Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 31 insertions, 1 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 83ebde0e5..749a09023 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
@@ -714,7 +714,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                     foreach (var stop in stops)
                     {
-                        if (stop.ColorSpace.Code == BL.Enumerations.ColorSpaces.Volume.ToInt32())
+                        if (stop.ColorSpace.Code == BL.Enumerations.ColorSpaces.Volume.ToInt32() && !stop.IsLiquidVolumesOutOfRange)
                         {
                             try
                             {
@@ -725,6 +725,14 @@ namespace Tango.MachineStudio.Developer.ViewModels
                             }
                             catch { }
                         }
+                        else if (stop.ColorSpace.Code == BL.Enumerations.ColorSpaces.RGB.ToInt32() && !stop.Corrected)
+                        {
+                            try
+                            {
+                                stop.IsOutOfGamut = TangoColorConverter.IsOutOfGamut(stop);
+                            }
+                            catch { }
+                        }
                     }
                 }
 
@@ -747,6 +755,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 _color_changed_from_hive = true;
                 SelectedBrushStop.Color = SelectedSuggestion.Color;
+                SelectedBrushStop.Corrected = true;
+                SelectedBrushStop.IsOutOfGamut = false;
 
                 var coords = SelectedSuggestion.Coordinates;
 
@@ -768,6 +778,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         {
             if (!_color_changed_from_hive && _hiveOpened)
             {
+                SelectedBrushStop.Corrected = false;
                 HiveSuggestions = TangoColorConverter.CreateHiveSuggestions(TangoColorConverter.GetSuggestions(SelectedBrushStop));
             }
         }
@@ -1102,6 +1113,11 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 return;
             }
 
+            foreach (var stop in ActiveJob.Segments.SelectMany(x => x.BrushStops).Where(x => x.LiquidVolumes == null))
+            {
+                stop.SetLiquidVolumes(SelectedMachine.Configuration, SelectedRML, SelectedProcessParametersTable);
+            }
+
             JobEvents.Clear();
             IsJobFailed = false;
             IsJobCanceled = false;
@@ -1169,6 +1185,13 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     });
                 };
 
+                _jobHandler.Finalizing += (_, __) => 
+                {
+                    _speech.SpeakInfo("Finalizing job...");
+                    LogManager.Log(String.Format("Finalizing job {0}.", RunningJob.Name));
+                    _eventLogger.Log(String.Format("Finalizing job {0}.", RunningJob.Name));
+                };
+
                 _jobHandler.Completed += (x, e) =>
                 {
                     LogManager.Log(String.Format("Job {0} has completed.", RunningJob.Name));
@@ -1312,9 +1335,13 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 ProcessParametersTablesGroup group = new ProcessParametersTablesGroup();
 
                 List<ProcessParametersTable> tables = new List<ProcessParametersTable>();
+
+                int index = 0;
+
                 foreach (var table in RmlProcessParametersTableGroup.ProcessParametersTables)
                 {
                     var newTable = table.CloneEntity();
+                    newTable.TableIndex = index++;
                     newTable.ProcessParametersTablesGroup = group;
                     tables.Add(newTable);
                 }
@@ -1368,10 +1395,13 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     _activeJobDbContext.Configuration.LazyLoadingEnabled = true;
 
                     LogManager.Log("Initializing available color spaces, RMLs & Winding methods...");
+                    var processParamsGroups = _activeJobDbContext.ProcessParametersTablesGroups.ToList();
+                    var processParams = _activeJobDbContext.ProcessParametersTables.ToList();
                     ColorSpaces = _activeJobDbContext.ColorSpaces.ToObservableCollection();
                     Rmls = _activeJobDbContext.Rmls.ToObservableCollection();
                     WindingMethods = _activeJobDbContext.WindingMethods.ToObservableCollection();
                     SpoolTypes = _activeJobDbContext.SpoolTypes.ToObservableCollection();
+                    
 
                     LogManager.Log("Setting active job...");
                     _activeJob = _activeJobDbContext.Jobs.SingleOrDefault(x => x.Guid == SelectedMachineJob.Guid);