michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Progress bars are not displayed as 'completed' when a test was aborted.

Browse Source
This commit is contained in:
Milan Hanajik
2017-05-05 12:46:37 +02:00
parent e746d0179f
commit ed83ae57c5
15 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
+6 -2
View File
@@ -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<Event> retval2 = new List<Event>(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<Event> retval3 = new List<Event>(1);
retval3.Add(Event.Error);
return retval3;