IMplemented dynamic mid tank capacity on TwineX4 & FSE.

1 files changed, 37 insertions, 33 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 6edc90844..998ab7db4 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
@@ -120,48 +120,52 @@
             </UniformGrid>
         </DataTemplate>
 
-        <PathGeometry x:Key="InkContainerPath" Figures="M16.000001,0.5 C24.560414,0.5 31.500001,6.9918714 31.500001,15 31.500001,15.500508 31.472893,15.995093 31.419976,16.48254 L31.417605,16.5 31.500001,16.5 31.500001,71 31.500001,71.5 31.486487,71.5 31.479832,71.74617 C31.064694,79.407524 24.292901,85.5 16.000001,85.5 7.7070995,85.5 0.9353075,79.407524 0.52016807,71.74617 L0.51351446,71.5 0.5,71.5 0.5,71 0.5,16.5 0.58239609,16.5 0.58002502,16.48254 C0.52710831,15.995093 0.50000054,15.500508 0.5,15 0.50000054,6.9918714 7.4395867,0.5 16.000001,0.5 z"/>
+        <PathGeometry x:Key="InkContainerPath"  Figures="M16.000001,0.5 C24.560414,0.5 31.500001,6.9918714 31.500001,15 31.500001,15.500508 31.472893,15.995093 31.419976,16.48254 L31.417605,16.5 31.500001,16.5 31.500001,71 31.500001,71.5 31.486487,71.5 31.479832,71.74617 C31.064694,79.407524 24.292901,85.5 16.000001,85.5 7.7070995,85.5 0.9353075,79.407524 0.52016807,71.74617 L0.51351446,71.5 0.5,71.5 0.5,71 0.5,16.5 0.58239609,16.5 0.58002502,16.48254 C0.52710831,15.995093 0.50000054,15.500508 0.5,15 0.50000054,6.9918714 7.4395867,0.5 16.000001,0.5 z"/>
         <DataTemplate x:Key="LiquidBox">
             <DockPanel>
                 <TextBlock DockPanel.Dock="Bottom" Text="{Binding IDSPack.LiquidType.ShortName}" HorizontalAlignment="Center" Margin="0 8 0 0"></TextBlock>
-            <Grid>
-                <Grid ClipToBounds="True" HorizontalAlignment="Center">
-                        <Path Fill="{Binding Path=IDSPack.LiquidType, Converter={StaticResource LiquidTypeToBrushConverter}}">
+                <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 >
+                            <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>
-                           
+                                </CombinedGeometry>
+                            </Path.Data>
+
                         </Path>
-                    <Path  Stroke="Black" Fill="Transparent" StrokeThickness="1" Data="{StaticResource InkContainerPath}">
-                           
+                        <Path  Stroke="{StaticResource TangoTextWatermarkBrush}" Fill="Transparent" StrokeThickness="1" Data="{StaticResource InkContainerPath}">
+
                         </Path>
-                </Grid>
+                    </Grid>
                     <UniformGrid Rows="4" Columns="1" Margin="0 15 0 15" HorizontalAlignment="Center">
-                        <Rectangle Width="10" Height="2" Stroke="Black"></Rectangle>
-                        <Rectangle Width="10" Height="2" Stroke="Black"></Rectangle>
-                        <Rectangle Width="10" Height="2" Stroke="Black"></Rectangle>
-                        <Rectangle Width="10" Height="2" Stroke="Black"></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>
+                        <Rectangle Width="10" Height="2" Stroke="{StaticResource TangoTextWatermarkBrush}"></Rectangle>
                     </UniformGrid>
+                    <Image Source="../Images/Overview Icons/error.png" Stretch="Fill" VerticalAlignment="Top"   Width="24" Height="24" Margin="0 4 0 0" Visibility="Visible"/>
+                    <Image Source="../Images/Overview Icons/Warning.png" Stretch="Fill" VerticalAlignment="Top" Width="24" Height="24" Visibility="Collapsed"/>
+                    <Image Source="../Images/Overview Icons/UpdateInk.png" Stretch="Fill" VerticalAlignment="Top" Width="24" Height="24" Visibility="Collapsed"/>
                 </Grid>
             </DockPanel>
         </DataTemplate>
@@ -196,13 +200,13 @@
                                 </CombinedGeometry>
                             </Path.Data>
                         </Path>
-                        <Path  Stroke="Black" Fill="Transparent" StrokeThickness="1" Data="{StaticResource InkContainerPath}"/>
+                        <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="Black" Width="10" Height="2" ></Rectangle>
-                        <Rectangle Width="10" Height="2" Stroke="Black"></Rectangle>
-                        <Rectangle Width="10" Height="2" Stroke="Black"></Rectangle>
-                        <Rectangle Width="10" Height="2" Stroke="Black"></Rectangle>
+                        <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>
                 </Grid>
             </DockPanel>
@@ -238,13 +242,13 @@
                                 </CombinedGeometry>
                             </Path.Data>
                         </Path>
-                        <Path  Stroke="Black" Fill="Transparent" StrokeThickness="1" Data="{StaticResource InkContainerPath}"/>
+                        <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="Black" Width="10" Height="2" ></Rectangle>
-                        <Rectangle Width="10" Height="2" Stroke="Black"></Rectangle>
-                        <Rectangle Width="10" Height="2" Stroke="Black"></Rectangle>
-                        <Rectangle Width="10" Height="2" Stroke="Black"></Rectangle>
+                        <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>
                 </Grid>
             </DockPanel>
@@ -880,7 +884,7 @@
                                                 <SolidColorBrush Color="{Binding DryerZone3.Color}"/>
                                             </TextBlock.Foreground>
                                         </TextBlock>
-                                        <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 10" FontSize="{StaticResource TangoComboBoxItemFontSize}" >&#186;C</TextBlock>
+                                        <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" >&#186;C</TextBlock>
 
                                 </Grid>
                                     <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Dryer Zone 3</TextBlock>