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.

---
 .../Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs   | 4 ++--
 .../Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs    | 2 ++
 .../Modules/Tango.MachineStudio.RML/Views/ColorConversionView.xaml | 4 ++--
 .../Modules/Tango.MachineStudio.RML/Views/RmlView.xaml             | 7 ++++---
 4 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index e3547c568..ea9470bb1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -263,7 +263,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             _machines_action_timer = new ActionTimer(TimeSpan.FromMilliseconds(200));
             _dispensers_action_timer = new ActionTimer(TimeSpan.FromMilliseconds(200));
 
-            AddIdsCommand = new RelayCommand(AddIds, (x) => ActiveMachine != null && ActiveMachine.Configuration != null && ActiveMachine.Configuration.IdsPacks.Count < 8);
+            AddIdsCommand = new RelayCommand(AddIds, (x) => ActiveMachine != null && ActiveMachine.Configuration != null && ActiveMachine.Configuration.IdsPacks.Count < 9);
             RemoveIdsCommand = new RelayCommand(RemoveIds, (x) => SelectedIds != null);
             EditMachineCommand = new RelayCommand(() => LoadSelectedMachine(), () => SelectedMachine != null);
             BackToMachinesCommand = new RelayCommand(() => View.NavigateTo(MachineDesignerNavigationView.MachinesView));
@@ -546,7 +546,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
                     if ((newMachine || clone) && machineCreationDialogVM.GenerateDispensers)
                     {
-                        for (int i = 0; i < 8; i++)
+                        for (int i = 0; i < 9; i++)
                         {
                             var serial = machineCreationDialogVM.SerialNumber + "-" + (i + 1);
 
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 95de19f42..fb9a246ce 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
@@ -217,6 +217,8 @@ namespace Tango.MachineStudio.RML.ViewModels
                     input.ThreadA = RML.WhitePointA;
                     input.ThreadB = RML.WhitePointB;
 
+                    input.UseLightInks = RML.UseLightInks;
+
                     //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/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