Changes in counters, part 2.

This commit is contained in:
Milan Hanajik
2020-01-22 13:51:47 +01:00
parent d8927a9052
commit c448c18a42
25 changed files with 40 additions and 13 deletions
@@ -1448,6 +1448,7 @@ namespace TBF.BenchControl.Sequences
string fullTestName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); string fullTestName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
Results.Entities.TestRslt tstRslt = ProcessData.BatchRslts.GetTestRslt(fullTestName, part); 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 if (tstRslt == null) return; /// Prevent program crash in certain cases
@@ -392,6 +392,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
UpdateTempPressDensAmb(tstRslt); UpdateTempPressDensAmb(tstRslt);
/// Main results /// Main results
@@ -665,6 +665,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
UpdateTempPressDensAmb(tstRslt); UpdateTempPressDensAmb(tstRslt);
/// Main results /// Main results
@@ -682,7 +682,8 @@ namespace TBF.BenchControl.TestMethods.DiverterTest
Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part);
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
UpdateTempPressDensAmb(tstRslt); UpdateTempPressDensAmb(tstRslt);
/// Main results /// Main results
@@ -352,6 +352,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
UpdateTempPressDensAmb(tstRslt); UpdateTempPressDensAmb(tstRslt);
/// Main results /// Main results
@@ -797,6 +797,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
UpdateTempPressDensAmb(tstRslt); UpdateTempPressDensAmb(tstRslt);
/// Main results /// Main results
@@ -567,7 +567,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part);
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
UpdateTempPressDensAmb(tstRslt); UpdateTempPressDensAmb(tstRslt);
/// Main results /// Main results
@@ -784,6 +784,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
UpdateTempPressDensAmb(tstRslt); UpdateTempPressDensAmb(tstRslt);
/// Main results /// Main results
@@ -929,6 +929,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
UpdateTempPressDensAmb(tstRslt); UpdateTempPressDensAmb(tstRslt);
/// Main results /// Main results
@@ -976,6 +976,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
UpdateTempPressDensAmb(tstRslt); UpdateTempPressDensAmb(tstRslt);
/// Main results /// Main results
@@ -706,6 +706,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
UpdateTempPressDensAmb(tstRslt); UpdateTempPressDensAmb(tstRslt);
/// Main results /// Main results
@@ -461,7 +461,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part);
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
UpdateTempPressDensAmb(tstRslt); UpdateTempPressDensAmb(tstRslt);
/// Main results /// Main results
@@ -736,7 +736,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part);
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
UpdateTempPressDensAmb(tstRslt); UpdateTempPressDensAmb(tstRslt);
/// Main results /// Main results
@@ -853,7 +853,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part);
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
UpdateTempPressDensAmb(tstRslt); UpdateTempPressDensAmb(tstRslt);
/// Main results /// Main results
@@ -732,7 +732,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part);
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
UpdateTempPressDensAmb(tstRslt); UpdateTempPressDensAmb(tstRslt);
double totalPulses = Convert.ToDouble(cBrd.EtPulses(0)); double totalPulses = Convert.ToDouble(cBrd.EtPulses(0));
@@ -726,7 +726,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part);
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
UpdateTempPressDensAmb(tstRslt); UpdateTempPressDensAmb(tstRslt);
/// Main results /// Main results
@@ -485,7 +485,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part);
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
UpdateTempPressDensAmb(tstRslt); UpdateTempPressDensAmb(tstRslt);
/// Main results /// Main results
@@ -354,7 +354,8 @@ namespace TBF.BenchControl.TestMethods.LeakTest
Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part);
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
UpdateTempPressDensAmb(tstRslt); UpdateTempPressDensAmb(tstRslt);
tstRslt.DensityDiv = 0; tstRslt.DensityDiv = 0;
@@ -53,6 +53,7 @@ namespace TBF.BenchControl.TestMethods.ManualEntry
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
UpdateTempPressDensAmb(tstRslt); UpdateTempPressDensAmb(tstRslt);
/// Main results /// Main results
@@ -190,7 +190,8 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part);
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
UpdateTempPressDensAmb(tstRslt); UpdateTempPressDensAmb(tstRslt);
tstRslt.DensityDiv = 0; tstRslt.DensityDiv = 0;
@@ -390,7 +390,8 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part);
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
UpdateTempPressDensAmb(tstRslt); UpdateTempPressDensAmb(tstRslt);
/// Main results /// Main results
@@ -392,7 +392,8 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part);
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
UpdateTempPressDensAmb(tstRslt); UpdateTempPressDensAmb(tstRslt);
/// Main results /// Main results
@@ -48,6 +48,8 @@ namespace TBF.BenchControl.TestMethods.Q2CorrectionFromHistory
TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part);
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
tstRslt.StartTime = DateTime.Now; tstRslt.StartTime = DateTime.Now;
tstRslt.EndTime = DateTime.Now; tstRslt.EndTime = DateTime.Now;
tstRslt.TestDone = true; tstRslt.TestDone = true;
@@ -460,7 +460,8 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest
Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part);
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
UpdateTempPressDensAmb(tstRslt); UpdateTempPressDensAmb(tstRslt);
/// Main results /// Main results
@@ -2599,6 +2599,8 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
if (tstRslt != null) if (tstRslt != null)
{ {
Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
/// Auxiliary results ... not required /// Auxiliary results ... not required
/// Main results /// Main results