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

1 files changed, 15 insertions, 13 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 3f28c2cff..a865cdc8f 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
@@ -38,7 +38,6 @@ using System.Threading;
 using Tango.SharedUI.Helpers;
 using Tango.Core.DI;
 using Tango.MachineStudio.Common;
-using Tango.BL.ColorConversion;
 using Tango.MachineStudio.Logging.ViewModels;
 using Tango.MachineStudio.Logging.Views;
 using Tango.AutoComplete.Editors;
@@ -47,6 +46,8 @@ using System.Runtime.ExceptionServices;
 using Tango.BL.Builders;
 using Tango.MachineStudio.Common.Navigation;
 using System.Diagnostics;
+using Tango.Core.ExtensionMethods;
+using Tango.ColorConversion;
 
 namespace Tango.MachineStudio.Developer.ViewModels
 {
@@ -80,6 +81,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         private bool _disable_gamut_check;
         private bool _rml_has_no_cct;
         private TaskItem _preparingTaskItem;
+        private IColorConverter _converter;
 
         #region Properties
 
@@ -713,6 +715,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
         /// <param name="notificationProvider">The notification provider.</param>
         public MainViewVM(IStudioApplicationManager applicationManager, INotificationProvider notificationProvider, IDiagnosticsFrameProvider diagnosticsFrameProvider, IVideoCaptureProvider videoCaptureProvider, DeveloperNavigationManager navigation, INavigationManager navigationManager, IAuthenticationProvider authentication, IEventLogger eventLogger, ISpeechProvider speech)
         {
+            _converter = new DefaultColorConverter();
+
             CanWork = true;
             EnableColorConversion = true;
 
@@ -835,7 +839,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                             {
                                 try
                                 {
-                                    var output = TangoColorConverter.GetSuggestions(stop);
+                                    var output = _converter.Convert(stop);
 
                                     stop.Red = output.SingleCoordinates.Red;
                                     stop.Green = output.SingleCoordinates.Green;
@@ -849,7 +853,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                             {
                                 try
                                 {
-                                    stop.IsOutOfGamut = TangoColorConverter.IsOutOfGamut(stop);
+                                    stop.IsOutOfGamut = _converter.IsOutOfGamut(stop);
                                     stop.OutOfGamutChecked = true;
                                 }
                                 catch { }
@@ -870,7 +874,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 _hiveOpened = true;
                 try
                 {
-                    HiveSuggestions = TangoColorConverter.CreateHiveSuggestions(TangoColorConverter.GetSuggestions(SelectedBrushStop));
+                    HiveSuggestions = _converter.Convert(SelectedBrushStop).CreateHiveSuggestions();
                 }
                 catch (Exception ex)
                 {
@@ -911,7 +915,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             if (!_color_changed_from_hive && _hiveOpened)
             {
                 SelectedBrushStop.Corrected = false;
-                HiveSuggestions = TangoColorConverter.CreateHiveSuggestions(TangoColorConverter.GetSuggestions(SelectedBrushStop));
+                HiveSuggestions = _converter.Convert(SelectedBrushStop).CreateHiveSuggestions();
             }
         }
 
@@ -1233,8 +1237,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
         {
             LogManager.Log(String.Format("BrushStop {0} Dropped on BrushStop {1}", dragged.StopIndex, dropped.StopIndex));
 
-            dragged.SetStopIndex(dropped.StopIndex);
-            dropped.SetStopIndex(dropped.StopIndex + 1);
+            dragged.SetStopIndexNoRaise(dropped.StopIndex);
+            dropped.SetStopIndexNoRaise(dropped.StopIndex + 1);
             ArrangeBrushStopsIndices();
         }
 
@@ -1988,7 +1992,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
             foreach (var stop in SelectedSegment.BrushStops.OrderBy(x => x.StopIndex))
             {
-                stop.SetStopIndex(index++);
+                stop.SetStopIndexNoRaise(index++);
             }
 
             if (SelectedSegment.BrushStops.Count > 1)
@@ -2024,8 +2028,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
                             _notification.ShowInfo("A job must contain at least one segment.");
                             return;
                         }
-                        ActiveJob.Segments.Remove(x);
-                        x.DefferedDelete(_activeJobDbContext);
+
+                        x.Delete(_activeJobDbContext);
                     });
 
                     ArrangeSegmentsIndices();
@@ -2075,8 +2079,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     LogManager.Log(String.Format("Removing {0} jobs...", SelectedJobs.Count));
                     SelectedJobs.ToList().ForEach(x =>
                     {
-                        SelectedMachine.Jobs.Remove(x);
-                        x.DefferedDelete(_machineDbContext);
+                        x.Delete(_machineDbContext);
                     });
 
                     using (_notification.PushTaskItem("Removing selected jobs..."))
@@ -2163,7 +2166,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
                             return;
                         }
                         SelectedSegment.BrushStops.Remove(x);
-                        x.DefferedDelete(_activeJobDbContext);
                     });
 
                     ArrangeBrushStopsIndices();