From 1e563685f9c74fc7cfc204b714a1401002eba5fd Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Sun, 15 Mar 2020 17:11:16 +0200
Subject: Machine Studio. Statistics Job Runs page, change colors of pies, a
 little changes in GUI.

---
 .../Models/StatisticsValueCollection.cs              | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(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 2ad165d79..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
 {
@@ -133,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
 
 
@@ -202,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
@@ -215,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
@@ -242,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,
@@ -254,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
@@ -270,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
@@ -281,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
-- 
cgit v1.3.1