Color calibration. Changes in GUI.

2 files changed, 76 insertions, 31 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorCalibrationView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorCalibrationView.xaml
index ffe3bf68e..de433b7e7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorCalibrationView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorCalibrationView.xaml
@@ -36,26 +36,28 @@
                     <ColumnDefinition Width="1*"/>
                     <ColumnDefinition Width="1*"/>
                 </Grid.ColumnDefinitions>
-                <Grid Grid.Column="0" Margin="20 0 0 0">
+                <Grid Grid.Column="0" Margin="20 0 20 0">
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
                         <RowDefinition Height="1*"/>
-                        <RowDefinition Height="1"/>
+                        <RowDefinition Height="3*"/>
                     </Grid.RowDefinitions>
-                    <Border Grid.Row="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Width="Auto" Height="80" Margin="0 0 0 20" >
-                        <StackPanel Orientation="Vertical">
-                            <TextBlock FontSize="16" HorizontalAlignment="Left" >Liquid Type</TextBlock>
+                    <Grid Grid.Row="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Width="Auto" Height="80" Margin="0 0 0 20" >
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*"></ColumnDefinition>
+                            <ColumnDefinition Width="1*"></ColumnDefinition>
+                        </Grid.ColumnDefinitions>
+                        <StackPanel Orientation="Vertical" Grid.Column="0">
+                            <TextBlock FontSize="20" HorizontalAlignment="Left" >Liquid Type</TextBlock>
                             <ComboBox Margin="0 20 0 0" MinWidth="140" HorizontalAlignment="Left" ItemsSource="{Binding LiquidTypes}"
                                       SelectedItem="{Binding LiquidType}" DisplayMemberPath="Name"
                                       Style="{StaticResource TransparentComboBoxStyle}" FontSize="16"></ComboBox>
                         </StackPanel>
-                    </Border>
+                        <Button Grid.Column="1" VerticalAlignment="Top"  Background="{StaticResource TransparentBackgroundBrush200}" MinWidth="160" Height="50" BorderBrush="{StaticResource TransparentBackgroundBrush200}" Command="{Binding CreateGraphCommand}" >
+                            <TextBlock FontSize="16"  Foreground="{StaticResource MainWindow.Foreground}">GET MAX DISPENSING RATE</TextBlock>
+                        </Button>
+                    </Grid>
                     <Grid  Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Stretch">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="1*"/>
-                            <RowDefinition Height="Auto"/>
-                        </Grid.RowDefinitions>
-                        <DataGrid HorizontalAlignment="Left" VerticalScrollBarVisibility ="Auto"  Margin="0 0 0 10" SelectionUnit="FullRow" BorderBrush="{StaticResource DarkGrayBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="True" CanUserDeleteRows="False" ItemsSource="{Binding Measurements}" >
+                        <DataGrid HorizontalAlignment="Left" VerticalScrollBarVisibility ="Auto"   SelectionUnit="FullRow" BorderBrush="{StaticResource DarkGrayBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="True" CanUserDeleteRows="False" ItemsSource="{Binding Measurements}" Margin="0 30 0 50">
                             <DataGrid.CellStyle>
                                 <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
                                     <Setter Property="BorderThickness" Value="0"/>
@@ -97,14 +99,17 @@
                                 <mahapps:DataGridNumericUpDownColumn Header="B" Minimum="-128" Maximum="127" Binding="{Binding B}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
                             </DataGrid.Columns>
                         </DataGrid>
-                        <Button Grid.Row="1"  Background="{StaticResource TransparentBackgroundBrush200}" MinWidth="160" Height="50" BorderBrush="{StaticResource TransparentBackgroundBrush200}" Command="{Binding CreateGraphCommand}" >
-                            <TextBlock FontSize="16"  Foreground="{StaticResource MainWindow.Foreground}">CREATE GRAPH</TextBlock>
-                        </Button>
+                        
                     </Grid>
                 </Grid>
-                <Grid Grid.Column="1">
-                    <Border  HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="20 20 0 0">
-                        <oxy:Plot Title="{Binding CalibrationType}" x:Name="CalibrationPlot">
+                <Grid Grid.Column="1" Margin="20 0 20 0">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="3*"/>
+                        </Grid.RowDefinitions>
+                        <Border  Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0 20 0 0" BorderThickness="0" BorderBrush="{StaticResource DarkGrayBrush}" CornerRadius="5">
+                            <oxy:Plot Title="{Binding CalibrationLiquidTypeName}" x:Name="CalibrationPlot" Margin="0 0 10 0" Background="Transparent">
                             <oxy:Plot.Series >
                                 <oxy:LineSeries ItemsSource="{Binding Points}"  Color="#73B6EC" MarkerFill="SteelBlue"  MarkerType="Circle" />
                                 <oxy:LineSeries ItemsSource="{Binding TargetPoints}"  Color="#E14141"   MarkerFill="#E14141"  MarkerType="Circle" />
@@ -114,20 +119,59 @@
                                 <oxy:LinearAxis Position="Left"  Title = "Lab" MajorGridlineStyle="Solid" MinorGridlineStyle="Dot" IsZoomEnabled="True" Minimum="{Binding From}" Maximum="{Binding To}"/>
                             </oxy:Plot.Axes>
                         </oxy:Plot>
-                    </Border>
-                </Grid>
-                <Grid Grid.Column="2" Margin="40 0 0 0">
-                    <StackPanel Orientation="Vertical">
-                        <TextBlock FontSize="16"  HorizontalAlignment="Left" Foreground="{StaticResource MainWindow.Foreground}" Height="50"   Visibility="{Binding HasError, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
-                            <Run FontWeight="DemiBold"> Factor: </Run>
-                            <Run Text="{Binding Factor}"></Run>
-                            <LineBreak />
-                        </TextBlock>
-                        <TextBlock FontSize="16"  Foreground="{StaticResource MainWindow.Foreground}"  FontWeight="SemiBold" Visibility="{Binding HasError, Converter={StaticResource BooleanToVisibilityConverter}}" Margin="0 20 10 20" >Warning:</TextBlock>
-                        <Border BorderThickness="1" CornerRadius="4" BorderBrush="{StaticResource DarkGrayBrush}" Visibility="{Binding HasError, Converter={StaticResource BooleanToVisibilityConverter}}">
-                            <TextBlock Margin="5" Foreground="{StaticResource RedBrush300}" Text="{Binding ErrorMessage}" Height="75" TextWrapping="Wrap" TextTrimming="CharacterEllipsis" />
                         </Border>
-                    </StackPanel>
+                        <Border BorderBrush="{StaticResource BlueBrush100}" BorderThickness="0" CornerRadius="5" Margin="55 0 20 0">
+                            <StackPanel Orientation="Vertical" Grid.Row="0" Margin="10 10 0 0">
+
+                                <TextBlock FontSize="16"  HorizontalAlignment="Left" Foreground="{StaticResource MainWindow.Foreground}" Height="50"   Visibility="{Binding HasError, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                <Run  FontSize="20"> Factor:  </Run>
+                                <Run Text="{Binding Factor}" Foreground="{StaticResource BlueBrush100}"></Run>
+                                <LineBreak />
+                                </TextBlock>
+                                <TextBlock FontSize="16"  Foreground="{StaticResource MainWindow.Foreground}"  FontWeight="SemiBold" Visibility="{Binding HasError, Converter={StaticResource BooleanToVisibilityConverter}}" Margin="0 20 10 10" >Warning:</TextBlock>
+
+                                <Border BorderThickness="1" CornerRadius="4" BorderBrush="{StaticResource DarkGrayBrush}" Visibility="{Binding HasError, Converter={StaticResource BooleanToVisibilityConverter}}" Height="Auto">
+                                    <TextBlock Margin="5" Foreground="{StaticResource RedBrush300}" Text="{Binding ErrorMessage}"  TextWrapping="Wrap"  Padding="5" FontSize="14"/>
+                                </Border>
+                            </StackPanel>
+                        </Border>
+                    </Grid>
+                </Grid>
+                <Grid Grid.Column="2" Margin="10 0 0 0">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="3*"/>
+                        </Grid.RowDefinitions>
+                        <Grid Grid.Row="0"  Margin="55 0 0 0">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <StackPanel Orientation="Vertical" Grid.Column="0">
+                                <TextBlock HorizontalAlignment="Left" FontSize="20" >Liquid Type</TextBlock>
+                                <ComboBox Margin="0 20 0 0" MinWidth="140" HorizontalAlignment="Left" ItemsSource="{Binding LiquidTypes}"
+                                      SelectedItem="{Binding SelectedLinearizationLiquidType}" DisplayMemberPath="Name"
+                                      Style="{StaticResource TransparentComboBoxStyle}" FontSize="16"></ComboBox>
+                            </StackPanel>
+                            <Button Grid.Column="1" IsEnabled="False" VerticalAlignment="Top" Background="{StaticResource TransparentBackgroundBrush200}" MinWidth="160" Height="50" BorderBrush="{StaticResource TransparentBackgroundBrush200}" Command="{Binding CreateLinearizationGraphCommand}" >
+                                <TextBlock FontSize="16"  Foreground="{StaticResource MainWindow.Foreground}">CREATE LINEARIZATION GRAPH</TextBlock>
+                            </Button>
+                           
+                        </Grid>
+                        <Border  Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0 20 0 0" BorderThickness="0" BorderBrush="{StaticResource DarkGrayBrush}" CornerRadius="5">
+                                <oxy:Plot Title="{Binding LinearizationLiquidTypeName}" x:Name="LinearizationPlot" Margin="0 0 10 0" Background="Transparent">
+                                    <oxy:Plot.Series >
+                                        <oxy:LineSeries ItemsSource="{Binding LinearizationPoints}"  Color="#73B6EC" MarkerFill="SteelBlue" />
+                                    </oxy:Plot.Series>
+                                    <oxy:Plot.Axes>
+                                        <oxy:LinearAxis Position="Bottom"  Title = "In Ink" MajorGridlineStyle="Solid" MinorGridlineStyle="Dot" IsZoomEnabled="True" Minimum="0"/>
+                                        <oxy:LinearAxis Position="Left"  Title = "Out Ink" MajorGridlineStyle="Solid" MinorGridlineStyle="Dot" IsZoomEnabled="True" Minimum="0" />
+                                    </oxy:Plot.Axes>
+                                </oxy:Plot>
+                            </Border>
+                    </Grid>
+                    
                 </Grid>
             </Grid>
             </DockPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorCalibrationView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorCalibrationView.xaml.cs
index 4c456c12d..d56b3c6c9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorCalibrationView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorCalibrationView.xaml.cs
@@ -33,6 +33,7 @@ namespace Tango.MachineStudio.RML.Views
             {
                 ColorCalibrationViewVM vm = (ColorCalibrationViewVM)DataContext;
                 vm.PlotControl = CalibrationPlot;
+                vm.LinearizationPlotControl = LinearizationPlot;
                 vm.Loading();
             }
         }