diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.Designer.cs b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.Designer.cs
index 9e947013f..56c5a2215 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.Designer.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.Designer.cs
@@ -28,203 +28,203 @@
///
private void InitializeComponent()
{
- 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.groupBox2 = new System.Windows.Forms.GroupBox();
- this.auxSN2TextBox = new System.Windows.Forms.TextBox();
- this.auxSN2Label = new System.Windows.Forms.Label();
- this.mainSN2TextBox = new System.Windows.Forms.TextBox();
- this.mainSN2Label = new System.Windows.Forms.Label();
- this.groupBox3 = new System.Windows.Forms.GroupBox();
- this.auxSN3TextBox = new System.Windows.Forms.TextBox();
- this.auxSN3Label = new System.Windows.Forms.Label();
- this.mainSN3TextBox = new System.Windows.Forms.TextBox();
- this.mainSN3Label = new System.Windows.Forms.Label();
- this.groupBox1.SuspendLayout();
- this.groupBox2.SuspendLayout();
- this.groupBox3.SuspendLayout();
- this.SuspendLayout();
- //
- // okButton
- //
- this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.okButton.ForeColor = System.Drawing.Color.Black;
- this.okButton.Location = new System.Drawing.Point(527, 43);
- this.okButton.Name = "okButton";
- this.okButton.Size = new System.Drawing.Size(98, 63);
- this.okButton.TabIndex = 0;
- this.okButton.Text = "OK";
- this.okButton.UseVisualStyleBackColor = true;
- this.okButton.Click += new System.EventHandler(this.okButton_Click);
- //
- // groupBox1
- //
- this.groupBox1.Controls.Add(this.auxSN1TextBox);
- this.groupBox1.Controls.Add(this.auxSN1Label);
- this.groupBox1.Controls.Add(this.mainSN1TextBox);
- this.groupBox1.Controls.Add(this.mainSN1Label);
- this.groupBox1.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.groupBox1.ForeColor = System.Drawing.Color.Black;
- this.groupBox1.Location = new System.Drawing.Point(28, 18);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(464, 137);
- this.groupBox1.TabIndex = 1;
- this.groupBox1.TabStop = false;
- this.groupBox1.Text = "Water Meter 1";
- //
- // mainSN1TextBox
- //
- this.mainSN1TextBox.Location = new System.Drawing.Point(262, 37);
- this.mainSN1TextBox.Name = "mainSN1TextBox";
- this.mainSN1TextBox.Size = new System.Drawing.Size(163, 31);
- this.mainSN1TextBox.TabIndex = 1;
- //
- // mainSN1Label
- //
- this.mainSN1Label.AutoSize = true;
- this.mainSN1Label.Location = new System.Drawing.Point(21, 40);
- this.mainSN1Label.Name = "mainSN1Label";
- this.mainSN1Label.Size = new System.Drawing.Size(195, 23);
- 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);
- this.groupBox2.Controls.Add(this.auxSN2Label);
- this.groupBox2.Controls.Add(this.mainSN2TextBox);
- this.groupBox2.Controls.Add(this.mainSN2Label);
- this.groupBox2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.groupBox2.ForeColor = System.Drawing.Color.Black;
- this.groupBox2.Location = new System.Drawing.Point(28, 175);
- this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(464, 137);
- this.groupBox2.TabIndex = 2;
- this.groupBox2.TabStop = false;
- this.groupBox2.Text = "Water Meter 2";
- //
- // auxSN2TextBox
- //
- 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;
- //
- // auxSN2Label
- //
- this.auxSN2Label.AutoSize = true;
- 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.Text = "Aux. WM Serial Nr.";
- //
- // mainSN2TextBox
- //
- this.mainSN2TextBox.Location = new System.Drawing.Point(262, 37);
- this.mainSN2TextBox.Name = "mainSN2TextBox";
- this.mainSN2TextBox.Size = new System.Drawing.Size(163, 31);
- this.mainSN2TextBox.TabIndex = 1;
- //
- // mainSN2Label
- //
- this.mainSN2Label.AutoSize = true;
- this.mainSN2Label.Location = new System.Drawing.Point(21, 40);
- this.mainSN2Label.Name = "mainSN2Label";
- this.mainSN2Label.Size = new System.Drawing.Size(195, 23);
- this.mainSN2Label.TabIndex = 0;
- this.mainSN2Label.Text = "Main WM Serial Nr.";
- //
- // groupBox3
- //
- this.groupBox3.Controls.Add(this.auxSN3TextBox);
- this.groupBox3.Controls.Add(this.auxSN3Label);
- this.groupBox3.Controls.Add(this.mainSN3TextBox);
- this.groupBox3.Controls.Add(this.mainSN3Label);
- this.groupBox3.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.groupBox3.ForeColor = System.Drawing.Color.Black;
- this.groupBox3.Location = new System.Drawing.Point(28, 330);
- this.groupBox3.Name = "groupBox3";
- this.groupBox3.Size = new System.Drawing.Size(464, 137);
- this.groupBox3.TabIndex = 3;
- this.groupBox3.TabStop = false;
- this.groupBox3.Text = "Water Meter 3";
- //
- // auxSN3TextBox
- //
- 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;
- //
- // auxSN3Label
- //
- this.auxSN3Label.AutoSize = true;
- 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.Text = "Aux. WM Serial Nr.";
- //
- // mainSN3TextBox
- //
- this.mainSN3TextBox.Location = new System.Drawing.Point(262, 37);
- this.mainSN3TextBox.Name = "mainSN3TextBox";
- this.mainSN3TextBox.Size = new System.Drawing.Size(163, 31);
- this.mainSN3TextBox.TabIndex = 1;
- //
- // mainSN3Label
- //
- this.mainSN3Label.AutoSize = true;
- this.mainSN3Label.Location = new System.Drawing.Point(21, 40);
- this.mainSN3Label.Name = "mainSN3Label";
- this.mainSN3Label.Size = new System.Drawing.Size(195, 23);
- this.mainSN3Label.TabIndex = 0;
- this.mainSN3Label.Text = "Main WM Serial Nr.";
- //
- // CycleBeginningForm
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.AutoSize = true;
- this.BackColor = System.Drawing.Color.DarkGoldenrod;
- this.ClientSize = new System.Drawing.Size(653, 492);
- this.Controls.Add(this.groupBox3);
- this.Controls.Add(this.groupBox2);
- this.Controls.Add(this.groupBox1);
- this.Controls.Add(this.okButton);
- this.ForeColor = System.Drawing.Color.Black;
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
- this.Name = "CycleBeginningForm";
- this.Text = "Daten";
- this.TopMost = true;
- this.groupBox1.ResumeLayout(false);
- this.groupBox1.PerformLayout();
- this.groupBox2.ResumeLayout(false);
- this.groupBox2.PerformLayout();
- this.groupBox3.ResumeLayout(false);
- this.groupBox3.PerformLayout();
- this.ResumeLayout(false);
+ this.okButton = new System.Windows.Forms.Button();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ 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();
+ this.mainSN2TextBox = new System.Windows.Forms.TextBox();
+ this.mainSN2Label = new System.Windows.Forms.Label();
+ this.groupBox3 = new System.Windows.Forms.GroupBox();
+ this.auxSN3TextBox = new System.Windows.Forms.TextBox();
+ this.auxSN3Label = new System.Windows.Forms.Label();
+ this.mainSN3TextBox = new System.Windows.Forms.TextBox();
+ this.mainSN3Label = new System.Windows.Forms.Label();
+ this.groupBox1.SuspendLayout();
+ this.groupBox2.SuspendLayout();
+ this.groupBox3.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // okButton
+ //
+ this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.okButton.ForeColor = System.Drawing.Color.Black;
+ this.okButton.Location = new System.Drawing.Point(527, 43);
+ this.okButton.Name = "okButton";
+ this.okButton.Size = new System.Drawing.Size(98, 63);
+ this.okButton.TabIndex = 0;
+ this.okButton.Text = "OK";
+ this.okButton.UseVisualStyleBackColor = true;
+ this.okButton.Click += new System.EventHandler(this.okButton_Click);
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.auxSN1TextBox);
+ this.groupBox1.Controls.Add(this.auxSN1Label);
+ this.groupBox1.Controls.Add(this.mainSN1TextBox);
+ this.groupBox1.Controls.Add(this.mainSN1Label);
+ this.groupBox1.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.groupBox1.ForeColor = System.Drawing.Color.Black;
+ this.groupBox1.Location = new System.Drawing.Point(28, 18);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(464, 137);
+ this.groupBox1.TabIndex = 1;
+ 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);
+ this.mainSN1TextBox.Name = "mainSN1TextBox";
+ this.mainSN1TextBox.Size = new System.Drawing.Size(163, 31);
+ this.mainSN1TextBox.TabIndex = 1;
+ //
+ // mainSN1Label
+ //
+ this.mainSN1Label.AutoSize = true;
+ this.mainSN1Label.Location = new System.Drawing.Point(21, 40);
+ this.mainSN1Label.Name = "mainSN1Label";
+ this.mainSN1Label.Size = new System.Drawing.Size(195, 23);
+ this.mainSN1Label.TabIndex = 0;
+ this.mainSN1Label.Text = "Main WM Serial Nr.";
+ //
+ // groupBox2
+ //
+ this.groupBox2.Controls.Add(this.auxSN2TextBox);
+ this.groupBox2.Controls.Add(this.auxSN2Label);
+ this.groupBox2.Controls.Add(this.mainSN2TextBox);
+ this.groupBox2.Controls.Add(this.mainSN2Label);
+ this.groupBox2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.groupBox2.ForeColor = System.Drawing.Color.Black;
+ this.groupBox2.Location = new System.Drawing.Point(28, 175);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Size = new System.Drawing.Size(464, 137);
+ this.groupBox2.TabIndex = 2;
+ this.groupBox2.TabStop = false;
+ this.groupBox2.Text = "Water Meter 2";
+ //
+ // auxSN2TextBox
+ //
+ 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 = 3;
+ //
+ // auxSN2Label
+ //
+ this.auxSN2Label.AutoSize = true;
+ 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 = 2;
+ this.auxSN2Label.Text = "Aux. WM Serial Nr.";
+ //
+ // mainSN2TextBox
+ //
+ this.mainSN2TextBox.Location = new System.Drawing.Point(262, 37);
+ this.mainSN2TextBox.Name = "mainSN2TextBox";
+ this.mainSN2TextBox.Size = new System.Drawing.Size(163, 31);
+ this.mainSN2TextBox.TabIndex = 1;
+ //
+ // mainSN2Label
+ //
+ this.mainSN2Label.AutoSize = true;
+ this.mainSN2Label.Location = new System.Drawing.Point(21, 40);
+ this.mainSN2Label.Name = "mainSN2Label";
+ this.mainSN2Label.Size = new System.Drawing.Size(195, 23);
+ this.mainSN2Label.TabIndex = 0;
+ this.mainSN2Label.Text = "Main WM Serial Nr.";
+ //
+ // groupBox3
+ //
+ this.groupBox3.Controls.Add(this.auxSN3TextBox);
+ this.groupBox3.Controls.Add(this.auxSN3Label);
+ this.groupBox3.Controls.Add(this.mainSN3TextBox);
+ this.groupBox3.Controls.Add(this.mainSN3Label);
+ this.groupBox3.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.groupBox3.ForeColor = System.Drawing.Color.Black;
+ this.groupBox3.Location = new System.Drawing.Point(28, 330);
+ this.groupBox3.Name = "groupBox3";
+ this.groupBox3.Size = new System.Drawing.Size(464, 137);
+ this.groupBox3.TabIndex = 3;
+ this.groupBox3.TabStop = false;
+ this.groupBox3.Text = "Water Meter 3";
+ //
+ // auxSN3TextBox
+ //
+ 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 = 3;
+ //
+ // auxSN3Label
+ //
+ this.auxSN3Label.AutoSize = true;
+ 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 = 2;
+ this.auxSN3Label.Text = "Aux. WM Serial Nr.";
+ //
+ // mainSN3TextBox
+ //
+ this.mainSN3TextBox.Location = new System.Drawing.Point(262, 37);
+ this.mainSN3TextBox.Name = "mainSN3TextBox";
+ this.mainSN3TextBox.Size = new System.Drawing.Size(163, 31);
+ this.mainSN3TextBox.TabIndex = 1;
+ //
+ // mainSN3Label
+ //
+ this.mainSN3Label.AutoSize = true;
+ this.mainSN3Label.Location = new System.Drawing.Point(21, 40);
+ this.mainSN3Label.Name = "mainSN3Label";
+ this.mainSN3Label.Size = new System.Drawing.Size(195, 23);
+ this.mainSN3Label.TabIndex = 0;
+ this.mainSN3Label.Text = "Main WM Serial Nr.";
+ //
+ // CycleBeginningForm
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.AutoSize = true;
+ this.BackColor = System.Drawing.Color.DarkGoldenrod;
+ this.ClientSize = new System.Drawing.Size(653, 492);
+ this.Controls.Add(this.groupBox3);
+ this.Controls.Add(this.groupBox2);
+ this.Controls.Add(this.groupBox1);
+ this.Controls.Add(this.okButton);
+ this.ForeColor = System.Drawing.Color.Black;
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+ this.Name = "CycleBeginningForm";
+ this.Text = "Daten";
+ this.TopMost = true;
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ this.groupBox2.ResumeLayout(false);
+ this.groupBox2.PerformLayout();
+ this.groupBox3.ResumeLayout(false);
+ this.groupBox3.PerformLayout();
+ this.ResumeLayout(false);
}
diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.Designer.cs b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.Designer.cs
index 2f9b8c79f..873ac4b83 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.Designer.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.Designer.cs
@@ -28,376 +28,376 @@
///
private void InitializeComponent()
{
- this.mainState1TextBox = new System.Windows.Forms.TextBox();
- this.mainState1Label = new System.Windows.Forms.Label();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.qFall1Label = new System.Windows.Forms.Label();
- this.qFall1TextBox = new System.Windows.Forms.TextBox();
- this.qRise1Label = new System.Windows.Forms.Label();
- this.qRise1TextBox = new System.Windows.Forms.TextBox();
- this.auxState1TextBox = new System.Windows.Forms.TextBox();
- this.auxState1Label = new System.Windows.Forms.Label();
- this.okButton = new System.Windows.Forms.Button();
- this.protocolGroupBox = new System.Windows.Forms.GroupBox();
- this.radioButton3 = new System.Windows.Forms.RadioButton();
- this.radioButton2 = new System.Windows.Forms.RadioButton();
- this.radioButton1 = new System.Windows.Forms.RadioButton();
- this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.qFall2Label = new System.Windows.Forms.Label();
- this.qFall2TextBox = new System.Windows.Forms.TextBox();
- this.qRise2Label = new System.Windows.Forms.Label();
- this.qRise2TextBox = new System.Windows.Forms.TextBox();
- this.mainState2TextBox = new System.Windows.Forms.TextBox();
- this.mainState2Label = new System.Windows.Forms.Label();
- this.auxState2TextBox = new System.Windows.Forms.TextBox();
- this.auxState2Label = new System.Windows.Forms.Label();
- this.groupBox3 = new System.Windows.Forms.GroupBox();
- this.qFall3Label = new System.Windows.Forms.Label();
- this.qFall3TextBox = new System.Windows.Forms.TextBox();
- this.qRise3Label = new System.Windows.Forms.Label();
- this.qRise3TextBox = new System.Windows.Forms.TextBox();
- this.mainState3TextBox = new System.Windows.Forms.TextBox();
- this.mainState3Label = new System.Windows.Forms.Label();
- this.auxState3TextBox = new System.Windows.Forms.TextBox();
- this.auxState3Label = new System.Windows.Forms.Label();
- this.groupBox1.SuspendLayout();
- this.protocolGroupBox.SuspendLayout();
- this.groupBox2.SuspendLayout();
- this.groupBox3.SuspendLayout();
- this.SuspendLayout();
- //
- // mainState1TextBox
- //
- 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;
- //
- // mainState1Label
- //
- this.mainState1Label.AutoSize = true;
- 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.Text = "Main WM State";
- //
- // groupBox1
- //
- this.groupBox1.Controls.Add(this.qFall1Label);
- this.groupBox1.Controls.Add(this.qFall1TextBox);
- this.groupBox1.Controls.Add(this.qRise1Label);
- this.groupBox1.Controls.Add(this.qRise1TextBox);
- this.groupBox1.Controls.Add(this.mainState1TextBox);
- this.groupBox1.Controls.Add(this.mainState1Label);
- this.groupBox1.Controls.Add(this.auxState1TextBox);
- this.groupBox1.Controls.Add(this.auxState1Label);
- this.groupBox1.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.groupBox1.ForeColor = System.Drawing.Color.Black;
- 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.TabStop = false;
- this.groupBox1.Text = "Water Meter 1";
- //
- // qFall1Label
- //
- this.qFall1Label.AutoSize = true;
- 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.Text = "Qfall";
- //
- // qFall1TextBox
- //
- 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;
- //
- // qRise1Label
- //
- this.qRise1Label.AutoSize = true;
- 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.Text = "Qrise";
- //
- // qRise1TextBox
- //
- 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;
- //
- // auxState1TextBox
- //
- this.auxState1TextBox.Location = new System.Drawing.Point(211, 87);
- this.auxState1TextBox.Name = "auxState1TextBox";
- this.auxState1TextBox.Size = new System.Drawing.Size(135, 31);
- this.auxState1TextBox.TabIndex = 3;
- //
- // auxState1Label
- //
- this.auxState1Label.AutoSize = true;
- this.auxState1Label.Location = new System.Drawing.Point(18, 90);
- this.auxState1Label.Name = "auxState1Label";
- this.auxState1Label.Size = new System.Drawing.Size(151, 23);
- this.auxState1Label.TabIndex = 2;
- this.auxState1Label.Text = "Aux. WM State";
- //
- // okButton
- //
- this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.okButton.ForeColor = System.Drawing.Color.Black;
- 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.Text = "OK";
- this.okButton.UseVisualStyleBackColor = true;
- this.okButton.Click += new System.EventHandler(this.okButton_Click);
- //
- // protocolGroupBox
- //
- this.protocolGroupBox.Controls.Add(this.radioButton3);
- this.protocolGroupBox.Controls.Add(this.radioButton2);
- this.protocolGroupBox.Controls.Add(this.radioButton1);
- this.protocolGroupBox.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- 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.TabStop = false;
- this.protocolGroupBox.Text = "Protocol";
- //
- // radioButton3
- //
- this.radioButton3.AutoSize = true;
- this.radioButton3.Location = new System.Drawing.Point(34, 100);
- this.radioButton3.Name = "radioButton3";
- this.radioButton3.Size = new System.Drawing.Size(152, 27);
- this.radioButton3.TabIndex = 2;
- this.radioButton3.Text = "radioButton3";
- this.radioButton3.UseVisualStyleBackColor = true;
- //
- // radioButton2
- //
- this.radioButton2.AutoSize = true;
- this.radioButton2.Location = new System.Drawing.Point(34, 67);
- this.radioButton2.Name = "radioButton2";
- this.radioButton2.Size = new System.Drawing.Size(152, 27);
- this.radioButton2.TabIndex = 1;
- this.radioButton2.Text = "radioButton2";
- this.radioButton2.UseVisualStyleBackColor = true;
- //
- // radioButton1
- //
- this.radioButton1.AutoSize = true;
- this.radioButton1.Checked = true;
- this.radioButton1.Location = new System.Drawing.Point(34, 34);
- this.radioButton1.Name = "radioButton1";
- this.radioButton1.Size = new System.Drawing.Size(152, 27);
- this.radioButton1.TabIndex = 0;
- this.radioButton1.TabStop = true;
- this.radioButton1.Text = "radioButton1";
- this.radioButton1.UseVisualStyleBackColor = true;
- //
- // groupBox2
- //
- this.groupBox2.Controls.Add(this.qFall2Label);
- this.groupBox2.Controls.Add(this.qFall2TextBox);
- this.groupBox2.Controls.Add(this.qRise2Label);
- this.groupBox2.Controls.Add(this.qRise2TextBox);
- this.groupBox2.Controls.Add(this.mainState2TextBox);
- this.groupBox2.Controls.Add(this.mainState2Label);
- this.groupBox2.Controls.Add(this.auxState2TextBox);
- this.groupBox2.Controls.Add(this.auxState2Label);
- this.groupBox2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.groupBox2.ForeColor = System.Drawing.Color.Black;
- 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.TabStop = false;
- this.groupBox2.Text = "Water Meter 2";
- //
- // qFall2Label
- //
- this.qFall2Label.AutoSize = true;
- 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.Text = "Qfall";
- //
- // qFall2TextBox
- //
- 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;
- //
- // qRise2Label
- //
- this.qRise2Label.AutoSize = true;
- 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.Text = "Qrise";
- //
- // qRise2TextBox
- //
- 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;
- //
- // 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;
- //
- // mainState2Label
- //
- this.mainState2Label.AutoSize = true;
- 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.Text = "Main WM State";
- //
- // auxState2TextBox
- //
- this.auxState2TextBox.Location = new System.Drawing.Point(211, 87);
- this.auxState2TextBox.Name = "auxState2TextBox";
- this.auxState2TextBox.Size = new System.Drawing.Size(135, 31);
- this.auxState2TextBox.TabIndex = 3;
- //
- // auxState2Label
- //
- this.auxState2Label.AutoSize = true;
- this.auxState2Label.Location = new System.Drawing.Point(18, 90);
- this.auxState2Label.Name = "auxState2Label";
- this.auxState2Label.Size = new System.Drawing.Size(151, 23);
- this.auxState2Label.TabIndex = 2;
- this.auxState2Label.Text = "Aux. WM State";
- //
- // groupBox3
- //
- this.groupBox3.Controls.Add(this.qFall3Label);
- this.groupBox3.Controls.Add(this.qFall3TextBox);
- this.groupBox3.Controls.Add(this.qRise3Label);
- this.groupBox3.Controls.Add(this.qRise3TextBox);
- this.groupBox3.Controls.Add(this.mainState3TextBox);
- this.groupBox3.Controls.Add(this.mainState3Label);
- this.groupBox3.Controls.Add(this.auxState3TextBox);
- this.groupBox3.Controls.Add(this.auxState3Label);
- this.groupBox3.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.groupBox3.ForeColor = System.Drawing.Color.Black;
- 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.TabStop = false;
- this.groupBox3.Text = "Water Meter 3";
- //
- // qFall3Label
- //
- this.qFall3Label.AutoSize = true;
- 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.Text = "Qfall";
- //
- // qFall3TextBox
- //
- 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;
- //
- // qRise3Label
- //
- this.qRise3Label.AutoSize = true;
- 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.Text = "Qrise";
- //
- // qRise3TextBox
- //
- 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;
- //
- // 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;
- //
- // mainState3Label
- //
- this.mainState3Label.AutoSize = true;
- 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.Text = "Main WM State";
- //
- // auxState3TextBox
- //
- this.auxState3TextBox.Location = new System.Drawing.Point(211, 87);
- this.auxState3TextBox.Name = "auxState3TextBox";
- this.auxState3TextBox.Size = new System.Drawing.Size(135, 31);
- this.auxState3TextBox.TabIndex = 3;
- //
- // auxState3Label
- //
- this.auxState3Label.AutoSize = true;
- this.auxState3Label.Location = new System.Drawing.Point(18, 90);
- this.auxState3Label.Name = "auxState3Label";
- this.auxState3Label.Size = new System.Drawing.Size(151, 23);
- this.auxState3Label.TabIndex = 2;
- this.auxState3Label.Text = "Aux. WM State";
- //
- // CycleEndForm
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.BackColor = System.Drawing.Color.DarkGoldenrod;
- this.ClientSize = new System.Drawing.Size(822, 542);
- this.Controls.Add(this.groupBox3);
- this.Controls.Add(this.groupBox2);
- this.Controls.Add(this.protocolGroupBox);
- this.Controls.Add(this.okButton);
- this.Controls.Add(this.groupBox1);
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
- this.Name = "CycleEndForm";
- this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
- this.Text = "Daten";
- this.TopMost = true;
- this.Load += new System.EventHandler(this.CycleEndForm_Load);
- this.groupBox1.ResumeLayout(false);
- this.groupBox1.PerformLayout();
- this.protocolGroupBox.ResumeLayout(false);
- this.protocolGroupBox.PerformLayout();
- this.groupBox2.ResumeLayout(false);
- this.groupBox2.PerformLayout();
- this.groupBox3.ResumeLayout(false);
- this.groupBox3.PerformLayout();
- this.ResumeLayout(false);
+ this.mainState1TextBox = new System.Windows.Forms.TextBox();
+ this.mainState1Label = new System.Windows.Forms.Label();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.qFall1Label = new System.Windows.Forms.Label();
+ this.qFall1TextBox = new System.Windows.Forms.TextBox();
+ this.qRise1Label = new System.Windows.Forms.Label();
+ this.qRise1TextBox = new System.Windows.Forms.TextBox();
+ this.auxState1TextBox = new System.Windows.Forms.TextBox();
+ this.auxState1Label = new System.Windows.Forms.Label();
+ this.okButton = new System.Windows.Forms.Button();
+ this.protocolGroupBox = new System.Windows.Forms.GroupBox();
+ this.radioButton3 = new System.Windows.Forms.RadioButton();
+ this.radioButton2 = new System.Windows.Forms.RadioButton();
+ this.radioButton1 = new System.Windows.Forms.RadioButton();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.qFall2Label = new System.Windows.Forms.Label();
+ this.qFall2TextBox = new System.Windows.Forms.TextBox();
+ this.qRise2Label = new System.Windows.Forms.Label();
+ this.qRise2TextBox = new System.Windows.Forms.TextBox();
+ this.mainState2TextBox = new System.Windows.Forms.TextBox();
+ this.mainState2Label = new System.Windows.Forms.Label();
+ this.auxState2TextBox = new System.Windows.Forms.TextBox();
+ this.auxState2Label = new System.Windows.Forms.Label();
+ this.groupBox3 = new System.Windows.Forms.GroupBox();
+ this.qFall3Label = new System.Windows.Forms.Label();
+ this.qFall3TextBox = new System.Windows.Forms.TextBox();
+ this.qRise3Label = new System.Windows.Forms.Label();
+ this.qRise3TextBox = new System.Windows.Forms.TextBox();
+ this.mainState3TextBox = new System.Windows.Forms.TextBox();
+ this.mainState3Label = new System.Windows.Forms.Label();
+ this.auxState3TextBox = new System.Windows.Forms.TextBox();
+ this.auxState3Label = new System.Windows.Forms.Label();
+ this.groupBox1.SuspendLayout();
+ this.protocolGroupBox.SuspendLayout();
+ this.groupBox2.SuspendLayout();
+ this.groupBox3.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // mainState1TextBox
+ //
+ 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 = 1;
+ //
+ // mainState1Label
+ //
+ this.mainState1Label.AutoSize = true;
+ 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 = 0;
+ this.mainState1Label.Text = "Main WM State";
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.qFall1Label);
+ this.groupBox1.Controls.Add(this.qFall1TextBox);
+ this.groupBox1.Controls.Add(this.qRise1Label);
+ this.groupBox1.Controls.Add(this.qRise1TextBox);
+ this.groupBox1.Controls.Add(this.mainState1TextBox);
+ this.groupBox1.Controls.Add(this.mainState1Label);
+ this.groupBox1.Controls.Add(this.auxState1TextBox);
+ this.groupBox1.Controls.Add(this.auxState1Label);
+ this.groupBox1.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.groupBox1.ForeColor = System.Drawing.Color.Black;
+ 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 = 1;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "Water Meter 1";
+ //
+ // qFall1Label
+ //
+ this.qFall1Label.AutoSize = true;
+ 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 = 6;
+ this.qFall1Label.Text = "Qfall";
+ //
+ // qFall1TextBox
+ //
+ 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 = 7;
+ //
+ // qRise1Label
+ //
+ this.qRise1Label.AutoSize = true;
+ 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 = 4;
+ this.qRise1Label.Text = "Qrise";
+ //
+ // qRise1TextBox
+ //
+ 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 = 5;
+ //
+ // auxState1TextBox
+ //
+ this.auxState1TextBox.Location = new System.Drawing.Point(211, 87);
+ this.auxState1TextBox.Name = "auxState1TextBox";
+ this.auxState1TextBox.Size = new System.Drawing.Size(135, 31);
+ this.auxState1TextBox.TabIndex = 3;
+ //
+ // auxState1Label
+ //
+ this.auxState1Label.AutoSize = true;
+ this.auxState1Label.Location = new System.Drawing.Point(18, 90);
+ this.auxState1Label.Name = "auxState1Label";
+ this.auxState1Label.Size = new System.Drawing.Size(151, 23);
+ this.auxState1Label.TabIndex = 2;
+ this.auxState1Label.Text = "Aux. WM State";
+ //
+ // okButton
+ //
+ this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.okButton.ForeColor = System.Drawing.Color.Black;
+ 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 = 0;
+ this.okButton.Text = "OK";
+ this.okButton.UseVisualStyleBackColor = true;
+ this.okButton.Click += new System.EventHandler(this.okButton_Click);
+ //
+ // protocolGroupBox
+ //
+ this.protocolGroupBox.Controls.Add(this.radioButton3);
+ this.protocolGroupBox.Controls.Add(this.radioButton2);
+ this.protocolGroupBox.Controls.Add(this.radioButton1);
+ this.protocolGroupBox.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ 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 = 4;
+ this.protocolGroupBox.TabStop = false;
+ this.protocolGroupBox.Text = "Protocol";
+ //
+ // radioButton3
+ //
+ this.radioButton3.AutoSize = true;
+ this.radioButton3.Location = new System.Drawing.Point(34, 100);
+ this.radioButton3.Name = "radioButton3";
+ this.radioButton3.Size = new System.Drawing.Size(152, 27);
+ this.radioButton3.TabIndex = 2;
+ this.radioButton3.Text = "radioButton3";
+ this.radioButton3.UseVisualStyleBackColor = true;
+ //
+ // radioButton2
+ //
+ this.radioButton2.AutoSize = true;
+ this.radioButton2.Location = new System.Drawing.Point(34, 67);
+ this.radioButton2.Name = "radioButton2";
+ this.radioButton2.Size = new System.Drawing.Size(152, 27);
+ this.radioButton2.TabIndex = 1;
+ this.radioButton2.Text = "radioButton2";
+ this.radioButton2.UseVisualStyleBackColor = true;
+ //
+ // radioButton1
+ //
+ this.radioButton1.AutoSize = true;
+ this.radioButton1.Checked = true;
+ this.radioButton1.Location = new System.Drawing.Point(34, 34);
+ this.radioButton1.Name = "radioButton1";
+ this.radioButton1.Size = new System.Drawing.Size(152, 27);
+ this.radioButton1.TabIndex = 0;
+ this.radioButton1.TabStop = true;
+ this.radioButton1.Text = "radioButton1";
+ this.radioButton1.UseVisualStyleBackColor = true;
+ //
+ // groupBox2
+ //
+ this.groupBox2.Controls.Add(this.qFall2Label);
+ this.groupBox2.Controls.Add(this.qFall2TextBox);
+ this.groupBox2.Controls.Add(this.qRise2Label);
+ this.groupBox2.Controls.Add(this.qRise2TextBox);
+ this.groupBox2.Controls.Add(this.mainState2TextBox);
+ this.groupBox2.Controls.Add(this.mainState2Label);
+ this.groupBox2.Controls.Add(this.auxState2TextBox);
+ this.groupBox2.Controls.Add(this.auxState2Label);
+ this.groupBox2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.groupBox2.ForeColor = System.Drawing.Color.Black;
+ 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 = 2;
+ this.groupBox2.TabStop = false;
+ this.groupBox2.Text = "Water Meter 2";
+ //
+ // qFall2Label
+ //
+ this.qFall2Label.AutoSize = true;
+ 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 = 6;
+ this.qFall2Label.Text = "Qfall";
+ //
+ // qFall2TextBox
+ //
+ 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 = 7;
+ //
+ // qRise2Label
+ //
+ this.qRise2Label.AutoSize = true;
+ 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 = 4;
+ this.qRise2Label.Text = "Qrise";
+ //
+ // qRise2TextBox
+ //
+ 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 = 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 = 1;
+ //
+ // mainState2Label
+ //
+ this.mainState2Label.AutoSize = true;
+ 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 = 0;
+ this.mainState2Label.Text = "Main WM State";
+ //
+ // auxState2TextBox
+ //
+ this.auxState2TextBox.Location = new System.Drawing.Point(211, 87);
+ this.auxState2TextBox.Name = "auxState2TextBox";
+ this.auxState2TextBox.Size = new System.Drawing.Size(135, 31);
+ this.auxState2TextBox.TabIndex = 3;
+ //
+ // auxState2Label
+ //
+ this.auxState2Label.AutoSize = true;
+ this.auxState2Label.Location = new System.Drawing.Point(18, 90);
+ this.auxState2Label.Name = "auxState2Label";
+ this.auxState2Label.Size = new System.Drawing.Size(151, 23);
+ this.auxState2Label.TabIndex = 2;
+ this.auxState2Label.Text = "Aux. WM State";
+ //
+ // groupBox3
+ //
+ this.groupBox3.Controls.Add(this.qFall3Label);
+ this.groupBox3.Controls.Add(this.qFall3TextBox);
+ this.groupBox3.Controls.Add(this.qRise3Label);
+ this.groupBox3.Controls.Add(this.qRise3TextBox);
+ this.groupBox3.Controls.Add(this.mainState3TextBox);
+ this.groupBox3.Controls.Add(this.mainState3Label);
+ this.groupBox3.Controls.Add(this.auxState3TextBox);
+ this.groupBox3.Controls.Add(this.auxState3Label);
+ this.groupBox3.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.groupBox3.ForeColor = System.Drawing.Color.Black;
+ 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 = 3;
+ this.groupBox3.TabStop = false;
+ this.groupBox3.Text = "Water Meter 3";
+ //
+ // qFall3Label
+ //
+ this.qFall3Label.AutoSize = true;
+ 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 = 6;
+ this.qFall3Label.Text = "Qfall";
+ //
+ // qFall3TextBox
+ //
+ 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 = 7;
+ //
+ // qRise3Label
+ //
+ this.qRise3Label.AutoSize = true;
+ 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 = 4;
+ this.qRise3Label.Text = "Qrise";
+ //
+ // qRise3TextBox
+ //
+ 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 = 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 = 1;
+ //
+ // mainState3Label
+ //
+ this.mainState3Label.AutoSize = true;
+ 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 = 0;
+ this.mainState3Label.Text = "Main WM State";
+ //
+ // auxState3TextBox
+ //
+ this.auxState3TextBox.Location = new System.Drawing.Point(211, 87);
+ this.auxState3TextBox.Name = "auxState3TextBox";
+ this.auxState3TextBox.Size = new System.Drawing.Size(135, 31);
+ this.auxState3TextBox.TabIndex = 3;
+ //
+ // auxState3Label
+ //
+ this.auxState3Label.AutoSize = true;
+ this.auxState3Label.Location = new System.Drawing.Point(18, 90);
+ this.auxState3Label.Name = "auxState3Label";
+ this.auxState3Label.Size = new System.Drawing.Size(151, 23);
+ this.auxState3Label.TabIndex = 2;
+ this.auxState3Label.Text = "Aux. WM State";
+ //
+ // CycleEndForm
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.Color.DarkGoldenrod;
+ this.ClientSize = new System.Drawing.Size(822, 542);
+ this.Controls.Add(this.groupBox3);
+ this.Controls.Add(this.groupBox2);
+ this.Controls.Add(this.protocolGroupBox);
+ this.Controls.Add(this.okButton);
+ this.Controls.Add(this.groupBox1);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+ this.Name = "CycleEndForm";
+ this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
+ this.Text = "Daten";
+ this.TopMost = true;
+ this.Load += new System.EventHandler(this.CycleEndForm_Load);
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ this.protocolGroupBox.ResumeLayout(false);
+ this.protocolGroupBox.PerformLayout();
+ this.groupBox2.ResumeLayout(false);
+ this.groupBox2.PerformLayout();
+ this.groupBox3.ResumeLayout(false);
+ this.groupBox3.PerformLayout();
+ this.ResumeLayout(false);
}
diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.Designer.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.Designer.cs
index 3eb7940e6..481eb6ddb 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.Designer.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.Designer.cs
@@ -28,186 +28,186 @@
///
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CycleBeginningForm));
- this.okButton = new System.Windows.Forms.Button();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.textBox1 = new System.Windows.Forms.TextBox();
- this.label1 = new System.Windows.Forms.Label();
- this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.textBox2 = new System.Windows.Forms.TextBox();
- this.label2 = new System.Windows.Forms.Label();
- this.groupBox3 = new System.Windows.Forms.GroupBox();
- this.textBox3 = new System.Windows.Forms.TextBox();
- this.label3 = new System.Windows.Forms.Label();
- this.groupBox4 = new System.Windows.Forms.GroupBox();
- this.textBox4 = new System.Windows.Forms.TextBox();
- this.label4 = new System.Windows.Forms.Label();
- this.groupBox5 = new System.Windows.Forms.GroupBox();
- this.textBox5 = new System.Windows.Forms.TextBox();
- this.label5 = new System.Windows.Forms.Label();
- this.groupBox6 = new System.Windows.Forms.GroupBox();
- this.textBox6 = new System.Windows.Forms.TextBox();
- this.label6 = new System.Windows.Forms.Label();
- this.groupBox1.SuspendLayout();
- this.groupBox2.SuspendLayout();
- this.groupBox3.SuspendLayout();
- this.groupBox4.SuspendLayout();
- this.groupBox5.SuspendLayout();
- this.groupBox6.SuspendLayout();
- this.SuspendLayout();
- //
- // okButton
- //
- resources.ApplyResources(this.okButton, "okButton");
- this.okButton.ForeColor = System.Drawing.Color.Black;
- this.okButton.Name = "okButton";
- this.okButton.UseVisualStyleBackColor = true;
- this.okButton.Click += new System.EventHandler(this.okButton_Click);
- //
- // groupBox1
- //
- this.groupBox1.Controls.Add(this.textBox1);
- this.groupBox1.Controls.Add(this.label1);
- resources.ApplyResources(this.groupBox1, "groupBox1");
- this.groupBox1.ForeColor = System.Drawing.Color.Black;
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.TabStop = false;
- //
- // textBox1
- //
- resources.ApplyResources(this.textBox1, "textBox1");
- this.textBox1.Name = "textBox1";
- //
- // label1
- //
- resources.ApplyResources(this.label1, "label1");
- this.label1.Name = "label1";
- //
- // groupBox2
- //
- this.groupBox2.Controls.Add(this.textBox2);
- this.groupBox2.Controls.Add(this.label2);
- resources.ApplyResources(this.groupBox2, "groupBox2");
- this.groupBox2.ForeColor = System.Drawing.Color.Black;
- this.groupBox2.Name = "groupBox2";
- this.groupBox2.TabStop = false;
- //
- // textBox2
- //
- resources.ApplyResources(this.textBox2, "textBox2");
- this.textBox2.Name = "textBox2";
- //
- // label2
- //
- resources.ApplyResources(this.label2, "label2");
- this.label2.Name = "label2";
- //
- // groupBox3
- //
- this.groupBox3.Controls.Add(this.textBox3);
- this.groupBox3.Controls.Add(this.label3);
- resources.ApplyResources(this.groupBox3, "groupBox3");
- this.groupBox3.ForeColor = System.Drawing.Color.Black;
- this.groupBox3.Name = "groupBox3";
- this.groupBox3.TabStop = false;
- //
- // textBox3
- //
- resources.ApplyResources(this.textBox3, "textBox3");
- this.textBox3.Name = "textBox3";
- //
- // label3
- //
- resources.ApplyResources(this.label3, "label3");
- this.label3.Name = "label3";
- //
- // groupBox4
- //
- this.groupBox4.Controls.Add(this.textBox4);
- this.groupBox4.Controls.Add(this.label4);
- resources.ApplyResources(this.groupBox4, "groupBox4");
- this.groupBox4.ForeColor = System.Drawing.Color.Black;
- this.groupBox4.Name = "groupBox4";
- this.groupBox4.TabStop = false;
- //
- // textBox4
- //
- resources.ApplyResources(this.textBox4, "textBox4");
- this.textBox4.Name = "textBox4";
- //
- // label4
- //
- resources.ApplyResources(this.label4, "label4");
- this.label4.Name = "label4";
- //
- // groupBox5
- //
- this.groupBox5.Controls.Add(this.textBox5);
- this.groupBox5.Controls.Add(this.label5);
- resources.ApplyResources(this.groupBox5, "groupBox5");
- this.groupBox5.ForeColor = System.Drawing.Color.Black;
- this.groupBox5.Name = "groupBox5";
- this.groupBox5.TabStop = false;
- //
- // textBox5
- //
- resources.ApplyResources(this.textBox5, "textBox5");
- this.textBox5.Name = "textBox5";
- //
- // label5
- //
- resources.ApplyResources(this.label5, "label5");
- this.label5.Name = "label5";
- //
- // groupBox6
- //
- this.groupBox6.Controls.Add(this.textBox6);
- this.groupBox6.Controls.Add(this.label6);
- resources.ApplyResources(this.groupBox6, "groupBox6");
- this.groupBox6.ForeColor = System.Drawing.Color.Black;
- this.groupBox6.Name = "groupBox6";
- this.groupBox6.TabStop = false;
- //
- // textBox6
- //
- resources.ApplyResources(this.textBox6, "textBox6");
- this.textBox6.Name = "textBox6";
- //
- // label6
- //
- resources.ApplyResources(this.label6, "label6");
- this.label6.Name = "label6";
- //
- // CycleBeginningForm
- //
- resources.ApplyResources(this, "$this");
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.BackColor = System.Drawing.Color.DarkGoldenrod;
- this.Controls.Add(this.groupBox6);
- this.Controls.Add(this.groupBox5);
- this.Controls.Add(this.groupBox4);
- this.Controls.Add(this.groupBox3);
- this.Controls.Add(this.groupBox2);
- this.Controls.Add(this.groupBox1);
- this.Controls.Add(this.okButton);
- this.ForeColor = System.Drawing.Color.Black;
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
- this.Name = "CycleBeginningForm";
- this.TopMost = true;
- this.Load += new System.EventHandler(this.CycleBeginningForm_Load);
- this.groupBox1.ResumeLayout(false);
- this.groupBox1.PerformLayout();
- this.groupBox2.ResumeLayout(false);
- this.groupBox2.PerformLayout();
- this.groupBox3.ResumeLayout(false);
- this.groupBox3.PerformLayout();
- this.groupBox4.ResumeLayout(false);
- this.groupBox4.PerformLayout();
- this.groupBox5.ResumeLayout(false);
- this.groupBox5.PerformLayout();
- this.groupBox6.ResumeLayout(false);
- this.groupBox6.PerformLayout();
- this.ResumeLayout(false);
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CycleBeginningForm));
+ this.okButton = new System.Windows.Forms.Button();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.textBox1 = new System.Windows.Forms.TextBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.textBox2 = new System.Windows.Forms.TextBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.groupBox3 = new System.Windows.Forms.GroupBox();
+ this.textBox3 = new System.Windows.Forms.TextBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.groupBox4 = new System.Windows.Forms.GroupBox();
+ this.textBox4 = new System.Windows.Forms.TextBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.groupBox5 = new System.Windows.Forms.GroupBox();
+ this.textBox5 = new System.Windows.Forms.TextBox();
+ this.label5 = new System.Windows.Forms.Label();
+ this.groupBox6 = new System.Windows.Forms.GroupBox();
+ this.textBox6 = new System.Windows.Forms.TextBox();
+ this.label6 = new System.Windows.Forms.Label();
+ this.groupBox1.SuspendLayout();
+ this.groupBox2.SuspendLayout();
+ this.groupBox3.SuspendLayout();
+ this.groupBox4.SuspendLayout();
+ this.groupBox5.SuspendLayout();
+ this.groupBox6.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // okButton
+ //
+ resources.ApplyResources(this.okButton, "okButton");
+ this.okButton.ForeColor = System.Drawing.Color.Black;
+ this.okButton.Name = "okButton";
+ this.okButton.UseVisualStyleBackColor = true;
+ this.okButton.Click += new System.EventHandler(this.okButton_Click);
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.textBox1);
+ this.groupBox1.Controls.Add(this.label1);
+ resources.ApplyResources(this.groupBox1, "groupBox1");
+ this.groupBox1.ForeColor = System.Drawing.Color.Black;
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.TabStop = false;
+ //
+ // textBox1
+ //
+ resources.ApplyResources(this.textBox1, "textBox1");
+ this.textBox1.Name = "textBox1";
+ //
+ // label1
+ //
+ resources.ApplyResources(this.label1, "label1");
+ this.label1.Name = "label1";
+ //
+ // groupBox2
+ //
+ this.groupBox2.Controls.Add(this.textBox2);
+ this.groupBox2.Controls.Add(this.label2);
+ resources.ApplyResources(this.groupBox2, "groupBox2");
+ this.groupBox2.ForeColor = System.Drawing.Color.Black;
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.TabStop = false;
+ //
+ // textBox2
+ //
+ resources.ApplyResources(this.textBox2, "textBox2");
+ this.textBox2.Name = "textBox2";
+ //
+ // label2
+ //
+ resources.ApplyResources(this.label2, "label2");
+ this.label2.Name = "label2";
+ //
+ // groupBox3
+ //
+ this.groupBox3.Controls.Add(this.textBox3);
+ this.groupBox3.Controls.Add(this.label3);
+ resources.ApplyResources(this.groupBox3, "groupBox3");
+ this.groupBox3.ForeColor = System.Drawing.Color.Black;
+ this.groupBox3.Name = "groupBox3";
+ this.groupBox3.TabStop = false;
+ //
+ // textBox3
+ //
+ resources.ApplyResources(this.textBox3, "textBox3");
+ this.textBox3.Name = "textBox3";
+ //
+ // label3
+ //
+ resources.ApplyResources(this.label3, "label3");
+ this.label3.Name = "label3";
+ //
+ // groupBox4
+ //
+ this.groupBox4.Controls.Add(this.textBox4);
+ this.groupBox4.Controls.Add(this.label4);
+ resources.ApplyResources(this.groupBox4, "groupBox4");
+ this.groupBox4.ForeColor = System.Drawing.Color.Black;
+ this.groupBox4.Name = "groupBox4";
+ this.groupBox4.TabStop = false;
+ //
+ // textBox4
+ //
+ resources.ApplyResources(this.textBox4, "textBox4");
+ this.textBox4.Name = "textBox4";
+ //
+ // label4
+ //
+ resources.ApplyResources(this.label4, "label4");
+ this.label4.Name = "label4";
+ //
+ // groupBox5
+ //
+ this.groupBox5.Controls.Add(this.textBox5);
+ this.groupBox5.Controls.Add(this.label5);
+ resources.ApplyResources(this.groupBox5, "groupBox5");
+ this.groupBox5.ForeColor = System.Drawing.Color.Black;
+ this.groupBox5.Name = "groupBox5";
+ this.groupBox5.TabStop = false;
+ //
+ // textBox5
+ //
+ resources.ApplyResources(this.textBox5, "textBox5");
+ this.textBox5.Name = "textBox5";
+ //
+ // label5
+ //
+ resources.ApplyResources(this.label5, "label5");
+ this.label5.Name = "label5";
+ //
+ // groupBox6
+ //
+ this.groupBox6.Controls.Add(this.textBox6);
+ this.groupBox6.Controls.Add(this.label6);
+ resources.ApplyResources(this.groupBox6, "groupBox6");
+ this.groupBox6.ForeColor = System.Drawing.Color.Black;
+ this.groupBox6.Name = "groupBox6";
+ this.groupBox6.TabStop = false;
+ //
+ // textBox6
+ //
+ resources.ApplyResources(this.textBox6, "textBox6");
+ this.textBox6.Name = "textBox6";
+ //
+ // label6
+ //
+ resources.ApplyResources(this.label6, "label6");
+ this.label6.Name = "label6";
+ //
+ // CycleBeginningForm
+ //
+ resources.ApplyResources(this, "$this");
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.Color.DarkGoldenrod;
+ this.Controls.Add(this.groupBox6);
+ this.Controls.Add(this.groupBox5);
+ this.Controls.Add(this.groupBox4);
+ this.Controls.Add(this.groupBox3);
+ this.Controls.Add(this.groupBox2);
+ this.Controls.Add(this.groupBox1);
+ this.Controls.Add(this.okButton);
+ this.ForeColor = System.Drawing.Color.Black;
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+ this.Name = "CycleBeginningForm";
+ this.TopMost = true;
+ this.Load += new System.EventHandler(this.CycleBeginningForm_Load);
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ this.groupBox2.ResumeLayout(false);
+ this.groupBox2.PerformLayout();
+ this.groupBox3.ResumeLayout(false);
+ this.groupBox3.PerformLayout();
+ this.groupBox4.ResumeLayout(false);
+ this.groupBox4.PerformLayout();
+ this.groupBox5.ResumeLayout(false);
+ this.groupBox5.PerformLayout();
+ this.groupBox6.ResumeLayout(false);
+ this.groupBox6.PerformLayout();
+ this.ResumeLayout(false);
}
diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.resx b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.resx
index 488384dcc..2833f4ad8 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.resx
+++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.resx
@@ -583,7 +583,7 @@
405, 92
- 4
+ 6
Wasserzähler 6
diff --git a/TestBenchFramework/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.designer.cs b/TestBenchFramework/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.designer.cs
index 6b51a7383..663579c5b 100644
--- a/TestBenchFramework/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.designer.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.designer.cs
@@ -28,270 +28,270 @@
///
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WMSNsAndStatesForm));
- this.okButton = new System.Windows.Forms.Button();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.wmStateTextBox1 = new System.Windows.Forms.TextBox();
- this.wmStateLabel1 = new System.Windows.Forms.Label();
- this.snTextBox1 = new System.Windows.Forms.TextBox();
- this.snLabel1 = new System.Windows.Forms.Label();
- this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.wmStateTextBox2 = new System.Windows.Forms.TextBox();
- this.wmStateLabel2 = new System.Windows.Forms.Label();
- this.snTextBox2 = new System.Windows.Forms.TextBox();
- this.snLabel2 = new System.Windows.Forms.Label();
- this.groupBox3 = new System.Windows.Forms.GroupBox();
- this.wmStateTextBox3 = new System.Windows.Forms.TextBox();
- this.wmStateLabel3 = new System.Windows.Forms.Label();
- this.snTextBox3 = new System.Windows.Forms.TextBox();
- this.snLabel3 = new System.Windows.Forms.Label();
- this.groupBox4 = new System.Windows.Forms.GroupBox();
- this.wmStateTextBox4 = new System.Windows.Forms.TextBox();
- this.wmStateLabel4 = new System.Windows.Forms.Label();
- this.snTextBox4 = new System.Windows.Forms.TextBox();
- this.snLabel4 = new System.Windows.Forms.Label();
- this.groupBox5 = new System.Windows.Forms.GroupBox();
- this.wmStateTextBox5 = new System.Windows.Forms.TextBox();
- this.wmStateLabel5 = new System.Windows.Forms.Label();
- this.snTextBox5 = new System.Windows.Forms.TextBox();
- this.snLabel5 = new System.Windows.Forms.Label();
- this.groupBox6 = new System.Windows.Forms.GroupBox();
- this.wmStateTextBox6 = new System.Windows.Forms.TextBox();
- this.wmStateLabel6 = new System.Windows.Forms.Label();
- this.snTextBox6 = new System.Windows.Forms.TextBox();
- this.snLabel6 = new System.Windows.Forms.Label();
- this.groupBox1.SuspendLayout();
- this.groupBox2.SuspendLayout();
- this.groupBox3.SuspendLayout();
- this.groupBox4.SuspendLayout();
- this.groupBox5.SuspendLayout();
- this.groupBox6.SuspendLayout();
- this.SuspendLayout();
- //
- // okButton
- //
- resources.ApplyResources(this.okButton, "okButton");
- this.okButton.ForeColor = System.Drawing.Color.Black;
- this.okButton.Name = "okButton";
- this.okButton.UseVisualStyleBackColor = true;
- this.okButton.Click += new System.EventHandler(this.okButton_Click);
- //
- // groupBox1
- //
- this.groupBox1.Controls.Add(this.wmStateTextBox1);
- this.groupBox1.Controls.Add(this.wmStateLabel1);
- this.groupBox1.Controls.Add(this.snTextBox1);
- this.groupBox1.Controls.Add(this.snLabel1);
- resources.ApplyResources(this.groupBox1, "groupBox1");
- this.groupBox1.ForeColor = System.Drawing.Color.Black;
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.TabStop = false;
- //
- // wmStateTextBox1
- //
- resources.ApplyResources(this.wmStateTextBox1, "wmStateTextBox1");
- this.wmStateTextBox1.Name = "wmStateTextBox1";
- //
- // wmStateLabel1
- //
- resources.ApplyResources(this.wmStateLabel1, "wmStateLabel1");
- this.wmStateLabel1.Name = "wmStateLabel1";
- //
- // snTextBox1
- //
- resources.ApplyResources(this.snTextBox1, "snTextBox1");
- this.snTextBox1.Name = "snTextBox1";
- //
- // snLabel1
- //
- resources.ApplyResources(this.snLabel1, "snLabel1");
- this.snLabel1.Name = "snLabel1";
- //
- // groupBox2
- //
- this.groupBox2.Controls.Add(this.wmStateTextBox2);
- this.groupBox2.Controls.Add(this.wmStateLabel2);
- this.groupBox2.Controls.Add(this.snTextBox2);
- this.groupBox2.Controls.Add(this.snLabel2);
- resources.ApplyResources(this.groupBox2, "groupBox2");
- this.groupBox2.ForeColor = System.Drawing.Color.Black;
- this.groupBox2.Name = "groupBox2";
- this.groupBox2.TabStop = false;
- //
- // wmStateTextBox2
- //
- resources.ApplyResources(this.wmStateTextBox2, "wmStateTextBox2");
- this.wmStateTextBox2.Name = "wmStateTextBox2";
- //
- // wmStateLabel2
- //
- resources.ApplyResources(this.wmStateLabel2, "wmStateLabel2");
- this.wmStateLabel2.Name = "wmStateLabel2";
- //
- // snTextBox2
- //
- resources.ApplyResources(this.snTextBox2, "snTextBox2");
- this.snTextBox2.Name = "snTextBox2";
- //
- // snLabel2
- //
- resources.ApplyResources(this.snLabel2, "snLabel2");
- this.snLabel2.Name = "snLabel2";
- //
- // groupBox3
- //
- this.groupBox3.Controls.Add(this.wmStateTextBox3);
- this.groupBox3.Controls.Add(this.wmStateLabel3);
- this.groupBox3.Controls.Add(this.snTextBox3);
- this.groupBox3.Controls.Add(this.snLabel3);
- resources.ApplyResources(this.groupBox3, "groupBox3");
- this.groupBox3.ForeColor = System.Drawing.Color.Black;
- this.groupBox3.Name = "groupBox3";
- this.groupBox3.TabStop = false;
- //
- // wmStateTextBox3
- //
- resources.ApplyResources(this.wmStateTextBox3, "wmStateTextBox3");
- this.wmStateTextBox3.Name = "wmStateTextBox3";
- //
- // wmStateLabel3
- //
- resources.ApplyResources(this.wmStateLabel3, "wmStateLabel3");
- this.wmStateLabel3.Name = "wmStateLabel3";
- //
- // snTextBox3
- //
- resources.ApplyResources(this.snTextBox3, "snTextBox3");
- this.snTextBox3.Name = "snTextBox3";
- //
- // snLabel3
- //
- resources.ApplyResources(this.snLabel3, "snLabel3");
- this.snLabel3.Name = "snLabel3";
- //
- // groupBox4
- //
- this.groupBox4.Controls.Add(this.wmStateTextBox4);
- this.groupBox4.Controls.Add(this.wmStateLabel4);
- this.groupBox4.Controls.Add(this.snTextBox4);
- this.groupBox4.Controls.Add(this.snLabel4);
- resources.ApplyResources(this.groupBox4, "groupBox4");
- this.groupBox4.ForeColor = System.Drawing.Color.Black;
- this.groupBox4.Name = "groupBox4";
- this.groupBox4.TabStop = false;
- //
- // wmStateTextBox4
- //
- resources.ApplyResources(this.wmStateTextBox4, "wmStateTextBox4");
- this.wmStateTextBox4.Name = "wmStateTextBox4";
- //
- // wmStateLabel4
- //
- resources.ApplyResources(this.wmStateLabel4, "wmStateLabel4");
- this.wmStateLabel4.Name = "wmStateLabel4";
- //
- // snTextBox4
- //
- resources.ApplyResources(this.snTextBox4, "snTextBox4");
- this.snTextBox4.Name = "snTextBox4";
- //
- // snLabel4
- //
- resources.ApplyResources(this.snLabel4, "snLabel4");
- this.snLabel4.Name = "snLabel4";
- //
- // groupBox5
- //
- this.groupBox5.Controls.Add(this.wmStateTextBox5);
- this.groupBox5.Controls.Add(this.wmStateLabel5);
- this.groupBox5.Controls.Add(this.snTextBox5);
- this.groupBox5.Controls.Add(this.snLabel5);
- resources.ApplyResources(this.groupBox5, "groupBox5");
- this.groupBox5.ForeColor = System.Drawing.Color.Black;
- this.groupBox5.Name = "groupBox5";
- this.groupBox5.TabStop = false;
- //
- // wmStateTextBox5
- //
- resources.ApplyResources(this.wmStateTextBox5, "wmStateTextBox5");
- this.wmStateTextBox5.Name = "wmStateTextBox5";
- //
- // wmStateLabel5
- //
- resources.ApplyResources(this.wmStateLabel5, "wmStateLabel5");
- this.wmStateLabel5.Name = "wmStateLabel5";
- //
- // snTextBox5
- //
- resources.ApplyResources(this.snTextBox5, "snTextBox5");
- this.snTextBox5.Name = "snTextBox5";
- //
- // snLabel5
- //
- resources.ApplyResources(this.snLabel5, "snLabel5");
- this.snLabel5.Name = "snLabel5";
- //
- // groupBox6
- //
- this.groupBox6.Controls.Add(this.wmStateTextBox6);
- this.groupBox6.Controls.Add(this.wmStateLabel6);
- this.groupBox6.Controls.Add(this.snTextBox6);
- this.groupBox6.Controls.Add(this.snLabel6);
- resources.ApplyResources(this.groupBox6, "groupBox6");
- this.groupBox6.ForeColor = System.Drawing.Color.Black;
- this.groupBox6.Name = "groupBox6";
- this.groupBox6.TabStop = false;
- //
- // wmStateTextBox6
- //
- resources.ApplyResources(this.wmStateTextBox6, "wmStateTextBox6");
- this.wmStateTextBox6.Name = "wmStateTextBox6";
- //
- // wmStateLabel6
- //
- resources.ApplyResources(this.wmStateLabel6, "wmStateLabel6");
- this.wmStateLabel6.Name = "wmStateLabel6";
- //
- // snTextBox6
- //
- resources.ApplyResources(this.snTextBox6, "snTextBox6");
- this.snTextBox6.Name = "snTextBox6";
- //
- // snLabel6
- //
- resources.ApplyResources(this.snLabel6, "snLabel6");
- this.snLabel6.Name = "snLabel6";
- //
- // WMSNsAndStatesForm
- //
- resources.ApplyResources(this, "$this");
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.BackColor = System.Drawing.Color.DarkGoldenrod;
- this.Controls.Add(this.groupBox6);
- this.Controls.Add(this.groupBox5);
- this.Controls.Add(this.groupBox4);
- this.Controls.Add(this.groupBox3);
- this.Controls.Add(this.groupBox2);
- this.Controls.Add(this.groupBox1);
- this.Controls.Add(this.okButton);
- this.ForeColor = System.Drawing.Color.Black;
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
- this.Name = "WMSNsAndStatesForm";
- this.TopMost = true;
- this.Load += new System.EventHandler(this.CycleBeginningForm_Load);
- this.groupBox1.ResumeLayout(false);
- this.groupBox1.PerformLayout();
- this.groupBox2.ResumeLayout(false);
- this.groupBox2.PerformLayout();
- this.groupBox3.ResumeLayout(false);
- this.groupBox3.PerformLayout();
- this.groupBox4.ResumeLayout(false);
- this.groupBox4.PerformLayout();
- this.groupBox5.ResumeLayout(false);
- this.groupBox5.PerformLayout();
- this.groupBox6.ResumeLayout(false);
- this.groupBox6.PerformLayout();
- this.ResumeLayout(false);
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WMSNsAndStatesForm));
+ this.okButton = new System.Windows.Forms.Button();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.wmStateTextBox1 = new System.Windows.Forms.TextBox();
+ this.wmStateLabel1 = new System.Windows.Forms.Label();
+ this.snTextBox1 = new System.Windows.Forms.TextBox();
+ this.snLabel1 = new System.Windows.Forms.Label();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.wmStateTextBox2 = new System.Windows.Forms.TextBox();
+ this.wmStateLabel2 = new System.Windows.Forms.Label();
+ this.snTextBox2 = new System.Windows.Forms.TextBox();
+ this.snLabel2 = new System.Windows.Forms.Label();
+ this.groupBox3 = new System.Windows.Forms.GroupBox();
+ this.wmStateTextBox3 = new System.Windows.Forms.TextBox();
+ this.wmStateLabel3 = new System.Windows.Forms.Label();
+ this.snTextBox3 = new System.Windows.Forms.TextBox();
+ this.snLabel3 = new System.Windows.Forms.Label();
+ this.groupBox4 = new System.Windows.Forms.GroupBox();
+ this.wmStateTextBox4 = new System.Windows.Forms.TextBox();
+ this.wmStateLabel4 = new System.Windows.Forms.Label();
+ this.snTextBox4 = new System.Windows.Forms.TextBox();
+ this.snLabel4 = new System.Windows.Forms.Label();
+ this.groupBox5 = new System.Windows.Forms.GroupBox();
+ this.wmStateTextBox5 = new System.Windows.Forms.TextBox();
+ this.wmStateLabel5 = new System.Windows.Forms.Label();
+ this.snTextBox5 = new System.Windows.Forms.TextBox();
+ this.snLabel5 = new System.Windows.Forms.Label();
+ this.groupBox6 = new System.Windows.Forms.GroupBox();
+ this.wmStateTextBox6 = new System.Windows.Forms.TextBox();
+ this.wmStateLabel6 = new System.Windows.Forms.Label();
+ this.snTextBox6 = new System.Windows.Forms.TextBox();
+ this.snLabel6 = new System.Windows.Forms.Label();
+ this.groupBox1.SuspendLayout();
+ this.groupBox2.SuspendLayout();
+ this.groupBox3.SuspendLayout();
+ this.groupBox4.SuspendLayout();
+ this.groupBox5.SuspendLayout();
+ this.groupBox6.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // okButton
+ //
+ resources.ApplyResources(this.okButton, "okButton");
+ this.okButton.ForeColor = System.Drawing.Color.Black;
+ this.okButton.Name = "okButton";
+ this.okButton.UseVisualStyleBackColor = true;
+ this.okButton.Click += new System.EventHandler(this.okButton_Click);
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.wmStateTextBox1);
+ this.groupBox1.Controls.Add(this.wmStateLabel1);
+ this.groupBox1.Controls.Add(this.snTextBox1);
+ this.groupBox1.Controls.Add(this.snLabel1);
+ resources.ApplyResources(this.groupBox1, "groupBox1");
+ this.groupBox1.ForeColor = System.Drawing.Color.Black;
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.TabStop = false;
+ //
+ // wmStateTextBox1
+ //
+ resources.ApplyResources(this.wmStateTextBox1, "wmStateTextBox1");
+ this.wmStateTextBox1.Name = "wmStateTextBox1";
+ //
+ // wmStateLabel1
+ //
+ resources.ApplyResources(this.wmStateLabel1, "wmStateLabel1");
+ this.wmStateLabel1.Name = "wmStateLabel1";
+ //
+ // snTextBox1
+ //
+ resources.ApplyResources(this.snTextBox1, "snTextBox1");
+ this.snTextBox1.Name = "snTextBox1";
+ //
+ // snLabel1
+ //
+ resources.ApplyResources(this.snLabel1, "snLabel1");
+ this.snLabel1.Name = "snLabel1";
+ //
+ // groupBox2
+ //
+ this.groupBox2.Controls.Add(this.wmStateTextBox2);
+ this.groupBox2.Controls.Add(this.wmStateLabel2);
+ this.groupBox2.Controls.Add(this.snTextBox2);
+ this.groupBox2.Controls.Add(this.snLabel2);
+ resources.ApplyResources(this.groupBox2, "groupBox2");
+ this.groupBox2.ForeColor = System.Drawing.Color.Black;
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.TabStop = false;
+ //
+ // wmStateTextBox2
+ //
+ resources.ApplyResources(this.wmStateTextBox2, "wmStateTextBox2");
+ this.wmStateTextBox2.Name = "wmStateTextBox2";
+ //
+ // wmStateLabel2
+ //
+ resources.ApplyResources(this.wmStateLabel2, "wmStateLabel2");
+ this.wmStateLabel2.Name = "wmStateLabel2";
+ //
+ // snTextBox2
+ //
+ resources.ApplyResources(this.snTextBox2, "snTextBox2");
+ this.snTextBox2.Name = "snTextBox2";
+ //
+ // snLabel2
+ //
+ resources.ApplyResources(this.snLabel2, "snLabel2");
+ this.snLabel2.Name = "snLabel2";
+ //
+ // groupBox3
+ //
+ this.groupBox3.Controls.Add(this.wmStateTextBox3);
+ this.groupBox3.Controls.Add(this.wmStateLabel3);
+ this.groupBox3.Controls.Add(this.snTextBox3);
+ this.groupBox3.Controls.Add(this.snLabel3);
+ resources.ApplyResources(this.groupBox3, "groupBox3");
+ this.groupBox3.ForeColor = System.Drawing.Color.Black;
+ this.groupBox3.Name = "groupBox3";
+ this.groupBox3.TabStop = false;
+ //
+ // wmStateTextBox3
+ //
+ resources.ApplyResources(this.wmStateTextBox3, "wmStateTextBox3");
+ this.wmStateTextBox3.Name = "wmStateTextBox3";
+ //
+ // wmStateLabel3
+ //
+ resources.ApplyResources(this.wmStateLabel3, "wmStateLabel3");
+ this.wmStateLabel3.Name = "wmStateLabel3";
+ //
+ // snTextBox3
+ //
+ resources.ApplyResources(this.snTextBox3, "snTextBox3");
+ this.snTextBox3.Name = "snTextBox3";
+ //
+ // snLabel3
+ //
+ resources.ApplyResources(this.snLabel3, "snLabel3");
+ this.snLabel3.Name = "snLabel3";
+ //
+ // groupBox4
+ //
+ this.groupBox4.Controls.Add(this.wmStateTextBox4);
+ this.groupBox4.Controls.Add(this.wmStateLabel4);
+ this.groupBox4.Controls.Add(this.snTextBox4);
+ this.groupBox4.Controls.Add(this.snLabel4);
+ resources.ApplyResources(this.groupBox4, "groupBox4");
+ this.groupBox4.ForeColor = System.Drawing.Color.Black;
+ this.groupBox4.Name = "groupBox4";
+ this.groupBox4.TabStop = false;
+ //
+ // wmStateTextBox4
+ //
+ resources.ApplyResources(this.wmStateTextBox4, "wmStateTextBox4");
+ this.wmStateTextBox4.Name = "wmStateTextBox4";
+ //
+ // wmStateLabel4
+ //
+ resources.ApplyResources(this.wmStateLabel4, "wmStateLabel4");
+ this.wmStateLabel4.Name = "wmStateLabel4";
+ //
+ // snTextBox4
+ //
+ resources.ApplyResources(this.snTextBox4, "snTextBox4");
+ this.snTextBox4.Name = "snTextBox4";
+ //
+ // snLabel4
+ //
+ resources.ApplyResources(this.snLabel4, "snLabel4");
+ this.snLabel4.Name = "snLabel4";
+ //
+ // groupBox5
+ //
+ this.groupBox5.Controls.Add(this.wmStateTextBox5);
+ this.groupBox5.Controls.Add(this.wmStateLabel5);
+ this.groupBox5.Controls.Add(this.snTextBox5);
+ this.groupBox5.Controls.Add(this.snLabel5);
+ resources.ApplyResources(this.groupBox5, "groupBox5");
+ this.groupBox5.ForeColor = System.Drawing.Color.Black;
+ this.groupBox5.Name = "groupBox5";
+ this.groupBox5.TabStop = false;
+ //
+ // wmStateTextBox5
+ //
+ resources.ApplyResources(this.wmStateTextBox5, "wmStateTextBox5");
+ this.wmStateTextBox5.Name = "wmStateTextBox5";
+ //
+ // wmStateLabel5
+ //
+ resources.ApplyResources(this.wmStateLabel5, "wmStateLabel5");
+ this.wmStateLabel5.Name = "wmStateLabel5";
+ //
+ // snTextBox5
+ //
+ resources.ApplyResources(this.snTextBox5, "snTextBox5");
+ this.snTextBox5.Name = "snTextBox5";
+ //
+ // snLabel5
+ //
+ resources.ApplyResources(this.snLabel5, "snLabel5");
+ this.snLabel5.Name = "snLabel5";
+ //
+ // groupBox6
+ //
+ this.groupBox6.Controls.Add(this.wmStateTextBox6);
+ this.groupBox6.Controls.Add(this.wmStateLabel6);
+ this.groupBox6.Controls.Add(this.snTextBox6);
+ this.groupBox6.Controls.Add(this.snLabel6);
+ resources.ApplyResources(this.groupBox6, "groupBox6");
+ this.groupBox6.ForeColor = System.Drawing.Color.Black;
+ this.groupBox6.Name = "groupBox6";
+ this.groupBox6.TabStop = false;
+ //
+ // wmStateTextBox6
+ //
+ resources.ApplyResources(this.wmStateTextBox6, "wmStateTextBox6");
+ this.wmStateTextBox6.Name = "wmStateTextBox6";
+ //
+ // wmStateLabel6
+ //
+ resources.ApplyResources(this.wmStateLabel6, "wmStateLabel6");
+ this.wmStateLabel6.Name = "wmStateLabel6";
+ //
+ // snTextBox6
+ //
+ resources.ApplyResources(this.snTextBox6, "snTextBox6");
+ this.snTextBox6.Name = "snTextBox6";
+ //
+ // snLabel6
+ //
+ resources.ApplyResources(this.snLabel6, "snLabel6");
+ this.snLabel6.Name = "snLabel6";
+ //
+ // WMSNsAndStatesForm
+ //
+ resources.ApplyResources(this, "$this");
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.Color.DarkGoldenrod;
+ this.Controls.Add(this.groupBox6);
+ this.Controls.Add(this.groupBox5);
+ this.Controls.Add(this.groupBox4);
+ this.Controls.Add(this.groupBox3);
+ this.Controls.Add(this.groupBox2);
+ this.Controls.Add(this.groupBox1);
+ this.Controls.Add(this.okButton);
+ this.ForeColor = System.Drawing.Color.Black;
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+ this.Name = "WMSNsAndStatesForm";
+ this.TopMost = true;
+ this.Load += new System.EventHandler(this.CycleBeginningForm_Load);
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ this.groupBox2.ResumeLayout(false);
+ this.groupBox2.PerformLayout();
+ this.groupBox3.ResumeLayout(false);
+ this.groupBox3.PerformLayout();
+ this.groupBox4.ResumeLayout(false);
+ this.groupBox4.PerformLayout();
+ this.groupBox5.ResumeLayout(false);
+ this.groupBox5.PerformLayout();
+ this.groupBox6.ResumeLayout(false);
+ this.groupBox6.PerformLayout();
+ this.ResumeLayout(false);
}
diff --git a/TestBenchFramework/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.resx b/TestBenchFramework/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.resx
index 21ef852d3..ad22c6695 100644
--- a/TestBenchFramework/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.resx
+++ b/TestBenchFramework/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.resx
@@ -276,7 +276,7 @@
163, 31
- 5
+ 3
wmStateTextBox2
@@ -304,7 +304,7 @@
68, 23
- 4
+ 2
State:
@@ -403,7 +403,7 @@
163, 31
- 5
+ 3
wmStateTextBox3
@@ -430,7 +430,7 @@
68, 23
- 4
+ 2
State:
@@ -529,7 +529,7 @@
163, 31
- 5
+ 3
wmStateTextBox4
@@ -556,7 +556,7 @@
68, 23
- 4
+ 2
State:
@@ -655,7 +655,7 @@
163, 31
- 5
+ 3
wmStateTextBox5
@@ -682,7 +682,7 @@
68, 23
- 4
+ 2
State:
@@ -781,7 +781,7 @@
163, 31
- 5
+ 3
wmStateTextBox6
@@ -808,7 +808,7 @@
68, 23
- 4
+ 2
State:
@@ -883,7 +883,7 @@
575, 92
- 4
+ 6
Water Meter 6
diff --git a/TestBenchFramework/Utils.cs b/TestBenchFramework/Utils.cs
index d1ff0a870..8155d21bc 100644
--- a/TestBenchFramework/Utils.cs
+++ b/TestBenchFramework/Utils.cs
@@ -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
}