ProcessTabPageCtrl24 items visibility for compound meters corrected.

TestBenchFramework/BenchControl/DataEntry/Combined/CycleBeginningForm.Designer.cs

@@ -63,9 +63,9 @@ namespace TBF.BenchControl.DataEntry.Combined
 			// 
 			this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
 			this.okButton.ForeColor = System.Drawing.Color.Black;
-			this.okButton.Location = new System.Drawing.Point(599, 33);
+			this.okButton.Location = new System.Drawing.Point(589, 33);
 			this.okButton.Name = "okButton";
-			this.okButton.Size = new System.Drawing.Size(98, 63);
+			this.okButton.Size = new System.Drawing.Size(117, 63);
 			this.okButton.TabIndex = 0;
 			this.okButton.Text = "OK";
 			this.okButton.UseVisualStyleBackColor = true;
@@ -91,9 +91,9 @@ namespace TBF.BenchControl.DataEntry.Combined
 			// aux1ComboBox
 			// 
 			this.aux1ComboBox.FormattingEnabled = true;
-			this.aux1ComboBox.Location = new System.Drawing.Point(262, 83);
+			this.aux1ComboBox.Location = new System.Drawing.Point(287, 83);
 			this.aux1ComboBox.Name = "aux1ComboBox";
-			this.aux1ComboBox.Size = new System.Drawing.Size(200, 31);
+			this.aux1ComboBox.Size = new System.Drawing.Size(175, 31);
 			this.aux1ComboBox.TabIndex = 6;
 			this.aux1ComboBox.Visible = false;
 			this.aux1ComboBox.SelectedIndexChanged += new System.EventHandler(this.aux1ComboBox_SelectedIndexChanged);
@@ -103,9 +103,9 @@ namespace TBF.BenchControl.DataEntry.Combined
 			// main1ComboBox
 			// 
 			this.main1ComboBox.FormattingEnabled = true;
-			this.main1ComboBox.Location = new System.Drawing.Point(262, 37);
+			this.main1ComboBox.Location = new System.Drawing.Point(287, 37);
 			this.main1ComboBox.Name = "main1ComboBox";
-			this.main1ComboBox.Size = new System.Drawing.Size(200, 31);
+			this.main1ComboBox.Size = new System.Drawing.Size(175, 31);
 			this.main1ComboBox.TabIndex = 5;
 			this.main1ComboBox.Visible = false;
 			this.main1ComboBox.SelectedIndexChanged += new System.EventHandler(this.main1ComboBox_SelectedIndexChanged);
@@ -164,9 +164,9 @@ namespace TBF.BenchControl.DataEntry.Combined
 			// aux2ComboBox
 			// 
 			this.aux2ComboBox.FormattingEnabled = true;
-			this.aux2ComboBox.Location = new System.Drawing.Point(262, 83);
+			this.aux2ComboBox.Location = new System.Drawing.Point(287, 83);
 			this.aux2ComboBox.Name = "aux2ComboBox";
-			this.aux2ComboBox.Size = new System.Drawing.Size(200, 31);
+			this.aux2ComboBox.Size = new System.Drawing.Size(175, 31);
 			this.aux2ComboBox.TabIndex = 10;
 			this.aux2ComboBox.Visible = false;
 			this.aux2ComboBox.SelectedIndexChanged += new System.EventHandler(this.aux2ComboBox_SelectedIndexChanged);
@@ -176,9 +176,9 @@ namespace TBF.BenchControl.DataEntry.Combined
 			// main2ComboBox
 			// 
 			this.main2ComboBox.FormattingEnabled = true;
-			this.main2ComboBox.Location = new System.Drawing.Point(262, 37);
+			this.main2ComboBox.Location = new System.Drawing.Point(287, 37);
 			this.main2ComboBox.Name = "main2ComboBox";
-			this.main2ComboBox.Size = new System.Drawing.Size(200, 31);
+			this.main2ComboBox.Size = new System.Drawing.Size(175, 31);
 			this.main2ComboBox.TabIndex = 9;
 			this.main2ComboBox.Visible = false;
 			this.main2ComboBox.SelectedIndexChanged += new System.EventHandler(this.main2ComboBox_SelectedIndexChanged);
@@ -237,9 +237,9 @@ namespace TBF.BenchControl.DataEntry.Combined
 			// aux3ComboBox
 			// 
 			this.aux3ComboBox.FormattingEnabled = true;
-			this.aux3ComboBox.Location = new System.Drawing.Point(262, 83);
+			this.aux3ComboBox.Location = new System.Drawing.Point(287, 83);
 			this.aux3ComboBox.Name = "aux3ComboBox";
-			this.aux3ComboBox.Size = new System.Drawing.Size(200, 31);
+			this.aux3ComboBox.Size = new System.Drawing.Size(175, 31);
 			this.aux3ComboBox.TabIndex = 10;
 			this.aux3ComboBox.Visible = false;
 			this.aux3ComboBox.SelectedIndexChanged += new System.EventHandler(this.aux3ComboBox_SelectedIndexChanged);
@@ -249,9 +249,9 @@ namespace TBF.BenchControl.DataEntry.Combined
 			// main3ComboBox
 			// 
 			this.main3ComboBox.FormattingEnabled = true;
-			this.main3ComboBox.Location = new System.Drawing.Point(262, 37);
+			this.main3ComboBox.Location = new System.Drawing.Point(287, 37);
 			this.main3ComboBox.Name = "main3ComboBox";
-			this.main3ComboBox.Size = new System.Drawing.Size(200, 31);
+			this.main3ComboBox.Size = new System.Drawing.Size(175, 31);
 			this.main3ComboBox.TabIndex = 9;
 			this.main3ComboBox.Visible = false;
 			this.main3ComboBox.SelectedIndexChanged += new System.EventHandler(this.main3ComboBox_SelectedIndexChanged);
@@ -295,9 +295,9 @@ namespace TBF.BenchControl.DataEntry.Combined
 			this.clearButton.Font = new System.Drawing.Font("Verdana", 14.25F);
 			this.clearButton.ForeColor = System.Drawing.Color.Black;
 			this.clearButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-			this.clearButton.Location = new System.Drawing.Point(599, 116);
+			this.clearButton.Location = new System.Drawing.Point(589, 116);
 			this.clearButton.Name = "clearButton";
-			this.clearButton.Size = new System.Drawing.Size(98, 63);
+			this.clearButton.Size = new System.Drawing.Size(117, 63);
 			this.clearButton.TabIndex = 9;
 			this.clearButton.Text = "Clear";
 			this.clearButton.UseVisualStyleBackColor = true;

TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.resx

@@ -122,10 +122,10 @@
     <value>Verdana, 14.25pt</value>
   </data>
   <data name="okButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>742, 26</value>
+    <value>729, 26</value>
   </data>
   <data name="okButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>98, 63</value>
+    <value>112, 63</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="okButton.TabIndex" type="System.Int32, mscorlib">
@@ -202,10 +202,10 @@
     <value>NoControl</value>
   </data>
   <data name="clearButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>596, 26</value>
+    <value>582, 26</value>
   </data>
   <data name="clearButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>98, 63</value>
+    <value>112, 63</value>
   </data>
   <data name="clearButton.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>

TestBenchFramework/Screens/ProcessTabPageCtrl24.cs

@@ -175,6 +175,27 @@ namespace TBF.Screens
 
 		}
 
+		void UpdateVisibility(Entities.MetersKind metersKind)
+		{
+			bool visible = (metersKind == Entities.MetersKind.Single);
+
+			for (int i = 2 * Program.CompoundWMsCount; i < textBoxesCount; i++)
+			{
+				meter[i].Visible = visible;
+				sensor[i].Visible = visible;
+				pulses[i].Visible = visible;
+				refPulses[i].Visible = visible;
+				volume[i].Visible = visible;
+				error[i].Visible = visible;
+				passed[i].Visible = visible;
+			}
+
+			groupBox1z.Visible = (metersKind == Entities.MetersKind.Combined) && (Program.CompoundWMsCount >= 1);
+			groupBox2z.Visible = (metersKind == Entities.MetersKind.Combined) && (Program.CompoundWMsCount >= 2);
+			groupBox3z.Visible = (metersKind == Entities.MetersKind.Combined) && (Program.CompoundWMsCount >= 3);
+		}
+
+
 		/// <summary>
 		/// Called when a new procedure is selected
 		/// </summary>
@@ -315,6 +336,7 @@ namespace TBF.Screens
 		void OnProcedureSelected(object sender, ProcedureSelectedEventArgs args)
 		{
             currentMetersKind = args.Procedure.MetersKind;
+			UpdateVisibility(currentMetersKind);
 			ResetLabelsAndTargetVals();
 			ResetReadings();
             Invalidate();