Some improvements to job runs.

5 files changed, 39 insertions, 19 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/JobLengthConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/JobLengthConverter.cs
index b730d7881..cd928d9c9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/JobLengthConverter.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/JobLengthConverter.cs
@@ -19,7 +19,13 @@ namespace Tango.MachineStudio.Statistics.Converters
                     double length = (double)values[0];
                     double endPoint = (double)values[1];
                     double width = (double)values[2];
-                    return Math.Round((endPoint / length) * width, MidpointRounding.AwayFromZero);
+                    var v = Math.Round((endPoint / length) * width, MidpointRounding.AwayFromZero);
+
+                    if (double.IsInfinity(v))
+                    {
+                        return 0d;
+                    }
+                    return v;
                 }
             }
             catch { }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/StatisticsValueCollection.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/StatisticsValueCollection.cs
index acbbde3f2..b5615e4d1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/StatisticsValueCollection.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/StatisticsValueCollection.cs
@@ -29,7 +29,7 @@ namespace Tango.MachineStudio.Statistics.Models
         public string Text { get; set; }
     }
 
-    public class StatisticsValueCollection: ExtendedObject
+    public class StatisticsValueCollection : ExtendedObject
     {
         private List<Color> _pieColors;
 
@@ -43,7 +43,9 @@ namespace Tango.MachineStudio.Statistics.Models
         public ObservableCollection<StatisticsValue> StatisticsCollection
         {
             get { return _statisticsCollection; }
-            set { _statisticsCollection = value;
+            set
+            {
+                _statisticsCollection = value;
                 RaisePropertyChangedAuto();
             }
         }
@@ -139,7 +141,7 @@ namespace Tango.MachineStudio.Statistics.Models
             _pieColors.Add(((SolidColorBrush)Application.Current.Resources["OrangeBrush"]).Color);
             _pieColors.Add(((SolidColorBrush)Application.Current.Resources["GreenBrush"]).Color);
             _pieColors.Add(((SolidColorBrush)Application.Current.Resources["BlueBrush100"]).Color);
-            _pieColors.Add(Colors.Yellow);
+            _pieColors.Add(Color.FromRgb(255, 216, 76));
 
 
             PieJobSource = new LabeledSeriesCollection()
@@ -214,7 +216,7 @@ namespace Tango.MachineStudio.Statistics.Models
             };
 
             PieJobSource.SeriesCollection.Add(series);
-            
+
             series = new PieSeries()
             {
                 Title = "MS",
@@ -250,7 +252,7 @@ namespace Tango.MachineStudio.Statistics.Models
                 DataLabels = true,
                 ToolTip = "",
                 LabelPoint = labelPoint,
-               
+
             };
             PieJobRunStatus.SeriesCollection.Add(series);
 
@@ -294,7 +296,7 @@ namespace Tango.MachineStudio.Statistics.Models
 
             PieGradientSolid.SeriesCollection.Add(series);
 
-            
+
             RaisePropertyChanged("PieGradientSolid");
         }
         #endregion
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs
index 3aa93cd3e..6be0948a9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs
@@ -347,7 +347,13 @@ namespace Tango.MachineStudio.Statistics.ViewModels
                                 x.Status,
                                 x.UploadingStartDate,
                                 x.UserGuid,
-                                x.LiquidQuantityString,
+                                x.CyanQuantity,
+                                x.MagentaQuantity,
+                                x.YellowQuantity,
+                                x.BlackQuantity,
+                                x.TransparentQuantity,
+                                x.LubricantQuantity,
+                                x.CleanerQuantity
                             });
 
 
@@ -405,7 +411,13 @@ namespace Tango.MachineStudio.Statistics.ViewModels
                                 Status = x.Status,
                                 UploadingStartDate = x.UploadingStartDate,
                                 UserGuid = x.UserGuid,
-                                LiquidQuantityString = x.LiquidQuantityString,
+                                CyanQuantity = x.CyanQuantity,
+                                MagentaQuantity = x.MagentaQuantity,
+                                YellowQuantity = x.YellowQuantity,
+                                BlackQuantity = x.BlackQuantity,
+                                TransparentQuantity = x.TransparentQuantity,
+                                LubricantQuantity = x.LubricantQuantity,
+                                CleanerQuantity = x.CleanerQuantity
                             }).ToList();
 
                         var modelList = runs.Select(x => new JobRunModel()
@@ -482,8 +494,8 @@ namespace Tango.MachineStudio.Statistics.ViewModels
                 val = selection.Sum(x => (x.JobRun.EndDate - x.JobRun.ActualStartDate).Value.TotalHours);
                 average = selection.Average(x => (x.JobRun.EndDate - x.JobRun.ActualStartDate).Value.TotalMilliseconds);
             }
-            StatisticsValueCollection.AddStatisticsValue("Total Runs Duration", val, " hours");
-            StatisticsValueCollection.AddStatisticsValue("Average Runs Duration", Math.Max(TimeSpan.FromMilliseconds(average).TotalHours, 0), " hours");
+            StatisticsValueCollection.AddStatisticsValue("Total Dyeing Time", val, " hours");
+            StatisticsValueCollection.AddStatisticsValue("Total Dyeing Time", Math.Max(TimeSpan.FromMilliseconds(average).TotalHours, 0), " hours");
         }
 
         /// <summary>
@@ -510,7 +522,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         protected void GenerateTotalThreadConsumption()
         {
             double val = JobRuns.Where(z => z.JobRun.EndPosition > 0).Sum(x => x.JobRun.EndPosition);
-            StatisticsValueCollection.AddStatisticsValue("Actual Total Runs Length", val, " m");
+            StatisticsValueCollection.AddStatisticsValue("Total Dyeing Length", val, " m");
         }
 
         /// <summary>
@@ -548,7 +560,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         /// </summary>
         protected void GenerateAllLiquidQuantities()
         {
-            var runs = JobRuns.Where(z => z.JobRun.EndPosition > 0 && z.JobRun.LiquidQuantities.Count > 0).ToList();
+            var runs = JobRuns.Where(z => z.JobRun.EndPosition > 0 && z.JobRun.LiquidQuantitiesFast.Count > 0).ToList();
 
             Dictionary<LiquidTypes, ulong> total_quantities = new Dictionary<LiquidTypes, ulong>();
 
@@ -559,7 +571,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels
 
             foreach (var run in runs)
             {
-                foreach (var lq in run.JobRun.LiquidQuantities)
+                foreach (var lq in run.JobRun.LiquidQuantitiesFast)
                 {
                     if (lq.Quantity < 0)
                     {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml
index af363b32a..6431d72fb 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml
@@ -326,7 +326,7 @@
                             </StackPanel>
                         </StackPanel>
                     </Grid>
-                    <Button Grid.Column="1" HorizontalAlignment="Right" Command="{Binding LoadJobRunsCommand}"  Margin="0 0 10 0" Padding="70 15" Height="Auto" VerticalAlignment="Center">RUN</Button>
+                    <Button Grid.Column="1" HorizontalAlignment="Right" Command="{Binding LoadJobRunsCommand}"  Margin="0 0 10 0" Padding="70 15" Height="Auto" VerticalAlignment="Center">ANALYZE</Button>
                 </Grid>
             </Border>
         </Grid>
@@ -466,7 +466,7 @@
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="1*" MaxWidth="200"/>
                                 </Grid.ColumnDefinitions>
-                                <ItemsControl ItemsSource="{Binding JobRun.LiquidQuantities,Mode=OneWay}" Margin="0 0 0 0" Height="70">
+                                <ItemsControl ItemsSource="{Binding JobRun.LiquidQuantitiesFast,Mode=OneWay}" Margin="0 0 0 0" Height="70">
                                 <ItemsControl.ItemContainerStyle>
                                     <Style TargetType="ContentPresenter">
                                         <Setter Property="Visibility" Value="Visible"></Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/MainView.xaml
index 170d3276a..21c099db9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/MainView.xaml
@@ -26,12 +26,12 @@
                         <Setter Property="Padding" Value="20,2"></Setter>
                     </Style>
                 </TabControl.Resources>
-                <TabItem Header="STATS" Margin="-100 0 0 0 ">
-                    <local:ChartsView x:Name="processParametersView" DataContext="{Binding ChartsViewVM}"/>
-                </TabItem>
                 <TabItem Header="JOB RUNS" Margin="-100 0 0 0 ">
                     <local:JobRunsView x:Name="jobRunsView"  DataContext="{Binding JobRunsViewVM}"/>
                 </TabItem>
+                <TabItem Header="STATS" Margin="-100 0 0 0 ">
+                    <local:ChartsView x:Name="processParametersView" DataContext="{Binding ChartsViewVM}"/>
+                </TabItem>
             </TabControl>
         </Grid>
     </Grid>