From 23e661dfbb74dc67ea097ae331cadd2446997b31 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Wed, 18 Mar 2020 11:19:40 +0200 Subject: Machine Studio. Changes in Statistics Job Runs and Action log. Improving data creation performance. --- .../Models/StatisticsValueCollection.cs | 19 ++++++++++++------- .../Models/TotalLiquidQuantityModel.cs | 15 +++++++++++++++ 2 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/TotalLiquidQuantityModel.cs (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models') 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 ef5527406..acbbde3f2 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 @@ -96,18 +96,18 @@ namespace Tango.MachineStudio.Statistics.Models set { _pieGradientSolid = value; RaisePropertyChangedAuto(); } } - private List _liquidQuantities; + private List _liquidQuantities; /// /// Gets or sets the liquid quantities. /// - public List LiquidQuantities + public List LiquidQuantities { get { if (_liquidQuantities == null) { - _liquidQuantities = new List(); + _liquidQuantities = new List(); } return _liquidQuantities; } @@ -115,12 +115,12 @@ namespace Tango.MachineStudio.Statistics.Models { _liquidQuantities = value; RaisePropertyChangedAuto(); } } - private int _totalLiquidQuantities; + private ulong _totalLiquidQuantities; /// /// Gets or sets the total liquid quantities. /// - public int TotalLiquidQuantities + public ulong TotalLiquidQuantities { get { return _totalLiquidQuantities; } set { _totalLiquidQuantities = value; RaisePropertyChangedAuto(); } @@ -302,10 +302,15 @@ namespace Tango.MachineStudio.Statistics.Models /// /// Generates the statistics liquid quantity and TotalLiquidQuantities. /// - public void GenerateStatisticsLiquidQuantity(List liquidQuantities) + public void GenerateStatisticsLiquidQuantity(List liquidQuantities) { LiquidQuantities = liquidQuantities; - TotalLiquidQuantities = liquidQuantities.Sum(x => x.Quantity); + TotalLiquidQuantities = 0; + + foreach (var item in liquidQuantities) + { + TotalLiquidQuantities += (ulong)item.Quantity; + } } } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/TotalLiquidQuantityModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/TotalLiquidQuantityModel.cs new file mode 100644 index 000000000..b5e2e9fb7 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/TotalLiquidQuantityModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL.Enumerations; + +namespace Tango.MachineStudio.Statistics.Models +{ + public class TotalLiquidQuantityModel + { + public LiquidTypes LiquidType { get; set; } + public ulong Quantity { get; set; } + } +} -- cgit v1.3.1 From 97f0f9cf442681560b9ca59b437804b9dc85e981 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Wed, 18 Mar 2020 18:17:50 +0200 Subject: Some improvements to job runs. --- .../Converters/JobLengthConverter.cs | 8 ++++++- .../Models/StatisticsValueCollection.cs | 14 +++++++----- .../ViewModels/JobRunsViewVM.cs | 26 ++++++++++++++++------ .../Views/JobRunsView.xaml | 4 ++-- .../Views/MainView.xaml | 6 ++--- 5 files changed, 39 insertions(+), 19 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models') 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 _pieColors; @@ -43,7 +43,9 @@ namespace Tango.MachineStudio.Statistics.Models public ObservableCollection 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"); } /// @@ -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"); } /// @@ -548,7 +560,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels /// 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 total_quantities = new Dictionary(); @@ -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 @@ - + @@ -466,7 +466,7 @@ - + - - - + + + -- cgit v1.3.1