Jerrycan change impl.

2 files changed, 94 insertions, 5 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 60584bc15..ba4769c91 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
@@ -13,6 +13,7 @@
              xmlns:global="clr-namespace:Tango.PPC.UI"
              xmlns:models="clr-namespace:Tango.PPC.UI.Models"
              xmlns:graphs="clr-namespace:Tango.PPC.UI.Graphs"
+             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
              xmlns:local="clr-namespace:Tango.PPC.UI.Views"
              mc:Ignorable="d" 
              d:DesignHeight="1280" d:DesignWidth="932" d:DataContext="{d:DesignInstance Type=vm:MachineStatusViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MachineStatusViewVM}">
@@ -132,7 +133,34 @@
                     <TextBlock DockPanel.Dock="Top" Height="15" VerticalAlignment="Top" TextAlignment="Center" Visibility="{Binding HasRemainingTimeoutError,Converter={StaticResource BooleanToVisibilityConverter}}" Text="{Binding RemainingTimeoutError, StringFormat='{}{0:hh}:{0:mm}h', FallbackValue=00:00}" HorizontalAlignment="Center" FontSize="{StaticResource TangoSmallFontSizeBar}" ></TextBlock>
                 </Grid>
                 <Grid >
-                    <Grid ClipToBounds="True" HorizontalAlignment="Center">
+                    <Grid ClipToBounds="True" HorizontalAlignment="Center" Background="Transparent">
+                        <Grid.Style>
+                            <Style TargetType="Grid">
+                                <Style.Triggers>
+                                    <Trigger Property="IsMouseOver" Value="True">
+                                        <Trigger.EnterActions>
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <DoubleAnimation Storyboard.TargetProperty="Opacity" To="0.8" Duration="00:00:0.2" />
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                        </Trigger.EnterActions>
+                                        <Trigger.ExitActions>
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <DoubleAnimation Storyboard.TargetProperty="Opacity" To="1" Duration="00:00:0.2" />
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                        </Trigger.ExitActions>
+                                    </Trigger>
+                                </Style.Triggers>
+                            </Style>
+                        </Grid.Style>
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="PreviewMouseUp">
+                                <i:InvokeCommandAction Command="{Binding PressedCommand}" />
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
                         <Path Fill="{Binding Path=IDSPack.LiquidType, Converter={StaticResource LiquidTypeToBrushConverter}}"  StrokeThickness="1.5" >
                             <Path.Resources>
                                 <sys:Double x:Key="RectWidth">30</sys:Double>
@@ -1070,7 +1098,53 @@
                                     <Image Source="../Images/Overview Icons/Sensors.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="40 11 40 0" DataContext="{Binding OverviewModel}">
+                                <UniformGrid Columns="6" Rows="1" Height="120" Margin="40 11 40 0" DataContext="{Binding OverviewModel}">
+
+                                    <!--DRYER ZONE 1-->
+                                    <StackPanel Orientation="Vertical">
+                                        <Grid>
+                                            <touch:TouchArcProgress  RingThickness="8" Value="{Binding DryerZone1.Value}" Maximum="{Binding DryerZone1.MaxValue}" Minimum="0" Width="100" Height="100">
+                                                <touch:TouchArcProgress.Foreground>
+                                                    <SolidColorBrush Color="{Binding DryerZone1.Color}"/>
+                                                </touch:TouchArcProgress.Foreground>
+                                            </touch:TouchArcProgress>
+                                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}" FontWeight="Bold" >
+                                                 <Run Text="{Binding DryerZone1.DisplayValue}">
+                                                    <Run.Foreground>
+                                                         <SolidColorBrush Color="{Binding DryerZone1.Color}"/>
+                                                    </Run.Foreground>
+                                                </Run>
+                                                <Run Text="{Binding DryerZone1.DisplayMaxValue}"></Run>
+                                            </TextBlock>
+                                            <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoDefaultFontSize}" >&#186;C</TextBlock>
+
+                                        </Grid>
+                                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Dryer Zone 1</TextBlock>
+                                    </StackPanel>
+
+                                    <!--DRYER ZONE 2-->
+                                    <StackPanel Orientation="Vertical">
+                                        <Grid>
+                                            <touch:TouchArcProgress  RingThickness="8" Value="{Binding DryerZone2.Value}" Maximum="{Binding DryerZone2.MaxValue}" Minimum="0" Width="100" Height="100">
+                                                <touch:TouchArcProgress.Foreground>
+                                                    <SolidColorBrush Color="{Binding DryerZone2.Color}"/>
+                                                </touch:TouchArcProgress.Foreground>
+                                            </touch:TouchArcProgress>
+                                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}" FontWeight="Bold" >
+                                                 <Run Text="{Binding DryerZone2.DisplayValue}">
+                                                    <Run.Foreground>
+                                                         <SolidColorBrush Color="{Binding DryerZone2.Color}"/>
+                                                    </Run.Foreground>
+                                                </Run>
+                                                <Run Text="{Binding DryerZone2.DisplayMaxValue}"></Run>
+                                            </TextBlock>
+                                            <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoDefaultFontSize}" >&#186;C</TextBlock>
+
+                                        </Grid>
+                                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Dryer Zone 2</TextBlock>
+                                    </StackPanel>
+
+                                    <!--DRYER ZONE 3-->
                                     <StackPanel Orientation="Vertical">
                                         <Grid>
                                             <touch:TouchArcProgress  RingThickness="8" Value="{Binding DryerZone3.Value}" Maximum="{Binding DryerZone3.MaxValue}" Minimum="0" Width="100" Height="100">
@@ -1091,8 +1165,11 @@
                                         </Grid>
                                         <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Dryer Zone 3</TextBlock>
                                     </StackPanel>
+                                    
+                                    
+                                    
 
-                                    <StackPanel Orientation="Vertical">
+                                    <!--<StackPanel Orientation="Vertical">
                                         <Grid>
                                             <touch:TouchArcProgress RingThickness="8" Value="{Binding DryerAir.Value}" Maximum="{Binding DryerAir.MaxValue}" Minimum="0" Width="100" Height="100">
                                                 <touch:TouchArcProgress.Foreground>
@@ -1147,7 +1224,8 @@
                                             </TextBlock>
                                         </Grid>
                                         <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Dryer Air</TextBlock>
-                                    </StackPanel>
+                                    </StackPanel>-->
+                                    
                                     <StackPanel Orientation="Vertical">
                                         <Grid>
                                             <touch:TouchArcProgress  RingThickness="8" Value="{Binding Tunnel.Value}" Maximum="{Binding Tunnel.MaxValue}" Minimum="0" Width="100" Height="100">
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineUpdateView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineUpdateView.xaml
index beb09be0d..4013e05bc 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineUpdateView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineUpdateView.xaml
@@ -16,7 +16,18 @@
         <DockPanel>
 
             <StackPanel DockPanel.Dock="Top" HorizontalAlignment="Center" Margin="0 20 0 0">
-                <Image Source="/Images/machine-update.png" Stretch="Fill" Width="700" />
+                <Image Stretch="Fill" Width="700">
+                    <Image.Style>
+                        <Style TargetType="Image">
+                            <Setter Property="Source" Value="/Images/machine-update.png"></Setter>
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding BuildProvider.IsEureka}" Value="True">
+                                    <Setter Property="Source" Value="/Images/update_x4.png"></Setter>
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </Image.Style>
+                </Image>
             </StackPanel>
 
             <controls:NavigationControl x:Name="navigationControl" TransitionType="Slide" KeepElementsAttached="True" Margin="0 20 0 0" SelectedIndex="0">