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.

---
 .../Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs  | 1 +
 .../Modules/Tango.MachineStudio.RML/Views/RmlView.xaml           | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

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

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>
-- 
cgit v1.3.1