From ef13de9874f1edfbb6f54038807bbe370e12461d Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 6 Apr 2022 12:48:26 +0200 Subject: [PATCH] LeakTest modified : 1. close valve+pump off 2. delay 3. start mass 4. leak test 5. end mass, ver. 2.27.1875 --- TBF/Properties/AssemblyInfo.cs | 4 +- TBF/Resources/Strings.Designer.cs | 9 ++ TBF/Resources/Strings.cs.resx | 3 + TBF/Resources/Strings.resx | 3 + TBF/Resources/Strings.sk.resx | 3 + TBF/Rig/TestMethods/LeakTest/LeakTestSeq.cs | 109 ++++++++++---------- 6 files changed, 72 insertions(+), 59 deletions(-) diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 2602195de..15c185c95 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.27.1873.0")] -[assembly: AssemblyFileVersion("2.27.1873.0")] +[assembly: AssemblyVersion("2.27.1875.0")] +[assembly: AssemblyFileVersion("2.27.1875.0")] diff --git a/TBF/Resources/Strings.Designer.cs b/TBF/Resources/Strings.Designer.cs index 84da8b751..08f4958ac 100644 --- a/TBF/Resources/Strings.Designer.cs +++ b/TBF/Resources/Strings.Designer.cs @@ -1275,6 +1275,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Delay. + /// + internal static string Delay { + get { + return ResourceManager.GetString("Delay", resourceCulture); + } + } + /// /// Looks up a localized string similar to Density. /// diff --git a/TBF/Resources/Strings.cs.resx b/TBF/Resources/Strings.cs.resx index 58d388d6e..4a9db9816 100644 --- a/TBF/Resources/Strings.cs.resx +++ b/TBF/Resources/Strings.cs.resx @@ -1677,4 +1677,7 @@ Spracování statistik + + Zpoždění + \ No newline at end of file diff --git a/TBF/Resources/Strings.resx b/TBF/Resources/Strings.resx index 154fb83b1..27975a02b 100644 --- a/TBF/Resources/Strings.resx +++ b/TBF/Resources/Strings.resx @@ -2308,4 +2308,7 @@ Processing statistics + + Delay + \ No newline at end of file diff --git a/TBF/Resources/Strings.sk.resx b/TBF/Resources/Strings.sk.resx index 66d827d6b..99e0a5017 100644 --- a/TBF/Resources/Strings.sk.resx +++ b/TBF/Resources/Strings.sk.resx @@ -204,4 +204,7 @@ Zákazky + + Oneskorenie + \ No newline at end of file diff --git a/TBF/Rig/TestMethods/LeakTest/LeakTestSeq.cs b/TBF/Rig/TestMethods/LeakTest/LeakTestSeq.cs index ebc09bf8b..0b70b1f33 100644 --- a/TBF/Rig/TestMethods/LeakTest/LeakTestSeq.cs +++ b/TBF/Rig/TestMethods/LeakTest/LeakTestSeq.cs @@ -148,6 +148,45 @@ namespace TBF.Rig.TestMethods.LeakTest pressure_set: + ///------------------------------------------------------ + Bridge.OnActivity(this, Strings.Closing_valve_Pump_off); + ///------------------------------------------------------ + State.Create(string.Format("{0}({1}) : Closing the valve", test.Method, test.Name)) + .AddOperation(checkUiOp) + .AddOperations(readTempPressOps) + .AddOperation(new TBF.Rig.Elde.SetValvesOp(cBrd, true, outPath)) + .EnterState(); + do + { + e = StateMachine.WaitRunDevsRunOps(); + + if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; } + if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } + } + while (e.Contains(Event.ValvesBusy)); + + + if (!testParams.IsPumpRunning) + { + /// testParams.IsPumpRunning==false => Close the pump at the beginning of the leak part of the test + + if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOff(); + + State.Create(string.Format("{0}({1}) : Stopping the pump", test.Method, test.Name)) + .AddOperation(checkUiOp) + .AddOperations(readTempPressOps) + .AddOperation(cBrd.SetValvesOp(null, inPath.Pump)) + .EnterState(); + do + { + e = StateMachine.WaitRunDevsRunOps(); + + if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; } + if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } + } + while (e.Contains(Event.ValvesBusy)); + } + startTime = StateMachine.Time; int estimtdEndTime = startTime + testParams.DurationPMax; @@ -169,62 +208,19 @@ namespace TBF.Rig.TestMethods.LeakTest int remainingTime = Math.Max(estimtdEndTime - StateMachine.Time, 0); if (remainingTime > 60) { - Bridge.OnActivity(this, string.Format("{0} ... {1} {2} {3} {4}", Strings.Test_in_progress, remainingTime / 60, "min", remainingTime % 60, Strings.sec)); + Bridge.OnActivity(this, string.Format("{0} ... {1} {2} {3} {4}", Strings.Delay, remainingTime / 60, "min", remainingTime % 60, Strings.sec)); } else { - Bridge.OnActivity(this, string.Format("{0} ... {1} s", Strings.Test_in_progress, remainingTime)); + Bridge.OnActivity(this, string.Format("{0} ... {1} s", Strings.Delay, remainingTime)); } } while (e.Contains(Event.TimerBusy)); - ///------------------------------------------------------ - Bridge.OnActivity(this, Strings.Closing_valve_Pump_off); - ///------------------------------------------------------ - State.Create(string.Format("{0}({1}) : Closing the valve", test.Method, test.Name)) - .AddOperation(checkUiOp) - .AddOperations(readTempPressOps) - .AddOperation(new TBF.Rig.Elde.SetValvesOp(cBrd, true, outPath)) - .EnterState(); - do { - e = StateMachine.WaitRunDevsRunOps(); - - if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; } - if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } - } - while (e.Contains(Event.ValvesBusy)); - - - if (!testParams.IsPumpRunning) - { - /// testParams.IsPumpRunning==false => Close the pump at the beginning of the leak part of the test - - if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOff(); - - State.Create(string.Format("{0}({1}) : Stopping the pump", test.Method, test.Name)) - .AddOperation(checkUiOp) - .AddOperations(readTempPressOps) - .AddOperation(cBrd.SetValvesOp(null, inPath.Pump)) - .EnterState(); - do { - e = StateMachine.WaitRunDevsRunOps(); - - if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; } - if (TestAndLogUiCmdStop(test,e)) { retVal = Event.UiCmdStop; goto stopTest; } - } - while (e.Contains(Event.ValvesBusy)); - } - - - TestStartTime = DateTime.Now; - startTime = StateMachine.Time; - estimtdEndTime = startTime + testParams.DurationLeak; - StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0); UpdateAllStatistics(StateMachine.Time); - if (testParams.MaxMassIncrease > 0) { //----------------------------------------------------- @@ -252,6 +248,10 @@ namespace TBF.Rig.TestMethods.LeakTest while (!e.Contains(Event.BalanceDone)); } + TestStartTime = DateTime.Now; + startTime = StateMachine.Time; + estimtdEndTime = startTime + testParams.DurationLeak; + ///------------------------------------------------ Bridge.OnActivity(this, Strings.Test_in_progress); ///------------------------------------------------ @@ -280,9 +280,6 @@ namespace TBF.Rig.TestMethods.LeakTest } while (e.Contains(Event.TimerBusy)); - /// - /// Measurement loop - end - /// if (testParams.MaxMassIncrease > 0) { //----------------------------------------------------- @@ -310,10 +307,13 @@ namespace TBF.Rig.TestMethods.LeakTest while (!e.Contains(Event.BalanceDone)); } - /// - /// Test_completed - /// - StopRecordingStatistics(); + TestEndTime = DateTime.Now; + StopRecordingStatistics(); + + //------------------------------------------------ + Bridge.OnActivity(this, Strings.Test_completed); + //------------------------------------------------ + if (testParams.IsPumpRunning) { @@ -335,11 +335,6 @@ namespace TBF.Rig.TestMethods.LeakTest while (e.Contains(Event.ValvesBusy)); } - //------------------------------------------------ - Bridge.OnActivity(this, Strings.Test_completed); - //------------------------------------------------ - - TestEndTime = DateTime.Now; /// Make sure the CycleBeginForm is closed so that water meter data (s/n) can be copied into results if (UIFlowControl.Stop == WaitBeginFormClosed()) goto stopTest;