From 6571e92dd34dedb02611a6e9a7714f8185bb4488 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Tue, 19 Jan 2021 22:19:03 +0200
Subject: Light Inks Basics.

---
 .../Modules/Tango.MachineStudio.RML/Views/ColorConversionView.xaml | 4 ++--
 .../Modules/Tango.MachineStudio.RML/Views/RmlView.xaml             | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorConversionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorConversionView.xaml
index 912ec3b0a..73f5208db 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorConversionView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorConversionView.xaml
@@ -128,7 +128,7 @@
         <TextBlock FontStyle="Italic" HorizontalAlignment="Center" Grid.Column="2" Margin="0 0 0 0">SUGGESTIONS</TextBlock>
         <TextBlock FontStyle="Italic" HorizontalAlignment="Center" Grid.Column="4" Margin="-80 0 0 0">LIQUID VOLUMES</TextBlock>
 
-        <Image Source="../Images/arrow-long-right.png" Grid.Column="1" Grid.Row="1" Width="120" Stretch="Fill" Height="30" Opacity="0.8" Margin="20 0 20 0"></Image>
+        <Image Source="../Images/arrow-long-right.png" Grid.Column="1" Grid.Row="1" Width="100" Stretch="Fill" Height="30" Opacity="0.8" Margin="20 0 20 0"></Image>
 
         <hive:HexList Width="220" Height="270" UseHexItemHasContainer="True" Grid.Column="2" Grid.Row="1" RowCount="6" ColumnCount="5" ItemsSource="{Binding HiveSuggestions}" SelectedItem="{Binding SelectedSuggestion,Mode=TwoWay}">
             <hive:HexList.ItemContainerStyle>
@@ -175,7 +175,7 @@
             </TextBlock.Style>
         </TextBlock>
 
-        <Image Source="../Images/arrow-long-right.png" Grid.Column="3" Grid.Row="1" Width="120" Stretch="Fill" Height="30" Opacity="0.8" Margin="20 0 20 0"></Image>
+        <Image Source="../Images/arrow-long-right.png" Grid.Column="3" Grid.Row="1" Width="100" Stretch="Fill" Height="30" Opacity="0.8" Margin="20 0 20 0"></Image>
 
         <Grid Grid.Column="4" Grid.Row="1" IsHitTestVisible="False">
             <StackPanel HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0 -20 0 0">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
index b6c91f066..788c78b9c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
@@ -168,7 +168,7 @@
                                 <Grid>
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="*"></ColumnDefinition>
-                                        <ColumnDefinition Width="260"></ColumnDefinition>
+                                        <ColumnDefinition Width="250"></ColumnDefinition>
                                     </Grid.ColumnDefinitions>
                                     <DockPanel>
                                         <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="20 0" Padding="7" CornerRadius="5">
@@ -198,7 +198,7 @@
                                                         <StackPanel VerticalAlignment="Center" Width="200" Margin="5 20 5 10">
 
                                                             <ComboBox materialDesign:HintAssist.Hint="No CCT Defined" Margin="0 5 0 0" HorizontalContentAlignment="Center" ItemsSource="{Binding CCTS}" SelectedItem="{Binding SelectedCCT}" DisplayMemberPath="FileName" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
-                                                            <UniformGrid Columns="2" Margin="0 5 0 0" HorizontalAlignment="Right">
+                                                            <UniformGrid Columns="2" Margin="0 5 0 0" HorizontalAlignment="Center">
                                                                 <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ImportForwardDataCommand}">
                                                                     <StackPanel Orientation="Horizontal" Margin="0 0 20 0">
                                                                         <materialDesign:PackIcon Kind="Upload" VerticalAlignment="Center" />
@@ -216,7 +216,8 @@
                                                             <TextBlock Margin="0 40 0 0" Text="Color Conversion Version:" HorizontalAlignment="Center"></TextBlock>
                                                             <mahapps:NumericUpDown Minimum="1" Maximum="4" Value="{Binding ActiveRML.ColorConversionVersion}" HorizontalContentAlignment="Center" Background="Transparent" BorderBrush="{StaticResource DimGrayBrush}" HasDecimals="False" Margin="0 5 0 0" />
 
-                                                            <CheckBox ToolTip="Use the color conversion engine to generate gradients" IsChecked="{Binding ActiveRML.UseColorLibGradients}" HorizontalAlignment="Center" Margin="0 40 0 0">Enable Gradient Generation</CheckBox>
+                                                            <CheckBox ToolTip="Use the color conversion engine to generate gradients" IsChecked="{Binding ActiveRML.UseColorLibGradients}" HorizontalAlignment="Left" Margin="0 20 0 0">Enable Gradient Generation</CheckBox>
+                                                            <CheckBox ToolTip="Use light inks when converting colors to liquid volumes" IsChecked="{Binding ActiveRML.UseLightInks}" HorizontalAlignment="Left" Margin="0 5 0 0">Use Light Inks</CheckBox>
                                                         </StackPanel>
                                                     </StackPanel>
                                                 </Grid>
-- 
cgit v1.3.1


From a4bd79a77bba87b8644e73903f020de94e1c7ade Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Thu, 28 Jan 2021 19:37:51 +0200
Subject: Added RML & Color Conversion VMax.

---
 Software/DB/PPC/Tango.mdf                          | Bin 75497472 -> 75497472 bytes
 Software/DB/PPC/Tango_log.ldf                      | Bin 53673984 -> 53673984 bytes
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 22675456 -> 22675456 bytes
 .../PMR/Messages/ColorLab/ConversionInput.proto    |   1 +
 .../ViewModels/ColorConversionViewVM.cs            |   1 +
 .../Tango.MachineStudio.RML/Views/RmlView.xaml     |   9 +-
 Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs  |   8 +
 .../Visual_Studio/Tango.BL/Entities/RmlBase.cs     |  38 +++++
 .../Tango.ColorConversion/DefaultColorConverter.cs |   2 +
 Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs  |   1 +
 .../Tango.DAL.Remote/DB/RemoteADO.edmx             |   3 +
 .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram     | 168 ++++++++++-----------
 .../Tango.PMR/ColorLab/ConversionInput.cs          |  35 ++++-
 .../SQLExaminer/Configurations/OverrideData.xml    | Bin 86768 -> 86838 bytes
 15 files changed, 177 insertions(+), 89 deletions(-)

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

diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf
index 9bba44732..b4ea2b8a2 100644
Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ
diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf
index 6c2bb4822..a1f2ace90 100644
Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 16753592d..e2aef1aa6 100644
Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index c2c7c2686..a4af854e7 100644
Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ
diff --git a/Software/PMR/Messages/ColorLab/ConversionInput.proto b/Software/PMR/Messages/ColorLab/ConversionInput.proto
index edf1c368f..5a7bfde10 100644
--- a/Software/PMR/Messages/ColorLab/ConversionInput.proto
+++ b/Software/PMR/Messages/ColorLab/ConversionInput.proto
@@ -22,4 +22,5 @@ message ConversionInput
 	repeated ProcessRange ProcessRanges = 11;
 	bool GenerateHive = 12;
 	bool UseLightInks = 13;
+	double VMax = 14;
 }
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs
index fb9a246ce..4a6fd7d36 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs
@@ -218,6 +218,7 @@ namespace Tango.MachineStudio.RML.ViewModels
                     input.ThreadB = RML.WhitePointB;
 
                     input.UseLightInks = RML.UseLightInks;
+                    input.VMax = RML.VMax;
 
                     //Validate calibration data
                     foreach (var vm in LiquidsCalibrationData.Where(x => x.LiquidType.HasPigment))
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
index 788c78b9c..62b6dc335 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
@@ -187,7 +187,7 @@
                                                 <DropShadowEffect Opacity="0.4" />
                                             </Border.Effect>
                                             <Grid>
-                                                <TextBlock HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">CCT</TextBlock>
+                                                <TextBlock HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">Engine</TextBlock>
                                             </Grid>
                                         </Border>
                                         <Grid DockPanel.Dock="Top" Background="#35B5B5B5" Margin="20 0">
@@ -217,7 +217,12 @@
                                                             <mahapps:NumericUpDown Minimum="1" Maximum="4" Value="{Binding ActiveRML.ColorConversionVersion}" HorizontalContentAlignment="Center" Background="Transparent" BorderBrush="{StaticResource DimGrayBrush}" HasDecimals="False" Margin="0 5 0 0" />
 
                                                             <CheckBox ToolTip="Use the color conversion engine to generate gradients" IsChecked="{Binding ActiveRML.UseColorLibGradients}" HorizontalAlignment="Left" Margin="0 20 0 0">Enable Gradient Generation</CheckBox>
-                                                            <CheckBox ToolTip="Use light inks when converting colors to liquid volumes" IsChecked="{Binding ActiveRML.UseLightInks}" HorizontalAlignment="Left" Margin="0 5 0 0">Use Light Inks</CheckBox>
+                                                            <CheckBox ToolTip="Use light inks when converting colors to liquid volumes" IsChecked="{Binding ActiveRML.UseLightInks}" HorizontalAlignment="Left" Margin="0 10 0 0">Use Light Inks</CheckBox>
+
+                                                            <DockPanel Margin="0 10 0 0">
+                                                                <TextBlock VerticalAlignment="Center" Text="V-Max:" ></TextBlock>
+                                                                <mahapps:NumericUpDown Minimum="1" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" HorizontalAlignment="Right" Width="100" Value="{Binding ActiveRML.VMax,Mode=TwoWay}"></mahapps:NumericUpDown>
+                                                            </DockPanel>
                                                         </StackPanel>
                                                     </StackPanel>
                                                 </Grid>
diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs
index f9717002d..4530ae25d 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs
@@ -381,5 +381,13 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
+        /// <summary>
+        /// v max
+        /// </summary>
+        public Double VMax 
+        {
+            get; set; 
+        }
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
index cc360ca64..cb081f263 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
@@ -103,6 +103,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Double> ArcHeadCleaningMotorSpeedChanged;
 
+        public event EventHandler<Double> VMaxChanged;
+
         public event EventHandler<SynchronizedObservableCollection<Cat>> CatsChanged;
 
         public event EventHandler<Cct> CctChanged;
@@ -1339,6 +1341,33 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Double _vmax;
+
+        /// <summary>
+        /// Gets or sets the rmlbase v max.
+        /// </summary>
+
+        [Column("V_MAX")]
+
+        public  Double VMax
+        {
+            get 
+            {
+                return _vmax; 
+            }
+
+            set 
+            {
+                if (_vmax != value)
+                {
+                    _vmax = value;
+
+                    OnVMaxChanged(value);
+
+                }
+            }
+        }
+
         protected SynchronizedObservableCollection<Cat> _cats;
 
         /// <summary>
@@ -2080,6 +2109,15 @@ namespace Tango.BL.Entities
             RaisePropertyChanged(nameof(ArcHeadCleaningMotorSpeed));
         }
 
+        /// <summary>
+        /// Called when the VMax has changed.
+        /// </summary>
+        protected virtual void OnVMaxChanged(Double vmax)
+        {
+            VMaxChanged?.Invoke(this, vmax);
+            RaisePropertyChanged(nameof(VMax));
+        }
+
         /// <summary>
         /// Called when the Cats has changed.
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
index 51cac0ef1..bcdd20c88 100644
--- a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
+++ b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
@@ -133,6 +133,8 @@ namespace Tango.ColorConversion
 
             conversionInput.UseLightInks = rml.UseLightInks && lightInksInstalled && useLightInks && settings.UseLightInks;
 
+            conversionInput.VMax = rml.VMax;
+
             conversionInput.ForwardData = ByteString.CopyFrom(rml.Cct.Data);
 
             foreach (var processTable in rml.GetActiveProcessGroup().ProcessParametersTables)
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
index c140fa362..f00189ce7 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
@@ -74,6 +74,7 @@ namespace Tango.DAL.Remote.DB
         public bool BYPASS_ROCKERS { get; set; }
         public int CLEANER_FLOW { get; set; }
         public double ARC_HEAD_CLEANING_MOTOR_SPEED { get; set; }
+        public double V_MAX { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<CAT> CATS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index a365ae5b8..1f8eb6454 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -1033,6 +1033,7 @@
           <Property Name="BYPASS_ROCKERS" Type="bit" Nullable="false" />
           <Property Name="CLEANER_FLOW" Type="int" Nullable="false" />
           <Property Name="ARC_HEAD_CLEANING_MOTOR_SPEED" Type="float" Nullable="false" />
+          <Property Name="V_MAX" Type="float" Nullable="false" />
         </EntityType>
         <EntityType Name="RMLS_SPOOLS">
           <Key>
@@ -4539,6 +4540,7 @@
           <Property Name="BYPASS_ROCKERS" Type="Boolean" Nullable="false" />
           <Property Name="CLEANER_FLOW" Type="Int32" Nullable="false" />
           <Property Name="ARC_HEAD_CLEANING_MOTOR_SPEED" Type="Double" Nullable="false" />
+          <Property Name="V_MAX" Type="Double" Nullable="false" />
           <NavigationProperty Name="CATS" Relationship="RemoteModel.FK_CATS_RMLS" FromRole="RML" ToRole="CAT" />
           <NavigationProperty Name="CCT" Relationship="RemoteModel.FK_RMLS_CCTS" FromRole="RML" ToRole="CCT" />
           <NavigationProperty Name="COLOR_CATALOGS_ITEMS_RECIPES" Relationship="RemoteModel.FK_COLOR_CATALOGS_ITEMS_RECIPES_RMLS" FromRole="RML" ToRole="COLOR_CATALOGS_ITEMS_RECIPES" />
@@ -7087,6 +7089,7 @@
           <EntitySetMapping Name="RMLS">
             <EntityTypeMapping TypeName="RemoteModel.RML">
               <MappingFragment StoreEntitySet="RMLS">
+                <ScalarProperty Name="V_MAX" ColumnName="V_MAX" />
                 <ScalarProperty Name="ARC_HEAD_CLEANING_MOTOR_SPEED" ColumnName="ARC_HEAD_CLEANING_MOTOR_SPEED" />
                 <ScalarProperty Name="CLEANER_FLOW" ColumnName="CLEANER_FLOW" />
                 <ScalarProperty Name="BYPASS_ROCKERS" ColumnName="BYPASS_ROCKERS" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
index 31eb5296d..be7e5f5e5 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,90 +5,90 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1" ZoomLevel="87">
-        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="79.25" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="56.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="65.5" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="59.625" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="17.75" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="8" PointY="61.75" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="20.75" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="13.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="9" PointY="5.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="11.25" PointY="12" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="13.5" PointY="10.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="24.625" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="39" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="46" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="75.375" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="24.625" />
-        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="5.25" PointY="57.125" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="5.75" PointY="1.875" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="8" PointY="1.375" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="62.5" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="11" PointY="57.75" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="27.875" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="33.75" />
-        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="5" />
-        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="17.75" PointY="15.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="3.5" PointY="69" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="5.75" PointY="44.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="62" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6.75" PointY="40.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="9.5" PointY="68" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="11.75" PointY="47.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="9.5" PointY="53.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="11.75" PointY="37.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="6.5" PointY="49" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="8.75" PointY="46" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="7" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="3.75" PointY="36.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="40.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="1.5" PointY="3" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="3.75" PointY="40.75" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="8" PointY="64.625" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="10.25" PointY="28.625" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="17.75" PointY="19.75" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="17.25" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="17" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="11.5" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="17" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="8.5" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="37.125" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="45.625" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="13.25" PointY="31.125" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="25" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="30.875" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="21.25" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="8" PointY="58.625" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="70.25" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="14" PointY="40.125" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="29.125" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="31.875" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="16.75" PointY="6.875" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="19" PointY="7.125" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="15.875" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="5.25" PointY="16.75" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="14" PointY="3" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="16.25" PointY="3.125" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="21" />
-        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="6" PointY="8" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="14.25" PointY="7" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="8.25" PointY="21.125" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="3" PointY="10.25" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="14.25" PointY="36" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="18.75" PointY="1.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="18.75" PointY="10.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="16.25" PointY="28.5" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="19.75" PointY="15.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="19.75" PointY="19.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="20.75" PointY="1.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="20.75" PointY="10.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="21.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="21.75" PointY="15.75" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="10.75" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="16.25" PointY="12.125" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="42.5" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="29" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="56.375" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="77.375" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="71.5" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="64.375" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="16.75" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="6" PointY="29" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="15.875" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="32.375" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="36.625" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="37.125" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="35.875" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="19.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="11.5" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3.75" PointY="69.875" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="60.5" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="24" />
+        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="8.25" PointY="72.125" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="3.75" PointY="84.5" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="6" PointY="83.875" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="74.5" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="83.625" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="12.75" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="26.625" />
+        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="43.25" />
+        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="0.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="8.5" PointY="92.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="10.75" PointY="75.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="8.5" PointY="88.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="10.75" PointY="71.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="9.5" PointY="57.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="11.75" PointY="57.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="6.5" PointY="60.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="8.75" PointY="61.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="9.5" PointY="79.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="11.75" PointY="63.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="52.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="3.75" PointY="65.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="67.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="1.5" PointY="80.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="3.75" PointY="75.625" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="6" PointY="32.5" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="8.25" PointY="36.875" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="5.75" PointY="6.75" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="16.375" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="20.25" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="1.875" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="20" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="34.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3.75" PointY="80.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="6" PointY="64.875" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="49" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="15.75" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="23.625" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="29.5" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="6" PointY="41.875" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3.75" PointY="58.375" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="8.5" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="46.625" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="49.25" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="0.75" PointY="7" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="3" PointY="7.125" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="14.875" />
+        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="5.25" PointY="23.875" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="12.375" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="12.5" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="20" />
+        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="11" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="14.25" PointY="27.375" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="16.25" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="6" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="38.5" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="2.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="8.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="11.25" PointY="53.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="10.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="2.75" PointY="3.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="11.75" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="13.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="14.75" PointY="5.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="15.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="27.125" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="31.5" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="33" />
         <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs
index 87a63fe27..abed81ceb 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs
@@ -24,7 +24,7 @@ namespace Tango.PMR.ColorLab {
           string.Concat(
             "ChVDb252ZXJzaW9uSW5wdXQucHJvdG8SElRhbmdvLlBNUi5Db2xvckxhYhoW",
             "SW5wdXRDb29yZGluYXRlcy5wcm90bxoQQ29sb3JTcGFjZS5wcm90bxoSUHJv",
-            "Y2Vzc1JhbmdlLnByb3RvIoMDCg9Db252ZXJzaW9uSW5wdXQSDwoHVGhyZWFk",
+            "Y2Vzc1JhbmdlLnByb3RvIpEDCg9Db252ZXJzaW9uSW5wdXQSDwoHVGhyZWFk",
             "TBgBIAEoARIPCgdUaHJlYWRBGAIgASgBEg8KB1RocmVhZEIYAyABKAESMgoK",
             "Q29sb3JTcGFjZRgEIAEoDjIeLlRhbmdvLlBNUi5Db2xvckxhYi5Db2xvclNw",
             "YWNlEj4KEElucHV0Q29vcmRpbmF0ZXMYBSABKAsyJC5UYW5nby5QTVIuQ29s",
@@ -33,11 +33,12 @@ namespace Tango.PMR.ColorLab {
             "C0RlbHRhQ2hyb21hGAkgASgBEg4KBkRlbHRhTBgKIAEoARI3Cg1Qcm9jZXNz",
             "UmFuZ2VzGAsgAygLMiAuVGFuZ28uUE1SLkNvbG9yTGFiLlByb2Nlc3NSYW5n",
             "ZRIUCgxHZW5lcmF0ZUhpdmUYDCABKAgSFAoMVXNlTGlnaHRJbmtzGA0gASgI",
-            "Qh4KHGNvbS50d2luZS50YW5nby5wbXIuY29sb3JsYWJiBnByb3RvMw=="));
+            "EgwKBFZNYXgYDiABKAFCHgocY29tLnR3aW5lLnRhbmdvLnBtci5jb2xvcmxh",
+            "YmIGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.InputCoordinatesReflection.Descriptor, global::Tango.PMR.ColorLab.ColorSpaceReflection.Descriptor, global::Tango.PMR.ColorLab.ProcessRangeReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.ConversionInput), global::Tango.PMR.ColorLab.ConversionInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ColorSpace", "InputCoordinates", "ForwardData", "InverseData", "SegmentLength", "DeltaChroma", "DeltaL", "ProcessRanges", "GenerateHive", "UseLightInks" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.ConversionInput), global::Tango.PMR.ColorLab.ConversionInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ColorSpace", "InputCoordinates", "ForwardData", "InverseData", "SegmentLength", "DeltaChroma", "DeltaL", "ProcessRanges", "GenerateHive", "UseLightInks", "VMax" }, null, null, null)
           }));
     }
     #endregion
@@ -81,6 +82,7 @@ namespace Tango.PMR.ColorLab {
       processRanges_ = other.processRanges_.Clone();
       generateHive_ = other.generateHive_;
       useLightInks_ = other.useLightInks_;
+      vMax_ = other.vMax_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -230,6 +232,17 @@ namespace Tango.PMR.ColorLab {
       }
     }
 
+    /// <summary>Field number for the "VMax" field.</summary>
+    public const int VMaxFieldNumber = 14;
+    private double vMax_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double VMax {
+      get { return vMax_; }
+      set {
+        vMax_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as ConversionInput);
@@ -256,6 +269,7 @@ namespace Tango.PMR.ColorLab {
       if(!processRanges_.Equals(other.processRanges_)) return false;
       if (GenerateHive != other.GenerateHive) return false;
       if (UseLightInks != other.UseLightInks) return false;
+      if (VMax != other.VMax) return false;
       return true;
     }
 
@@ -275,6 +289,7 @@ namespace Tango.PMR.ColorLab {
       hash ^= processRanges_.GetHashCode();
       if (GenerateHive != false) hash ^= GenerateHive.GetHashCode();
       if (UseLightInks != false) hash ^= UseLightInks.GetHashCode();
+      if (VMax != 0D) hash ^= VMax.GetHashCode();
       return hash;
     }
 
@@ -334,6 +349,10 @@ namespace Tango.PMR.ColorLab {
         output.WriteRawTag(104);
         output.WriteBool(UseLightInks);
       }
+      if (VMax != 0D) {
+        output.WriteRawTag(113);
+        output.WriteDouble(VMax);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -376,6 +395,9 @@ namespace Tango.PMR.ColorLab {
       if (UseLightInks != false) {
         size += 1 + 1;
       }
+      if (VMax != 0D) {
+        size += 1 + 8;
+      }
       return size;
     }
 
@@ -424,6 +446,9 @@ namespace Tango.PMR.ColorLab {
       if (other.UseLightInks != false) {
         UseLightInks = other.UseLightInks;
       }
+      if (other.VMax != 0D) {
+        VMax = other.VMax;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -489,6 +514,10 @@ namespace Tango.PMR.ColorLab {
             UseLightInks = input.ReadBool();
             break;
           }
+          case 113: {
+            VMax = input.ReadDouble();
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml
index 06dcf7642..efc7fa5fb 100644
Binary files a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml and b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml differ
-- 
cgit v1.3.1


From d7a2713f1ff4679a7b28a90d1622d1dbfdf06aee Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Mon, 1 Feb 2021 12:29:37 +0200
Subject: created new test program to check Light Inks.

---
 .../Tango.MachineStudio.RML/Views/RmlsView.xaml    |   8 +-
 .../Tango.ColorLib.LightInksTest.CLI/App.config    |  14 ++
 .../ColorLibConnector.cs                           |  56 +++++++
 .../Tango.ColorLib.LightInksTest.CLI/Program.cs    | 163 +++++++++++++++++++++
 .../Properties/AssemblyInfo.cs                     |  36 +++++
 .../Sylko_HV_IL350R.cct                            | Bin 0 -> 1660324 bytes
 .../Sylko_HV_IL400Bl95R_1.cct                      | Bin 0 -> 1660328 bytes
 .../Tango.ColorLib.LightInksTest.CLI.csproj        |  83 +++++++++++
 .../packages.config                                |   4 +
 Software/Visual_Studio/Tango.sln                   |  35 ++++-
 10 files changed, 390 insertions(+), 9 deletions(-)
 create mode 100644 Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/App.config
 create mode 100644 Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/ColorLibConnector.cs
 create mode 100644 Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Program.cs
 create mode 100644 Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Properties/AssemblyInfo.cs
 create mode 100644 Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Sylko_HV_IL350R.cct
 create mode 100644 Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Sylko_HV_IL400Bl95R_1.cct
 create mode 100644 Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Tango.ColorLib.LightInksTest.CLI.csproj
 create mode 100644 Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/packages.config

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml
index b1a1f4aa5..b60f2fcf5 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml
@@ -84,10 +84,12 @@
                             <Setter Property="BorderThickness" Value="0"/>
                             <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
                             <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+                            <Setter Property="Padding" Value="4"></Setter>
+                            <Setter Property="Margin" Value="0 5 0 0"></Setter>
                         </Style>
                     </DataGrid.CellStyle>
                     <DataGrid.Columns>
-                        <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="140" />
+                        <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="140"/>
                         <DataGridTextColumn Header="MANUFACTURER" Binding="{Binding Manufacturer}" Width="Auto" />
                         <DataGridTextColumn Header="MATERIAL" Binding="{Binding MediaMaterial.Name}" Width="Auto" />
                         <DataGridTextColumn Header="PURPOSE" Binding="{Binding MediaPurpose.Name}" Width="Auto" />
@@ -97,7 +99,7 @@
                         <DataGridTemplateColumn Header="LIQUID FACTORS" Width="1*">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
-                                    <ItemsControl ItemsSource="{Binding LiquidTypesRmls}" Margin="0 10 0 0">
+                                    <ItemsControl ItemsSource="{Binding LiquidTypesRmls}" Margin="0 -5 0 0">
                                         <ItemsControl.ItemsPanel>
                                             <ItemsPanelTemplate>
                                                 <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
@@ -105,7 +107,7 @@
                                         </ItemsControl.ItemsPanel>
                                         <ItemsControl.ItemTemplate>
                                             <DataTemplate DataType="{x:Type observables:LiquidTypesRml}">
-                                                <Grid Width="47" Height="40" Margin="10 -10 0 0">
+                                                <Grid Width="47" Height="40" Margin="10 0 0 0">
                                                     <shapes:Hexagon StrokeThickness="1" Stroke="Gray">
                                                         <shapes:Hexagon.Fill>
                                                             <LinearGradientBrush Opacity="0.7" >
diff --git a/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/App.config b/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/App.config
new file mode 100644
index 000000000..332e7dbda
--- /dev/null
+++ b/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/App.config
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.5.0" newVersion="5.0.5.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/ColorLibConnector.cs b/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/ColorLibConnector.cs
new file mode 100644
index 000000000..12f6ea162
--- /dev/null
+++ b/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/ColorLibConnector.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Core.Helpers;
+using Tango.PMR;
+using Tango.PMR.ColorLab;
+
+namespace Tango.ColorLib.LightInksTest.CLI
+{
+    public class ColorLibConnector
+    {
+        static class NativeMethods
+        {
+            [DllImport("kernel32.dll")]
+            public static extern IntPtr LoadLibrary(string dllToLoad);
+
+            [DllImport("kernel32.dll")]
+            public static extern IntPtr GetProcAddress(IntPtr hModule, string procedureName);
+
+            [DllImport("kernel32.dll")]
+            public static extern bool FreeLibrary(IntPtr hModule);
+        }
+
+        public ConversionOutput Convert(ConversionInput input)
+        {
+            String fileName = $"{AssemblyHelper.GetCurrentAssemblyFolder()}\\Tango.ColorLib_v4.dll";
+
+            if (!File.Exists(fileName))
+            {
+                throw new FileNotFoundException($"Could not find color conversion library '{fileName}'.");
+            }
+
+            IntPtr pDll = NativeMethods.LoadLibrary(fileName);
+            IntPtr pAddressOfFunctionToCall = NativeMethods.GetProcAddress(pDll, "Convert");
+            NativeMethodDelegate convertorDelegate = (NativeMethodDelegate)Marshal.GetDelegateForFunctionPointer(
+                                                                                        pAddressOfFunctionToCall,
+                                                                                        typeof(NativeMethodDelegate));
+
+            NativePMR<ConversionInput, ConversionOutput> nativePMR = new NativePMR<ConversionInput, ConversionOutput>(convertorDelegate);
+            ConversionOutput output = nativePMR.Invoke(input);
+
+            bool result = NativeMethods.FreeLibrary(pDll);
+
+            if (output.HasError)
+            {
+                throw new ExternalException($"Color Conversion Error: {output.ErrorMessage}!");
+            }
+
+            return output;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Program.cs b/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Program.cs
new file mode 100644
index 000000000..7e6fb2a30
--- /dev/null
+++ b/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Program.cs
@@ -0,0 +1,163 @@
+using Google.Protobuf;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Core.ExtensionMethods;
+using Tango.PMR.ColorLab;
+
+
+namespace Tango.ColorLib.LightInksTest.CLI
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            ColorLibConnector connector = new ColorLibConnector();
+            Console.WriteLine("Press any key to start...");
+            Console.ReadLine();
+            Stopwatch watch = new Stopwatch();
+            watch.Start();
+            Console.WriteLine();
+
+            ConversionInput input = CreateConversionInput( PMR.ColorLab.ColorSpace.Rgb, true);
+            ConversionOutput result =  connector.Convert(input);
+            Console.WriteLine($"Result Convert RGB with LightInk flag TRUE :\n{result.ToJsonString()}");
+            Console.WriteLine();
+
+            input = CreateConversionInput( PMR.ColorLab.ColorSpace.Lab, true);
+            result = connector.Convert(input);
+            Console.WriteLine($"Result Convert LAB with LightInk flag TRUE :\n{result.ToJsonString()}");
+            Console.WriteLine();
+
+            input = CreateConversionInput( PMR.ColorLab.ColorSpace.Rgb, false);
+            result = connector.Convert(input);
+            Console.WriteLine($"Result Convert RGB with LightInk flag FALSE :\n{result.ToJsonString()}");
+            Console.WriteLine();
+
+            input = CreateConversionInput( PMR.ColorLab.ColorSpace.Lab, false);
+            result = connector.Convert(input);
+            Console.WriteLine($"Result Convert LAB with LightInk flag FALSE :\n{result.ToJsonString()}");
+            Console.WriteLine();
+
+            input = CreateConversionInput( PMR.ColorLab.ColorSpace.Catalog, true);
+            result = connector.Convert(input);
+            Console.WriteLine($"Result Convert Catalog with LightInk TRUE :\n{result.ToJsonString()}");
+            Console.WriteLine();
+
+            input = CreateConversionInput( PMR.ColorLab.ColorSpace.Catalog, false);
+            result = connector.Convert(input);
+            Console.WriteLine($"Result Convert Catalog with LightInk flag False :\n{result.ToJsonString()}");
+            Console.WriteLine();
+
+            input = CreateConversionInput( PMR.ColorLab.ColorSpace.Volume, true);
+            result = connector.Convert(input);
+            Console.WriteLine($"Result Convert Volume with LightInk flag True :\n{result.ToJsonString()}");
+            Console.WriteLine();
+
+            input = CreateConversionInput(PMR.ColorLab.ColorSpace.Volume, false);
+            result = connector.Convert(input);
+            Console.WriteLine($"Result Convert Volume with LightInk flag False :\n{result.ToJsonString()}");
+            Console.WriteLine();
+
+
+            watch.Stop();
+            
+            //Console.WriteLine($"Processing completed after: {watch.ElapsedMilliseconds.ToString()} milliseconds.");
+            Console.WriteLine();
+            
+            Console.WriteLine("Press return to exit...");
+            Console.ReadLine();
+        }
+
+        public static ConversionInput CreateConversionInput( PMR.ColorLab.ColorSpace colorSpase, bool useLightInks)
+        {
+            ConversionInput input = new ConversionInput();
+            input.ThreadL = 92.7867;
+            input.ThreadA = -0.2519;
+            input.ThreadB = 0.6968;
+
+            input.ColorSpace = colorSpase;
+            input.InputCoordinates = GetColorInputCoordinates(colorSpase);
+
+            //Process Ranges
+            input.ProcessRanges.Add(new ProcessRange()
+            {
+                MinInkUptake = 200,
+                MaxInkUptake = 200,
+            });
+
+            input.ProcessRanges.Add(new ProcessRange()
+            {
+                MinInkUptake = 200,
+                MaxInkUptake = 400,
+            });
+
+            input.ForwardData = ByteString.CopyFrom(File.ReadAllBytes(@"Sylko_HV_IL350R.cct"));
+
+            //RML Liquid Factors
+            input.InputCoordinates.InputLiquids.Add(new InputLiquid()
+            {
+                LiquidType = LiquidType.Cyan,
+                CalibrationData = BL.Entities.Cat.CreateDemoCalibrationData(LiquidType.Cyan),
+                MaxNanoliterPerCentimeter = 200,
+            });
+
+            input.InputCoordinates.InputLiquids.Add(new InputLiquid()
+            {
+                LiquidType = LiquidType.Magenta,
+                CalibrationData = BL.Entities.Cat.CreateDemoCalibrationData(LiquidType.Magenta),
+                MaxNanoliterPerCentimeter = 200,
+            });
+
+            input.InputCoordinates.InputLiquids.Add(new InputLiquid()
+            {
+                LiquidType = LiquidType.Yellow,
+                CalibrationData = BL.Entities.Cat.CreateDemoCalibrationData(LiquidType.Yellow),
+                MaxNanoliterPerCentimeter = 200,
+            });
+
+            input.InputCoordinates.InputLiquids.Add(new InputLiquid()
+            {
+                LiquidType = LiquidType.Black,
+                CalibrationData = BL.Entities.Cat.CreateDemoCalibrationData(LiquidType.Black),
+                MaxNanoliterPerCentimeter = 200,
+            });
+            input.GenerateHive = false;
+            input.UseLightInks = useLightInks;
+            input.VMax = 5;
+            return input;
+        }
+
+        public static InputCoordinates GetColorInputCoordinates(PMR.ColorLab.ColorSpace colorSpase)
+        {
+            InputCoordinates inputCoordinates = new InputCoordinates();
+
+            if (colorSpase == PMR.ColorLab.ColorSpace.Rgb)
+            {
+                inputCoordinates.Red = 20;
+                inputCoordinates.Green = 120;
+                inputCoordinates.Blue = 180;
+            }
+            else if (colorSpase == PMR.ColorLab.ColorSpace.Lab)
+            {
+                inputCoordinates.L = 50; ;
+                inputCoordinates.A = -90;
+                inputCoordinates.B = -30;
+            }
+            else if (colorSpase == PMR.ColorLab.ColorSpace.Cmyk)
+            {
+                inputCoordinates.Cyan = 50;
+                inputCoordinates.Magenta = 20;
+                inputCoordinates.Yellow =80;
+                inputCoordinates.Key = 10;
+            }
+
+            return inputCoordinates;
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..97d5aa9f2
--- /dev/null
+++ b/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Tango.ColorLib.LightInksTest.CLI")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Tango.ColorLib.LightInksTest.CLI")]
+[assembly: AssemblyCopyright("Copyright ©  2021")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("70dd08ca-3bd1-43d6-84ff-2db8a192c315")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Sylko_HV_IL350R.cct b/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Sylko_HV_IL350R.cct
new file mode 100644
index 000000000..d164d7c84
Binary files /dev/null and b/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Sylko_HV_IL350R.cct differ
diff --git a/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Sylko_HV_IL400Bl95R_1.cct b/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Sylko_HV_IL400Bl95R_1.cct
new file mode 100644
index 000000000..5802a14eb
Binary files /dev/null and b/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Sylko_HV_IL400Bl95R_1.cct differ
diff --git a/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Tango.ColorLib.LightInksTest.CLI.csproj b/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Tango.ColorLib.LightInksTest.CLI.csproj
new file mode 100644
index 000000000..a618cfb44
--- /dev/null
+++ b/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Tango.ColorLib.LightInksTest.CLI.csproj
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{70DD08CA-3BD1-43D6-84FF-2DB8A192C315}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Tango.ColorLib.LightInksTest.CLI</RootNamespace>
+    <AssemblyName>Tango.ColorLib.LightInksTest.CLI</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ColorLibConnector.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="Sylko_HV_IL350R.cct">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Sylko_HV_IL400Bl95R_1.cct" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\Build\ColorLib\Debug\Tango.ColorLib_v4.dll">
+      <Link>Tango.ColorLib_v4.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Google.Protobuf">
+      <Version>3.4.1</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Tango.BL\Tango.BL.csproj">
+      <Project>{f441feee-322a-4943-b566-110e12fd3b72}</Project>
+      <Name>Tango.BL</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Tango.Core\Tango.Core.csproj">
+      <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
+      <Name>Tango.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Tango.PMR\Tango.PMR.csproj">
+      <Project>{e4927038-348d-4295-aaf4-861c58cb3943}</Project>
+      <Name>Tango.PMR</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/packages.config b/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/packages.config
new file mode 100644
index 000000000..fa3c0d58d
--- /dev/null
+++ b/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Google.Protobuf" version="3.4.1" targetFramework="net461" />
+</packages>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln
index 655c00e56..c2bb2f26b 100644
--- a/Software/Visual_Studio/Tango.sln
+++ b/Software/Visual_Studio/Tango.sln
@@ -461,6 +461,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.StubsUtils.ProcedureC
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.CsvToJobTester.CLI", "Utilities\Tango.CsvToJobTester.CLI\Tango.CsvToJobTester.CLI.csproj", "{4747A2DE-F419-41B1-95A7-E9FBB4EA0B3B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.ColorLib.LightInksTest.CLI", "Tango.ColorLib.LightInksTest.CLI\Tango.ColorLib.LightInksTest.CLI.csproj", "{70DD08CA-3BD1-43D6-84FF-2DB8A192C315}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -4376,6 +4378,26 @@ Global
 		{4747A2DE-F419-41B1-95A7-E9FBB4EA0B3B}.Release|x64.Build.0 = Release|Any CPU
 		{4747A2DE-F419-41B1-95A7-E9FBB4EA0B3B}.Release|x86.ActiveCfg = Release|Any CPU
 		{4747A2DE-F419-41B1-95A7-E9FBB4EA0B3B}.Release|x86.Build.0 = Release|Any CPU
+		{70DD08CA-3BD1-43D6-84FF-2DB8A192C315}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70DD08CA-3BD1-43D6-84FF-2DB8A192C315}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70DD08CA-3BD1-43D6-84FF-2DB8A192C315}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{70DD08CA-3BD1-43D6-84FF-2DB8A192C315}.Debug|ARM.Build.0 = Debug|Any CPU
+		{70DD08CA-3BD1-43D6-84FF-2DB8A192C315}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{70DD08CA-3BD1-43D6-84FF-2DB8A192C315}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{70DD08CA-3BD1-43D6-84FF-2DB8A192C315}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{70DD08CA-3BD1-43D6-84FF-2DB8A192C315}.Debug|x64.Build.0 = Debug|Any CPU
+		{70DD08CA-3BD1-43D6-84FF-2DB8A192C315}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{70DD08CA-3BD1-43D6-84FF-2DB8A192C315}.Debug|x86.Build.0 = Debug|Any CPU
+		{70DD08CA-3BD1-43D6-84FF-2DB8A192C315}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{70DD08CA-3BD1-43D6-84FF-2DB8A192C315}.Release|Any CPU.Build.0 = Release|Any CPU
+		{70DD08CA-3BD1-43D6-84FF-2DB8A192C315}.Release|ARM.ActiveCfg = Release|Any CPU
+		{70DD08CA-3BD1-43D6-84FF-2DB8A192C315}.Release|ARM.Build.0 = Release|Any CPU
+		{70DD08CA-3BD1-43D6-84FF-2DB8A192C315}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{70DD08CA-3BD1-43D6-84FF-2DB8A192C315}.Release|ARM64.Build.0 = Release|Any CPU
+		{70DD08CA-3BD1-43D6-84FF-2DB8A192C315}.Release|x64.ActiveCfg = Release|Any CPU
+		{70DD08CA-3BD1-43D6-84FF-2DB8A192C315}.Release|x64.Build.0 = Release|Any CPU
+		{70DD08CA-3BD1-43D6-84FF-2DB8A192C315}.Release|x86.ActiveCfg = Release|Any CPU
+		{70DD08CA-3BD1-43D6-84FF-2DB8A192C315}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -4538,14 +4560,15 @@ Global
 		{5C9A4F46-263D-4C23-B361-F09E14BB109E} = {4A8BD6EC-41CF-46A9-B2CD-9D0DF6465963}
 		{8F0BCFC8-AF0F-40D3-882A-902CD221A6DE} = {4A8BD6EC-41CF-46A9-B2CD-9D0DF6465963}
 		{4747A2DE-F419-41B1-95A7-E9FBB4EA0B3B} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760}
+		{70DD08CA-3BD1-43D6-84FF-2DB8A192C315} = {8336A702-9C49-4C9E-ADCC-1886A666D3BD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6}
-		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
-		BuildVersion_UpdateAssemblyVersion = True
-		BuildVersion_UpdateFileVersion = False
-		BuildVersion_StartDate = 2000/1/1
-		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
 		BuildVersion_UseGlobalSettings = False
+		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
+		BuildVersion_StartDate = 2000/1/1
+		BuildVersion_UpdateFileVersion = False
+		BuildVersion_UpdateAssemblyVersion = True
+		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
+		SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6}
 	EndGlobalSection
 EndGlobal
-- 
cgit v1.3.1


From 0a1203a500d309ff2a2a20e5643d3f85c7c6d3a9 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Tue, 2 Feb 2021 17:06:33 +0200
Subject: Test - set CMYK colors for Catalog ColorSpace. RMLsView -remove text
 from color hexagon and reduce size.

---
 .../ColorLib/Tango.ColorLib_v4/ColorConverter.cpp  | 37 +++++++++++++++++++---
 .../Tango.MachineStudio.RML/Views/RmlsView.xaml    |  4 +--
 .../Tango.ColorLib.LightInksTest.CLI/Program.cs    |  7 ++--
 .../Tango.ColorLib.OutOfGamutTest.CLI/Program.cs   |  7 ++--
 4 files changed, 42 insertions(+), 13 deletions(-)

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

diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp
index 572d37dac..e1d720371 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp
@@ -22,6 +22,7 @@
 #include <algorithm>  
 #include <sstream>
 #include<vector>
+#include <map>
 
 #include "GradientConversionInput.pb-c.h"
 #include "GradientConversionOutput.pb-c.h"
@@ -2143,9 +2144,37 @@ void Tango::ColorLib::ColorConverter::CountNumberofInks(RecommendedProcessTableI
 void Tango::ColorLib::ColorConverter::CountNumberofInks(ConversionInput* conversionInput, int &numInks, int &numLightInks)
 {
 	int nLiquids = conversionInput->inputcoordinates->n_inputliquids;
-	//	int numberofInks = 0;
-		//Cyan
-	int nCyan = 0;
+	std::map< LiquidType, int> liquidsToCountMap;
+	std::map< LiquidType, int> lightLiquidsToCountMap;
+	numInks = -1;
+	numLightInks = -1;
+	for (int i = 0; i < nLiquids; ++i)
+	{
+		LiquidType liquidType = conversionInput->inputcoordinates->inputliquids[i]->liquidtype;
+		if (liquidType == LiquidType::LIQUID_TYPE__LightCyan || liquidType == LiquidType::LIQUID_TYPE__LightMagenta || liquidType == LiquidType::LIQUID_TYPE__LightYellow)
+		{
+			if (lightLiquidsToCountMap.find(liquidType) == lightLiquidsToCountMap.end())
+			{
+				lightLiquidsToCountMap[liquidType] = 1;
+			}
+			else {
+				return;
+			}
+		}
+		else if(liquidType == LiquidType::LIQUID_TYPE__Cyan || liquidType == LiquidType::LIQUID_TYPE__Magenta || liquidType == LiquidType::LIQUID_TYPE__Yellow || liquidType == LiquidType::LIQUID_TYPE__Black)
+		{
+			if (liquidsToCountMap.find(liquidType) == liquidsToCountMap.end())
+			{
+				liquidsToCountMap[liquidType] = 1;
+			}
+			else {
+				return;
+			}
+		}
+	}
+	numInks = liquidsToCountMap.size() + lightLiquidsToCountMap.size();
+	numLightInks = lightLiquidsToCountMap.size();
+	/*int nCyan = 0;
 	for (int i = 0; i < nLiquids; ++i)
 	{
 		if (conversionInput->inputcoordinates->inputliquids[i]->liquidtype == LIQUID_TYPE__Cyan)
@@ -2230,7 +2259,7 @@ void Tango::ColorLib::ColorConverter::CountNumberofInks(ConversionInput* convers
 		return;
 	}
 	numInks = nCyan + nMagenta + nYellow + nBlack + nLightCyan + nLightMagenta + nLightYellow;
-	numLightInks = nLightCyan + nLightMagenta + nLightYellow;;
+	numLightInks = nLightCyan + nLightMagenta + nLightYellow;;*/
 	return;
 }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml
index b60f2fcf5..fd05ee28e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml
@@ -107,7 +107,7 @@
                                         </ItemsControl.ItemsPanel>
                                         <ItemsControl.ItemTemplate>
                                             <DataTemplate DataType="{x:Type observables:LiquidTypesRml}">
-                                                <Grid Width="47" Height="40" Margin="10 0 0 0">
+                                                <Grid Width="35" Height="32" Margin="10 0 0 0">
                                                     <shapes:Hexagon StrokeThickness="1" Stroke="Gray">
                                                         <shapes:Hexagon.Fill>
                                                             <LinearGradientBrush Opacity="0.7" >
@@ -116,8 +116,6 @@
                                                             </LinearGradientBrush>
                                                         </shapes:Hexagon.Fill>
                                                     </shapes:Hexagon>
-
-                                                    <TextBlock FontSize="8" Width="40" TextTrimming="CharacterEllipsis" TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center" Background="Transparent" Foreground="{StaticResource Hexagon.ForegroundBrush}" Text="{Binding LiquidType.Name}" FontStyle="Italic"></TextBlock>
                                                 </Grid>
                                             </DataTemplate>
                                         </ItemsControl.ItemTemplate>
diff --git a/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Program.cs b/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Program.cs
index 5d7d6ffae..3c9a128ed 100644
--- a/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Program.cs
+++ b/Software/Visual_Studio/Tango.ColorLib.LightInksTest.CLI/Program.cs
@@ -17,8 +17,8 @@ namespace Tango.ColorLib.LightInksTest.CLI
         static void Main(string[] args)
         {
             ColorLibConnector connector = new ColorLibConnector();
-            Console.WriteLine("Press any key to start...");
-            Console.ReadLine();
+            //Console.WriteLine("Press any key to start...");
+            //Console.ReadLine();
             Stopwatch watch = new Stopwatch();
             watch.Start();
             Console.WriteLine();
@@ -179,6 +179,7 @@ namespace Tango.ColorLib.LightInksTest.CLI
                     MaxNanoliterPerCentimeter = 200,
                 });
             }
+
             input.GenerateHive = false;
             input.UseLightInks = useLightInks;
             input.VMax = 5;
@@ -201,7 +202,7 @@ namespace Tango.ColorLib.LightInksTest.CLI
                 inputCoordinates.A = -90;
                 inputCoordinates.B = -30;
             }
-            else if (colorSpase == PMR.ColorLab.ColorSpace.Cmyk)
+            else if (colorSpase == PMR.ColorLab.ColorSpace.Cmyk || colorSpase == PMR.ColorLab.ColorSpace.Catalog)
             {
                 inputCoordinates.Cyan = 50;
                 inputCoordinates.Magenta = 20;
diff --git a/Software/Visual_Studio/Tango.ColorLib.OutOfGamutTest.CLI/Program.cs b/Software/Visual_Studio/Tango.ColorLib.OutOfGamutTest.CLI/Program.cs
index 0469d8518..edb94bc60 100644
--- a/Software/Visual_Studio/Tango.ColorLib.OutOfGamutTest.CLI/Program.cs
+++ b/Software/Visual_Studio/Tango.ColorLib.OutOfGamutTest.CLI/Program.cs
@@ -288,7 +288,7 @@ namespace Tango.ColorLib.OutOfGamutTest.CLI
             //        Volume = _s_random.Next(0, 100)
             //    });
             //}
-            //else
+            else if (colorSpase == PMR.ColorLab.ColorSpace.Catalog || colorSpase == ColorSpace.Cmyk)
             {
                 inputCoordinates.Cyan = _s_random.Next(0, 100);
                 inputCoordinates.Magenta = _s_random.Next(0, 100);
@@ -317,7 +317,7 @@ namespace Tango.ColorLib.OutOfGamutTest.CLI
                 input.A = _s_random.Next(-128, 128);
                 input.B = _s_random.Next(-128, 128);
             }
-            else if(colorSpase == PMR.ColorLab.ColorSpace.Catalog || colorSpase == ColorSpace.Volume)
+            else if(colorSpase == ColorSpace.Volume)
             {
                 input.LiquidVolumes.Add(new LiquidVolume()
                 {
@@ -340,7 +340,8 @@ namespace Tango.ColorLib.OutOfGamutTest.CLI
                     Volume = _s_random.Next(0, 100)
                 });
             }
-            else{
+            else if(colorSpase == PMR.ColorLab.ColorSpace.Catalog || colorSpase == ColorSpace.Cmyk)
+            { 
                 input.Cyan = _s_random.Next(0, 100);
                 input.Magenta = _s_random.Next(0, 100);
                 input.Yellow = _s_random.Next(0, 100);
-- 
cgit v1.3.1