From 58f872c6f4e693f6648831d63d6a233452f319c9 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 3 Jul 2015 02:42:30 +0200 Subject: [PATCH] Bug fix in adjustment dialog for 24 watermeters, version 1.5.64. --- .../TestMethods/Adjustment/WMErrorsForm24.cs | 4 +- .../Adjustment/WMErrorsForm24.designer.cs | 50 ++++++++++++++++++- TestBenchFramework/Properties/AssemblyInfo.cs | 4 +- 3 files changed, 53 insertions(+), 5 deletions(-) diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm24.cs b/TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm24.cs index a2297799a..e9bbd049f 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm24.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm24.cs @@ -55,8 +55,8 @@ namespace TBF.BenchControl.TestMethods.Adjustment wmErrorTextBox21, wmErrorTextBox22, wmErrorTextBox23, wmErrorTextBox24, }; - rects = new Rectangle[WaterMetersCount]; - for (int i = 0; i < WaterMetersCount; i++) + rects = new Rectangle[24]; + for (int i = 0; i < 24; i++) { int row = i % 12; int col = i / 12; diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm24.designer.cs b/TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm24.designer.cs index 04f0bb34b..feb0a3598 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm24.designer.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm24.designer.cs @@ -89,6 +89,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox2.Name = "wmErrorTextBox2"; this.wmErrorTextBox2.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox2.TabIndex = 1; + this.wmErrorTextBox2.Visible = false; // // wmErrorLabel2 // @@ -99,6 +100,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel2.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel2.TabIndex = 0; this.wmErrorLabel2.Text = "Error [%]"; + this.wmErrorLabel2.Visible = false; // // wmErrorLabel1 // @@ -109,6 +111,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel1.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel1.TabIndex = 0; this.wmErrorLabel1.Text = "Error [%]"; + this.wmErrorLabel1.Visible = false; // // okButton // @@ -129,6 +132,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox3.Name = "wmErrorTextBox3"; this.wmErrorTextBox3.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox3.TabIndex = 1; + this.wmErrorTextBox3.Visible = false; // // wmErrorLabel3 // @@ -139,6 +143,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel3.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel3.TabIndex = 0; this.wmErrorLabel3.Text = "Error [%]"; + this.wmErrorLabel3.Visible = false; // // wmErrorTextBox4 // @@ -147,6 +152,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox4.Name = "wmErrorTextBox4"; this.wmErrorTextBox4.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox4.TabIndex = 1; + this.wmErrorTextBox4.Visible = false; // // wmErrorLabel4 // @@ -157,6 +163,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel4.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel4.TabIndex = 0; this.wmErrorLabel4.Text = "Error [%]"; + this.wmErrorLabel4.Visible = false; // // wmErrorTextBox5 // @@ -165,6 +172,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox5.Name = "wmErrorTextBox5"; this.wmErrorTextBox5.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox5.TabIndex = 1; + this.wmErrorTextBox5.Visible = false; // // wmErrorLabel5 // @@ -175,6 +183,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel5.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel5.TabIndex = 0; this.wmErrorLabel5.Text = "Error [%]"; + this.wmErrorLabel5.Visible = false; // // wmErrorTextBox6 // @@ -183,6 +192,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox6.Name = "wmErrorTextBox6"; this.wmErrorTextBox6.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox6.TabIndex = 1; + this.wmErrorTextBox6.Visible = false; // // wmErrorLabel6 // @@ -193,6 +203,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel6.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel6.TabIndex = 0; this.wmErrorLabel6.Text = "Error [%]"; + this.wmErrorLabel6.Visible = false; // // wmErrorTextBox1 // @@ -201,6 +212,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox1.Name = "wmErrorTextBox1"; this.wmErrorTextBox1.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox1.TabIndex = 1; + this.wmErrorTextBox1.Visible = false; // // wmErrorTextBox7 // @@ -209,6 +221,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox7.Name = "wmErrorTextBox7"; this.wmErrorTextBox7.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox7.TabIndex = 9; + this.wmErrorTextBox7.Visible = false; // // wmErrorLabel7 // @@ -219,6 +232,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel7.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel7.TabIndex = 8; this.wmErrorLabel7.Text = "Error [%]"; + this.wmErrorLabel7.Visible = false; // // wmErrorTextBox8 // @@ -227,6 +241,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox8.Name = "wmErrorTextBox8"; this.wmErrorTextBox8.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox8.TabIndex = 11; + this.wmErrorTextBox8.Visible = false; // // wmErrorLabel8 // @@ -237,6 +252,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel8.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel8.TabIndex = 10; this.wmErrorLabel8.Text = "Error [%]"; + this.wmErrorLabel8.Visible = false; // // wmErrorTextBox9 // @@ -245,6 +261,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox9.Name = "wmErrorTextBox9"; this.wmErrorTextBox9.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox9.TabIndex = 13; + this.wmErrorTextBox9.Visible = false; // // wmErrorLabel9 // @@ -255,6 +272,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel9.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel9.TabIndex = 12; this.wmErrorLabel9.Text = "Error [%]"; + this.wmErrorLabel9.Visible = false; // // wmErrorTextBox10 // @@ -263,6 +281,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox10.Name = "wmErrorTextBox10"; this.wmErrorTextBox10.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox10.TabIndex = 15; + this.wmErrorTextBox10.Visible = false; // // wmErrorLabel10 // @@ -273,6 +292,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel10.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel10.TabIndex = 14; this.wmErrorLabel10.Text = "Error [%]"; + this.wmErrorLabel10.Visible = false; // // wmErrorTextBox12 // @@ -281,6 +301,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox12.Name = "wmErrorTextBox12"; this.wmErrorTextBox12.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox12.TabIndex = 19; + this.wmErrorTextBox12.Visible = false; // // wmErrorLabel12 // @@ -291,6 +312,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel12.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel12.TabIndex = 18; this.wmErrorLabel12.Text = "Error [%]"; + this.wmErrorLabel12.Visible = false; // // wmErrorTextBox11 // @@ -299,6 +321,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox11.Name = "wmErrorTextBox11"; this.wmErrorTextBox11.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox11.TabIndex = 17; + this.wmErrorTextBox11.Visible = false; // // wmErrorLabel11 // @@ -309,6 +332,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel11.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel11.TabIndex = 16; this.wmErrorLabel11.Text = "Error [%]"; + this.wmErrorLabel11.Visible = false; // // wmErrorTextBox24 // @@ -317,6 +341,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox24.Name = "wmErrorTextBox24"; this.wmErrorTextBox24.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox24.TabIndex = 43; + this.wmErrorTextBox24.Visible = false; // // wmErrorLabel24 // @@ -327,6 +352,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel24.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel24.TabIndex = 42; this.wmErrorLabel24.Text = "Error [%]"; + this.wmErrorLabel24.Visible = false; // // wmErrorTextBox23 // @@ -335,6 +361,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox23.Name = "wmErrorTextBox23"; this.wmErrorTextBox23.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox23.TabIndex = 41; + this.wmErrorTextBox23.Visible = false; // // wmErrorLabel23 // @@ -345,6 +372,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel23.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel23.TabIndex = 40; this.wmErrorLabel23.Text = "Error [%]"; + this.wmErrorLabel23.Visible = false; // // wmErrorTextBox22 // @@ -353,6 +381,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox22.Name = "wmErrorTextBox22"; this.wmErrorTextBox22.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox22.TabIndex = 39; + this.wmErrorTextBox22.Visible = false; // // wmErrorLabel22 // @@ -363,6 +392,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel22.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel22.TabIndex = 38; this.wmErrorLabel22.Text = "Error [%]"; + this.wmErrorLabel22.Visible = false; // // wmErrorTextBox21 // @@ -371,6 +401,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox21.Name = "wmErrorTextBox21"; this.wmErrorTextBox21.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox21.TabIndex = 37; + this.wmErrorTextBox21.Visible = false; // // wmErrorLabel21 // @@ -381,6 +412,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel21.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel21.TabIndex = 36; this.wmErrorLabel21.Text = "Error [%]"; + this.wmErrorLabel21.Visible = false; // // wmErrorTextBox20 // @@ -389,6 +421,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox20.Name = "wmErrorTextBox20"; this.wmErrorTextBox20.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox20.TabIndex = 35; + this.wmErrorTextBox20.Visible = false; // // wmErrorLabel20 // @@ -399,6 +432,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel20.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel20.TabIndex = 34; this.wmErrorLabel20.Text = "Error [%]"; + this.wmErrorLabel20.Visible = false; // // wmErrorTextBox19 // @@ -407,6 +441,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox19.Name = "wmErrorTextBox19"; this.wmErrorTextBox19.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox19.TabIndex = 33; + this.wmErrorTextBox19.Visible = false; // // wmErrorLabel19 // @@ -417,6 +452,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel19.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel19.TabIndex = 32; this.wmErrorLabel19.Text = "Error [%]"; + this.wmErrorLabel19.Visible = false; // // wmErrorTextBox18 // @@ -425,6 +461,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox18.Name = "wmErrorTextBox18"; this.wmErrorTextBox18.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox18.TabIndex = 27; + this.wmErrorTextBox18.Visible = false; // // wmErrorLabel18 // @@ -435,6 +472,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel18.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel18.TabIndex = 23; this.wmErrorLabel18.Text = "Error [%]"; + this.wmErrorLabel18.Visible = false; // // wmErrorTextBox17 // @@ -443,6 +481,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox17.Name = "wmErrorTextBox17"; this.wmErrorTextBox17.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox17.TabIndex = 26; + this.wmErrorTextBox17.Visible = false; // // wmErrorLabel17 // @@ -453,6 +492,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel17.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel17.TabIndex = 22; this.wmErrorLabel17.Text = "Error [%]"; + this.wmErrorLabel17.Visible = false; // // wmErrorTextBox16 // @@ -461,6 +501,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox16.Name = "wmErrorTextBox16"; this.wmErrorTextBox16.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox16.TabIndex = 30; + this.wmErrorTextBox16.Visible = false; // // wmErrorLabel16 // @@ -471,6 +512,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel16.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel16.TabIndex = 21; this.wmErrorLabel16.Text = "Error [%]"; + this.wmErrorLabel16.Visible = false; // // wmErrorTextBox15 // @@ -479,6 +521,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox15.Name = "wmErrorTextBox15"; this.wmErrorTextBox15.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox15.TabIndex = 31; + this.wmErrorTextBox15.Visible = false; // // wmErrorLabel15 // @@ -489,6 +532,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel15.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel15.TabIndex = 20; this.wmErrorLabel15.Text = "Error [%]"; + this.wmErrorLabel15.Visible = false; // // wmErrorTextBox14 // @@ -497,6 +541,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox14.Name = "wmErrorTextBox14"; this.wmErrorTextBox14.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox14.TabIndex = 28; + this.wmErrorTextBox14.Visible = false; // // wmErrorLabel14 // @@ -507,6 +552,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel14.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel14.TabIndex = 25; this.wmErrorLabel14.Text = "Error [%]"; + this.wmErrorLabel14.Visible = false; // // wmErrorTextBox13 // @@ -515,6 +561,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorTextBox13.Name = "wmErrorTextBox13"; this.wmErrorTextBox13.Size = new System.Drawing.Size(137, 40); this.wmErrorTextBox13.TabIndex = 29; + this.wmErrorTextBox13.Visible = false; // // wmErrorLabel13 // @@ -525,13 +572,14 @@ namespace TBF.BenchControl.TestMethods.Adjustment this.wmErrorLabel13.Size = new System.Drawing.Size(103, 23); this.wmErrorLabel13.TabIndex = 24; this.wmErrorLabel13.Text = "Error [%]"; + this.wmErrorLabel13.Visible = false; // // WMErrorsForm24 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.DarkGoldenrod; - this.ClientSize = new System.Drawing.Size(1267, 605); + this.ClientSize = new System.Drawing.Size(1267, 592); this.Controls.Add(this.wmErrorTextBox24); this.Controls.Add(this.wmErrorLabel24); this.Controls.Add(this.wmErrorTextBox23); diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index fb238f39c..1e7a1518e 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("1.5.63.1")] -[assembly: AssemblyFileVersion("1.5.63.1")] +[assembly: AssemblyVersion("1.5.64.1")] +[assembly: AssemblyFileVersion("1.5.64.1")]