From fa5b427d4d609b0fd0cf43ce09abe6c602728182 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 7 Mar 2017 18:35:39 +0100 Subject: [PATCH] Simulated mode for FixedStartMassCollection method, Bug fix in DataEntry.Standard6.TestStartEndForm, ver. 2.12.485 --- .../DataEntry/Standard12/TestStartEndForm.cs | 4 +-- .../DataEntry/Standard6/CycleBeginningForm.cs | 9 ++++-- .../DataEntry/Standard6/TestStartEndForm.cs | 32 +++++++++++-------- .../Compound/Component.cs | 4 +-- .../FixedStartMassCollectionSeq.cs | 5 ++- .../HeatMeters/Component.cs | 4 +-- .../Single/Component.cs | 4 +-- TestBenchFramework/Properties/AssemblyInfo.cs | 4 +-- 8 files changed, 38 insertions(+), 28 deletions(-) diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/TestStartEndForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard12/TestStartEndForm.cs index e837dd45f..bce87b1df 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard12/TestStartEndForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Standard12/TestStartEndForm.cs @@ -151,8 +151,6 @@ namespace TBF.BenchControl.DataEntry.Standard12 { Localize(); - //Height = 115 + 90 * WaterMetersCount; - for (int i = 0; i < TextBoxesCount; i++) { if (i < WaterMetersCount) @@ -196,6 +194,8 @@ namespace TBF.BenchControl.DataEntry.Standard12 } } } + + //Height = 85 + 44 * WaterMetersCount; } void Localize() diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard6/CycleBeginningForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard6/CycleBeginningForm.cs index 14ef0a383..91acd039a 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard6/CycleBeginningForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Standard6/CycleBeginningForm.cs @@ -41,8 +41,6 @@ namespace TBF.BenchControl.DataEntry.Standard6 enabledComboBoxes = new List(); StartForceCloseHandler(); - - Height = 147 + WaterMetersCount * 90; } /// Parameterless constructor for all watermeters @@ -73,24 +71,29 @@ namespace TBF.BenchControl.DataEntry.Standard6 if (WaterMetersCount < 4) { groupBox4.Visible = false; } else { enabledComboBoxes.Add(comboBox4); } if (WaterMetersCount < 5) { groupBox5.Visible = false; } else { enabledComboBoxes.Add(comboBox5); } if (WaterMetersCount < 6) { groupBox6.Visible = false; } else { enabledComboBoxes.Add(comboBox6); } - } + + Height = 147 + WaterMetersCount * 90; + } void Localize() { Text = Strings.Data; orderGroupBox.Text = Strings.Purchase_order; + groupBox1.Text = Strings.Water_Meter + " 1"; groupBox2.Text = Strings.Water_Meter + " 2"; groupBox3.Text = Strings.Water_Meter + " 3"; groupBox4.Text = Strings.Water_Meter + " 4"; groupBox5.Text = Strings.Water_Meter + " 5"; groupBox6.Text = Strings.Water_Meter + " 6"; + label1.Text = Strings.Serial_Number; label2.Text = Strings.Serial_Number; label3.Text = Strings.Serial_Number; label4.Text = Strings.Serial_Number; label5.Text = Strings.Serial_Number; label6.Text = Strings.Serial_Number; + okButton.Text = Strings.OkBtnText; clearButton.Text = Strings.ClearBtnText; } diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard6/TestStartEndForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard6/TestStartEndForm.cs index f1cc3672d..31853f55b 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard6/TestStartEndForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Standard6/TestStartEndForm.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2017 Sensus Metering Systems /// using System; using System.Windows.Forms; @@ -87,7 +87,7 @@ namespace TBF.BenchControl.DataEntry.Standard6 { Localize(); - Height = 115 + 90 * WaterMetersCount; + Height = 70 + 90 * WaterMetersCount; if (WaterMetersCount < 1) groupBox1.Visible = false; if (WaterMetersCount < 2) groupBox2.Visible = false; @@ -104,39 +104,43 @@ namespace TBF.BenchControl.DataEntry.Standard6 if (WaterMetersCount >= 4) wmStartStateTextBox4.Text = WMStartStateStr[3]; if (WaterMetersCount >= 5) wmStartStateTextBox5.Text = WMStartStateStr[4]; if (WaterMetersCount >= 6) wmStartStateTextBox6.Text = WMStartStateStr[5]; - wmEndStateTextBox1.Enabled = (disabled == null || disabled.Length < 1 || !disabled[0]); - wmEndStateTextBox2.Enabled = (disabled == null || disabled.Length < 2 || !disabled[1]); - wmEndStateTextBox3.Enabled = (disabled == null || disabled.Length < 3 || !disabled[2]); - wmEndStateTextBox4.Enabled = (disabled == null || disabled.Length < 4 || !disabled[3]); - wmEndStateTextBox5.Enabled = (disabled == null || disabled.Length < 5 || !disabled[4]); - wmEndStateTextBox6.Enabled = (disabled == null || disabled.Length < 6 || !disabled[5]); + + wmEndStateTextBox1.Enabled = (disabled.Length >= 1 && !disabled[0]); + wmEndStateTextBox2.Enabled = (disabled.Length >= 2 && !disabled[1]); + wmEndStateTextBox3.Enabled = (disabled.Length >= 3 && !disabled[2]); + wmEndStateTextBox4.Enabled = (disabled.Length >= 4 && !disabled[3]); + wmEndStateTextBox5.Enabled = (disabled.Length >= 5 && !disabled[4]); + wmEndStateTextBox6.Enabled = (disabled.Length >= 6 && !disabled[5]); } else { - wmStartStateTextBox1.Enabled = (disabled == null || disabled.Length < 1 || !disabled[0]); - wmStartStateTextBox2.Enabled = (disabled == null || disabled.Length < 2 || !disabled[1]); - wmStartStateTextBox3.Enabled = (disabled == null || disabled.Length < 3 || !disabled[2]); - wmStartStateTextBox4.Enabled = (disabled == null || disabled.Length < 4 || !disabled[3]); - wmStartStateTextBox5.Enabled = (disabled == null || disabled.Length < 5 || !disabled[4]); - wmStartStateTextBox6.Enabled = (disabled == null || disabled.Length < 6 || !disabled[5]); + wmStartStateTextBox1.Enabled = (disabled.Length >= 1 && !disabled[0]); + wmStartStateTextBox2.Enabled = (disabled.Length >= 2 && !disabled[1]); + wmStartStateTextBox3.Enabled = (disabled.Length >= 3 && !disabled[2]); + wmStartStateTextBox4.Enabled = (disabled.Length >= 4 && !disabled[3]); + wmStartStateTextBox5.Enabled = (disabled.Length >= 5 && !disabled[4]); + wmStartStateTextBox6.Enabled = (disabled.Length >= 6 && !disabled[5]); } } void Localize() { Text = Strings.Water_Meter_States; + groupBox1.Text = Strings.Water_Meter + " 1"; groupBox2.Text = Strings.Water_Meter + " 2"; groupBox3.Text = Strings.Water_Meter + " 3"; groupBox4.Text = Strings.Water_Meter + " 4"; groupBox5.Text = Strings.Water_Meter + " 5"; groupBox6.Text = Strings.Water_Meter + " 6"; + wmStateLabel1.Text = Strings.WMState; wmStateLabel2.Text = Strings.WMState; wmStateLabel3.Text = Strings.WMState; wmStateLabel4.Text = Strings.WMState; wmStateLabel5.Text = Strings.WMState; wmStateLabel6.Text = Strings.WMState; + startLabel.Text = Strings.Start; endLabel.Text = Strings.End; okButton.Text = Strings.OkBtnText; diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Compound/Component.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Compound/Component.cs index 7f68538c8..c3a973305 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Compound/Component.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Compound/Component.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2016 Sensus Metering Systems +/// Copyright (c) 2013-2017 Sensus Metering Systems /// using System; using System.Collections.Generic; @@ -32,7 +32,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.Compound public IList Execute(Test test, bool outerLoopMode, int outerLoopCounter) { - return (new FixedStartMassCollectionSeq()).Execute(test, outerLoopMode, outerLoopCounter, true, null); + return (new FixedStartMassCollectionSeq()).Execute(test, outerLoopMode, outerLoopCounter, true, null, DebugLevel); } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index 924c3078b..1b93168ee 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -28,7 +28,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection /// public IList Execute(Config.Entities.Test test, bool outerLoopMode, int outerLoopCounter, bool compound, - HeatMeters.TestParams heatMetersTestParams) + HeatMeters.TestParams heatMetersTestParams, + Config.Entities.DebugMode debugLevel) { Elde.ControlBoardDev cBrd = StateMachine.ControlBoard; @@ -161,6 +162,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection set_flow: + if (debugLevel == Config.Entities.DebugMode.Simulate) goto flow_set; + //------------------------------------------------ Bridge.OnActivity(this, Strings.Setting_the_flow); //------------------------------------------------ diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/Component.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/Component.cs index bfd4a02a2..ec3dce467 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/Component.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/Component.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2016 Sensus Metering Systems +/// Copyright (c) 2013-2017 Sensus Metering Systems /// using System; using System.Collections.Generic; @@ -35,7 +35,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.HeatMeters public IList Execute(Test test, bool outerLoopMode, int outerLoopCounter) { - return (new FixedStartMassCollectionSeq()).Execute(test, outerLoopMode, outerLoopCounter, false, testMethodCfg.TestParams); + return (new FixedStartMassCollectionSeq()).Execute(test, outerLoopMode, outerLoopCounter, false, testMethodCfg.TestParams, DebugLevel); } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Single/Component.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Single/Component.cs index 7fff3d977..3e89ac51e 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Single/Component.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Single/Component.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2016 Sensus Metering Systems +/// Copyright (c) 2013-2017 Sensus Metering Systems /// using System; using System.Collections.Generic; @@ -32,7 +32,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.Single public IList Execute(Test test, bool outerLoopMode, int outerLoopCounter) { - return (new FixedStartMassCollectionSeq()).Execute(test, outerLoopMode, outerLoopCounter, false, null); + return (new FixedStartMassCollectionSeq()).Execute(test, outerLoopMode, outerLoopCounter, false, null, DebugLevel); } } } diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index fffc0786d..e43a636d5 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.12.484.1")] -[assembly: AssemblyFileVersion("2.12.484.1")] +[assembly: AssemblyVersion("2.12.485.1")] +[assembly: AssemblyFileVersion("2.12.485.1")]