From 8e49a8041391c9aa946060aed2c538b1ce958a68 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 19 Sep 2019 18:29:10 +0300
Subject: Added support for multiple ColorLib versions ! Added version control
 and display in RML & Research Module. Implemented GenerateHive optimizations.

---
 .../Modules/Tango.MachineStudio.Developer/App.xaml       | 12 ++++++++++++
 .../Tango.MachineStudio.Developer.csproj                 |  6 +++++-
 .../ViewModels/MainViewVM.cs                             | 11 ++++++-----
 .../Tango.MachineStudio.Developer/Views/JobView.xaml     | 16 +++++++++++-----
 4 files changed, 34 insertions(+), 11 deletions(-)
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/App.xaml

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/App.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/App.xaml
new file mode 100644
index 000000000..dff08b5e8
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/App.xaml
@@ -0,0 +1,12 @@
+<Application x:Class="Tango.MachineStudio.Developer.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/Tango.MachineStudio.Common;component/Resources/MaterialDesign.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/Tango.MachineStudio.Common;component/Themes/LightThemeColors.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
\ No newline at end of file
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 6e55b6d14..10fce1b20 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
@@ -141,6 +141,10 @@
     <Compile Include="Views\RunningJobView.xaml.cs">
       <DependentUpon>RunningJobView.xaml</DependentUpon>
     </Compile>
+    <Page Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\EmbroideryDisplayView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -361,7 +365,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </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 ac5354a74..3f551c866 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
@@ -827,7 +827,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         {
             while (true)
             {
-                if (!_rml_has_no_cct && EnableColorConversion && !_disable_gamut_check && IsJobVisible && IsVisible && ActiveJob != null && ActiveJob.Segments != null)
+                if (!_rml_has_no_cct && EnableColorConversion && !_disable_gamut_check && IsJobVisible && IsVisible && ActiveJob != null && ActiveJob.Segments != null && SelectedProcessParametersTable != null)
                 {
                     try
                     {
@@ -839,7 +839,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                             {
                                 try
                                 {
-                                    var output = _converter.Convert(stop);
+                                    var output = _converter.Convert(stop, false);
 
                                     stop.Red = output.SingleCoordinates.Red;
                                     stop.Green = output.SingleCoordinates.Green;
@@ -853,7 +853,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
                             {
                                 try
                                 {
-                                    stop.IsOutOfGamut = _converter.IsOutOfGamut(stop);
+                                    var output = _converter.Convert(stop, false);
+                                    output.ApplyOnBrushStopLiquidVolumes(stop, SelectedProcessParametersTable);
                                     stop.OutOfGamutChecked = true;
                                 }
                                 catch { }
@@ -874,7 +875,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 _hiveOpened = true;
                 try
                 {
-                    HiveSuggestions = _converter.Convert(SelectedBrushStop).CreateHiveSuggestions();
+                    HiveSuggestions = _converter.Convert(SelectedBrushStop, true).CreateHiveSuggestions();
                 }
                 catch (Exception ex)
                 {
@@ -915,7 +916,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             if (!_color_changed_from_hive && _hiveOpened)
             {
                 SelectedBrushStop.Corrected = false;
-                HiveSuggestions = _converter.Convert(SelectedBrushStop).CreateHiveSuggestions();
+                HiveSuggestions = _converter.Convert(SelectedBrushStop, true).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 861a639d3..742798ce4 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
@@ -753,13 +753,19 @@
                                                                 <StackPanel>
                                                                     <TextBlock>MEDIA</TextBlock>
                                                                     <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
-                                                                        <ComboBox Width="250" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}" Style="{StaticResource TransparentComboBoxStyle}">
+                                                                        <ComboBox Width="250" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}" Style="{StaticResource TransparentComboBoxStyle}" HorizontalContentAlignment="Stretch">
                                                                             <ComboBox.ItemTemplate>
                                                                                 <DataTemplate>
-                                                                                    <StackPanel>
-                                                                                        <TextBlock Text="{Binding Name}" FontWeight="Bold" FontStyle="Italic"></TextBlock>
-                                                                                        <TextBlock FontSize="11" Text="{Binding Manufacturer}" Foreground="Gray"></TextBlock>
-                                                                                    </StackPanel>
+                                                                                    <DockPanel>
+                                                                                        <StackPanel DockPanel.Dock="Left">
+                                                                                            <TextBlock Text="{Binding Name}" FontWeight="Bold" FontStyle="Italic"></TextBlock>
+                                                                                            <TextBlock FontSize="11" Text="{Binding Manufacturer}" Foreground="Gray"></TextBlock>
+                                                                                        </StackPanel>
+                                                                                        <TextBlock Margin="20 0 0 0" VerticalAlignment="Center" HorizontalAlignment="Right">
+                                                                                            <Run Foreground="Gray">v:</Run>
+                                                                                            <Run FontWeight="Bold" Text="{Binding ColorConversionVersion,Mode=OneWay}"></Run>
+                                                                                        </TextBlock>
+                                                                                    </DockPanel>
                                                                                 </DataTemplate>
                                                                             </ComboBox.ItemTemplate>
                                                                         </ComboBox>
-- 
cgit v1.3.1