From 120a4ac8f9d33b3b0eeaba545402ab55484edadc Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 18 Jul 2018 11:14:03 +0300
Subject: Added out of gamut & volumes check.

---
 .../Views/JobView.xaml                             |  86 ++++--
 .../Views/MainView.xaml                            | 294 +++++++++++----------
 2 files changed, 209 insertions(+), 171 deletions(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index cfa6462e7..d6652b38d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -189,6 +189,28 @@
                                                                 <Setter Property="Grid.Row" Value="0"></Setter>
                                                                 <Setter Property="Background" Value="Transparent"></Setter>
                                                                 <Setter Property="BorderThickness" Value="1"></Setter>
+                                                                <Setter Property="ToolTip">
+                                                                    <Setter.Value>
+                                                                        <ToolTip Background="White">
+                                                                            <ItemsControl ItemsSource="{Binding Coordinates.OutputLiquids}">
+                                                                                <ItemsControl.ItemsPanel>
+                                                                                    <ItemsPanelTemplate>
+                                                                                        <StackPanel Orientation="Horizontal"></StackPanel>
+                                                                                    </ItemsPanelTemplate>
+                                                                                </ItemsControl.ItemsPanel>
+                                                                                <ItemsControl.ItemTemplate>
+                                                                                    <DataTemplate>
+                                                                                        <TextBlock TextAlignment="Center" Foreground="#202020" Margin="10 0">
+                                                                                            <Run Text="{Binding LiquidType}"></Run>
+                                                                                            <LineBreak/>
+                                                                                            <Run Text="{Binding Volume,StringFormat=0}"></Run>
+                                                                                        </TextBlock>
+                                                                                    </DataTemplate>
+                                                                                </ItemsControl.ItemTemplate>
+                                                                            </ItemsControl>
+                                                                        </ToolTip>
+                                                                    </Setter.Value>
+                                                                </Setter>
 
                                                                 <Style.Triggers>
                                                                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self},Path=DataContext,Converter={StaticResource ObjectToObjectTypeConverter}}" Value="{x:Type colorConversion:ColorConversionSuggestion}">
@@ -721,6 +743,11 @@
                                                                                                                                 </DataTemplate>
                                                                                                                             </ItemsControl.ItemTemplate>
                                                                                                                         </ItemsControl>
+
+                                                                                                                        <StackPanel Orientation="Horizontal" Margin="30 10 0 0" Height="16" Visibility="{Binding IsLiquidVolumesOutOfRange,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                                                                                                            <materialDesign:PackIcon Kind="Alert" Foreground="#FFAC3C" />
+                                                                                                                            <TextBlock Margin="5 0 0 0" Foreground="#FFAC3C">Liquid volumes exceeds the maximum range for color conversion!</TextBlock>
+                                                                                                                        </StackPanel>
                                                                                                                     </StackPanel>
                                                                                                                 </Setter.Value>
                                                                                                             </Setter>
@@ -728,32 +755,39 @@
                                                                                                         <DataTrigger Binding="{Binding ColorSpace.Name}" Value="RGB">
                                                                                                             <Setter Property="Content">
                                                                                                                 <Setter.Value>
-                                                                                                                    <StackPanel Orientation="Horizontal">
-                                                                                                                        <ContentControl Style="{StaticResource numberBorder}" Foreground="#FF6F6F" Width="60" Height="60" Margin="10 0 0 0">
-                                                                                                                            <mahapps:NumericUpDown FontSize="{StaticResource NumbersFontSize}" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Red, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center">
-                                                                                                                                <mahapps:NumericUpDown.Resources>
-                                                                                                                                    <Style TargetType="TextBox"/>
-                                                                                                                                </mahapps:NumericUpDown.Resources>
-                                                                                                                            </mahapps:NumericUpDown>
-                                                                                                                        </ContentControl>
-
-                                                                                                                        <ContentControl Style="{StaticResource numberBorder}" Foreground="#92FF92" Width="60" Height="60" Margin="10 0 0 0">
-                                                                                                                            <mahapps:NumericUpDown FontSize="{StaticResource NumbersFontSize}" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Green, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center">
-                                                                                                                                <mahapps:NumericUpDown.Resources>
-                                                                                                                                    <Style TargetType="TextBox"/>
-                                                                                                                                </mahapps:NumericUpDown.Resources>
-                                                                                                                            </mahapps:NumericUpDown>
-                                                                                                                        </ContentControl>
-
-                                                                                                                        <ContentControl Style="{StaticResource numberBorder}" Foreground="#3C7EF4" BorderThickness="1" Width="60" Height="60" Margin="10 0 0 0">
-                                                                                                                            <mahapps:NumericUpDown FontSize="{StaticResource NumbersFontSize}" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Blue, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center">
-                                                                                                                                <mahapps:NumericUpDown.Resources>
-                                                                                                                                    <Style TargetType="TextBox"/>
-                                                                                                                                </mahapps:NumericUpDown.Resources>
-                                                                                                                            </mahapps:NumericUpDown>
-                                                                                                                        </ContentControl>
-
-                                                                                                                        <ContentControl Style="{StaticResource colorPicker}"></ContentControl>
+                                                                                                                    <StackPanel>
+                                                                                                                        <StackPanel Orientation="Horizontal">
+                                                                                                                            <ContentControl Style="{StaticResource numberBorder}" Foreground="#FF6F6F" Width="60" Height="60" Margin="10 0 0 0">
+                                                                                                                                <mahapps:NumericUpDown FontSize="{StaticResource NumbersFontSize}" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Red, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center">
+                                                                                                                                    <mahapps:NumericUpDown.Resources>
+                                                                                                                                        <Style TargetType="TextBox"/>
+                                                                                                                                    </mahapps:NumericUpDown.Resources>
+                                                                                                                                </mahapps:NumericUpDown>
+                                                                                                                            </ContentControl>
+
+                                                                                                                            <ContentControl Style="{StaticResource numberBorder}" Foreground="#92FF92" Width="60" Height="60" Margin="10 0 0 0">
+                                                                                                                                <mahapps:NumericUpDown FontSize="{StaticResource NumbersFontSize}" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Green, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center">
+                                                                                                                                    <mahapps:NumericUpDown.Resources>
+                                                                                                                                        <Style TargetType="TextBox"/>
+                                                                                                                                    </mahapps:NumericUpDown.Resources>
+                                                                                                                                </mahapps:NumericUpDown>
+                                                                                                                            </ContentControl>
+
+                                                                                                                            <ContentControl Style="{StaticResource numberBorder}" Foreground="#3C7EF4" BorderThickness="1" Width="60" Height="60" Margin="10 0 0 0">
+                                                                                                                                <mahapps:NumericUpDown FontSize="{StaticResource NumbersFontSize}" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Blue, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center">
+                                                                                                                                    <mahapps:NumericUpDown.Resources>
+                                                                                                                                        <Style TargetType="TextBox"/>
+                                                                                                                                    </mahapps:NumericUpDown.Resources>
+                                                                                                                                </mahapps:NumericUpDown>
+                                                                                                                            </ContentControl>
+
+                                                                                                                            <ContentControl Style="{StaticResource colorPicker}"></ContentControl>
+                                                                                                                        </StackPanel>
+
+                                                                                                                        <StackPanel Orientation="Horizontal" Margin="30 10 0 0" Height="16" Visibility="{Binding IsOutOfGamut,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                                                                                                            <materialDesign:PackIcon Kind="Alert" Foreground="#FF6D6D" />
+                                                                                                                            <TextBlock Margin="5 0 0 0" Foreground="#FF6D6D">Color is out of gamut!</TextBlock>
+                                                                                                                        </StackPanel>
                                                                                                                     </StackPanel>
                                                                                                                 </Setter.Value>
                                                                                                             </Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
index d8da5a804..4830b67ed 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
@@ -131,163 +131,165 @@
                                                     <DataTemplate>
                                                         <Grid ClipToBounds="False">
                                                             <Grid.ToolTip>
-                                                                <ToolTip Background="White" BorderThickness="1" BorderBrush="#202020">
-                                                                    <StackPanel Background="White">
-                                                                        <ItemsControl ItemsSource="{Binding BrushStops[0].LiquidVolumes}" VerticalAlignment="Center">
-                                                                            <ItemsControl.ItemsPanel>
-                                                                                <ItemsPanelTemplate>
-                                                                                    <StackPanel VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
-                                                                                </ItemsPanelTemplate>
-                                                                            </ItemsControl.ItemsPanel>
-                                                                            <ItemsControl.ItemTemplate>
-                                                                                <DataTemplate>
-                                                                                    <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Width="60" Height="60" Margin="10 0 0 0">
-                                                                                        <ContentControl.Foreground>
-                                                                                            <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
-                                                                                        </ContentControl.Foreground>
-                                                                                        <TextBlock Foreground="#202020" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Volume,StringFormat=0.00}"></TextBlock>
-                                                                                    </ContentControl>
-                                                                                </DataTemplate>
-                                                                            </ItemsControl.ItemTemplate>
-                                                                        </ItemsControl>
-
-                                                                        <DataGrid Margin="0 10 0 0" IsReadOnly="True" ItemsSource="{Binding BrushStops[0].LiquidVolumes}" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False" CanUserSortColumns="False" Background="Transparent" SelectionUnit="FullRow">
-                                                                            <DataGrid.CellStyle>
-                                                                                <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
-                                                                                    <Setter Property="BorderThickness" Value="0"/>
-                                                                                    <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-                                                                                </Style>
-                                                                            </DataGrid.CellStyle>
-                                                                            <DataGrid.Columns>
-                                                                                <DataGridTemplateColumn Header="IDS PACK">
-                                                                                    <DataGridTemplateColumn.CellTemplate>
-                                                                                        <DataTemplate>
-                                                                                            <Grid x:Name="t0">
-                                                                                                <Polygon x:Name="t1" Points="0,0 15,0 0,15 0,0" Margin="-15 -11 0 0">
-                                                                                                    <Polygon.Fill>
-                                                                                                        <SolidColorBrush x:Name="t2" Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter},FallbackValue={StaticResource dummyColor}}" />
-                                                                                                    </Polygon.Fill>
-                                                                                                </Polygon>
-                                                                                                <TextBlock FontWeight="SemiBold" TextWrapping="Wrap" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding IdsPack.LiquidType.Name}"></TextBlock>
-                                                                                            </Grid>
-                                                                                        </DataTemplate>
-                                                                                    </DataGridTemplateColumn.CellTemplate>
-                                                                                </DataGridTemplateColumn>
-                                                                                <DataGridTemplateColumn Header="D/F">
-                                                                                    <DataGridTemplateColumn.CellTemplate>
-                                                                                        <DataTemplate>
-                                                                                            <TextBlock VerticalAlignment="Center">
+                                                                <ToolTip Background="White" Padding="0" Visibility="{Binding IsInterSegment,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                                                    <Border BorderThickness="1" BorderBrush="#202020" CornerRadius="3" Padding="5">
+                                                                        <StackPanel Background="White">
+                                                                            <ItemsControl ItemsSource="{Binding BrushStops[0].LiquidVolumes}" VerticalAlignment="Center">
+                                                                                <ItemsControl.ItemsPanel>
+                                                                                    <ItemsPanelTemplate>
+                                                                                        <StackPanel VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
+                                                                                    </ItemsPanelTemplate>
+                                                                                </ItemsControl.ItemsPanel>
+                                                                                <ItemsControl.ItemTemplate>
+                                                                                    <DataTemplate>
+                                                                                        <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Width="60" Height="60" Margin="10 0 0 0">
+                                                                                            <ContentControl.Foreground>
+                                                                                                <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
+                                                                                            </ContentControl.Foreground>
+                                                                                            <TextBlock Foreground="#202020" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Volume,StringFormat=0.00}"></TextBlock>
+                                                                                        </ContentControl>
+                                                                                    </DataTemplate>
+                                                                                </ItemsControl.ItemTemplate>
+                                                                            </ItemsControl>
+
+                                                                            <DataGrid Margin="0 10 0 0" SelectedIndex="-1" IsReadOnly="True" ItemsSource="{Binding BrushStops[0].LiquidVolumes}" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False" CanUserSortColumns="False" Background="Transparent" SelectionUnit="FullRow">
+                                                                                <DataGrid.CellStyle>
+                                                                                    <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+                                                                                        <Setter Property="BorderThickness" Value="0"/>
+                                                                                        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                                                                                    </Style>
+                                                                                </DataGrid.CellStyle>
+                                                                                <DataGrid.Columns>
+                                                                                    <DataGridTemplateColumn Header="IDS PACK">
+                                                                                        <DataGridTemplateColumn.CellTemplate>
+                                                                                            <DataTemplate>
+                                                                                                <Grid x:Name="t0">
+                                                                                                    <Polygon x:Name="t1" Points="0,0 15,0 0,15 0,0" Margin="-15 -11 0 0">
+                                                                                                        <Polygon.Fill>
+                                                                                                            <SolidColorBrush x:Name="t2" Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter},FallbackValue={StaticResource dummyColor}}" />
+                                                                                                        </Polygon.Fill>
+                                                                                                    </Polygon>
+                                                                                                    <TextBlock FontWeight="SemiBold" TextWrapping="Wrap" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding IdsPack.LiquidType.Name}"></TextBlock>
+                                                                                                </Grid>
+                                                                                            </DataTemplate>
+                                                                                        </DataGridTemplateColumn.CellTemplate>
+                                                                                    </DataGridTemplateColumn>
+                                                                                    <DataGridTemplateColumn Header="D/F">
+                                                                                        <DataGridTemplateColumn.CellTemplate>
+                                                                                            <DataTemplate>
+                                                                                                <TextBlock VerticalAlignment="Center">
                                                                                                                         <Run Text="{Binding IdsPack.DispenserType.NlPerPulse,StringFormat='0.0'}"></Run>
                                                                                                                         <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
-                                                                                            </TextBlock>
-                                                                                        </DataTemplate>
-                                                                                    </DataGridTemplateColumn.CellTemplate>
-                                                                                </DataGridTemplateColumn>
-                                                                                <DataGridTemplateColumn Header="STEP">
-                                                                                    <DataGridTemplateColumn.CellTemplate>
-                                                                                        <DataTemplate>
-                                                                                            <ComboBox ItemsSource="{Binding Source={StaticResource dispenserDivisions}}" SelectedItem="{Binding DispenserStepDivision,UpdateSourceTrigger=PropertyChanged}">
-                                                                                                <ComboBox.ItemContainerStyle>
-                                                                                                    <Style TargetType="ComboBoxItem" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
-                                                                                                        <Setter Property="Background" Value="#ECECEC"></Setter>
-                                                                                                    </Style>
-                                                                                                </ComboBox.ItemContainerStyle>
-                                                                                                <ComboBox.ItemTemplate>
-                                                                                                    <DataTemplate>
-                                                                                                        <TextBlock Text="{Binding Converter={StaticResource EnumToDescriptionConverter}}"></TextBlock>
-                                                                                                    </DataTemplate>
-                                                                                                </ComboBox.ItemTemplate>
-                                                                                            </ComboBox>
-                                                                                        </DataTemplate>
-                                                                                    </DataGridTemplateColumn.CellTemplate>
-                                                                                </DataGridTemplateColumn>
-                                                                                <DataGridTemplateColumn Header="MAX NL / CM">
-                                                                                    <DataGridTemplateColumn.CellTemplate>
-                                                                                        <DataTemplate>
-                                                                                            <TextBlock VerticalAlignment="Center">
+                                                                                                </TextBlock>
+                                                                                            </DataTemplate>
+                                                                                        </DataGridTemplateColumn.CellTemplate>
+                                                                                    </DataGridTemplateColumn>
+                                                                                    <DataGridTemplateColumn Header="STEP">
+                                                                                        <DataGridTemplateColumn.CellTemplate>
+                                                                                            <DataTemplate>
+                                                                                                <ComboBox ItemsSource="{Binding Source={StaticResource dispenserDivisions}}" SelectedItem="{Binding DispenserStepDivision,UpdateSourceTrigger=PropertyChanged}">
+                                                                                                    <ComboBox.ItemContainerStyle>
+                                                                                                        <Style TargetType="ComboBoxItem" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
+                                                                                                            <Setter Property="Background" Value="#ECECEC"></Setter>
+                                                                                                        </Style>
+                                                                                                    </ComboBox.ItemContainerStyle>
+                                                                                                    <ComboBox.ItemTemplate>
+                                                                                                        <DataTemplate>
+                                                                                                            <TextBlock Text="{Binding Converter={StaticResource EnumToDescriptionConverter}}"></TextBlock>
+                                                                                                        </DataTemplate>
+                                                                                                    </ComboBox.ItemTemplate>
+                                                                                                </ComboBox>
+                                                                                            </DataTemplate>
+                                                                                        </DataGridTemplateColumn.CellTemplate>
+                                                                                    </DataGridTemplateColumn>
+                                                                                    <DataGridTemplateColumn Header="MAX NL / CM">
+                                                                                        <DataGridTemplateColumn.CellTemplate>
+                                                                                            <DataTemplate>
+                                                                                                <TextBlock VerticalAlignment="Center">
                                                                                                                         <Run Text="{Binding LiquidMaxNanoliterPerCentimeter,Mode=OneWay,StringFormat='0.0'}"></Run>
                                                                                                                         <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
-                                                                                            </TextBlock>
-                                                                                        </DataTemplate>
-                                                                                    </DataGridTemplateColumn.CellTemplate>
-                                                                                </DataGridTemplateColumn>
-                                                                                <DataGridTemplateColumn Header="VOLUME">
-                                                                                    <DataGridTemplateColumn.CellTemplate>
-                                                                                        <DataTemplate>
-                                                                                            <TextBlock VerticalAlignment="Center">
+                                                                                                </TextBlock>
+                                                                                            </DataTemplate>
+                                                                                        </DataGridTemplateColumn.CellTemplate>
+                                                                                    </DataGridTemplateColumn>
+                                                                                    <DataGridTemplateColumn Header="VOLUME">
+                                                                                        <DataGridTemplateColumn.CellTemplate>
+                                                                                            <DataTemplate>
+                                                                                                <TextBlock VerticalAlignment="Center">
                                                                                                                         <Run Text="{Binding Volume,StringFormat='0.0'}"></Run>
                                                                                                                         <Run Text="%" Foreground="Gray"></Run>
-                                                                                            </TextBlock>
-                                                                                        </DataTemplate>
-                                                                                    </DataGridTemplateColumn.CellTemplate>
-                                                                                </DataGridTemplateColumn>
-                                                                                <DataGridTemplateColumn Header="FORMULA">
-                                                                                    <DataGridTemplateColumn.CellTemplate>
-                                                                                        <DataTemplate>
-                                                                                            <TextBlock VerticalAlignment="Center">
+                                                                                                </TextBlock>
+                                                                                            </DataTemplate>
+                                                                                        </DataGridTemplateColumn.CellTemplate>
+                                                                                    </DataGridTemplateColumn>
+                                                                                    <DataGridTemplateColumn Header="FORMULA">
+                                                                                        <DataGridTemplateColumn.CellTemplate>
+                                                                                            <DataTemplate>
+                                                                                                <TextBlock VerticalAlignment="Center">
                                                                                                                         <Run Text="{Binding IdsPack.IdsPackFormula.Name}"></Run>
-                                                                                            </TextBlock>
-                                                                                        </DataTemplate>
-                                                                                    </DataGridTemplateColumn.CellTemplate>
-                                                                                </DataGridTemplateColumn>
-                                                                                <DataGridTemplateColumn Header="NL / CM">
-                                                                                    <DataGridTemplateColumn.CellTemplate>
-                                                                                        <DataTemplate>
-                                                                                            <TextBlock VerticalAlignment="Center">
+                                                                                                </TextBlock>
+                                                                                            </DataTemplate>
+                                                                                        </DataGridTemplateColumn.CellTemplate>
+                                                                                    </DataGridTemplateColumn>
+                                                                                    <DataGridTemplateColumn Header="NL / CM">
+                                                                                        <DataGridTemplateColumn.CellTemplate>
+                                                                                            <DataTemplate>
+                                                                                                <TextBlock VerticalAlignment="Center">
                                                                                                                         <Run Text="{Binding NanoliterPerCentimeter,Mode=OneWay,StringFormat='0.0'}"></Run>
                                                                                                                         <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
-                                                                                            </TextBlock>
-                                                                                        </DataTemplate>
-                                                                                    </DataGridTemplateColumn.CellTemplate>
-                                                                                </DataGridTemplateColumn>
-                                                                                <DataGridTemplateColumn Header="NL / SEC">
-                                                                                    <DataGridTemplateColumn.CellTemplate>
-                                                                                        <DataTemplate>
-                                                                                            <TextBlock VerticalAlignment="Center">
+                                                                                                </TextBlock>
+                                                                                            </DataTemplate>
+                                                                                        </DataGridTemplateColumn.CellTemplate>
+                                                                                    </DataGridTemplateColumn>
+                                                                                    <DataGridTemplateColumn Header="NL / SEC">
+                                                                                        <DataGridTemplateColumn.CellTemplate>
+                                                                                            <DataTemplate>
+                                                                                                <TextBlock VerticalAlignment="Center">
                                                                                                                         <Run Text="{Binding NanoliterPerSecond,Mode=OneWay,StringFormat='0.0'}"></Run>
                                                                                                                         <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
-                                                                                            </TextBlock>
-                                                                                        </DataTemplate>
-                                                                                    </DataGridTemplateColumn.CellTemplate>
-                                                                                </DataGridTemplateColumn>
-                                                                                <DataGridTemplateColumn Header="PULSE / SEC">
-                                                                                    <DataGridTemplateColumn.CellTemplate>
-                                                                                        <DataTemplate>
-                                                                                            <Label VerticalAlignment="Center">
-                                                                                                <Label.Style>
-                                                                                                    <Style TargetType="Label">
-                                                                                                        <Setter Property="Content">
-                                                                                                            <Setter.Value>
-                                                                                                                <TextBlock>
+                                                                                                </TextBlock>
+                                                                                            </DataTemplate>
+                                                                                        </DataGridTemplateColumn.CellTemplate>
+                                                                                    </DataGridTemplateColumn>
+                                                                                    <DataGridTemplateColumn Header="PULSE / SEC">
+                                                                                        <DataGridTemplateColumn.CellTemplate>
+                                                                                            <DataTemplate>
+                                                                                                <Label VerticalAlignment="Center">
+                                                                                                    <Label.Style>
+                                                                                                        <Style TargetType="Label">
+                                                                                                            <Setter Property="Content">
+                                                                                                                <Setter.Value>
+                                                                                                                    <TextBlock>
                                                                                                                                                  <Run Text="{Binding PulsePerSecond,Mode=OneWay,StringFormat='0.0'}"></Run>
                                                                                                                                                  <Run Text="(pulse)" FontSize="9" Foreground="Gray"></Run>
-                                                                                                                </TextBlock>
-                                                                                                            </Setter.Value>
-                                                                                                        </Setter>
-                                                                                                        <Style.Triggers>
-                                                                                                            <DataTrigger Binding="{Binding DispenserStepDivision}" Value="{x:Static dispensing:DispenserStepDivisions.Auto}">
-                                                                                                                <Setter Property="Content" Value="Auto"></Setter>
-                                                                                                            </DataTrigger>
-                                                                                                            <DataTrigger Binding="{Binding DispenserStepDivision,Converter={StaticResource IsNotConverter},ConverterParameter={x:Static dispensing:DispenserStepDivisions.Auto}}" Value="True">
-                                                                                                                <Setter Property="Content">
-                                                                                                                    <Setter.Value>
-                                                                                                                        <TextBlock>
+                                                                                                                    </TextBlock>
+                                                                                                                </Setter.Value>
+                                                                                                            </Setter>
+                                                                                                            <Style.Triggers>
+                                                                                                                <DataTrigger Binding="{Binding DispenserStepDivision}" Value="{x:Static dispensing:DispenserStepDivisions.Auto}">
+                                                                                                                    <Setter Property="Content" Value="Auto"></Setter>
+                                                                                                                </DataTrigger>
+                                                                                                                <DataTrigger Binding="{Binding DispenserStepDivision,Converter={StaticResource IsNotConverter},ConverterParameter={x:Static dispensing:DispenserStepDivisions.Auto}}" Value="True">
+                                                                                                                    <Setter Property="Content">
+                                                                                                                        <Setter.Value>
+                                                                                                                            <TextBlock>
                                                                                                                                                  <Run Text="{Binding PulsePerSecond,Mode=OneWay,StringFormat='0.0'}"></Run>
                                                                                                                                                  <Run Text="(pulse)" FontSize="9" Foreground="Gray"></Run>
-                                                                                                                        </TextBlock>
-                                                                                                                    </Setter.Value>
-                                                                                                                </Setter>
-                                                                                                            </DataTrigger>
-                                                                                                        </Style.Triggers>
-                                                                                                    </Style>
-                                                                                                </Label.Style>
-                                                                                            </Label>
-                                                                                        </DataTemplate>
-                                                                                    </DataGridTemplateColumn.CellTemplate>
-                                                                                </DataGridTemplateColumn>
-                                                                            </DataGrid.Columns>
-                                                                        </DataGrid>
-                                                                    </StackPanel>
+                                                                                                                            </TextBlock>
+                                                                                                                        </Setter.Value>
+                                                                                                                    </Setter>
+                                                                                                                </DataTrigger>
+                                                                                                            </Style.Triggers>
+                                                                                                        </Style>
+                                                                                                    </Label.Style>
+                                                                                                </Label>
+                                                                                            </DataTemplate>
+                                                                                        </DataGridTemplateColumn.CellTemplate>
+                                                                                    </DataGridTemplateColumn>
+                                                                                </DataGrid.Columns>
+                                                                            </DataGrid>
+                                                                        </StackPanel>
+                                                                    </Border>
                                                                 </ToolTip>
                                                             </Grid.ToolTip>
                                                             <Grid.Width>
@@ -301,10 +303,12 @@
                                                             <StackPanel Margin="0 0 0 0" ClipToBounds="False">
 
                                                                 <StackPanel Margin="0 0 0 0" HorizontalAlignment="Center" VerticalAlignment="Center">
-                                                                    <TextBlock Margin="0 0 0 0" FontSize="14" HorizontalAlignment="Right">
-                                                                                <Run Text="{Binding Length,Mode=OneWay,StringFormat=N2}"></Run>
-                                                                                <Run FontSize="12" Text="m"></Run>
+                                                                    <Canvas Height="19">
+                                                                    <TextBlock Canvas.Top="0" Canvas.Left="-7" Margin="0 0 0 0" FontSize="10" HorizontalAlignment="Right">
+                                                                                <Run Text="{Binding Length,Mode=OneWay,StringFormat=0}"></Run>
+                                                                                <Run FontSize="7" Text="m"></Run>
                                                                     </TextBlock>
+                                                                    </Canvas>
                                                                     <materialDesign:PackIcon HorizontalAlignment="Center" RenderTransformOrigin="0.5,0.5" Kind="Triangle" Width="12" Height="12">
                                                                         <materialDesign:PackIcon.RenderTransform>
                                                                             <RotateTransform Angle="180" />
-- 
cgit v1.3.1