From ed83ae57c563d584dafb348bf623efc19c3a1db4 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 5 May 2017 12:41:15 +0200 Subject: [PATCH] Progress bars are not displayed as 'completed' when a test was aborted. --- Config/Entities/Enums.cs | 5 +++-- .../BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs | 5 +++-- .../CombinedWithDetection/CombinedWithDetectionSeq.cs | 8 ++++++-- .../BenchControl/TestMethods/Endurance/EnduranceSeq.cs | 5 +++-- .../FixedStartAdvanced/FixedStartAdvancedSeq.cs | 5 +++-- .../FixedStartMassCollectionSeq.cs | 5 +++-- .../TestMethods/FlyingStart/FlyingStartSeq.cs | 7 ++++--- .../FlyingStartMassCollectionSeq.cs | 7 ++++--- .../BenchControl/TestMethods/LeakTest/LeakTestSeq.cs | 5 +++-- .../BenchControl/TestMethods/LiveStream/LiveStreamSeq.cs | 2 +- .../BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs | 5 +++-- .../ReferenceFlowmeterCalibrationSeq.cs | 8 ++++++-- .../TestMethods/RoiDetection/RoiDetectionSeq.cs | 5 +++-- .../iPerlCommunication/iPerlCommunicationForm.cs | 2 +- .../iPerlCommunication/iPerlCommunicationSeq.cs | 6 +++--- 15 files changed, 49 insertions(+), 31 deletions(-) diff --git a/Config/Entities/Enums.cs b/Config/Entities/Enums.cs index e3800e357..835a33cdb 100644 --- a/Config/Entities/Enums.cs +++ b/Config/Entities/Enums.cs @@ -226,10 +226,11 @@ namespace Config.Entities public enum Progress { JustStarted, - TransitionBefore, + TransitionBefore, SwitchingFlowDetection, FlowSetting, - Test, + Aborted, /// Use as an argument when a test was aborted + Test, TransitionAfter, Completed, Count, diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs index 92421885d..55ffa301c 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs @@ -88,7 +88,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses)); string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; - TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); + TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, 0, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.JustStarted)); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting)); @@ -436,7 +436,8 @@ namespace TBF.BenchControl.TestMethods.Adjustment case Event.UiCmdStop: { if (retVal == Event.Done) retVal = Event.UiCmdStop; break; } } - Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed)); + Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, + (retVal == Event.Done) ? Config.Entities.Progress.Completed : Config.Entities.Progress.Aborted)); /// Create a list with one item 'retVal' (default is Event.Done) and return it IList retList = new List(1); diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs index 9f351b90c..d9f79466f 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs @@ -38,7 +38,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection /// /// Test method simulation /// - TestProgressEventArgs.SetEstimatedTimes(new int[] { 0, 0, 0, 60, 0, 0, 0 }); + TestProgressEventArgs.SetEstimatedTimes(new int[] { 0, 0, 0, 30, 0, 30, 0, 0 }); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Config.Entities.Progress.JustStarted)); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Config.Entities.Progress.FlowSetting)); @@ -135,7 +135,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, (int)totalPulses)); string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; - TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 120, 30, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); + TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 120, 30, 0, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.JustStarted)); Qrise = 0; @@ -796,6 +796,8 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection } while (!e.Contains(Event.ValvesSet)); + Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.Aborted)); + IList retval2 = new List(1); retval2.Add(Event.UiCmdStop); return retval2; @@ -814,6 +816,8 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection } while (!e.Contains(Event.ValvesSet)); + Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.Aborted)); + IList retval3 = new List(1); retval3.Add(Event.Error); return retval3; diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs index 887b7b935..ff1acc5a8 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs @@ -81,7 +81,7 @@ namespace TBF.BenchControl.TestMethods.Endurance Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses)); string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; - TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); + TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, 0, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.JustStarted)); @@ -643,7 +643,8 @@ namespace TBF.BenchControl.TestMethods.Endurance case Event.UiCmdStop: { if (retVal == Event.Done) retVal = Event.UiCmdStop; break; } } - Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed)); + Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, + (retVal == Event.Done) ? Config.Entities.Progress.Completed : Config.Entities.Progress.Aborted)); /// Create a list with one item 'retVal' (default is Event.Done) and return it IList retList = new List(1); diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs index c2a4fbecb..0615646f3 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs @@ -61,7 +61,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses)); string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; - TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); + TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, 0, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.JustStarted)); @@ -648,7 +648,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced case Event.UiCmdStop: { if (retVal == Event.Done) retVal = Event.UiCmdStop; break; } } - Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed)); + Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, + (retVal == Event.Done) ? Config.Entities.Progress.Completed : Config.Entities.Progress.Aborted)); /// Create a list with one item 'retVal' (default is Event.Done) and return it IList retList = new List(1); diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index 79a46fc65..8d524a17a 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -73,7 +73,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses)); string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; - TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); + TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, 0, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.JustStarted)); @@ -1002,7 +1002,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection stopTestWOTransitionAfter: - Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed)); + Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, + (retVal == Event.Done) ? Config.Entities.Progress.Completed : Config.Entities.Progress.Aborted)); /// Create a list with one item 'retVal' (default is Event.Done) and return it IList retList = new List(1); diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index 9abab7e29..95ef9d034 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -40,7 +40,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart /// /// Test method simulation /// - TestProgressEventArgs.SetEstimatedTimes(new int[] { 0, 0, 0, 60, 0, 0, 0 }); + TestProgressEventArgs.SetEstimatedTimes(new int[] { 0, 0, 0, 30, 0, 30, 0, 0 }); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Config.Entities.Progress.JustStarted)); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Config.Entities.Progress.FlowSetting)); @@ -121,7 +121,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses)); string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; - TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); + TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, 0, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.JustStarted)); @@ -677,7 +677,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStart case Event.UiCmdStop: { if (retVal == Event.Done) retVal = Event.UiCmdStop; break; } } - Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed)); + Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, + (retVal == Event.Done) ? Config.Entities.Progress.Completed : Config.Entities.Progress.Aborted)); /// Create a list with one item 'retVal' (default is Event.Done) and return it IList retList = new List(1); diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index 87f81a05f..be9f83c21 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -40,7 +40,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection /// /// Test method simulation /// - TestProgressEventArgs.SetEstimatedTimes(new int[] { 0, 0, 0, 60, 0, 0, 0 } ); + TestProgressEventArgs.SetEstimatedTimes(new int[] { 0, 0, 0, 30, 0, 30, 0, 0 } ); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Config.Entities.Progress.JustStarted)); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Config.Entities.Progress.FlowSetting)); @@ -128,7 +128,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses)); string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; - TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); + TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, 0, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); /// start, transition, flow detection, flow setting, aborted, test, transition, end Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.JustStarted)); @@ -1025,7 +1025,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection stopTestWOTransitionAfter: - Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed)); + Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, + (retVal == Event.Done) ? Config.Entities.Progress.Completed : Config.Entities.Progress.Aborted)); /// Create a list with one item 'retVal' (default is Event.Done) and return it IList retList = new List(1); diff --git a/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs b/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs index 43dffbb55..2dac9b872 100644 --- a/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs @@ -37,7 +37,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, false); - TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); + TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, 0, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.JustStarted)); // Transition or SetRoute - Start @@ -441,7 +441,8 @@ namespace TBF.BenchControl.TestMethods.LeakTest case Event.UiCmdStop: { if (retVal == Event.Done) retVal = Event.UiCmdStop; break; } } - Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.Completed)); + Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, + (retVal == Event.Done) ? Config.Entities.Progress.Completed : Config.Entities.Progress.Aborted)); /// Create a list with one item 'retVal' (default is Event.Done) and return it IList retList = new List(1); diff --git a/TestBenchFramework/BenchControl/TestMethods/LiveStream/LiveStreamSeq.cs b/TestBenchFramework/BenchControl/TestMethods/LiveStream/LiveStreamSeq.cs index 2b118d559..954dc8b02 100644 --- a/TestBenchFramework/BenchControl/TestMethods/LiveStream/LiveStreamSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/LiveStream/LiveStreamSeq.cs @@ -37,7 +37,7 @@ namespace TBF.BenchControl.TestMethods.LiveStream } } - TestProgressEventArgs.SetEstimatedTimes(new int[] { 60, 0, 0, 0, 0, 60, 0 }); + TestProgressEventArgs.SetEstimatedTimes(new int[] { 60, 0, 0, 0, 0, 0, 60, 0 }); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.JustStarted)); //------------------------------------------------ diff --git a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs index 7de58510d..a53684246 100644 --- a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs @@ -37,7 +37,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, false); - TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); + TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, 0, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.JustStarted)); // Transition or SetRoute - Start @@ -352,7 +352,8 @@ namespace TBF.BenchControl.TestMethods.PMaxTest case Event.UiCmdStop: { if (retVal == Event.Done) retVal = Event.UiCmdStop; break; } } - Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.Completed)); + Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, + (retVal == Event.Done) ? Config.Entities.Progress.Completed : Config.Entities.Progress.Aborted)); /// Create a list with one item 'retVal' (default is Event.Done) and return it IList retList = new List(1); diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs index bd26300d8..55c1567c8 100644 --- a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs @@ -61,7 +61,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses)); string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; - TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); + TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, 0, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.JustStarted)); @@ -401,7 +401,8 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration /// Append the results to the CSV-file allResults.Info(TestResult2CsvLine(testName, test.Part)); - Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed)); + Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, + (retVal == Event.Done) ? Config.Entities.Progress.Completed : Config.Entities.Progress.Aborted)); if (!outerLoopMode && (++repetitionNr <= test.Repeats)) { @@ -433,6 +434,9 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration case Event.UiCmdStop: { if (retVal == Event.Done) retVal = Event.UiCmdStop; break; } } + Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, + (retVal == Event.Done) ? Config.Entities.Progress.Completed : Config.Entities.Progress.Aborted)); + /// Create a list with one item 'retVal' (default is Event.Done) and return it IList retList = new List(1); retList.Add(retVal); diff --git a/TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs index 2d67d83d1..8a1609313 100644 --- a/TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs @@ -56,7 +56,7 @@ namespace TBF.BenchControl.TestMethods.RoiDetection Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses)); string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; - TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); + TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, 0, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.JustStarted)); //------------------------------------------------- @@ -233,7 +233,8 @@ namespace TBF.BenchControl.TestMethods.RoiDetection case Event.UiCmdStop: { if (retVal == Event.Done) retVal = Event.UiCmdStop; break; } } - Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed)); + Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, + (retVal == Event.Done) ? Config.Entities.Progress.Completed : Config.Entities.Progress.Aborted)); /// Create a list with one item 'retVal' (default is Event.Done) and return it IList retList = new List(1); diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs index 243ff34a9..4b9451694 100644 --- a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs +++ b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs @@ -629,7 +629,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication { iPerlCommunicationParams testParams = multiTestParams[i]; - TBF.UiBridge.TestProgressEventArgs.SetEstimatedTimes(new int[] { 0, 0, 10, 140, 0, 0, 0 }); + TBF.UiBridge.TestProgressEventArgs.SetEstimatedTimes(new int[] { 0, 0, 10, 0, 140, 0, 0, 0 }); TBF.UiBridge.Bridge.OnTestProgress(null, new TBF.UiBridge.TestProgressEventArgs(tests[i], Config.Entities.Progress.JustStarted)); string activity = testParams.Activity; /// Current activity diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs index 966d7ff0c..726e73006 100644 --- a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs @@ -61,7 +61,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication if (testParams.Activity.ToLower().Contains(Q2correctedFromCmd)) { - TestProgressEventArgs.SetEstimatedTimes(new int[] { 0, 0, 0, 60, 0, 0, 0 }); + TestProgressEventArgs.SetEstimatedTimes(new int[] { 0, 0, 0, 30, 0, 30, 0, 0 }); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Config.Entities.Progress.JustStarted)); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Config.Entities.Progress.FlowSetting)); @@ -79,7 +79,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication } //else if (testParams.Activity.ToLower().Contains(Hz2correctedFromCmd)) //{ - // TestProgressEventArgs.SetEstimatedTimes(new int[] { 0, 0, 0, 60, 0, 0, 0 }); + // TestProgressEventArgs.SetEstimatedTimes(new int[] { 0, 0, 0, 30, 0, 30, 0, 0 }); // Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Config.Entities.Progress.JustStarted)); // Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Config.Entities.Progress.FlowSetting)); @@ -106,7 +106,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication //} else if (testParams.Activity.ToLower().Contains("simulate ")) { - TestProgressEventArgs.SetEstimatedTimes(new int[] { 0, 0, 0, 60, 0, 0, 0 } ); + TestProgressEventArgs.SetEstimatedTimes(new int[] { 0, 0, 0, 30, 0, 30, 0, 0 } ); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Config.Entities.Progress.JustStarted)); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Config.Entities.Progress.FlowSetting));