From c448c18a42525a5e6e92a20a44fc08a92268a433 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 22 Jan 2020 13:51:47 +0100 Subject: [PATCH] Changes in counters, part 2. --- TBF/BenchControl/Sequences/SequenceBase.cs | 1 + TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs | 1 + .../CombinedWithDetection/CombinedWithDetectionSeq.cs | 1 + TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs | 3 ++- TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs | 1 + TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs | 1 + .../TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs | 3 ++- .../FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs | 1 + .../FixedStartMassCollDeferredEvalSeq.cs | 1 + .../FixedStartMassCollection/FixedStartMassCollectionSeq.cs | 1 + .../FixedStartTankCollection/FixedStartTankCollectionSeq.cs | 1 + TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs | 3 ++- .../FlyingStartFirstRepetWithMassCollSeq.cs | 3 ++- .../FlyingStartMassCollComparativeSeq.cs | 3 ++- .../FlyingStartMassCollProlongedSeq.cs | 3 ++- .../FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs | 3 ++- .../FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs | 3 ++- TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs | 3 ++- TBF/BenchControl/TestMethods/ManualEntry/ManualEntrySeq.cs | 1 + TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs | 3 ++- TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs | 3 ++- .../TestMethods/PulsesTestManual/PulsesTestManualSeq.cs | 3 ++- .../TestMethods/Q2CorrectionFromHistory/FromHistorySeq.cs | 2 ++ .../TestMethods/SensitivityTest/SensitivityTestSeq.cs | 3 ++- .../TestMethods/iPerlCommunication/iPerlCommunicationForm.cs | 2 ++ 25 files changed, 40 insertions(+), 13 deletions(-) diff --git a/TBF/BenchControl/Sequences/SequenceBase.cs b/TBF/BenchControl/Sequences/SequenceBase.cs index fd7a8b7c4..79773b710 100644 --- a/TBF/BenchControl/Sequences/SequenceBase.cs +++ b/TBF/BenchControl/Sequences/SequenceBase.cs @@ -1448,6 +1448,7 @@ namespace TBF.BenchControl.Sequences string fullTestName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); Results.Entities.TestRslt tstRslt = ProcessData.BatchRslts.GetTestRslt(fullTestName, part); + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); if (tstRslt == null) return; /// Prevent program crash in certain cases diff --git a/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs index 1539a3e2e..49b2971fc 100644 --- a/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs +++ b/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs @@ -392,6 +392,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment if (tstRslt != null) { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); UpdateTempPressDensAmb(tstRslt); /// Main results diff --git a/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs index 8f20c3ccb..78369120c 100644 --- a/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs +++ b/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs @@ -665,6 +665,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection if (tstRslt != null) { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); UpdateTempPressDensAmb(tstRslt); /// Main results diff --git a/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs b/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs index a957e6a16..f99fb5872 100644 --- a/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs +++ b/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs @@ -682,7 +682,8 @@ namespace TBF.BenchControl.TestMethods.DiverterTest Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); if (tstRslt != null) - { + { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); UpdateTempPressDensAmb(tstRslt); /// Main results diff --git a/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs b/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs index 0bf65e2a7..9703f85db 100644 --- a/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs +++ b/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs @@ -352,6 +352,7 @@ namespace TBF.BenchControl.TestMethods.Endurance if (tstRslt != null) { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); UpdateTempPressDensAmb(tstRslt); /// Main results diff --git a/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs b/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs index 395a6aca9..bb61fcdd4 100644 --- a/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs @@ -797,6 +797,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart if (tstRslt != null) { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); UpdateTempPressDensAmb(tstRslt); /// Main results diff --git a/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs b/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs index 8f5bc6d81..e0b0ed4dc 100644 --- a/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs @@ -567,7 +567,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); if (tstRslt != null) - { + { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); UpdateTempPressDensAmb(tstRslt); /// Main results diff --git a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs index 4e87514a8..25c61a665 100644 --- a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs @@ -784,6 +784,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval if (tstRslt != null) { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); UpdateTempPressDensAmb(tstRslt); /// Main results diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs index c2b2d435e..a185b7df2 100644 --- a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs @@ -929,6 +929,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval if (tstRslt != null) { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); UpdateTempPressDensAmb(tstRslt); /// Main results diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index d652e53b9..1a2fa2568 100644 --- a/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -976,6 +976,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection if (tstRslt != null) { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); UpdateTempPressDensAmb(tstRslt); /// Main results diff --git a/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs b/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs index 899dcabae..c34bb1373 100644 --- a/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs @@ -706,6 +706,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection if (tstRslt != null) { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); UpdateTempPressDensAmb(tstRslt); /// Main results diff --git a/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index 7ad3bae06..da40270f7 100644 --- a/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -461,7 +461,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStart Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); if (tstRslt != null) - { + { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); UpdateTempPressDensAmb(tstRslt); /// Main results diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs index 1348312c5..b51502080 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs @@ -736,7 +736,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); if (tstRslt != null) - { + { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); UpdateTempPressDensAmb(tstRslt); /// Main results diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs index 80fa9b632..deea681a5 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs @@ -853,7 +853,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); if (tstRslt != null) - { + { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); UpdateTempPressDensAmb(tstRslt); /// Main results diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs index e60c66411..25038ac4d 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs @@ -732,7 +732,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); if (tstRslt != null) - { + { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); UpdateTempPressDensAmb(tstRslt); double totalPulses = Convert.ToDouble(cBrd.EtPulses(0)); diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index b30e792c2..18b3a8d02 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -726,7 +726,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); if (tstRslt != null) - { + { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); UpdateTempPressDensAmb(tstRslt); /// Main results diff --git a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs index 35d6247c9..e24db5696 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs @@ -485,7 +485,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); if (tstRslt != null) - { + { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); UpdateTempPressDensAmb(tstRslt); /// Main results diff --git a/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs b/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs index 2fadfdff7..eb27bf605 100644 --- a/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs +++ b/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs @@ -354,7 +354,8 @@ namespace TBF.BenchControl.TestMethods.LeakTest Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); if (tstRslt != null) - { + { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); UpdateTempPressDensAmb(tstRslt); tstRslt.DensityDiv = 0; diff --git a/TBF/BenchControl/TestMethods/ManualEntry/ManualEntrySeq.cs b/TBF/BenchControl/TestMethods/ManualEntry/ManualEntrySeq.cs index f0e1852e7..8c7f78829 100644 --- a/TBF/BenchControl/TestMethods/ManualEntry/ManualEntrySeq.cs +++ b/TBF/BenchControl/TestMethods/ManualEntry/ManualEntrySeq.cs @@ -53,6 +53,7 @@ namespace TBF.BenchControl.TestMethods.ManualEntry if (tstRslt != null) { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); UpdateTempPressDensAmb(tstRslt); /// Main results diff --git a/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs b/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs index fbf09c0c1..9a9fc7277 100644 --- a/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs +++ b/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs @@ -190,7 +190,8 @@ namespace TBF.BenchControl.TestMethods.PMaxTest Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); if (tstRslt != null) - { + { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); UpdateTempPressDensAmb(tstRslt); tstRslt.DensityDiv = 0; diff --git a/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs b/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs index e11c2b8e6..97652e0d3 100644 --- a/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs +++ b/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs @@ -390,7 +390,8 @@ namespace TBF.BenchControl.TestMethods.PulsesTest Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); if (tstRslt != null) - { + { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); UpdateTempPressDensAmb(tstRslt); /// Main results diff --git a/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs b/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs index d9c0bbaf6..ce4809a3f 100644 --- a/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs +++ b/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs @@ -392,7 +392,8 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); if (tstRslt != null) - { + { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); UpdateTempPressDensAmb(tstRslt); /// Main results diff --git a/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/FromHistorySeq.cs b/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/FromHistorySeq.cs index bf54c68e2..b8527b281 100644 --- a/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/FromHistorySeq.cs +++ b/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/FromHistorySeq.cs @@ -48,6 +48,8 @@ namespace TBF.BenchControl.TestMethods.Q2CorrectionFromHistory TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); if (tstRslt != null) { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); + tstRslt.StartTime = DateTime.Now; tstRslt.EndTime = DateTime.Now; tstRslt.TestDone = true; diff --git a/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs b/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs index 5b06a92fb..c77ef7fd5 100644 --- a/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs +++ b/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs @@ -460,7 +460,8 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); if (tstRslt != null) - { + { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); UpdateTempPressDensAmb(tstRslt); /// Main results diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs index 26eb31cc8..164ffca88 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs @@ -2599,6 +2599,8 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication if (tstRslt != null) { + Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); + /// Auxiliary results ... not required /// Main results