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

1 files changed, 56 insertions, 13 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 2a298777b..287e09009 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
@@ -11,6 +11,8 @@ using System.Windows.Media;
 using Tango.BL.Enumerations;
 using Tango.BL.ValueObjects;
 using Tango.Core;
+using System.Windows.Media;
+using System.Windows;
 
 namespace Tango.MachineStudio.Statistics.Models
 {
@@ -35,6 +37,9 @@ namespace Tango.MachineStudio.Statistics.Models
 
         private ObservableCollection<StatisticsValue> _statisticsCollection;
 
+        /// <summary>
+        /// Gets or sets the statistics collection of StatisticsValue object.
+        /// </summary>
         public ObservableCollection<StatisticsValue> StatisticsCollection
         {
             get { return _statisticsCollection; }
@@ -44,16 +49,25 @@ namespace Tango.MachineStudio.Statistics.Models
         }
 
         private List<StatisticsValue> _threadConsumptionPerThread;
-
+        /// <summary>
+        /// Gets or sets the thread consumption per thread list.
+        /// </summary>
         public List<StatisticsValue> ThreadConsumptionPerThread
         {
             get { return _threadConsumptionPerThread; }
             set { _threadConsumptionPerThread = value; RaisePropertyChangedAuto(); }
         }
 
+        /// <summary>
+        /// Gets or sets the thread consumption per thread collection.
+        /// </summary>
         public CompositeCollection ThreadConsumptionPerThreadCollection { get; set; }
 
         private LabeledSeriesCollection _pieJobSource;
+
+        /// <summary>
+        /// Gets or sets the pie job source.
+        /// </summary>
         public LabeledSeriesCollection PieJobSource
         {
             get { return _pieJobSource; }
@@ -61,6 +75,10 @@ namespace Tango.MachineStudio.Statistics.Models
         }
 
         private LabeledSeriesCollection _pieJobRunStatus;
+
+        /// <summary>
+        /// Gets or sets the pie job run status.
+        /// </summary>
         public LabeledSeriesCollection PieJobRunStatus
         {
             get { return _pieJobRunStatus; }
@@ -68,6 +86,10 @@ namespace Tango.MachineStudio.Statistics.Models
         }
 
         private LabeledSeriesCollection _pieGradientSolid;
+
+        /// <summary>
+        /// Gets or sets the pie gradient solid.
+        /// </summary>
         public LabeledSeriesCollection PieGradientSolid
         {
             get { return _pieGradientSolid; }
@@ -75,6 +97,10 @@ namespace Tango.MachineStudio.Statistics.Models
         }
 
         private List<JobRunLiquidQuantity> _liquidQuantities;
+
+        /// <summary>
+        /// Gets or sets the liquid quantities.
+        /// </summary>
         public List<JobRunLiquidQuantity> LiquidQuantities
         {
             get
@@ -91,6 +117,9 @@ namespace Tango.MachineStudio.Statistics.Models
 
         private int _totalLiquidQuantities;
 
+        /// <summary>
+        /// Gets or sets the total liquid quantities.
+        /// </summary>
         public int TotalLiquidQuantities
         {
             get { return _totalLiquidQuantities; }
@@ -106,8 +135,10 @@ namespace Tango.MachineStudio.Statistics.Models
             ThreadConsumptionPerThreadCollection = new CompositeCollection();
 
             _pieColors = new List<Color>();
-            _pieColors.Add(Color.FromRgb(239, 131, 43));//green
-            _pieColors.Add(Color.FromRgb(144, 233, 144));//orange
+            _pieColors.Add(((SolidColorBrush)Application.Current.Resources["RedBrush100"]).Color);
+            _pieColors.Add(((SolidColorBrush)Application.Current.Resources["OrangeBrush300"]).Color);
+            _pieColors.Add(((SolidColorBrush)Application.Current.Resources["GreenBrush300"]).Color);
+            _pieColors.Add(((SolidColorBrush)Application.Current.Resources["BlueBrush100"]).Color);
             _pieColors.Add(Color.FromRgb(100, 184, 236));//blue
 
 
@@ -128,6 +159,9 @@ namespace Tango.MachineStudio.Statistics.Models
             };
         }
 
+        /// <summary>
+        /// Cleans all values.
+        /// </summary>
         public void Clean()
         {
             StatisticsCollection.Clear();
@@ -138,21 +172,27 @@ namespace Tango.MachineStudio.Statistics.Models
             PieGradientSolid.SeriesCollection.Clear();
         }
 
-        public void AddStatisticsValue( string name, double value, string unit)
+        /// <summary>
+        /// Adds the statistics value.
+        /// </summary>
+        public void AddStatisticsValue(string name, double value, string unit)
         {
-            StatisticsCollection.Add(new StatisticsValue() { Name = name, Value=value, Unit = unit });
+            StatisticsCollection.Add(new StatisticsValue() { Name = name, Value = value, Unit = unit });
             RaisePropertyChanged("StatisticsCollection");
         }
 
+        /// <summary>
+        /// Creates the thread consumption per thread.
+        /// </summary>
         public void CreateThreadConsumptionPerThread(List<StatisticsValue> threads)
         {
             ThreadConsumptionPerThreadCollection.Add(new CollectionContainer() { Collection = threads.Take(threads.Count() > 2 ? 2 : threads.Count()) });
             if (threads.Count() > 2)
             {
-                ThreadConsumptionPerThreadCollection.Add(new CollectionContainer() { Collection = new List<MoreValue>() { new MoreValue(){ Text="More threads ..." } } });
+                ThreadConsumptionPerThreadCollection.Add(new CollectionContainer() { Collection = new List<MoreValue>() { new MoreValue() { Text = "More threads ..." } } });
                 ThreadConsumptionPerThread = threads.Skip(2).ToList();
             }
-                
+
             RaisePropertyChanged("ThreadConsumptionPerThreadCollection");
         }
 
@@ -166,7 +206,7 @@ namespace Tango.MachineStudio.Statistics.Models
             {
                 Title = "PPC",
                 Values = new ChartValues<int>() { PPCCount },
-                Fill = new SolidColorBrush(_pieColors[0]),
+                Fill = new SolidColorBrush(_pieColors[2]),
                 DataLabels = true,
                 ToolTip = "",
                 LabelPoint = labelPoint
@@ -179,7 +219,7 @@ namespace Tango.MachineStudio.Statistics.Models
             {
                 Title = "MS",
                 Values = new ChartValues<int>() { MSCount },
-                Fill = new SolidColorBrush(_pieColors[2]),
+                Fill = new SolidColorBrush(_pieColors[3]),
                 DataLabels = true,
                 ToolTip = "",
                 LabelPoint = labelPoint
@@ -206,7 +246,7 @@ namespace Tango.MachineStudio.Statistics.Models
             {
                 Title = "Aborted",
                 Values = new ChartValues<int>() { abortedCount },
-                Fill = new SolidColorBrush(_pieColors[2]),
+                Fill = new SolidColorBrush(_pieColors[1]),
                 DataLabels = true,
                 ToolTip = "",
                 LabelPoint = labelPoint,
@@ -218,7 +258,7 @@ namespace Tango.MachineStudio.Statistics.Models
             {
                 Title = "Completed",
                 Values = new ChartValues<int>() { completedCount },
-                Fill = new SolidColorBrush(_pieColors[1]),
+                Fill = new SolidColorBrush(_pieColors[2]),
                 DataLabels = true,
                 ToolTip = "",
                 LabelPoint = labelPoint
@@ -234,7 +274,7 @@ namespace Tango.MachineStudio.Statistics.Models
             {
                 Title = "Solid",
                 Values = new ChartValues<int>() { solidCount },
-                Fill = new SolidColorBrush(_pieColors[0]),
+                Fill = new SolidColorBrush(_pieColors[2]),
                 DataLabels = true,
                 ToolTip = "",
                 LabelPoint = labelPoint
@@ -245,7 +285,7 @@ namespace Tango.MachineStudio.Statistics.Models
             {
                 Title = "Gradient",
                 Values = new ChartValues<int>() { gradientCount },
-                Fill = new SolidColorBrush(_pieColors[2]),
+                Fill = new SolidColorBrush(_pieColors[3]),
                 DataLabels = true,
                 ToolTip = "",
                 LabelPoint = labelPoint
@@ -259,6 +299,9 @@ namespace Tango.MachineStudio.Statistics.Models
         }
         #endregion
 
+        /// <summary>
+        /// Generates the statistics liquid quantity and TotalLiquidQuantities.
+        /// </summary>
         public void GenerateStatisticsLiquidQuantity(List<JobRunLiquidQuantity> liquidQuantities)
         {
             LiquidQuantities = liquidQuantities;