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

4 files changed, 40 insertions, 41 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml
index d396b5860..0e9e6d617 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml
@@ -255,7 +255,7 @@
                             <touch:LightTouchDataGridColumn Width="200" Header="Thread" SortMember="ThreadName" HorizontalContentAlignment="Left">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock Margin="5 0 0 0" IsHitTestVisible="False" Text="{Binding ThreadName,Converter={StaticResource StringEllipsisConverter},ConverterParameter='44'}" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                                        <TextBlock Margin="5 0 0 0" IsHitTestVisible="False" Text="{Binding ThreadName,Converter={StaticResource StringEllipsisConverter},ConverterParameter='44'}" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Center" FontWeight="Regular"></TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
@@ -285,7 +285,7 @@
                             <touch:LightTouchDataGridColumn Width="100" Header="Updated" SortMember="LastUpdated">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock IsHitTestVisible="False" Text="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateConverter}}"></TextBlock>
+                                        <TextBlock IsHitTestVisible="False" Text="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateConverter}}" FontWeight="Regular"></TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
@@ -364,7 +364,7 @@
                             <touch:LightTouchDataGridColumn Width="100" Header="Status" SortMember="JobStatus" HorizontalContentAlignment="Left">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock IsHitTestVisible="False" Text="{Binding JobStatus,Converter={StaticResource EnumToDescriptionConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                                        <TextBlock IsHitTestVisible="False" Text="{Binding JobStatus,Converter={StaticResource EnumToDescriptionConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center" FontWeight="Regular"></TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
@@ -378,7 +378,7 @@
                             <touch:LightTouchDataGridColumn Width="200" Header="Thread" SortMember="ThreadName" HorizontalContentAlignment="Left">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock Margin="5 0 0 0"  IsHitTestVisible="False" Text="{Binding ThreadName,Converter={StaticResource StringEllipsisConverter},ConverterParameter='43'}" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                                        <TextBlock Margin="5 0 0 0"  IsHitTestVisible="False" Text="{Binding ThreadName,Converter={StaticResource StringEllipsisConverter},ConverterParameter='43'}" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Center" FontWeight="Regular"></TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
@@ -407,7 +407,7 @@
                             <touch:LightTouchDataGridColumn Width="100" Header="Updated" SortMember="LastUpdated">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock IsHitTestVisible="False" Text="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateConverter}}"></TextBlock>
+                                        <TextBlock IsHitTestVisible="False" Text="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateConverter}}" FontWeight="Regular"></TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressWeightSpoolConverter.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressWeightSpoolConverter.cs
index 05a41912c..f451fe0d9 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressWeightSpoolConverter.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/ProgressWeightSpoolConverter.cs
@@ -42,7 +42,7 @@ namespace Tango.PPC.UI.Converters
                     var currentProgressBy4Spools = (double)currentProgresslength * 4;
 
                     int coeff = (int)currentProgressBy4Spools / (int)totalBy4Spools;
-                    var progressCurrent = coeff == 0 ? currentProgressBy4Spools : currentProgressBy4Spools % (coeff * totalBy4Spools);//show for progress
+                    var progressCurrent = (coeff == 0 || coeff == 1) ? currentProgressBy4Spools : currentProgressBy4Spools % (coeff * totalBy4Spools);//show for progress
                     var weight = ((double)progressCurrent * coef) / (1000);//(g)
                     if (forOneSpool)
                     {
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs
index 0030d71aa..faddc5c54 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/MachineOverviewModel.cs
@@ -70,30 +70,29 @@ namespace Tango.PPC.UI.Models
             UpdateHeaterItem(Tunnel, tunnelState);
 
             //Pumps Pressure
-            if (diagnostics.Monitors.EuInkLinesPressure.Count > 0 && diagnostics.Monitors.EuInkLinesPressure.Any(x => x.Data.Count > 0))
-            {
-                //EuDispenser1Pressure
-                List<double> EuDispensersPressure = new List<double>();
-                var EuDispenser1PressureValue = diagnostics.Monitors.EuDispenser1Pressure.FirstOrDefault();
-                EuDispensersPressure.Add(EuDispenser1PressureValue);
-                var EuDispenser2PressureValue = diagnostics.Monitors.EuDispenser2Pressure.FirstOrDefault();
-                EuDispensersPressure.Add(EuDispenser2PressureValue);
-                var EuDispenser3PressureValue = diagnostics.Monitors.EuDispenser3Pressure.FirstOrDefault();
-                EuDispensersPressure.Add(EuDispenser3PressureValue);
-                var EuDispenser4PressureValue = diagnostics.Monitors.EuDispenser4Pressure.FirstOrDefault();
-                EuDispensersPressure.Add(EuDispenser4PressureValue);
-                var EuDispenser5PressureValue = diagnostics.Monitors.EuDispenser5Pressure.FirstOrDefault();
-                EuDispensersPressure.Add(EuDispenser5PressureValue);
-                var EuDispenser6PressureValue = diagnostics.Monitors.EuDispenser6Pressure.FirstOrDefault();
-                EuDispensersPressure.Add(EuDispenser6PressureValue);
-                var EuDispenser7PressureValue = diagnostics.Monitors.EuDispenser7Pressure.FirstOrDefault();
-                EuDispensersPressure.Add(EuDispenser7PressureValue);
-                var EuDispenser8PressureValue = diagnostics.Monitors.EuDispenser8Pressure.FirstOrDefault();
-                EuDispensersPressure.Add(EuDispenser8PressureValue);
 
-                var pumpsPressuerValue = EuDispensersPressure.Max();// diagnostics.Monitors.EuInkLinesPressure.SelectMany(x => x.Data).Max();
-                UpdatePumpsPressureItem(pumpsPressuerValue);
-            }
+            //EuDispenser1Pressure
+            List<double> EuDispensersPressure = new List<double>();
+            var EuDispenser1PressureValue = diagnostics.Monitors.EuDispenser1Pressure.FirstOrDefault();
+            EuDispensersPressure.Add(EuDispenser1PressureValue);
+            var EuDispenser2PressureValue = diagnostics.Monitors.EuDispenser2Pressure.FirstOrDefault();
+            EuDispensersPressure.Add(EuDispenser2PressureValue);
+            var EuDispenser3PressureValue = diagnostics.Monitors.EuDispenser3Pressure.FirstOrDefault();
+            EuDispensersPressure.Add(EuDispenser3PressureValue);
+            var EuDispenser4PressureValue = diagnostics.Monitors.EuDispenser4Pressure.FirstOrDefault();
+            EuDispensersPressure.Add(EuDispenser4PressureValue);
+            var EuDispenser5PressureValue = diagnostics.Monitors.EuDispenser5Pressure.FirstOrDefault();
+            EuDispensersPressure.Add(EuDispenser5PressureValue);
+            var EuDispenser6PressureValue = diagnostics.Monitors.EuDispenser6Pressure.FirstOrDefault();
+            EuDispensersPressure.Add(EuDispenser6PressureValue);
+            var EuDispenser7PressureValue = diagnostics.Monitors.EuDispenser7Pressure.FirstOrDefault();
+            EuDispensersPressure.Add(EuDispenser7PressureValue);
+            var EuDispenser8PressureValue = diagnostics.Monitors.EuDispenser8Pressure.FirstOrDefault();
+            EuDispensersPressure.Add(EuDispenser8PressureValue);
+
+            var pumpsPressuerValue = EuDispensersPressure.Max();// diagnostics.Monitors.EuInkLinesPressure.SelectMany(x => x.Data).Max();
+            UpdatePumpsPressureItem(pumpsPressuerValue);
+
 
             //Lubricant
             var lubricantValue = diagnostics.Monitors.EuLubricantCurrent.FirstOrDefault();
@@ -111,7 +110,7 @@ namespace Tango.PPC.UI.Models
                 {
                     item.Status = "Heating Up";
                     item.Color = Colors.Orange;
-                    item.DisplayValue = $"{state.CurrentValue} / {state.SetPoint}";
+                    item.DisplayValue = $"{state.CurrentValue.ToString("N1")} / {state.SetPoint}";
                     item.MaxValue = state.SetPoint;
                     item.Value = state.CurrentValue;
                 }
@@ -134,7 +133,7 @@ namespace Tango.PPC.UI.Models
                 {
                     item.Status = "Over-temperature";
                     item.Color = Colors.Red;
-                    item.DisplayValue = $"{state.CurrentValue} / {state.SetPoint}";
+                    item.DisplayValue = $"{state.CurrentValue.ToString("N1")} / {state.SetPoint}";
                     item.MaxValue = state.SetPoint;
                     item.Value = state.CurrentValue > state.SetPoint? state.SetPoint : state.CurrentValue;
                 }
@@ -153,13 +152,13 @@ namespace Tango.PPC.UI.Models
             {
                 DryerAir.Status = "Heating Up";
                 DryerAir.Color = Colors.Orange;
-                DryerAir.DisplayValue = $"{currentvalue}";
+                DryerAir.DisplayValue = currentvalue.ToString("N1");
             }
             else if (currentvalue >= DryerAirMaxValue)
             {
                 DryerAir.Status = "Operational";
                 DryerAir.Color = Colors.Green;
-                DryerAir.DisplayValue = $"{currentvalue}";
+                DryerAir.DisplayValue = currentvalue.ToString("N1");
             }
             DryerAir.Value = currentvalue;
         }
@@ -170,13 +169,13 @@ namespace Tango.PPC.UI.Models
             {
                 PumpsPressure.Status = "Overpressure";
                 PumpsPressure.Color = Colors.Red;
-                PumpsPressure.DisplayValue = maxValue.ToString();
+                PumpsPressure.DisplayValue = maxValue.ToString("N1");
             }
             else
             {
                 PumpsPressure.Status = "Operational";
                 PumpsPressure.Color = Colors.Green;
-                PumpsPressure.DisplayValue = maxValue.ToString();
+                PumpsPressure.DisplayValue = maxValue.ToString("N1");
             }
             PumpsPressure.Value = maxValue;
         }
@@ -196,7 +195,7 @@ namespace Tango.PPC.UI.Models
                     return;
                 }
                 Lubricant.Status = "Active";
-                Lubricant.DisplayValue = lubricantValue.ToString();
+                Lubricant.DisplayValue = lubricantValue.ToString("N1");
                 Lubricant.Color = Colors.Green;
                 return;
             }
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 adf25eddb..996b54d13 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
@@ -367,7 +367,7 @@
                                         <Rectangle Height="3" Fill="{StaticResource TangoPrimaryAccentBrush}"  VerticalAlignment="Bottom"  Margin="0 2 0 0"></Rectangle>
                                     </StackPanel>
                                 </touch:TouchButton>
-                                <TextBlock DockPanel.Dock="Left" FontSize="{StaticResource TangoLargeHeaderFontSize}" Text="{Binding Job.Name, TargetNullValue='-', FallbackValue='-'}"></TextBlock>
+                                <TextBlock DockPanel.Dock="Left" FontSize="28" Text="{Binding Job.Name, TargetNullValue='-', FallbackValue='-'}"></TextBlock>
                             </DockPanel>
                             <Border Height="2" Background="{StaticResource TangoLightBorderBrush}"  VerticalAlignment="Bottom"  Margin="0 2 0 0" CornerRadius="2"></Border>
                         </Grid>
@@ -557,7 +557,7 @@
                                                 <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 ProgressWeightSpoolConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='0'>
+                                                            <MultiBinding Converter="{StaticResource ProgressWeightSpoolConverter}" StringFormat="0.00" TargetNullValue='-' FallbackValue='0'>
                                                                 <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp" />
                                                                 <Binding Path="IsSpoolView"/>
                                                                 <Binding Path="RunningJobStatus.ProgressMinusSettingUp" />
@@ -884,7 +884,7 @@
                             </Grid.ColumnDefinitions>
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" >
                                 <Image Margin="0 2 0 0" Source="../Images/Job Issues/job_length.png" Stretch="Uniform" VerticalAlignment="Top" HorizontalAlignment="Left" Width="Auto" Height="32" />
-                                <TextBlock Margin="20 10 0 0" Width="50"  FontWeight="SemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}" >
+                                <TextBlock Margin="20 5 0 0" Width="Auto"  FontWeight="SemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"  VerticalAlignment="Top">
                                     <TextBlock.Text>
                                         <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='-' Mode="OneWay">
                                             <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/>
@@ -894,7 +894,7 @@
                                 </TextBlock>
                             </StackPanel>
                             <!--<Grid Grid.Column="1"  Margin="20 8 20 0" VerticalAlignment="Top" Height="20">-->
-                            <locaControls:RunningJobViewerEureka Grid.Column="1" Margin="20 12 20 0"  VerticalAlignment="Top" ThumbHeight="16" Height="14"  HeightSlider="14"  DisplayMarkers="False" IsActive="True" Job="{Binding Job}" 
+                            <locaControls:RunningJobViewerEureka Grid.Column="1" Margin="10 12 20 0"  VerticalAlignment="Top" ThumbHeight="16" Height="14"  HeightSlider="14"  DisplayMarkers="False" IsActive="True" Job="{Binding Job}" 
                                                                      RunningJobStatus="{Binding RunningJobStatus}"  
                                                                      MaximumValue="{Binding RunningJobStatus.TotalProgressMinusSettingUp, FallbackValue=100,TargetNullValue=100}" 
                                                                      MinimumValue="0"
@@ -1011,7 +1011,7 @@
                                                     <SolidColorBrush Color="{Binding Lubricant.Color}"/>
                                                 </touch:TouchArcProgress.Foreground>
                                             </touch:TouchArcProgress>
-                                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="{Binding Lubricant.DisplayValue}">
+                                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="{Binding Lubricant.DisplayValue, StringFormat=0.## }">
                                                 <TextBlock.Foreground>
                                                     <SolidColorBrush Color="{Binding Lubricant.Color}"/>
                                                 </TextBlock.Foreground>