Moved Observables to Integration !!

Implemented basic sketch for IDS Pack Formulation.

1 files changed, 7 insertions, 7 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 5a1b46041..f6ddc9d19 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
@@ -9,7 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Media;
 using Tango.Core.Commands;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Controls;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.Common.StudioApplication;
@@ -47,8 +47,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
             set
             {
                 _selectedMachine = value;
-                RaisePropertyChangedAuto();
                 OnMachineChanged();
+                RaisePropertyChangedAuto();
                 InvalidateRelayCommands();
 
                 if (_selectedMachine != null)
@@ -145,8 +145,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
             set
             {
                 _selectedRML = value;
-                RaisePropertyChangedAuto();
                 InvalidateLiquidFactorsAndProcessTables();
+                RaisePropertyChangedAuto();
                 InvalidateRelayCommands();
             }
         }
@@ -308,7 +308,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         {
             if (SelectedSegment != null)
             {
-                SetSegmentBrushStopsInkVolumes(SelectedSegment);
+                SetSegmentBrushStopsLiquidVolumes(SelectedSegment);
                 SelectedBrushStop = SelectedSegment.BrushStops.FirstOrDefault();
             }
         }
@@ -347,13 +347,13 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
         #region Private Methods
 
-        private void SetSegmentBrushStopsInkVolumes(Segment segment)
+        private void SetSegmentBrushStopsLiquidVolumes(Segment segment)
         {
             if (!DesignMode)
             {
                 foreach (var stop in segment.BrushStops)
                 {
-                    stop.SetInkVolumes(SelectedMachine.Configuration);
+                    stop.SetLiquidVolumes(SelectedMachine.Configuration, SelectedRML);
                 }
             }
         }
@@ -526,7 +526,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 var stop = new BrushStop();
                 stop.ColorSpace = Adapter.ColorSpaces.FirstOrDefault();
-                stop.SetInkVolumes(SelectedMachine.Configuration);
+                stop.SetLiquidVolumes(SelectedMachine.Configuration, SelectedRML);
                 SelectedSegment.BrushStops.Add(stop);
             }
         }