Dispenser Analyzer.

A little changes in  titles, using with param in command line, versions.

7 files changed, 31 insertions, 14 deletions

diff --git a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analysis/DispenserReader.cs b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analysis/DispenserReader.cs
index 8bb519425..e62af4e46 100644
--- a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analysis/DispenserReader.cs
+++ b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analysis/DispenserReader.cs
@@ -58,7 +58,7 @@ namespace Tango.DispenserAnalyzer.UI.Analysis
         
         public List<string> GetTitles(String filePath)
         {
-            string xAxistitle = "Time[msec]";
+            string xAxistitle = "Time[100 msec]";
             string yAxistitle = "Pressure [mbar]";
             return new List<string>() { xAxistitle, yAxistitle };
         }
diff --git a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analyzers/FlowAnalyser.cs b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analyzers/FlowAnalyser.cs
index 81c578e5c..213f4e4f0 100644
--- a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analyzers/FlowAnalyser.cs
+++ b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analyzers/FlowAnalyser.cs
@@ -177,7 +177,7 @@ namespace Tango.DispenserAnalyzer.UI.Analyzers
                         }
                     }
                     this.IsShowPlotResult = true;
-                    RangeToCountChart.Title = $"Flow Range To Count {TestNumber}";
+                    RangeToCountChart.Title = $"Local error histogram {TestNumber}";
                     RangeToCountChart.UpdateData();
                 }
                 var rangeToTimePoints = RangeToTimeChart.Points;
@@ -188,7 +188,7 @@ namespace Tango.DispenserAnalyzer.UI.Analyzers
                 }
                 if (!BackgroundMode)
                 {
-                    RangeToTimeChart.Title = $"Flow Time Location To Range {TestNumber}";
+                    RangeToTimeChart.Title = $"Local error vs position {TestNumber}";
                     RangeToTimeChart.UpdateData();
                 }
                     
@@ -220,12 +220,12 @@ namespace Tango.DispenserAnalyzer.UI.Analyzers
                     sum += countValArr[i].Value;
                     if (max_key == 0)
                         max_key = (int)countValArr[i].Key;
-                    if (sum >= merror)
+                    if (sum > merror)
                     {
                         double persentageOfError = countValArr[i].Key / AverageValue * 100;
                         range = (int)countValArr[i].Key;
                         int occurrence = countValArr[i].Value;
-                        LocalErrors = $" {persentageOfError.ToString("F2")}% where range = {range.ToString()} and occurrence = {occurrence.ToString()}";
+                        LocalErrors = $" {persentageOfError.ToString("F2")}% where max local error = {range.ToString()} and occurrence = {occurrence.ToString()}";
                         break;
                     }
                 }
diff --git a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/App.xaml.cs b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/App.xaml.cs
index d70c2e7a8..f3bce6c99 100644
--- a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/App.xaml.cs
+++ b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/App.xaml.cs
@@ -17,10 +17,27 @@ namespace Tango.DispenserAnalyzer.UI
         private void Application_Startup(object sender, StartupEventArgs e)
         {
             MainWindow wnd = new MainWindow();
-            if (e.Args.Length > 0)
+
+            string[] args = null;
+            if (AppDomain.CurrentDomain.SetupInformation.ActivationArguments != null)
+            {
+                string[] inputArgs = AppDomain.CurrentDomain.SetupInformation.ActivationArguments.ActivationData;
+
+                if (inputArgs != null && inputArgs.Length > 0)
+                {
+                    char[] spearator = { ','};
+                    args = inputArgs[0].Split(spearator);
+                }
+            }
+            else if (e.Args.Length > 0)
+            {
+                char[] spearator = { ',' };
+                args = e.Args[0].Split(spearator);
+            }
+            if(args != null && args.Length > 0)
             {
-                wnd.GenerateResultsInBackground(e.Args);
-                //Current.Shutdown();
+                //MessageBox.Show("Before generate" + String.Join(" ", args));
+                wnd.GenerateResultsInBackground(args);
             }
             else
             {
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 7b95ba36b..6438e7278 100644
--- a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@ 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.2.0.0")]
+[assembly: AssemblyVersion("3.1.1.3")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 [assembly: NeutralResourcesLanguage("en-AS")]
 
diff --git a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Settings.cs b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Settings.cs
index b8084b2d3..d515a0940 100644
--- a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Settings.cs
+++ b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Settings.cs
@@ -54,8 +54,8 @@ namespace Tango.DispenserAnalyzer.UI
             DefaultValues[AnalyzerSettingsEnum.ExcludeAnalysis] = 1800;
             DefaultValues[AnalyzerSettingsEnum.AvgMinValue] = 1400;
             DefaultValues[AnalyzerSettingsEnum.AvgMaxValue] = 1850;
-            DefaultValues[AnalyzerSettingsEnum.MaxMinRange] = 500;
-            DefaultValues[AnalyzerSettingsEnum.MaxMinIntervals] = 300;
+            DefaultValues[AnalyzerSettingsEnum.MaxMinRange] = 450;
+            DefaultValues[AnalyzerSettingsEnum.MaxMinIntervals] = 450;
             DefaultValues[AnalyzerSettingsEnum.MaxError] = 1.5;
             DefaultValues[AnalyzerSettingsEnum.TakeOffMaxMin] = 3;
             DefaultValues[AnalyzerSettingsEnum.TimeInterval] = 0.1;
diff --git a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Tango.DispenserAnalyzer.UI.csproj b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Tango.DispenserAnalyzer.UI.csproj
index 5a261fb85..51d693d88 100644
--- a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Tango.DispenserAnalyzer.UI.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Tango.DispenserAnalyzer.UI.csproj
@@ -29,7 +29,7 @@
     <ProductName>Dispenser Analyser</ProductName>
     <PublisherName>Twine</PublisherName>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>2</ApplicationRevision>
+    <ApplicationRevision>4</ApplicationRevision>
     <ApplicationVersion>3.1.1.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
diff --git a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/ViewModels/SettingsVM.cs b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/ViewModels/SettingsVM.cs
index 0f2b5a457..b610d7652 100644
--- a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/ViewModels/SettingsVM.cs
+++ b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/ViewModels/SettingsVM.cs
@@ -80,8 +80,8 @@ namespace Tango.DispenserAnalyzer.UI.ViewModels
             list.Add(new SettingsModel(AnalyzerSettingsEnum.FlowPBUPassFail, "4.5 sec"));
             list.Add(new SettingsModel(AnalyzerSettingsEnum.ExcludeAnalysis, "1800 reads"));
             list.Add(new SettingsModel(AnalyzerSettingsEnum.AvgMinValue, "1400-1850 [mbar]", true));
-            list.Add(new SettingsModel(AnalyzerSettingsEnum.MaxMinRange, "500 reads"));
-            list.Add(new SettingsModel(AnalyzerSettingsEnum.MaxMinIntervals, "300 reads"));
+            list.Add(new SettingsModel(AnalyzerSettingsEnum.MaxMinRange, "450 reads"));
+            list.Add(new SettingsModel(AnalyzerSettingsEnum.MaxMinIntervals, "450 reads"));
             list.Add(new SettingsModel(AnalyzerSettingsEnum.MaxError, "1.5%"));
             list.Add(new SettingsModel(AnalyzerSettingsEnum.TakeOffMaxMin, "3"));
             list.ForEach(x =>  x.SettingValueEvent += new EventHandler(OnSettingValueChanged));