Machine Studio. Changes in Statistics Job Runs and Action log. Improving data creation performance.

1 files changed, 12 insertions, 7 deletions

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<JobRunLiquidQuantity> _liquidQuantities;
+        private List<TotalLiquidQuantityModel> _liquidQuantities;
 
         /// <summary>
         /// Gets or sets the liquid quantities.
         /// </summary>
-        public List<JobRunLiquidQuantity> LiquidQuantities
+        public List<TotalLiquidQuantityModel> LiquidQuantities
         {
             get
             {
                 if (_liquidQuantities == null)
                 {
-                    _liquidQuantities = new List<JobRunLiquidQuantity>();
+                    _liquidQuantities = new List<TotalLiquidQuantityModel>();
                 }
                 return _liquidQuantities;
             }
@@ -115,12 +115,12 @@ namespace Tango.MachineStudio.Statistics.Models
             { _liquidQuantities = value; RaisePropertyChangedAuto(); }
         }
 
-        private int _totalLiquidQuantities;
+        private ulong _totalLiquidQuantities;
 
         /// <summary>
         /// Gets or sets the total liquid quantities.
         /// </summary>
-        public int TotalLiquidQuantities
+        public ulong TotalLiquidQuantities
         {
             get { return _totalLiquidQuantities; }
             set { _totalLiquidQuantities = value; RaisePropertyChangedAuto(); }
@@ -302,10 +302,15 @@ namespace Tango.MachineStudio.Statistics.Models
         /// <summary>
         /// Generates the statistics liquid quantity and TotalLiquidQuantities.
         /// </summary>
-        public void GenerateStatisticsLiquidQuantity(List<JobRunLiquidQuantity> liquidQuantities)
+        public void GenerateStatisticsLiquidQuantity(List<TotalLiquidQuantityModel> liquidQuantities)
         {
             LiquidQuantities = liquidQuantities;
-            TotalLiquidQuantities = liquidQuantities.Sum(x => x.Quantity);
+            TotalLiquidQuantities = 0;
+
+            foreach (var item in liquidQuantities)
+            {
+                TotalLiquidQuantities += (ulong)item.Quantity;
+            }
         }
 
     }