New ColorConversion project.

1 files changed, 8 insertions, 5 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 b0b6cfcb3..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;
@@ -48,6 +47,7 @@ using Tango.BL.Builders;
 using Tango.MachineStudio.Common.Navigation;
 using System.Diagnostics;
 using Tango.Core.ExtensionMethods;
+using Tango.ColorConversion;
 
 namespace Tango.MachineStudio.Developer.ViewModels
 {
@@ -81,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
 
@@ -714,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;
 
@@ -836,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;
@@ -850,7 +853,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                             {
                                 try
                                 {
-                                    stop.IsOutOfGamut = TangoColorConverter.IsOutOfGamut(stop);
+                                    stop.IsOutOfGamut = _converter.IsOutOfGamut(stop);
                                     stop.OutOfGamutChecked = true;
                                 }
                                 catch { }
@@ -871,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)
                 {
@@ -912,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();
             }
         }