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

6 files changed, 27 insertions, 10 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 eab4eecde..ef5527406 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
@@ -20,7 +20,7 @@ namespace Tango.MachineStudio.Statistics.Models
     {
         public string Name { get; set; }
 
-        public double Value { get; set; }
+        public object Value { get; set; }
 
         public string Unit { get; set; }
     }
@@ -139,7 +139,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(Color.FromRgb(100, 184, 236));//blue
+            _pieColors.Add(Colors.Yellow);
 
 
             PieJobSource = new LabeledSeriesCollection()
@@ -175,7 +175,7 @@ namespace Tango.MachineStudio.Statistics.Models
         /// <summary>
         /// Adds the statistics value.
         /// </summary>
-        public void AddStatisticsValue(string name, double value, string unit)
+        public void AddStatisticsValue(string name, object value, string unit)
         {
             StatisticsCollection.Add(new StatisticsValue() { Name = name, Value = value, Unit = unit });
             RaisePropertyChanged("StatisticsCollection");
@@ -206,7 +206,7 @@ namespace Tango.MachineStudio.Statistics.Models
             {
                 Title = "PPC",
                 Values = new ChartValues<int>() { PPCCount },
-                Fill = new SolidColorBrush(_pieColors[2]),
+                Fill = new SolidColorBrush(_pieColors[4]),
                 DataLabels = true,
                 ToolTip = "",
                 LabelPoint = labelPoint
@@ -274,7 +274,7 @@ namespace Tango.MachineStudio.Statistics.Models
             {
                 Title = "Solid",
                 Values = new ChartValues<int>() { solidCount },
-                Fill = new SolidColorBrush(_pieColors[2]),
+                Fill = new SolidColorBrush(_pieColors[4]),
                 DataLabels = true,
                 ToolTip = "",
                 LabelPoint = labelPoint
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 ca40273f9..94d06a178 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
@@ -367,6 +367,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         protected void GenerateStatistics()
         {
             StatisticsValueCollection.Clean();
+            GenerateTotalRunsCount();
             GenerateTotalRunsLength();
             GenerateTotalThreadConsumption();
             GenerateRunsDuration();
@@ -377,7 +378,13 @@ namespace Tango.MachineStudio.Statistics.ViewModels
             CreateThreadConsumptionPerThread();
             GenerateAllLiquidQuantities();
         }
-        
+
+        protected void GenerateTotalRunsCount()
+        {//Total Runs: 
+            int val =JobRuns.Where(z => z.JobRun.EndPosition > 0).Count();
+            StatisticsValueCollection.AddStatisticsValue("Total Runs ", val, " ");
+        }
+
         /// <summary>
         /// Generates the total length of the job runs.
         /// </summary>
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 ecc846903..af363b32a 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
@@ -554,7 +554,7 @@
                                     <StackPanel Orientation="Horizontal" Margin="0 3">
                                         <TextBlock Text="{Binding Name}" FontWeight="SemiBold"/>
                                         <TextBlock Text=": "/>
-                                        <TextBlock Text="{Binding Value, StringFormat={}{0:0.00}}"/>
+                                        <TextBlock Text="{Binding Value, StringFormat={}{0:#,0.##}}"/>
                                         <TextBlock Text="{Binding Unit}"/>
                                     </StackPanel>
                                 </DataTemplate>
diff --git a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/MainWindow.xaml b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/MainWindow.xaml
index a330b4425..3eabf21b4 100644
--- a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/MainWindow.xaml
+++ b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/MainWindow.xaml
@@ -11,7 +11,7 @@
         xmlns:local="clr-namespace:Tango.DispenserAnalyzer.UI"
         xmlns:vm ="clr-namespace:Tango.DispenserAnalyzer.UI.ViewModels"
         mc:Ignorable="d"
-        Title="Dispenser Analyser" Height="1000" Width="860" WindowStartupLocation="CenterScreen" WindowStyle="SingleBorderWindow" ResizeMode="CanResize" Foreground="#202020" 
+        Title="{Binding WindowTitle, RelativeSource={RelativeSource Mode=Self}}" Height="1000" Width="860" WindowStartupLocation="CenterScreen" WindowStyle="SingleBorderWindow" ResizeMode="CanResize" Foreground="#202020" 
         d:DataContext="{d:DesignInstance Type=vm:MainWindowVM, IsDesignTimeCreatable=False}">
     <Window.Resources>
         <converters:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter" />
diff --git a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/MainWindow.xaml.cs b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/MainWindow.xaml.cs
index 26d64c995..a7bcf796e 100644
--- a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/MainWindow.xaml.cs
+++ b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/MainWindow.xaml.cs
@@ -25,7 +25,17 @@ namespace Tango.DispenserAnalyzer.UI
     public partial class MainWindow : Window
     {
         private MainWindowVM _vm;
-       
+
+        public string WindowTitle
+        {
+            get
+            {
+                Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+                return "Dispenser Analyzer - Version" + version;
+            }
+        }
+        
+
         public MainWindow()
         {
             InitializeComponent();
diff --git a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Properties/AssemblyInfo.cs
index 4b15c6e1f..363f31ea5 100644
--- a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]