Dispenser Analyzer. Flow test . return some logic in Flow Test

3 files changed, 29 insertions, 7 deletions

diff --git a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analysis/AnalyzerResultBase.cs b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analysis/AnalyzerResultBase.cs
index ec2940a73..0e1537892 100644
--- a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analysis/AnalyzerResultBase.cs
+++ b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analysis/AnalyzerResultBase.cs
@@ -1,11 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
+using OxyPlot;
 using Tango.Core;
 
 namespace Tango.DispenserAnalyzer.UI.Analysis
@@ -14,6 +16,8 @@ namespace Tango.DispenserAnalyzer.UI.Analysis
     {
         public AnalyzerResultValue Result { get; set; }
         public List<AnalysisPlotValue> PlotValues { get; set; }
+        public ObservableCollection<DataPoint> Points { get; set; }
+
 
         public List<AnalyzerResultProperty> Properties
         {
@@ -50,6 +54,7 @@ namespace Tango.DispenserAnalyzer.UI.Analysis
         }
 
         public bool IsShowPlotResult { get; set; }
+
         public AnalyzerResultBase()
         {
             PlotValues = new List<AnalysisPlotValue>();
diff --git a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analysis/IAnalyzerResult.cs b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analysis/IAnalyzerResult.cs
index 9adbc889d..4871f5c34 100644
--- a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analysis/IAnalyzerResult.cs
+++ b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analysis/IAnalyzerResult.cs
@@ -1,5 +1,7 @@
-using System;
+using OxyPlot;
+using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -10,5 +12,6 @@ namespace Tango.DispenserAnalyzer.UI.Analysis
     {
         AnalyzerResultValue Result { get; set; }
         List<AnalysisPlotValue> PlotValues { get; set; }
+        ObservableCollection<DataPoint> Points { get; set; }
     }
 }
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 9ac30db40..c2dd47824 100644
--- a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analyzers/FlowAnalyser.cs
+++ b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analyzers/FlowAnalyser.cs
@@ -190,14 +190,28 @@ namespace Tango.DispenserAnalyzer.UI.Analyzers
                 double merror = BuildMeasurementError(range_values);
                 double sum = 0;
                 int max_key = 0;
-                if(countValArr.Count() > 0)
+                for (int i = countValArr.Count() - 1; i >= 0; i--)
                 {
-                    max_key = (int)countValArr[countValArr.Count() - 1].Key;
-                    double persentageOfError = countValArr[countValArr.Count() - 1].Key / AverageValue * 100;
-                    int range = (int)countValArr[countValArr.Count() - 1].Key;
-                    int occurrence = countValArr[countValArr.Count() - 1].Value;
-                    LocalErrors = $" {persentageOfError.ToString("F2")}% where range = {range.ToString()} and occurrence = {occurrence.ToString()}";
+                    sum += countValArr[i].Value;
+                    if (max_key == 0)
+                        max_key = (int)countValArr[i].Key;
+                    if (sum >= merror)
+                    {
+                        double persentageOfError = countValArr[i].Key / AverageValue * 100;
+                        int range = (int)countValArr[i].Key;
+                        int occurrence = countValArr[i].Value;
+                        LocalErrors = $" {persentageOfError.ToString("F2")}% where range = {range.ToString()} and occurrence = {occurrence.ToString()}";
+                        break;
+                    }
                 }
+                //if (countValArr.Count() > 0)
+                //{
+                //    max_key = (int)countValArr[countValArr.Count() - 1].Key;
+                //    double persentageOfError = countValArr[countValArr.Count() - 1].Key / AverageValue * 100;
+                //    int range = (int)countValArr[countValArr.Count() - 1].Key;
+                //    int occurrence = countValArr[countValArr.Count() - 1].Value;
+                //    LocalErrors = $" {persentageOfError.ToString("F2")}% where range = {range.ToString()} and occurrence = {occurrence.ToString()}";
+                //}
                 
 
                 //for (int i = countValArr.Count() - 1; i >= 0 ; i--)