From d84c3ca4d8dbfe46a2188d90f291cd39a6d16c35 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Sun, 10 Jan 2016 01:44:28 +0100 Subject: [PATCH] Cosmetical changes (progress for modeless form sometimes not completed) --- .../BenchControl/Sequences/SequenceBase.cs | 4 ++-- .../iPerlCommunication/iPerlCommunicationSeq.cs | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs index 821d331b4..7af397879 100644 --- a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs +++ b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs @@ -885,8 +885,8 @@ namespace TBF.BenchControl.Sequences tstRslt.DensityOut = Program.LocalSettings.RealDensity; tstRslt.DensityDiv = Program.LocalSettings.RealDensity; tstRslt.Buoyancy = 0; /// TODO - tstRslt.FlowMass = tstRslt.MassEnd / tstRslt.TargetTime(); - tstRslt.FlowVolume = tstRslt.TargetVolume() / tstRslt.TargetTime(); + tstRslt.FlowMass = 3600.0 * tstRslt.MassEnd / tstRslt.TargetTime(); + tstRslt.FlowVolume = 3.6 * tstRslt.TargetVolume() / tstRslt.TargetTime(); tstRslt.VolumeCTV = tstRslt.TargetVolume(); tstRslt.VolumeMaster = tstRslt.TargetVolume(); tstRslt.ErrorMaster = 0; diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs index 06b43cb78..2578b3d31 100644 --- a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs @@ -72,10 +72,15 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication if (testParams.Activity.ToLower().Contains(Q2correctedFromCmd)) { + TestProgressEventArgs.SetEstimatedTimes(new int[] { 0, 0, 0, 60, 0, 0, 0 }); + Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Config.Entities.Progress.JustStarted)); + Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Config.Entities.Progress.FlowSetting)); + string fromTestName = testParams.Activity.Substring(Q2correctedFromCmd.Length); MakeCorrectedFrom(test.Name, fromTestName); + Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Config.Entities.Progress.Completed)); Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, test.Part)); allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file @@ -156,6 +161,10 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication CloseIPerlCommForm(); retVal = Event.UiCmdStop; } + else + { + TBF.UiBridge.Bridge.OnTestProgress(null, new TBF.UiBridge.TestProgressEventArgs(test.Name, Config.Entities.Progress.Completed)); + } /// Test 'Quit' modelessDlg = null; /// Modeless dialog is closed now