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 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/StatisticsValueCollection.cs') 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; + } } } -- cgit v1.3.1