MetersKind.Standard in TBF/Entities/Enums.cs reverted to MetersKind.Single
This commit is contained in:
Milan Hanajik
@@ -176,7 +176,7 @@ namespace TBF.BenchControl.DataEntry.Munich3
|
||||
{
|
||||
foreach (var test in results)
|
||||
{
|
||||
if (test.MetersKind != Entities.MetersKind.Standard) continue;
|
||||
if (test.MetersKind != Entities.MetersKind.Single) continue;
|
||||
|
||||
int nrMtrsToUpdate = Math.Max(waterMeters.Count, test.Meters.Count);
|
||||
for (int i = 0; i < nrMtrsToUpdate; i++)
|
||||
|
||||
@@ -165,7 +165,7 @@ namespace TBF.BenchControl.DataEntry.Standard
|
||||
{
|
||||
foreach (var test in results)
|
||||
{
|
||||
if (test.MetersKind != Entities.MetersKind.Standard) continue;
|
||||
if (test.MetersKind != Entities.MetersKind.Single) continue;
|
||||
|
||||
int nrMtrsToUpdate = Math.Max(waterMeters.Count, test.Meters.Count);
|
||||
for (int i = 0; i < nrMtrsToUpdate; i++)
|
||||
|
||||
@@ -54,7 +54,7 @@ namespace TBF.BenchControl.ResultsPrinters.Basic
|
||||
|
||||
dateTime = DateTime.Now;
|
||||
|
||||
if ((unsortedResults != null) && (unsortedResults.Count != 0) && (unsortedResults[0].MetersKind == Entities.MetersKind.Standard))
|
||||
if ((unsortedResults != null) && (unsortedResults.Count != 0) && (unsortedResults[0].MetersKind == Entities.MetersKind.Single))
|
||||
{
|
||||
resultItems = Forms.ResultItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Printer_SingleWM);
|
||||
combined = false;
|
||||
|
||||
@@ -65,7 +65,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
|
||||
|
||||
/// Start the test, initialize test results
|
||||
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
|
||||
Entities.TestResult tstRslt = new Entities.TestResult(test, repetitionNr, Entities.MetersKind.Standard);
|
||||
Entities.TestResult tstRslt = new Entities.TestResult(test, repetitionNr, Entities.MetersKind.Single);
|
||||
tstRslt.DoNotEvaluate = true;
|
||||
tstRslt.DoNotPublish = true;
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
|
||||
|
||||
public bool Evaluate { get { return false; } }
|
||||
public bool Publish { get { return false; } }
|
||||
public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Standard; }
|
||||
public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Single; }
|
||||
|
||||
public TestMethod(TestMethodCfg cfg)
|
||||
: base(cfg)
|
||||
|
||||
@@ -26,7 +26,7 @@ namespace TBF.BenchControl.TestMethods.CameraRoiDetection
|
||||
//====================================
|
||||
/// Start the test, initialize test results
|
||||
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, 1, inPath, benchPath, outPath, sensPath, 0));
|
||||
Entities.TestResult tstRslt = new Entities.TestResult(test, 1, Entities.MetersKind.Standard);
|
||||
Entities.TestResult tstRslt = new Entities.TestResult(test, 1, Entities.MetersKind.Single);
|
||||
tstRslt.DoNotEvaluate = true;
|
||||
tstRslt.DoNotPublish = true;
|
||||
|
||||
|
||||
+1
-1
@@ -59,7 +59,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
|
||||
loop:
|
||||
/// Start the test, initialize test results
|
||||
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
|
||||
Entities.TestResult tstRslt = new Entities.TestResult(test, repetitionNr, Entities.MetersKind.Standard);
|
||||
Entities.TestResult tstRslt = new Entities.TestResult(test, repetitionNr, Entities.MetersKind.Single);
|
||||
|
||||
|
||||
int flowSetTime0 = StateMachine.Time;
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
|
||||
|
||||
public bool Evaluate { get { return true; } }
|
||||
public bool Publish { get { return true; } }
|
||||
public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Standard; }
|
||||
public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Single; }
|
||||
|
||||
public TestMethod(TestMethodCfg cfg)
|
||||
: base(cfg)
|
||||
|
||||
@@ -56,7 +56,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
|
||||
loop:
|
||||
/// Start the test, initialize test results
|
||||
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
|
||||
Entities.TestResult tstRslt = new Entities.TestResult(test, repetitionNr, Entities.MetersKind.Standard);
|
||||
Entities.TestResult tstRslt = new Entities.TestResult(test, repetitionNr, Entities.MetersKind.Single);
|
||||
|
||||
//------------------------------------------------
|
||||
Bridge.OnActivity(this, Strings.Setting_the_flow);
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
|
||||
|
||||
public bool Evaluate { get { return true; } }
|
||||
public bool Publish { get { return true; } }
|
||||
public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Standard; }
|
||||
public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Single; }
|
||||
|
||||
public TestMethod(TestMethodCfg cfg)
|
||||
: base(cfg)
|
||||
|
||||
+1
-1
@@ -56,7 +56,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
|
||||
loop:
|
||||
/// Start the test, initialize test results
|
||||
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
|
||||
Entities.TestResult tstRslt = new Entities.TestResult(test, repetitionNr, Entities.MetersKind.Standard);
|
||||
Entities.TestResult tstRslt = new Entities.TestResult(test, repetitionNr, Entities.MetersKind.Single);
|
||||
|
||||
|
||||
int flowSetTime0 = StateMachine.Time;
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
|
||||
|
||||
public bool Evaluate { get { return true; } }
|
||||
public bool Publish { get { return true; } }
|
||||
public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Standard; }
|
||||
public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Single; }
|
||||
|
||||
public TestMethod(TestMethodCfg cfg)
|
||||
: base(cfg)
|
||||
|
||||
@@ -43,7 +43,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
|
||||
|
||||
/// Start the test, initialize test results
|
||||
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, 1, inPath, benchPath, outPath, sensPath, 0));
|
||||
Entities.TestResult tstRslt = new Entities.TestResult(test, 1, Entities.MetersKind.Standard);
|
||||
Entities.TestResult tstRslt = new Entities.TestResult(test, 1, Entities.MetersKind.Single);
|
||||
|
||||
//------------------------------------------------
|
||||
Bridge.OnActivity(this, Strings.Starting_the_pump);
|
||||
|
||||
@@ -43,7 +43,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
|
||||
|
||||
/// Start the test, initialize test results
|
||||
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, 1, inPath, benchPath, outPath, sensPath, 0));
|
||||
Entities.TestResult tstRslt = new Entities.TestResult(test, 1, Entities.MetersKind.Standard);
|
||||
Entities.TestResult tstRslt = new Entities.TestResult(test, 1, Entities.MetersKind.Single);
|
||||
|
||||
//------------------------------------------------
|
||||
Bridge.OnActivity(this, Strings.Starting_the_pump);
|
||||
|
||||
+1
-1
@@ -56,7 +56,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
|
||||
loop:
|
||||
/// Start the test, initialize test results
|
||||
Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
|
||||
Entities.TestResult tstRslt = new Entities.TestResult(test, repetitionNr, Entities.MetersKind.Standard);
|
||||
Entities.TestResult tstRslt = new Entities.TestResult(test, repetitionNr, Entities.MetersKind.Single);
|
||||
|
||||
|
||||
int flowSetTime0 = StateMachine.Time;
|
||||
|
||||
Reference in New Issue
Block a user