Cosmetical changes (progress for modeless form sometimes not completed)

This commit is contained in:
Milan Hanajik
2016-01-10 01:44:28 +01:00
parent 98c8b0e7a8
commit d84c3ca4d8
2 changed files with 11 additions and 2 deletions
@@ -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;
@@ -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