diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.Designer.cs b/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.Designer.cs
new file mode 100644
index 000000000..a7f22c6dc
--- /dev/null
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.Designer.cs
@@ -0,0 +1,770 @@
+///
+/// Copyright (c) 2015 Sensus Metering Systems
+///
+namespace TBF.BenchControl.DataEntry.Standard24
+{
+ partial class CycleBeginningForm
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CycleBeginningForm));
+ this.okButton = new System.Windows.Forms.Button();
+ this.orderGroupBox = new System.Windows.Forms.GroupBox();
+ this.orderComboBox = new System.Windows.Forms.ComboBox();
+ this.clearButton = new System.Windows.Forms.Button();
+ this.label1 = new System.Windows.Forms.Label();
+ this.comboBox1 = new System.Windows.Forms.ComboBox();
+ this.checkBox1 = new System.Windows.Forms.CheckBox();
+ this.checkBox2 = new System.Windows.Forms.CheckBox();
+ this.comboBox2 = new System.Windows.Forms.ComboBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.checkBox3 = new System.Windows.Forms.CheckBox();
+ this.comboBox3 = new System.Windows.Forms.ComboBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.checkBox4 = new System.Windows.Forms.CheckBox();
+ this.comboBox4 = new System.Windows.Forms.ComboBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.checkBox5 = new System.Windows.Forms.CheckBox();
+ this.comboBox5 = new System.Windows.Forms.ComboBox();
+ this.label5 = new System.Windows.Forms.Label();
+ this.checkBox6 = new System.Windows.Forms.CheckBox();
+ this.comboBox6 = new System.Windows.Forms.ComboBox();
+ this.label6 = new System.Windows.Forms.Label();
+ this.checkBox7 = new System.Windows.Forms.CheckBox();
+ this.comboBox7 = new System.Windows.Forms.ComboBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this.checkBox8 = new System.Windows.Forms.CheckBox();
+ this.comboBox8 = new System.Windows.Forms.ComboBox();
+ this.label8 = new System.Windows.Forms.Label();
+ this.checkBox9 = new System.Windows.Forms.CheckBox();
+ this.comboBox9 = new System.Windows.Forms.ComboBox();
+ this.label9 = new System.Windows.Forms.Label();
+ this.checkBox10 = new System.Windows.Forms.CheckBox();
+ this.comboBox10 = new System.Windows.Forms.ComboBox();
+ this.label10 = new System.Windows.Forms.Label();
+ this.checkBox11 = new System.Windows.Forms.CheckBox();
+ this.comboBox11 = new System.Windows.Forms.ComboBox();
+ this.label11 = new System.Windows.Forms.Label();
+ this.checkBox12 = new System.Windows.Forms.CheckBox();
+ this.comboBox12 = new System.Windows.Forms.ComboBox();
+ this.label12 = new System.Windows.Forms.Label();
+ this.checkBox13 = new System.Windows.Forms.CheckBox();
+ this.comboBox13 = new System.Windows.Forms.ComboBox();
+ this.label13 = new System.Windows.Forms.Label();
+ this.checkBox14 = new System.Windows.Forms.CheckBox();
+ this.comboBox14 = new System.Windows.Forms.ComboBox();
+ this.label14 = new System.Windows.Forms.Label();
+ this.checkBox15 = new System.Windows.Forms.CheckBox();
+ this.comboBox15 = new System.Windows.Forms.ComboBox();
+ this.label15 = new System.Windows.Forms.Label();
+ this.checkBox16 = new System.Windows.Forms.CheckBox();
+ this.comboBox16 = new System.Windows.Forms.ComboBox();
+ this.label16 = new System.Windows.Forms.Label();
+ this.checkBox17 = new System.Windows.Forms.CheckBox();
+ this.comboBox17 = new System.Windows.Forms.ComboBox();
+ this.label17 = new System.Windows.Forms.Label();
+ this.checkBox18 = new System.Windows.Forms.CheckBox();
+ this.comboBox18 = new System.Windows.Forms.ComboBox();
+ this.label18 = new System.Windows.Forms.Label();
+ this.checkBox19 = new System.Windows.Forms.CheckBox();
+ this.comboBox19 = new System.Windows.Forms.ComboBox();
+ this.label19 = new System.Windows.Forms.Label();
+ this.checkBox20 = new System.Windows.Forms.CheckBox();
+ this.comboBox20 = new System.Windows.Forms.ComboBox();
+ this.label20 = new System.Windows.Forms.Label();
+ this.checkBox21 = new System.Windows.Forms.CheckBox();
+ this.comboBox21 = new System.Windows.Forms.ComboBox();
+ this.label21 = new System.Windows.Forms.Label();
+ this.checkBox22 = new System.Windows.Forms.CheckBox();
+ this.comboBox22 = new System.Windows.Forms.ComboBox();
+ this.label22 = new System.Windows.Forms.Label();
+ this.checkBox23 = new System.Windows.Forms.CheckBox();
+ this.comboBox23 = new System.Windows.Forms.ComboBox();
+ this.label23 = new System.Windows.Forms.Label();
+ this.checkBox24 = new System.Windows.Forms.CheckBox();
+ this.comboBox24 = new System.Windows.Forms.ComboBox();
+ this.label24 = new System.Windows.Forms.Label();
+ this.orderGroupBox.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);
+ //
+ // orderGroupBox
+ //
+ this.orderGroupBox.Controls.Add(this.orderComboBox);
+ resources.ApplyResources(this.orderGroupBox, "orderGroupBox");
+ this.orderGroupBox.ForeColor = System.Drawing.Color.Black;
+ this.orderGroupBox.Name = "orderGroupBox";
+ this.orderGroupBox.TabStop = false;
+ //
+ // orderComboBox
+ //
+ this.orderComboBox.FormattingEnabled = true;
+ resources.ApplyResources(this.orderComboBox, "orderComboBox");
+ this.orderComboBox.Name = "orderComboBox";
+ //
+ // clearButton
+ //
+ resources.ApplyResources(this.clearButton, "clearButton");
+ this.clearButton.ForeColor = System.Drawing.Color.Black;
+ this.clearButton.Name = "clearButton";
+ this.clearButton.UseVisualStyleBackColor = true;
+ this.clearButton.Click += new System.EventHandler(this.clearButton_Click);
+ //
+ // label1
+ //
+ resources.ApplyResources(this.label1, "label1");
+ this.label1.Name = "label1";
+ //
+ // comboBox1
+ //
+ resources.ApplyResources(this.comboBox1, "comboBox1");
+ this.comboBox1.FormattingEnabled = true;
+ this.comboBox1.Name = "comboBox1";
+ this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
+ this.comboBox1.TextChanged += new System.EventHandler(this.comboBox1_TextChanged);
+ //
+ // checkBox1
+ //
+ resources.ApplyResources(this.checkBox1, "checkBox1");
+ this.checkBox1.Name = "checkBox1";
+ this.checkBox1.UseVisualStyleBackColor = true;
+ //
+ // checkBox2
+ //
+ resources.ApplyResources(this.checkBox2, "checkBox2");
+ this.checkBox2.Name = "checkBox2";
+ this.checkBox2.UseVisualStyleBackColor = true;
+ //
+ // comboBox2
+ //
+ resources.ApplyResources(this.comboBox2, "comboBox2");
+ this.comboBox2.FormattingEnabled = true;
+ this.comboBox2.Name = "comboBox2";
+ this.comboBox2.SelectedIndexChanged += new System.EventHandler(this.comboBox2_SelectedIndexChanged);
+ this.comboBox2.TextChanged += new System.EventHandler(this.comboBox2_TextChanged);
+ //
+ // label2
+ //
+ resources.ApplyResources(this.label2, "label2");
+ this.label2.Name = "label2";
+ //
+ // checkBox3
+ //
+ resources.ApplyResources(this.checkBox3, "checkBox3");
+ this.checkBox3.Name = "checkBox3";
+ this.checkBox3.UseVisualStyleBackColor = true;
+ //
+ // comboBox3
+ //
+ resources.ApplyResources(this.comboBox3, "comboBox3");
+ this.comboBox3.FormattingEnabled = true;
+ this.comboBox3.Name = "comboBox3";
+ this.comboBox3.SelectedIndexChanged += new System.EventHandler(this.comboBox3_SelectedIndexChanged);
+ this.comboBox3.TextChanged += new System.EventHandler(this.comboBox3_TextChanged);
+ //
+ // label3
+ //
+ resources.ApplyResources(this.label3, "label3");
+ this.label3.Name = "label3";
+ //
+ // checkBox4
+ //
+ resources.ApplyResources(this.checkBox4, "checkBox4");
+ this.checkBox4.Name = "checkBox4";
+ this.checkBox4.UseVisualStyleBackColor = true;
+ //
+ // comboBox4
+ //
+ resources.ApplyResources(this.comboBox4, "comboBox4");
+ this.comboBox4.FormattingEnabled = true;
+ this.comboBox4.Name = "comboBox4";
+ this.comboBox4.SelectedIndexChanged += new System.EventHandler(this.comboBox4_SelectedIndexChanged);
+ this.comboBox4.TextChanged += new System.EventHandler(this.comboBox4_TextChanged);
+ //
+ // label4
+ //
+ resources.ApplyResources(this.label4, "label4");
+ this.label4.Name = "label4";
+ //
+ // checkBox5
+ //
+ resources.ApplyResources(this.checkBox5, "checkBox5");
+ this.checkBox5.Name = "checkBox5";
+ this.checkBox5.UseVisualStyleBackColor = true;
+ //
+ // comboBox5
+ //
+ resources.ApplyResources(this.comboBox5, "comboBox5");
+ this.comboBox5.FormattingEnabled = true;
+ this.comboBox5.Name = "comboBox5";
+ this.comboBox5.SelectedIndexChanged += new System.EventHandler(this.comboBox5_SelectedIndexChanged);
+ this.comboBox5.TextChanged += new System.EventHandler(this.comboBox5_TextChanged);
+ //
+ // label5
+ //
+ resources.ApplyResources(this.label5, "label5");
+ this.label5.Name = "label5";
+ //
+ // checkBox6
+ //
+ resources.ApplyResources(this.checkBox6, "checkBox6");
+ this.checkBox6.Name = "checkBox6";
+ this.checkBox6.UseVisualStyleBackColor = true;
+ //
+ // comboBox6
+ //
+ resources.ApplyResources(this.comboBox6, "comboBox6");
+ this.comboBox6.FormattingEnabled = true;
+ this.comboBox6.Name = "comboBox6";
+ this.comboBox6.SelectedIndexChanged += new System.EventHandler(this.comboBox6_SelectedIndexChanged);
+ this.comboBox6.TextChanged += new System.EventHandler(this.comboBox6_TextChanged);
+ //
+ // label6
+ //
+ resources.ApplyResources(this.label6, "label6");
+ this.label6.Name = "label6";
+ //
+ // checkBox7
+ //
+ resources.ApplyResources(this.checkBox7, "checkBox7");
+ this.checkBox7.Name = "checkBox7";
+ this.checkBox7.UseVisualStyleBackColor = true;
+ //
+ // comboBox7
+ //
+ resources.ApplyResources(this.comboBox7, "comboBox7");
+ this.comboBox7.FormattingEnabled = true;
+ this.comboBox7.Name = "comboBox7";
+ this.comboBox7.SelectedIndexChanged += new System.EventHandler(this.comboBox7_SelectedIndexChanged);
+ this.comboBox7.TextChanged += new System.EventHandler(this.comboBox7_TextChanged);
+ //
+ // label7
+ //
+ resources.ApplyResources(this.label7, "label7");
+ this.label7.Name = "label7";
+ //
+ // checkBox8
+ //
+ resources.ApplyResources(this.checkBox8, "checkBox8");
+ this.checkBox8.Name = "checkBox8";
+ this.checkBox8.UseVisualStyleBackColor = true;
+ //
+ // comboBox8
+ //
+ resources.ApplyResources(this.comboBox8, "comboBox8");
+ this.comboBox8.FormattingEnabled = true;
+ this.comboBox8.Name = "comboBox8";
+ this.comboBox8.SelectedIndexChanged += new System.EventHandler(this.comboBox8_SelectedIndexChanged);
+ this.comboBox8.TextChanged += new System.EventHandler(this.comboBox8_TextChanged);
+ //
+ // label8
+ //
+ resources.ApplyResources(this.label8, "label8");
+ this.label8.Name = "label8";
+ //
+ // checkBox9
+ //
+ resources.ApplyResources(this.checkBox9, "checkBox9");
+ this.checkBox9.Name = "checkBox9";
+ this.checkBox9.UseVisualStyleBackColor = true;
+ //
+ // comboBox9
+ //
+ resources.ApplyResources(this.comboBox9, "comboBox9");
+ this.comboBox9.FormattingEnabled = true;
+ this.comboBox9.Name = "comboBox9";
+ this.comboBox9.SelectedIndexChanged += new System.EventHandler(this.comboBox9_SelectedIndexChanged);
+ this.comboBox9.TextChanged += new System.EventHandler(this.comboBox9_TextChanged);
+ //
+ // label9
+ //
+ resources.ApplyResources(this.label9, "label9");
+ this.label9.Name = "label9";
+ //
+ // checkBox10
+ //
+ resources.ApplyResources(this.checkBox10, "checkBox10");
+ this.checkBox10.Name = "checkBox10";
+ this.checkBox10.UseVisualStyleBackColor = true;
+ //
+ // comboBox10
+ //
+ resources.ApplyResources(this.comboBox10, "comboBox10");
+ this.comboBox10.FormattingEnabled = true;
+ this.comboBox10.Name = "comboBox10";
+ this.comboBox10.SelectedIndexChanged += new System.EventHandler(this.comboBox10_SelectedIndexChanged);
+ this.comboBox10.TextChanged += new System.EventHandler(this.comboBox10_TextChanged);
+ //
+ // label10
+ //
+ resources.ApplyResources(this.label10, "label10");
+ this.label10.Name = "label10";
+ //
+ // checkBox11
+ //
+ resources.ApplyResources(this.checkBox11, "checkBox11");
+ this.checkBox11.Name = "checkBox11";
+ this.checkBox11.UseVisualStyleBackColor = true;
+ //
+ // comboBox11
+ //
+ resources.ApplyResources(this.comboBox11, "comboBox11");
+ this.comboBox11.FormattingEnabled = true;
+ this.comboBox11.Name = "comboBox11";
+ this.comboBox11.SelectedIndexChanged += new System.EventHandler(this.comboBox11_SelectedIndexChanged);
+ this.comboBox11.TextChanged += new System.EventHandler(this.comboBox11_TextChanged);
+ //
+ // label11
+ //
+ resources.ApplyResources(this.label11, "label11");
+ this.label11.Name = "label11";
+ //
+ // checkBox12
+ //
+ resources.ApplyResources(this.checkBox12, "checkBox12");
+ this.checkBox12.Name = "checkBox12";
+ this.checkBox12.UseVisualStyleBackColor = true;
+ //
+ // comboBox12
+ //
+ resources.ApplyResources(this.comboBox12, "comboBox12");
+ this.comboBox12.FormattingEnabled = true;
+ this.comboBox12.Name = "comboBox12";
+ this.comboBox12.SelectedIndexChanged += new System.EventHandler(this.comboBox12_SelectedIndexChanged);
+ this.comboBox12.TextChanged += new System.EventHandler(this.comboBox12_TextChanged);
+ //
+ // label12
+ //
+ resources.ApplyResources(this.label12, "label12");
+ this.label12.Name = "label12";
+ //
+ // checkBox13
+ //
+ resources.ApplyResources(this.checkBox13, "checkBox13");
+ this.checkBox13.Name = "checkBox13";
+ this.checkBox13.UseVisualStyleBackColor = true;
+ //
+ // comboBox13
+ //
+ resources.ApplyResources(this.comboBox13, "comboBox13");
+ this.comboBox13.FormattingEnabled = true;
+ this.comboBox13.Name = "comboBox13";
+ this.comboBox13.SelectedIndexChanged += new System.EventHandler(this.comboBox13_SelectedIndexChanged);
+ this.comboBox13.TextChanged += new System.EventHandler(this.comboBox13_TextChanged);
+ //
+ // label13
+ //
+ resources.ApplyResources(this.label13, "label13");
+ this.label13.Name = "label13";
+ //
+ // checkBox14
+ //
+ resources.ApplyResources(this.checkBox14, "checkBox14");
+ this.checkBox14.Name = "checkBox14";
+ this.checkBox14.UseVisualStyleBackColor = true;
+ //
+ // comboBox14
+ //
+ resources.ApplyResources(this.comboBox14, "comboBox14");
+ this.comboBox14.FormattingEnabled = true;
+ this.comboBox14.Name = "comboBox14";
+ this.comboBox14.SelectedIndexChanged += new System.EventHandler(this.comboBox14_SelectedIndexChanged);
+ this.comboBox14.TextChanged += new System.EventHandler(this.comboBox14_TextChanged);
+ //
+ // label14
+ //
+ resources.ApplyResources(this.label14, "label14");
+ this.label14.Name = "label14";
+ //
+ // checkBox15
+ //
+ resources.ApplyResources(this.checkBox15, "checkBox15");
+ this.checkBox15.Name = "checkBox15";
+ this.checkBox15.UseVisualStyleBackColor = true;
+ //
+ // comboBox15
+ //
+ resources.ApplyResources(this.comboBox15, "comboBox15");
+ this.comboBox15.FormattingEnabled = true;
+ this.comboBox15.Name = "comboBox15";
+ this.comboBox15.SelectedIndexChanged += new System.EventHandler(this.comboBox15_SelectedIndexChanged);
+ this.comboBox15.TextChanged += new System.EventHandler(this.comboBox15_TextChanged);
+ //
+ // label15
+ //
+ resources.ApplyResources(this.label15, "label15");
+ this.label15.Name = "label15";
+ //
+ // checkBox16
+ //
+ resources.ApplyResources(this.checkBox16, "checkBox16");
+ this.checkBox16.Name = "checkBox16";
+ this.checkBox16.UseVisualStyleBackColor = true;
+ //
+ // comboBox16
+ //
+ resources.ApplyResources(this.comboBox16, "comboBox16");
+ this.comboBox16.FormattingEnabled = true;
+ this.comboBox16.Name = "comboBox16";
+ this.comboBox16.SelectedIndexChanged += new System.EventHandler(this.comboBox16_SelectedIndexChanged);
+ this.comboBox16.TextChanged += new System.EventHandler(this.comboBox16_TextChanged);
+ //
+ // label16
+ //
+ resources.ApplyResources(this.label16, "label16");
+ this.label16.Name = "label16";
+ //
+ // checkBox17
+ //
+ resources.ApplyResources(this.checkBox17, "checkBox17");
+ this.checkBox17.Name = "checkBox17";
+ this.checkBox17.UseVisualStyleBackColor = true;
+ //
+ // comboBox17
+ //
+ resources.ApplyResources(this.comboBox17, "comboBox17");
+ this.comboBox17.FormattingEnabled = true;
+ this.comboBox17.Name = "comboBox17";
+ this.comboBox17.SelectedIndexChanged += new System.EventHandler(this.comboBox17_SelectedIndexChanged);
+ this.comboBox17.TextChanged += new System.EventHandler(this.comboBox17_TextChanged);
+ //
+ // label17
+ //
+ resources.ApplyResources(this.label17, "label17");
+ this.label17.Name = "label17";
+ //
+ // checkBox18
+ //
+ resources.ApplyResources(this.checkBox18, "checkBox18");
+ this.checkBox18.Name = "checkBox18";
+ this.checkBox18.UseVisualStyleBackColor = true;
+ //
+ // comboBox18
+ //
+ resources.ApplyResources(this.comboBox18, "comboBox18");
+ this.comboBox18.FormattingEnabled = true;
+ this.comboBox18.Name = "comboBox18";
+ this.comboBox18.SelectedIndexChanged += new System.EventHandler(this.comboBox18_SelectedIndexChanged);
+ this.comboBox18.TextChanged += new System.EventHandler(this.comboBox18_TextChanged);
+ //
+ // label18
+ //
+ resources.ApplyResources(this.label18, "label18");
+ this.label18.Name = "label18";
+ //
+ // checkBox19
+ //
+ resources.ApplyResources(this.checkBox19, "checkBox19");
+ this.checkBox19.Name = "checkBox19";
+ this.checkBox19.UseVisualStyleBackColor = true;
+ //
+ // comboBox19
+ //
+ resources.ApplyResources(this.comboBox19, "comboBox19");
+ this.comboBox19.FormattingEnabled = true;
+ this.comboBox19.Name = "comboBox19";
+ this.comboBox19.SelectedIndexChanged += new System.EventHandler(this.comboBox19_SelectedIndexChanged);
+ this.comboBox19.TextChanged += new System.EventHandler(this.comboBox19_TextChanged);
+ //
+ // label19
+ //
+ resources.ApplyResources(this.label19, "label19");
+ this.label19.Name = "label19";
+ //
+ // checkBox20
+ //
+ resources.ApplyResources(this.checkBox20, "checkBox20");
+ this.checkBox20.Name = "checkBox20";
+ this.checkBox20.UseVisualStyleBackColor = true;
+ //
+ // comboBox20
+ //
+ resources.ApplyResources(this.comboBox20, "comboBox20");
+ this.comboBox20.FormattingEnabled = true;
+ this.comboBox20.Name = "comboBox20";
+ this.comboBox20.SelectedIndexChanged += new System.EventHandler(this.comboBox20_SelectedIndexChanged);
+ this.comboBox20.TextChanged += new System.EventHandler(this.comboBox20_TextChanged);
+ //
+ // label20
+ //
+ resources.ApplyResources(this.label20, "label20");
+ this.label20.Name = "label20";
+ //
+ // checkBox21
+ //
+ resources.ApplyResources(this.checkBox21, "checkBox21");
+ this.checkBox21.Name = "checkBox21";
+ this.checkBox21.UseVisualStyleBackColor = true;
+ //
+ // comboBox21
+ //
+ resources.ApplyResources(this.comboBox21, "comboBox21");
+ this.comboBox21.FormattingEnabled = true;
+ this.comboBox21.Name = "comboBox21";
+ this.comboBox21.SelectedIndexChanged += new System.EventHandler(this.comboBox21_SelectedIndexChanged);
+ this.comboBox21.TextChanged += new System.EventHandler(this.comboBox21_TextChanged);
+ //
+ // label21
+ //
+ resources.ApplyResources(this.label21, "label21");
+ this.label21.Name = "label21";
+ //
+ // checkBox22
+ //
+ resources.ApplyResources(this.checkBox22, "checkBox22");
+ this.checkBox22.Name = "checkBox22";
+ this.checkBox22.UseVisualStyleBackColor = true;
+ //
+ // comboBox22
+ //
+ resources.ApplyResources(this.comboBox22, "comboBox22");
+ this.comboBox22.FormattingEnabled = true;
+ this.comboBox22.Name = "comboBox22";
+ this.comboBox22.SelectedIndexChanged += new System.EventHandler(this.comboBox22_SelectedIndexChanged);
+ this.comboBox22.TextChanged += new System.EventHandler(this.comboBox22_TextChanged);
+ //
+ // label22
+ //
+ resources.ApplyResources(this.label22, "label22");
+ this.label22.Name = "label22";
+ //
+ // checkBox23
+ //
+ resources.ApplyResources(this.checkBox23, "checkBox23");
+ this.checkBox23.Name = "checkBox23";
+ this.checkBox23.UseVisualStyleBackColor = true;
+ //
+ // comboBox23
+ //
+ resources.ApplyResources(this.comboBox23, "comboBox23");
+ this.comboBox23.FormattingEnabled = true;
+ this.comboBox23.Name = "comboBox23";
+ this.comboBox23.SelectedIndexChanged += new System.EventHandler(this.comboBox23_SelectedIndexChanged);
+ this.comboBox23.TextChanged += new System.EventHandler(this.comboBox23_TextChanged);
+ //
+ // label23
+ //
+ resources.ApplyResources(this.label23, "label23");
+ this.label23.Name = "label23";
+ //
+ // checkBox24
+ //
+ resources.ApplyResources(this.checkBox24, "checkBox24");
+ this.checkBox24.Name = "checkBox24";
+ this.checkBox24.UseVisualStyleBackColor = true;
+ //
+ // comboBox24
+ //
+ resources.ApplyResources(this.comboBox24, "comboBox24");
+ this.comboBox24.FormattingEnabled = true;
+ this.comboBox24.Name = "comboBox24";
+ this.comboBox24.SelectedIndexChanged += new System.EventHandler(this.comboBox24_SelectedIndexChanged);
+ this.comboBox24.TextChanged += new System.EventHandler(this.comboBox24_TextChanged);
+ //
+ // label24
+ //
+ resources.ApplyResources(this.label24, "label24");
+ this.label24.Name = "label24";
+ //
+ // CycleBeginningForm
+ //
+ resources.ApplyResources(this, "$this");
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.Color.DarkGoldenrod;
+ this.Controls.Add(this.checkBox24);
+ this.Controls.Add(this.comboBox24);
+ this.Controls.Add(this.label24);
+ this.Controls.Add(this.checkBox23);
+ this.Controls.Add(this.comboBox23);
+ this.Controls.Add(this.label23);
+ this.Controls.Add(this.checkBox22);
+ this.Controls.Add(this.comboBox22);
+ this.Controls.Add(this.label22);
+ this.Controls.Add(this.checkBox21);
+ this.Controls.Add(this.comboBox21);
+ this.Controls.Add(this.label21);
+ this.Controls.Add(this.checkBox20);
+ this.Controls.Add(this.comboBox20);
+ this.Controls.Add(this.label20);
+ this.Controls.Add(this.checkBox19);
+ this.Controls.Add(this.comboBox19);
+ this.Controls.Add(this.label19);
+ this.Controls.Add(this.checkBox18);
+ this.Controls.Add(this.comboBox18);
+ this.Controls.Add(this.label18);
+ this.Controls.Add(this.checkBox17);
+ this.Controls.Add(this.comboBox17);
+ this.Controls.Add(this.label17);
+ this.Controls.Add(this.checkBox16);
+ this.Controls.Add(this.comboBox16);
+ this.Controls.Add(this.label16);
+ this.Controls.Add(this.checkBox15);
+ this.Controls.Add(this.comboBox15);
+ this.Controls.Add(this.label15);
+ this.Controls.Add(this.checkBox14);
+ this.Controls.Add(this.comboBox14);
+ this.Controls.Add(this.label14);
+ this.Controls.Add(this.checkBox13);
+ this.Controls.Add(this.comboBox13);
+ this.Controls.Add(this.label13);
+ this.Controls.Add(this.checkBox12);
+ this.Controls.Add(this.comboBox12);
+ this.Controls.Add(this.label12);
+ this.Controls.Add(this.checkBox11);
+ this.Controls.Add(this.comboBox11);
+ this.Controls.Add(this.label11);
+ this.Controls.Add(this.checkBox10);
+ this.Controls.Add(this.comboBox10);
+ this.Controls.Add(this.label10);
+ this.Controls.Add(this.checkBox9);
+ this.Controls.Add(this.comboBox9);
+ this.Controls.Add(this.label9);
+ this.Controls.Add(this.checkBox8);
+ this.Controls.Add(this.comboBox8);
+ this.Controls.Add(this.label8);
+ this.Controls.Add(this.checkBox7);
+ this.Controls.Add(this.comboBox7);
+ this.Controls.Add(this.label7);
+ this.Controls.Add(this.checkBox6);
+ this.Controls.Add(this.comboBox6);
+ this.Controls.Add(this.label6);
+ this.Controls.Add(this.checkBox5);
+ this.Controls.Add(this.comboBox5);
+ this.Controls.Add(this.label5);
+ this.Controls.Add(this.checkBox4);
+ this.Controls.Add(this.comboBox4);
+ this.Controls.Add(this.label4);
+ this.Controls.Add(this.checkBox3);
+ this.Controls.Add(this.comboBox3);
+ this.Controls.Add(this.label3);
+ this.Controls.Add(this.checkBox2);
+ this.Controls.Add(this.comboBox2);
+ this.Controls.Add(this.label2);
+ this.Controls.Add(this.checkBox1);
+ this.Controls.Add(this.comboBox1);
+ this.Controls.Add(this.label1);
+ this.Controls.Add(this.clearButton);
+ this.Controls.Add(this.orderGroupBox);
+ 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.orderGroupBox.ResumeLayout(false);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Button okButton;
+ private System.Windows.Forms.GroupBox orderGroupBox;
+ private System.Windows.Forms.ComboBox orderComboBox;
+ private System.Windows.Forms.Button clearButton;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.ComboBox comboBox1;
+ private System.Windows.Forms.CheckBox checkBox1;
+ private System.Windows.Forms.CheckBox checkBox2;
+ private System.Windows.Forms.ComboBox comboBox2;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.CheckBox checkBox3;
+ private System.Windows.Forms.ComboBox comboBox3;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.CheckBox checkBox4;
+ private System.Windows.Forms.ComboBox comboBox4;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.CheckBox checkBox5;
+ private System.Windows.Forms.ComboBox comboBox5;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.CheckBox checkBox6;
+ private System.Windows.Forms.ComboBox comboBox6;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.CheckBox checkBox7;
+ private System.Windows.Forms.ComboBox comboBox7;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.CheckBox checkBox8;
+ private System.Windows.Forms.ComboBox comboBox8;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.CheckBox checkBox9;
+ private System.Windows.Forms.ComboBox comboBox9;
+ private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.CheckBox checkBox10;
+ private System.Windows.Forms.ComboBox comboBox10;
+ private System.Windows.Forms.Label label10;
+ private System.Windows.Forms.CheckBox checkBox11;
+ private System.Windows.Forms.ComboBox comboBox11;
+ private System.Windows.Forms.Label label11;
+ private System.Windows.Forms.CheckBox checkBox12;
+ private System.Windows.Forms.ComboBox comboBox12;
+ private System.Windows.Forms.Label label12;
+ private System.Windows.Forms.CheckBox checkBox13;
+ private System.Windows.Forms.ComboBox comboBox13;
+ private System.Windows.Forms.Label label13;
+ private System.Windows.Forms.CheckBox checkBox14;
+ private System.Windows.Forms.ComboBox comboBox14;
+ private System.Windows.Forms.Label label14;
+ private System.Windows.Forms.CheckBox checkBox15;
+ private System.Windows.Forms.ComboBox comboBox15;
+ private System.Windows.Forms.Label label15;
+ private System.Windows.Forms.CheckBox checkBox16;
+ private System.Windows.Forms.ComboBox comboBox16;
+ private System.Windows.Forms.Label label16;
+ private System.Windows.Forms.CheckBox checkBox17;
+ private System.Windows.Forms.ComboBox comboBox17;
+ private System.Windows.Forms.Label label17;
+ private System.Windows.Forms.CheckBox checkBox18;
+ private System.Windows.Forms.ComboBox comboBox18;
+ private System.Windows.Forms.Label label18;
+ private System.Windows.Forms.CheckBox checkBox19;
+ private System.Windows.Forms.ComboBox comboBox19;
+ private System.Windows.Forms.Label label19;
+ private System.Windows.Forms.CheckBox checkBox20;
+ private System.Windows.Forms.ComboBox comboBox20;
+ private System.Windows.Forms.Label label20;
+ private System.Windows.Forms.CheckBox checkBox21;
+ private System.Windows.Forms.ComboBox comboBox21;
+ private System.Windows.Forms.Label label21;
+ private System.Windows.Forms.CheckBox checkBox22;
+ private System.Windows.Forms.ComboBox comboBox22;
+ private System.Windows.Forms.Label label22;
+ private System.Windows.Forms.CheckBox checkBox23;
+ private System.Windows.Forms.ComboBox comboBox23;
+ private System.Windows.Forms.Label label23;
+ private System.Windows.Forms.CheckBox checkBox24;
+ private System.Windows.Forms.ComboBox comboBox24;
+ private System.Windows.Forms.Label label24;
+ }
+}
\ No newline at end of file
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.cs
new file mode 100644
index 000000000..52916cf5b
--- /dev/null
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.cs
@@ -0,0 +1,588 @@
+///
+/// Copyright (c) 2015 Sensus Metering Systems
+///
+using System;
+using System.Windows.Forms;
+using log4net;
+using TBF.Resources;
+
+namespace TBF.BenchControl.DataEntry.Standard24
+{
+ public partial class CycleBeginningForm : Form, GenericDevices.IHasCompleted
+ {
+ private static readonly ILog log = LogManager.GetLogger(typeof(CycleBeginningForm));
+
+ /// Number of text boxes for serial numbers
+ public readonly int WaterMetersCount;
+
+ /// To be retrieved after the form is closed
+ public string PurchaseOrder;
+ public string[] SNText;
+ public bool[] Disabled;
+
+ /// Set to 'true' when the form closes
+ public bool Completed { get { return completed; } }
+ bool completed;
+
+ ///
+ /// Constructor
+ ///
+ /// Number of text boxes for serial numbers
+ public CycleBeginningForm(int waterMetersCount)
+ {
+ this.WaterMetersCount = waterMetersCount;
+ InitializeComponent();
+ SNText = new string[WaterMetersCount];
+ Disabled = new bool[WaterMetersCount];
+ completed = false;
+ StartForceCloseHandler();
+
+ //Height = 147 + WaterMetersCount * 90;
+ }
+
+ /// Parameterless constructor for all watermeters
+ public CycleBeginningForm()
+ : this(Program.WMsCount)
+ {
+ }
+
+ private void CycleBeginningForm_Load(object sender, EventArgs e)
+ {
+ Localize();
+
+ PrepareOrderCombo(orderComboBox);
+
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (WaterMetersCount >= 1) comboBox1.Items.Add(Program.LocalSettings.LastSNTexts[0]);
+ if (WaterMetersCount >= 2) comboBox2.Items.Add(Program.LocalSettings.LastSNTexts[1]);
+ if (WaterMetersCount >= 3) comboBox3.Items.Add(Program.LocalSettings.LastSNTexts[2]);
+ if (WaterMetersCount >= 4) comboBox4.Items.Add(Program.LocalSettings.LastSNTexts[3]);
+ if (WaterMetersCount >= 5) comboBox5.Items.Add(Program.LocalSettings.LastSNTexts[4]);
+ if (WaterMetersCount >= 6) comboBox6.Items.Add(Program.LocalSettings.LastSNTexts[5]);
+ if (WaterMetersCount >= 7) comboBox3.Items.Add(Program.LocalSettings.LastSNTexts[6]);
+ if (WaterMetersCount >= 8) comboBox4.Items.Add(Program.LocalSettings.LastSNTexts[7]);
+ if (WaterMetersCount >= 9) comboBox5.Items.Add(Program.LocalSettings.LastSNTexts[8]);
+ if (WaterMetersCount >= 10) comboBox6.Items.Add(Program.LocalSettings.LastSNTexts[9]);
+ if (WaterMetersCount >= 11) comboBox1.Items.Add(Program.LocalSettings.LastSNTexts[10]);
+ if (WaterMetersCount >= 12) comboBox2.Items.Add(Program.LocalSettings.LastSNTexts[11]);
+ if (WaterMetersCount >= 13) comboBox3.Items.Add(Program.LocalSettings.LastSNTexts[12]);
+ if (WaterMetersCount >= 14) comboBox4.Items.Add(Program.LocalSettings.LastSNTexts[13]);
+ if (WaterMetersCount >= 15) comboBox5.Items.Add(Program.LocalSettings.LastSNTexts[14]);
+ if (WaterMetersCount >= 16) comboBox6.Items.Add(Program.LocalSettings.LastSNTexts[15]);
+ if (WaterMetersCount >= 17) comboBox3.Items.Add(Program.LocalSettings.LastSNTexts[16]);
+ if (WaterMetersCount >= 18) comboBox4.Items.Add(Program.LocalSettings.LastSNTexts[17]);
+ if (WaterMetersCount >= 19) comboBox5.Items.Add(Program.LocalSettings.LastSNTexts[18]);
+ if (WaterMetersCount >= 20) comboBox6.Items.Add(Program.LocalSettings.LastSNTexts[19]);
+ if (WaterMetersCount >= 21) comboBox1.Items.Add(Program.LocalSettings.LastSNTexts[20]);
+ if (WaterMetersCount >= 22) comboBox2.Items.Add(Program.LocalSettings.LastSNTexts[21]);
+ if (WaterMetersCount >= 23) comboBox3.Items.Add(Program.LocalSettings.LastSNTexts[22]);
+ if (WaterMetersCount >= 24) comboBox4.Items.Add(Program.LocalSettings.LastSNTexts[23]);
+ }
+
+ if (WaterMetersCount < 1) { label1.Visible = comboBox1.Visible = checkBox1.Visible = false; }
+ if (WaterMetersCount < 2) { label2.Visible = comboBox2.Visible = checkBox2.Visible = false; }
+ if (WaterMetersCount < 3) { label3.Visible = comboBox3.Visible = checkBox3.Visible = false; }
+ if (WaterMetersCount < 4) { label4.Visible = comboBox4.Visible = checkBox4.Visible = false; }
+ if (WaterMetersCount < 5) { label5.Visible = comboBox5.Visible = checkBox5.Visible = false; }
+ if (WaterMetersCount < 6) { label6.Visible = comboBox6.Visible = checkBox6.Visible = false; }
+ if (WaterMetersCount < 7) { label7.Visible = comboBox7.Visible = checkBox7.Visible = false; }
+ if (WaterMetersCount < 8) { label8.Visible = comboBox8.Visible = checkBox8.Visible = false; }
+ if (WaterMetersCount < 9) { label9.Visible = comboBox9.Visible = checkBox9.Visible = false; }
+ if (WaterMetersCount < 10) { label10.Visible = comboBox10.Visible = checkBox10.Visible = false; }
+ if (WaterMetersCount < 11) { label11.Visible = comboBox11.Visible = checkBox11.Visible = false; }
+ if (WaterMetersCount < 12) { label12.Visible = comboBox12.Visible = checkBox12.Visible = false; }
+ if (WaterMetersCount < 13) { label13.Visible = comboBox13.Visible = checkBox13.Visible = false; }
+ if (WaterMetersCount < 14) { label14.Visible = comboBox14.Visible = checkBox14.Visible = false; }
+ if (WaterMetersCount < 15) { label15.Visible = comboBox15.Visible = checkBox15.Visible = false; }
+ if (WaterMetersCount < 16) { label16.Visible = comboBox16.Visible = checkBox16.Visible = false; }
+ if (WaterMetersCount < 17) { label17.Visible = comboBox17.Visible = checkBox17.Visible = false; }
+ if (WaterMetersCount < 18) { label18.Visible = comboBox18.Visible = checkBox18.Visible = false; }
+ if (WaterMetersCount < 19) { label19.Visible = comboBox19.Visible = checkBox19.Visible = false; }
+ if (WaterMetersCount < 20) { label20.Visible = comboBox20.Visible = checkBox20.Visible = false; }
+ if (WaterMetersCount < 21) { label21.Visible = comboBox21.Visible = checkBox21.Visible = false; }
+ if (WaterMetersCount < 22) { label22.Visible = comboBox22.Visible = checkBox22.Visible = false; }
+ if (WaterMetersCount < 23) { label23.Visible = comboBox23.Visible = checkBox23.Visible = false; }
+ if (WaterMetersCount < 24) { label24.Visible = comboBox24.Visible = checkBox24.Visible = false; }
+ }
+
+ void Localize()
+ {
+ Text = Strings.Data;
+ orderGroupBox.Text = Strings.Purchase_Order;
+ label1.Text = Strings.Serial_Number + " 1";
+ label2.Text = Strings.Serial_Number + " 2";
+ label3.Text = Strings.Serial_Number + " 3";
+ label4.Text = Strings.Serial_Number + " 4";
+ label5.Text = Strings.Serial_Number + " 5";
+ label6.Text = Strings.Serial_Number + " 6";
+ label7.Text = Strings.Serial_Number + " 7";
+ label8.Text = Strings.Serial_Number + " 8";
+ label9.Text = Strings.Serial_Number + " 9";
+ label10.Text = Strings.Serial_Number + " 10";
+ label11.Text = Strings.Serial_Number + " 11";
+ label12.Text = Strings.Serial_Number + " 12";
+ label13.Text = Strings.Serial_Number + " 13";
+ label14.Text = Strings.Serial_Number + " 14";
+ label15.Text = Strings.Serial_Number + " 15";
+ label16.Text = Strings.Serial_Number + " 16";
+ label17.Text = Strings.Serial_Number + " 17";
+ label18.Text = Strings.Serial_Number + " 18";
+ label19.Text = Strings.Serial_Number + " 19";
+ label20.Text = Strings.Serial_Number + " 20";
+ label21.Text = Strings.Serial_Number + " 21";
+ label22.Text = Strings.Serial_Number + " 22";
+ label23.Text = Strings.Serial_Number + " 23";
+ label24.Text = Strings.Serial_Number + " 24";
+ okButton.Text = Strings.OkBtnText;
+ clearButton.Text = Strings.ClearBtnText;
+ }
+
+ ///
+ /// Load Purchase order combo box items from the LocalSettings PurchaseOrderHistory array
+ ///
+ /// Puchase order ComboBox
+ void PrepareOrderCombo(ComboBox orderComboBox)
+ {
+ for (int i = 0; i < Program.LocalSettings.PurchaseOrderHistoryCount; i++)
+ {
+ orderComboBox.Items.Add(Program.LocalSettings.PurchaseOrderHistory[i]);
+ }
+
+ if (orderComboBox.Items.Count > 0)
+ {
+ orderComboBox.Text = orderComboBox.Items[0].ToString();
+ }
+ }
+
+ private void okButton_Click(object sender, EventArgs e)
+ {
+ PurchaseOrder = orderComboBox.Text;
+ Program.LocalSettings.UpdateHistory(orderComboBox.Text,
+ ref Program.LocalSettings.PurchaseOrderHistory
+#if FUZHOU150 || FUZHOU300
+ , 20
+#endif
+ );
+
+ Program.LocalSettings.LastSNTexts = SNText;
+
+ if (WaterMetersCount >= 1) { SNText[0] = comboBox1.Text; Disabled[0] = !checkBox1.Checked; }
+ if (WaterMetersCount >= 2) { SNText[1] = comboBox2.Text; Disabled[1] = !checkBox2.Checked; }
+ if (WaterMetersCount >= 3) { SNText[2] = comboBox3.Text; Disabled[2] = !checkBox3.Checked; }
+ if (WaterMetersCount >= 4) { SNText[3] = comboBox4.Text; Disabled[3] = !checkBox4.Checked; }
+ if (WaterMetersCount >= 5) { SNText[4] = comboBox5.Text; Disabled[4] = !checkBox5.Checked; }
+ if (WaterMetersCount >= 6) { SNText[5] = comboBox6.Text; Disabled[5] = !checkBox6.Checked; }
+ if (WaterMetersCount >= 7) { SNText[6] = comboBox7.Text; Disabled[6] = !checkBox7.Checked; }
+ if (WaterMetersCount >= 8) { SNText[7] = comboBox8.Text; Disabled[7] = !checkBox8.Checked; }
+ if (WaterMetersCount >= 9) { SNText[8] = comboBox9.Text; Disabled[8] = !checkBox9.Checked; }
+ if (WaterMetersCount >= 10) { SNText[9] = comboBox10.Text; Disabled[9] = !checkBox10.Checked; }
+ if (WaterMetersCount >= 11) { SNText[10] = comboBox11.Text; Disabled[10] = !checkBox11.Checked; }
+ if (WaterMetersCount >= 12) { SNText[11] = comboBox12.Text; Disabled[11] = !checkBox12.Checked; }
+ if (WaterMetersCount >= 13) { SNText[12] = comboBox13.Text; Disabled[12] = !checkBox13.Checked; }
+ if (WaterMetersCount >= 14) { SNText[13] = comboBox14.Text; Disabled[13] = !checkBox14.Checked; }
+ if (WaterMetersCount >= 15) { SNText[14] = comboBox15.Text; Disabled[14] = !checkBox15.Checked; }
+ if (WaterMetersCount >= 16) { SNText[15] = comboBox16.Text; Disabled[15] = !checkBox16.Checked; }
+ if (WaterMetersCount >= 17) { SNText[16] = comboBox17.Text; Disabled[16] = !checkBox17.Checked; }
+ if (WaterMetersCount >= 18) { SNText[17] = comboBox18.Text; Disabled[17] = !checkBox18.Checked; }
+ if (WaterMetersCount >= 19) { SNText[18] = comboBox19.Text; Disabled[18] = !checkBox19.Checked; }
+ if (WaterMetersCount >= 20) { SNText[19] = comboBox20.Text; Disabled[19] = !checkBox20.Checked; }
+ if (WaterMetersCount >= 21) { SNText[20] = comboBox21.Text; Disabled[20] = !checkBox21.Checked; }
+ if (WaterMetersCount >= 22) { SNText[21] = comboBox22.Text; Disabled[21] = !checkBox22.Checked; }
+ if (WaterMetersCount >= 23) { SNText[22] = comboBox23.Text; Disabled[22] = !checkBox23.Checked; }
+ if (WaterMetersCount >= 24) { SNText[23] = comboBox24.Text; Disabled[23] = !checkBox24.Checked; }
+
+ completed = true;
+ Close();
+ }
+
+
+ private void UpdateAllCombos()
+ {
+ if (WaterMetersCount >= 1)
+ {
+ comboBox1.Text = Program.LocalSettings.LastSNTexts[0];
+ checkBox1.Checked = !string.IsNullOrEmpty(comboBox1.Text);
+ }
+ if (WaterMetersCount >= 2)
+ {
+ comboBox2.Text = Program.LocalSettings.LastSNTexts[1];
+ checkBox2.Checked = !string.IsNullOrEmpty(comboBox2.Text);
+ }
+ if (WaterMetersCount >= 3)
+ {
+ comboBox3.Text = Program.LocalSettings.LastSNTexts[2];
+ checkBox3.Checked = !string.IsNullOrEmpty(comboBox3.Text);
+ }
+ if (WaterMetersCount >= 4)
+ {
+ comboBox4.Text = Program.LocalSettings.LastSNTexts[3];
+ checkBox4.Checked = !string.IsNullOrEmpty(comboBox4.Text);
+ }
+ if (WaterMetersCount >= 5)
+ {
+ comboBox5.Text = Program.LocalSettings.LastSNTexts[4];
+ checkBox5.Checked = !string.IsNullOrEmpty(comboBox5.Text);
+ }
+ if (WaterMetersCount >= 6)
+ {
+ comboBox6.Text = Program.LocalSettings.LastSNTexts[5];
+ checkBox6.Checked = !string.IsNullOrEmpty(comboBox6.Text);
+ }
+ if (WaterMetersCount >= 7)
+ {
+ comboBox7.Text = Program.LocalSettings.LastSNTexts[6];
+ checkBox7.Checked = !string.IsNullOrEmpty(comboBox7.Text);
+ }
+ if (WaterMetersCount >= 8)
+ {
+ comboBox8.Text = Program.LocalSettings.LastSNTexts[7];
+ checkBox8.Checked = !string.IsNullOrEmpty(comboBox8.Text);
+ }
+ if (WaterMetersCount >= 9)
+ {
+ comboBox9.Text = Program.LocalSettings.LastSNTexts[8];
+ checkBox9.Checked = !string.IsNullOrEmpty(comboBox9.Text);
+ }
+ if (WaterMetersCount >= 10)
+ {
+ comboBox10.Text = Program.LocalSettings.LastSNTexts[9];
+ checkBox10.Checked = !string.IsNullOrEmpty(comboBox10.Text);
+ }
+ if (WaterMetersCount >= 11)
+ {
+ comboBox11.Text = Program.LocalSettings.LastSNTexts[10];
+ checkBox11.Checked = !string.IsNullOrEmpty(comboBox11.Text);
+ }
+ if (WaterMetersCount >= 12)
+ {
+ comboBox12.Text = Program.LocalSettings.LastSNTexts[11];
+ checkBox12.Checked = !string.IsNullOrEmpty(comboBox12.Text);
+ }
+ if (WaterMetersCount >= 13)
+ {
+ comboBox13.Text = Program.LocalSettings.LastSNTexts[12];
+ checkBox13.Checked = !string.IsNullOrEmpty(comboBox13.Text);
+ }
+ if (WaterMetersCount >= 14)
+ {
+ comboBox14.Text = Program.LocalSettings.LastSNTexts[13];
+ checkBox14.Checked = !string.IsNullOrEmpty(comboBox14.Text);
+ }
+ if (WaterMetersCount >= 15)
+ {
+ comboBox15.Text = Program.LocalSettings.LastSNTexts[14];
+ checkBox15.Checked = !string.IsNullOrEmpty(comboBox15.Text);
+ }
+ if (WaterMetersCount >= 16)
+ {
+ comboBox16.Text = Program.LocalSettings.LastSNTexts[15];
+ checkBox16.Checked = !string.IsNullOrEmpty(comboBox16.Text);
+ }
+ if (WaterMetersCount >= 17)
+ {
+ comboBox17.Text = Program.LocalSettings.LastSNTexts[16];
+ checkBox17.Checked = !string.IsNullOrEmpty(comboBox17.Text);
+ }
+ if (WaterMetersCount >= 18)
+ {
+ comboBox18.Text = Program.LocalSettings.LastSNTexts[17];
+ checkBox18.Checked = !string.IsNullOrEmpty(comboBox18.Text);
+ }
+ if (WaterMetersCount >= 19)
+ {
+ comboBox19.Text = Program.LocalSettings.LastSNTexts[18];
+ checkBox19.Checked = !string.IsNullOrEmpty(comboBox19.Text);
+ }
+ if (WaterMetersCount >= 20)
+ {
+ comboBox20.Text = Program.LocalSettings.LastSNTexts[19];
+ checkBox20.Checked = !string.IsNullOrEmpty(comboBox20.Text);
+ }
+ if (WaterMetersCount >= 21)
+ {
+ comboBox21.Text = Program.LocalSettings.LastSNTexts[20];
+ checkBox21.Checked = !string.IsNullOrEmpty(comboBox21.Text);
+ }
+ if (WaterMetersCount >= 22)
+ {
+ comboBox22.Text = Program.LocalSettings.LastSNTexts[21];
+ checkBox22.Checked = !string.IsNullOrEmpty(comboBox22.Text);
+ }
+ if (WaterMetersCount >= 23)
+ {
+ comboBox23.Text = Program.LocalSettings.LastSNTexts[22];
+ checkBox23.Checked = !string.IsNullOrEmpty(comboBox23.Text);
+ }
+ if (WaterMetersCount >= 24)
+ {
+ comboBox24.Text = Program.LocalSettings.LastSNTexts[23];
+ checkBox24.Checked = !string.IsNullOrEmpty(comboBox24.Text);
+ }
+ }
+
+ private void clearButton_Click(object sender, EventArgs e)
+ {
+ if (WaterMetersCount >= 1) { comboBox1.Text = string.Empty; checkBox1.Checked = false; }
+ if (WaterMetersCount >= 2) { comboBox2.Text = string.Empty; checkBox2.Checked = false; }
+ if (WaterMetersCount >= 3) { comboBox3.Text = string.Empty; checkBox3.Checked = false; }
+ if (WaterMetersCount >= 4) { comboBox4.Text = string.Empty; checkBox4.Checked = false; }
+ if (WaterMetersCount >= 5) { comboBox5.Text = string.Empty; checkBox5.Checked = false; }
+ if (WaterMetersCount >= 6) { comboBox6.Text = string.Empty; checkBox6.Checked = false; }
+ if (WaterMetersCount >= 7) { comboBox7.Text = string.Empty; checkBox7.Checked = false; }
+ if (WaterMetersCount >= 8) { comboBox8.Text = string.Empty; checkBox8.Checked = false; }
+ if (WaterMetersCount >= 9) { comboBox9.Text = string.Empty; checkBox9.Checked = false; }
+ if (WaterMetersCount >= 10) { comboBox10.Text = string.Empty; checkBox10.Checked = false; }
+ if (WaterMetersCount >= 11) { comboBox11.Text = string.Empty; checkBox11.Checked = false; }
+ if (WaterMetersCount >= 12) { comboBox12.Text = string.Empty; checkBox12.Checked = false; }
+ if (WaterMetersCount >= 13) { comboBox13.Text = string.Empty; checkBox13.Checked = false; }
+ if (WaterMetersCount >= 14) { comboBox14.Text = string.Empty; checkBox14.Checked = false; }
+ if (WaterMetersCount >= 15) { comboBox15.Text = string.Empty; checkBox15.Checked = false; }
+ if (WaterMetersCount >= 16) { comboBox16.Text = string.Empty; checkBox16.Checked = false; }
+ if (WaterMetersCount >= 17) { comboBox17.Text = string.Empty; checkBox17.Checked = false; }
+ if (WaterMetersCount >= 18) { comboBox18.Text = string.Empty; checkBox18.Checked = false; }
+ if (WaterMetersCount >= 19) { comboBox19.Text = string.Empty; checkBox19.Checked = false; }
+ if (WaterMetersCount >= 20) { comboBox20.Text = string.Empty; checkBox20.Checked = false; }
+ if (WaterMetersCount >= 21) { comboBox21.Text = string.Empty; checkBox21.Checked = false; }
+ if (WaterMetersCount >= 22) { comboBox22.Text = string.Empty; checkBox22.Checked = false; }
+ if (WaterMetersCount >= 23) { comboBox23.Text = string.Empty; checkBox23.Checked = false; }
+ if (WaterMetersCount >= 24) { comboBox24.Text = string.Empty; checkBox24.Checked = false; }
+ }
+
+
+ private void comboBox1_TextChanged(object sender, EventArgs e) { checkBox1.Checked = true; }
+ private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox1.Text.Equals(Program.LocalSettings.LastSNTexts[0])) UpdateAllCombos();
+ }
+ }
+
+ private void comboBox2_TextChanged(object sender, EventArgs e) { checkBox2.Checked = true; }
+ private void comboBox2_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox2.Text.Equals(Program.LocalSettings.LastSNTexts[1])) UpdateAllCombos();
+ }
+ }
+
+ private void comboBox3_TextChanged(object sender, EventArgs e) { checkBox3.Checked = true; }
+ private void comboBox3_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox3.Text.Equals(Program.LocalSettings.LastSNTexts[2])) UpdateAllCombos();
+ }
+ }
+
+ private void comboBox4_TextChanged(object sender, EventArgs e) { checkBox4.Checked = true; }
+ private void comboBox4_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox4.Text.Equals(Program.LocalSettings.LastSNTexts[3])) UpdateAllCombos();
+ }
+ }
+
+ private void comboBox5_TextChanged(object sender, EventArgs e) { checkBox5.Checked = true; }
+ private void comboBox5_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox5.Text.Equals(Program.LocalSettings.LastSNTexts[4])) UpdateAllCombos();
+ }
+ }
+
+ private void comboBox6_TextChanged(object sender, EventArgs e) { checkBox6.Checked = true; }
+ private void comboBox6_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox6.Text.Equals(Program.LocalSettings.LastSNTexts[5])) UpdateAllCombos();
+ }
+ }
+
+ private void comboBox7_TextChanged(object sender, EventArgs e) { checkBox7.Checked = true; }
+ private void comboBox7_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox7.Text.Equals(Program.LocalSettings.LastSNTexts[6])) UpdateAllCombos();
+ }
+ }
+
+ private void comboBox8_TextChanged(object sender, EventArgs e) { checkBox8.Checked = true; }
+ private void comboBox8_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox8.Text.Equals(Program.LocalSettings.LastSNTexts[7])) UpdateAllCombos();
+ }
+ }
+
+ private void comboBox9_TextChanged(object sender, EventArgs e) { checkBox9.Checked = true; }
+ private void comboBox9_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox9.Text.Equals(Program.LocalSettings.LastSNTexts[8])) UpdateAllCombos();
+ }
+ }
+
+ private void comboBox10_TextChanged(object sender, EventArgs e) { checkBox10.Checked = true; }
+ private void comboBox10_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox10.Text.Equals(Program.LocalSettings.LastSNTexts[9])) UpdateAllCombos();
+ }
+ }
+
+ private void comboBox11_TextChanged(object sender, EventArgs e) { checkBox11.Checked = true; }
+ private void comboBox11_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox11.Text.Equals(Program.LocalSettings.LastSNTexts[10])) UpdateAllCombos();
+ }
+ }
+
+ private void comboBox12_TextChanged(object sender, EventArgs e) { checkBox12.Checked = true; }
+ private void comboBox12_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox12.Text.Equals(Program.LocalSettings.LastSNTexts[11])) UpdateAllCombos();
+ }
+ }
+
+ private void comboBox13_TextChanged(object sender, EventArgs e) { checkBox13.Checked = true; }
+ private void comboBox13_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox13.Text.Equals(Program.LocalSettings.LastSNTexts[12])) UpdateAllCombos();
+ }
+ }
+
+ private void comboBox14_TextChanged(object sender, EventArgs e) { checkBox14.Checked = true; }
+ private void comboBox14_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox14.Text.Equals(Program.LocalSettings.LastSNTexts[13])) UpdateAllCombos();
+ }
+ }
+
+ private void comboBox15_TextChanged(object sender, EventArgs e) { checkBox15.Checked = true; }
+ private void comboBox15_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox15.Text.Equals(Program.LocalSettings.LastSNTexts[14])) UpdateAllCombos();
+ }
+ }
+
+ private void comboBox16_TextChanged(object sender, EventArgs e) { checkBox16.Checked = true; }
+ private void comboBox16_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox16.Text.Equals(Program.LocalSettings.LastSNTexts[15])) UpdateAllCombos();
+ }
+ }
+
+ private void comboBox17_TextChanged(object sender, EventArgs e) { checkBox17.Checked = true; }
+ private void comboBox17_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox17.Text.Equals(Program.LocalSettings.LastSNTexts[16])) UpdateAllCombos();
+ }
+ }
+
+ private void comboBox18_TextChanged(object sender, EventArgs e) { checkBox18.Checked = true; }
+ private void comboBox18_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox18.Text.Equals(Program.LocalSettings.LastSNTexts[17])) UpdateAllCombos();
+ }
+ }
+
+ private void comboBox19_TextChanged(object sender, EventArgs e) { checkBox19.Checked = true; }
+ private void comboBox19_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox19.Text.Equals(Program.LocalSettings.LastSNTexts[18])) UpdateAllCombos();
+ }
+ }
+
+ private void comboBox20_TextChanged(object sender, EventArgs e) { checkBox20.Checked = true; }
+ private void comboBox20_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox20.Text.Equals(Program.LocalSettings.LastSNTexts[19])) UpdateAllCombos();
+ }
+ }
+
+ private void comboBox21_TextChanged(object sender, EventArgs e) { checkBox21.Checked = true; }
+ private void comboBox21_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox21.Text.Equals(Program.LocalSettings.LastSNTexts[20])) UpdateAllCombos();
+ }
+ }
+
+ private void comboBox22_TextChanged(object sender, EventArgs e) { checkBox22.Checked = true; }
+ private void comboBox22_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox22.Text.Equals(Program.LocalSettings.LastSNTexts[21])) UpdateAllCombos();
+ }
+ }
+
+ private void comboBox23_TextChanged(object sender, EventArgs e) { checkBox23.Checked = true; }
+ private void comboBox23_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox23.Text.Equals(Program.LocalSettings.LastSNTexts[22])) UpdateAllCombos();
+ }
+ }
+
+ private void comboBox24_TextChanged(object sender, EventArgs e) { checkBox24.Checked = true; }
+ private void comboBox24_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+ {
+ if (comboBox24.Text.Equals(Program.LocalSettings.LastSNTexts[23])) UpdateAllCombos();
+ }
+ }
+
+ #region Forced close handling
+
+ public void StartForceCloseHandler()
+ {
+ UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args)
+ {
+ if (InvokeRequired) { Invoke(new EventHandler(OnForceClose), sender, args); }
+ else OnForceClose(sender, args);
+ };
+ }
+
+ private void OnForceClose(object sender, EventArgs args)
+ {
+ DialogResult = DialogResult.Cancel;
+ Close();
+ }
+
+ #endregion
+ }
+}
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.resx b/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.resx
new file mode 100644
index 000000000..114e112e0
--- /dev/null
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.resx
@@ -0,0 +1,2259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+
+ Verdana, 14.25pt
+
+
+ 742, 26
+
+
+ 98, 63
+
+
+
+ 7
+
+
+ OK
+
+
+ okButton
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 74
+
+
+ 90, 31
+
+
+ 260, 31
+
+
+ 0
+
+
+ orderComboBox
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ orderGroupBox
+
+
+ 0
+
+
+ Verdana, 14.25pt
+
+
+ 28, 12
+
+
+ 397, 82
+
+
+ 0
+
+
+ Order
+
+
+ orderGroupBox
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 73
+
+
+ Verdana, 14.25pt
+
+
+
+ NoControl
+
+
+ 596, 26
+
+
+ 98, 63
+
+
+ 8
+
+
+ Clear
+
+
+ clearButton
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 72
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ 24, 127
+
+
+ 166, 23
+
+
+ 9
+
+
+ Serial Number 1
+
+
+ label1
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 71
+
+
+ Verdana, 14.25pt
+
+
+ 215, 124
+
+
+ 163, 31
+
+
+ 10
+
+
+ comboBox1
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 70
+
+
+ True
+
+
+ 410, 135
+
+
+ 15, 14
+
+
+ 11
+
+
+ checkBox1
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 69
+
+
+ True
+
+
+ NoControl
+
+
+ 410, 179
+
+
+ 15, 14
+
+
+ 14
+
+
+ checkBox2
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 66
+
+
+ Verdana, 14.25pt
+
+
+ 215, 168
+
+
+ 163, 31
+
+
+ 13
+
+
+ comboBox2
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 67
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ NoControl
+
+
+ 24, 171
+
+
+ 166, 23
+
+
+ 12
+
+
+ Serial Number 2
+
+
+ label2
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 68
+
+
+ True
+
+
+ NoControl
+
+
+ 410, 223
+
+
+ 15, 14
+
+
+ 17
+
+
+ checkBox3
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 63
+
+
+ Verdana, 14.25pt
+
+
+ 215, 212
+
+
+ 163, 31
+
+
+ 16
+
+
+ comboBox3
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 64
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ NoControl
+
+
+ 24, 215
+
+
+ 166, 23
+
+
+ 15
+
+
+ Serial Number 3
+
+
+ label3
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 65
+
+
+ True
+
+
+ NoControl
+
+
+ 410, 267
+
+
+ 15, 14
+
+
+ 20
+
+
+ checkBox4
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 60
+
+
+ Verdana, 14.25pt
+
+
+ 215, 256
+
+
+ 163, 31
+
+
+ 19
+
+
+ comboBox4
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 61
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ NoControl
+
+
+ 24, 259
+
+
+ 166, 23
+
+
+ 18
+
+
+ Serial Number 4
+
+
+ label4
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 62
+
+
+ True
+
+
+ NoControl
+
+
+ 410, 311
+
+
+ 15, 14
+
+
+ 23
+
+
+ checkBox5
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 57
+
+
+ Verdana, 14.25pt
+
+
+ 215, 300
+
+
+ 163, 31
+
+
+ 22
+
+
+ comboBox5
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 58
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ NoControl
+
+
+ 24, 303
+
+
+ 166, 23
+
+
+ 21
+
+
+ Serial Number 5
+
+
+ label5
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 59
+
+
+ True
+
+
+ NoControl
+
+
+ 410, 355
+
+
+ 15, 14
+
+
+ 26
+
+
+ checkBox6
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 54
+
+
+ Verdana, 14.25pt
+
+
+ 215, 344
+
+
+ 163, 31
+
+
+ 25
+
+
+ comboBox6
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 55
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ NoControl
+
+
+ 24, 347
+
+
+ 166, 23
+
+
+ 24
+
+
+ Serial Number 6
+
+
+ label6
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 56
+
+
+ True
+
+
+ NoControl
+
+
+ 410, 399
+
+
+ 15, 14
+
+
+ 29
+
+
+ checkBox7
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 51
+
+
+ Verdana, 14.25pt
+
+
+ 215, 388
+
+
+ 163, 31
+
+
+ 28
+
+
+ comboBox7
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 52
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ NoControl
+
+
+ 24, 391
+
+
+ 166, 23
+
+
+ 27
+
+
+ Serial Number 7
+
+
+ label7
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 53
+
+
+ True
+
+
+ NoControl
+
+
+ 410, 443
+
+
+ 15, 14
+
+
+ 32
+
+
+ checkBox8
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 48
+
+
+ Verdana, 14.25pt
+
+
+ 215, 432
+
+
+ 163, 31
+
+
+ 31
+
+
+ comboBox8
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 49
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ NoControl
+
+
+ 24, 435
+
+
+ 166, 23
+
+
+ 30
+
+
+ Serial Number 8
+
+
+ label8
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 50
+
+
+ True
+
+
+ NoControl
+
+
+ 410, 487
+
+
+ 15, 14
+
+
+ 35
+
+
+ checkBox9
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 45
+
+
+ Verdana, 14.25pt
+
+
+ 215, 476
+
+
+ 163, 31
+
+
+ 34
+
+
+ comboBox9
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 46
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ NoControl
+
+
+ 24, 479
+
+
+ 166, 23
+
+
+ 33
+
+
+ Serial Number 9
+
+
+ label9
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 47
+
+
+ True
+
+
+ NoControl
+
+
+ 410, 531
+
+
+ 15, 14
+
+
+ 38
+
+
+ checkBox10
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 42
+
+
+ Verdana, 14.25pt
+
+
+ 215, 520
+
+
+ 163, 31
+
+
+ 37
+
+
+ comboBox10
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 43
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ NoControl
+
+
+ 24, 523
+
+
+ 178, 23
+
+
+ 36
+
+
+ Serial Number 10
+
+
+ label10
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 44
+
+
+ True
+
+
+ NoControl
+
+
+ 410, 575
+
+
+ 15, 14
+
+
+ 41
+
+
+ checkBox11
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 39
+
+
+ Verdana, 14.25pt
+
+
+ 215, 564
+
+
+ 163, 31
+
+
+ 40
+
+
+ comboBox11
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 40
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ NoControl
+
+
+ 24, 567
+
+
+ 178, 23
+
+
+ 39
+
+
+ Serial Number 11
+
+
+ label11
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 41
+
+
+ True
+
+
+ NoControl
+
+
+ 410, 619
+
+
+ 15, 14
+
+
+ 44
+
+
+ checkBox12
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 36
+
+
+ Verdana, 14.25pt
+
+
+ 215, 608
+
+
+ 163, 31
+
+
+ 43
+
+
+ comboBox12
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 37
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ NoControl
+
+
+ 24, 611
+
+
+ 178, 23
+
+
+ 42
+
+
+ Serial Number 12
+
+
+ label12
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 38
+
+
+ True
+
+
+ NoControl
+
+
+ 871, 135
+
+
+ 15, 14
+
+
+ 47
+
+
+ checkBox13
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 33
+
+
+ Verdana, 14.25pt
+
+
+ 676, 124
+
+
+ 163, 31
+
+
+ 46
+
+
+ comboBox13
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 34
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ NoControl
+
+
+ 481, 127
+
+
+ 178, 23
+
+
+ 45
+
+
+ Serial Number 13
+
+
+ label13
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 35
+
+
+ True
+
+
+ NoControl
+
+
+ 871, 179
+
+
+ 15, 14
+
+
+ 50
+
+
+ checkBox14
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 30
+
+
+ Verdana, 14.25pt
+
+
+ 676, 168
+
+
+ 163, 31
+
+
+ 49
+
+
+ comboBox14
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 31
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ NoControl
+
+
+ 481, 171
+
+
+ 178, 23
+
+
+ 48
+
+
+ Serial Number 14
+
+
+ label14
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 32
+
+
+ True
+
+
+ NoControl
+
+
+ 871, 223
+
+
+ 15, 14
+
+
+ 53
+
+
+ checkBox15
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 27
+
+
+ Verdana, 14.25pt
+
+
+ 676, 212
+
+
+ 163, 31
+
+
+ 52
+
+
+ comboBox15
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 28
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ NoControl
+
+
+ 481, 215
+
+
+ 178, 23
+
+
+ 51
+
+
+ Serial Number 15
+
+
+ label15
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 29
+
+
+ True
+
+
+ NoControl
+
+
+ 871, 267
+
+
+ 15, 14
+
+
+ 56
+
+
+ checkBox16
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 24
+
+
+ Verdana, 14.25pt
+
+
+ 676, 256
+
+
+ 163, 31
+
+
+ 55
+
+
+ comboBox16
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 25
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ NoControl
+
+
+ 481, 259
+
+
+ 178, 23
+
+
+ 54
+
+
+ Serial Number 16
+
+
+ label16
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 26
+
+
+ True
+
+
+ NoControl
+
+
+ 871, 311
+
+
+ 15, 14
+
+
+ 59
+
+
+ checkBox17
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 21
+
+
+ Verdana, 14.25pt
+
+
+ 676, 300
+
+
+ 163, 31
+
+
+ 58
+
+
+ comboBox17
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 22
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ NoControl
+
+
+ 481, 303
+
+
+ 178, 23
+
+
+ 57
+
+
+ Serial Number 17
+
+
+ label17
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 23
+
+
+ True
+
+
+ NoControl
+
+
+ 871, 355
+
+
+ 15, 14
+
+
+ 62
+
+
+ checkBox18
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 18
+
+
+ Verdana, 14.25pt
+
+
+ 676, 344
+
+
+ 163, 31
+
+
+ 61
+
+
+ comboBox18
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 19
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ NoControl
+
+
+ 481, 347
+
+
+ 178, 23
+
+
+ 60
+
+
+ Serial Number 18
+
+
+ label18
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 20
+
+
+ True
+
+
+ NoControl
+
+
+ 871, 399
+
+
+ 15, 14
+
+
+ 65
+
+
+ checkBox19
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 15
+
+
+ Verdana, 14.25pt
+
+
+ 676, 388
+
+
+ 163, 31
+
+
+ 64
+
+
+ comboBox19
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 16
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ NoControl
+
+
+ 481, 391
+
+
+ 178, 23
+
+
+ 63
+
+
+ Serial Number 19
+
+
+ label19
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 17
+
+
+ True
+
+
+ NoControl
+
+
+ 871, 443
+
+
+ 15, 14
+
+
+ 68
+
+
+ checkBox20
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 12
+
+
+ Verdana, 14.25pt
+
+
+ 676, 432
+
+
+ 163, 31
+
+
+ 67
+
+
+ comboBox20
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 13
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ NoControl
+
+
+ 481, 435
+
+
+ 178, 23
+
+
+ 66
+
+
+ Serial Number 20
+
+
+ label20
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 14
+
+
+ True
+
+
+ NoControl
+
+
+ 871, 487
+
+
+ 15, 14
+
+
+ 71
+
+
+ checkBox21
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 9
+
+
+ Verdana, 14.25pt
+
+
+ 676, 476
+
+
+ 163, 31
+
+
+ 70
+
+
+ comboBox21
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 10
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ NoControl
+
+
+ 481, 479
+
+
+ 178, 23
+
+
+ 69
+
+
+ Serial Number 21
+
+
+ label21
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 11
+
+
+ True
+
+
+ NoControl
+
+
+ 871, 531
+
+
+ 15, 14
+
+
+ 74
+
+
+ checkBox22
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 6
+
+
+ Verdana, 14.25pt
+
+
+ 676, 520
+
+
+ 163, 31
+
+
+ 73
+
+
+ comboBox22
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 7
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ NoControl
+
+
+ 481, 523
+
+
+ 178, 23
+
+
+ 72
+
+
+ Serial Number 22
+
+
+ label22
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 8
+
+
+ True
+
+
+ NoControl
+
+
+ 871, 575
+
+
+ 15, 14
+
+
+ 77
+
+
+ checkBox23
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 3
+
+
+ Verdana, 14.25pt
+
+
+ 676, 564
+
+
+ 163, 31
+
+
+ 76
+
+
+ comboBox23
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 4
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ NoControl
+
+
+ 481, 567
+
+
+ 178, 23
+
+
+ 75
+
+
+ Serial Number 23
+
+
+ label23
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 5
+
+
+ True
+
+
+ NoControl
+
+
+ 871, 619
+
+
+ 15, 14
+
+
+ 80
+
+
+ checkBox24
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 0
+
+
+ Verdana, 14.25pt
+
+
+ 676, 608
+
+
+ 163, 31
+
+
+ 79
+
+
+ comboBox24
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 1
+
+
+ True
+
+
+ Verdana, 14.25pt
+
+
+ NoControl
+
+
+ 481, 611
+
+
+ 178, 23
+
+
+ 78
+
+
+ Serial Number 24
+
+
+ label24
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 2
+
+
+ True
+
+
+ 6, 13
+
+
+ True
+
+
+ 919, 656
+
+
+ Batch data
+
+
+ CycleBeginningForm
+
+
+ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleEndForm.Designer.cs b/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleEndForm.Designer.cs
new file mode 100644
index 000000000..9e66afa23
--- /dev/null
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleEndForm.Designer.cs
@@ -0,0 +1,305 @@
+///
+/// Copyright (c) 2015 Sensus Metering Systems
+///
+namespace TBF.BenchControl.DataEntry.Standard24
+{
+ partial class CycleEndForm
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.textBox2 = new System.Windows.Forms.TextBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.textBox1 = new System.Windows.Forms.TextBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.okButton = new System.Windows.Forms.Button();
+ 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.groupBox2.SuspendLayout();
+ this.groupBox1.SuspendLayout();
+ this.groupBox3.SuspendLayout();
+ this.groupBox4.SuspendLayout();
+ this.groupBox5.SuspendLayout();
+ this.groupBox6.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // groupBox2
+ //
+ this.groupBox2.Controls.Add(this.textBox2);
+ this.groupBox2.Controls.Add(this.label2);
+ 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, 104);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Size = new System.Drawing.Size(362, 81);
+ this.groupBox2.TabIndex = 2;
+ this.groupBox2.TabStop = false;
+ this.groupBox2.Text = "Wasserzähler 2";
+ //
+ // textBox2
+ //
+ this.textBox2.Location = new System.Drawing.Point(183, 31);
+ this.textBox2.Name = "textBox2";
+ this.textBox2.Size = new System.Drawing.Size(163, 31);
+ this.textBox2.TabIndex = 1;
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(18, 34);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(74, 23);
+ this.label2.TabIndex = 0;
+ this.label2.Text = "Stand:";
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.textBox1);
+ this.groupBox1.Controls.Add(this.label1);
+ 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, 14);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(362, 81);
+ this.groupBox1.TabIndex = 1;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "Wasserzähler 1";
+ //
+ // textBox1
+ //
+ this.textBox1.Location = new System.Drawing.Point(183, 31);
+ this.textBox1.Name = "textBox1";
+ this.textBox1.Size = new System.Drawing.Size(163, 31);
+ this.textBox1.TabIndex = 1;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(18, 34);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(74, 23);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "Stand:";
+ //
+ // 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(425, 23);
+ this.okButton.Name = "okButton";
+ this.okButton.Size = new System.Drawing.Size(98, 63);
+ this.okButton.TabIndex = 7;
+ this.okButton.Text = "OK";
+ this.okButton.UseVisualStyleBackColor = true;
+ this.okButton.Click += new System.EventHandler(this.okButton_Click);
+ //
+ // groupBox3
+ //
+ this.groupBox3.Controls.Add(this.textBox3);
+ this.groupBox3.Controls.Add(this.label3);
+ 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(25, 194);
+ this.groupBox3.Name = "groupBox3";
+ this.groupBox3.Size = new System.Drawing.Size(362, 81);
+ this.groupBox3.TabIndex = 3;
+ this.groupBox3.TabStop = false;
+ this.groupBox3.Text = "Wasserzähler 3";
+ //
+ // textBox3
+ //
+ this.textBox3.Location = new System.Drawing.Point(183, 31);
+ this.textBox3.Name = "textBox3";
+ this.textBox3.Size = new System.Drawing.Size(163, 31);
+ this.textBox3.TabIndex = 1;
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(18, 34);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(74, 23);
+ this.label3.TabIndex = 0;
+ this.label3.Text = "Stand:";
+ //
+ // groupBox4
+ //
+ this.groupBox4.Controls.Add(this.textBox4);
+ this.groupBox4.Controls.Add(this.label4);
+ this.groupBox4.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.groupBox4.ForeColor = System.Drawing.Color.Black;
+ this.groupBox4.Location = new System.Drawing.Point(25, 284);
+ this.groupBox4.Name = "groupBox4";
+ this.groupBox4.Size = new System.Drawing.Size(362, 81);
+ this.groupBox4.TabIndex = 4;
+ this.groupBox4.TabStop = false;
+ this.groupBox4.Text = "Wasserzähler 4";
+ //
+ // textBox4
+ //
+ this.textBox4.Location = new System.Drawing.Point(183, 31);
+ this.textBox4.Name = "textBox4";
+ this.textBox4.Size = new System.Drawing.Size(163, 31);
+ this.textBox4.TabIndex = 1;
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(18, 34);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(74, 23);
+ this.label4.TabIndex = 0;
+ this.label4.Text = "Stand:";
+ //
+ // groupBox5
+ //
+ this.groupBox5.Controls.Add(this.textBox5);
+ this.groupBox5.Controls.Add(this.label5);
+ this.groupBox5.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.groupBox5.ForeColor = System.Drawing.Color.Black;
+ this.groupBox5.Location = new System.Drawing.Point(25, 374);
+ this.groupBox5.Name = "groupBox5";
+ this.groupBox5.Size = new System.Drawing.Size(362, 81);
+ this.groupBox5.TabIndex = 5;
+ this.groupBox5.TabStop = false;
+ this.groupBox5.Text = "Wasserzähler 5";
+ //
+ // textBox5
+ //
+ this.textBox5.Location = new System.Drawing.Point(183, 31);
+ this.textBox5.Name = "textBox5";
+ this.textBox5.Size = new System.Drawing.Size(163, 31);
+ this.textBox5.TabIndex = 1;
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(18, 34);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(74, 23);
+ this.label5.TabIndex = 0;
+ this.label5.Text = "Stand:";
+ //
+ // groupBox6
+ //
+ this.groupBox6.Controls.Add(this.textBox6);
+ this.groupBox6.Controls.Add(this.label6);
+ this.groupBox6.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.groupBox6.ForeColor = System.Drawing.Color.Black;
+ this.groupBox6.Location = new System.Drawing.Point(25, 464);
+ this.groupBox6.Name = "groupBox6";
+ this.groupBox6.Size = new System.Drawing.Size(362, 81);
+ this.groupBox6.TabIndex = 6;
+ this.groupBox6.TabStop = false;
+ this.groupBox6.Text = "Wasserzähler 6";
+ //
+ // textBox6
+ //
+ this.textBox6.Location = new System.Drawing.Point(183, 31);
+ this.textBox6.Name = "textBox6";
+ this.textBox6.Size = new System.Drawing.Size(163, 31);
+ this.textBox6.TabIndex = 1;
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Location = new System.Drawing.Point(18, 34);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(74, 23);
+ this.label6.TabIndex = 0;
+ this.label6.Text = "Stand:";
+ //
+ // 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(559, 566);
+ this.Controls.Add(this.groupBox6);
+ this.Controls.Add(this.groupBox5);
+ this.Controls.Add(this.groupBox4);
+ this.Controls.Add(this.groupBox3);
+ this.Controls.Add(this.okButton);
+ this.Controls.Add(this.groupBox2);
+ 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.groupBox2.ResumeLayout(false);
+ this.groupBox2.PerformLayout();
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.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);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.GroupBox groupBox2;
+ private System.Windows.Forms.TextBox textBox2;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.TextBox textBox1;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Button okButton;
+ private System.Windows.Forms.GroupBox groupBox3;
+ private System.Windows.Forms.TextBox textBox3;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.GroupBox groupBox4;
+ private System.Windows.Forms.TextBox textBox4;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.GroupBox groupBox5;
+ private System.Windows.Forms.TextBox textBox5;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.GroupBox groupBox6;
+ private System.Windows.Forms.TextBox textBox6;
+ private System.Windows.Forms.Label label6;
+
+ }
+}
\ No newline at end of file
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleEndForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleEndForm.cs
new file mode 100644
index 000000000..1bf7756cb
--- /dev/null
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleEndForm.cs
@@ -0,0 +1,108 @@
+///
+/// Copyright (c) 2015 Sensus Metering Systems
+///
+using System;
+using System.Windows.Forms;
+using log4net;
+using TBF.Resources;
+
+namespace TBF.BenchControl.DataEntry.Standard24
+{
+ public partial class CycleEndForm : Form, GenericDevices.IHasCompleted
+ {
+ private static readonly ILog log = LogManager.GetLogger(typeof(CycleEndForm));
+
+ /// Number of text boxes for serial numbers
+ public readonly int WaterMetersCount;
+
+ // To be retrieved after the form closes
+ public string[] EndStateText;
+
+ // Set to 'true' when the form closes
+ public bool Completed { get { return completed; } }
+ bool completed;
+
+ ///
+ /// Constructor
+ ///
+ /// Number of text boxes for serial numbers
+ public CycleEndForm(int waterMetersCount)
+ {
+ this.WaterMetersCount = waterMetersCount;
+ InitializeComponent();
+ EndStateText = new string[WaterMetersCount];
+ completed = false;
+ StartForceCloseHandler();
+ }
+
+ /// Parameterless constructor for 3 watermeters
+ public CycleEndForm()
+ : this(3)
+ {
+ }
+
+ private void CycleEndForm_Load(object sender, EventArgs e)
+ {
+ Localize();
+
+ Height = 50 + 90 * WaterMetersCount;
+
+ if (WaterMetersCount < 1) groupBox1.Visible = false;
+ if (WaterMetersCount < 2) groupBox2.Visible = false;
+ if (WaterMetersCount < 3) groupBox3.Visible = false;
+ if (WaterMetersCount < 4) groupBox4.Visible = false;
+ if (WaterMetersCount < 5) groupBox5.Visible = false;
+ if (WaterMetersCount < 6) groupBox6.Visible = false;
+ }
+
+ void Localize()
+ {
+ Text = Strings.Data;
+ groupBox1.Text = Strings.Water_Meter + " 1";
+ groupBox2.Text = Strings.Water_Meter + " 2";
+ groupBox3.Text = Strings.Water_Meter + " 3";
+ groupBox4.Text = Strings.Water_Meter + " 4";
+ groupBox5.Text = Strings.Water_Meter + " 5";
+ groupBox6.Text = Strings.Water_Meter + " 6";
+ label1.Text = Strings.State;
+ label2.Text = Strings.State;
+ label3.Text = Strings.State;
+ label4.Text = Strings.State;
+ label5.Text = Strings.State;
+ label6.Text = Strings.State;
+ okButton.Text = Strings.OkBtnText;
+ }
+
+ private void okButton_Click(object sender, EventArgs e)
+ {
+ if (WaterMetersCount >= 1) EndStateText[0] = textBox1.Text;
+ if (WaterMetersCount >= 2) EndStateText[1] = textBox3.Text;
+ if (WaterMetersCount >= 3) EndStateText[2] = textBox4.Text;
+ if (WaterMetersCount >= 4) EndStateText[3] = textBox5.Text;
+ if (WaterMetersCount >= 5) EndStateText[4] = textBox6.Text;
+ if (WaterMetersCount >= 6) EndStateText[5] = textBox6.Text;
+
+ completed = true;
+ Close();
+ }
+
+ #region Forced close handling
+
+ public void StartForceCloseHandler()
+ {
+ UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args)
+ {
+ if (InvokeRequired) { Invoke(new EventHandler(OnForceClose), sender, args); }
+ else OnForceClose(sender, args);
+ };
+ }
+
+ void OnForceClose(object sender, EventArgs args)
+ {
+ DialogResult = DialogResult.Cancel;
+ Close();
+ }
+
+ #endregion
+ }
+}
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleEndForm.resx b/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleEndForm.resx
new file mode 100644
index 000000000..1af7de150
--- /dev/null
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleEndForm.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryForm.cs
new file mode 100644
index 000000000..e0f178dc0
--- /dev/null
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryForm.cs
@@ -0,0 +1,263 @@
+///
+/// Copyright (c) 2015 Sensus Metering Systems
+///
+using System;
+using System.Collections.Generic;
+using log4net;
+using TBF.BenchControl;
+using TBF.BenchControl.GenericDevices;
+
+namespace TBF.BenchControl.DataEntry.Standard24
+{
+ public class EntryForm : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm, IHasWMStatesForm
+ {
+ private static readonly ILog log = LogManager.GetLogger(typeof(EntryForm));
+ public override string ToString() { return string.Format("DataEntry.Standard24({0})", Cfg.ToString(1)); }
+
+ readonly EntryFormCfg entryFormCfg;
+
+ ///
+ /// Properties set by the Begin, End and WMStates form
+ ///
+ string purchaseOrder;
+ public string PurchaseOrder { get { return purchaseOrder; } }
+
+ string[] serialNr;
+ public string SerialNr(int wmNr) { return (wmNr >= 0 && wmNr < serialNr.Length) ? serialNr[wmNr] : string.Empty; }
+
+ bool[] disabled;
+ public bool Disabled(int wmNr) { return (wmNr >= 0 && wmNr < disabled.Length) ? disabled[wmNr] : false; }
+
+ string[] wmCycleEndState;
+ public string WMCycleEndState(int wmNr) { return (wmNr >= 0 && wmNr < wmCycleEndState.Length) ? wmCycleEndState[wmNr] : string.Empty; }
+
+ float[] wmStartState;
+ public float WMStartState(int wmNr) { return (wmNr >= 0 && wmNr < wmStartState.Length) ? wmStartState[wmNr] : 0; }
+
+ float[] wmEndState;
+ public float WMEndState(int wmNr) { return (wmNr >= 0 && wmNr < wmEndState.Length) ? wmEndState[wmNr] : 0; }
+
+ string[] wmStartStateStr;
+
+
+ System.Windows.Forms.Form modelessDlg;
+
+ float refVolume;
+ float errLimLo;
+ float errLimHi;
+
+ bool resultSaved; /// Set in Run() when results are saved
+
+ IList waterMeters; /// Passesd as an argument of ShowCycleBeginFormOp/ShowCycleEndFormOp constructor
+
+ public enum CurrentOp
+ {
+ None,
+ ShowFormAtCycleBeginning,
+ ShowFormAtCycleEnd,
+ EnterTestStartStates,
+ EnterTestEndStates,
+ }
+
+ CurrentOp currentOp;
+
+
+ public EntryForm(EntryFormCfg cfg)
+ : base(cfg)
+ {
+ serialNr = new string[Program.WMsCount];
+ disabled = new bool[Program.WMsCount];
+ wmStartState = new float[Program.WMsCount];
+ wmStartStateStr = new string[Program.WMsCount];
+ wmEndState = new float[Program.WMsCount];
+ wmCycleEndState = new string[Program.WMsCount];
+
+ entryFormCfg = cfg;
+ currentOp = CurrentOp.None;
+ log.Debug(this.ToString());
+ }
+
+ /// Reference to the operation
+ public IOperation ShowCycleBeginFormOp(IList waterMeters)
+ {
+ if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
+ currentOp = CurrentOp.ShowFormAtCycleBeginning;
+ this.waterMeters = waterMeters;
+ return this;
+ }
+
+ /// Reference to the operation
+ public IOperation ShowCycleEndFormOp(IList waterMeters)
+ {
+ if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
+ currentOp = CurrentOp.ShowFormAtCycleEnd;
+ this.waterMeters = waterMeters;
+ return this;
+ }
+
+ /// Reference to the operation
+ public IOperation ShowTestStartFormOp()
+ {
+ if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
+ currentOp = CurrentOp.EnterTestStartStates;
+ return this;
+ }
+
+ /// Reference to the operation
+ public IOperation ShowTestEndFormOp(float refVolume, float errLimLo, float errLimHi)
+ {
+ if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
+ currentOp = CurrentOp.EnterTestEndStates;
+ this.refVolume = refVolume;
+ this.errLimLo = errLimLo;
+ this.errLimHi = errLimHi;
+ return this;
+ }
+
+ delegate void EntryFormDlgt(EntryForm myRef);
+ ///
+ void OpenBeginningDlg(EntryForm myRef)
+ {
+ myRef.modelessDlg = new CycleBeginningForm(Program.WMsCount);
+ modelessDlg.Show();
+ }
+ ///
+ void OpenEndDlg(EntryForm myRef)
+ {
+ myRef.modelessDlg = new CycleEndForm(Program.WMsCount);
+ modelessDlg.Show();
+ }
+ ///
+ void OpenTestStartStatesDlg(EntryForm myRef)
+ {
+ myRef.modelessDlg = new TestStartEndForm(Program.WMsCount, disabled);
+ modelessDlg.Show();
+ }
+ ///
+ void OpenTestEndStatesDlg(EntryForm myRef)
+ {
+ myRef.modelessDlg = new TestStartEndForm(Program.WMsCount, wmStartStateStr, disabled, refVolume, errLimLo, errLimHi);
+ modelessDlg.Show();
+ }
+
+ /// Start this operation
+ public void Start()
+ {
+ resultSaved = false;
+ switch (currentOp)
+ {
+ case CurrentOp.ShowFormAtCycleBeginning:
+ Program.MainWnd.Invoke(new EntryFormDlgt(OpenBeginningDlg), this);
+ break;
+ case CurrentOp.ShowFormAtCycleEnd:
+ Program.MainWnd.Invoke(new EntryFormDlgt(OpenEndDlg), this);
+ break;
+ case CurrentOp.EnterTestStartStates:
+ Program.MainWnd.Invoke(new EntryFormDlgt(OpenTestStartStatesDlg), this);
+ break;
+ case CurrentOp.EnterTestEndStates:
+ Program.MainWnd.Invoke(new EntryFormDlgt(OpenTestEndStatesDlg), this);
+ break;
+ }
+ }
+
+ /// Run this operation
+ /// Event.ResultsPrinted
+ public Event Run()
+ {
+ if ((modelessDlg is IHasCompleted) && !(modelessDlg as IHasCompleted).Completed)
+ {
+ return Event.ModelessFormIsOpen;
+ }
+
+ if (!resultSaved) /// This is to save the result only once
+ {
+ if (modelessDlg is CycleBeginningForm)
+ {
+ CycleBeginningForm dlg = (modelessDlg as CycleBeginningForm);
+
+ purchaseOrder = dlg.PurchaseOrder;
+
+ for (int i = 0; i < Math.Min(dlg.WaterMetersCount, waterMeters.Count); i++)
+ {
+ if (waterMeters[i] != null)
+ {
+ serialNr[i] = waterMeters[i].SerialNr = dlg.SNText[i];
+ disabled[i] = waterMeters[i].Disabled = dlg.Disabled[i];
+ }
+ }
+ }
+ else if (modelessDlg is CycleEndForm)
+ {
+ CycleEndForm dlg = (modelessDlg as CycleEndForm);
+
+ for (int i = 0; i < Math.Min(dlg.WaterMetersCount, waterMeters.Count); i++)
+ {
+ if (waterMeters[i] != null)
+ {
+ wmCycleEndState[i] = waterMeters[i].EndState = dlg.EndStateText[i];
+ }
+ }
+ }
+ else if (modelessDlg is TestStartEndForm && currentOp == CurrentOp.EnterTestStartStates)
+ {
+ /// Fixed start test - start
+ TestStartEndForm dlg = (modelessDlg as TestStartEndForm);
+
+ for (int i = 0; i < dlg.WaterMetersCount; i++)
+ {
+ wmStartState[i] = dlg.WMStartState[i];
+ wmStartStateStr[i] = dlg.WMStartStateStr[i];
+ }
+ }
+ else if (modelessDlg is TestStartEndForm && currentOp == CurrentOp.EnterTestEndStates)
+ {
+ /// Fixed start test - end
+ TestStartEndForm dlg = (modelessDlg as TestStartEndForm);
+
+ for (int i = 0; i < dlg.WaterMetersCount; i++)
+ {
+ wmEndState[i] = dlg.WMEndState[i];
+ }
+ }
+ resultSaved = true;
+ modelessDlg = null;
+ }
+
+ return Event.ModelessFormClosed; /// Form closed
+ }
+
+ /// Stop this operation
+ public void Stop()
+ {
+ if (modelessDlg is IHasCompleted)
+ {
+ UiBridge.Bridge.OnCloseModelessForm(this, null);
+ modelessDlg = null;
+ }
+ currentOp = CurrentOp.None;
+ }
+
+ ///
+ /// Updates test results with the information collected in watermeters.
+ ///
+ /// Watermetes with information entered in the forms
+ /// Test results to be updated with the information
+ public void UpdateTestResults(IList waterMeters, IList testResults)
+ {
+ foreach (var testRslt in testResults)
+ {
+ if (testRslt.MetersKind != Entities.MetersKind.Single) continue;
+
+ testRslt.PurchaseOrder = PurchaseOrder;
+
+ for (int i = 0; i < testRslt.Meters.Count; i++)
+ {
+ testRslt.Meters[i].SerialNr = SerialNr(i);
+ testRslt.Meters[i].Disabled = Disabled(i);
+ testRslt.Meters[i].EndState = WMCycleEndState(i);
+ }
+ }
+ }
+ }
+}
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfg.cs b/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfg.cs
new file mode 100644
index 000000000..9610b5f8a
--- /dev/null
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfg.cs
@@ -0,0 +1,39 @@
+///
+/// Copyright (c) 2015 Sensus Metering Systems
+///
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml.Serialization;
+using TBF.BenchControl.Generic;
+
+namespace TBF.BenchControl.DataEntry.Standard24
+{
+ public class EntryFormCfg : ComponentCfgBase, Generic.IComponentCfg
+ {
+ public IComponent GetComponent(IList components) { return new EntryForm(this); }
+ public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
+
+ ///
+ /// Serialized parameters
+ ///
+
+ /// Private parameterless constructor invoked by all other (public) constructors
+ EntryFormCfg()
+ {
+ Name = "DataEntry-Standard-24";
+ ParentName = string.Empty;
+ }
+
+ public EntryFormCfg(IComponentFactory factory)
+ : this()
+ {
+ this.Factory = factory;
+ }
+
+ public string ToString(int i)
+ {
+ return string.Format("Name={0}", Name);
+ }
+ }
+}
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.cs b/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.cs
new file mode 100644
index 000000000..2b7798f01
--- /dev/null
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.cs
@@ -0,0 +1,71 @@
+///
+/// Copyright (c) 2015 Sensus Metering Systems
+///
+using System;
+using System.Windows.Forms;
+using log4net;
+using TBF.BenchControl.Generic;
+
+namespace TBF.BenchControl.DataEntry.Standard24
+{
+ public partial class EntryFormCfgCtrl : UserControl, IComponentCfgCtrl
+ {
+ static readonly ILog log = LogManager.GetLogger(typeof(EntryFormCfgCtrl));
+
+ public bool ShowMore { get { return false; } }
+
+ EntryFormCfg config;
+ public IComponentCfg Config
+ {
+ get { return config as IComponentCfg; }
+ set
+ {
+ config = value as EntryFormCfg;
+ Redraw();
+ }
+ }
+
+ public EntryFormCfgCtrl()
+ {
+ InitializeComponent();
+ }
+
+ private void EntryFormCfgCtrl_Load(object sender, EventArgs e)
+ {
+ Redraw();
+ }
+
+ public void Closing()
+ {
+ }
+
+ void Redraw()
+ {
+ if (config == null) return; /// Control was not loaded, settings were not changed
+ classNameLabel.Text = config.Factory.ClassName;
+ nameTextBox.Text = config.Name;
+ }
+
+ public void Unlock()
+ {
+ nameTextBox.Enabled = true;
+ }
+
+ public CfgUpdateFlags VerifyCfg(ref string message)
+ {
+ CfgUpdateFlags flags = CfgUpdateFlags.None;
+ return flags;
+ }
+
+ public CfgUpdateFlags UpdateCfg()
+ {
+ CfgUpdateFlags flags = CfgUpdateFlags.RestartRqrd;
+
+ if (config == null) return CfgUpdateFlags.Error; /// Control was not loaded, settings were not changed
+
+ config.Name = nameTextBox.Text;
+
+ return flags;
+ }
+ }
+}
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.designer.cs b/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.designer.cs
new file mode 100644
index 000000000..8494416f3
--- /dev/null
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.designer.cs
@@ -0,0 +1,86 @@
+///
+/// Copyright (c) 2015 Sensus Metering Systems
+///
+namespace TBF.BenchControl.DataEntry.Standard24
+{
+ partial class EntryFormCfgCtrl
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.nameTextBox = new System.Windows.Forms.TextBox();
+ this.nameLabel = new System.Windows.Forms.Label();
+ this.classNameLabel = new System.Windows.Forms.Label();
+ this.SuspendLayout();
+ //
+ // nameTextBox
+ //
+ this.nameTextBox.Enabled = false;
+ this.nameTextBox.Location = new System.Drawing.Point(137, 57);
+ this.nameTextBox.Name = "nameTextBox";
+ this.nameTextBox.Size = new System.Drawing.Size(130, 20);
+ this.nameTextBox.TabIndex = 5;
+ //
+ // nameLabel
+ //
+ this.nameLabel.AutoSize = true;
+ this.nameLabel.Location = new System.Drawing.Point(27, 60);
+ this.nameLabel.Name = "nameLabel";
+ this.nameLabel.Size = new System.Drawing.Size(35, 13);
+ this.nameLabel.TabIndex = 4;
+ this.nameLabel.Text = "Name";
+ //
+ // classNameLabel
+ //
+ this.classNameLabel.AutoSize = true;
+ this.classNameLabel.Location = new System.Drawing.Point(134, 33);
+ this.classNameLabel.Name = "classNameLabel";
+ this.classNameLabel.Size = new System.Drawing.Size(83, 13);
+ this.classNameLabel.TabIndex = 3;
+ this.classNameLabel.Text = "ComonentName";
+ //
+ // EntryFormCfgCtrl
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.nameTextBox);
+ this.Controls.Add(this.nameLabel);
+ this.Controls.Add(this.classNameLabel);
+ this.Name = "EntryFormCfgCtrl";
+ this.Size = new System.Drawing.Size(300, 200);
+ this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.TextBox nameTextBox;
+ private System.Windows.Forms.Label nameLabel;
+ private System.Windows.Forms.Label classNameLabel;
+ }
+}
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.resx b/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.resx
new file mode 100644
index 000000000..1af7de150
--- /dev/null
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormFactory.cs b/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormFactory.cs
new file mode 100644
index 000000000..a867d1aa3
--- /dev/null
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormFactory.cs
@@ -0,0 +1,21 @@
+///
+/// Copyright (c) 2015 Sensus Metering Systems
+///
+using TBF.BenchControl.Generic;
+
+namespace TBF.BenchControl.DataEntry.Standard24
+{
+ public class EntryFormFactory : IComponentFactory
+ {
+ public string ClassName { get { return "DataEntry-Standard-24"; } }
+
+ public void ResetStaticProperties() { EntryForm.ResetStaticProperties(); }
+
+ public IComponentCfg DefaultConfig() { return new EntryFormCfg(this); }
+
+ public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component)
+ {
+ return ComponentCfgBase.CreateFromDbEntity(typeof(EntryFormCfg), component, this);
+ }
+ }
+}
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.cs
new file mode 100644
index 000000000..e1291289f
--- /dev/null
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.cs
@@ -0,0 +1,460 @@
+///
+/// Copyright (c) 2015 Sensus Metering Systems
+///
+using System;
+using System.Windows.Forms;
+using log4net;
+using TBF.Resources;
+
+namespace TBF.BenchControl.DataEntry.Standard24
+{
+ public partial class TestStartEndForm : Form, GenericDevices.IHasCompleted
+ {
+ private static readonly ILog log = LogManager.GetLogger(typeof(TestStartEndForm));
+
+ // Set to 'true' when the form closes
+ public bool Completed { get { return completed; } }
+ bool completed;
+
+ /// Number of text boxes for serial numbers
+ public readonly int WaterMetersCount;
+
+ readonly bool[] disabled;
+
+ // To be retrieved after the form closes
+ public float[] WMStartState;
+
+ // To be retrieved after the form closes
+ public readonly string[] WMStartStateStr;
+
+ // To be retrieved after the form closes
+ public float[] WMEndState;
+
+ bool endStates; /// false=start states, true=end states
+ float refVolume;
+ float warningLimLo; /// limit to display exclamation mark, typically 2x errLimLo
+ float warningLimHi; /// limit to display exclamation mark, typically 2x errLimHi
+
+ ///
+ /// Constructor to fill in start states
+ ///
+ /// Number of text boxes for serial numbers
+ public TestStartEndForm(int waterMetersCount, bool[] disabled)
+ {
+ endStates = false;
+
+ this.WaterMetersCount = waterMetersCount;
+ this.disabled = disabled;
+
+ InitializeComponent();
+ WMStartState = new float[waterMetersCount];
+ WMStartStateStr = new string[waterMetersCount];
+ completed = false;
+ StartForceCloseHandler();
+ }
+
+ ///
+ /// Constructor to fill in end states
+ ///
+ /// Number of text boxes for serial numbers
+ public TestStartEndForm(int waterMetersCount, string[] wmStartStateStr, bool[] disabled,
+ float refVolume, float errLimLo, float errLimHi)
+ {
+ endStates = true;
+
+ this.WaterMetersCount = waterMetersCount;
+ this.WMStartStateStr = wmStartStateStr;
+ if (wmStartStateStr == null || wmStartStateStr.Length != waterMetersCount)
+ throw (new Exception("Invalid 'wmStartStateStr' argument"));
+ this.disabled = disabled;
+ this.refVolume = refVolume;
+ this.warningLimLo = 2 * errLimLo;
+ this.warningLimHi = 2 * errLimHi;
+
+ InitializeComponent();
+ WMEndState = new float[waterMetersCount];
+ completed = false;
+ StartForceCloseHandler();
+ }
+
+ /// Parameterless constructor for all watermeters
+ public TestStartEndForm()
+ : this(Program.WMsCount, null)
+ {
+ }
+
+ private void CycleEndForm_Load(object sender, EventArgs e)
+ {
+ Localize();
+
+ Height = 115 + 90 * WaterMetersCount;
+
+ if (WaterMetersCount < 1) groupBox1.Visible = false;
+ if (WaterMetersCount < 2) groupBox2.Visible = false;
+ if (WaterMetersCount < 3) groupBox3.Visible = false;
+ if (WaterMetersCount < 4) groupBox4.Visible = false;
+ if (WaterMetersCount < 5) groupBox5.Visible = false;
+ if (WaterMetersCount < 6) groupBox6.Visible = false;
+
+ if (endStates)
+ {
+ if (WaterMetersCount >= 1) wmStartStateTextBox1.Text = WMStartStateStr[0];
+ if (WaterMetersCount >= 2) wmStartStateTextBox2.Text = WMStartStateStr[1];
+ if (WaterMetersCount >= 3) wmStartStateTextBox3.Text = WMStartStateStr[2];
+ if (WaterMetersCount >= 4) wmStartStateTextBox4.Text = WMStartStateStr[3];
+ if (WaterMetersCount >= 5) wmStartStateTextBox5.Text = WMStartStateStr[4];
+ if (WaterMetersCount >= 6) wmStartStateTextBox6.Text = WMStartStateStr[5];
+ wmEndStateTextBox1.Enabled = (disabled == null || disabled.Length < 1 || !disabled[0]);
+ wmEndStateTextBox2.Enabled = (disabled == null || disabled.Length < 2 || !disabled[1]);
+ wmEndStateTextBox3.Enabled = (disabled == null || disabled.Length < 3 || !disabled[2]);
+ wmEndStateTextBox4.Enabled = (disabled == null || disabled.Length < 4 || !disabled[3]);
+ wmEndStateTextBox5.Enabled = (disabled == null || disabled.Length < 5 || !disabled[4]);
+ wmEndStateTextBox6.Enabled = (disabled == null || disabled.Length < 6 || !disabled[5]);
+ }
+ else
+ {
+ wmStartStateTextBox1.Enabled = (disabled == null || disabled.Length < 1 || !disabled[0]);
+ wmStartStateTextBox2.Enabled = (disabled == null || disabled.Length < 2 || !disabled[1]);
+ wmStartStateTextBox3.Enabled = (disabled == null || disabled.Length < 3 || !disabled[2]);
+ wmStartStateTextBox4.Enabled = (disabled == null || disabled.Length < 4 || !disabled[3]);
+ wmStartStateTextBox5.Enabled = (disabled == null || disabled.Length < 5 || !disabled[4]);
+ wmStartStateTextBox6.Enabled = (disabled == null || disabled.Length < 6 || !disabled[5]);
+ }
+ }
+
+ void Localize()
+ {
+ Text = Strings.Water_Meter_States;
+ groupBox1.Text = Strings.Water_Meter + " 1";
+ groupBox2.Text = Strings.Water_Meter + " 2";
+ groupBox3.Text = Strings.Water_Meter + " 3";
+ groupBox4.Text = Strings.Water_Meter + " 4";
+ groupBox5.Text = Strings.Water_Meter + " 5";
+ groupBox6.Text = Strings.Water_Meter + " 6";
+ wmStateLabel1.Text = Strings.WMState;
+ wmStateLabel2.Text = Strings.WMState;
+ wmStateLabel3.Text = Strings.WMState;
+ wmStateLabel4.Text = Strings.WMState;
+ wmStateLabel5.Text = Strings.WMState;
+ wmStateLabel6.Text = Strings.WMState;
+ startLabel.Text = Strings.Start;
+ endLabel.Text = Strings.End;
+ okButton.Text = Strings.OkBtnText;
+ }
+
+ private void okButton_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ if (endStates)
+ {
+ if (wmEndStateTextBox1.Enabled) WMEndState[0] = Utils.ParseUFloat(wmEndStateTextBox1.Text);
+ if (wmEndStateTextBox2.Enabled) WMEndState[1] = Utils.ParseUFloat(wmEndStateTextBox2.Text);
+ if (wmEndStateTextBox3.Enabled) WMEndState[2] = Utils.ParseUFloat(wmEndStateTextBox3.Text);
+ if (wmEndStateTextBox4.Enabled) WMEndState[3] = Utils.ParseUFloat(wmEndStateTextBox4.Text);
+ if (wmEndStateTextBox5.Enabled) WMEndState[4] = Utils.ParseUFloat(wmEndStateTextBox5.Text);
+ if (wmEndStateTextBox6.Enabled) WMEndState[5] = Utils.ParseUFloat(wmEndStateTextBox6.Text);
+ }
+ else
+ {
+ if (wmStartStateTextBox1.Enabled)
+ {
+ WMStartStateStr[0] = wmStartStateTextBox1.Text;
+ WMStartState[0] = Utils.ParseUFloat(wmStartStateTextBox1.Text);
+ }
+ if (wmStartStateTextBox2.Enabled)
+ {
+ WMStartStateStr[1] = wmStartStateTextBox2.Text;
+ WMStartState[1] = Utils.ParseUFloat(wmStartStateTextBox2.Text);
+ }
+ if (wmStartStateTextBox3.Enabled)
+ {
+ WMStartStateStr[2] = wmStartStateTextBox3.Text;
+ WMStartState[2] = Utils.ParseUFloat(wmStartStateTextBox3.Text);
+ }
+ if (wmStartStateTextBox4.Enabled)
+ {
+ WMStartStateStr[3] = wmStartStateTextBox4.Text;
+ WMStartState[3] = Utils.ParseUFloat(wmStartStateTextBox4.Text);
+ }
+ if (wmStartStateTextBox5.Enabled)
+ {
+ WMStartStateStr[4] = wmStartStateTextBox5.Text;
+ WMStartState[4] = Utils.ParseUFloat(wmStartStateTextBox5.Text);
+ }
+ if (wmStartStateTextBox6.Enabled)
+ {
+ WMStartStateStr[5] = wmStartStateTextBox6.Text;
+ WMStartState[5] = Utils.ParseUFloat(wmStartStateTextBox6.Text);
+ }
+ }
+ }
+ catch
+ {
+ return;
+ }
+
+ completed = true;
+ Close();
+ }
+
+ #region Forced close handling
+
+ public void StartForceCloseHandler()
+ {
+ UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args)
+ {
+ if (InvokeRequired) { Invoke(new EventHandler(OnForceClose), sender, args); }
+ else OnForceClose(sender, args);
+ };
+ }
+
+ void OnForceClose(object sender, EventArgs args)
+ {
+ DialogResult = DialogResult.Cancel;
+ Close();
+ }
+
+ #endregion
+
+ private void wmEndStateTextBox1_TextChanged(object sender, EventArgs e)
+ {
+ float err = 0;
+ try
+ {
+ float endState = Utils.ParseUFloat(wmEndStateTextBox1.Text);
+ float startState = Utils.ParseUFloat(wmStartStateTextBox1.Text);
+ err = 100.0f * (endState - startState - refVolume) / refVolume;
+ }
+ catch { };
+
+ exclamation1.Visible = (err < warningLimLo) || (warningLimHi < err);
+ }
+
+ private void wmEndStateTextBox2_TextChanged(object sender, EventArgs e)
+ {
+ float err = 0;
+ try
+ {
+ float endState = Utils.ParseUFloat(wmEndStateTextBox2.Text);
+ float startState = Utils.ParseUFloat(wmStartStateTextBox2.Text);
+ err = 100.0f * (endState - startState - refVolume) / refVolume;
+ }
+ catch { err = 1000.0f; };
+
+ exclamation2.Visible = (err < warningLimLo) || (warningLimHi < err);
+ }
+
+ private void wmEndStateTextBox3_TextChanged(object sender, EventArgs e)
+ {
+ float err = 0;
+ try
+ {
+ float endState = Utils.ParseUFloat(wmEndStateTextBox3.Text);
+ float startState = Utils.ParseUFloat(wmStartStateTextBox3.Text);
+ err = 100.0f * (endState - startState - refVolume) / refVolume;
+ }
+ catch { err = 1000.0f; };
+
+ exclamation3.Visible = (err < warningLimLo) || (warningLimHi < err);
+ }
+
+ private void wmEndStateTextBox4_TextChanged(object sender, EventArgs e)
+ {
+ float err = 0;
+ try
+ {
+ float endState = Utils.ParseUFloat(wmEndStateTextBox4.Text);
+ float startState = Utils.ParseUFloat(wmStartStateTextBox4.Text);
+ err = 100.0f * (endState - startState - refVolume) / refVolume;
+ }
+ catch { err = 1000.0f; };
+
+ exclamation4.Visible = (err < warningLimLo) || (warningLimHi < err);
+ }
+
+ private void wmEndStateTextBox5_TextChanged(object sender, EventArgs e)
+ {
+ float err = 0;
+ try
+ {
+ float endState = Utils.ParseUFloat(wmEndStateTextBox5.Text);
+ float startState = Utils.ParseUFloat(wmStartStateTextBox5.Text);
+ err = 100.0f * (endState - startState - refVolume) / refVolume;
+ }
+ catch { err = 1000.0f; };
+
+ exclamation5.Visible = (err < warningLimLo) || (warningLimHi < err);
+ }
+
+ private void wmEndStateTextBox6_TextChanged(object sender, EventArgs e)
+ {
+ float err = 0;
+ try
+ {
+ float endState = Utils.ParseUFloat(wmEndStateTextBox6.Text);
+ float startState = Utils.ParseUFloat(wmStartStateTextBox6.Text);
+ err = 100.0f * (endState - startState - refVolume) / refVolume;
+ }
+ catch { err = 1000.0f; };
+
+ exclamation6.Visible = (err < warningLimLo) || (warningLimHi < err);
+ }
+
+ private void wmStartStateTextBox1_KeyPress(object sender, KeyPressEventArgs e)
+ {
+ if (e.KeyChar == '\r')
+ {
+ if (wmStartStateTextBox2.Enabled) wmStartStateTextBox2.Focus();
+ else if (wmStartStateTextBox3.Enabled) wmStartStateTextBox3.Focus();
+ else if (wmStartStateTextBox4.Enabled) wmStartStateTextBox4.Focus();
+ else if (wmStartStateTextBox5.Enabled) wmStartStateTextBox5.Focus();
+ else if (wmStartStateTextBox6.Enabled) wmStartStateTextBox6.Focus();
+ }
+ else if (e.KeyChar == '+') okButton_Click(sender, e);
+ }
+
+ private void wmStartStateTextBox2_KeyPress(object sender, KeyPressEventArgs e)
+ {
+ if (e.KeyChar == '\r')
+ {
+ if (wmStartStateTextBox3.Enabled) wmStartStateTextBox3.Focus();
+ else if (wmStartStateTextBox4.Enabled) wmStartStateTextBox4.Focus();
+ else if (wmStartStateTextBox5.Enabled) wmStartStateTextBox5.Focus();
+ else if (wmStartStateTextBox6.Enabled) wmStartStateTextBox6.Focus();
+ else if (wmStartStateTextBox1.Enabled) wmStartStateTextBox1.Focus();
+ }
+ else if (e.KeyChar == '+') okButton_Click(sender, e);
+ }
+
+ private void wmStartStateTextBox3_KeyPress(object sender, KeyPressEventArgs e)
+ {
+ if (e.KeyChar == '\r')
+ {
+ if (wmStartStateTextBox4.Enabled) wmStartStateTextBox4.Focus();
+ else if (wmStartStateTextBox5.Enabled) wmStartStateTextBox5.Focus();
+ else if (wmStartStateTextBox6.Enabled) wmStartStateTextBox6.Focus();
+ else if (wmStartStateTextBox1.Enabled) wmStartStateTextBox1.Focus();
+ else if (wmStartStateTextBox2.Enabled) wmStartStateTextBox2.Focus();
+ }
+ else if (e.KeyChar == '+') okButton_Click(sender, e);
+ }
+
+ private void wmStartStateTextBox4_KeyPress(object sender, KeyPressEventArgs e)
+ {
+ if (e.KeyChar == '\r')
+ {
+ if (wmStartStateTextBox5.Enabled) wmStartStateTextBox5.Focus();
+ else if (wmStartStateTextBox6.Enabled) wmStartStateTextBox6.Focus();
+ else if (wmStartStateTextBox1.Enabled) wmStartStateTextBox1.Focus();
+ else if (wmStartStateTextBox2.Enabled) wmStartStateTextBox2.Focus();
+ else if (wmStartStateTextBox3.Enabled) wmStartStateTextBox3.Focus();
+ }
+ else if (e.KeyChar == '+') okButton_Click(sender, e);
+ }
+
+ private void wmStartStateTextBox5_KeyPress(object sender, KeyPressEventArgs e)
+ {
+ if (e.KeyChar == '\r')
+ {
+ if (wmStartStateTextBox6.Enabled) wmStartStateTextBox6.Focus();
+ else if (wmStartStateTextBox1.Enabled) wmStartStateTextBox1.Focus();
+ else if (wmStartStateTextBox2.Enabled) wmStartStateTextBox2.Focus();
+ else if (wmStartStateTextBox3.Enabled) wmStartStateTextBox3.Focus();
+ else if (wmStartStateTextBox4.Enabled) wmStartStateTextBox4.Focus();
+ }
+ else if (e.KeyChar == '+') okButton_Click(sender, e);
+ }
+
+ private void wmStartStateTextBox6_KeyPress(object sender, KeyPressEventArgs e)
+ {
+ if (e.KeyChar == '\r')
+ {
+ if (wmStartStateTextBox1.Enabled) wmStartStateTextBox1.Focus();
+ else if (wmStartStateTextBox1.Enabled) wmStartStateTextBox1.Focus();
+ else if (wmStartStateTextBox3.Enabled) wmStartStateTextBox3.Focus();
+ else if (wmStartStateTextBox4.Enabled) wmStartStateTextBox4.Focus();
+ else if (wmStartStateTextBox5.Enabled) wmStartStateTextBox5.Focus();
+ }
+ else if (e.KeyChar == '+') okButton_Click(sender, e);
+ }
+
+ private void wmEndStateTextBox1_KeyPress(object sender, KeyPressEventArgs e)
+ {
+ if (e.KeyChar == '\r')
+ {
+ if (wmEndStateTextBox2.Enabled) wmEndStateTextBox2.Focus();
+ else if (wmEndStateTextBox3.Enabled) wmEndStateTextBox3.Focus();
+ else if (wmEndStateTextBox4.Enabled) wmEndStateTextBox4.Focus();
+ else if (wmEndStateTextBox5.Enabled) wmEndStateTextBox5.Focus();
+ else if (wmEndStateTextBox6.Enabled) wmEndStateTextBox6.Focus();
+ }
+ else if (e.KeyChar == '+') okButton_Click(sender, e);
+ }
+
+ private void wmEndStateTextBox2_KeyPress(object sender, KeyPressEventArgs e)
+ {
+ if (e.KeyChar == '\r')
+ {
+ if (wmEndStateTextBox3.Enabled) wmEndStateTextBox3.Focus();
+ else if (wmEndStateTextBox4.Enabled) wmEndStateTextBox4.Focus();
+ else if (wmEndStateTextBox5.Enabled) wmEndStateTextBox5.Focus();
+ else if (wmEndStateTextBox6.Enabled) wmEndStateTextBox6.Focus();
+ else if (wmEndStateTextBox1.Enabled) wmEndStateTextBox1.Focus();
+ }
+ else if (e.KeyChar == '+') okButton_Click(sender, e);
+ }
+
+ private void wmEndStateTextBox3_KeyPress(object sender, KeyPressEventArgs e)
+ {
+ if (e.KeyChar == '\r')
+ {
+ if (wmEndStateTextBox4.Enabled) wmEndStateTextBox4.Focus();
+ else if (wmEndStateTextBox5.Enabled) wmEndStateTextBox5.Focus();
+ else if (wmEndStateTextBox6.Enabled) wmEndStateTextBox6.Focus();
+ else if (wmEndStateTextBox1.Enabled) wmEndStateTextBox1.Focus();
+ else if (wmEndStateTextBox2.Enabled) wmEndStateTextBox2.Focus();
+ }
+ else if (e.KeyChar == '+') okButton_Click(sender, e);
+ }
+
+ private void wmEndStateTextBox4_KeyPress(object sender, KeyPressEventArgs e)
+ {
+ if (e.KeyChar == '\r')
+ {
+ if (wmEndStateTextBox5.Enabled) wmEndStateTextBox5.Focus();
+ else if (wmEndStateTextBox6.Enabled) wmEndStateTextBox6.Focus();
+ else if (wmEndStateTextBox1.Enabled) wmEndStateTextBox1.Focus();
+ else if (wmEndStateTextBox2.Enabled) wmEndStateTextBox2.Focus();
+ else if (wmEndStateTextBox3.Enabled) wmEndStateTextBox3.Focus();
+ }
+ else if (e.KeyChar == '+') okButton_Click(sender, e);
+ }
+
+ private void wmEndStateTextBox5_KeyPress(object sender, KeyPressEventArgs e)
+ {
+ if (e.KeyChar == '\r')
+ {
+ if (wmEndStateTextBox6.Enabled) wmEndStateTextBox6.Focus();
+ else if (wmEndStateTextBox1.Enabled) wmEndStateTextBox1.Focus();
+ else if (wmEndStateTextBox2.Enabled) wmEndStateTextBox2.Focus();
+ else if (wmEndStateTextBox3.Enabled) wmEndStateTextBox3.Focus();
+ else if (wmEndStateTextBox4.Enabled) wmEndStateTextBox4.Focus();
+ }
+ else if (e.KeyChar == '+') okButton_Click(sender, e);
+ }
+
+ private void wmEndStateTextBox6_KeyPress(object sender, KeyPressEventArgs e)
+ {
+ if (e.KeyChar == '\r')
+ {
+ if (wmEndStateTextBox1.Enabled) wmEndStateTextBox1.Focus();
+ else if (wmEndStateTextBox1.Enabled) wmEndStateTextBox1.Focus();
+ else if (wmEndStateTextBox3.Enabled) wmEndStateTextBox3.Focus();
+ else if (wmEndStateTextBox4.Enabled) wmEndStateTextBox4.Focus();
+ else if (wmEndStateTextBox5.Enabled) wmEndStateTextBox5.Focus();
+ }
+ else if (e.KeyChar == '+') okButton_Click(sender, e);
+ }
+ }
+}
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.designer.cs b/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.designer.cs
new file mode 100644
index 000000000..d8f56b606
--- /dev/null
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.designer.cs
@@ -0,0 +1,512 @@
+///
+/// Copyright (c) 2015 Sensus Metering Systems
+///
+namespace TBF.BenchControl.DataEntry.Standard24
+{
+ partial class TestStartEndForm
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.exclamation2 = new System.Windows.Forms.Label();
+ this.wmStartStateTextBox2 = new System.Windows.Forms.TextBox();
+ this.wmEndStateTextBox2 = new System.Windows.Forms.TextBox();
+ this.wmStateLabel2 = new System.Windows.Forms.Label();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.exclamation1 = new System.Windows.Forms.Label();
+ this.wmStartStateTextBox1 = new System.Windows.Forms.TextBox();
+ this.wmEndStateTextBox1 = new System.Windows.Forms.TextBox();
+ this.wmStateLabel1 = new System.Windows.Forms.Label();
+ this.okButton = new System.Windows.Forms.Button();
+ this.groupBox3 = new System.Windows.Forms.GroupBox();
+ this.exclamation3 = new System.Windows.Forms.Label();
+ this.wmStartStateTextBox3 = new System.Windows.Forms.TextBox();
+ this.wmEndStateTextBox3 = new System.Windows.Forms.TextBox();
+ this.wmStateLabel3 = new System.Windows.Forms.Label();
+ this.groupBox4 = new System.Windows.Forms.GroupBox();
+ this.exclamation4 = new System.Windows.Forms.Label();
+ this.wmStartStateTextBox4 = new System.Windows.Forms.TextBox();
+ this.wmEndStateTextBox4 = new System.Windows.Forms.TextBox();
+ this.wmStateLabel4 = new System.Windows.Forms.Label();
+ this.groupBox5 = new System.Windows.Forms.GroupBox();
+ this.exclamation5 = new System.Windows.Forms.Label();
+ this.wmStartStateTextBox5 = new System.Windows.Forms.TextBox();
+ this.wmEndStateTextBox5 = new System.Windows.Forms.TextBox();
+ this.wmStateLabel5 = new System.Windows.Forms.Label();
+ this.groupBox6 = new System.Windows.Forms.GroupBox();
+ this.exclamation6 = new System.Windows.Forms.Label();
+ this.wmStartStateTextBox6 = new System.Windows.Forms.TextBox();
+ this.wmEndStateTextBox6 = new System.Windows.Forms.TextBox();
+ this.wmStateLabel6 = new System.Windows.Forms.Label();
+ this.startLabel = new System.Windows.Forms.Label();
+ this.endLabel = new System.Windows.Forms.Label();
+ this.groupBox2.SuspendLayout();
+ this.groupBox1.SuspendLayout();
+ this.groupBox3.SuspendLayout();
+ this.groupBox4.SuspendLayout();
+ this.groupBox5.SuspendLayout();
+ this.groupBox6.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // groupBox2
+ //
+ this.groupBox2.Controls.Add(this.exclamation2);
+ this.groupBox2.Controls.Add(this.wmStartStateTextBox2);
+ this.groupBox2.Controls.Add(this.wmEndStateTextBox2);
+ this.groupBox2.Controls.Add(this.wmStateLabel2);
+ 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, 122);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Size = new System.Drawing.Size(547, 81);
+ this.groupBox2.TabIndex = 2;
+ this.groupBox2.TabStop = false;
+ this.groupBox2.Text = "Water Meter 2";
+ //
+ // exclamation2
+ //
+ this.exclamation2.AutoSize = true;
+ this.exclamation2.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.exclamation2.ForeColor = System.Drawing.Color.Red;
+ this.exclamation2.Location = new System.Drawing.Point(515, 27);
+ this.exclamation2.Name = "exclamation2";
+ this.exclamation2.Size = new System.Drawing.Size(30, 38);
+ this.exclamation2.TabIndex = 4;
+ this.exclamation2.Text = "!";
+ this.exclamation2.Visible = false;
+ //
+ // wmStartStateTextBox2
+ //
+ this.wmStartStateTextBox2.Enabled = false;
+ this.wmStartStateTextBox2.Location = new System.Drawing.Point(164, 31);
+ this.wmStartStateTextBox2.Name = "wmStartStateTextBox2";
+ this.wmStartStateTextBox2.Size = new System.Drawing.Size(163, 31);
+ this.wmStartStateTextBox2.TabIndex = 3;
+ this.wmStartStateTextBox2.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.wmStartStateTextBox2_KeyPress);
+ //
+ // wmEndStateTextBox2
+ //
+ this.wmEndStateTextBox2.Enabled = false;
+ this.wmEndStateTextBox2.Location = new System.Drawing.Point(350, 31);
+ this.wmEndStateTextBox2.Name = "wmEndStateTextBox2";
+ this.wmEndStateTextBox2.Size = new System.Drawing.Size(163, 31);
+ this.wmEndStateTextBox2.TabIndex = 1;
+ this.wmEndStateTextBox2.TextChanged += new System.EventHandler(this.wmEndStateTextBox2_TextChanged);
+ this.wmEndStateTextBox2.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.wmEndStateTextBox2_KeyPress);
+ //
+ // wmStateLabel2
+ //
+ this.wmStateLabel2.AutoSize = true;
+ this.wmStateLabel2.Location = new System.Drawing.Point(18, 34);
+ this.wmStateLabel2.Name = "wmStateLabel2";
+ this.wmStateLabel2.Size = new System.Drawing.Size(68, 23);
+ this.wmStateLabel2.TabIndex = 0;
+ this.wmStateLabel2.Text = "State:";
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.exclamation1);
+ this.groupBox1.Controls.Add(this.wmStartStateTextBox1);
+ this.groupBox1.Controls.Add(this.wmEndStateTextBox1);
+ this.groupBox1.Controls.Add(this.wmStateLabel1);
+ 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, 32);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(547, 81);
+ this.groupBox1.TabIndex = 1;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "Water Meter 1";
+ //
+ // exclamation1
+ //
+ this.exclamation1.AutoSize = true;
+ this.exclamation1.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.exclamation1.ForeColor = System.Drawing.Color.Red;
+ this.exclamation1.Location = new System.Drawing.Point(515, 27);
+ this.exclamation1.Name = "exclamation1";
+ this.exclamation1.Size = new System.Drawing.Size(30, 38);
+ this.exclamation1.TabIndex = 3;
+ this.exclamation1.Text = "!";
+ this.exclamation1.Visible = false;
+ //
+ // wmStartStateTextBox1
+ //
+ this.wmStartStateTextBox1.Enabled = false;
+ this.wmStartStateTextBox1.Location = new System.Drawing.Point(164, 31);
+ this.wmStartStateTextBox1.Name = "wmStartStateTextBox1";
+ this.wmStartStateTextBox1.Size = new System.Drawing.Size(163, 31);
+ this.wmStartStateTextBox1.TabIndex = 2;
+ this.wmStartStateTextBox1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.wmStartStateTextBox1_KeyPress);
+ //
+ // wmEndStateTextBox1
+ //
+ this.wmEndStateTextBox1.Enabled = false;
+ this.wmEndStateTextBox1.Location = new System.Drawing.Point(350, 31);
+ this.wmEndStateTextBox1.Name = "wmEndStateTextBox1";
+ this.wmEndStateTextBox1.Size = new System.Drawing.Size(163, 31);
+ this.wmEndStateTextBox1.TabIndex = 1;
+ this.wmEndStateTextBox1.TextChanged += new System.EventHandler(this.wmEndStateTextBox1_TextChanged);
+ this.wmEndStateTextBox1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.wmEndStateTextBox1_KeyPress);
+ //
+ // wmStateLabel1
+ //
+ this.wmStateLabel1.AutoSize = true;
+ this.wmStateLabel1.Location = new System.Drawing.Point(18, 34);
+ this.wmStateLabel1.Name = "wmStateLabel1";
+ this.wmStateLabel1.Size = new System.Drawing.Size(68, 23);
+ this.wmStateLabel1.TabIndex = 0;
+ this.wmStateLabel1.Text = "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(603, 46);
+ this.okButton.Name = "okButton";
+ this.okButton.Size = new System.Drawing.Size(98, 63);
+ this.okButton.TabIndex = 7;
+ this.okButton.Text = "OK";
+ this.okButton.UseVisualStyleBackColor = true;
+ this.okButton.Click += new System.EventHandler(this.okButton_Click);
+ //
+ // groupBox3
+ //
+ this.groupBox3.Controls.Add(this.exclamation3);
+ this.groupBox3.Controls.Add(this.wmStartStateTextBox3);
+ this.groupBox3.Controls.Add(this.wmEndStateTextBox3);
+ this.groupBox3.Controls.Add(this.wmStateLabel3);
+ 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(25, 212);
+ this.groupBox3.Name = "groupBox3";
+ this.groupBox3.Size = new System.Drawing.Size(547, 81);
+ this.groupBox3.TabIndex = 3;
+ this.groupBox3.TabStop = false;
+ this.groupBox3.Text = "Water Meter 3";
+ //
+ // exclamation3
+ //
+ this.exclamation3.AutoSize = true;
+ this.exclamation3.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.exclamation3.ForeColor = System.Drawing.Color.Red;
+ this.exclamation3.Location = new System.Drawing.Point(515, 27);
+ this.exclamation3.Name = "exclamation3";
+ this.exclamation3.Size = new System.Drawing.Size(30, 38);
+ this.exclamation3.TabIndex = 5;
+ this.exclamation3.Text = "!";
+ this.exclamation3.Visible = false;
+ //
+ // wmStartStateTextBox3
+ //
+ this.wmStartStateTextBox3.Enabled = false;
+ this.wmStartStateTextBox3.Location = new System.Drawing.Point(164, 31);
+ this.wmStartStateTextBox3.Name = "wmStartStateTextBox3";
+ this.wmStartStateTextBox3.Size = new System.Drawing.Size(163, 31);
+ this.wmStartStateTextBox3.TabIndex = 4;
+ this.wmStartStateTextBox3.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.wmStartStateTextBox3_KeyPress);
+ //
+ // wmEndStateTextBox3
+ //
+ this.wmEndStateTextBox3.Enabled = false;
+ this.wmEndStateTextBox3.Location = new System.Drawing.Point(350, 31);
+ this.wmEndStateTextBox3.Name = "wmEndStateTextBox3";
+ this.wmEndStateTextBox3.Size = new System.Drawing.Size(163, 31);
+ this.wmEndStateTextBox3.TabIndex = 1;
+ this.wmEndStateTextBox3.TextChanged += new System.EventHandler(this.wmEndStateTextBox3_TextChanged);
+ this.wmEndStateTextBox3.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.wmEndStateTextBox3_KeyPress);
+ //
+ // wmStateLabel3
+ //
+ this.wmStateLabel3.AutoSize = true;
+ this.wmStateLabel3.Location = new System.Drawing.Point(18, 34);
+ this.wmStateLabel3.Name = "wmStateLabel3";
+ this.wmStateLabel3.Size = new System.Drawing.Size(68, 23);
+ this.wmStateLabel3.TabIndex = 0;
+ this.wmStateLabel3.Text = "State:";
+ //
+ // groupBox4
+ //
+ this.groupBox4.Controls.Add(this.exclamation4);
+ this.groupBox4.Controls.Add(this.wmStartStateTextBox4);
+ this.groupBox4.Controls.Add(this.wmEndStateTextBox4);
+ this.groupBox4.Controls.Add(this.wmStateLabel4);
+ this.groupBox4.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.groupBox4.ForeColor = System.Drawing.Color.Black;
+ this.groupBox4.Location = new System.Drawing.Point(25, 302);
+ this.groupBox4.Name = "groupBox4";
+ this.groupBox4.Size = new System.Drawing.Size(547, 81);
+ this.groupBox4.TabIndex = 4;
+ this.groupBox4.TabStop = false;
+ this.groupBox4.Text = "Water Meter 4";
+ //
+ // exclamation4
+ //
+ this.exclamation4.AutoSize = true;
+ this.exclamation4.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.exclamation4.ForeColor = System.Drawing.Color.Red;
+ this.exclamation4.Location = new System.Drawing.Point(515, 27);
+ this.exclamation4.Name = "exclamation4";
+ this.exclamation4.Size = new System.Drawing.Size(30, 38);
+ this.exclamation4.TabIndex = 5;
+ this.exclamation4.Text = "!";
+ this.exclamation4.Visible = false;
+ //
+ // wmStartStateTextBox4
+ //
+ this.wmStartStateTextBox4.Enabled = false;
+ this.wmStartStateTextBox4.Location = new System.Drawing.Point(164, 31);
+ this.wmStartStateTextBox4.Name = "wmStartStateTextBox4";
+ this.wmStartStateTextBox4.Size = new System.Drawing.Size(163, 31);
+ this.wmStartStateTextBox4.TabIndex = 4;
+ this.wmStartStateTextBox4.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.wmStartStateTextBox4_KeyPress);
+ //
+ // wmEndStateTextBox4
+ //
+ this.wmEndStateTextBox4.Enabled = false;
+ this.wmEndStateTextBox4.Location = new System.Drawing.Point(350, 31);
+ this.wmEndStateTextBox4.Name = "wmEndStateTextBox4";
+ this.wmEndStateTextBox4.Size = new System.Drawing.Size(163, 31);
+ this.wmEndStateTextBox4.TabIndex = 1;
+ this.wmEndStateTextBox4.TextChanged += new System.EventHandler(this.wmEndStateTextBox4_TextChanged);
+ this.wmEndStateTextBox4.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.wmEndStateTextBox4_KeyPress);
+ //
+ // wmStateLabel4
+ //
+ this.wmStateLabel4.AutoSize = true;
+ this.wmStateLabel4.Location = new System.Drawing.Point(18, 34);
+ this.wmStateLabel4.Name = "wmStateLabel4";
+ this.wmStateLabel4.Size = new System.Drawing.Size(68, 23);
+ this.wmStateLabel4.TabIndex = 0;
+ this.wmStateLabel4.Text = "State:";
+ //
+ // groupBox5
+ //
+ this.groupBox5.Controls.Add(this.exclamation5);
+ this.groupBox5.Controls.Add(this.wmStartStateTextBox5);
+ this.groupBox5.Controls.Add(this.wmEndStateTextBox5);
+ this.groupBox5.Controls.Add(this.wmStateLabel5);
+ this.groupBox5.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.groupBox5.ForeColor = System.Drawing.Color.Black;
+ this.groupBox5.Location = new System.Drawing.Point(25, 392);
+ this.groupBox5.Name = "groupBox5";
+ this.groupBox5.Size = new System.Drawing.Size(547, 81);
+ this.groupBox5.TabIndex = 5;
+ this.groupBox5.TabStop = false;
+ this.groupBox5.Text = "Water Meter 5";
+ //
+ // exclamation5
+ //
+ this.exclamation5.AutoSize = true;
+ this.exclamation5.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.exclamation5.ForeColor = System.Drawing.Color.Red;
+ this.exclamation5.Location = new System.Drawing.Point(515, 27);
+ this.exclamation5.Name = "exclamation5";
+ this.exclamation5.Size = new System.Drawing.Size(30, 38);
+ this.exclamation5.TabIndex = 5;
+ this.exclamation5.Text = "!";
+ this.exclamation5.Visible = false;
+ //
+ // wmStartStateTextBox5
+ //
+ this.wmStartStateTextBox5.Enabled = false;
+ this.wmStartStateTextBox5.Location = new System.Drawing.Point(164, 31);
+ this.wmStartStateTextBox5.Name = "wmStartStateTextBox5";
+ this.wmStartStateTextBox5.Size = new System.Drawing.Size(163, 31);
+ this.wmStartStateTextBox5.TabIndex = 4;
+ this.wmStartStateTextBox5.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.wmStartStateTextBox5_KeyPress);
+ //
+ // wmEndStateTextBox5
+ //
+ this.wmEndStateTextBox5.Enabled = false;
+ this.wmEndStateTextBox5.Location = new System.Drawing.Point(350, 31);
+ this.wmEndStateTextBox5.Name = "wmEndStateTextBox5";
+ this.wmEndStateTextBox5.Size = new System.Drawing.Size(163, 31);
+ this.wmEndStateTextBox5.TabIndex = 1;
+ this.wmEndStateTextBox5.TextChanged += new System.EventHandler(this.wmEndStateTextBox5_TextChanged);
+ this.wmEndStateTextBox5.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.wmEndStateTextBox5_KeyPress);
+ //
+ // wmStateLabel5
+ //
+ this.wmStateLabel5.AutoSize = true;
+ this.wmStateLabel5.Location = new System.Drawing.Point(18, 34);
+ this.wmStateLabel5.Name = "wmStateLabel5";
+ this.wmStateLabel5.Size = new System.Drawing.Size(68, 23);
+ this.wmStateLabel5.TabIndex = 0;
+ this.wmStateLabel5.Text = "State:";
+ //
+ // groupBox6
+ //
+ this.groupBox6.Controls.Add(this.exclamation6);
+ this.groupBox6.Controls.Add(this.wmStartStateTextBox6);
+ this.groupBox6.Controls.Add(this.wmEndStateTextBox6);
+ this.groupBox6.Controls.Add(this.wmStateLabel6);
+ this.groupBox6.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.groupBox6.ForeColor = System.Drawing.Color.Black;
+ this.groupBox6.Location = new System.Drawing.Point(25, 482);
+ this.groupBox6.Name = "groupBox6";
+ this.groupBox6.Size = new System.Drawing.Size(547, 81);
+ this.groupBox6.TabIndex = 6;
+ this.groupBox6.TabStop = false;
+ this.groupBox6.Text = "Water Meter 6";
+ //
+ // exclamation6
+ //
+ this.exclamation6.AutoSize = true;
+ this.exclamation6.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.exclamation6.ForeColor = System.Drawing.Color.Red;
+ this.exclamation6.Location = new System.Drawing.Point(515, 27);
+ this.exclamation6.Name = "exclamation6";
+ this.exclamation6.Size = new System.Drawing.Size(30, 38);
+ this.exclamation6.TabIndex = 5;
+ this.exclamation6.Text = "!";
+ this.exclamation6.Visible = false;
+ //
+ // wmStartStateTextBox6
+ //
+ this.wmStartStateTextBox6.Enabled = false;
+ this.wmStartStateTextBox6.Location = new System.Drawing.Point(164, 31);
+ this.wmStartStateTextBox6.Name = "wmStartStateTextBox6";
+ this.wmStartStateTextBox6.Size = new System.Drawing.Size(163, 31);
+ this.wmStartStateTextBox6.TabIndex = 4;
+ this.wmStartStateTextBox6.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.wmStartStateTextBox6_KeyPress);
+ //
+ // wmEndStateTextBox6
+ //
+ this.wmEndStateTextBox6.Enabled = false;
+ this.wmEndStateTextBox6.Location = new System.Drawing.Point(350, 31);
+ this.wmEndStateTextBox6.Name = "wmEndStateTextBox6";
+ this.wmEndStateTextBox6.Size = new System.Drawing.Size(163, 31);
+ this.wmEndStateTextBox6.TabIndex = 1;
+ this.wmEndStateTextBox6.TextChanged += new System.EventHandler(this.wmEndStateTextBox6_TextChanged);
+ this.wmEndStateTextBox6.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.wmEndStateTextBox6_KeyPress);
+ //
+ // wmStateLabel6
+ //
+ this.wmStateLabel6.AutoSize = true;
+ this.wmStateLabel6.Location = new System.Drawing.Point(18, 34);
+ this.wmStateLabel6.Name = "wmStateLabel6";
+ this.wmStateLabel6.Size = new System.Drawing.Size(68, 23);
+ this.wmStateLabel6.TabIndex = 0;
+ this.wmStateLabel6.Text = "State:";
+ //
+ // startLabel
+ //
+ this.startLabel.AutoSize = true;
+ this.startLabel.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.startLabel.Location = new System.Drawing.Point(245, 11);
+ this.startLabel.Name = "startLabel";
+ this.startLabel.Size = new System.Drawing.Size(56, 23);
+ this.startLabel.TabIndex = 8;
+ this.startLabel.Text = "Start";
+ //
+ // endLabel
+ //
+ this.endLabel.AutoSize = true;
+ this.endLabel.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.endLabel.Location = new System.Drawing.Point(431, 11);
+ this.endLabel.Name = "endLabel";
+ this.endLabel.Size = new System.Drawing.Size(46, 23);
+ this.endLabel.TabIndex = 9;
+ this.endLabel.Text = "End";
+ //
+ // TestStartEndForm
+ //
+ 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(729, 586);
+ this.Controls.Add(this.endLabel);
+ this.Controls.Add(this.startLabel);
+ this.Controls.Add(this.groupBox6);
+ this.Controls.Add(this.groupBox5);
+ this.Controls.Add(this.groupBox4);
+ this.Controls.Add(this.groupBox3);
+ this.Controls.Add(this.okButton);
+ this.Controls.Add(this.groupBox2);
+ this.Controls.Add(this.groupBox1);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+ this.Name = "TestStartEndForm";
+ this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
+ this.Text = "End States";
+ this.TopMost = true;
+ this.Load += new System.EventHandler(this.CycleEndForm_Load);
+ this.groupBox2.ResumeLayout(false);
+ this.groupBox2.PerformLayout();
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.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);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.GroupBox groupBox2;
+ private System.Windows.Forms.TextBox wmEndStateTextBox2;
+ private System.Windows.Forms.Label wmStateLabel2;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.TextBox wmEndStateTextBox1;
+ private System.Windows.Forms.Label wmStateLabel1;
+ private System.Windows.Forms.Button okButton;
+ private System.Windows.Forms.GroupBox groupBox3;
+ private System.Windows.Forms.TextBox wmEndStateTextBox3;
+ private System.Windows.Forms.Label wmStateLabel3;
+ private System.Windows.Forms.GroupBox groupBox4;
+ private System.Windows.Forms.TextBox wmEndStateTextBox4;
+ private System.Windows.Forms.Label wmStateLabel4;
+ private System.Windows.Forms.GroupBox groupBox5;
+ private System.Windows.Forms.TextBox wmEndStateTextBox5;
+ private System.Windows.Forms.Label wmStateLabel5;
+ private System.Windows.Forms.GroupBox groupBox6;
+ private System.Windows.Forms.TextBox wmEndStateTextBox6;
+ private System.Windows.Forms.Label wmStateLabel6;
+ private System.Windows.Forms.TextBox wmStartStateTextBox2;
+ private System.Windows.Forms.TextBox wmStartStateTextBox1;
+ private System.Windows.Forms.TextBox wmStartStateTextBox3;
+ private System.Windows.Forms.TextBox wmStartStateTextBox4;
+ private System.Windows.Forms.TextBox wmStartStateTextBox5;
+ private System.Windows.Forms.TextBox wmStartStateTextBox6;
+ private System.Windows.Forms.Label startLabel;
+ private System.Windows.Forms.Label endLabel;
+ private System.Windows.Forms.Label exclamation2;
+ private System.Windows.Forms.Label exclamation1;
+ private System.Windows.Forms.Label exclamation3;
+ private System.Windows.Forms.Label exclamation4;
+ private System.Windows.Forms.Label exclamation5;
+ private System.Windows.Forms.Label exclamation6;
+
+ }
+}
\ No newline at end of file
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.resx b/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.resx
new file mode 100644
index 000000000..1af7de150
--- /dev/null
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/TestBenchFramework/BenchControl/TbfComponents.cs b/TestBenchFramework/BenchControl/TbfComponents.cs
index 7a8b31335..fc8307dd5 100644
--- a/TestBenchFramework/BenchControl/TbfComponents.cs
+++ b/TestBenchFramework/BenchControl/TbfComponents.cs
@@ -26,7 +26,8 @@ namespace TBF.BenchControl
Factories.Add(new DataEntry.Munich3.EntryFormFactory());
Factories.Add(new DataEntry.Munich.EntryFormFactory());
Factories.Add(new DataEntry.Standard.EntryFormFactory());
- Factories.Add(new Elde.Diverter.DiverterFactory());
+ Factories.Add(new DataEntry.Standard24.EntryFormFactory());
+ Factories.Add(new Elde.Diverter.DiverterFactory());
Factories.Add(new TestMethods.FixedStartMassCollection.TestMethodFactory());
Factories.Add(new Elde.FixedStartRegisterReader.RegisterReaderFactory());
Factories.Add(new Elde.FlowMeter.FlowMeterFactory());
diff --git a/TestBenchFramework/TBF.csproj b/TestBenchFramework/TBF.csproj
index c88410134..f2c011e26 100644
--- a/TestBenchFramework/TBF.csproj
+++ b/TestBenchFramework/TBF.csproj
@@ -150,6 +150,33 @@
AmbientCfgCtrl.cs
+
+ Form
+
+
+ CycleBeginningForm.cs
+
+
+ Form
+
+
+ CycleEndForm.cs
+
+
+
+
+ UserControl
+
+
+ EntryFormCfgCtrl.cs
+
+
+
+ Form
+
+
+ TestStartEndForm.cs
+
Form
@@ -1173,6 +1200,18 @@
EntryFormCfgCtrl.cs
+
+ CycleBeginningForm.cs
+
+
+ CycleEndForm.cs
+
+
+ EntryFormCfgCtrl.cs
+
+
+ TestStartEndForm.cs
+
CycleBeginningForm.cs