Added font Poppins. Changes in GUI.

4 files changed, 85 insertions, 39 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml
index 7addfdd13..bdcf675e3 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml
@@ -14,6 +14,7 @@
 
                 <!--Common-->
                 <ResourceDictionary Source="pack://application:,,,/Tango.PPC.Common;component/Resources/Merged.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/Tango.PPC.Common;component/Resources/Fonts.xaml" />
 
                 <!--Local-->
                 <ResourceDictionary Source="Resources/Colors.xaml"></ResourceDictionary>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml
index 2b73e274c..be53c67fc 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml
@@ -7,7 +7,7 @@
 		xmlns:views="clr-namespace:Tango.PPC.UI.Views"
         mc:Ignorable="d"
         Title="Tango - PPC" Height="800" Stylus.IsTapFeedbackEnabled="False" Stylus.IsPressAndHoldEnabled="False" Stylus.IsTouchFeedbackEnabled="False"  Width="800" WindowStyle="SingleBorderWindow" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" 
-        FontFamily="{StaticResource TangoFlexoFontFamily}"
+        FontFamily="{StaticResource Poppins}"
         FontSize="{StaticResource TangoDefaultFontSize}"
         Foreground="{StaticResource TangoDarkForegroundBrush}"
         FontWeight="Medium" RenderOptions.BitmapScalingMode="LowQuality" SnapsToDevicePixels="True" UseLayoutRounding="True">
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs
index 866a6ddfe..f9bc4cefb 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs
@@ -133,7 +133,7 @@ namespace Tango.PPC.UI.ViewModels
         {
             StopCommand = new RelayCommand(StopJob, ()=>CanStopped());
             AbortCommand = new RelayCommand(AbortJob, () => CanStopped());
-            GoToJobCommand = new RelayCommand(GoToJob);
+            GoToJobCommand = new RelayCommand(GoToJob, () => CanStopped());
             JobStatusViewCommand = new RelayCommand(JobStatusView);
             OverviewViewCommand = new RelayCommand(OverviewView);
 
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 559d81dbe..d98a8823d 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
@@ -190,41 +190,8 @@
                     </DockPanel>
                     <Border Height="2" Background="{StaticResource TangoLightBorderBrush}"  VerticalAlignment="Bottom"  Margin="0 2 0 0" CornerRadius="2"></Border>
                 </Grid>
-            
-            <DockPanel Grid.Row="1" Margin="0 25 0 0">
-                <!--<Grid Panel.ZIndex="100" DockPanel.Dock="Top" Height="117" Background="{StaticResource TangoPrimaryBackgroundBrush}">
-                    <Grid.Effect>
-                        <DropShadowEffect Color="Silver" ShadowDepth="0"  BlurRadius="20" Opacity="1" />
-                    </Grid.Effect>
-
-                    <Grid HorizontalAlignment="Right" Margin="0 0 20 0">
-                        <StackPanel Orientation="Horizontal">
-                            <Grid>
-                                <StackPanel x:Name="techPressElement" VerticalAlignment="Center" Background="Transparent">
-                                    <locaControls:MachineStatusControl HorizontalAlignment="Center" DataContext="{Binding MachineProvider.MachineOperator}" />
-                                    <TextBlock Margin="0 10 0 0" FontSize="{StaticResource TangoSmallFontSize}" Text="{Binding MachineProvider.MachineOperator.Status,Converter={StaticResource EnumToDescriptionConverter}}"></TextBlock>
-                                </StackPanel>
-
-                                <Grid IsHitTestVisible="False" HorizontalAlignment="Center">
-                                    <Grid.Style>
-                                        <Style TargetType="Grid">
-                                            <Setter Property="Visibility" Value="Hidden"></Setter>
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding MachineProvider.MachineOperator.MachineStatus.AutoInkFillingEnabled}" Value="True">
-                                                    <Setter Property="Visibility" Value="Visible"></Setter>
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding MachineProvider.MachineOperator.IsConnected}" Value="False">
-                                                    <Setter Property="Visibility" Value="Hidden"></Setter>
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </Grid.Style>
-                                </Grid>
-                            </Grid>
-                        </StackPanel>
-                    </Grid>
-                </Grid>-->
 
+                <DockPanel Grid.Row="1" Margin="0 25 0 0">
                         <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" VerticalAlignment="Top"  Width="200" MinHeight="30" HorizontalAlignment="Right" Margin="0 0 0 0">
                             <touch:TouchToggleSlider Style="{StaticResource TouchToggleButtonSlider}" Background="{StaticResource TangoMidBackgroundBrush}" CheckedBackground="{StaticResource TangoMidBackgroundBrush}" UncheckedBackground="{StaticResource TangoMidBackgroundBrush}"  HorizontalAlignment="Right" VerticalAlignment="Top" Margin="20 0 20 0"  CornerRadius="17" Height="34" Width="164" ThumbWidth="80" LeftText="Total" RightText="Spool" ThumbCornerRadius="13" IsChecked="{Binding IsSpoolView}" ></touch:TouchToggleSlider>
                         </StackPanel>
@@ -607,10 +574,88 @@
                 </Grid>
             </Grid>
 
-        <Grid x:Name="Overview" Grid.Row="1" Visibility="{Binding IsJobStatusViewEnable, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                <Grid x:Name="Overview" Margin="32 50 60 0" Grid.Row="1" Visibility="{Binding IsJobStatusViewEnable, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="96"></RowDefinition>
+                        <RowDefinition Height="Auto"></RowDefinition>
+                        <RowDefinition Height="Auto"></RowDefinition>
+                        <RowDefinition Height="Auto"></RowDefinition>
+                        <RowDefinition Height="100"></RowDefinition>
+                    </Grid.RowDefinitions>
+                    <Grid>
+                        <DockPanel Margin="0 10 0 0">
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" DockPanel.Dock="Right" Margin="0 0 0 0">
+                                <Image Source="../Images/Job Issues/ttime_left.png" Stretch="Fill" VerticalAlignment="Top" Height="32" Width="32"/>
+                                <TextBlock Margin="15 10 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>
+
+                                </TextBlock>
+                                <touch:TouchButton Content="Abort"  Height="50" Width="164" CornerRadius="30" Command="{Binding AbortCommand}" IsEnabled="true" BorderThickness="0" BorderBrush="{StaticResource TangoPrimaryAccentBrush}" EnableDropShadow="False" VerticalAlignment="Top" Margin="20 -5 0 0">
+                                    <touch:TouchButton.Style >
+                                        <Style TargetType="touch:TouchButton" >
+                                            <Setter Property="Foreground" Value="{StaticResource TangoLightForegroundBrush}"></Setter>
+                                            <Setter Property="Background" Value="{StaticResource TangoPrimaryAccentBrush}"/>
+                                            <Style.Triggers>
+                                                <Trigger Property="IsEnabled" Value="False">
+                                                    <Setter Property="Foreground" Value="{StaticResource TangoDisabledForegroundBrush}"></Setter>
+                                                    <Setter Property="Background" Value="{StaticResource TangoDisabledBackgroundBrush}"></Setter>
+                                                </Trigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </touch:TouchButton.Style>
+                                </touch:TouchButton>
 
-        </Grid>
-        </Grid>
+                            </StackPanel>
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" DockPanel.Dock="Left">
+                                <Image Source="../Images/Job Issues/job_length.png" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Left" Width="32" Height="32"/>
+                                <TextBlock Margin="20 10 0 0" MinWidth="25"  FontWeight="SemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}" >
+                                    <TextBlock.Text>
+                                        <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='-' Mode="OneWay">
+                                            <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/>
+                                            <Binding Path="Job.Spools" Mode="OneWay"/>
+                                        </MultiBinding>
+                                    </TextBlock.Text>
+                                </TextBlock>
+                            </StackPanel>
+                            <StackPanel Orientation="Vertical" Margin="30 5 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" Maximum="{Binding RunningJobStatus.TotalProgressMinusSettingUp}" Value="{Binding RunningJobStatus.ProgressMinusSettingUp}" Foreground="{StaticResource TangoDarkForegroundBrush}"
+                                           IsSnapToTickEnabled="True"  TickFrequency="1" VerticalAlignment="Center" IsEnabled="False" />
+                            </StackPanel>
+                        </DockPanel>
+                        <Border Height="2" Background="{StaticResource TangoLightBorderBrush}"  VerticalAlignment="Bottom"  Margin="0 2 0 0" CornerRadius="2"></Border>
+                    </Grid>
+                    <Grid Grid.Row="1" Margin="0 25 0 0">
+                        <StackPanel Orientation="Vertical">
+                            <StackPanel Orientation="Horizontal" >
+                                <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="150">
+                                
+                            </UniformGrid>
+                            <Grid Height="150">
+                                
+                            </Grid>
+                            
+                        </StackPanel>
+                    </Grid>
+                    <Grid Grid.Row="2" x:Name="IncLevels">
+                        <DockPanel>
+                                    <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" >
+                                        <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}">Waste</TextBlock>
+                                    </StackPanel>
+                                    <StackPanel Orientation="Horizontal" >
+                                        <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}">Ink Levels</TextBlock>
+                                    </StackPanel>
+                                </DockPanel>
+                                
+                    </Grid>
+                </Grid>
+            </Grid>
         </Grid>
         <Grid VerticalAlignment="Bottom" Grid.ColumnSpan="2" Margin="10 0 0 0">
             <touch:TouchExpander x:Name="Notifications" Style="{StaticResource TouchRoundedExpander}"  IsTabStop="False" KeyboardNavigation.TabNavigation ="None" BorderThickness="0" IsExpanded="false" CornerRadius="20 20 0 0" >