Merged Extra Inks to Software.

1 files changed, 26 insertions, 4 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 4fd1a834b..073f79a97 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
@@ -233,7 +233,22 @@ namespace Tango.MachineStudio.Developer.ViewModels
         public List<LiquidTypesRml> LiquidTypesRmls
         {
             get { return _liquidTypesRmls; }
-            set { _liquidTypesRmls = value; RaisePropertyChangedAuto(); }
+            set { _liquidTypesRmls = value; RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(LiquidTypesRmlsOrdered)); }
+        }
+
+        public List<LiquidTypesRml> LiquidTypesRmlsOrdered
+        {
+            get
+            {
+                if (Settings.UsePreferredLiquidVolumeIndex)
+                {
+                    return LiquidTypesRmls.OrderBy(x => x.LiquidType.PreferredIndex).ToList();
+                }
+                else
+                {
+                    return LiquidTypesRmls;
+                }
+            }
         }
 
         private ProcessParametersTablesGroup _rmlProcessParametersTablesGroup;
@@ -841,6 +856,14 @@ namespace Tango.MachineStudio.Developer.ViewModels
         {
             Settings = SettingsManager.Default.GetOrCreate<DeveloperModuleSettings>();
 
+            Settings.PropertyChanged += (x, e) => 
+            {
+                if (e.PropertyName == nameof(Settings.UsePreferredLiquidVolumeIndex))
+                {
+                    RaisePropertyChanged(nameof(LiquidTypesRmlsOrdered));
+                }
+            };
+
             AutoProcessSelection = Settings.AutoProcessSelection;
 
             SelectedJobs = new ObservableCollection<Job>();
@@ -2336,10 +2359,9 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     newJob.Machine = SelectedMachine;
 
 
-
                     SelectedMachine.Jobs.Add(newJob);
                     var segment = newJob.AddSolidSegment();
-                    segment.BrushStops[0].SetAllDispensingStepDivisions(BL.Dispensing.DispenserStepDivisions.D8);
+                    segment.BrushStops[0].SetAllDispensingStepDivisions(BL.Dispensing.DispenserStepDivisions.D8, SelectedMachine.Configuration);
 
                     LogManager.Log("Saving selected machine to database...");
                     await SelectedMachine.SaveAsync(_machineDbContext);
@@ -2407,7 +2429,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 stop.Segment = SelectedSegment;
                 stop.ColorSpace = ColorSpaces.FirstOrDefault();
                 stop.Color = Colors.Black;
-                stop.SetAllDispensingStepDivisions(BL.Dispensing.DispenserStepDivisions.D8);
+                stop.SetAllDispensingStepDivisions(BL.Dispensing.DispenserStepDivisions.D8, SelectedMachine.Configuration);
                 stop.SetLiquidVolumes(SelectedMachine.Configuration, SelectedRML, SelectedProcessParametersTable);
                 SelectedSegment.BrushStops.Add(stop);
                 // _activeJobDbContext.BrushStops.Add(stop);