Present Lubricant Ink with divider, sort the Ink level indicators.

Related Work Items: #8528

1 files changed, 97 insertions, 17 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
index 996b54d13..1cdc39973 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
@@ -162,11 +162,90 @@
 
                         </Path>
                     </Grid>
-                    <UniformGrid Rows="4" Columns="1" Margin="0 15 0 15" HorizontalAlignment="Center">
-                        <Rectangle Width="10" Height="2" Stroke="{StaticResource TangoTextWatermarkBrush}"></Rectangle>
-                        <Rectangle Width="10" Height="2" Stroke="{StaticResource TangoTextWatermarkBrush}"></Rectangle>
-                        <Rectangle Width="10" Height="2" Stroke="{StaticResource TangoTextWatermarkBrush}"></Rectangle>
-                        <Rectangle Width="10" Height="2" Stroke="{StaticResource TangoTextWatermarkBrush}"></Rectangle>
+                    <UniformGrid Rows="4" Columns="1" Margin="0 12 0 12" HorizontalAlignment="Center">
+                        <Rectangle Width="6" Height="2"  Fill="{StaticResource TangoKeyboardKeyDarkBrush}"></Rectangle>
+                        <Rectangle Width="6" Height="2"  Fill="{StaticResource TangoKeyboardKeyDarkBrush}"></Rectangle>
+                        <Rectangle Width="6" Height="2"  Fill="{StaticResource TangoKeyboardKeyDarkBrush}"></Rectangle>
+                        <Rectangle Width="6" Height="2"  Fill="{StaticResource TangoKeyboardKeyDarkBrush}"></Rectangle>
+                    </UniformGrid>
+                    <Image Stretch="Fill" VerticalAlignment="Top" Margin="0 4 0 0">
+                        <Image.Style>
+                            <Style TargetType="{x:Type Image}" >
+                                <Setter Property="Source" Value="{x:Null}"/>
+                                <Setter Property="Image.Width" Value="24"/>
+                                <Setter Property="Image.Height" Value="24"/>
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding IsMidTankLow}" Value="True">
+                                        <Setter Property="Source" Value="../Images/Overview Icons/Warning.png"/>
+                                    </DataTrigger>
+                                    <DataTrigger Binding="{Binding FillingTimeoutError}" Value="True">
+                                        <Setter Property="Source" Value="../Images/Overview Icons/Error.png"/>
+                                        <Setter Property="Image.Width" Value="21"/>
+                                        <Setter Property="Image.Height" Value="26"/>
+                                    </DataTrigger>
+                                    <DataTrigger Binding="{Binding MidTankEmpty}" Value="True">
+                                        <Setter Property="Source" Value="../Images/Overview Icons/Error.png"/>
+                                        <Setter Property="Image.Width" Value="21"/>
+                                        <Setter Property="Image.Height" Value="26"/>
+                                    </DataTrigger>
+                                    <DataTrigger Binding="{Binding MidTankRefillPumpActive}" Value="True" >
+                                        <Setter Property="Source" Value="../Images/Overview Icons/UpdateInk.png"/>
+                                    </DataTrigger>
+                                    <DataTrigger Binding="{Binding JerricanPresent}" Value="False" >
+                                        <Setter Property="Source" Value="../Images/Overview Icons/JericanRemoved.png"/>
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </Image.Style>
+                    </Image>
+                </Grid>
+            </DockPanel>
+        </DataTemplate>
+
+        <DataTemplate x:Key="LubLiquidBox" DataType="{x:Type models:JerricanLevelModel}">
+            <DockPanel>
+                <TextBlock DockPanel.Dock="Bottom" Text="Lub" HorizontalAlignment="Center" Margin="0 8 0 0"></TextBlock>
+                <Grid Height="15" DockPanel.Dock="Top">
+                    <TextBlock DockPanel.Dock="Top" Height="15" VerticalAlignment="Top" TextAlignment="Center" Visibility="{Binding HasRemainingTimeoutError,Converter={StaticResource BooleanToVisibilityConverter}}" Text="{Binding RemainingTimeoutError, StringFormat='{}{0:hh}:{0:mm}m', FallbackValue=00:00}" HorizontalAlignment="Center" FontSize="{StaticResource TangoSmallFontSizeBar}" ></TextBlock>
+                </Grid>
+                <Grid >
+                    <Grid ClipToBounds="True" HorizontalAlignment="Center">
+                        <Path Fill="{Binding Path=IDSPack.LiquidType, Converter={StaticResource LiquidTypeToBrushConverter}}"  StrokeThickness="1.5" >
+                            <Path.Resources>
+                                <sys:Double x:Key="RectWidth">30</sys:Double>
+                                <sys:Double x:Key="RectHeight">88</sys:Double>
+                            </Path.Resources>
+                            <Path.Data>
+                                <CombinedGeometry GeometryCombineMode="Intersect">
+                                    <CombinedGeometry.Geometry1>
+                                        <StaticResource ResourceKey="InkContainerPath"/>
+                                    </CombinedGeometry.Geometry1>
+                                    <CombinedGeometry.Geometry2>
+                                        <!--Rect="1,30 30,88"-->
+                                        <RectangleGeometry >
+                                            <RectangleGeometry.Rect>
+                                                <MultiBinding Converter="{StaticResource MidTankLevelToElementRectConverter}">
+                                                    <Binding Source="{StaticResource RectHeight}"/>
+                                                    <Binding Source="{StaticResource RectWidth}"/>
+                                                    <Binding Path="Level" />
+                                                    <Binding Path="IDSPack.MidTankType.LiterCapacity" />
+                                                </MultiBinding>
+                                            </RectangleGeometry.Rect>
+                                        </RectangleGeometry>
+                                    </CombinedGeometry.Geometry2>
+                                </CombinedGeometry>
+                            </Path.Data>
+
+                        </Path>
+                        <Path  Stroke="{StaticResource TangoTextWatermarkBrush}" Fill="Transparent" StrokeThickness="1" Data="{StaticResource InkContainerPath}">
+
+                        </Path>
+                    </Grid>
+                    <UniformGrid Rows="4" Columns="1" Margin="0 12 0 12" HorizontalAlignment="Center">
+                        <Rectangle Width="6" Height="2"  Fill="{StaticResource TangoKeyboardKeyDarkBrush}"></Rectangle>
+                        <Rectangle Width="6" Height="2"  Fill="{StaticResource TangoKeyboardKeyDarkBrush}"></Rectangle>
+                        <Rectangle Width="6" Height="2"  Fill="{StaticResource TangoKeyboardKeyDarkBrush}"></Rectangle>
+                        <Rectangle Width="6" Height="2"  Fill="{StaticResource TangoKeyboardKeyDarkBrush}"></Rectangle>
                     </UniformGrid>
                     <Image Stretch="Fill" VerticalAlignment="Top" Margin="0 4 0 0">
                         <Image.Style>
@@ -236,11 +315,11 @@
                         </Path>
                         <Path  Stroke="{StaticResource TangoTextWatermarkBrush}" Fill="Transparent" StrokeThickness="1" Data="{StaticResource InkContainerPath}"/>
                     </Grid>
-                    <UniformGrid Rows="4" Columns="1" Margin="0 15 0 15" HorizontalAlignment="Center">
-                        <Rectangle Stroke="{StaticResource TangoTextWatermarkBrush}" Width="10" Height="2" ></Rectangle>
-                        <Rectangle Width="10" Height="2" Stroke="{StaticResource TangoTextWatermarkBrush}"></Rectangle>
-                        <Rectangle Width="10" Height="2" Stroke="{StaticResource TangoTextWatermarkBrush}"></Rectangle>
-                        <Rectangle Width="10" Height="2" Stroke="{StaticResource TangoTextWatermarkBrush}"></Rectangle>
+                    <UniformGrid Rows="4" Columns="1" Margin="0 12 0 12" HorizontalAlignment="Center">
+                        <Rectangle Fill="{StaticResource TangoKeyboardKeyDarkBrush}" Width="6" Height="2" ></Rectangle>
+                        <Rectangle Width="6" Height="2" Fill="{StaticResource TangoKeyboardKeyDarkBrush}"></Rectangle>
+                        <Rectangle Width="6" Height="2" Fill="{StaticResource TangoKeyboardKeyDarkBrush}"></Rectangle>
+                        <Rectangle Width="6" Height="2" Fill="{StaticResource TangoKeyboardKeyDarkBrush}"></Rectangle>
                     </UniformGrid>
                 </Grid>
             </DockPanel>
@@ -904,7 +983,7 @@
 
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Grid.Column="2" Margin="0 0 0 0">
                                 <Image Margin="0 2 0 0" Source="../Images/Job Issues/ttime_left.png" Stretch="Uniform" VerticalAlignment="Top" Height="32"/>
-                                <TextBlock Margin="15 10 0 0" FontWeight="Light" FontSize="{StaticResource TangoComboBoxItemFontSize}"  HorizontalAlignment="Center">
+                                <TextBlock Margin="15 5 0 0" FontWeight="Light" FontSize="{StaticResource TangoComboBoxItemFontSize}"  HorizontalAlignment="Center">
                                                 <Run Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToTwoDigitsTimeConverter},FallbackValue=5}"></Run>
                                                  <Run FontSize="16" Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToLabelConverter},FallbackValue=min}"></Run>
 
@@ -1089,7 +1168,7 @@
                                             <TextBlock Margin="12 0 0 0 " VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Waste</TextBlock>
                                         </StackPanel>
                                         <StackPanel Orientation="Horizontal" Margin="-25 24 0 0">
-                                            <Rectangle Height="88" Width="2" Fill="{StaticResource TangoColumnDividerBrush}" VerticalAlignment="Top" Margin="-15 15 0 0"/>
+                                            <Rectangle Height="88" Width="2" Fill="{StaticResource TangoTextWatermarkBrush}" VerticalAlignment="Top" Margin="-15 15 0 0"/>
                                             <ContentControl Margin="20 0 0 0" ContentTemplate="{StaticResource WasteBox}" Content="{Binding}" IsTabStop="False"/>
                                         </StackPanel>
 
@@ -1107,9 +1186,10 @@
                                                     </ItemsPanelTemplate>
                                                 </ItemsControl.ItemsPanel>
                                             </ItemsControl>
-
-                                            <!--<Rectangle Height="88" Width="2" Fill="{StaticResource TangoColumnDividerBrush}" VerticalAlignment="Top" Margin="12 15 0 0"/>
-                                            <ContentControl Margin="45 0 0 0" ContentTemplate="{StaticResource LubBox}" Content="{Binding}" IsTabStop="False"/>-->
+                                            <StackPanel Orientation="Horizontal" Margin="40 0 0 0">
+                                                <Rectangle Height="88" Width="2" Fill="{StaticResource TangoTextWatermarkBrush}" VerticalAlignment="Top" Margin="-15 15 0 0"/>
+                                                <ContentControl Margin="30 0 0 0" ContentTemplate="{StaticResource LubLiquidBox}" Content="{Binding MidTankLubLevel}" IsTabStop="False"/>
+                                            </StackPanel>
                                         </StackPanel>
                                     </StackPanel>
                                 </DockPanel>
@@ -1120,8 +1200,8 @@
                     </Grid>
                 </Grid>
             </Grid>
-            <Grid VerticalAlignment="Bottom" Grid.ColumnSpan="2" Margin="10 0 1 0">
-                <touch:TouchExpander x:Name="Notifications" Style="{StaticResource TouchRoundedExpander}"  IsTabStop="False" KeyboardNavigation.TabNavigation ="None" BorderThickness="0" IsExpanded="false" CornerRadius="20 20 0 0" >
+            <Grid VerticalAlignment="Bottom" Grid.ColumnSpan="2" Margin="10 0 2 0">
+                <touch:TouchExpander x:Name="Notifications" Style="{StaticResource TouchRoundedExpander}"  IsTabStop="False" KeyboardNavigation.TabNavigation ="None" BorderThickness="0 0 0 0" IsExpanded="false" CornerRadius="20 20 0 0" Margin="0 0 0 -1">
                     <touch:TouchExpander.Header>
                         <DockPanel >
                             <touch:TouchButton Margin="0 0 20 0" Content="Clear All" DockPanel.Dock="Right" Width="120"  Height="38"  HorizontalAlignment="Right" VerticalAlignment="Center" EnableDropShadow="False"  Background="Transparent" BorderThickness="1" CornerRadius="19"  BorderBrush="{StaticResource TangoPrimaryAccentBrush}" Foreground="{StaticResource TangoPrimaryAccentBrush}" Command="{Binding ClearAllNotificationsCommand}" Visibility="{Binding NotificationProvider.HasNotificationItems, Converter={StaticResource BooleanToVisibilityConverter}}" >