From 439029c0228ec639013502d4094361f80f836c5d Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Wed, 18 Sep 2019 12:07:19 +0300
Subject: Dropped dependencies of ColorLab module. Implemented ColorConversion
 view and view model. Refactored Machine Designer "Color Calibration" Tab.

---
 .../ViewModels/ColorConversionViewVM.cs            |    3 -
 .../Tango.MachineStudio.RML/ViewModels/RgbVM.cs    |    2 +-
 .../Views/CalibrationDataView.xaml                 |    2 +-
 .../Views/ColorConversionView.xaml                 | 1013 ++++++--------------
 .../Tango.MachineStudio.RML/Views/RmlView.xaml     |   13 +-
 5 files changed, 332 insertions(+), 701 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 2624c9b7d..735f75ab0 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
@@ -174,9 +174,6 @@ namespace Tango.MachineStudio.RML.ViewModels
         public ColorConversionViewVM(INotificationProvider notification)
         {
             _notification = notification;
-
-            // CCT = new Cct();
-
             SourceColor = new RgbVM();
             SourceColor.ColorChanged += SourceColor_ColorChanged;
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/RgbVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/RgbVM.cs
index e64592aae..18e6d4fca 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/RgbVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/RgbVM.cs
@@ -24,7 +24,7 @@ namespace Tango.MachineStudio.RML.ViewModels
             _color_change_timer.Tick += _color_change_timer_Tick;
             _color_change_timer.Stop();
 
-            Color = Colors.DimGray;
+            _color = Colors.DimGray;
         }
 
         private void _color_change_timer_Tick(object sender, EventArgs e)
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/CalibrationDataView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/CalibrationDataView.xaml
index 54e96017c..824ed7495 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/CalibrationDataView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/CalibrationDataView.xaml
@@ -53,7 +53,7 @@
                                     <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
                                         <Setter Property="BorderThickness" Value="0"/>
                                         <Setter Property="HorizontalContentAlignment" Value="Left"></Setter>
-                                        <Setter Property="FlowDirection" Value="RightToLeft"></Setter>
+                                        <Setter Property="HorizontalAlignment" Value="Left"></Setter>
                                         <Setter Property="Foreground" Value="{StaticResource BlackForegroundBrush}"></Setter>
                                     </Style>
                                 </DataGrid.CellStyle>
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 ed27c1760..912ec3b0a 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
@@ -28,745 +28,370 @@
         <converters:BooleanInverseConverter x:Key="BooleanInverseConverter" />
         <converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter" />
     </UserControl.Resources>
-    <Grid>
-        <DockPanel>
-            <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="20 0" Padding="5" CornerRadius="5">
-                <Border.Effect>
-                    <DropShadowEffect Opacity="0.4" />
-                </Border.Effect>
-                <Grid>
-                    <TextBlock HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">COLOR CONVERSION</TextBlock>
-                </Grid>
-            </Border>
-            <Grid DockPanel.Dock="Top" x:Name="ColorCalibrationGrid" Margin="80,20,20,20">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="250" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="1*" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="20" />
-                    <RowDefinition/>
-                    <RowDefinition Height="30" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <Grid.Resources>
-                    <Style TargetType="TextBlock" >
-                        <Setter Property="Foreground" Value="{StaticResource JobFieldForeground}"/>
-                    </Style>
-                </Grid.Resources>
-
-                <Grid Grid.Row="1">
-
-                    <StackPanel Orientation="Vertical" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="-60 35 0 0">
-                        <RadioButton IsChecked="{Binding SourceColor.IsLab,Converter={StaticResource BooleanInverseConverter}}">RGB</RadioButton>
-                        <RadioButton Margin="0 10 0 0" IsChecked="{Binding SourceColor.IsLab}">LAB</RadioButton>
+    <Grid DockPanel.Dock="Top" x:Name="ColorCalibrationGrid" Margin="80,20,20,20">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="250" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="1*" />
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="20" />
+            <RowDefinition/>
+            <RowDefinition Height="30" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid.Resources>
+            <Style TargetType="TextBlock" >
+                <Setter Property="Foreground" Value="{StaticResource JobFieldForeground}"/>
+            </Style>
+        </Grid.Resources>
+
+        <Grid Grid.Row="1">
+
+            <StackPanel Orientation="Vertical" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="-60 35 0 0">
+                <RadioButton IsChecked="{Binding SourceColor.IsLab,Converter={StaticResource BooleanInverseConverter}}">RGB</RadioButton>
+                <RadioButton Margin="0 10 0 0" IsChecked="{Binding SourceColor.IsLab}">LAB</RadioButton>
+            </StackPanel>
+
+            <StackPanel VerticalAlignment="Center">
+                <StackPanel Height="20">
+                    <StackPanel Orientation="Horizontal" Margin="0 0 0 5" Visibility="{Binding IsOutOfGamut,Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <materialDesign:PackIcon Kind="Alert" Foreground="{StaticResource RedBrush100}" />
+                        <TextBlock Margin="5 0 0 0" Foreground="{StaticResource RedBrush100}">Color is out of gamut</TextBlock>
                     </StackPanel>
+                </StackPanel>
+                <Border BorderThickness="1" BorderBrush="#545454" Margin="0" Padding="2 2 2 0">
+                    <brushPicker:BrushPicker x:Name="picker" Color="{Binding SourceColor.Color,Mode=TwoWay}" Background="Transparent" BorderThickness="0" Height="150" BrushTypeVisibility="Collapsed"></brushPicker:BrushPicker>
+                </Border>
 
-                    <StackPanel VerticalAlignment="Center">
-                        <StackPanel Height="20">
-                            <StackPanel Orientation="Horizontal" Margin="0 0 0 5" Visibility="{Binding IsOutOfGamut,Converter={StaticResource BooleanToVisibilityConverter}}">
-                                <materialDesign:PackIcon Kind="Alert" Foreground="{StaticResource RedBrush100}" />
-                                <TextBlock Margin="5 0 0 0" Foreground="{StaticResource RedBrush100}">Color is out of gamut</TextBlock>
-                            </StackPanel>
-                        </StackPanel>
-                        <Border BorderThickness="1" BorderBrush="#545454" Margin="0" Padding="2 2 2 0">
-                            <brushPicker:BrushPicker x:Name="picker" Color="{Binding SourceColor.Color,Mode=TwoWay}" Background="Transparent" BorderThickness="0" Height="150" BrushTypeVisibility="Collapsed"></brushPicker:BrushPicker>
-                        </Border>
-
-                        <Grid>
-                            <ContentControl>
-                                <ContentControl.Style>
-                                    <Style TargetType="ContentControl">
+                <Grid>
+                    <ContentControl>
+                        <ContentControl.Style>
+                            <Style TargetType="ContentControl">
+                                <Setter Property="Content">
+                                    <Setter.Value>
+                                        <StackPanel>
+                                            <DockPanel Margin="0 10 0 0">
+                                                <TextBlock DockPanel.Dock="Left" Text="R" VerticalAlignment="Center" />
+                                                <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="255" Width="30" Value="{Binding SourceColor.Red}"></mahapps:NumericUpDown>
+                                                <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Red,Mode=TwoWay}"></Slider>
+                                            </DockPanel>
+                                            <DockPanel Margin="0 10 0 0">
+                                                <TextBlock DockPanel.Dock="Left" Text="G" VerticalAlignment="Center" />
+                                                <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="255" Width="30" Value="{Binding SourceColor.Green}"></mahapps:NumericUpDown>
+                                                <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Green,Mode=TwoWay}"></Slider>
+                                            </DockPanel>
+                                            <DockPanel Margin="0 10 0 0">
+                                                <TextBlock DockPanel.Dock="Left" Text="B" VerticalAlignment="Center" />
+                                                <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="255" Width="30" Value="{Binding SourceColor.Blue}"></mahapps:NumericUpDown>
+                                                <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Blue,Mode=TwoWay}"></Slider>
+                                            </DockPanel>
+                                        </StackPanel>
+                                    </Setter.Value>
+                                </Setter>
+
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding SourceColor.IsLab}" Value="True">
                                         <Setter Property="Content">
                                             <Setter.Value>
                                                 <StackPanel>
                                                     <DockPanel Margin="0 10 0 0">
-                                                        <TextBlock DockPanel.Dock="Left" Text="R" VerticalAlignment="Center" />
-                                                        <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="255" Width="30" Value="{Binding SourceColor.Red}"></mahapps:NumericUpDown>
-                                                        <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Red,Mode=TwoWay}"></Slider>
+                                                        <TextBlock DockPanel.Dock="Left" Text="L" VerticalAlignment="Center" />
+                                                        <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0.00" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="100" Width="30" Value="{Binding SourceColor.L}"></mahapps:NumericUpDown>
+                                                        <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Minimum="0" Maximum="100" Value="{Binding SourceColor.L,Mode=TwoWay}"></Slider>
                                                     </DockPanel>
                                                     <DockPanel Margin="0 10 0 0">
-                                                        <TextBlock DockPanel.Dock="Left" Text="G" VerticalAlignment="Center" />
-                                                        <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="255" Width="30" Value="{Binding SourceColor.Green}"></mahapps:NumericUpDown>
-                                                        <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Green,Mode=TwoWay}"></Slider>
+                                                        <TextBlock DockPanel.Dock="Left" Text="A" VerticalAlignment="Center" />
+                                                        <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0.00" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="-128" Maximum="128" Width="30" Value="{Binding SourceColor.A}"></mahapps:NumericUpDown>
+                                                        <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Minimum="-128" Maximum="128" Value="{Binding SourceColor.A,Mode=TwoWay}"></Slider>
                                                     </DockPanel>
                                                     <DockPanel Margin="0 10 0 0">
                                                         <TextBlock DockPanel.Dock="Left" Text="B" VerticalAlignment="Center" />
-                                                        <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="255" Width="30" Value="{Binding SourceColor.Blue}"></mahapps:NumericUpDown>
-                                                        <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Blue,Mode=TwoWay}"></Slider>
+                                                        <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0.00" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="-128" Maximum="128" Width="30" Value="{Binding SourceColor.B}"></mahapps:NumericUpDown>
+                                                        <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Minimum="-128" Maximum="128" Value="{Binding SourceColor.B,Mode=TwoWay}"></Slider>
                                                     </DockPanel>
                                                 </StackPanel>
                                             </Setter.Value>
                                         </Setter>
-
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding SourceColor.IsLab}" Value="True">
-                                                <Setter Property="Content">
-                                                    <Setter.Value>
-                                                        <StackPanel>
-                                                            <DockPanel Margin="0 10 0 0">
-                                                                <TextBlock DockPanel.Dock="Left" Text="L" VerticalAlignment="Center" />
-                                                                <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0.00" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="100" Width="30" Value="{Binding SourceColor.L}"></mahapps:NumericUpDown>
-                                                                <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Minimum="0" Maximum="100" Value="{Binding SourceColor.L,Mode=TwoWay}"></Slider>
-                                                            </DockPanel>
-                                                            <DockPanel Margin="0 10 0 0">
-                                                                <TextBlock DockPanel.Dock="Left" Text="A" VerticalAlignment="Center" />
-                                                                <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0.00" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="-128" Maximum="128" Width="30" Value="{Binding SourceColor.A}"></mahapps:NumericUpDown>
-                                                                <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Minimum="-128" Maximum="128" Value="{Binding SourceColor.A,Mode=TwoWay}"></Slider>
-                                                            </DockPanel>
-                                                            <DockPanel Margin="0 10 0 0">
-                                                                <TextBlock DockPanel.Dock="Left" Text="B" VerticalAlignment="Center" />
-                                                                <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0.00" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="-128" Maximum="128" Width="30" Value="{Binding SourceColor.B}"></mahapps:NumericUpDown>
-                                                                <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Minimum="-128" Maximum="128" Value="{Binding SourceColor.B,Mode=TwoWay}"></Slider>
-                                                            </DockPanel>
-                                                        </StackPanel>
-                                                    </Setter.Value>
-                                                </Setter>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </ContentControl.Style>
-                            </ContentControl>
-                        </Grid>
-                    </StackPanel>
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </ContentControl.Style>
+                    </ContentControl>
                 </Grid>
-
-                <TextBlock FontStyle="Italic" HorizontalAlignment="Center">SOURCE / INVERSE</TextBlock>
-                <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>
-
-                <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>
-                        <Style TargetType="hive:HexItem" BasedOn="{StaticResource {x:Type hive:HexItem}}">
+            </StackPanel>
+        </Grid>
+
+        <TextBlock FontStyle="Italic" HorizontalAlignment="Center">SOURCE / INVERSE</TextBlock>
+        <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>
+
+        <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>
+                <Style TargetType="hive:HexItem" BasedOn="{StaticResource {x:Type hive:HexItem}}">
+                    <Setter Property="Background" Value="{Binding Brush}"></Setter>
+                    <Setter Property="Grid.Column" Value="0"></Setter>
+                    <Setter Property="Grid.Row" Value="0"></Setter>
+                    <Setter Property="Background" Value="Transparent"></Setter>
+                    <Setter Property="BorderThickness" Value="1"></Setter>
+
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self},Path=DataContext,Converter={StaticResource ObjectToObjectTypeConverter}}" Value="{x:Type colorConversion:ColorConversionSuggestion}">
+                            <Setter Property="Grid.Column" Value="{Binding Column}"></Setter>
+                            <Setter Property="Grid.Row" Value="{Binding Row}"></Setter>
                             <Setter Property="Background" Value="{Binding Brush}"></Setter>
-                            <Setter Property="Grid.Column" Value="0"></Setter>
-                            <Setter Property="Grid.Row" Value="0"></Setter>
-                            <Setter Property="Background" Value="Transparent"></Setter>
-                            <Setter Property="BorderThickness" Value="1"></Setter>
-
-                            <Style.Triggers>
-                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self},Path=DataContext,Converter={StaticResource ObjectToObjectTypeConverter}}" Value="{x:Type colorConversion:ColorConversionSuggestion}">
-                                    <Setter Property="Grid.Column" Value="{Binding Column}"></Setter>
-                                    <Setter Property="Grid.Row" Value="{Binding Row}"></Setter>
-                                    <Setter Property="Background" Value="{Binding Brush}"></Setter>
-                                </DataTrigger>
-                                <Trigger Property="IsSelected" Value="True">
-                                    <Setter Property="BorderThickness" Value="2"></Setter>
-                                </Trigger>
-                            </Style.Triggers>
-                        </Style>
-                    </hive:HexList.ItemContainerStyle>
-
-                    <hive:HexList.ItemTemplate>
-                        <DataTemplate>
-                            <TextBlock Foreground="{StaticResource WhiteTextBrush}">
+                        </DataTrigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter Property="BorderThickness" Value="2"></Setter>
+                        </Trigger>
+                    </Style.Triggers>
+                </Style>
+            </hive:HexList.ItemContainerStyle>
+
+            <hive:HexList.ItemTemplate>
+                <DataTemplate>
+                    <TextBlock Foreground="{StaticResource WhiteTextBrush}">
                                         <Run Text="{Binding Row}"></Run><Run>,</Run>
                                         <Run Text="{Binding Column}"/>
-                            </TextBlock>
-                        </DataTemplate>
-                    </hive:HexList.ItemTemplate>
-                </hive:HexList>
-
-                <TextBlock FontSize="40" Foreground="{StaticResource RedBrush100}" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="2" Grid.Row="1" Text="NO INPUT">
-                    <TextBlock.Style>
-                        <Style TargetType="TextBlock">
-                            <Setter Property="Visibility" Value="Collapsed"></Setter>
-                            <Style.Triggers>
-                                <DataTrigger Binding="{Binding HiveSuggestions.Count}" Value="0">
-                                    <Setter Property="Visibility" Value="Visible"></Setter>
-                                </DataTrigger>
-                            </Style.Triggers>
-                        </Style>
-                    </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>
-
-                <Grid Grid.Column="4" Grid.Row="1" IsHitTestVisible="False">
-                    <StackPanel HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0 -20 0 0">
-                        <StackPanel Orientation="Horizontal" Height="60">
-                            <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
-                                <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">R</TextBlock>
-
-                                <Grid>
-                                    <Rectangle Margin="0 5 0 0" Stroke="#202020">
-                                        <Rectangle.Fill>
-                                            <SolidColorBrush Color="Red" Opacity="{Binding SelectedSuggestion.Coordinates.Red,Converter={StaticResource ColorComponentToOpacityConverter}}" />
-                                        </Rectangle.Fill>
-                                    </Rectangle>
-                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.Red}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
-                                </Grid>
-                            </DockPanel>
-                            <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
-                                <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">G</TextBlock>
-                                <Grid>
-                                    <Rectangle Margin="0 5 0 0" Stroke="#202020">
-                                        <Rectangle.Fill>
-                                            <SolidColorBrush Color="Green" Opacity="{Binding SelectedSuggestion.Coordinates.Green,Converter={StaticResource ColorComponentToOpacityConverter}}" />
-                                        </Rectangle.Fill>
-                                    </Rectangle>
-                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.Green}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
-                                </Grid>
-                            </DockPanel>
-                            <DockPanel Width="50" HorizontalAlignment="Left">
-                                <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
-                                <Grid>
-                                    <Rectangle Margin="0 5 0 0" Stroke="#202020">
-                                        <Rectangle.Fill>
-                                            <SolidColorBrush Color="Blue" Opacity="{Binding SelectedSuggestion.Coordinates.Blue,Converter={StaticResource ColorComponentToOpacityConverter}}" />
-                                        </Rectangle.Fill>
-                                    </Rectangle>
-                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.Blue}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
-                                </Grid>
-                            </DockPanel>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal" Height="40" Margin="0 5 0 0">
-                            <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
-                                <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">L</TextBlock>
+                    </TextBlock>
+                </DataTemplate>
+            </hive:HexList.ItemTemplate>
+        </hive:HexList>
+
+        <TextBlock FontSize="40" Foreground="{StaticResource RedBrush100}" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="2" Grid.Row="1" Text="NO INPUT">
+            <TextBlock.Style>
+                <Style TargetType="TextBlock">
+                    <Setter Property="Visibility" Value="Collapsed"></Setter>
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding HiveSuggestions.Count}" Value="0">
+                            <Setter Property="Visibility" Value="Visible"></Setter>
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </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>
+
+        <Grid Grid.Column="4" Grid.Row="1" IsHitTestVisible="False">
+            <StackPanel HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0 -20 0 0">
+                <StackPanel Orientation="Horizontal" Height="60">
+                    <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                        <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">R</TextBlock>
 
-                                <Grid>
-                                    <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
-                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.L,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
-                                </Grid>
-                            </DockPanel>
-                            <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
-                                <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">A</TextBlock>
+                        <Grid>
+                            <Rectangle Margin="0 5 0 0" Stroke="#202020">
+                                <Rectangle.Fill>
+                                    <SolidColorBrush Color="Red" Opacity="{Binding SelectedSuggestion.Coordinates.Red,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                </Rectangle.Fill>
+                            </Rectangle>
+                            <TextBlock Text="{Binding SelectedSuggestion.Coordinates.Red}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                        </Grid>
+                    </DockPanel>
+                    <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                        <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">G</TextBlock>
+                        <Grid>
+                            <Rectangle Margin="0 5 0 0" Stroke="#202020">
+                                <Rectangle.Fill>
+                                    <SolidColorBrush Color="Green" Opacity="{Binding SelectedSuggestion.Coordinates.Green,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                </Rectangle.Fill>
+                            </Rectangle>
+                            <TextBlock Text="{Binding SelectedSuggestion.Coordinates.Green}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                        </Grid>
+                    </DockPanel>
+                    <DockPanel Width="50" HorizontalAlignment="Left">
+                        <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
+                        <Grid>
+                            <Rectangle Margin="0 5 0 0" Stroke="#202020">
+                                <Rectangle.Fill>
+                                    <SolidColorBrush Color="Blue" Opacity="{Binding SelectedSuggestion.Coordinates.Blue,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                </Rectangle.Fill>
+                            </Rectangle>
+                            <TextBlock Text="{Binding SelectedSuggestion.Coordinates.Blue}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                        </Grid>
+                    </DockPanel>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Height="40" Margin="0 5 0 0">
+                    <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                        <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">L</TextBlock>
 
-                                <Grid>
-                                    <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
-                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.A,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
-                                </Grid>
-                            </DockPanel>
-                            <DockPanel Width="50" HorizontalAlignment="Left">
-                                <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
+                        <Grid>
+                            <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
+                            <TextBlock Text="{Binding SelectedSuggestion.Coordinates.L,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                        </Grid>
+                    </DockPanel>
+                    <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                        <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">A</TextBlock>
 
-                                <Grid>
-                                    <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
-                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.B,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
-                                </Grid>
-                            </DockPanel>
-                        </StackPanel>
-                    </StackPanel>
+                        <Grid>
+                            <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
+                            <TextBlock Text="{Binding SelectedSuggestion.Coordinates.A,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                        </Grid>
+                    </DockPanel>
+                    <DockPanel Width="50" HorizontalAlignment="Left">
+                        <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
 
-                    <ItemsControl ItemsSource="{Binding LiquidVolumes}" VerticalAlignment="Center" MinWidth="420" >
-                        <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>
+                        <Grid>
+                            <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
+                            <TextBlock Text="{Binding SelectedSuggestion.Coordinates.B,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                        </Grid>
+                    </DockPanel>
+                </StackPanel>
+            </StackPanel>
+
+            <ItemsControl ItemsSource="{Binding LiquidVolumes}" VerticalAlignment="Center" MinWidth="420" >
+                <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>
-                    <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>
+                                </mahapps:NumericUpDown>
+                            </ContentControl>
+                        </StackPanel>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+            <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">
+            <TextBlock FontSize="14" FontWeight="SemiBold" FontStyle="Italic" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 15">
                                 <Run>GAMUT REGION:</Run>
                                 <Run Text="{Binding SelectedSuggestion.ProcessParametersTableIndex,Mode=OneWay}"></Run>
-                    </TextBlock>
-                </Grid>
-
+            </TextBlock>
+        </Grid>
 
-                <StackPanel Grid.Column="4" Grid.Row="3">
-                    <StackPanel Height="25" Margin="25 0 0 0">
-                        <StackPanel Orientation="Horizontal" Margin="0 0 0 0" Visibility="{Binding IsVolumesOutOfRange,Converter={StaticResource BooleanToVisibilityConverter}}">
-                            <materialDesign:PackIcon Kind="Alert" Foreground="{StaticResource RedBrush100}" />
-                            <TextBlock Margin="5 0 0 0" Foreground="{StaticResource RedBrush100}">Liquid volumes exceeds the maximum range</TextBlock>
-                        </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>
+        <StackPanel Grid.Column="4" Grid.Row="3">
+            <StackPanel Height="25" Margin="25 0 0 0">
+                <StackPanel Orientation="Horizontal" Margin="0 0 0 0" Visibility="{Binding IsVolumesOutOfRange,Converter={StaticResource BooleanToVisibilityConverter}}">
+                    <materialDesign:PackIcon Kind="Alert" Foreground="{StaticResource RedBrush100}" />
+                    <TextBlock Margin="5 0 0 0" Foreground="{StaticResource RedBrush100}">Liquid volumes exceeds the maximum range</TextBlock>
+                </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>
                                                         <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
                                                     </mahapps:NumericUpDown.Resources>-->
-                                        </mahapps:NumericUpDown>
-                                    </ContentControl>
-                                </StackPanel>
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
-                </StackPanel>
-
-
-                <Image Source="../Images/arrow-long-Left.png" Grid.Column="2" Grid.Row="3" Width="140" Stretch="Fill" Height="30" Opacity="0.8"></Image>
-
-                <Border BorderBrush="{StaticResource borderBrush}" Grid.Row="3">
-                    <Grid>
-                        <DockPanel Width="80" HorizontalAlignment="Left">
-                            <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">COMPOSITE</TextBlock>
-                            <Grid>
-                                <Ellipse Height="70"  Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}">
-                                    <Ellipse.Fill>
-                                        <SolidColorBrush Color="{Binding TargetColor.Color}"></SolidColorBrush>
-                                    </Ellipse.Fill>
-                                </Ellipse>
-                                <materialDesign:PackIcon Visibility="{Binding IsVolumesOutOfRange,Converter={StaticResource BooleanToVisibilityConverter}}" Kind="Alert" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White" Width="24" Height="24" />
-                            </Grid>
-                        </DockPanel>
-
-                        <StackPanel HorizontalAlignment="Right">
-                            <StackPanel Orientation="Horizontal" Height="60">
-                                <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
-                                    <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">R</TextBlock>
-
-                                    <Grid>
-                                        <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}">
-                                            <Rectangle.Fill>
-                                                <SolidColorBrush Color="Red" Opacity="{Binding TargetColor.Red,Converter={StaticResource ColorComponentToOpacityConverter}}" />
-                                            </Rectangle.Fill>
-                                        </Rectangle>
-                                        <TextBlock Text="{Binding TargetColor.Red}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
-                                    </Grid>
-                                </DockPanel>
-                                <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
-                                    <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">G</TextBlock>
-                                    <Grid>
-                                        <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}">
-                                            <Rectangle.Fill>
-                                                <SolidColorBrush Color="Green" Opacity="{Binding TargetColor.Green,Converter={StaticResource ColorComponentToOpacityConverter}}" />
-                                            </Rectangle.Fill>
-                                        </Rectangle>
-                                        <TextBlock Text="{Binding TargetColor.Green}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
-                                    </Grid>
-                                </DockPanel>
-                                <DockPanel Width="50" HorizontalAlignment="Left">
-                                    <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
-                                    <Grid>
-                                        <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}">
-                                            <Rectangle.Fill>
-                                                <SolidColorBrush Color="Blue" Opacity="{Binding TargetColor.Blue,Converter={StaticResource ColorComponentToOpacityConverter}}" />
-                                            </Rectangle.Fill>
-                                        </Rectangle>
-                                        <TextBlock Text="{Binding TargetColor.Blue}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
-                                    </Grid>
-                                </DockPanel>
-                            </StackPanel>
-                            <StackPanel Orientation="Horizontal" Height="40" Margin="0 5 0 0">
-                                <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
-                                    <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">L</TextBlock>
-
-                                    <Grid>
-                                        <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}"/>
-                                        <TextBlock Text="{Binding TargetColor.L,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource BlackForegroundBrush}"></TextBlock>
-                                    </Grid>
-                                </DockPanel>
-                                <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
-                                    <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">A</TextBlock>
-
-                                    <Grid>
-                                        <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}"/>
-                                        <TextBlock Text="{Binding TargetColor.A,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource BlackForegroundBrush}"></TextBlock>
-                                    </Grid>
-                                </DockPanel>
-                                <DockPanel Width="50" HorizontalAlignment="Left">
-                                    <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
-
-                                    <Grid>
-                                        <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}"/>
-                                        <TextBlock Text="{Binding TargetColor.B,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource BlackForegroundBrush}"></TextBlock>
-                                    </Grid>
-                                </DockPanel>
-                            </StackPanel>
-                        </StackPanel>
-                    </Grid>
-                </Border>
-            </Grid>
-
-            <!--<Grid Margin="80,20,20,20" DockPanel.Dock="Top" x:Name="ColorCalibrationGrid">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="250" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="1*" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="20" />
-                    <RowDefinition />
-                    <RowDefinition Height="30" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <Grid.Resources>
-                    <Style TargetType="TextBlock" >
-                        <Setter Property="Foreground" Value="{StaticResource JobFieldForeground}"/>
-                    </Style>
-                </Grid.Resources>
-
-                <Grid Grid.Row="1">
-
-                    <StackPanel Orientation="Vertical" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="-70 15 0 0">
-                        <RadioButton IsChecked="{Binding SourceColor.IsLab,Converter={StaticResource BooleanInverseConverter}}">RGB</RadioButton>
-                        <RadioButton Margin="0 10 0 0" IsChecked="{Binding SourceColor.IsLab}">LAB</RadioButton>
-                    </StackPanel>
-
-                    <StackPanel VerticalAlignment="Center">
-                        <StackPanel Height="20">
-                            <StackPanel Orientation="Horizontal" Margin="0 0 0 5" Visibility="{Binding IsOutOfGamut,Converter={StaticResource BooleanToVisibilityConverter}}">
-                                <materialDesign:PackIcon Kind="Alert" Foreground="{StaticResource RedBrush100}" />
-                                <TextBlock Margin="5 0 0 0" Foreground="{StaticResource RedBrush100}">Color is out of gamut</TextBlock>
-                            </StackPanel>
-                        </StackPanel>
-                        <Border BorderThickness="1" BorderBrush="#545454" Margin="0" Padding="2 2 2 0">
-                            <brushPicker:BrushPicker x:Name="picker" Color="{Binding SourceColor.Color,Mode=TwoWay}" Background="Transparent" BorderThickness="0" Height="150" BrushTypeVisibility="Collapsed"></brushPicker:BrushPicker>
-                        </Border>
-
-                        <Grid>
-                            <ContentControl>
-                                <ContentControl.Style>
-                                    <Style TargetType="ContentControl">
-                                        <Setter Property="Content">
-                                            <Setter.Value>
-                                                <StackPanel>
-                                                    <DockPanel Margin="0 10 0 0">
-                                                        <TextBlock DockPanel.Dock="Left" Text="R" VerticalAlignment="Center" />
-                                                        <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="255" Width="30" Value="{Binding SourceColor.Red}"></mahapps:NumericUpDown>
-                                                        <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Red,Mode=TwoWay}"></Slider>
-                                                    </DockPanel>
-                                                    <DockPanel Margin="0 10 0 0">
-                                                        <TextBlock DockPanel.Dock="Left" Text="G" VerticalAlignment="Center" />
-                                                        <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="255" Width="30" Value="{Binding SourceColor.Green}"></mahapps:NumericUpDown>
-                                                        <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Green,Mode=TwoWay}"></Slider>
-                                                    </DockPanel>
-                                                    <DockPanel Margin="0 10 0 0">
-                                                        <TextBlock DockPanel.Dock="Left" Text="B" VerticalAlignment="Center" />
-                                                        <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="255" Width="30" Value="{Binding SourceColor.Blue}"></mahapps:NumericUpDown>
-                                                        <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Blue,Mode=TwoWay}"></Slider>
-                                                    </DockPanel>
-                                                </StackPanel>
-                                            </Setter.Value>
-                                        </Setter>
-
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding SourceColor.IsLab}" Value="True">
-                                                <Setter Property="Content">
-                                                    <Setter.Value>
-                                                        <StackPanel>
-                                                            <DockPanel Margin="0 10 0 0">
-                                                                <TextBlock DockPanel.Dock="Left" Text="L" VerticalAlignment="Center" />
-                                                                <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0.00" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="100" Width="30" Value="{Binding SourceColor.L}"></mahapps:NumericUpDown>
-                                                                <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Minimum="0" Maximum="100" Value="{Binding SourceColor.L,Mode=TwoWay}"></Slider>
-                                                            </DockPanel>
-                                                            <DockPanel Margin="0 10 0 0">
-                                                                <TextBlock DockPanel.Dock="Left" Text="A" VerticalAlignment="Center" />
-                                                                <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0.00" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="-128" Maximum="128" Width="30" Value="{Binding SourceColor.A}"></mahapps:NumericUpDown>
-                                                                <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Minimum="-128" Maximum="128" Value="{Binding SourceColor.A,Mode=TwoWay}"></Slider>
-                                                            </DockPanel>
-                                                            <DockPanel Margin="0 10 0 0">
-                                                                <TextBlock DockPanel.Dock="Left" Text="B" VerticalAlignment="Center" />
-                                                                <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0.00" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="-128" Maximum="128" Width="30" Value="{Binding SourceColor.B}"></mahapps:NumericUpDown>
-                                                                <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Minimum="-128" Maximum="128" Value="{Binding SourceColor.B,Mode=TwoWay}"></Slider>
-                                                            </DockPanel>
-                                                        </StackPanel>
-                                                    </Setter.Value>
-                                                </Setter>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </ContentControl.Style>
+                                </mahapps:NumericUpDown>
                             </ContentControl>
-                        </Grid>
-                    </StackPanel>
-                </Grid>
-
-                <TextBlock FontStyle="Italic" HorizontalAlignment="Center" Grid.Column="0">SOURCE / INVERSE</TextBlock>
-                <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="100" Stretch="Fill" Height="30" Opacity="0.8" Margin="10 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>
-                        <Style TargetType="hive:HexItem" BasedOn="{StaticResource {x:Type hive:HexItem}}">
-                            <Setter Property="Background" Value="{Binding Brush}"></Setter>
-                            <Setter Property="Grid.Column" Value="0"></Setter>
-                            <Setter Property="Grid.Row" Value="0"></Setter>
-                            <Setter Property="Background" Value="Transparent"></Setter>
-                            <Setter Property="BorderThickness" Value="1"></Setter>
-
-                            <Style.Triggers>
-                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self},Path=DataContext,Converter={StaticResource ObjectToObjectTypeConverter}}" Value="{x:Type colorConversion:ColorConversionSuggestion}">
-                                    <Setter Property="Grid.Column" Value="{Binding Column}"></Setter>
-                                    <Setter Property="Grid.Row" Value="{Binding Row}"></Setter>
-                                    <Setter Property="Background" Value="{Binding Brush}"></Setter>
-                                </DataTrigger>
-                                <Trigger Property="IsSelected" Value="True">
-                                    <Setter Property="BorderThickness" Value="2"></Setter>
-                                </Trigger>
-                            </Style.Triggers>
-                        </Style>
-                    </hive:HexList.ItemContainerStyle>
-
-                    <hive:HexList.ItemTemplate>
-                        <DataTemplate>
-                            <TextBlock Foreground="{StaticResource WhiteTextBrush}">
-                                        <Run Text="{Binding Row}"></Run><Run>,</Run>
-                                        <Run Text="{Binding Column}"/>
-                            </TextBlock>
-                        </DataTemplate>
-                    </hive:HexList.ItemTemplate>
-                </hive:HexList>
-
-                <TextBlock FontSize="40" Foreground="{StaticResource RedBrush100}" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="2" Grid.Row="1" Text="NO INPUT">
-                    <TextBlock.Style>
-                        <Style TargetType="TextBlock">
-                            <Setter Property="Visibility" Value="Collapsed"></Setter>
-                            <Style.Triggers>
-                                <DataTrigger Binding="{Binding HiveSuggestions.Count}" Value="0">
-                                    <Setter Property="Visibility" Value="Visible"></Setter>
-                                </DataTrigger>
-                            </Style.Triggers>
-                        </Style>
-                    </TextBlock.Style>
-                </TextBlock>
-
-                <Image Source="../Images/arrow-long-right.png" Grid.Column="3" Grid.Row="1" Width="100" Stretch="Fill" Height="30" Opacity="0.8" Margin="10 0 20 0"></Image>
-
-                <Grid Grid.Column="4" Grid.Row="1" IsHitTestVisible="False">
-                    <StackPanel HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0 0 0 0">
-                        <StackPanel Orientation="Horizontal" Height="50">
-                            <DockPanel Width="40" HorizontalAlignment="Left" Margin="0 0 5 0">
-                                <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">R</TextBlock>
-
-                                <Grid>
-                                    <Rectangle Margin="0 5 0 0" Stroke="#202020">
-                                        <Rectangle.Fill>
-                                            <SolidColorBrush Color="Red" Opacity="{Binding SelectedSuggestion.Coordinates.Red,Converter={StaticResource ColorComponentToOpacityConverter}}" />
-                                        </Rectangle.Fill>
-                                    </Rectangle>
-                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.Red}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
-                                </Grid>
-                            </DockPanel>
-                            <DockPanel Width="40" HorizontalAlignment="Left" Margin="0 0 5 0">
-                                <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">G</TextBlock>
-                                <Grid>
-                                    <Rectangle Margin="0 5 0 0" Stroke="#202020">
-                                        <Rectangle.Fill>
-                                            <SolidColorBrush Color="Green" Opacity="{Binding SelectedSuggestion.Coordinates.Green,Converter={StaticResource ColorComponentToOpacityConverter}}" />
-                                        </Rectangle.Fill>
-                                    </Rectangle>
-                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.Green}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
-                                </Grid>
-                            </DockPanel>
-                            <DockPanel Width="40" HorizontalAlignment="Left">
-                                <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
-                                <Grid>
-                                    <Rectangle Margin="0 5 0 0" Stroke="#202020">
-                                        <Rectangle.Fill>
-                                            <SolidColorBrush Color="Blue" Opacity="{Binding SelectedSuggestion.Coordinates.Blue,Converter={StaticResource ColorComponentToOpacityConverter}}" />
-                                        </Rectangle.Fill>
-                                    </Rectangle>
-                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.Blue}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
-                                </Grid>
-                            </DockPanel>
                         </StackPanel>
-                        <StackPanel Orientation="Horizontal" Height="40" Margin="0 5 0 0">
-                            <DockPanel Width="40" HorizontalAlignment="Left" Margin="0 0 5 0">
-                                <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">L</TextBlock>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+        </StackPanel>
 
-                                <Grid>
-                                    <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
-                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.L,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
-                                </Grid>
-                            </DockPanel>
-                            <DockPanel Width="40" HorizontalAlignment="Left" Margin="0 0 5 0">
-                                <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">A</TextBlock>
 
-                                <Grid>
-                                    <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
-                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.A,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
-                                </Grid>
-                            </DockPanel>
-                            <DockPanel Width="40" HorizontalAlignment="Left">
-                                <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
+        <Image Source="../Images/arrow-long-Left.png" Grid.Column="2" Grid.Row="3" Width="140" Stretch="Fill" Height="30" Opacity="0.8"></Image>
 
-                                <Grid>
-                                    <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
-                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.B,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
-                                </Grid>
-                            </DockPanel>
-                        </StackPanel>
-                    </StackPanel>
-
-                    <ItemsControl ItemsSource="{Binding LiquidVolumes}" VerticalAlignment="Center" MinWidth="320" >
-                        <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>
-                                    </ContentControl>
-                                </StackPanel>
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
-                    <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">
-                                <Run>GAMUT REGION:</Run>
-                                <Run Text="{Binding SelectedSuggestion.ProcessParametersTableIndex,Mode=OneWay}"></Run>
-                    </TextBlock>
-                </Grid>
+        <Border BorderBrush="{StaticResource borderBrush}" Grid.Row="3">
+            <Grid>
+                <DockPanel Width="80" HorizontalAlignment="Left">
+                    <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">COMPOSITE</TextBlock>
+                    <Grid>
+                        <Ellipse Height="70"  Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}">
+                            <Ellipse.Fill>
+                                <SolidColorBrush Color="{Binding TargetColor.Color}"></SolidColorBrush>
+                            </Ellipse.Fill>
+                        </Ellipse>
+                        <materialDesign:PackIcon Visibility="{Binding IsVolumesOutOfRange,Converter={StaticResource BooleanToVisibilityConverter}}" Kind="Alert" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White" Width="24" Height="24" />
+                    </Grid>
+                </DockPanel>
 
+                <StackPanel HorizontalAlignment="Right">
+                    <StackPanel Orientation="Horizontal" Height="60">
+                        <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                            <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">R</TextBlock>
 
-                <StackPanel Grid.Column="4" Grid.Row="3">
-                    <StackPanel Height="25" Margin="25 0 0 0">
-                        <StackPanel Orientation="Horizontal" Margin="0 0 0 0" Visibility="{Binding IsVolumesOutOfRange,Converter={StaticResource BooleanToVisibilityConverter}}">
-                            <materialDesign:PackIcon Kind="Alert" Foreground="{StaticResource RedBrush100}" />
-                            <TextBlock Margin="5 0 0 0" Foreground="{StaticResource RedBrush100}">Liquid volumes exceeds the maximum range</TextBlock>
-                        </StackPanel>
+                            <Grid>
+                                <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}">
+                                    <Rectangle.Fill>
+                                        <SolidColorBrush Color="Red" Opacity="{Binding TargetColor.Red,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                    </Rectangle.Fill>
+                                </Rectangle>
+                                <TextBlock Text="{Binding TargetColor.Red}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                            </Grid>
+                        </DockPanel>
+                        <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                            <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">G</TextBlock>
+                            <Grid>
+                                <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}">
+                                    <Rectangle.Fill>
+                                        <SolidColorBrush Color="Green" Opacity="{Binding TargetColor.Green,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                    </Rectangle.Fill>
+                                </Rectangle>
+                                <TextBlock Text="{Binding TargetColor.Green}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                            </Grid>
+                        </DockPanel>
+                        <DockPanel Width="50" HorizontalAlignment="Left">
+                            <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
+                            <Grid>
+                                <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}">
+                                    <Rectangle.Fill>
+                                        <SolidColorBrush Color="Blue" Opacity="{Binding TargetColor.Blue,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                    </Rectangle.Fill>
+                                </Rectangle>
+                                <TextBlock Text="{Binding TargetColor.Blue}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                            </Grid>
+                        </DockPanel>
                     </StackPanel>
+                    <StackPanel Orientation="Horizontal" Height="40" Margin="0 5 0 0">
+                        <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                            <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">L</TextBlock>
 
-                    <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>
-                                    </ContentControl>
-                                </StackPanel>
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
-                </StackPanel>
-
-
-                <Image Source="../Images/arrow-long-Left.png" Grid.Column="2" Grid.Row="3" Width="120" Stretch="Fill" Height="30" Opacity="0.8"></Image>
-
-                <Border BorderBrush="{StaticResource borderBrush}" Grid.Row="3">
-                    <Grid>
-                        <DockPanel Width="80" HorizontalAlignment="Left">
-                            <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">COMPOSITE</TextBlock>
                             <Grid>
-                                <Ellipse Height="70"  Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}">
-                                    <Ellipse.Fill>
-                                        <SolidColorBrush Color="{Binding TargetColor.Color}"></SolidColorBrush>
-                                    </Ellipse.Fill>
-                                </Ellipse>
-                                <materialDesign:PackIcon Visibility="{Binding IsVolumesOutOfRange,Converter={StaticResource BooleanToVisibilityConverter}}" Kind="Alert" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White" Width="24" Height="24" />
+                                <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}"/>
+                                <TextBlock Text="{Binding TargetColor.L,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource BlackForegroundBrush}"></TextBlock>
                             </Grid>
                         </DockPanel>
+                        <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                            <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">A</TextBlock>
 
-                        <StackPanel HorizontalAlignment="Right">
-                            <StackPanel Orientation="Horizontal" Height="60">
-                                <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
-                                    <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">R</TextBlock>
-
-                                    <Grid>
-                                        <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}">
-                                            <Rectangle.Fill>
-                                                <SolidColorBrush Color="Red" Opacity="{Binding TargetColor.Red,Converter={StaticResource ColorComponentToOpacityConverter}}" />
-                                            </Rectangle.Fill>
-                                        </Rectangle>
-                                        <TextBlock Text="{Binding TargetColor.Red}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
-                                    </Grid>
-                                </DockPanel>
-                                <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
-                                    <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">G</TextBlock>
-                                    <Grid>
-                                        <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}">
-                                            <Rectangle.Fill>
-                                                <SolidColorBrush Color="Green" Opacity="{Binding TargetColor.Green,Converter={StaticResource ColorComponentToOpacityConverter}}" />
-                                            </Rectangle.Fill>
-                                        </Rectangle>
-                                        <TextBlock Text="{Binding TargetColor.Green}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
-                                    </Grid>
-                                </DockPanel>
-                                <DockPanel Width="50" HorizontalAlignment="Left">
-                                    <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
-                                    <Grid>
-                                        <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}">
-                                            <Rectangle.Fill>
-                                                <SolidColorBrush Color="Blue" Opacity="{Binding TargetColor.Blue,Converter={StaticResource ColorComponentToOpacityConverter}}" />
-                                            </Rectangle.Fill>
-                                        </Rectangle>
-                                        <TextBlock Text="{Binding TargetColor.Blue}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
-                                    </Grid>
-                                </DockPanel>
-                            </StackPanel>
-                            <StackPanel Orientation="Horizontal" Height="40" Margin="0 5 0 0">
-                                <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
-                                    <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">L</TextBlock>
-
-                                    <Grid>
-                                        <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}"/>
-                                        <TextBlock Text="{Binding TargetColor.L,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource BlackForegroundBrush}"></TextBlock>
-                                    </Grid>
-                                </DockPanel>
-                                <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
-                                    <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">A</TextBlock>
-
-                                    <Grid>
-                                        <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}"/>
-                                        <TextBlock Text="{Binding TargetColor.A,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource BlackForegroundBrush}"></TextBlock>
-                                    </Grid>
-                                </DockPanel>
-                                <DockPanel Width="50" HorizontalAlignment="Left">
-                                    <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
+                            <Grid>
+                                <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}"/>
+                                <TextBlock Text="{Binding TargetColor.A,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource BlackForegroundBrush}"></TextBlock>
+                            </Grid>
+                        </DockPanel>
+                        <DockPanel Width="50" HorizontalAlignment="Left">
+                            <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
 
-                                    <Grid>
-                                        <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}"/>
-                                        <TextBlock Text="{Binding TargetColor.B,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource BlackForegroundBrush}"></TextBlock>
-                                    </Grid>
-                                </DockPanel>
-                            </StackPanel>
-                        </StackPanel>
-                    </Grid>
-                </Border>
-            </Grid>-->
-        </DockPanel>
+                            <Grid>
+                                <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}"/>
+                                <TextBlock Text="{Binding TargetColor.B,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource BlackForegroundBrush}"></TextBlock>
+                            </Grid>
+                        </DockPanel>
+                    </StackPanel>
+                </StackPanel>
+            </Grid>
+        </Border>
     </Grid>
 </UserControl>
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 628b9e402..1e8e55c5d 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
@@ -147,7 +147,17 @@
                                         <ColumnDefinition Width="*"></ColumnDefinition>
                                         <ColumnDefinition Width="260"></ColumnDefinition>
                                     </Grid.ColumnDefinitions>
-                                    <local:ColorConversionView x:Name="colorConversionView" Margin="0 0 0 0"  Grid.Column="0" DataContext="{Binding ColorConversionViewVM}"/>
+                                    <DockPanel>
+                                        <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="20 0" Padding="5" CornerRadius="5">
+                                            <Border.Effect>
+                                                <DropShadowEffect Opacity="0.4" />
+                                            </Border.Effect>
+                                            <Grid>
+                                                <TextBlock HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">COLOR CONVERSION</TextBlock>
+                                            </Grid>
+                                        </Border>
+                                        <local:ColorConversionView x:Name="colorConversionView" Margin="0 0 0 0"  Grid.Column="0" DataContext="{Binding ColorConversionViewVM}"/>
+                                    </DockPanel>
                                     <DockPanel Grid.Column="1">
                                         <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="16 0" Padding="5" CornerRadius="5">
                                             <Border.Effect>
@@ -186,7 +196,6 @@
                                         </Grid>
                                     </DockPanel>
                                 </Grid>
-                                <!--<local:ColorConversionView x:Name="colorConversionView" />-->
                             </TabItem>
                         </TabControl>
                     </Grid>
-- 
cgit v1.3.1


From c87fdf91d84a21ea5d1e3824166e11e645bb10ec Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Thu, 19 Sep 2019 11:25:37 +0300
Subject: Fixed issue with calibration view flow direction.

---
 .../Views/CalibrationDataView.xaml                 | 42 ++++++++++++++++++++--
 1 file changed, 39 insertions(+), 3 deletions(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/CalibrationDataView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/CalibrationDataView.xaml
index 824ed7495..f1995283c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/CalibrationDataView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/CalibrationDataView.xaml
@@ -53,14 +53,50 @@
                                     <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
                                         <Setter Property="BorderThickness" Value="0"/>
                                         <Setter Property="HorizontalContentAlignment" Value="Left"></Setter>
-                                        <Setter Property="HorizontalAlignment" Value="Left"></Setter>
+                                        <Setter Property="HorizontalAlignment" Value="Stretch"></Setter>
                                         <Setter Property="Foreground" Value="{StaticResource BlackForegroundBrush}"></Setter>
                                     </Style>
                                 </DataGrid.CellStyle>
+                                <!--<DataGrid.RowStyle>
+                                    <Style BasedOn="{StaticResource {x:Type DataGridRow}}" TargetType="{x:Type DataGridRow}">
+                                        <Style.Triggers>
+                                            <Trigger Property="IsSelected" Value="True">
+                                                <Setter Property="Background" Value="Transparent" />
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </DataGrid.RowStyle>-->
+                                <DataGrid.Resources>
+                                    <Style x:Key="CellNumericUpDown" TargetType="{x:Type  mahapps:NumericUpDown}" BasedOn="{StaticResource {x:Type mahapps:NumericUpDown}}">
+                                        <Setter Property="FrameworkElement.HorizontalAlignment" Value="Stretch"/>
+                                        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+                                        <Setter Property="Background" Value="Transparent"/>
+                                        <Setter Property="BorderThickness" Value="0"/>
+                                        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
+                                        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled"/>
+                                        <Setter Property="Focusable" Value="false"/>
+                                        <Setter Property="IsHitTestVisible" Value="false"/>
+                                        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled"/>
+                                        <Setter Property="FrameworkElement.VerticalAlignment" Value="Top"/>
+                                        <Setter Property="VerticalContentAlignment" Value="Center"/>
+                                        <Setter Property="FrameworkElement.MinHeight" Value="0"/>
+                                        <Setter Property="HideUpDownButtons" Value="true"/>
+                                    </Style>
+                                    <Style x:Key="EditableCellNumericUpDown" TargetType="{x:Type  mahapps:NumericUpDown}" BasedOn="{StaticResource {x:Type mahapps:NumericUpDown}}">
+                                        <Setter Property="FrameworkElement.HorizontalAlignment" Value="Stretch"/>
+                                        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+                                        <Setter Property="BorderThickness" Value="0"/>
+                                        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
+                                        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled"/>
+                                        <Setter Property="FrameworkElement.VerticalAlignment" Value="Top"/>
+                                        <Setter Property="VerticalContentAlignment" Value="Center"/>
+                                        <Setter Property="FrameworkElement.MinHeight" Value="0"/>
+                                    </Style>
+                                </DataGrid.Resources>
                                 <DataGrid.Columns>
                                     <DataGridTextColumn Header="#" Binding="{Binding Index}" Width="Auto" IsReadOnly="True" Foreground="{StaticResource DimGrayBrush}" FontSize="11" />
-                                    <mahapps:DataGridNumericUpDownColumn Header="X" Binding="{Binding X}" Minimum="0" Maximum="10000" HideUpDownButtons="True" Width="1*"/>
-                                    <mahapps:DataGridNumericUpDownColumn Header="Y" Binding="{Binding Y}" Minimum="0" Maximum="10000" HideUpDownButtons="True" Width="1*" />
+                                    <mahapps:DataGridNumericUpDownColumn Header="X" Binding="{Binding X}" Minimum="0" Maximum="10000" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}"/>
+                                    <mahapps:DataGridNumericUpDownColumn Header="Y" Binding="{Binding Y}" Minimum="0" Maximum="10000" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}"/>
                                 </DataGrid.Columns>
                             </DataGrid>
                         </Grid>
-- 
cgit v1.3.1