Added Extra Inks + Color Blending + MS Handling.

Removed Violet Impl.
Updated Inks LAB.

2 files changed, 94 insertions, 115 deletions

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 c3816e93f..a86707319 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
@@ -243,7 +243,8 @@
                 </StackPanel>
             </StackPanel>
 
-            <ItemsControl ItemsSource="{Binding LiquidVolumes}" VerticalAlignment="Center" MinWidth="420" >
+            <Viewbox MaxHeight="80" HorizontalAlignment="Right">
+                <ItemsControl ItemsSource="{Binding LiquidVolumes}" VerticalAlignment="Center">
                 <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
                         <StackPanel VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
@@ -267,6 +268,7 @@
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
+            </Viewbox>
             <Image Source="../Images/arrow-long-down.png" Grid.Column="1" Grid.Row="1" Margin="0 0 10 -170" Height="70" Width="40" Opacity="0.8" Stretch="Fill" HorizontalAlignment="Right" ></Image>
 
             <TextBlock FontSize="14" FontWeight="SemiBold" FontStyle="Italic" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 15">
@@ -284,30 +286,32 @@
                 </StackPanel>
             </StackPanel>
 
-            <ItemsControl ItemsSource="{Binding LiquidVolumes}" VerticalAlignment="Center" MinWidth="420" IsEnabled="{Binding IsFree}">
-                <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <StackPanel VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
-                    </ItemsPanelTemplate>
-                </ItemsControl.ItemsPanel>
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <StackPanel>
-                            <TextBlock HorizontalAlignment="Center" TextAlignment="Center" Text="{Binding Name}" FontSize="10" Margin="0 0 0 5"></TextBlock>
-                            <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Width="60" Height="60" Margin="10 0 0 0">
-                                <ContentControl.Foreground>
-                                    <SolidColorBrush Color="{Binding Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
-                                </ContentControl.Foreground>
-                                <mahapps:NumericUpDown FontSize="16" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.00" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
-                                    <!--<mahapps:NumericUpDown.Resources>
+            <Viewbox MaxHeight="80" HorizontalAlignment="Right">
+                <ItemsControl ItemsSource="{Binding LiquidVolumes}" VerticalAlignment="Center" IsEnabled="{Binding IsFree}">
+                    <ItemsControl.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <StackPanel VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
+                        </ItemsPanelTemplate>
+                    </ItemsControl.ItemsPanel>
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <StackPanel>
+                                <TextBlock HorizontalAlignment="Center" TextAlignment="Center" Text="{Binding Name}" FontSize="10" Margin="0 0 0 5"></TextBlock>
+                                <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Width="60" Height="60" Margin="10 0 0 0">
+                                    <ContentControl.Foreground>
+                                        <SolidColorBrush Color="{Binding Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
+                                    </ContentControl.Foreground>
+                                    <mahapps:NumericUpDown FontSize="16" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.00" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                        <!--<mahapps:NumericUpDown.Resources>
                                                         <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
                                                     </mahapps:NumericUpDown.Resources>-->
-                                </mahapps:NumericUpDown>
-                            </ContentControl>
-                        </StackPanel>
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
+                                    </mahapps:NumericUpDown>
+                                </ContentControl>
+                            </StackPanel>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </Viewbox>
         </StackPanel>
 
 
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 cdacbae60..8447a3899 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
@@ -227,107 +227,82 @@
                                         <Grid DockPanel.Dock="Top" Background="#35B5B5B5" Margin="20 0">
                                             <ScrollViewer HorizontalScrollBarVisibility="Disabled">
                                                 <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                                                <Grid>
-                                                    <StackPanel Orientation="Vertical" HorizontalAlignment="Left">
-                                                        <Image Source="../Images/data-table.png" Height="20" Opacity="0.8" ></Image>
-                                                        <StackPanel VerticalAlignment="Center" Margin="5 20 5 10">
+                                                    <Grid>
+                                                        <StackPanel Orientation="Vertical" HorizontalAlignment="Left">
+                                                            <Image Source="../Images/data-table.png" Height="20" Opacity="0.8" ></Image>
+                                                            <StackPanel VerticalAlignment="Center" Margin="5 20 5 10">
 
-                                                            <StackPanel>
                                                                 <StackPanel>
-                                                                    <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="Center">
-                                                                        <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ImportForwardDataCommand}">
-                                                                            <StackPanel Orientation="Horizontal" Margin="0 0 20 0">
-                                                                                <materialDesign:PackIcon Kind="Upload" VerticalAlignment="Center" />
-                                                                                <TextBlock Margin="5 0 0 0">IMPORT</TextBlock>
-                                                                            </StackPanel>
-                                                                        </Button>
-                                                                        <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ExportForwardDataCommand}">
-                                                                            <StackPanel Orientation="Horizontal">
-                                                                                <materialDesign:PackIcon Kind="Download" VerticalAlignment="Center" />
-                                                                                <TextBlock Margin="5 0 0 0">EXPORT</TextBlock>
-                                                                            </StackPanel>
-                                                                        </Button>
-                                                                    </UniformGrid>
-                                                                </StackPanel>
+                                                                    <StackPanel>
+                                                                        <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="Center">
+                                                                            <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ImportForwardDataCommand}">
+                                                                                <StackPanel Orientation="Horizontal" Margin="0 0 20 0">
+                                                                                    <materialDesign:PackIcon Kind="Upload" VerticalAlignment="Center" />
+                                                                                    <TextBlock Margin="5 0 0 0">IMPORT</TextBlock>
+                                                                                </StackPanel>
+                                                                            </Button>
+                                                                            <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ExportForwardDataCommand}">
+                                                                                <StackPanel Orientation="Horizontal">
+                                                                                    <materialDesign:PackIcon Kind="Download" VerticalAlignment="Center" />
+                                                                                    <TextBlock Margin="5 0 0 0">EXPORT</TextBlock>
+                                                                                </StackPanel>
+                                                                            </Button>
+                                                                        </UniformGrid>
+                                                                    </StackPanel>
 
-                                                                <StackPanel>
-                                                                    <ComboBox materialDesign:HintAssist.Hint="No GBD Defined" Margin="0 5 0 0" HorizontalContentAlignment="Center" ItemsSource="{Binding GBDS}" SelectedItem="{Binding SelectedGBD}" DisplayMemberPath="FileName" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
-                                                                    <UniformGrid Columns="2" Margin="0 5 0 0" HorizontalAlignment="Center">
-                                                                        <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ImportGBDCommand}">
-                                                                            <StackPanel Orientation="Horizontal" Margin="0 0 20 0">
-                                                                                <materialDesign:PackIcon Kind="Upload" VerticalAlignment="Center" />
-                                                                                <TextBlock Margin="5 0 0 0">IMPORT</TextBlock>
-                                                                            </StackPanel>
-                                                                        </Button>
-                                                                        <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ExportGBDCommand}">
-                                                                            <StackPanel Orientation="Horizontal">
-                                                                                <materialDesign:PackIcon Kind="Download" VerticalAlignment="Center" />
-                                                                                <TextBlock Margin="5 0 0 0">EXPORT</TextBlock>
-                                                                            </StackPanel>
-                                                                        </Button>
-                                                                    </UniformGrid>
-                                                                </StackPanel>
+                                                                    <StackPanel>
+                                                                        <ComboBox materialDesign:HintAssist.Hint="No GBD Defined" Margin="0 5 0 0" HorizontalContentAlignment="Center" ItemsSource="{Binding GBDS}" SelectedItem="{Binding SelectedGBD}" DisplayMemberPath="FileName" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
+                                                                        <UniformGrid Columns="2" Margin="0 5 0 0" HorizontalAlignment="Center">
+                                                                            <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ImportGBDCommand}">
+                                                                                <StackPanel Orientation="Horizontal" Margin="0 0 20 0">
+                                                                                    <materialDesign:PackIcon Kind="Upload" VerticalAlignment="Center" />
+                                                                                    <TextBlock Margin="5 0 0 0">IMPORT</TextBlock>
+                                                                                </StackPanel>
+                                                                            </Button>
+                                                                            <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ExportGBDCommand}">
+                                                                                <StackPanel Orientation="Horizontal">
+                                                                                    <materialDesign:PackIcon Kind="Download" VerticalAlignment="Center" />
+                                                                                    <TextBlock Margin="5 0 0 0">EXPORT</TextBlock>
+                                                                                </StackPanel>
+                                                                            </Button>
+                                                                        </UniformGrid>
+                                                                    </StackPanel>
 
-                                                                <StackPanel>
-                                                                    <ComboBox materialDesign:HintAssist.Hint="No LUB Defined" Margin="0 5 0 0" HorizontalContentAlignment="Center" ItemsSource="{Binding LUBS}" SelectedItem="{Binding SelectedLUB}" DisplayMemberPath="FileName" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
-                                                                    <UniformGrid Columns="2" Margin="0 5 0 0" HorizontalAlignment="Center">
-                                                                        <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ImportLUBCommand}">
-                                                                            <StackPanel Orientation="Horizontal" Margin="0 0 20 0">
-                                                                                <materialDesign:PackIcon Kind="Upload" VerticalAlignment="Center" />
-                                                                                <TextBlock Margin="5 0 0 0">IMPORT</TextBlock>
-                                                                            </StackPanel>
-                                                                        </Button>
-                                                                        <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ExportLUBCommand}">
-                                                                            <StackPanel Orientation="Horizontal">
-                                                                                <materialDesign:PackIcon Kind="Download" VerticalAlignment="Center" />
-                                                                                <TextBlock Margin="5 0 0 0">EXPORT</TextBlock>
-                                                                            </StackPanel>
-                                                                        </Button>
-                                                                    </UniformGrid>
+                                                                    <StackPanel>
+                                                                        <ComboBox materialDesign:HintAssist.Hint="No LUB Defined" Margin="0 5 0 0" HorizontalContentAlignment="Center" ItemsSource="{Binding LUBS}" SelectedItem="{Binding SelectedLUB}" DisplayMemberPath="FileName" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
+                                                                        <UniformGrid Columns="2" Margin="0 5 0 0" HorizontalAlignment="Center">
+                                                                            <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ImportLUBCommand}">
+                                                                                <StackPanel Orientation="Horizontal" Margin="0 0 20 0">
+                                                                                    <materialDesign:PackIcon Kind="Upload" VerticalAlignment="Center" />
+                                                                                    <TextBlock Margin="5 0 0 0">IMPORT</TextBlock>
+                                                                                </StackPanel>
+                                                                            </Button>
+                                                                            <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ExportLUBCommand}">
+                                                                                <StackPanel Orientation="Horizontal">
+                                                                                    <materialDesign:PackIcon Kind="Download" VerticalAlignment="Center" />
+                                                                                    <TextBlock Margin="5 0 0 0">EXPORT</TextBlock>
+                                                                                </StackPanel>
+                                                                            </Button>
+                                                                        </UniformGrid>
+                                                                    </StackPanel>
                                                                 </StackPanel>
-                                                            </StackPanel>
-
-                                                            <TextBlock Margin="0 20 0 0" Text="Color Conversion Version:" HorizontalAlignment="Center"></TextBlock>
-                                                            <mahapps:NumericUpDown Minimum="1" Maximum="6" 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 10 0 0">Use Light Inks</CheckBox>
-                                                            <CheckBox ToolTip="Use lubricant transformation when converting to liquid volumes" IsChecked="{Binding ActiveRML.UseLubricantTransform}" HorizontalAlignment="Left" Margin="0 10 0 0">Use Lubricant Transform</CheckBox>
+                                                                <TextBlock Margin="0 20 0 0" Text="Color Conversion Version:" HorizontalAlignment="Center"></TextBlock>
+                                                                <mahapps:NumericUpDown Minimum="1" Maximum="6" Value="{Binding ActiveRML.ColorConversionVersion}" HorizontalContentAlignment="Center" Background="Transparent" BorderBrush="{StaticResource DimGrayBrush}" HasDecimals="False" Margin="0 5 0 0" />
 
-                                                            <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>
+                                                                <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 10 0 0">Use Light Inks</CheckBox>
+                                                                <CheckBox ToolTip="Use lubricant transformation when converting to liquid volumes" IsChecked="{Binding ActiveRML.UseLubricantTransform}" HorizontalAlignment="Left" Margin="0 10 0 0">Use Lubricant Transform</CheckBox>
 
-                                                                <Separator Margin="0 40 0 0" Foreground="Cyan" Background="Violet" Height="2" />
-                                                                <TextBlock Margin="0 10 0 0" Text="CMYKV Prediction Type" FontSize="10"></TextBlock>
-                                                                <ComboBox Margin="0 5 0 0" Style="{StaticResource TransparentComboBoxStyle}" ItemsSource="{Binding Source={x:Type enumerations:CMYKVPredictionTypes},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding ActiveRML.PredictionType}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"></ComboBox>
-
-                                                                <StackPanel Visibility="{Binding ActiveRML.PredictionType,Converter={StaticResource EnumToVisibilityConverter},ConverterParameter='Predict_CMYKV,Predict_RGB,PredictAll'}">
-                                                                    <TextBlock Margin="0 20 0 0" Text="CMYKV Prediction Method" FontSize="10"></TextBlock>
-                                                                    <ComboBox Margin="0 5 0 0" Style="{StaticResource TransparentComboBoxStyle}" ItemsSource="{Binding Source={x:Type enumerations:CMYKVPredictionMethods},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding ActiveRML.PredictionMethod}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"></ComboBox>
-
-                                                                    <StackPanel Margin="0 20 0 0" Visibility="{Binding ActiveRML.PredictionMethod,Converter={StaticResource EnumToVisibilityConverter},ConverterParameter='KNearestNeighbors'}">
-                                                                            <TextBlock FontSize="10" Text="K-Value:"></TextBlock>
-                                                                            <mahapps:NumericUpDown Minimum="5" Maximum="1000" Value="{Binding ActiveRML.KNearestK}" HorizontalContentAlignment="Center" Background="Transparent" BorderBrush="{StaticResource DimGrayBrush}" HasDecimals="False" Margin="0 5 0 0" />
-                                                                    </StackPanel>
-
-                                                                    <TextBlock FontSize="10" Margin="0 20 0 0" Text="Hue Threshold:"></TextBlock>
-                                                                    <mahapps:NumericUpDown Minimum="0" Maximum="360" Value="{Binding ActiveRML.CmykvHueThreshold}" HorizontalContentAlignment="Center" Background="Transparent" BorderBrush="{StaticResource DimGrayBrush}" HasDecimals="True" Margin="0 5 0 0" />
-                                                                </StackPanel>
-
-                                                                <StackPanel Visibility="{Binding ActiveRML.PredictionType,Converter={StaticResource EnumToVisibilityConverter},ConverterParameter='SimpleRGBPreview'}">
-                                                                    <TextBlock FontSize="10" Margin="0 20 0 0">
-                                                                        <Run>Blending Factor:</Run>
-                                                                        <Run Text="{Binding ActiveRML.SimpleRgbPreviewFactor,StringFormat=N2,Mode=OneWay}"></Run>
-                                                                    </TextBlock>
-                                                                    <Slider Minimum="0.1" Maximum="1" Value="{Binding ActiveRML.SimpleRgbPreviewFactor}" Margin="0 5 0 0" SmallChange="0.01" />                                                                    
-                                                                </StackPanel>
+                                                                <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>
-                                            </StackPanel>
+                                                        </StackPanel>
+                                                    </Grid>
+                                                </StackPanel>
                                             </ScrollViewer>
                                         </Grid>
                                     </DockPanel>