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

Simulated mode for FixedStartMassCollection method, Bug fix in DataEntry.Standard6.TestStartEndForm, ver. 2.12.485

Browse Source
This commit is contained in:
Milan Hanajik
2017-03-07 19:00:36 +01:00
parent 21102bb991
commit fa5b427d4d
8 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/DataEntry/Standard12/TestStartEndForm.cs
+2 -2
View File
@@ -151,8 +151,6 @@ namespace TBF.BenchControl.DataEntry.Standard12
{ {
Localize(); Localize();
//Height = 115 + 90 * WaterMetersCount;
for (int i = 0; i < TextBoxesCount; i++) for (int i = 0; i < TextBoxesCount; i++)
{ {
if (i < WaterMetersCount) if (i < WaterMetersCount)
@@ -196,6 +194,8 @@ namespace TBF.BenchControl.DataEntry.Standard12
} }
} }
} }
//Height = 85 + 44 * WaterMetersCount;
} }
void Localize() void Localize()
TestBenchFramework/BenchControl/DataEntry/Standard6/CycleBeginningForm.cs
+5 -2
View File
@@ -41,8 +41,6 @@ namespace TBF.BenchControl.DataEntry.Standard6
enabledComboBoxes = new List<ComboBox>(); enabledComboBoxes = new List<ComboBox>();
StartForceCloseHandler(); StartForceCloseHandler();
Height = 147 + WaterMetersCount * 90;
} }
/// <summary> Parameterless constructor for all watermeters </summary> /// <summary> Parameterless constructor for all watermeters </summary>
@@ -73,24 +71,29 @@ namespace TBF.BenchControl.DataEntry.Standard6
if (WaterMetersCount < 4) { groupBox4.Visible = false; } else { enabledComboBoxes.Add(comboBox4); } if (WaterMetersCount < 4) { groupBox4.Visible = false; } else { enabledComboBoxes.Add(comboBox4); }
if (WaterMetersCount < 5) { groupBox5.Visible = false; } else { enabledComboBoxes.Add(comboBox5); } if (WaterMetersCount < 5) { groupBox5.Visible = false; } else { enabledComboBoxes.Add(comboBox5); }
if (WaterMetersCount < 6) { groupBox6.Visible = false; } else { enabledComboBoxes.Add(comboBox6); } if (WaterMetersCount < 6) { groupBox6.Visible = false; } else { enabledComboBoxes.Add(comboBox6); }
Height = 147 + WaterMetersCount * 90;
} }
void Localize() void Localize()
{ {
Text = Strings.Data; Text = Strings.Data;
orderGroupBox.Text = Strings.Purchase_order; orderGroupBox.Text = Strings.Purchase_order;
groupBox1.Text = Strings.Water_Meter + " 1"; groupBox1.Text = Strings.Water_Meter + " 1";
groupBox2.Text = Strings.Water_Meter + " 2"; groupBox2.Text = Strings.Water_Meter + " 2";
groupBox3.Text = Strings.Water_Meter + " 3"; groupBox3.Text = Strings.Water_Meter + " 3";
groupBox4.Text = Strings.Water_Meter + " 4"; groupBox4.Text = Strings.Water_Meter + " 4";
groupBox5.Text = Strings.Water_Meter + " 5"; groupBox5.Text = Strings.Water_Meter + " 5";
groupBox6.Text = Strings.Water_Meter + " 6"; groupBox6.Text = Strings.Water_Meter + " 6";
label1.Text = Strings.Serial_Number; label1.Text = Strings.Serial_Number;
label2.Text = Strings.Serial_Number; label2.Text = Strings.Serial_Number;
label3.Text = Strings.Serial_Number; label3.Text = Strings.Serial_Number;
label4.Text = Strings.Serial_Number; label4.Text = Strings.Serial_Number;
label5.Text = Strings.Serial_Number; label5.Text = Strings.Serial_Number;
label6.Text = Strings.Serial_Number; label6.Text = Strings.Serial_Number;
okButton.Text = Strings.OkBtnText; okButton.Text = Strings.OkBtnText;
clearButton.Text = Strings.ClearBtnText; clearButton.Text = Strings.ClearBtnText;
} }
TestBenchFramework/BenchControl/DataEntry/Standard6/TestStartEndForm.cs
+18 -14
View File
@@ -1,5 +1,5 @@
/// ///
/// Copyright (c) 2013-2015 Sensus Metering Systems /// Copyright (c) 2013-2017 Sensus Metering Systems
/// ///
using System; using System;
using System.Windows.Forms; using System.Windows.Forms;
@@ -87,7 +87,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
{ {
Localize(); Localize();
Height = 115 + 90 * WaterMetersCount; Height = 70 + 90 * WaterMetersCount;
if (WaterMetersCount < 1) groupBox1.Visible = false; if (WaterMetersCount < 1) groupBox1.Visible = false;
if (WaterMetersCount < 2) groupBox2.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 >= 4) wmStartStateTextBox4.Text = WMStartStateStr[3];
if (WaterMetersCount >= 5) wmStartStateTextBox5.Text = WMStartStateStr[4]; if (WaterMetersCount >= 5) wmStartStateTextBox5.Text = WMStartStateStr[4];
if (WaterMetersCount >= 6) wmStartStateTextBox6.Text = WMStartStateStr[5]; 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]); wmEndStateTextBox1.Enabled = (disabled.Length >= 1 && !disabled[0]);
wmEndStateTextBox3.Enabled = (disabled == null || disabled.Length < 3 || !disabled[2]); wmEndStateTextBox2.Enabled = (disabled.Length >= 2 && !disabled[1]);
wmEndStateTextBox4.Enabled = (disabled == null || disabled.Length < 4 || !disabled[3]); wmEndStateTextBox3.Enabled = (disabled.Length >= 3 && !disabled[2]);
wmEndStateTextBox5.Enabled = (disabled == null || disabled.Length < 5 || !disabled[4]); wmEndStateTextBox4.Enabled = (disabled.Length >= 4 && !disabled[3]);
wmEndStateTextBox6.Enabled = (disabled == null || disabled.Length < 6 || !disabled[5]); wmEndStateTextBox5.Enabled = (disabled.Length >= 5 && !disabled[4]);
wmEndStateTextBox6.Enabled = (disabled.Length >= 6 && !disabled[5]);
} }
else else
{ {
wmStartStateTextBox1.Enabled = (disabled == null || disabled.Length < 1 || !disabled[0]); wmStartStateTextBox1.Enabled = (disabled.Length >= 1 && !disabled[0]);
wmStartStateTextBox2.Enabled = (disabled == null || disabled.Length < 2 || !disabled[1]); wmStartStateTextBox2.Enabled = (disabled.Length >= 2 && !disabled[1]);
wmStartStateTextBox3.Enabled = (disabled == null || disabled.Length < 3 || !disabled[2]); wmStartStateTextBox3.Enabled = (disabled.Length >= 3 && !disabled[2]);
wmStartStateTextBox4.Enabled = (disabled == null || disabled.Length < 4 || !disabled[3]); wmStartStateTextBox4.Enabled = (disabled.Length >= 4 && !disabled[3]);
wmStartStateTextBox5.Enabled = (disabled == null || disabled.Length < 5 || !disabled[4]); wmStartStateTextBox5.Enabled = (disabled.Length >= 5 && !disabled[4]);
wmStartStateTextBox6.Enabled = (disabled == null || disabled.Length < 6 || !disabled[5]); wmStartStateTextBox6.Enabled = (disabled.Length >= 6 && !disabled[5]);
} }
} }
void Localize() void Localize()
{ {
Text = Strings.Water_Meter_States; Text = Strings.Water_Meter_States;
groupBox1.Text = Strings.Water_Meter + " 1"; groupBox1.Text = Strings.Water_Meter + " 1";
groupBox2.Text = Strings.Water_Meter + " 2"; groupBox2.Text = Strings.Water_Meter + " 2";
groupBox3.Text = Strings.Water_Meter + " 3"; groupBox3.Text = Strings.Water_Meter + " 3";
groupBox4.Text = Strings.Water_Meter + " 4"; groupBox4.Text = Strings.Water_Meter + " 4";
groupBox5.Text = Strings.Water_Meter + " 5"; groupBox5.Text = Strings.Water_Meter + " 5";
groupBox6.Text = Strings.Water_Meter + " 6"; groupBox6.Text = Strings.Water_Meter + " 6";
wmStateLabel1.Text = Strings.WMState; wmStateLabel1.Text = Strings.WMState;
wmStateLabel2.Text = Strings.WMState; wmStateLabel2.Text = Strings.WMState;
wmStateLabel3.Text = Strings.WMState; wmStateLabel3.Text = Strings.WMState;
wmStateLabel4.Text = Strings.WMState; wmStateLabel4.Text = Strings.WMState;
wmStateLabel5.Text = Strings.WMState; wmStateLabel5.Text = Strings.WMState;
wmStateLabel6.Text = Strings.WMState; wmStateLabel6.Text = Strings.WMState;
startLabel.Text = Strings.Start; startLabel.Text = Strings.Start;
endLabel.Text = Strings.End; endLabel.Text = Strings.End;
okButton.Text = Strings.OkBtnText; okButton.Text = Strings.OkBtnText;
TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Compound/Component.cs
+2 -2
View File
@@ -1,5 +1,5 @@
/// ///
/// Copyright (c) 2013-2016 Sensus Metering Systems /// Copyright (c) 2013-2017 Sensus Metering Systems
/// ///
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -32,7 +32,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.Compound
public IList<Event> Execute(Test test, bool outerLoopMode, int outerLoopCounter) public IList<Event> 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);
} }
} }
} }
TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+4 -1
View File
@@ -28,7 +28,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
/// </returns> /// </returns>
public IList<Event> Execute(Config.Entities.Test test, bool outerLoopMode, int outerLoopCounter, public IList<Event> Execute(Config.Entities.Test test, bool outerLoopMode, int outerLoopCounter,
bool compound, bool compound,
HeatMeters.TestParams heatMetersTestParams) HeatMeters.TestParams heatMetersTestParams,
Config.Entities.DebugMode debugLevel)
{ {
Elde.ControlBoardDev cBrd = StateMachine.ControlBoard; Elde.ControlBoardDev cBrd = StateMachine.ControlBoard;
@@ -161,6 +162,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
set_flow: set_flow:
if (debugLevel == Config.Entities.DebugMode.Simulate) goto flow_set;
//------------------------------------------------ //------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_the_flow); Bridge.OnActivity(this, Strings.Setting_the_flow);
//------------------------------------------------ //------------------------------------------------
TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/Component.cs
+2 -2
View File
@@ -1,5 +1,5 @@
/// ///
/// Copyright (c) 2013-2016 Sensus Metering Systems /// Copyright (c) 2013-2017 Sensus Metering Systems
/// ///
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -35,7 +35,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.HeatMeters
public IList<Event> Execute(Test test, bool outerLoopMode, int outerLoopCounter) public IList<Event> 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);
} }
} }
} }
TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Single/Component.cs
+2 -2
View File
@@ -1,5 +1,5 @@
/// ///
/// Copyright (c) 2013-2016 Sensus Metering Systems /// Copyright (c) 2013-2017 Sensus Metering Systems
/// ///
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -32,7 +32,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.Single
public IList<Event> Execute(Test test, bool outerLoopMode, int outerLoopCounter) public IList<Event> 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);
} }
} }
} }
TestBenchFramework/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.12.484.1")] [assembly: AssemblyVersion("2.12.485.1")]
[assembly: AssemblyFileVersion("2.12.484.1")] [assembly: AssemblyFileVersion("2.12.485.1")]