Merge branch 'eureka_ppc' of https://twinetfs.visualstudio.com/Tango/_git/Tango into eureka_ppc

1 files changed, 139 insertions, 25 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 9ee64f4a8..f667593a7 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:shapes="clr-namespace:Tango.SharedUI.Shapes;assembly=Tango.SharedUI"
              xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
              xmlns:vm="clr-namespace:Tango.PPC.UI.ViewModels"
@@ -20,6 +21,8 @@
         <localConverters:CollectionToCountConverter x:Key="CollectionToCountConverter"/>
         <localConverters:ProgressLengthSpoolConverter x:Key="ProgressLengthSpoolConverter"/>
         <localConverters:ProgressWeightSpoolConverter x:Key="ProgressWeightSpoolConverter"/>
+        <localConverters:LiquidTypeToBrushConverter x:Key="LiquidTypeToBrushConverter"/>
+        <localConverters:MidTankLevelToElementRectConverter x:Key="MidTankLevelToElementRectConverter"/>
 
         <Style x:Key="LinkRoundButtonStyle" TargetType="{x:Type touch:TouchButton}">
             <Setter Property="Background" Value="{StaticResource TangoMidAccentBrush}"></Setter>
@@ -117,6 +120,48 @@
             </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"/>
+        <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}}">
+                            <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" />
+                                                </MultiBinding>
+                                            </RectangleGeometry.Rect>
+                                        </RectangleGeometry>
+                                    </CombinedGeometry.Geometry2>
+                            </CombinedGeometry>
+                        </Path.Data>
+                    </Path>
+                    <Path  Stroke="Black" Fill="Transparent" StrokeThickness="1" Data="{StaticResource InkContainerPath}"/>
+                </Grid> 
+                <UniformGrid Rows="4" Columns="1" Margin="0 15 0 15" HorizontalAlignment="Center">
+                    <Rectangle Width="10" Height="2" Fill="Black"></Rectangle>
+                    <Rectangle Width="10" Height="2" Fill="Black"></Rectangle>
+                    <Rectangle Width="10" Height="2" Fill="Black"></Rectangle>
+                    <Rectangle Width="10" Height="2" Fill="Black"></Rectangle>
+                </UniformGrid>
+            </Grid>
+            </DockPanel>
+        </DataTemplate>
 
     </UserControl.Resources>
     <Grid Width="1246" Height="1400">
@@ -470,8 +515,9 @@
                             <Run Text="x"></Run><Run Text="{Binding RunningJobStatus.RemainingUnits}"></Run>
                         </TextBlock>-->
                     </Grid>
-                        <touch:MultiRangeSlider x:Name="PART_LowerSlider" Height="30"  Margin="0 0 0 0" Minimum="0"  Foreground="{StaticResource TangoDarkForegroundBrush}"
-                                           IsSnapToTickEnabled="True"  TickFrequency="1" VerticalAlignment="Center" IsEnabled="False" Maximum="{Binding RunningJobStatus.TotalProgressMinusSettingUp}" 
+                        <touch:MultiRangeSlider x:Name="PART_LowerSlider" Height="30"  Margin="0 0 0 0"   Foreground="{StaticResource TangoDarkForegroundBrush}"
+                                           IsSnapToTickEnabled="True"  TickFrequency="1" VerticalAlignment="Center"  Maximum="{Binding RunningJobStatus.TotalProgressMinusSettingUp}" Minimum="0" IsEnabled="False"
+                                           MaximumValue ="{Binding RunningJobStatus.TotalProgressMinusSettingUp}"
                             Value ="{Binding RunningJobStatus.ProgressMinusSettingUp}"/>
 
                         <UniformGrid DockPanel.Dock="Bottom" Columns="4" Rows="1" HorizontalAlignment="Left" Margin="0 35 0 0" Height="Auto" VerticalAlignment="Top" Width="1200">
@@ -717,8 +763,9 @@
                             <StackPanel Orientation="Vertical" Margin="30 8 30 0" >
                                 <locaControls:RunningJobViewerEureka Height="16"  DisplayMarkers="False" IsActive="True" Job="{Binding Job}" RunningJobStatus="{Binding RunningJobStatus}"  />
                                 
-                                <touch:MultiRangeSlider x:Name="PART_LowerSlider1" Height="26"  Margin="0 0 0 0" Minimum="0"  Foreground="{StaticResource TangoDarkForegroundBrush}"
-                                           IsSnapToTickEnabled="True"  TickFrequency="1" VerticalAlignment="Center" IsEnabled="False" Maximum="{Binding RunningJobStatus.TotalProgressMinusSettingUp}"   Value ="{Binding RunningJobStatus.ProgressMinusSettingUp}"/>
+                                <touch:MultiRangeSlider x:Name="PART_LowerSlider1" Height="26"  Margin="0 0 0 0"   Foreground="{StaticResource TangoDarkForegroundBrush}"
+                                           IsSnapToTickEnabled="True"  TickFrequency="1" VerticalAlignment="Center" Maximum="{Binding RunningJobStatus.TotalProgressMinusSettingUp}" Minimum="0" IsEnabled="False" 
+                                           MaximumValue ="{Binding RunningJobStatus.TotalProgressMinusSettingUp}" Value ="{Binding RunningJobStatus.ProgressMinusSettingUp}"/>
 
                             </StackPanel>
                         </DockPanel>
@@ -730,44 +777,104 @@
                                 <Image Source="../Images/Job Issues/job_length.png" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Left" Width="32" Height="32"/>
                                 <TextBlock Margin="12 0 0 0 " VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Sensors</TextBlock>
                             </StackPanel>
-                            <UniformGrid Columns="5" Rows="1" Height="120" Margin="20 12 20 0">
+                            <UniformGrid Columns="5" Rows="1" Height="120" Margin="20 22 20 0">
                                 <StackPanel Orientation="Vertical">
                                 <Grid>
-                                    <touch:TouchArcProgress Foreground="Green" RingThickness="10" Value="75" Maximum="100" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress>
+                                    <touch:TouchArcProgress Foreground="Green" RingThickness="10" Value="10" Maximum="10" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress>
                                     <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="Bold" Foreground="Green">10</TextBlock>
                                     <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 10" FontSize="{StaticResource TangoComboBoxItemFontSize}" >Bar</TextBlock>
 
                                 </Grid>
                                     <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Pressure</TextBlock>
                                 </StackPanel>
+                                
+                                <StackPanel Orientation="Vertical">
                                 <Grid>
-                                    <touch:TouchArcProgress Foreground="Green" RingThickness="10" Value="75" Maximum="100" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress>
-                                    <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Foreground="Green">10</TextBlock>
+                                    <touch:TouchArcProgress Foreground="Green" RingThickness="10" Value="200" Maximum="200" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress>
+                                    <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Foreground="Green">200</TextBlock>
                                     <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="&#186;C" ></TextBlock>
-                                </Grid>
-                                <Grid>
-                                    <touch:TouchArcProgress Foreground="Green" RingThickness="10" Value="75" Maximum="100" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress>
-                                    <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Foreground="Green">10</TextBlock>
+                                </Grid> 
+                                    <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Dryer Zone</TextBlock>
+                                </StackPanel>
+                                <StackPanel Orientation="Vertical">
+                                    <Grid>
+                                    <touch:TouchArcProgress Foreground="Red" RingThickness="10" Value="80" Maximum="200" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress>
+                                    <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Foreground="Black">80/200</TextBlock>
                                     <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="&#186;C"></TextBlock>
 
                                 </Grid>
-                                <Grid>
-                                    <touch:TouchArcProgress Foreground="red" RingThickness="10" Value="75" Maximum="100" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress>
-                                    <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Foreground="Green">75</TextBlock>
+                                    <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Tunnel</TextBlock>
+                                </StackPanel>
+                                <StackPanel Orientation="Vertical">
+                                    <Grid>
+                                    <touch:TouchArcProgress Foreground="Green" RingThickness="10" Value="200" Maximum="200" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress>
+                                    <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Foreground="Green">200</TextBlock>
                                     <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="&#186;C"></TextBlock>
 
                                 </Grid>
-                                <Grid>
-                                    <touch:TouchArcProgress Foreground="red" RingThickness="10" Value="75" Maximum="100" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress>
-                                    <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Foreground="Red">200</TextBlock>
+                                    <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Dyeing Head</TextBlock>
+                                </StackPanel>
+                                <StackPanel Orientation="Vertical">
+                                    <Grid>
+                                    <touch:TouchArcProgress Foreground="red" RingThickness="10" Value="218" Maximum="200" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress>
+                                    <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Foreground="Red">218/200</TextBlock>
                                     <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="&#186;C"></TextBlock>
 
                                 </Grid>
+                                    <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Dyeing Head</TextBlock>
+                                </StackPanel>
                             </UniformGrid>
-                            <Grid >
-                                <Image Source="../Images/Job Issues/Machine outline.png" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Left" Width="Auto" Height="Auto"/>
+                            <Grid  Margin="0 28 0 0">
+                                <Image Source="../Images/Job Issues/Machine outline.png" Height="Auto" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Center" Width="634" />
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                    <StackPanel Orientation="Vertical">
+                                        <Border Height="184" Width="83" VerticalAlignment="Center" CornerRadius="2 0 0 2" BorderThickness="0" BorderBrush="{StaticResource TangoBlackInkBrush}">
+                                            <UniformGrid Columns="1" Rows="4" Margin="10">
+                                                <touch:TouchRadioButton  HorizontalAlignment="Center" IsChecked="True"></touch:TouchRadioButton>
+                                                <touch:TouchRadioButton  HorizontalAlignment="Center"></touch:TouchRadioButton>
+                                                <touch:TouchRadioButton  HorizontalAlignment="Center"></touch:TouchRadioButton>
+                                                <touch:TouchRadioButton  HorizontalAlignment="Center"></touch:TouchRadioButton>
+                                            </UniformGrid>
+                                        </Border>
+                                        <TextBlock HorizontalAlignment="Center" Margin="0 4 0 0">Winder</TextBlock>
+                                    </StackPanel>
+                                    <StackPanel Orientation="Vertical">
+                                        <Border Height="171" Width="95" VerticalAlignment="Center" CornerRadius="0" BorderThickness="0" BorderBrush="{StaticResource TangoBlackInkBrush}">
+                                            <UniformGrid Columns="1" Rows="4" Margin="0 16 0 0" VerticalAlignment="Center">
+                                                <touch:TouchRadioButton  HorizontalAlignment="Center" IsChecked="True"></touch:TouchRadioButton>
+                                                <touch:TouchRadioButton  HorizontalAlignment="Center"></touch:TouchRadioButton>
+                                                <touch:TouchRadioButton  HorizontalAlignment="Center"></touch:TouchRadioButton>
+                                                <touch:TouchRadioButton  HorizontalAlignment="Center"></touch:TouchRadioButton>
+                                            </UniformGrid>
+                                        </Border>
+                                        <TextBlock HorizontalAlignment="Center" Margin="0 16 0 0">Dancer</TextBlock>
+                                    </StackPanel>
+
+
+                                    <StackPanel Orientation="Vertical" Margin="274 0 0 0">
+                                        <Border Height="171" Width="95" VerticalAlignment="Center" CornerRadius="0" BorderThickness="0" BorderBrush="{StaticResource TangoBlackInkBrush}">
+                                            <UniformGrid Columns="1" Rows="4" Margin="0 16 0 0" VerticalAlignment="Center">
+                                                <touch:TouchRadioButton  HorizontalAlignment="Center" IsChecked="True"></touch:TouchRadioButton>
+                                                <touch:TouchRadioButton  HorizontalAlignment="Center"></touch:TouchRadioButton>
+                                                <touch:TouchRadioButton  HorizontalAlignment="Center"></touch:TouchRadioButton>
+                                                <touch:TouchRadioButton  HorizontalAlignment="Center"></touch:TouchRadioButton>
+                                            </UniformGrid>
+                                        </Border>
+                                        <TextBlock HorizontalAlignment="Center" Margin="0 16 0 0">BTSR</TextBlock>
+                                    </StackPanel>
+                                    <StackPanel Orientation="Vertical">
+                                        <Border Height="184" Width="83" VerticalAlignment="Center" CornerRadius="2 0 0 2" BorderThickness="0" BorderBrush="{StaticResource TangoBlackInkBrush}">
+                                            <UniformGrid Columns="1" Rows="4" Margin="10">
+                                                <touch:TouchRadioButton  HorizontalAlignment="Center" IsChecked="True"></touch:TouchRadioButton>
+                                                <touch:TouchRadioButton  HorizontalAlignment="Center"></touch:TouchRadioButton>
+                                                <touch:TouchRadioButton  HorizontalAlignment="Center"></touch:TouchRadioButton>
+                                                <touch:TouchRadioButton  HorizontalAlignment="Center"></touch:TouchRadioButton>
+                                            </UniformGrid>
+                                        </Border>
+                                        <TextBlock HorizontalAlignment="Center" Margin="0 4 0 0">Feeder</TextBlock>
+                                    </StackPanel>
+                                </StackPanel>
                             </Grid>
-                            
                         </StackPanel>
                     </Grid>
                     <Grid Grid.Row="2" x:Name="IncLevels" Margin="0 20 0 0">
@@ -782,8 +889,15 @@
                                         <TextBlock Margin="12 0 0 0 " VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Ink Levels</TextBlock>
                                     </StackPanel>
                                 </DockPanel>
-                        <UniformGrid Columns="12" Rows="1" Margin="0 20 0 0">
-                            <Border Height="88" Width="32" CornerRadius="16" BorderThickness="2" BorderBrush="RosyBrown">
+                        <StackPanel Orientation="Horizontal" Margin="0 24 0 0">
+                                <ItemsControl ItemsSource="{Binding MidTankLevels}" ItemTemplate="{StaticResource LiquidBox}">
+                                    <ItemsControl.ItemsPanel>
+                                        <ItemsPanelTemplate>
+                                            <UniformGrid Rows="1" IsItemsHost="True" Width="580"></UniformGrid>
+                                        </ItemsPanelTemplate>
+                                    </ItemsControl.ItemsPanel>
+                                </ItemsControl>
+                                <!--<Border Height="88" Width="32" CornerRadius="16" BorderThickness="2" BorderBrush="RosyBrown">
                                     <Grid>
                                     <Canvas Width="30" >
                                             <Rectangle  Canvas.Top="30" Fill="Cyan" Height="88" Width="32" >
@@ -803,8 +917,8 @@
                                             <Rectangle Width="10" Height="2" Fill="Black"></Rectangle>
                                         </UniformGrid>
                                     </Grid>
-                            </Border>
-                        </UniformGrid>
+                            </Border>-->
+                        </StackPanel>
                                 </StackPanel>
                     </Grid>
                 </Grid>