From dc11398ba5728af943256ca99eba8c9d66e1b6e2 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 25 Jan 2018 14:12:56 +0200 Subject: 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. --- .../ViewModels/MainViewVM.cs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs') 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(); } } -- cgit v1.3.1