PPC. Machine Status View changes.

5 files changed, 74 insertions, 27 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/LengthToWeightConverter.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/LengthToWeightConverter.cs
index 910a5238b..82a947e97 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/LengthToWeightConverter.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/LengthToWeightConverter.cs
@@ -23,7 +23,7 @@ namespace Tango.PPC.UI.Converters
             }
             catch (Exception ex)
             {
-                return 0d;
+                return "-";
             }
         }
         
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/LengthWithSpoolsConverter.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/LengthWithSpoolsConverter.cs
index 48e9bce7b..3b42885bd 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/LengthWithSpoolsConverter.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/LengthWithSpoolsConverter.cs
@@ -21,7 +21,7 @@ namespace Tango.PPC.UI.Converters
             }
             catch
             {
-                return 0d;
+                return "-";
             }
         }
 
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 8e5d3e0f9..b41dbb0bf 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs
@@ -81,6 +81,17 @@ namespace Tango.PPC.UI.ViewModels
             set { _isSpoolView = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _isWeightView;
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is length. Show indicator values in length or weight.
+        /// </summary>
+        public bool IsWeghtView
+        {
+            get { return _isWeightView; }
+            set { _isWeightView = value; RaisePropertyChangedAuto(); }
+        }
+
+
         private bool _isDyeingProcess;
 
         public bool IsDyeingProcess
@@ -191,6 +202,7 @@ namespace Tango.PPC.UI.ViewModels
             IsJobStatusViewEnable = true;
             IsEnabledStopButton = false;
             IsSpoolView = false;
+            IsWeghtView = false;
         }
 
         #region printing
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 18c9b3adb..370ac1de7 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
@@ -195,8 +195,8 @@
                 <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">
                             <StackPanel Orientation="Vertical">
-                                <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="36" Width="164" ThumbWidth="80" LeftText="Total" RightText="Spool" ThumbCornerRadius="13" IsChecked="{Binding IsSpoolView}" FontSize="{StaticResource TangoDefaultFontSize}"></touch:TouchToggleSlider>
-                                <touch:TouchToggleSlider  Style="{StaticResource TouchToggleButtonSlider}" Background="{StaticResource TangoMidBackgroundBrush}" CheckedBackground="{StaticResource TangoMidBackgroundBrush}" UncheckedBackground="{StaticResource TangoMidBackgroundBrush}"  HorizontalAlignment="Right" VerticalAlignment="Top" Margin="20 20 20 0"  CornerRadius="17" Height="36" Width="164" ThumbWidth="80" LeftText="Length" RightText="Weight" ThumbCornerRadius="13" IsChecked="{Binding IsSpoolView}" FontSize="{StaticResource TangoDefaultFontSize}"></touch:TouchToggleSlider>
+                                <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="36" Width="164" ThumbWidth="80" LeftText="4 Spools" RightText="1 Spool" ThumbCornerRadius="13" IsChecked="{Binding IsSpoolView}" FontSize="{StaticResource TangoDefaultFontSize}"></touch:TouchToggleSlider>
+                                <touch:TouchToggleSlider  Style="{StaticResource TouchToggleButtonSlider}" Background="{StaticResource TangoMidBackgroundBrush}" CheckedBackground="{StaticResource TangoMidBackgroundBrush}" UncheckedBackground="{StaticResource TangoMidBackgroundBrush}"  HorizontalAlignment="Right" VerticalAlignment="Top" Margin="20 40 20 0"  CornerRadius="17" Height="36" Width="164" ThumbWidth="80" LeftText="Length" RightText="Weight" ThumbCornerRadius="13" IsChecked="{Binding IsWeghtView}" FontSize="{StaticResource TangoDefaultFontSize}"></touch:TouchToggleSlider>
                             </StackPanel>
                         </StackPanel>
 
@@ -260,11 +260,10 @@
                             </StackPanel>
                         </StackPanel>
                     </UniformGrid>
-                    <Grid Background="{StaticResource TangoMidBackgroundBrush}" VerticalAlignment="Top">
+                        <Grid x:Name="StatusCicle" Background="{StaticResource TangoMidBackgroundBrush}" VerticalAlignment="Top">
                         <StackPanel VerticalAlignment="Center">
-                        <Grid>
-
-                            <touch:TouchRingProgress Width="364" Height="364" RingThickness="10">
+                                <Grid>
+                                    <touch:TouchRingProgress Width="364" Height="364" RingThickness="10">
                                 <touch:TouchRingProgress.Style>
                                     <Style TargetType="touch:TouchRingProgress">
                                         <Setter Property="Visibility" Value="Visible"></Setter>
@@ -273,7 +272,7 @@
                                         <Setter Property="Value" Value="{Binding RunningJobStatus.ProgressMinusSettingUp}"></Setter>
                                         <Style.Triggers>
                                             <DataTrigger Binding="{Binding RunningJobStatus.IsSettingUp}" Value="False">
-                                                <Setter Property="Visibility" Value="Visible"></Setter>
+                                               <Setter Property="Visibility" Value="Visible"></Setter>
                                             </DataTrigger>
                                             <DataTrigger Binding="{Binding RunningJobStatus.IsCompleted}" Value="True">
                                                 <Setter Property="Maximum" Value="100"></Setter>
@@ -302,6 +301,15 @@
                                                         <Setter Property="Visibility" Value="Visible"></Setter>
                                                         <Setter Property="Value" Value="0"></Setter>
                                                         <Setter Property="IsIndeterminate" Value="True"></Setter>
+                                                        <Setter Property="Foreground">
+                                                            <Setter.Value>
+                                                                <LinearGradientBrush StartPoint="0, 0" EndPoint="1, 1">
+                                                                    <GradientStop Offset="0.2" Color="Red"/>
+                                                                    <GradientStop Offset="0.6" Color="Yellow"/>
+                                                                    <GradientStop Offset="0.8" Color="Blue"/>
+                                                                </LinearGradientBrush>
+                                                            </Setter.Value>
+                                                        </Setter>
                                                     </DataTrigger>
                                                     <DataTrigger Binding="{Binding RunningJobStatus.IsCompleted}" Value="True">
                                                         <Setter Property="IsIndeterminate" Value="False"></Setter>
@@ -323,13 +331,17 @@
 
                                     <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
 
-                                        <StackPanel Visibility="{Binding RunningJobStatus.IsSettingUp,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                        <StackPanel Visibility="{Binding RunningJobStatus.IsSettingUp, TargetNullValue=true, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                                                <Image Source="../Images/JobProgressView/drop.png" Stretch="None" />
-                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Completed</TextBlock>
+                                                <Image Source="../Images/JobProgressView/drop.png" Stretch="None" VerticalAlignment="Center" />
+                                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Completed /</TextBlock>
+                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityInverseConverter}}"> Length</TextBlock>
+                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityConverter}}"> Weight</TextBlock>
+                                                </StackPanel>
                                             </StackPanel>
-                                            <StackPanel Orientation="Horizontal" Margin="0 10 0 0" HorizontalAlignment="Center">
-                                                <TextBlock FontWeight="Light" FontSize="{StaticResource TangoLargeFontSize}">
+                                            <StackPanel Orientation="Horizontal" Margin="0 15 0 0" HorizontalAlignment="Center" Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                                <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center">
                                                     <TextBlock.Text>
                                                         <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="0" TargetNullValue='-' FallbackValue='0' Mode="OneWay">
                                                             <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/>
@@ -337,8 +349,8 @@
                                                         </MultiBinding>
                                                     </TextBlock.Text>
                                                 </TextBlock>
-                                                <TextBlock FontWeight="Light" FontSize="{StaticResource TangoLargeFontSize}"  Text="/"></TextBlock>
-                                                <TextBlock FontWeight="Light" FontSize="{StaticResource TangoLargeFontSize}">
+                                                <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center" Text="/"></TextBlock>
+                                                <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" VerticalAlignment="Center">
                                                     <TextBlock.Text>
                                                         <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="0" TargetNullValue='-' FallbackValue='0' Mode="OneWay">
                                                             <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp" Mode="OneWay"/>
@@ -346,11 +358,33 @@
                                                         </MultiBinding>
                                                     </TextBlock.Text>
                                                 </TextBlock>
-                                                <TextBlock FontWeight="Light" FontSize="{StaticResource TangoLargeFontSize}"  Text="m"></TextBlock>
+                                                <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" VerticalAlignment="Center" Text=" m"></TextBlock>
+                                            </StackPanel>
+                                            <StackPanel Orientation="Horizontal" Margin="0 10 0 0" HorizontalAlignment="Center" Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                                <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center">
+                                                    <TextBlock.Text>
+                                                        <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='0' Mode="OneWay">
+                                                            <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/>
+                                                            <Binding Path="Job.GramPerLength" Mode="OneWay"/>
+                                                            <Binding Path="Job.Spools" Mode="OneWay"/>
+                                                        </MultiBinding>
+                                                    </TextBlock.Text>
+                                                </TextBlock>
+                                                <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center" Text="/"></TextBlock>
+                                                <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" VerticalAlignment="Center">
+                                                    <TextBlock.Text>
+                                                        <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='0' Mode="OneWay">
+                                                            <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp" Mode="OneWay"/>
+                                                            <Binding Path="Job.GramPerLength" Mode="OneWay"/>
+                                                            <Binding Path="Job.Spools" Mode="OneWay"/>
+                                                        </MultiBinding>
+                                                    </TextBlock.Text>
+                                                </TextBlock>
+                                                <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" VerticalAlignment="Center" Text=" g"></TextBlock>
                                             </StackPanel>
                                         </StackPanel>
 
-                                        <StackPanel Height="90" Visibility="{Binding RunningJobStatus.IsSettingUp,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                        <StackPanel Height="90" Visibility="{Binding RunningJobStatus.IsSettingUp, FallbackValue=collapsed, Converter={StaticResource BooleanToVisibilityConverter}}">
                                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                                                 <Image Source="../Images/JobProgressView/drop.png" Stretch="None" />
                                                 <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Getting Ready...</TextBlock>
@@ -360,19 +394,19 @@
                                         <Rectangle Margin="0 10 0 0" Width="250" Stroke="{StaticResource TangoDividerBrush}" />
 
                                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0 15 0 0">
-                                            <Image Source="../Images/JobProgressView/clock.png" Stretch="None" />
-                                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Time Left</TextBlock>
+                                            <Image Source="../Images/JobProgressView/clock.png" Stretch="None" VerticalAlignment="Center" />
+                                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Time Left</TextBlock>
                                         </StackPanel>
 
-                                        <TextBlock FontWeight="Light" FontSize="{StaticResource TangoLargeFontSize}" Margin="0 10 0 0" 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 VerticalAlignment="Center" FontSize="{StaticResource TangoLargeInfoFontSize}" Margin="0 10 0 0" HorizontalAlignment="Center">
+                                            <Run Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToTwoDigitsTimeConverter},FallbackValue=-}"></Run>
+                                            <Run FontSize="{StaticResource TangoComboBoxItemFontSize}" Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToLabelConverter},FallbackValue=min}"></Run>
                                         </TextBlock>
                                     </StackPanel>
                                 </Grid>
 
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                                    <touch:TouchButton Content="Abort" Margin="0 20 0 0" Height="50" Width="164" CornerRadius="30" Command="{Binding AbortCommand}" IsEnabled="true" BorderThickness="1" BorderBrush="{StaticResource TangoPrimaryAccentBrush}" EnableDropShadow="False">
+                                    <touch:TouchButton Visibility="Collapsed" Content="Abort" Margin="0 20 0 0" Height="50" Width="164" CornerRadius="30" Command="{Binding AbortCommand}" IsEnabled="true" BorderThickness="1" BorderBrush="{StaticResource TangoPrimaryAccentBrush}" EnableDropShadow="False">
                                         <touch:TouchButton.Style >
                                             <Style TargetType="touch:TouchButton" >
                                                 <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
@@ -386,7 +420,7 @@
                                             </Style>
                                         </touch:TouchButton.Style>
                                     </touch:TouchButton>
-                                    <touch:TouchButton Content="Stop" Margin="20 20 0 0" Height="50" Width="164" CornerRadius="30"  Command="{Binding StopCommand}" IsEnabled="{Binding MachineProvider.MachineOperator.IsPrinting}" EnableDropShadow="False">
+                                    <touch:TouchButton Content="Stop" Margin="0 20 0 0" Height="50" Width="164" CornerRadius="30"  Command="{Binding StopCommand}" IsEnabled="{Binding MachineProvider.MachineOperator.IsPrinting}" EnableDropShadow="False">
                                         <touch:TouchButton.Style >
                                             <Style TargetType="touch:TouchButton" >
                                                 <Setter Property="Foreground" Value="{StaticResource TangoLightForegroundBrush}"></Setter>
@@ -454,7 +488,7 @@
                             <Image Source="../Images/Job Issues/job_copies.png" Stretch="None" VerticalAlignment="Top"/>
                             <StackPanel Orientation="Vertical" Margin="15 0 0 0">
                                 <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Copies</TextBlock>
-                                    <TextBlock Text="{Binding RunningJobStatus.RemainingUnits,TargetNullValue='-', FallbackValue='-'}" FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"></TextBlock>
+                                    <TextBlock Text="{Binding RunningJobStatus.CurrentUnit,TargetNullValue='-', FallbackValue='-'}" FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"></TextBlock>
                             </StackPanel>
                         </StackPanel>
                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
@@ -633,7 +667,7 @@
                                              <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 Content="Stop"  Height="50" Width="164" CornerRadius="30" Command="{Binding StopCommand}" 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>
diff --git a/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml b/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml
index e1f249008..d4990ebf9 100644
--- a/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml
@@ -30,4 +30,5 @@
     <sys:Double x:Key="TangoMenuItemFontSize">27</sys:Double>
     <sys:Double x:Key="TangoLargeFontSize">46</sys:Double>
     <sys:Double x:Key="TangoLargeHeaderFontSize">42</sys:Double>
+    <sys:Double x:Key="TangoLargeInfoFontSize">36</sys:Double>
 </ResourceDictionary>
\ No newline at end of file