diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs index 3258912f9..ce674a0db 100644 --- a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs +++ b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs @@ -282,7 +282,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication int textBoxesCount; Label[] labels; - TextBox[] counters; + PictureBox[] counters; TextBox[] messages; static IList waterMeters; @@ -328,18 +328,18 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication wmLabel41, wmLabel42, wmLabel43, wmLabel44, wmLabel45, wmLabel46, wmLabel47, wmLabel48, }; - counters = new TextBox[48] + counters = new PictureBox[48] { - textBox1, textBox2, textBox3, textBox4, textBox5, - textBox6, textBox7, textBox8, textBox9, textBox10, - textBox11, textBox12, textBox13, textBox14, textBox15, - textBox16, textBox17, textBox18, textBox19, textBox20, - textBox21, textBox22, textBox23, textBox24, textBox25, - textBox26, textBox27, textBox28, textBox29, textBox30, - textBox31, textBox32, textBox33, textBox34, textBox35, - textBox36, textBox37, textBox38, textBox39, textBox40, - textBox41, textBox42, textBox43, textBox44, textBox45, - textBox46, textBox47, textBox48, + pictureBox1, pictureBox2, pictureBox3, pictureBox4, pictureBox5, + pictureBox6, pictureBox7, pictureBox8, pictureBox9, pictureBox10, + pictureBox11, pictureBox12, pictureBox13, pictureBox14, pictureBox15, + pictureBox16, pictureBox17, pictureBox18, pictureBox19, pictureBox20, + pictureBox21, pictureBox22, pictureBox23, pictureBox24, pictureBox25, + pictureBox26, pictureBox27, pictureBox28, pictureBox29, pictureBox30, + pictureBox31, pictureBox32, pictureBox33, pictureBox34, pictureBox35, + pictureBox36, pictureBox37, pictureBox38, pictureBox39, pictureBox40, + pictureBox41, pictureBox42, pictureBox43, pictureBox44, pictureBox45, + pictureBox46, pictureBox47, pictureBox48, }; messages = new TextBox[48] { @@ -563,7 +563,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication for (int i = 0; i < waterMeters.Count; i++) { waterMeters[i].FlushedDataCount = 0; - counters[i].Text = "0"; + counters[i].BackColor = Color.Red; } /// @@ -1374,7 +1374,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication for (int i = 0; i < waterMeters.Count; i++) { - counters[i].Text = (waterMeters[i].FlushedDataCount % 1000).ToString(); + counters[i].BackColor = (waterMeters[i].FlushedDataDelta == 0) ? Color.Red : Color.Green; } lock (this) diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.designer.cs b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.designer.cs index ce63c3d1d..92d8c0e2a 100644 --- a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.designer.cs +++ b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.designer.cs @@ -129,54 +129,102 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication this.wmTextBox25 = new System.Windows.Forms.TextBox(); this.wmLabel25 = new System.Windows.Forms.Label(); this.activityLabel = new System.Windows.Forms.Label(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.textBox3 = new System.Windows.Forms.TextBox(); - this.textBox4 = new System.Windows.Forms.TextBox(); - this.textBox5 = new System.Windows.Forms.TextBox(); - this.textBox6 = new System.Windows.Forms.TextBox(); - this.textBox7 = new System.Windows.Forms.TextBox(); - this.textBox8 = new System.Windows.Forms.TextBox(); - this.textBox9 = new System.Windows.Forms.TextBox(); - this.textBox10 = new System.Windows.Forms.TextBox(); - this.textBox11 = new System.Windows.Forms.TextBox(); - this.textBox12 = new System.Windows.Forms.TextBox(); - this.textBox13 = new System.Windows.Forms.TextBox(); - this.textBox14 = new System.Windows.Forms.TextBox(); - this.textBox15 = new System.Windows.Forms.TextBox(); - this.textBox16 = new System.Windows.Forms.TextBox(); - this.textBox17 = new System.Windows.Forms.TextBox(); - this.textBox18 = new System.Windows.Forms.TextBox(); - this.textBox19 = new System.Windows.Forms.TextBox(); - this.textBox20 = new System.Windows.Forms.TextBox(); - this.textBox21 = new System.Windows.Forms.TextBox(); - this.textBox22 = new System.Windows.Forms.TextBox(); - this.textBox23 = new System.Windows.Forms.TextBox(); - this.textBox24 = new System.Windows.Forms.TextBox(); - this.textBox25 = new System.Windows.Forms.TextBox(); - this.textBox26 = new System.Windows.Forms.TextBox(); - this.textBox27 = new System.Windows.Forms.TextBox(); - this.textBox28 = new System.Windows.Forms.TextBox(); - this.textBox29 = new System.Windows.Forms.TextBox(); - this.textBox30 = new System.Windows.Forms.TextBox(); - this.textBox31 = new System.Windows.Forms.TextBox(); - this.textBox32 = new System.Windows.Forms.TextBox(); - this.textBox33 = new System.Windows.Forms.TextBox(); - this.textBox34 = new System.Windows.Forms.TextBox(); - this.textBox35 = new System.Windows.Forms.TextBox(); - this.textBox36 = new System.Windows.Forms.TextBox(); - this.textBox37 = new System.Windows.Forms.TextBox(); - this.textBox38 = new System.Windows.Forms.TextBox(); - this.textBox39 = new System.Windows.Forms.TextBox(); - this.textBox40 = new System.Windows.Forms.TextBox(); - this.textBox41 = new System.Windows.Forms.TextBox(); - this.textBox42 = new System.Windows.Forms.TextBox(); - this.textBox43 = new System.Windows.Forms.TextBox(); - this.textBox44 = new System.Windows.Forms.TextBox(); - this.textBox45 = new System.Windows.Forms.TextBox(); - this.textBox46 = new System.Windows.Forms.TextBox(); - this.textBox47 = new System.Windows.Forms.TextBox(); - this.textBox48 = new System.Windows.Forms.TextBox(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.pictureBox3 = new System.Windows.Forms.PictureBox(); + this.pictureBox4 = new System.Windows.Forms.PictureBox(); + this.pictureBox5 = new System.Windows.Forms.PictureBox(); + this.pictureBox6 = new System.Windows.Forms.PictureBox(); + this.pictureBox7 = new System.Windows.Forms.PictureBox(); + this.pictureBox8 = new System.Windows.Forms.PictureBox(); + this.pictureBox9 = new System.Windows.Forms.PictureBox(); + this.pictureBox10 = new System.Windows.Forms.PictureBox(); + this.pictureBox11 = new System.Windows.Forms.PictureBox(); + this.pictureBox12 = new System.Windows.Forms.PictureBox(); + this.pictureBox13 = new System.Windows.Forms.PictureBox(); + this.pictureBox14 = new System.Windows.Forms.PictureBox(); + this.pictureBox15 = new System.Windows.Forms.PictureBox(); + this.pictureBox16 = new System.Windows.Forms.PictureBox(); + this.pictureBox17 = new System.Windows.Forms.PictureBox(); + this.pictureBox18 = new System.Windows.Forms.PictureBox(); + this.pictureBox19 = new System.Windows.Forms.PictureBox(); + this.pictureBox20 = new System.Windows.Forms.PictureBox(); + this.pictureBox21 = new System.Windows.Forms.PictureBox(); + this.pictureBox22 = new System.Windows.Forms.PictureBox(); + this.pictureBox23 = new System.Windows.Forms.PictureBox(); + this.pictureBox24 = new System.Windows.Forms.PictureBox(); + this.pictureBox25 = new System.Windows.Forms.PictureBox(); + this.pictureBox26 = new System.Windows.Forms.PictureBox(); + this.pictureBox27 = new System.Windows.Forms.PictureBox(); + this.pictureBox28 = new System.Windows.Forms.PictureBox(); + this.pictureBox29 = new System.Windows.Forms.PictureBox(); + this.pictureBox30 = new System.Windows.Forms.PictureBox(); + this.pictureBox31 = new System.Windows.Forms.PictureBox(); + this.pictureBox32 = new System.Windows.Forms.PictureBox(); + this.pictureBox33 = new System.Windows.Forms.PictureBox(); + this.pictureBox34 = new System.Windows.Forms.PictureBox(); + this.pictureBox35 = new System.Windows.Forms.PictureBox(); + this.pictureBox36 = new System.Windows.Forms.PictureBox(); + this.pictureBox37 = new System.Windows.Forms.PictureBox(); + this.pictureBox38 = new System.Windows.Forms.PictureBox(); + this.pictureBox39 = new System.Windows.Forms.PictureBox(); + this.pictureBox40 = new System.Windows.Forms.PictureBox(); + this.pictureBox41 = new System.Windows.Forms.PictureBox(); + this.pictureBox42 = new System.Windows.Forms.PictureBox(); + this.pictureBox43 = new System.Windows.Forms.PictureBox(); + this.pictureBox44 = new System.Windows.Forms.PictureBox(); + this.pictureBox45 = new System.Windows.Forms.PictureBox(); + this.pictureBox46 = new System.Windows.Forms.PictureBox(); + this.pictureBox47 = new System.Windows.Forms.PictureBox(); + this.pictureBox48 = new System.Windows.Forms.PictureBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox8)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox10)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox11)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox12)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox13)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox14)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox15)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox16)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox17)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox18)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox19)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox20)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox21)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox22)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox23)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox24)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox25)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox26)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox27)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox28)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox29)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox30)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox31)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox32)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox33)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox34)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox35)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox36)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox37)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox38)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox39)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox40)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox41)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox42)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox43)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox44)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox45)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox46)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox47)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox48)).BeginInit(); this.SuspendLayout(); // // wmTextBox2 @@ -1149,437 +1197,389 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication this.activityLabel.TabIndex = 95; this.activityLabel.Text = "Activity label"; // - // textBox1 - // - this.textBox1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox1.Location = new System.Drawing.Point(135, 89); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(50, 23); - this.textBox1.TabIndex = 96; - this.textBox1.Visible = false; - // - // textBox2 - // - this.textBox2.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox2.Location = new System.Drawing.Point(135, 118); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(50, 23); - this.textBox2.TabIndex = 97; - this.textBox2.Visible = false; - // - // textBox3 - // - this.textBox3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox3.Location = new System.Drawing.Point(135, 147); - this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(50, 23); - this.textBox3.TabIndex = 98; - this.textBox3.Visible = false; - // - // textBox4 - // - this.textBox4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox4.Location = new System.Drawing.Point(135, 176); - this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(50, 23); - this.textBox4.TabIndex = 99; - this.textBox4.Visible = false; - // - // textBox5 - // - this.textBox5.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox5.Location = new System.Drawing.Point(135, 205); - this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(50, 23); - this.textBox5.TabIndex = 100; - this.textBox5.Visible = false; - // - // textBox6 - // - this.textBox6.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox6.Location = new System.Drawing.Point(135, 234); - this.textBox6.Name = "textBox6"; - this.textBox6.Size = new System.Drawing.Size(50, 23); - this.textBox6.TabIndex = 101; - this.textBox6.Visible = false; - // - // textBox7 - // - this.textBox7.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox7.Location = new System.Drawing.Point(135, 263); - this.textBox7.Name = "textBox7"; - this.textBox7.Size = new System.Drawing.Size(50, 23); - this.textBox7.TabIndex = 102; - this.textBox7.Visible = false; - // - // textBox8 - // - this.textBox8.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox8.Location = new System.Drawing.Point(135, 292); - this.textBox8.Name = "textBox8"; - this.textBox8.Size = new System.Drawing.Size(50, 23); - this.textBox8.TabIndex = 103; - this.textBox8.Visible = false; - // - // textBox9 - // - this.textBox9.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox9.Location = new System.Drawing.Point(135, 321); - this.textBox9.Name = "textBox9"; - this.textBox9.Size = new System.Drawing.Size(50, 23); - this.textBox9.TabIndex = 104; - this.textBox9.Visible = false; - // - // textBox10 - // - this.textBox10.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox10.Location = new System.Drawing.Point(135, 350); - this.textBox10.Name = "textBox10"; - this.textBox10.Size = new System.Drawing.Size(50, 23); - this.textBox10.TabIndex = 105; - this.textBox10.Visible = false; - // - // textBox11 - // - this.textBox11.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox11.Location = new System.Drawing.Point(135, 379); - this.textBox11.Name = "textBox11"; - this.textBox11.Size = new System.Drawing.Size(50, 23); - this.textBox11.TabIndex = 106; - this.textBox11.Visible = false; - // - // textBox12 - // - this.textBox12.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox12.Location = new System.Drawing.Point(135, 408); - this.textBox12.Name = "textBox12"; - this.textBox12.Size = new System.Drawing.Size(50, 23); - this.textBox12.TabIndex = 107; - this.textBox12.Visible = false; - // - // textBox13 - // - this.textBox13.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox13.Location = new System.Drawing.Point(135, 437); - this.textBox13.Name = "textBox13"; - this.textBox13.Size = new System.Drawing.Size(50, 23); - this.textBox13.TabIndex = 108; - this.textBox13.Visible = false; - // - // textBox14 - // - this.textBox14.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox14.Location = new System.Drawing.Point(135, 466); - this.textBox14.Name = "textBox14"; - this.textBox14.Size = new System.Drawing.Size(50, 23); - this.textBox14.TabIndex = 109; - this.textBox14.Visible = false; - // - // textBox15 - // - this.textBox15.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox15.Location = new System.Drawing.Point(135, 495); - this.textBox15.Name = "textBox15"; - this.textBox15.Size = new System.Drawing.Size(50, 23); - this.textBox15.TabIndex = 110; - this.textBox15.Visible = false; - // - // textBox16 - // - this.textBox16.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox16.Location = new System.Drawing.Point(135, 524); - this.textBox16.Name = "textBox16"; - this.textBox16.Size = new System.Drawing.Size(50, 23); - this.textBox16.TabIndex = 111; - this.textBox16.Visible = false; - // - // textBox17 - // - this.textBox17.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox17.Location = new System.Drawing.Point(135, 553); - this.textBox17.Name = "textBox17"; - this.textBox17.Size = new System.Drawing.Size(50, 23); - this.textBox17.TabIndex = 112; - this.textBox17.Visible = false; - // - // textBox18 - // - this.textBox18.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox18.Location = new System.Drawing.Point(135, 582); - this.textBox18.Name = "textBox18"; - this.textBox18.Size = new System.Drawing.Size(50, 23); - this.textBox18.TabIndex = 113; - this.textBox18.Visible = false; - // - // textBox19 - // - this.textBox19.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox19.Location = new System.Drawing.Point(135, 611); - this.textBox19.Name = "textBox19"; - this.textBox19.Size = new System.Drawing.Size(50, 23); - this.textBox19.TabIndex = 114; - this.textBox19.Visible = false; - // - // textBox20 - // - this.textBox20.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox20.Location = new System.Drawing.Point(135, 640); - this.textBox20.Name = "textBox20"; - this.textBox20.Size = new System.Drawing.Size(50, 23); - this.textBox20.TabIndex = 115; - this.textBox20.Visible = false; - // - // textBox21 - // - this.textBox21.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox21.Location = new System.Drawing.Point(135, 669); - this.textBox21.Name = "textBox21"; - this.textBox21.Size = new System.Drawing.Size(50, 23); - this.textBox21.TabIndex = 116; - this.textBox21.Visible = false; - // - // textBox22 - // - this.textBox22.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox22.Location = new System.Drawing.Point(135, 698); - this.textBox22.Name = "textBox22"; - this.textBox22.Size = new System.Drawing.Size(50, 23); - this.textBox22.TabIndex = 117; - this.textBox22.Visible = false; - // - // textBox23 - // - this.textBox23.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox23.Location = new System.Drawing.Point(135, 727); - this.textBox23.Name = "textBox23"; - this.textBox23.Size = new System.Drawing.Size(50, 23); - this.textBox23.TabIndex = 118; - this.textBox23.Visible = false; - // - // textBox24 - // - this.textBox24.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox24.Location = new System.Drawing.Point(135, 756); - this.textBox24.Name = "textBox24"; - this.textBox24.Size = new System.Drawing.Size(50, 23); - this.textBox24.TabIndex = 119; - this.textBox24.Visible = false; - // - // textBox25 - // - this.textBox25.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox25.Location = new System.Drawing.Point(696, 89); - this.textBox25.Name = "textBox25"; - this.textBox25.Size = new System.Drawing.Size(50, 23); - this.textBox25.TabIndex = 120; - this.textBox25.Visible = false; - // - // textBox26 - // - this.textBox26.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox26.Location = new System.Drawing.Point(696, 118); - this.textBox26.Name = "textBox26"; - this.textBox26.Size = new System.Drawing.Size(50, 23); - this.textBox26.TabIndex = 121; - this.textBox26.Visible = false; - // - // textBox27 - // - this.textBox27.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox27.Location = new System.Drawing.Point(696, 147); - this.textBox27.Name = "textBox27"; - this.textBox27.Size = new System.Drawing.Size(50, 23); - this.textBox27.TabIndex = 122; - this.textBox27.Visible = false; - // - // textBox28 - // - this.textBox28.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox28.Location = new System.Drawing.Point(696, 176); - this.textBox28.Name = "textBox28"; - this.textBox28.Size = new System.Drawing.Size(50, 23); - this.textBox28.TabIndex = 123; - this.textBox28.Visible = false; - // - // textBox29 - // - this.textBox29.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox29.Location = new System.Drawing.Point(696, 205); - this.textBox29.Name = "textBox29"; - this.textBox29.Size = new System.Drawing.Size(50, 23); - this.textBox29.TabIndex = 124; - this.textBox29.Visible = false; - // - // textBox30 - // - this.textBox30.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox30.Location = new System.Drawing.Point(696, 234); - this.textBox30.Name = "textBox30"; - this.textBox30.Size = new System.Drawing.Size(50, 23); - this.textBox30.TabIndex = 125; - this.textBox30.Visible = false; - // - // textBox31 - // - this.textBox31.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox31.Location = new System.Drawing.Point(696, 263); - this.textBox31.Name = "textBox31"; - this.textBox31.Size = new System.Drawing.Size(50, 23); - this.textBox31.TabIndex = 126; - this.textBox31.Visible = false; - // - // textBox32 - // - this.textBox32.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox32.Location = new System.Drawing.Point(696, 292); - this.textBox32.Name = "textBox32"; - this.textBox32.Size = new System.Drawing.Size(50, 23); - this.textBox32.TabIndex = 127; - this.textBox32.Visible = false; - // - // textBox33 - // - this.textBox33.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox33.Location = new System.Drawing.Point(696, 321); - this.textBox33.Name = "textBox33"; - this.textBox33.Size = new System.Drawing.Size(50, 23); - this.textBox33.TabIndex = 128; - this.textBox33.Visible = false; - // - // textBox34 - // - this.textBox34.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox34.Location = new System.Drawing.Point(696, 350); - this.textBox34.Name = "textBox34"; - this.textBox34.Size = new System.Drawing.Size(50, 23); - this.textBox34.TabIndex = 129; - this.textBox34.Visible = false; - // - // textBox35 - // - this.textBox35.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox35.Location = new System.Drawing.Point(696, 379); - this.textBox35.Name = "textBox35"; - this.textBox35.Size = new System.Drawing.Size(50, 23); - this.textBox35.TabIndex = 130; - this.textBox35.Visible = false; - // - // textBox36 - // - this.textBox36.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox36.Location = new System.Drawing.Point(696, 408); - this.textBox36.Name = "textBox36"; - this.textBox36.Size = new System.Drawing.Size(50, 23); - this.textBox36.TabIndex = 131; - this.textBox36.Visible = false; - // - // textBox37 - // - this.textBox37.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox37.Location = new System.Drawing.Point(696, 437); - this.textBox37.Name = "textBox37"; - this.textBox37.Size = new System.Drawing.Size(50, 23); - this.textBox37.TabIndex = 132; - this.textBox37.Visible = false; - // - // textBox38 - // - this.textBox38.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox38.Location = new System.Drawing.Point(696, 466); - this.textBox38.Name = "textBox38"; - this.textBox38.Size = new System.Drawing.Size(50, 23); - this.textBox38.TabIndex = 133; - this.textBox38.Visible = false; - // - // textBox39 - // - this.textBox39.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox39.Location = new System.Drawing.Point(696, 495); - this.textBox39.Name = "textBox39"; - this.textBox39.Size = new System.Drawing.Size(50, 23); - this.textBox39.TabIndex = 134; - this.textBox39.Visible = false; - // - // textBox40 - // - this.textBox40.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox40.Location = new System.Drawing.Point(696, 523); - this.textBox40.Name = "textBox40"; - this.textBox40.Size = new System.Drawing.Size(50, 23); - this.textBox40.TabIndex = 135; - this.textBox40.Visible = false; - // - // textBox41 - // - this.textBox41.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox41.Location = new System.Drawing.Point(696, 553); - this.textBox41.Name = "textBox41"; - this.textBox41.Size = new System.Drawing.Size(50, 23); - this.textBox41.TabIndex = 136; - this.textBox41.Visible = false; - // - // textBox42 - // - this.textBox42.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox42.Location = new System.Drawing.Point(696, 582); - this.textBox42.Name = "textBox42"; - this.textBox42.Size = new System.Drawing.Size(50, 23); - this.textBox42.TabIndex = 137; - this.textBox42.Visible = false; - // - // textBox43 - // - this.textBox43.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox43.Location = new System.Drawing.Point(696, 611); - this.textBox43.Name = "textBox43"; - this.textBox43.Size = new System.Drawing.Size(50, 23); - this.textBox43.TabIndex = 138; - this.textBox43.Visible = false; - // - // textBox44 - // - this.textBox44.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox44.Location = new System.Drawing.Point(696, 640); - this.textBox44.Name = "textBox44"; - this.textBox44.Size = new System.Drawing.Size(50, 23); - this.textBox44.TabIndex = 139; - this.textBox44.Visible = false; - // - // textBox45 - // - this.textBox45.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox45.Location = new System.Drawing.Point(696, 669); - this.textBox45.Name = "textBox45"; - this.textBox45.Size = new System.Drawing.Size(50, 23); - this.textBox45.TabIndex = 140; - this.textBox45.Visible = false; - // - // textBox46 - // - this.textBox46.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox46.Location = new System.Drawing.Point(696, 698); - this.textBox46.Name = "textBox46"; - this.textBox46.Size = new System.Drawing.Size(50, 23); - this.textBox46.TabIndex = 141; - this.textBox46.Visible = false; - // - // textBox47 - // - this.textBox47.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox47.Location = new System.Drawing.Point(696, 727); - this.textBox47.Name = "textBox47"; - this.textBox47.Size = new System.Drawing.Size(50, 23); - this.textBox47.TabIndex = 142; - this.textBox47.Visible = false; - // - // textBox48 - // - this.textBox48.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textBox48.Location = new System.Drawing.Point(696, 756); - this.textBox48.Name = "textBox48"; - this.textBox48.Size = new System.Drawing.Size(50, 23); - this.textBox48.TabIndex = 143; - this.textBox48.Visible = false; + // pictureBox1 + // + this.pictureBox1.Location = new System.Drawing.Point(151, 89); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(23, 23); + this.pictureBox1.TabIndex = 96; + this.pictureBox1.TabStop = false; + // + // pictureBox2 + // + this.pictureBox2.Location = new System.Drawing.Point(151, 118); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(23, 23); + this.pictureBox2.TabIndex = 97; + this.pictureBox2.TabStop = false; + // + // pictureBox3 + // + this.pictureBox3.Location = new System.Drawing.Point(151, 147); + this.pictureBox3.Name = "pictureBox3"; + this.pictureBox3.Size = new System.Drawing.Size(23, 23); + this.pictureBox3.TabIndex = 98; + this.pictureBox3.TabStop = false; + // + // pictureBox4 + // + this.pictureBox4.Location = new System.Drawing.Point(151, 176); + this.pictureBox4.Name = "pictureBox4"; + this.pictureBox4.Size = new System.Drawing.Size(23, 23); + this.pictureBox4.TabIndex = 99; + this.pictureBox4.TabStop = false; + // + // pictureBox5 + // + this.pictureBox5.Location = new System.Drawing.Point(151, 205); + this.pictureBox5.Name = "pictureBox5"; + this.pictureBox5.Size = new System.Drawing.Size(23, 23); + this.pictureBox5.TabIndex = 100; + this.pictureBox5.TabStop = false; + // + // pictureBox6 + // + this.pictureBox6.Location = new System.Drawing.Point(151, 234); + this.pictureBox6.Name = "pictureBox6"; + this.pictureBox6.Size = new System.Drawing.Size(23, 23); + this.pictureBox6.TabIndex = 101; + this.pictureBox6.TabStop = false; + // + // pictureBox7 + // + this.pictureBox7.Location = new System.Drawing.Point(151, 263); + this.pictureBox7.Name = "pictureBox7"; + this.pictureBox7.Size = new System.Drawing.Size(23, 23); + this.pictureBox7.TabIndex = 102; + this.pictureBox7.TabStop = false; + // + // pictureBox8 + // + this.pictureBox8.Location = new System.Drawing.Point(151, 292); + this.pictureBox8.Name = "pictureBox8"; + this.pictureBox8.Size = new System.Drawing.Size(23, 23); + this.pictureBox8.TabIndex = 103; + this.pictureBox8.TabStop = false; + // + // pictureBox9 + // + this.pictureBox9.Location = new System.Drawing.Point(151, 321); + this.pictureBox9.Name = "pictureBox9"; + this.pictureBox9.Size = new System.Drawing.Size(23, 23); + this.pictureBox9.TabIndex = 104; + this.pictureBox9.TabStop = false; + // + // pictureBox10 + // + this.pictureBox10.Location = new System.Drawing.Point(151, 350); + this.pictureBox10.Name = "pictureBox10"; + this.pictureBox10.Size = new System.Drawing.Size(23, 23); + this.pictureBox10.TabIndex = 105; + this.pictureBox10.TabStop = false; + // + // pictureBox11 + // + this.pictureBox11.Location = new System.Drawing.Point(151, 379); + this.pictureBox11.Name = "pictureBox11"; + this.pictureBox11.Size = new System.Drawing.Size(23, 23); + this.pictureBox11.TabIndex = 106; + this.pictureBox11.TabStop = false; + // + // pictureBox12 + // + this.pictureBox12.Location = new System.Drawing.Point(151, 408); + this.pictureBox12.Name = "pictureBox12"; + this.pictureBox12.Size = new System.Drawing.Size(23, 23); + this.pictureBox12.TabIndex = 107; + this.pictureBox12.TabStop = false; + // + // pictureBox13 + // + this.pictureBox13.Location = new System.Drawing.Point(151, 437); + this.pictureBox13.Name = "pictureBox13"; + this.pictureBox13.Size = new System.Drawing.Size(23, 23); + this.pictureBox13.TabIndex = 108; + this.pictureBox13.TabStop = false; + // + // pictureBox14 + // + this.pictureBox14.Location = new System.Drawing.Point(151, 466); + this.pictureBox14.Name = "pictureBox14"; + this.pictureBox14.Size = new System.Drawing.Size(23, 23); + this.pictureBox14.TabIndex = 109; + this.pictureBox14.TabStop = false; + // + // pictureBox15 + // + this.pictureBox15.Location = new System.Drawing.Point(151, 495); + this.pictureBox15.Name = "pictureBox15"; + this.pictureBox15.Size = new System.Drawing.Size(23, 23); + this.pictureBox15.TabIndex = 110; + this.pictureBox15.TabStop = false; + // + // pictureBox16 + // + this.pictureBox16.Location = new System.Drawing.Point(151, 524); + this.pictureBox16.Name = "pictureBox16"; + this.pictureBox16.Size = new System.Drawing.Size(23, 23); + this.pictureBox16.TabIndex = 111; + this.pictureBox16.TabStop = false; + // + // pictureBox17 + // + this.pictureBox17.Location = new System.Drawing.Point(151, 553); + this.pictureBox17.Name = "pictureBox17"; + this.pictureBox17.Size = new System.Drawing.Size(23, 23); + this.pictureBox17.TabIndex = 112; + this.pictureBox17.TabStop = false; + // + // pictureBox18 + // + this.pictureBox18.Location = new System.Drawing.Point(151, 582); + this.pictureBox18.Name = "pictureBox18"; + this.pictureBox18.Size = new System.Drawing.Size(23, 23); + this.pictureBox18.TabIndex = 113; + this.pictureBox18.TabStop = false; + // + // pictureBox19 + // + this.pictureBox19.Location = new System.Drawing.Point(151, 611); + this.pictureBox19.Name = "pictureBox19"; + this.pictureBox19.Size = new System.Drawing.Size(23, 23); + this.pictureBox19.TabIndex = 114; + this.pictureBox19.TabStop = false; + // + // pictureBox20 + // + this.pictureBox20.Location = new System.Drawing.Point(151, 640); + this.pictureBox20.Name = "pictureBox20"; + this.pictureBox20.Size = new System.Drawing.Size(23, 23); + this.pictureBox20.TabIndex = 115; + this.pictureBox20.TabStop = false; + // + // pictureBox21 + // + this.pictureBox21.Location = new System.Drawing.Point(151, 669); + this.pictureBox21.Name = "pictureBox21"; + this.pictureBox21.Size = new System.Drawing.Size(23, 23); + this.pictureBox21.TabIndex = 116; + this.pictureBox21.TabStop = false; + // + // pictureBox22 + // + this.pictureBox22.Location = new System.Drawing.Point(151, 698); + this.pictureBox22.Name = "pictureBox22"; + this.pictureBox22.Size = new System.Drawing.Size(23, 23); + this.pictureBox22.TabIndex = 117; + this.pictureBox22.TabStop = false; + // + // pictureBox23 + // + this.pictureBox23.Location = new System.Drawing.Point(151, 727); + this.pictureBox23.Name = "pictureBox23"; + this.pictureBox23.Size = new System.Drawing.Size(23, 23); + this.pictureBox23.TabIndex = 118; + this.pictureBox23.TabStop = false; + // + // pictureBox24 + // + this.pictureBox24.Location = new System.Drawing.Point(151, 756); + this.pictureBox24.Name = "pictureBox24"; + this.pictureBox24.Size = new System.Drawing.Size(23, 23); + this.pictureBox24.TabIndex = 119; + this.pictureBox24.TabStop = false; + // + // pictureBox25 + // + this.pictureBox25.Location = new System.Drawing.Point(712, 89); + this.pictureBox25.Name = "pictureBox25"; + this.pictureBox25.Size = new System.Drawing.Size(23, 23); + this.pictureBox25.TabIndex = 120; + this.pictureBox25.TabStop = false; + // + // pictureBox26 + // + this.pictureBox26.Location = new System.Drawing.Point(712, 118); + this.pictureBox26.Name = "pictureBox26"; + this.pictureBox26.Size = new System.Drawing.Size(23, 23); + this.pictureBox26.TabIndex = 121; + this.pictureBox26.TabStop = false; + // + // pictureBox27 + // + this.pictureBox27.Location = new System.Drawing.Point(712, 147); + this.pictureBox27.Name = "pictureBox27"; + this.pictureBox27.Size = new System.Drawing.Size(23, 23); + this.pictureBox27.TabIndex = 122; + this.pictureBox27.TabStop = false; + // + // pictureBox28 + // + this.pictureBox28.Location = new System.Drawing.Point(712, 176); + this.pictureBox28.Name = "pictureBox28"; + this.pictureBox28.Size = new System.Drawing.Size(23, 23); + this.pictureBox28.TabIndex = 123; + this.pictureBox28.TabStop = false; + // + // pictureBox29 + // + this.pictureBox29.Location = new System.Drawing.Point(712, 205); + this.pictureBox29.Name = "pictureBox29"; + this.pictureBox29.Size = new System.Drawing.Size(23, 23); + this.pictureBox29.TabIndex = 124; + this.pictureBox29.TabStop = false; + // + // pictureBox30 + // + this.pictureBox30.Location = new System.Drawing.Point(712, 234); + this.pictureBox30.Name = "pictureBox30"; + this.pictureBox30.Size = new System.Drawing.Size(23, 23); + this.pictureBox30.TabIndex = 125; + this.pictureBox30.TabStop = false; + // + // pictureBox31 + // + this.pictureBox31.Location = new System.Drawing.Point(712, 263); + this.pictureBox31.Name = "pictureBox31"; + this.pictureBox31.Size = new System.Drawing.Size(23, 23); + this.pictureBox31.TabIndex = 126; + this.pictureBox31.TabStop = false; + // + // pictureBox32 + // + this.pictureBox32.Location = new System.Drawing.Point(712, 292); + this.pictureBox32.Name = "pictureBox32"; + this.pictureBox32.Size = new System.Drawing.Size(23, 23); + this.pictureBox32.TabIndex = 127; + this.pictureBox32.TabStop = false; + // + // pictureBox33 + // + this.pictureBox33.Location = new System.Drawing.Point(712, 321); + this.pictureBox33.Name = "pictureBox33"; + this.pictureBox33.Size = new System.Drawing.Size(23, 23); + this.pictureBox33.TabIndex = 128; + this.pictureBox33.TabStop = false; + // + // pictureBox34 + // + this.pictureBox34.Location = new System.Drawing.Point(712, 350); + this.pictureBox34.Name = "pictureBox34"; + this.pictureBox34.Size = new System.Drawing.Size(23, 23); + this.pictureBox34.TabIndex = 129; + this.pictureBox34.TabStop = false; + // + // pictureBox35 + // + this.pictureBox35.Location = new System.Drawing.Point(712, 379); + this.pictureBox35.Name = "pictureBox35"; + this.pictureBox35.Size = new System.Drawing.Size(23, 23); + this.pictureBox35.TabIndex = 130; + this.pictureBox35.TabStop = false; + // + // pictureBox36 + // + this.pictureBox36.Location = new System.Drawing.Point(712, 408); + this.pictureBox36.Name = "pictureBox36"; + this.pictureBox36.Size = new System.Drawing.Size(23, 23); + this.pictureBox36.TabIndex = 131; + this.pictureBox36.TabStop = false; + // + // pictureBox37 + // + this.pictureBox37.Location = new System.Drawing.Point(712, 437); + this.pictureBox37.Name = "pictureBox37"; + this.pictureBox37.Size = new System.Drawing.Size(23, 23); + this.pictureBox37.TabIndex = 132; + this.pictureBox37.TabStop = false; + // + // pictureBox38 + // + this.pictureBox38.Location = new System.Drawing.Point(712, 466); + this.pictureBox38.Name = "pictureBox38"; + this.pictureBox38.Size = new System.Drawing.Size(23, 23); + this.pictureBox38.TabIndex = 133; + this.pictureBox38.TabStop = false; + // + // pictureBox39 + // + this.pictureBox39.Location = new System.Drawing.Point(712, 495); + this.pictureBox39.Name = "pictureBox39"; + this.pictureBox39.Size = new System.Drawing.Size(23, 23); + this.pictureBox39.TabIndex = 134; + this.pictureBox39.TabStop = false; + // + // pictureBox40 + // + this.pictureBox40.Location = new System.Drawing.Point(712, 524); + this.pictureBox40.Name = "pictureBox40"; + this.pictureBox40.Size = new System.Drawing.Size(23, 23); + this.pictureBox40.TabIndex = 135; + this.pictureBox40.TabStop = false; + // + // pictureBox41 + // + this.pictureBox41.Location = new System.Drawing.Point(712, 553); + this.pictureBox41.Name = "pictureBox41"; + this.pictureBox41.Size = new System.Drawing.Size(23, 23); + this.pictureBox41.TabIndex = 136; + this.pictureBox41.TabStop = false; + // + // pictureBox42 + // + this.pictureBox42.Location = new System.Drawing.Point(712, 582); + this.pictureBox42.Name = "pictureBox42"; + this.pictureBox42.Size = new System.Drawing.Size(23, 23); + this.pictureBox42.TabIndex = 137; + this.pictureBox42.TabStop = false; + // + // pictureBox43 + // + this.pictureBox43.Location = new System.Drawing.Point(712, 611); + this.pictureBox43.Name = "pictureBox43"; + this.pictureBox43.Size = new System.Drawing.Size(23, 23); + this.pictureBox43.TabIndex = 138; + this.pictureBox43.TabStop = false; + // + // pictureBox44 + // + this.pictureBox44.Location = new System.Drawing.Point(712, 640); + this.pictureBox44.Name = "pictureBox44"; + this.pictureBox44.Size = new System.Drawing.Size(23, 23); + this.pictureBox44.TabIndex = 139; + this.pictureBox44.TabStop = false; + // + // pictureBox45 + // + this.pictureBox45.Location = new System.Drawing.Point(712, 669); + this.pictureBox45.Name = "pictureBox45"; + this.pictureBox45.Size = new System.Drawing.Size(23, 23); + this.pictureBox45.TabIndex = 140; + this.pictureBox45.TabStop = false; + // + // pictureBox46 + // + this.pictureBox46.Location = new System.Drawing.Point(712, 698); + this.pictureBox46.Name = "pictureBox46"; + this.pictureBox46.Size = new System.Drawing.Size(23, 23); + this.pictureBox46.TabIndex = 141; + this.pictureBox46.TabStop = false; + // + // pictureBox47 + // + this.pictureBox47.Location = new System.Drawing.Point(712, 727); + this.pictureBox47.Name = "pictureBox47"; + this.pictureBox47.Size = new System.Drawing.Size(23, 23); + this.pictureBox47.TabIndex = 142; + this.pictureBox47.TabStop = false; + // + // pictureBox48 + // + this.pictureBox48.Location = new System.Drawing.Point(712, 756); + this.pictureBox48.Name = "pictureBox48"; + this.pictureBox48.Size = new System.Drawing.Size(23, 23); + this.pictureBox48.TabIndex = 143; + this.pictureBox48.TabStop = false; // // iPerlCommunicationForm // @@ -1587,54 +1587,54 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.DarkGray; this.ClientSize = new System.Drawing.Size(1161, 795); - this.Controls.Add(this.textBox48); - this.Controls.Add(this.textBox47); - this.Controls.Add(this.textBox46); - this.Controls.Add(this.textBox45); - this.Controls.Add(this.textBox44); - this.Controls.Add(this.textBox43); - this.Controls.Add(this.textBox42); - this.Controls.Add(this.textBox41); - this.Controls.Add(this.textBox40); - this.Controls.Add(this.textBox39); - this.Controls.Add(this.textBox38); - this.Controls.Add(this.textBox37); - this.Controls.Add(this.textBox36); - this.Controls.Add(this.textBox35); - this.Controls.Add(this.textBox34); - this.Controls.Add(this.textBox33); - this.Controls.Add(this.textBox32); - this.Controls.Add(this.textBox31); - this.Controls.Add(this.textBox30); - this.Controls.Add(this.textBox29); - this.Controls.Add(this.textBox28); - this.Controls.Add(this.textBox27); - this.Controls.Add(this.textBox26); - this.Controls.Add(this.textBox25); - this.Controls.Add(this.textBox24); - this.Controls.Add(this.textBox23); - this.Controls.Add(this.textBox22); - this.Controls.Add(this.textBox21); - this.Controls.Add(this.textBox20); - this.Controls.Add(this.textBox19); - this.Controls.Add(this.textBox18); - this.Controls.Add(this.textBox17); - this.Controls.Add(this.textBox16); - this.Controls.Add(this.textBox15); - this.Controls.Add(this.textBox14); - this.Controls.Add(this.textBox13); - this.Controls.Add(this.textBox12); - this.Controls.Add(this.textBox11); - this.Controls.Add(this.textBox10); - this.Controls.Add(this.textBox9); - this.Controls.Add(this.textBox8); - this.Controls.Add(this.textBox7); - this.Controls.Add(this.textBox6); - this.Controls.Add(this.textBox5); - this.Controls.Add(this.textBox4); - this.Controls.Add(this.textBox3); - this.Controls.Add(this.textBox2); - this.Controls.Add(this.textBox1); + this.Controls.Add(this.pictureBox48); + this.Controls.Add(this.pictureBox47); + this.Controls.Add(this.pictureBox46); + this.Controls.Add(this.pictureBox45); + this.Controls.Add(this.pictureBox44); + this.Controls.Add(this.pictureBox43); + this.Controls.Add(this.pictureBox42); + this.Controls.Add(this.pictureBox41); + this.Controls.Add(this.pictureBox40); + this.Controls.Add(this.pictureBox39); + this.Controls.Add(this.pictureBox38); + this.Controls.Add(this.pictureBox37); + this.Controls.Add(this.pictureBox36); + this.Controls.Add(this.pictureBox35); + this.Controls.Add(this.pictureBox34); + this.Controls.Add(this.pictureBox33); + this.Controls.Add(this.pictureBox32); + this.Controls.Add(this.pictureBox31); + this.Controls.Add(this.pictureBox30); + this.Controls.Add(this.pictureBox29); + this.Controls.Add(this.pictureBox28); + this.Controls.Add(this.pictureBox27); + this.Controls.Add(this.pictureBox26); + this.Controls.Add(this.pictureBox25); + this.Controls.Add(this.pictureBox24); + this.Controls.Add(this.pictureBox23); + this.Controls.Add(this.pictureBox22); + this.Controls.Add(this.pictureBox21); + this.Controls.Add(this.pictureBox20); + this.Controls.Add(this.pictureBox19); + this.Controls.Add(this.pictureBox18); + this.Controls.Add(this.pictureBox17); + this.Controls.Add(this.pictureBox16); + this.Controls.Add(this.pictureBox15); + this.Controls.Add(this.pictureBox14); + this.Controls.Add(this.pictureBox13); + this.Controls.Add(this.pictureBox12); + this.Controls.Add(this.pictureBox11); + this.Controls.Add(this.pictureBox10); + this.Controls.Add(this.pictureBox9); + this.Controls.Add(this.pictureBox8); + this.Controls.Add(this.pictureBox7); + this.Controls.Add(this.pictureBox6); + this.Controls.Add(this.pictureBox5); + this.Controls.Add(this.pictureBox4); + this.Controls.Add(this.pictureBox3); + this.Controls.Add(this.pictureBox2); + this.Controls.Add(this.pictureBox1); this.Controls.Add(this.activityLabel); this.Controls.Add(this.wmTextBox48); this.Controls.Add(this.wmLabel48); @@ -1738,6 +1738,54 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication this.Text = "Water Meter States"; this.TopMost = true; this.Load += new System.EventHandler(this.iPerlCommunicationForm_Load); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox8)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox10)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox11)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox12)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox13)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox14)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox15)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox16)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox17)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox18)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox19)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox20)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox21)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox22)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox23)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox24)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox25)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox26)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox27)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox28)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox29)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox30)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox31)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox32)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox33)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox34)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox35)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox36)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox37)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox38)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox39)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox40)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox41)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox42)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox43)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox44)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox45)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox46)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox47)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox48)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1842,54 +1890,54 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication private System.Windows.Forms.TextBox wmTextBox25; private System.Windows.Forms.Label wmLabel25; private System.Windows.Forms.Label activityLabel; - private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.TextBox textBox2; - private System.Windows.Forms.TextBox textBox3; - private System.Windows.Forms.TextBox textBox4; - private System.Windows.Forms.TextBox textBox5; - private System.Windows.Forms.TextBox textBox6; - private System.Windows.Forms.TextBox textBox7; - private System.Windows.Forms.TextBox textBox8; - private System.Windows.Forms.TextBox textBox9; - private System.Windows.Forms.TextBox textBox10; - private System.Windows.Forms.TextBox textBox11; - private System.Windows.Forms.TextBox textBox12; - private System.Windows.Forms.TextBox textBox13; - private System.Windows.Forms.TextBox textBox14; - private System.Windows.Forms.TextBox textBox15; - private System.Windows.Forms.TextBox textBox16; - private System.Windows.Forms.TextBox textBox17; - private System.Windows.Forms.TextBox textBox18; - private System.Windows.Forms.TextBox textBox19; - private System.Windows.Forms.TextBox textBox20; - private System.Windows.Forms.TextBox textBox21; - private System.Windows.Forms.TextBox textBox22; - private System.Windows.Forms.TextBox textBox23; - private System.Windows.Forms.TextBox textBox24; - private System.Windows.Forms.TextBox textBox25; - private System.Windows.Forms.TextBox textBox26; - private System.Windows.Forms.TextBox textBox27; - private System.Windows.Forms.TextBox textBox28; - private System.Windows.Forms.TextBox textBox29; - private System.Windows.Forms.TextBox textBox30; - private System.Windows.Forms.TextBox textBox31; - private System.Windows.Forms.TextBox textBox32; - private System.Windows.Forms.TextBox textBox33; - private System.Windows.Forms.TextBox textBox34; - private System.Windows.Forms.TextBox textBox35; - private System.Windows.Forms.TextBox textBox36; - private System.Windows.Forms.TextBox textBox37; - private System.Windows.Forms.TextBox textBox38; - private System.Windows.Forms.TextBox textBox39; - private System.Windows.Forms.TextBox textBox40; - private System.Windows.Forms.TextBox textBox41; - private System.Windows.Forms.TextBox textBox42; - private System.Windows.Forms.TextBox textBox43; - private System.Windows.Forms.TextBox textBox44; - private System.Windows.Forms.TextBox textBox45; - private System.Windows.Forms.TextBox textBox46; - private System.Windows.Forms.TextBox textBox47; - private System.Windows.Forms.TextBox textBox48; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.PictureBox pictureBox2; + private System.Windows.Forms.PictureBox pictureBox3; + private System.Windows.Forms.PictureBox pictureBox4; + private System.Windows.Forms.PictureBox pictureBox5; + private System.Windows.Forms.PictureBox pictureBox6; + private System.Windows.Forms.PictureBox pictureBox7; + private System.Windows.Forms.PictureBox pictureBox8; + private System.Windows.Forms.PictureBox pictureBox9; + private System.Windows.Forms.PictureBox pictureBox10; + private System.Windows.Forms.PictureBox pictureBox11; + private System.Windows.Forms.PictureBox pictureBox12; + private System.Windows.Forms.PictureBox pictureBox13; + private System.Windows.Forms.PictureBox pictureBox14; + private System.Windows.Forms.PictureBox pictureBox15; + private System.Windows.Forms.PictureBox pictureBox16; + private System.Windows.Forms.PictureBox pictureBox17; + private System.Windows.Forms.PictureBox pictureBox18; + private System.Windows.Forms.PictureBox pictureBox19; + private System.Windows.Forms.PictureBox pictureBox20; + private System.Windows.Forms.PictureBox pictureBox21; + private System.Windows.Forms.PictureBox pictureBox22; + private System.Windows.Forms.PictureBox pictureBox23; + private System.Windows.Forms.PictureBox pictureBox24; + private System.Windows.Forms.PictureBox pictureBox25; + private System.Windows.Forms.PictureBox pictureBox26; + private System.Windows.Forms.PictureBox pictureBox27; + private System.Windows.Forms.PictureBox pictureBox28; + private System.Windows.Forms.PictureBox pictureBox29; + private System.Windows.Forms.PictureBox pictureBox30; + private System.Windows.Forms.PictureBox pictureBox31; + private System.Windows.Forms.PictureBox pictureBox32; + private System.Windows.Forms.PictureBox pictureBox33; + private System.Windows.Forms.PictureBox pictureBox34; + private System.Windows.Forms.PictureBox pictureBox35; + private System.Windows.Forms.PictureBox pictureBox36; + private System.Windows.Forms.PictureBox pictureBox37; + private System.Windows.Forms.PictureBox pictureBox38; + private System.Windows.Forms.PictureBox pictureBox39; + private System.Windows.Forms.PictureBox pictureBox40; + private System.Windows.Forms.PictureBox pictureBox41; + private System.Windows.Forms.PictureBox pictureBox42; + private System.Windows.Forms.PictureBox pictureBox43; + private System.Windows.Forms.PictureBox pictureBox44; + private System.Windows.Forms.PictureBox pictureBox45; + private System.Windows.Forms.PictureBox pictureBox46; + private System.Windows.Forms.PictureBox pictureBox47; + private System.Windows.Forms.PictureBox pictureBox48; } } \ No newline at end of file diff --git a/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs b/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs index f0575ae25..9999a21c8 100644 --- a/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs +++ b/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs @@ -347,9 +347,21 @@ namespace TBF.BenchControl.WaterMeters.iPerl public int FlushedDataCount { get { return flushedDataCount; } - set { flushedDataCount = value; } + set { flushedDataCount = lastFlushedDataCount = value; } } + int lastFlushedDataCount; + public int FlushedDataDelta + { + get + { + int retval = flushedDataCount - lastFlushedDataCount; + lastFlushedDataCount = flushedDataCount; + return retval; + } + } + + /// /// Opto serial port and worker thread related private variables diff --git a/TestBenchFramework/ProcedureDlg.Designer.cs b/TestBenchFramework/ProcedureDlg.Designer.cs index 5892e35ee..274d40c64 100644 --- a/TestBenchFramework/ProcedureDlg.Designer.cs +++ b/TestBenchFramework/ProcedureDlg.Designer.cs @@ -101,27 +101,30 @@ namespace TBF // // mainSplitContainer.Panel1 // + resources.ApplyResources(this.mainSplitContainer.Panel1, "mainSplitContainer.Panel1"); this.mainSplitContainer.Panel1.Controls.Add(this.tabControl); // // mainSplitContainer.Panel2 // + resources.ApplyResources(this.mainSplitContainer.Panel2, "mainSplitContainer.Panel2"); this.mainSplitContainer.Panel2.Controls.Add(this.sharedButtons); // // tabControl // + resources.ApplyResources(this.tabControl, "tabControl"); this.tabControl.Controls.Add(this.generalTabPage); this.tabControl.Controls.Add(this.historyTabPage); this.tabControl.Controls.Add(this.metrology1TabPage); this.tabControl.Controls.Add(this.metrology2TabPage); this.tabControl.Controls.Add(this.processTabPage); this.tabControl.Controls.Add(this.parametersTabPage); - resources.ApplyResources(this.tabControl, "tabControl"); this.tabControl.Name = "tabControl"; this.tabControl.SelectedIndex = 0; this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged); // // generalTabPage // + resources.ApplyResources(this.generalTabPage, "generalTabPage"); this.generalTabPage.Controls.Add(this.fileWriter4ComboBox); this.generalTabPage.Controls.Add(this.fileWriter3ComboBox); this.generalTabPage.Controls.Add(this.printer2ComboBox); @@ -156,32 +159,33 @@ namespace TBF this.generalTabPage.Controls.Add(this.label12); this.generalTabPage.Controls.Add(this.procNameTextBox); this.generalTabPage.Controls.Add(this.label1); - resources.ApplyResources(this.generalTabPage, "generalTabPage"); + this.generalTabPage.ImageKey = global::TBF.Resources.Strings.Camera; this.generalTabPage.Name = "generalTabPage"; + this.generalTabPage.ToolTipText = global::TBF.Resources.Strings.Camera; this.generalTabPage.UseVisualStyleBackColor = true; // // fileWriter4ComboBox // - this.fileWriter4ComboBox.FormattingEnabled = true; resources.ApplyResources(this.fileWriter4ComboBox, "fileWriter4ComboBox"); + this.fileWriter4ComboBox.FormattingEnabled = true; this.fileWriter4ComboBox.Name = "fileWriter4ComboBox"; // // fileWriter3ComboBox // - this.fileWriter3ComboBox.FormattingEnabled = true; resources.ApplyResources(this.fileWriter3ComboBox, "fileWriter3ComboBox"); + this.fileWriter3ComboBox.FormattingEnabled = true; this.fileWriter3ComboBox.Name = "fileWriter3ComboBox"; // // printer2ComboBox // - this.printer2ComboBox.FormattingEnabled = true; resources.ApplyResources(this.printer2ComboBox, "printer2ComboBox"); + this.printer2ComboBox.FormattingEnabled = true; this.printer2ComboBox.Name = "printer2ComboBox"; // // fileWriter2ComboBox // - this.fileWriter2ComboBox.FormattingEnabled = true; resources.ApplyResources(this.fileWriter2ComboBox, "fileWriter2ComboBox"); + this.fileWriter2ComboBox.FormattingEnabled = true; this.fileWriter2ComboBox.Name = "fileWriter2ComboBox"; // // protocolTitleTextBox @@ -198,6 +202,7 @@ namespace TBF // metersKindRadioButton2 // resources.ApplyResources(this.metersKindRadioButton2, "metersKindRadioButton2"); + this.metersKindRadioButton2.ImageKey = global::TBF.Resources.Strings.Camera; this.metersKindRadioButton2.Name = "metersKindRadioButton2"; this.metersKindRadioButton2.TabStop = true; this.metersKindRadioButton2.UseVisualStyleBackColor = true; @@ -205,63 +210,69 @@ namespace TBF // metersKindRadioButton1 // resources.ApplyResources(this.metersKindRadioButton1, "metersKindRadioButton1"); + this.metersKindRadioButton1.ImageKey = global::TBF.Resources.Strings.Camera; this.metersKindRadioButton1.Name = "metersKindRadioButton1"; this.metersKindRadioButton1.TabStop = true; this.metersKindRadioButton1.UseVisualStyleBackColor = true; // // transitionEndComboBox // - this.transitionEndComboBox.FormattingEnabled = true; resources.ApplyResources(this.transitionEndComboBox, "transitionEndComboBox"); + this.transitionEndComboBox.FormattingEnabled = true; this.transitionEndComboBox.Name = "transitionEndComboBox"; // // transitionEndLabel // resources.ApplyResources(this.transitionEndLabel, "transitionEndLabel"); + this.transitionEndLabel.ImageKey = global::TBF.Resources.Strings.Camera; this.transitionEndLabel.Name = "transitionEndLabel"; // // transitionStartComboBox // - this.transitionStartComboBox.FormattingEnabled = true; resources.ApplyResources(this.transitionStartComboBox, "transitionStartComboBox"); + this.transitionStartComboBox.FormattingEnabled = true; this.transitionStartComboBox.Name = "transitionStartComboBox"; // // transitionStartLabel // resources.ApplyResources(this.transitionStartLabel, "transitionStartLabel"); + this.transitionStartLabel.ImageKey = global::TBF.Resources.Strings.Camera; this.transitionStartLabel.Name = "transitionStartLabel"; // // fileWriter1ComboBox // - this.fileWriter1ComboBox.FormattingEnabled = true; resources.ApplyResources(this.fileWriter1ComboBox, "fileWriter1ComboBox"); + this.fileWriter1ComboBox.FormattingEnabled = true; this.fileWriter1ComboBox.Name = "fileWriter1ComboBox"; // // printer1ComboBox // - this.printer1ComboBox.FormattingEnabled = true; resources.ApplyResources(this.printer1ComboBox, "printer1ComboBox"); + this.printer1ComboBox.FormattingEnabled = true; this.printer1ComboBox.Name = "printer1ComboBox"; // // dataEntryComboBox // - this.dataEntryComboBox.FormattingEnabled = true; resources.ApplyResources(this.dataEntryComboBox, "dataEntryComboBox"); + this.dataEntryComboBox.FormattingEnabled = true; this.dataEntryComboBox.Name = "dataEntryComboBox"; // // resultsWriterLabel // resources.ApplyResources(this.resultsWriterLabel, "resultsWriterLabel"); + this.resultsWriterLabel.ImageKey = global::TBF.Resources.Strings.Camera; this.resultsWriterLabel.Name = "resultsWriterLabel"; // // resultsPrinterLabel // resources.ApplyResources(this.resultsPrinterLabel, "resultsPrinterLabel"); + this.resultsPrinterLabel.ImageKey = global::TBF.Resources.Strings.Camera; this.resultsPrinterLabel.Name = "resultsPrinterLabel"; // // dataEntryLabel // resources.ApplyResources(this.dataEntryLabel, "dataEntryLabel"); + this.dataEntryLabel.ImageKey = global::TBF.Resources.Strings.Camera; this.dataEntryLabel.Name = "dataEntryLabel"; // // notesTextBox @@ -272,6 +283,7 @@ namespace TBF // label18 // resources.ApplyResources(this.label18, "label18"); + this.label18.ImageKey = global::TBF.Resources.Strings.Camera; this.label18.Name = "label18"; // // watermetersTextBox @@ -282,6 +294,7 @@ namespace TBF // watermetersLabel // resources.ApplyResources(this.watermetersLabel, "watermetersLabel"); + this.watermetersLabel.ImageKey = global::TBF.Resources.Strings.Camera; this.watermetersLabel.Name = "watermetersLabel"; // // lastChangedOnTextBox @@ -292,6 +305,7 @@ namespace TBF // label15 // resources.ApplyResources(this.label15, "label15"); + this.label15.ImageKey = global::TBF.Resources.Strings.Camera; this.label15.Name = "label15"; // // lastChangedByTextBox @@ -302,6 +316,7 @@ namespace TBF // label16 // resources.ApplyResources(this.label16, "label16"); + this.label16.ImageKey = global::TBF.Resources.Strings.Camera; this.label16.Name = "label16"; // // createdOnTextBox @@ -312,6 +327,7 @@ namespace TBF // label14 // resources.ApplyResources(this.label14, "label14"); + this.label14.ImageKey = global::TBF.Resources.Strings.Camera; this.label14.Name = "label14"; // // createdByTextBox @@ -322,6 +338,7 @@ namespace TBF // label13 // resources.ApplyResources(this.label13, "label13"); + this.label13.ImageKey = global::TBF.Resources.Strings.Camera; this.label13.Name = "label13"; // // descriptionTextBox @@ -332,6 +349,7 @@ namespace TBF // label12 // resources.ApplyResources(this.label12, "label12"); + this.label12.ImageKey = global::TBF.Resources.Strings.Camera; this.label12.Name = "label12"; // // procNameTextBox @@ -342,19 +360,22 @@ namespace TBF // label1 // resources.ApplyResources(this.label1, "label1"); + this.label1.ImageKey = global::TBF.Resources.Strings.Camera; this.label1.Name = "label1"; // // historyTabPage // - this.historyTabPage.Controls.Add(this.historyListViewEx); resources.ApplyResources(this.historyTabPage, "historyTabPage"); + this.historyTabPage.Controls.Add(this.historyListViewEx); + this.historyTabPage.ImageKey = global::TBF.Resources.Strings.Camera; this.historyTabPage.Name = "historyTabPage"; + this.historyTabPage.ToolTipText = global::TBF.Resources.Strings.Camera; this.historyTabPage.UseVisualStyleBackColor = true; // // historyListViewEx // - this.historyListViewEx.AllowColumnReorder = true; resources.ApplyResources(this.historyListViewEx, "historyListViewEx"); + this.historyListViewEx.AllowColumnReorder = true; this.historyListViewEx.DoubleClickActivation = false; this.historyListViewEx.FullRowSelect = true; this.historyListViewEx.GridLines = true; @@ -364,15 +385,17 @@ namespace TBF // // metrology1TabPage // - this.metrology1TabPage.Controls.Add(this.metrology1ListViewEx); resources.ApplyResources(this.metrology1TabPage, "metrology1TabPage"); + this.metrology1TabPage.Controls.Add(this.metrology1ListViewEx); + this.metrology1TabPage.ImageKey = global::TBF.Resources.Strings.Camera; this.metrology1TabPage.Name = "metrology1TabPage"; + this.metrology1TabPage.ToolTipText = global::TBF.Resources.Strings.Camera; this.metrology1TabPage.UseVisualStyleBackColor = true; // // metrology1ListViewEx // - this.metrology1ListViewEx.AllowColumnReorder = true; resources.ApplyResources(this.metrology1ListViewEx, "metrology1ListViewEx"); + this.metrology1ListViewEx.AllowColumnReorder = true; this.metrology1ListViewEx.DoubleClickActivation = false; this.metrology1ListViewEx.FullRowSelect = true; this.metrology1ListViewEx.GridLines = true; @@ -383,15 +406,17 @@ namespace TBF // // metrology2TabPage // - this.metrology2TabPage.Controls.Add(this.metrology2ListViewEx); resources.ApplyResources(this.metrology2TabPage, "metrology2TabPage"); + this.metrology2TabPage.Controls.Add(this.metrology2ListViewEx); + this.metrology2TabPage.ImageKey = global::TBF.Resources.Strings.Camera; this.metrology2TabPage.Name = "metrology2TabPage"; + this.metrology2TabPage.ToolTipText = global::TBF.Resources.Strings.Camera; this.metrology2TabPage.UseVisualStyleBackColor = true; // // metrology2ListViewEx // - this.metrology2ListViewEx.AllowColumnReorder = true; resources.ApplyResources(this.metrology2ListViewEx, "metrology2ListViewEx"); + this.metrology2ListViewEx.AllowColumnReorder = true; this.metrology2ListViewEx.DoubleClickActivation = false; this.metrology2ListViewEx.FullRowSelect = true; this.metrology2ListViewEx.GridLines = true; @@ -402,15 +427,17 @@ namespace TBF // // processTabPage // - this.processTabPage.Controls.Add(this.processListViewEx); resources.ApplyResources(this.processTabPage, "processTabPage"); + this.processTabPage.Controls.Add(this.processListViewEx); + this.processTabPage.ImageKey = global::TBF.Resources.Strings.Camera; this.processTabPage.Name = "processTabPage"; + this.processTabPage.ToolTipText = global::TBF.Resources.Strings.Camera; this.processTabPage.UseVisualStyleBackColor = true; // // processListViewEx // - this.processListViewEx.AllowColumnReorder = true; resources.ApplyResources(this.processListViewEx, "processListViewEx"); + this.processListViewEx.AllowColumnReorder = true; this.processListViewEx.DoubleClickActivation = false; this.processListViewEx.FullRowSelect = true; this.processListViewEx.GridLines = true; @@ -421,15 +448,17 @@ namespace TBF // // parametersTabPage // - this.parametersTabPage.Controls.Add(this.parametersListViewEx); resources.ApplyResources(this.parametersTabPage, "parametersTabPage"); + this.parametersTabPage.Controls.Add(this.parametersListViewEx); + this.parametersTabPage.ImageKey = global::TBF.Resources.Strings.Camera; this.parametersTabPage.Name = "parametersTabPage"; + this.parametersTabPage.ToolTipText = global::TBF.Resources.Strings.Camera; this.parametersTabPage.UseVisualStyleBackColor = true; // // parametersListViewEx // - this.parametersListViewEx.AllowColumnReorder = true; resources.ApplyResources(this.parametersListViewEx, "parametersListViewEx"); + this.parametersListViewEx.AllowColumnReorder = true; this.parametersListViewEx.DoubleClickActivation = false; this.parametersListViewEx.FullRowSelect = true; this.parametersListViewEx.Name = "parametersListViewEx"; diff --git a/TestBenchFramework/ProcedureDlg.cs b/TestBenchFramework/ProcedureDlg.cs index 44a33acaf..bff6a8075 100644 --- a/TestBenchFramework/ProcedureDlg.cs +++ b/TestBenchFramework/ProcedureDlg.cs @@ -337,11 +337,11 @@ namespace TBF descriptionTextBox.Text = LoadedProcedure.Description; createdByTextBox.Text = LoadedProcedure.CreationUser; - createdOnTextBox.Text = LoadedProcedure.CreationTime.ToShortDateString(); + createdOnTextBox.Text = LoadedProcedure.CreationTime.ToString(); lastChangedByTextBox.Text = LoadedProcedure.LastChgUser; if (LoadedProcedure.LastChgTime > LoadedProcedure.CreationTime) { - lastChangedOnTextBox.Text = LoadedProcedure.LastChgTime.ToShortDateString(); + lastChangedOnTextBox.Text = LoadedProcedure.LastChgTime.ToString(); } watermetersTextBox.Text = LoadedProcedure.Watermeters; protocolTitleTextBox.Text = LoadedProcedure.ProtocolTitle; @@ -388,8 +388,6 @@ namespace TBF Text = string.Format("{0} '{1}'", Strings.Procedure, LoadedProcedure.Name); LoadedProcedure.Description = descriptionTextBox.Text; - LoadedProcedure.LastChgUser = User.CurrentUser.Name; - LoadedProcedure.LastChgTime = DateTime.Now; LoadedProcedure.Watermeters = watermetersTextBox.Text; LoadedProcedure.ProtocolTitle = protocolTitleTextBox.Text; @@ -502,7 +500,7 @@ namespace TBF found = true; ListViewItem item = new ListViewItem(p.Name); item.SubItems.Add(p.Revision.ToString()); - item.SubItems.Add(p.LastChgTime.ToShortDateString()); + item.SubItems.Add(p.LastChgTime.ToString()); item.SubItems.Add(p.LastChgUser.ToString()); item.SubItems.Add(p.Description); historyListViewEx.Items.Add(item); diff --git a/TestBenchFramework/ProcedureDlg.cs.resx b/TestBenchFramework/ProcedureDlg.cs.resx index b13f45c57..73043967c 100644 --- a/TestBenchFramework/ProcedureDlg.cs.resx +++ b/TestBenchFramework/ProcedureDlg.cs.resx @@ -117,88 +117,122 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Procedura - - - Vložte data - - - Datum - - - Popis - - - Obecné - - - Historie změn - - - Změněno - - - Jméno postupu - - - Stručný popis - - - Vytvořil - - - Datum - - - Datum - - - Poslední změna - - - Poznámky - - - Singl - - - Kombinované - - - Metrologie I. - - - Metrologie II. - - - Parametry - - - Proces - - - Název protokolu - - - Jednotlivý - - - Kombinovaný - - - Tisknout - - - Uložit - - - Vypuštění - - - Plnění - - - Testované typy měřičů - + + + 85, 13 + + + Název protokolu + + + 90, 17 + + + Kombinované + + + 48, 17 + + + Singl + + + 55, 13 + + + Vypuštění + + + 38, 13 + + + Plnění + + + 33, 13 + + + Uložit + + + 48, 13 + + + Tisknout + + + 60, 13 + + + Vložte data + + + 56, 13 + + + Poznámky + + + 115, 13 + + + Testované typy měřičů + + + 38, 13 + + + Datum + + + 83, 13 + + + Poslední změna + + + 38, 13 + + + Datum + + + 42, 13 + + + Vytvořil + + + 71, 13 + + + Stručný popis + + + 79, 13 + + + Jméno postupu + + + Obecné + + + Historie změn + + + Metrologie I. + + + Metrologie II. + + + Proces + + + Parametry + + + Procedura + \ No newline at end of file diff --git a/TestBenchFramework/ProcedureDlg.de.resx b/TestBenchFramework/ProcedureDlg.de.resx index a2344e182..e34254ced 100644 --- a/TestBenchFramework/ProcedureDlg.de.resx +++ b/TestBenchFramework/ProcedureDlg.de.resx @@ -118,30 +118,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 931, 409 - - - 1034, 409 - - - 923, 371 - - - Allgemein - - - 148, 335 - - - 148, 312 - - - 148, 243 - - - 148, 289 - 148, 105 @@ -169,9 +145,6 @@ Einzel - - 148, 197 - 20, 200 @@ -181,27 +154,12 @@ Entwässern - - 148, 174 - - - 20, 177 - 45, 13 Befüllen - - 148, 266 - - - 148, 220 - - - 148, 151 - 20, 269 @@ -268,12 +226,6 @@ Datum - - 148, 82 - - - 20, 85 - 102, 13 @@ -292,52 +244,43 @@ Datum - - 148, 59 - - - 20, 62 - 62, 13 Errstellt von - - 148, 36 - 526, 20 - - 20, 39 - 92, 13 Kurzbeschreibung - - 148, 13 - - - 20, 16 - 75, 13 Prüfungsname + + 923, 371 + + + Allgemein + + + 917, 365 + 923, 371 Änderungen - + 917, 365 @@ -346,7 +289,7 @@ Metrologie I. - + 917, 365 @@ -355,7 +298,7 @@ Metrologie II. - + 917, 365 @@ -364,14 +307,17 @@ Prüfstrecke - - 917, 365 + + 923, 371 923, 371 - - 923, 371 + + 931, 409 + + + 1034, 409 1034, 409 diff --git a/TestBenchFramework/ProcedureDlg.resx b/TestBenchFramework/ProcedureDlg.resx index e17138bbf..668914e47 100644 --- a/TestBenchFramework/ProcedureDlg.resx +++ b/TestBenchFramework/ProcedureDlg.resx @@ -117,1267 +117,1267 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Fill + + protocolTitleLabel - - - True + + + NoControl + + + Metrology I. - - 0, 0 + + 121, 20 - - 148, 335 + + 353, 195 - - 121, 21 + + 20, 62 - - 29 + + transitionStartComboBox - - fileWriter4ComboBox + + tabControl - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 - + + 10 + + + 1 + + generalTabPage + + 148, 59 + + + Process + + + label15 + + + 923, 364 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 25 + 0 - - 148, 312 + + printer1ComboBox - - 121, 21 + + Printers - - 28 - - - fileWriter3ComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + generalTabPage - + + 0 + + + metrology2TabPage + + + 20, 108 + + + True + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + 931, 402 + + + 30, 13 + + 1 148, 243 - - 121, 21 + + 17 - - 24 + + metrology2ListViewEx - - printer2ComboBox + + 317, 161 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 353, 59 - - generalTabPage + + 86, 13 - - 2 + + 923, 364 - - 148, 289 - - - 121, 21 - - - 27 - - - fileWriter2ComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 3 - - - 148, 128 - - - 522, 20 - - - 15 - - - protocolTitleTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 4 - - - True - - - NoControl - - - 20, 131 - - - 65, 13 - - - 14 - - - Protocol title - - - protocolTitleLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 5 - - - True - - - NoControl - - - 427, 163 - - - 72, 17 - - - 31 - - - Combined - - - metersKindRadioButton2 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 6 - - - True - - - 356, 163 - - - 54, 17 - - - 30 - - - Single - - - metersKindRadioButton1 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 7 - - - 148, 197 - - - 121, 21 - - - 21 - - - transitionEndComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 8 - - - True - - - NoControl - - - 20, 202 - - - 63, 13 - - - 20 - - - Purge - End - - - transitionEndLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 9 - - - 148, 174 - - - 121, 21 - - - 19 - - - transitionStartComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 10 - - - True - - - NoControl - - - 20, 177 - - - 71, 13 - - - 18 - - - Purge - Begin - - - transitionStartLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 11 - - - 148, 266 - - - 121, 21 - - + 26 - - fileWriter1ComboBox + + 32 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - generalTabPage + + 353, 82 - - 12 + + 32 - - 148, 220 + + 4, 34 - - 121, 21 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + procNameTextBox + + + History of Changes 23 - - printer1ComboBox + + metersKindRadioButton1 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 21 + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Single + + + resultsPrinterLabel + + + 148, 36 + + + 1 + + + generalTabPage + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + historyTabPage + + + 16 generalTabPage - - 13 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 148, 151 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 121, 21 + + 3, 3, 3, 3 - - 17 + + 3 - - dataEntryComboBox + + 2 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + generalTabPage - - 14 + + NoControl - + + $this + + + 148, 174 + + + generalTabPage + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + + + 0 + + + lastChangedOnTextBox + + True NoControl - - 20, 271 - - - 70, 13 - - - 25 - Results writer - - resultsWriterLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 15 - - - True - - - NoControl - - - 20, 225 - - - 42, 13 - - - 22 - - - Printers - - - resultsPrinterLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 16 - - - True - - - NoControl - - - 21, 154 - - - 57, 13 - - - 16 - - - Data Entry - - - dataEntryLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 17 - - - 353, 195 - - - True - - - 317, 161 - - - 33 - - - notesTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 18 - - - True - - - NoControl - - - 291, 198 - - - 35, 13 - - - 32 - - - Notes - - - label18 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 19 - - - 148, 105 - - - 522, 20 - - - 13 - - - watermetersTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 20 - - - True - - - NoControl - - - 20, 108 - - - 94, 13 - - - 12 - - - Meter types tested - - - watermetersLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 21 - - - 353, 82 - - - 97, 20 - - - 11 - - - lastChangedOnTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 22 - - - True - - - NoControl - - - 291, 85 - - - 30, 13 - - - 10 - - - Date - - - label15 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 23 - - - 148, 82 - - - 121, 20 - - - 9 - - - lastChangedByTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 24 - - - True - - - NoControl - - - 20, 85 - - - 86, 13 - - - 8 - - - Last changed by - - - label16 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 25 - - - 353, 59 - - - 97, 20 - - - 7 - - - createdOnTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 26 - - - True - - - NoControl - - - 291, 62 - - - 30, 13 - - - 6 - - - Date - - - label14 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 27 - - - 148, 59 - - - 121, 20 - - - 5 - - - createdByTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 28 - - - True - - - NoControl - - - 20, 62 - - - 58, 13 - - - 4 - - - Created by - - - label13 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 29 - - - 148, 36 - - - 522, 20 - - - 3 - - - descriptionTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 30 - - - True - - - NoControl - - - 20, 39 - - - 86, 13 - - - 2 - - - Short description - - - label12 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 31 - 148, 13 - - 217, 20 + + Combined - - 1 + + -1, 0 - - procNameTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - generalTabPage - - - 32 - - + True - + + generalTabPage + + + 3, 3, 3, 3 + + NoControl - - 20, 16 + + 3, 3, 3, 3 - - 85, 13 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + generalTabPage - - Procedure name + + 57, 13 - - label1 + + 6, 13 + + + mainSplitContainer + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 20 + + + 18 + + + Meter types tested + + + transitionEndLabel + + + 4, 34 + + + 3 + + + 0, 0 + + + 86, 13 + + + 148, 266 + + + TBF.UiControls.ListViewEx, TBF, Version=2.8.313.1, Culture=neutral, PublicKeyToken=null + + + 31 + + + Fill + + + transitionStartLabel + + + 22 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + + + 94, 13 + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + parametersTabPage + + + 20, 271 + + + generalTabPage + + + 923, 364 + + + historyListViewEx + + + tabControl + + + 13 + + + 923, 364 + + + 427, 163 + + + 291, 62 + + + protocolTitleTextBox + + + notesTextBox + + + metrology1TabPage + + + metersKindRadioButton2 + + + 121, 21 + + + True System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + 148, 197 + + generalTabPage - + + 2 + + + createdOnTextBox + + + label16 + + + 21 + + 33 - - 4, 34 + + label12 - - 3, 3, 3, 3 + + watermetersTextBox - - 923, 364 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + 27 - - General + + Parameters - + generalTabPage System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabControl - - - 0 - - - Fill - - - 3, 3 - - - 917, 358 - - - 0 - - - historyListViewEx - - - TBF.UiControls.ListViewEx, TBF, Version=2.7.283.1, Culture=neutral, PublicKeyToken=null - - - historyTabPage - - - 0 - - - 4, 34 - - - 3, 3, 3, 3 - - - 923, 364 - - - 1 - - - History of Changes - - - historyTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 1 - - - Fill - - - 3, 3 - - - 917, 358 - - - 0 - - - metrology1ListViewEx - - - TBF.UiControls.ListViewEx, TBF, Version=2.7.283.1, Culture=neutral, PublicKeyToken=null - - - metrology1TabPage - - - 0 - - - 4, 34 - - - 3, 3, 3, 3 - - - 923, 364 - - - 2 - - - Metrology I. - - - metrology1TabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 2 - - - Fill - - - 3, 3 - - - 917, 358 - - - 0 - - - metrology2ListViewEx - - - TBF.UiControls.ListViewEx, TBF, Version=2.7.283.1, Culture=neutral, PublicKeyToken=null - - - metrology2TabPage - 0 - - 4, 34 - - - 3, 3, 3, 3 - - - 923, 364 - - - 3 - - - Metrology II. - - - metrology2TabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 3 - - - Fill - - - 3, 3 - - - 917, 358 - - - 0 - - - processListViewEx - - - TBF.UiControls.ListViewEx, TBF, Version=2.7.283.1, Culture=neutral, PublicKeyToken=null - - - processTabPage - - - 0 - - - 4, 34 - - - 3, 3, 3, 3 - - - 923, 364 - - - 4 - - - Process - - - processTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 4 - - - Fill - - - 0, 0 - - - 923, 364 - - - 0 - - - parametersListViewEx - - - TBF.UiControls.ListViewEx, TBF, Version=2.7.283.1, Culture=neutral, PublicKeyToken=null - - - parametersTabPage - - - 0 - - - 4, 34 - - - 923, 364 - - - 5 - - - Parameters - - - parametersTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 5 - - - Fill - - - 58, 30 - - - 0, 0 - - - 931, 402 - - - 1 - - - tabControl - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainSplitContainer.Panel1 - - - 0 - - - mainSplitContainer.Panel1 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainSplitContainer - - - 0 - - - -1, 0 - - - 100, 400 - - - 0 - - - sharedButtons - - - TBF.UiControls.SharedButtons, TBF, Version=2.7.283.1, Culture=neutral, PublicKeyToken=null - - - mainSplitContainer.Panel2 - - - 0 - - - mainSplitContainer.Panel2 + + generalTabPage System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mainSplitContainer + + 0 - - 1 + + metrology1TabPage - - 1034, 402 + + 85, 13 + + + 9 + + + NoControl + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + label13 + + + True + + + 23 + + + generalTabPage + + + generalTabPage + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 931 - + + 70, 13 + + + 3 + + + label18 + + + 121, 21 + + + 20 + + + 7 + + + 17 + + + label1 + + + generalTabPage + + + True + + + generalTabPage + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 21, 154 + + + 0 + + + Fill + + + printer2ComboBox + + 1 - + + fileWriter2ComboBox + + + True + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 54, 17 + + + Procedure name + + + TBF.UiControls.ListViewEx, TBF, Version=2.8.313.1, Culture=neutral, PublicKeyToken=null + + + True + + + 11 + + + Fill + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 100, 400 + + + resultsWriterLabel + + + NoControl + + + 11 + + + 30 + + + 0, 0 + + + NoControl + + + 148, 82 + + + NoControl + + mainSplitContainer - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 148, 289 - - $this + + 4 + + + 3 + + + metrology1ListViewEx + + + 150, 20 + + + 30, 13 + + + 31 + + + True + + + tabControl + + + generalTabPage + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 27 + + + 148, 151 + + + 917, 358 + + + 18 + + + generalTabPage + + + 20, 131 + + + 0, 0 + + + transitionEndComboBox + + + 58, 13 + + + 12 + + + 522, 20 + + + NoControl + + + 148, 128 + + + generalTabPage + + + 24 + + + 29 + + + 72, 17 + + + 71, 13 + + + 16 + + + 3, 3 + + + NoControl + + + 30 + + + Fill + + + 25 + + + watermetersLabel + + + generalTabPage + + + 917, 358 + + + 148, 312 + + + 26 + + + 4, 34 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 15 + + + 19 + + + Purge - Begin + + + 6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + 28 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + True + + + mainSplitContainer.Panel2 + + + 13 + + + 24 + + + mainSplitContainer.Panel1 + + + 121, 21 + + + 14 + + + generalTabPage + + + 917, 358 + + + 4 + + + mainSplitContainer.Panel2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 20, 16 + + + TBF.UiControls.SharedButtons, TBF, Version=2.8.313.1, Culture=neutral, PublicKeyToken=null + + + 217, 20 + + + tabControl + + + 7 + + + 63, 13 + + + 917, 358 + + + 1 + + + generalTabPage + + + NoControl + + + generalTabPage 0 - + True - - - 6, 13 - - 1034, 402 + + 121, 21 - - CenterParent - - - Procedure + + 356, 163 ProcedureDlg - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 8 + + Purge - End + + + tabControl + + + generalTabPage + + + generalTabPage + + + 20, 85 + + + Metrology II. + + + 148, 105 + + + parametersTabPage + + + historyTabPage + + + True + + + 3, 3 + + + True + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + dataEntryComboBox + + + Notes + + + 150, 20 + + + 42, 13 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + 65, 13 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + generalTabPage + + + 20, 177 + + + generalTabPage + + + Created by + + + createdByTextBox + + + fileWriter4ComboBox + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 8 + + + 4, 34 + + + processTabPage + + + 22 + + + 3, 3 + + + TBF.UiControls.ListViewEx, TBF, Version=2.8.313.1, Culture=neutral, PublicKeyToken=null + + + mainSplitContainer.Panel1 + + + generalTabPage + + + 5 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 121, 21 + + + 291, 198 + + + 19 + + + 20, 225 + + + 9 + + + Data Entry + + + generalTabPage + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 2 + + + Date + + + generalTabPage + + + Fill + + + 5 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3, 3 + + + 121, 21 + + + 0 + + + mainSplitContainer + + + generalTabPage + + + 33 + + + lastChangedByTextBox + + + 121, 21 + + + 0 + + + 0 + + + 0 + + + 20, 202 + + + metrology2TabPage + + + 12 + + + sharedButtons + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + + + CenterParent + + + 29 + + + 1034, 402 + + + generalTabPage + + + 2 + + + 522, 20 + + + 148, 220 + + + 923, 364 + + + tabControl + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3, 3, 3, 3 + + + processTabPage + + + TBF.UiControls.ListViewEx, TBF, Version=2.8.313.1, Culture=neutral, PublicKeyToken=null + + + 3, 3, 3, 3 + + + 4 + + + processListViewEx + + + 4 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 1034, 402 + + + parametersListViewEx + + + 121, 20 + + + True + + + 291, 85 + + + 4, 34 + + + 0 + + + Procedure + + + descriptionTextBox + + + True + + + 121, 21 + + + 10 + + + generalTabPage + + + 0 + + + generalTabPage + + + 522, 20 + + + 5 + + + 6 + + + Last changed by + + + dataEntryLabel + + + NoControl + + + 4, 34 + + + 14 + + + 148, 335 + + + True + + + 1 + + + 28 + + + Protocol title + + + 1 + + + General + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 20, 39 + + + 58, 30 + + + fileWriter1ComboBox + + + Short description + + + fileWriter3ComboBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Date + + + NoControl + + + TBF.UiControls.ListViewEx, TBF, Version=2.8.313.1, Culture=neutral, PublicKeyToken=null + + + 0 + + + 15 + + + True + + + 121, 21 + + + 35, 13 + + + 923, 364 + + + 923, 364 + + + tabControl + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + 0 + + + label14 + + + True + \ No newline at end of file diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 57ba4f1a8..7e709b084 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.8.313.1")] -[assembly: AssemblyFileVersion("2.8.313.1")] +[assembly: AssemblyVersion("2.8.314.1")] +[assembly: AssemblyFileVersion("2.8.314.1")]