From 077dec37b376400f1705a42355e7396669d00b65 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Sun, 7 Jul 2019 17:31:09 +0300
Subject: New ColorConversion project.

---
 .../Tango.MachineStudio.Developer.csproj                    |  6 +++++-
 .../Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs  | 13 ++++++++-----
 .../Tango.MachineStudio.Developer/Views/JobView.xaml        |  6 +++---
 .../Tango.MachineStudio.Developer/Views/JobView.xaml.cs     |  5 +++++
 4 files changed, 21 insertions(+), 9 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
index cd00557b1..6e55b6d14 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
@@ -208,6 +208,10 @@
       <Project>{40085232-aced-4cbe-945b-90ba8153c151}</Project>
       <Name>Tango.BrushPicker</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.ColorConversion\Tango.ColorConversion.csproj">
+      <Project>{b4fe6485-4161-4b36-bc08-67e0b53d01b7}</Project>
+      <Name>Tango.ColorConversion</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.ColorPicker\Tango.ColorPicker.csproj">
       <Project>{a2f5af44-29ff-45d6-9d25-ecda5cce88b5}</Project>
       <Name>Tango.ColorPicker</Name>
@@ -357,7 +361,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
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();
             }
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index 95f88d1ea..ad1648642 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -7,7 +7,7 @@
              xmlns:dragAndDrop="clr-namespace:Tango.DragAndDrop;assembly=Tango.DragAndDrop"
              xmlns:brushPicker="clr-namespace:Tango.BrushPicker;assembly=Tango.BrushPicker"
              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:colorConversion="clr-namespace:Tango.BL.ColorConversion;assembly=Tango.BL"
+             xmlns:colorConversion="clr-namespace:Tango.ColorConversion;assembly=Tango.ColorConversion"
              xmlns:hive="clr-namespace:Tango.Hive;assembly=Tango.Hive"
              xmlns:automation="clr-namespace:Tango.MachineStudio.Common.Automation;assembly=Tango.MachineStudio.Common"
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
@@ -901,10 +901,10 @@
                                                             </DockPanel>
                                                         </Grid>
                                                         <Grid Margin="0 10 10 0">
-                                                            <controls:MultiSelectListBox AutomationProperties.AutomationId="{x:Static automation:Developer.BrushStopsListBox}" SelectionMode="Extended" Style="{x:Null}" Background="Transparent" ScrollViewer.CanContentScroll="False" BorderThickness="0" ItemsSource="{Binding BrushStopsCollectionView}" SelectedItem="{Binding SelectedBrushStop}" SelectedItemsList="{Binding SelectedBrushStops,Mode=TwoWay}" HorizontalContentAlignment="Stretch">
+                                                            <controls:MultiSelectListBox x:Name="listStops" AutomationProperties.AutomationId="{x:Static automation:Developer.BrushStopsListBox}" SelectionMode="Extended" Style="{x:Null}" Background="Transparent" ScrollViewer.CanContentScroll="False" BorderThickness="0" ItemsSource="{Binding BrushStopsCollectionView}" SelectedItem="{Binding SelectedBrushStop}" SelectedItemsList="{Binding SelectedBrushStops,Mode=TwoWay}" HorizontalContentAlignment="Stretch">
                                                                 <ListBox.ItemContainerStyle>
                                                                     <Style TargetType="ListBoxItem" BasedOn="{StaticResource basicListBoxItem}">
-
+                                                                        <EventSetter Event="PreviewMouseDown" Handler="OnBrushStopMouseDown"></EventSetter>
                                                                     </Style>
                                                                 </ListBox.ItemContainerStyle>
                                                                 <ItemsControl.ItemTemplate>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
index f3af53352..18dc795bd 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
@@ -312,5 +312,10 @@ namespace Tango.MachineStudio.Developer.Views
                 _vm.OnBrushStopFieldValueChanged(stop);
             }
         }
+
+        private void OnBrushStopMouseDown(object sender, MouseButtonEventArgs e)
+        {
+            listStops.SelectedItem = (sender as ListBoxItem).DataContext;
+        }
     }
 }
-- 
cgit v1.3.1