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

Bugfixes: FM pumps % interpretation after adding a pump, Tabs order in entry forms

Browse Source
This commit is contained in:
Milan Hanajik
2015-02-01 11:04:05 +01:00
parent efa14c6ebb
commit 8009774c20
7 changed files with 1028 additions and 1028 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.Designer.cs
Generated
+22 -22
View File
@@ -30,10 +30,10 @@
{
this.okButton = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.mainSN1TextBox = new System.Windows.Forms.TextBox();
this.mainSN1Label = new System.Windows.Forms.Label();
this.auxSN1TextBox = new System.Windows.Forms.TextBox();
this.auxSN1Label = new System.Windows.Forms.Label();
this.mainSN1TextBox = new System.Windows.Forms.TextBox();
this.mainSN1Label = new System.Windows.Forms.Label();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.auxSN2TextBox = new System.Windows.Forms.TextBox();
this.auxSN2Label = new System.Windows.Forms.Label();
@@ -76,6 +76,22 @@
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Water Meter 1";
//
// auxSN1TextBox
//
this.auxSN1TextBox.Location = new System.Drawing.Point(262, 83);
this.auxSN1TextBox.Name = "auxSN1TextBox";
this.auxSN1TextBox.Size = new System.Drawing.Size(163, 31);
this.auxSN1TextBox.TabIndex = 3;
//
// auxSN1Label
//
this.auxSN1Label.AutoSize = true;
this.auxSN1Label.Location = new System.Drawing.Point(21, 86);
this.auxSN1Label.Name = "auxSN1Label";
this.auxSN1Label.Size = new System.Drawing.Size(193, 23);
this.auxSN1Label.TabIndex = 2;
this.auxSN1Label.Text = "Aux. WM Serial Nr.";
//
// mainSN1TextBox
//
this.mainSN1TextBox.Location = new System.Drawing.Point(262, 37);
@@ -92,22 +108,6 @@
this.mainSN1Label.TabIndex = 0;
this.mainSN1Label.Text = "Main WM Serial Nr.";
//
// auxSN1TextBox
//
this.auxSN1TextBox.Location = new System.Drawing.Point(262, 83);
this.auxSN1TextBox.Name = "auxSN1TextBox";
this.auxSN1TextBox.Size = new System.Drawing.Size(163, 31);
this.auxSN1TextBox.TabIndex = 1;
//
// auxSN1Label
//
this.auxSN1Label.AutoSize = true;
this.auxSN1Label.Location = new System.Drawing.Point(21, 86);
this.auxSN1Label.Name = "auxSN1Label";
this.auxSN1Label.Size = new System.Drawing.Size(193, 23);
this.auxSN1Label.TabIndex = 0;
this.auxSN1Label.Text = "Aux. WM Serial Nr.";
//
// groupBox2
//
this.groupBox2.Controls.Add(this.auxSN2TextBox);
@@ -128,7 +128,7 @@
this.auxSN2TextBox.Location = new System.Drawing.Point(262, 83);
this.auxSN2TextBox.Name = "auxSN2TextBox";
this.auxSN2TextBox.Size = new System.Drawing.Size(163, 31);
this.auxSN2TextBox.TabIndex = 1;
this.auxSN2TextBox.TabIndex = 3;
//
// auxSN2Label
//
@@ -136,7 +136,7 @@
this.auxSN2Label.Location = new System.Drawing.Point(21, 86);
this.auxSN2Label.Name = "auxSN2Label";
this.auxSN2Label.Size = new System.Drawing.Size(193, 23);
this.auxSN2Label.TabIndex = 0;
this.auxSN2Label.TabIndex = 2;
this.auxSN2Label.Text = "Aux. WM Serial Nr.";
//
// mainSN2TextBox
@@ -175,7 +175,7 @@
this.auxSN3TextBox.Location = new System.Drawing.Point(262, 83);
this.auxSN3TextBox.Name = "auxSN3TextBox";
this.auxSN3TextBox.Size = new System.Drawing.Size(163, 31);
this.auxSN3TextBox.TabIndex = 1;
this.auxSN3TextBox.TabIndex = 3;
//
// auxSN3Label
//
@@ -183,7 +183,7 @@
this.auxSN3Label.Location = new System.Drawing.Point(21, 86);
this.auxSN3Label.Name = "auxSN3Label";
this.auxSN3Label.Size = new System.Drawing.Size(193, 23);
this.auxSN3Label.TabIndex = 0;
this.auxSN3Label.TabIndex = 2;
this.auxSN3Label.Text = "Aux. WM Serial Nr.";
//
// mainSN3TextBox
TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.Designer.cs
Generated
+23 -23
View File
@@ -71,7 +71,7 @@
this.mainState1TextBox.Location = new System.Drawing.Point(211, 42);
this.mainState1TextBox.Name = "mainState1TextBox";
this.mainState1TextBox.Size = new System.Drawing.Size(135, 31);
this.mainState1TextBox.TabIndex = 3;
this.mainState1TextBox.TabIndex = 1;
//
// mainState1Label
//
@@ -79,7 +79,7 @@
this.mainState1Label.Location = new System.Drawing.Point(18, 45);
this.mainState1Label.Name = "mainState1Label";
this.mainState1Label.Size = new System.Drawing.Size(153, 23);
this.mainState1Label.TabIndex = 2;
this.mainState1Label.TabIndex = 0;
this.mainState1Label.Text = "Main WM State";
//
// groupBox1
@@ -97,7 +97,7 @@
this.groupBox1.Location = new System.Drawing.Point(25, 23);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(375, 237);
this.groupBox1.TabIndex = 3;
this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Water Meter 1";
//
@@ -107,7 +107,7 @@
this.qFall1Label.Location = new System.Drawing.Point(18, 184);
this.qFall1Label.Name = "qFall1Label";
this.qFall1Label.Size = new System.Drawing.Size(55, 23);
this.qFall1Label.TabIndex = 11;
this.qFall1Label.TabIndex = 6;
this.qFall1Label.Text = "Qfall";
//
// qFall1TextBox
@@ -115,7 +115,7 @@
this.qFall1TextBox.Location = new System.Drawing.Point(211, 177);
this.qFall1TextBox.Name = "qFall1TextBox";
this.qFall1TextBox.Size = new System.Drawing.Size(135, 31);
this.qFall1TextBox.TabIndex = 10;
this.qFall1TextBox.TabIndex = 7;
//
// qRise1Label
//
@@ -123,7 +123,7 @@
this.qRise1Label.Location = new System.Drawing.Point(18, 135);
this.qRise1Label.Name = "qRise1Label";
this.qRise1Label.Size = new System.Drawing.Size(60, 23);
this.qRise1Label.TabIndex = 9;
this.qRise1Label.TabIndex = 4;
this.qRise1Label.Text = "Qrise";
//
// qRise1TextBox
@@ -131,7 +131,7 @@
this.qRise1TextBox.Location = new System.Drawing.Point(211, 132);
this.qRise1TextBox.Name = "qRise1TextBox";
this.qRise1TextBox.Size = new System.Drawing.Size(135, 31);
this.qRise1TextBox.TabIndex = 8;
this.qRise1TextBox.TabIndex = 5;
//
// auxState1TextBox
//
@@ -156,7 +156,7 @@
this.okButton.Location = new System.Drawing.Point(699, 33);
this.okButton.Name = "okButton";
this.okButton.Size = new System.Drawing.Size(98, 63);
this.okButton.TabIndex = 5;
this.okButton.TabIndex = 0;
this.okButton.Text = "OK";
this.okButton.UseVisualStyleBackColor = true;
this.okButton.Click += new System.EventHandler(this.okButton_Click);
@@ -170,7 +170,7 @@
this.protocolGroupBox.Location = new System.Drawing.Point(422, 118);
this.protocolGroupBox.Name = "protocolGroupBox";
this.protocolGroupBox.Size = new System.Drawing.Size(375, 142);
this.protocolGroupBox.TabIndex = 6;
this.protocolGroupBox.TabIndex = 4;
this.protocolGroupBox.TabStop = false;
this.protocolGroupBox.Text = "Protocol";
//
@@ -221,7 +221,7 @@
this.groupBox2.Location = new System.Drawing.Point(25, 282);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(375, 237);
this.groupBox2.TabIndex = 7;
this.groupBox2.TabIndex = 2;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Water Meter 2";
//
@@ -231,7 +231,7 @@
this.qFall2Label.Location = new System.Drawing.Point(18, 184);
this.qFall2Label.Name = "qFall2Label";
this.qFall2Label.Size = new System.Drawing.Size(55, 23);
this.qFall2Label.TabIndex = 11;
this.qFall2Label.TabIndex = 6;
this.qFall2Label.Text = "Qfall";
//
// qFall2TextBox
@@ -239,7 +239,7 @@
this.qFall2TextBox.Location = new System.Drawing.Point(211, 177);
this.qFall2TextBox.Name = "qFall2TextBox";
this.qFall2TextBox.Size = new System.Drawing.Size(135, 31);
this.qFall2TextBox.TabIndex = 10;
this.qFall2TextBox.TabIndex = 7;
//
// qRise2Label
//
@@ -247,7 +247,7 @@
this.qRise2Label.Location = new System.Drawing.Point(18, 135);
this.qRise2Label.Name = "qRise2Label";
this.qRise2Label.Size = new System.Drawing.Size(60, 23);
this.qRise2Label.TabIndex = 9;
this.qRise2Label.TabIndex = 4;
this.qRise2Label.Text = "Qrise";
//
// qRise2TextBox
@@ -255,14 +255,14 @@
this.qRise2TextBox.Location = new System.Drawing.Point(211, 132);
this.qRise2TextBox.Name = "qRise2TextBox";
this.qRise2TextBox.Size = new System.Drawing.Size(135, 31);
this.qRise2TextBox.TabIndex = 8;
this.qRise2TextBox.TabIndex = 5;
//
// mainState2TextBox
//
this.mainState2TextBox.Location = new System.Drawing.Point(211, 42);
this.mainState2TextBox.Name = "mainState2TextBox";
this.mainState2TextBox.Size = new System.Drawing.Size(135, 31);
this.mainState2TextBox.TabIndex = 3;
this.mainState2TextBox.TabIndex = 1;
//
// mainState2Label
//
@@ -270,7 +270,7 @@
this.mainState2Label.Location = new System.Drawing.Point(17, 45);
this.mainState2Label.Name = "mainState2Label";
this.mainState2Label.Size = new System.Drawing.Size(153, 23);
this.mainState2Label.TabIndex = 2;
this.mainState2Label.TabIndex = 0;
this.mainState2Label.Text = "Main WM State";
//
// auxState2TextBox
@@ -304,7 +304,7 @@
this.groupBox3.Location = new System.Drawing.Point(422, 282);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(375, 237);
this.groupBox3.TabIndex = 8;
this.groupBox3.TabIndex = 3;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Water Meter 3";
//
@@ -314,7 +314,7 @@
this.qFall3Label.Location = new System.Drawing.Point(18, 184);
this.qFall3Label.Name = "qFall3Label";
this.qFall3Label.Size = new System.Drawing.Size(55, 23);
this.qFall3Label.TabIndex = 11;
this.qFall3Label.TabIndex = 6;
this.qFall3Label.Text = "Qfall";
//
// qFall3TextBox
@@ -322,7 +322,7 @@
this.qFall3TextBox.Location = new System.Drawing.Point(211, 177);
this.qFall3TextBox.Name = "qFall3TextBox";
this.qFall3TextBox.Size = new System.Drawing.Size(135, 31);
this.qFall3TextBox.TabIndex = 10;
this.qFall3TextBox.TabIndex = 7;
//
// qRise3Label
//
@@ -330,7 +330,7 @@
this.qRise3Label.Location = new System.Drawing.Point(18, 135);
this.qRise3Label.Name = "qRise3Label";
this.qRise3Label.Size = new System.Drawing.Size(60, 23);
this.qRise3Label.TabIndex = 9;
this.qRise3Label.TabIndex = 4;
this.qRise3Label.Text = "Qrise";
//
// qRise3TextBox
@@ -338,14 +338,14 @@
this.qRise3TextBox.Location = new System.Drawing.Point(211, 132);
this.qRise3TextBox.Name = "qRise3TextBox";
this.qRise3TextBox.Size = new System.Drawing.Size(135, 31);
this.qRise3TextBox.TabIndex = 8;
this.qRise3TextBox.TabIndex = 5;
//
// mainState3TextBox
//
this.mainState3TextBox.Location = new System.Drawing.Point(211, 42);
this.mainState3TextBox.Name = "mainState3TextBox";
this.mainState3TextBox.Size = new System.Drawing.Size(135, 31);
this.mainState3TextBox.TabIndex = 3;
this.mainState3TextBox.TabIndex = 1;
//
// mainState3Label
//
@@ -353,7 +353,7 @@
this.mainState3Label.Location = new System.Drawing.Point(18, 45);
this.mainState3Label.Name = "mainState3Label";
this.mainState3Label.Size = new System.Drawing.Size(153, 23);
this.mainState3Label.TabIndex = 2;
this.mainState3Label.TabIndex = 0;
this.mainState3Label.Text = "Main WM State";
//
// auxState3TextBox
TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.resx
+1 -1
View File
@@ -583,7 +583,7 @@
<value>405, 92</value>
</data>
<data name="groupBox6.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
<value>6</value>
</data>
<data name="groupBox6.Text" xml:space="preserve">
<value>Wasserzähler 6</value>
TestBenchFramework/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.resx
+11 -11
View File
@@ -276,7 +276,7 @@
<value>163, 31</value>
</data>
<data name="wmStateTextBox2.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
<value>3</value>
</data>
<data name="&gt;&gt;wmStateTextBox2.Name" xml:space="preserve">
<value>wmStateTextBox2</value>
@@ -304,7 +304,7 @@
<value>68, 23</value>
</data>
<data name="wmStateLabel2.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
<value>2</value>
</data>
<data name="wmStateLabel2.Text" xml:space="preserve">
<value>State:</value>
@@ -403,7 +403,7 @@
<value>163, 31</value>
</data>
<data name="wmStateTextBox3.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
<value>3</value>
</data>
<data name="&gt;&gt;wmStateTextBox3.Name" xml:space="preserve">
<value>wmStateTextBox3</value>
@@ -430,7 +430,7 @@
<value>68, 23</value>
</data>
<data name="wmStateLabel3.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
<value>2</value>
</data>
<data name="wmStateLabel3.Text" xml:space="preserve">
<value>State:</value>
@@ -529,7 +529,7 @@
<value>163, 31</value>
</data>
<data name="wmStateTextBox4.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
<value>3</value>
</data>
<data name="&gt;&gt;wmStateTextBox4.Name" xml:space="preserve">
<value>wmStateTextBox4</value>
@@ -556,7 +556,7 @@
<value>68, 23</value>
</data>
<data name="wmStateLabel4.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
<value>2</value>
</data>
<data name="wmStateLabel4.Text" xml:space="preserve">
<value>State:</value>
@@ -655,7 +655,7 @@
<value>163, 31</value>
</data>
<data name="wmStateTextBox5.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
<value>3</value>
</data>
<data name="&gt;&gt;wmStateTextBox5.Name" xml:space="preserve">
<value>wmStateTextBox5</value>
@@ -682,7 +682,7 @@
<value>68, 23</value>
</data>
<data name="wmStateLabel5.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
<value>2</value>
</data>
<data name="wmStateLabel5.Text" xml:space="preserve">
<value>State:</value>
@@ -781,7 +781,7 @@
<value>163, 31</value>
</data>
<data name="wmStateTextBox6.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
<value>3</value>
</data>
<data name="&gt;&gt;wmStateTextBox6.Name" xml:space="preserve">
<value>wmStateTextBox6</value>
@@ -808,7 +808,7 @@
<value>68, 23</value>
</data>
<data name="wmStateLabel6.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
<value>2</value>
</data>
<data name="wmStateLabel6.Text" xml:space="preserve">
<value>State:</value>
@@ -883,7 +883,7 @@
<value>575, 92</value>
</data>
<data name="groupBox6.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
<value>6</value>
</data>
<data name="groupBox6.Text" xml:space="preserve">
<value>Water Meter 6</value>
TestBenchFramework/Utils.cs
+5 -5
View File
@@ -122,7 +122,7 @@ namespace TBF
{
result[i] = fdummy;
}
else // if (rvPosStr[i].Equals("---"))
else // if ((i < rvPosStr.Length) && rvPosStr[i].Equals("---"))
{
result[i] = -1.0f; /// Negative value means no regulation valve position change
}
@@ -141,20 +141,20 @@ namespace TBF
int fmPumpCount = BenchControl.Sequences.SequenceBase.PumpsWithFM.Count;
float[] result = new float[fmPumpCount];
string[] rvPosStr = (step.PumpWithFMPcts != null) ? step.PumpWithFMPcts.Split(new char[] { ';' }) : new string[0];
string[] fmPctsStr = (step.PumpWithFMPcts != null) ? step.PumpWithFMPcts.Split(new char[] { ';' }) : new string[0];
for (int i = 0; i < fmPumpCount; i++)
{
float fdummy;
if ((i < rvPosStr.Length) && Utils.TryParseUFloat(rvPosStr[i], out fdummy) &&
if ((i < fmPctsStr.Length) && Utils.TryParseUFloat(fmPctsStr[i], out fdummy) &&
(fdummy >= 0) && (fdummy <= 100.0f))
{
result[i] = fdummy;
}
else if (rvPosStr[i].Equals("Dflt"))
else if ((i < fmPctsStr.Length) && fmPctsStr[i].Equals("Dflt"))
{
result[i] = -2.0f; /// This value means default pump power defined by the Test parameter
}
else //if (rvPosStr[i].Equals("---"))
else //if ((i < rvPosStr.Length) && rvPosStr[i].Equals("---"))
{
result[i] = -1.0f; /// This value means no pump power change
}