michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MetersKind.Standard in TBF/Entities/Enums.cs reverted to MetersKind.Single

Browse Source
This commit is contained in:
Milan Hanajik 2015-03-25 05:35:05 +01:00
parent 23d5e6d19d
commit 1e63ded8e1
20 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs
View File

@ -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++)

2
TestBenchFramework/BenchControl/DataEntry/Standard/EntryForm.cs
View File

@ -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++)

2
TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs
View File

@ -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;

2
TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
View File

@ -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;

2
TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethod.cs
View File

@ -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)

2
TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs
View File

@ -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;

2
TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
View File

@ -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;

2
TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/TestMethod.cs
View File

@ -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)

2
TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
View File

@ -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);

2
TestBenchFramework/BenchControl/TestMethods/FlyingStart/TestMethod.cs
View File

@ -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)

2
TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
View File

@ -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;

2
TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/TestMethod.cs
View File

@ -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)

2
TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs
View File

@ -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);

2
TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs
View File

@ -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);

2
TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
View File

@ -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;

2
TestBenchFramework/Entities/Enums.cs
View File

@ -8,7 +8,7 @@ namespace TBF.Entities
/// </summary>
public enum MetersKind
{
Standard,
Single,
Combined,
}

2
TestBenchFramework/Entities/Procedure.cs
View File

@ -48,7 +48,7 @@ namespace TBF.Entities
CreationTime = DateTime.Now;
LastChgUser = CreationUser;
LastChgTime = CreationTime;
MetersKind = Entities.MetersKind.Standard;
MetersKind = Entities.MetersKind.Single;
ProtocolTitle = "Watermeter test protocol";
}

2
TestBenchFramework/Entities/TestResult.cs
View File

@ -106,7 +106,7 @@ namespace TBF.Entities
{
MetersKind = kind;
if (kind == MetersKind.Standard)
if (kind == MetersKind.Single)
{
for (int i = 0; i < Program.WMsCount; i++) Meters.Add(new MeterTestResult(this));
}

4
TestBenchFramework/ProcedureDlg.cs
View File

@ -288,7 +288,7 @@ namespace TBF
}
watermetersTextBox.Text = LoadedProcedure.Watermeters;
protocolTitleTextBox.Text = LoadedProcedure.ProtocolTitle;
metersKindRadioButton1.Checked = (LoadedProcedure.MetersKind == MetersKind.Standard);
metersKindRadioButton1.Checked = (LoadedProcedure.MetersKind == MetersKind.Single);
metersKindRadioButton2.Checked = (LoadedProcedure.MetersKind == MetersKind.Combined);
notesTextBox.Text = LoadedProcedure.LongDescription;
dataEntryComboBox.Text = string.IsNullOrEmpty(LoadedProcedure.DataEntry) ? "---" : LoadedProcedure.DataEntry;
@ -310,7 +310,7 @@ namespace TBF
LoadedProcedure.Watermeters = watermetersTextBox.Text;
LoadedProcedure.ProtocolTitle = protocolTitleTextBox.Text;
LoadedProcedure.MetersKind = (metersKindRadioButton1.Checked ? MetersKind.Standard : MetersKind.Combined);
LoadedProcedure.MetersKind = (metersKindRadioButton1.Checked ? MetersKind.Single : MetersKind.Combined);
if (dataEntryComboBox.Items.Contains(dataEntryComboBox.Text))
{

14
TestBenchFramework/Screens/ProcessTabPageCtrl.cs
View File

@ -23,7 +23,7 @@ namespace TBF.Screens
/// </summary>
public ProcessTabPageCtrl()
{
currentMetersKind = Entities.MetersKind.Standard;
currentMetersKind = Entities.MetersKind.Single;
InitializeComponent();
@ -103,7 +103,7 @@ namespace TBF.Screens
scaleCmpntLabel.Text = "---";
if (currentMetersKind == Entities.MetersKind.Standard)
if (currentMetersKind == Entities.MetersKind.Single)
{
watermeterPictureBox1z.Visible = false;
watermeterPictureBox2z.Visible = false;
@ -232,7 +232,7 @@ namespace TBF.Screens
passed1zLabel.Text = "---";
}
if ((currentMetersKind == Entities.MetersKind.Standard && Program.WMsCount >= 3) ||
if ((currentMetersKind == Entities.MetersKind.Single && Program.WMsCount >= 3) ||
(currentMetersKind == Entities.MetersKind.Combined && Program.WMsCount >= 4))
{
pulses3Label.Text = "---";
@ -258,7 +258,7 @@ namespace TBF.Screens
passed2zLabel.Text = "---";
}
if ((currentMetersKind == Entities.MetersKind.Standard && Program.WMsCount >= 5) ||
if ((currentMetersKind == Entities.MetersKind.Single && Program.WMsCount >= 5) ||
(currentMetersKind == Entities.MetersKind.Combined && Program.WMsCount >= 6))
{
pulses5Label.Text = "---";
@ -372,7 +372,7 @@ namespace TBF.Screens
error1zLabel.Text = args.TestResult.CombinedMeters[0].VolumeErrorPct.ToString();
}
if ((currentMetersKind == Entities.MetersKind.Standard && Program.WMsCount >= 3) ||
if ((currentMetersKind == Entities.MetersKind.Single && Program.WMsCount >= 3) ||
(currentMetersKind == Entities.MetersKind.Combined && Program.WMsCount >= 4))
{
pulses3Label.Text = args.TestResult.Meters[2].PulsesMeter.ToString();
@ -393,7 +393,7 @@ namespace TBF.Screens
error2zLabel.Text = args.TestResult.CombinedMeters[1].VolumeErrorPct.ToString();
}
if ((currentMetersKind == Entities.MetersKind.Standard && Program.WMsCount >= 5) ||
if ((currentMetersKind == Entities.MetersKind.Single && Program.WMsCount >= 5) ||
(currentMetersKind == Entities.MetersKind.Combined && Program.WMsCount >= 6))
{
pulses5Label.Text = args.TestResult.Meters[4].PulsesMeter.ToString();
@ -462,7 +462,7 @@ namespace TBF.Screens
volumeCtvLabel.Text = args.TestResult.VolumeCTV.ToString("F1");
refErrorLabel.Text = (tRes.ErrorMaster == 0) ? "---" : tRes.ErrorMaster.ToString("F2");
if (tRes.MetersKind == Entities.MetersKind.Standard)
if (tRes.MetersKind == Entities.MetersKind.Single)
{
pulses1Label.Text = tRes.Meters[0].PulsesMeter.ToString("F0");
refPulses1Label.Text = tRes.Meters[0].PulsesMaster.ToString("F0");