aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-01-25 14:12:56 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-01-25 14:12:56 +0200
commitdc11398ba5728af943256ca99eba8c9d66e1b6e2 (patch)
tree5ff3d0f64f2361d254511810258d7824eeab98d3 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels
parentd36a5ab7115ec53405622e4437cd3f8f615d515d (diff)
downloadTango-dc11398ba5728af943256ca99eba8c9d66e1b6e2.tar.gz
Tango-dc11398ba5728af943256ca99eba8c9d66e1b6e2.zip
Refactored ObservableEntity:
Observables comparison is now done by GUID. Implemented != == Equals overrides. Save and load are now done only on decorated properties so properties on partial class are allowed! Implemented dynamic graph sizes on developer module.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs17
1 files changed, 7 insertions, 10 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index dc3ba0ec5..0742ca752 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -239,13 +239,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
{
using (_notification.PushTaskItem("Saving Liquid Factors..."))
{
- String machineGuid = SelectedMachine.Guid;
- String rmlGuid = SelectedRML.Guid;
-
await SelectedRML.SaveAsync();
-
- SelectedMachine = Adapter.Machines.SingleOrDefault(x => x.Guid == machineGuid);
- SelectedRML = Adapter.Rmls.SingleOrDefault(x => x.Guid == rmlGuid);
+ InvalidateLiquidFactorsAndProcessTables();
}
}
}
@@ -298,14 +293,16 @@ namespace Tango.MachineStudio.Developer.ViewModels
g.Active = false;
}
- String machineGuid = SelectedMachine.Guid;
- String rmlGuid = SelectedRML.Guid;
+ //String machineGuid = SelectedMachine.Guid;
+ //String rmlGuid = SelectedRML.Guid;
SelectedRML.ProcessParametersTablesGroups.Add(group);
await SelectedRML.SaveAsync();
- SelectedMachine = Adapter.Machines.SingleOrDefault(x => x.Guid == machineGuid);
- SelectedRML = Adapter.Rmls.SingleOrDefault(x => x.Guid == rmlGuid);
+ //SelectedMachine = Adapter.Machines.SingleOrDefault(x => x.Guid == machineGuid);
+ //SelectedRML = Adapter.Rmls.SingleOrDefault(x => x.Guid == rmlGuid);
+
+ InvalidateLiquidFactorsAndProcessTables();
}
}