From fcea95d403d208edc17fabfbcf57aae7acd42fcb Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 24 Sep 2014 15:38:54 +0200 Subject: [PATCH] Process screen hides additional watermeters (if their number is < 6). --- .../Screens/ProcessTabPageCtrl.Designer.cs | 330 +++++++++--------- .../Screens/ProcessTabPageCtrl.cs | 20 +- .../Screens/ProcessTabPageCtrl.resx | 16 +- 3 files changed, 188 insertions(+), 178 deletions(-) diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl.Designer.cs b/TestBenchFramework/Screens/ProcessTabPageCtrl.Designer.cs index b902eddd9..ce20099c9 100644 --- a/TestBenchFramework/Screens/ProcessTabPageCtrl.Designer.cs +++ b/TestBenchFramework/Screens/ProcessTabPageCtrl.Designer.cs @@ -122,7 +122,7 @@ this.watermeterPictureBox1 = new System.Windows.Forms.PictureBox(); this.watermeterPictureBox2 = new System.Windows.Forms.PictureBox(); this.watermeterPictureBox3 = new System.Windows.Forms.PictureBox(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.watermeterPictureBox4 = new System.Windows.Forms.PictureBox(); this.groupBox4 = new System.Windows.Forms.GroupBox(); this.label43 = new System.Windows.Forms.Label(); this.passed4Label = new System.Windows.Forms.Label(); @@ -135,7 +135,7 @@ this.refPulses4Label = new System.Windows.Forms.Label(); this.pulses4Label = new System.Windows.Forms.Label(); this.sensor4Label = new System.Windows.Forms.Label(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.watermeterPictureBox5 = new System.Windows.Forms.PictureBox(); this.groupBox5 = new System.Windows.Forms.GroupBox(); this.label42 = new System.Windows.Forms.Label(); this.passed5Label = new System.Windows.Forms.Label(); @@ -148,7 +148,7 @@ this.refPulses5Label = new System.Windows.Forms.Label(); this.pulses5Label = new System.Windows.Forms.Label(); this.sensor5Label = new System.Windows.Forms.Label(); - this.pictureBox3 = new System.Windows.Forms.PictureBox(); + this.watermeterPictureBox6 = new System.Windows.Forms.PictureBox(); this.groupBox6 = new System.Windows.Forms.GroupBox(); this.label44 = new System.Windows.Forms.Label(); this.passed6Label = new System.Windows.Forms.Label(); @@ -169,18 +169,18 @@ ((System.ComponentModel.ISupportInitialize)(this.watermeterPictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.watermeterPictureBox2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.watermeterPictureBox3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.watermeterPictureBox4)).BeginInit(); this.groupBox4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.watermeterPictureBox5)).BeginInit(); this.groupBox5.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.watermeterPictureBox6)).BeginInit(); this.groupBox6.SuspendLayout(); this.SuspendLayout(); // // sensor1Label // this.sensor1Label.AutoSize = true; - this.sensor1Label.Location = new System.Drawing.Point(74, 16); + this.sensor1Label.Location = new System.Drawing.Point(72, 16); this.sensor1Label.Name = "sensor1Label"; this.sensor1Label.Size = new System.Drawing.Size(44, 13); this.sensor1Label.TabIndex = 0; @@ -189,7 +189,7 @@ // pulses1Label // this.pulses1Label.AutoSize = true; - this.pulses1Label.Location = new System.Drawing.Point(74, 36); + this.pulses1Label.Location = new System.Drawing.Point(72, 36); this.pulses1Label.Name = "pulses1Label"; this.pulses1Label.Size = new System.Drawing.Size(43, 13); this.pulses1Label.TabIndex = 1; @@ -198,7 +198,7 @@ // refPulses1Label // this.refPulses1Label.AutoSize = true; - this.refPulses1Label.Location = new System.Drawing.Point(74, 57); + this.refPulses1Label.Location = new System.Drawing.Point(72, 57); this.refPulses1Label.Name = "refPulses1Label"; this.refPulses1Label.Size = new System.Drawing.Size(56, 13); this.refPulses1Label.TabIndex = 2; @@ -207,7 +207,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(30, 36); + this.label1.Location = new System.Drawing.Point(28, 36); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(38, 13); this.label1.TabIndex = 3; @@ -216,7 +216,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(8, 57); + this.label2.Location = new System.Drawing.Point(6, 57); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(60, 13); this.label2.TabIndex = 4; @@ -225,7 +225,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(23, 77); + this.label3.Location = new System.Drawing.Point(21, 77); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(45, 13); this.label3.TabIndex = 5; @@ -234,7 +234,7 @@ // volume1Label // this.volume1Label.AutoSize = true; - this.volume1Label.Location = new System.Drawing.Point(74, 77); + this.volume1Label.Location = new System.Drawing.Point(72, 77); this.volume1Label.Name = "volume1Label"; this.volume1Label.Size = new System.Drawing.Size(47, 13); this.volume1Label.TabIndex = 6; @@ -243,7 +243,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(19, 98); + this.label4.Location = new System.Drawing.Point(17, 98); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(49, 13); this.label4.TabIndex = 7; @@ -252,7 +252,7 @@ // error1Label // this.error1Label.AutoSize = true; - this.error1Label.Location = new System.Drawing.Point(74, 98); + this.error1Label.Location = new System.Drawing.Point(72, 98); this.error1Label.Name = "error1Label"; this.error1Label.Size = new System.Drawing.Size(34, 13); this.error1Label.TabIndex = 8; @@ -261,7 +261,7 @@ // passed1Label // this.passed1Label.AutoSize = true; - this.passed1Label.Location = new System.Drawing.Point(74, 118); + this.passed1Label.Location = new System.Drawing.Point(72, 118); this.passed1Label.Name = "passed1Label"; this.passed1Label.Size = new System.Drawing.Size(47, 13); this.passed1Label.TabIndex = 9; @@ -280,7 +280,7 @@ this.groupBox1.Controls.Add(this.refPulses1Label); this.groupBox1.Controls.Add(this.pulses1Label); this.groupBox1.Controls.Add(this.sensor1Label); - this.groupBox1.Location = new System.Drawing.Point(25, 221); + this.groupBox1.Location = new System.Drawing.Point(23, 221); this.groupBox1.Name = "groupBox1"; this.groupBox1.Size = new System.Drawing.Size(139, 144); this.groupBox1.TabIndex = 10; @@ -290,7 +290,7 @@ // label35 // this.label35.AutoSize = true; - this.label35.Location = new System.Drawing.Point(25, 16); + this.label35.Location = new System.Drawing.Point(23, 16); this.label35.Name = "label35"; this.label35.Size = new System.Drawing.Size(43, 13); this.label35.TabIndex = 10; @@ -309,7 +309,7 @@ this.groupBox2.Controls.Add(this.refPulses2Label); this.groupBox2.Controls.Add(this.pulses2Label); this.groupBox2.Controls.Add(this.sensor2Label); - this.groupBox2.Location = new System.Drawing.Point(168, 221); + this.groupBox2.Location = new System.Drawing.Point(166, 221); this.groupBox2.Name = "groupBox2"; this.groupBox2.Size = new System.Drawing.Size(139, 144); this.groupBox2.TabIndex = 11; @@ -319,7 +319,7 @@ // label36 // this.label36.AutoSize = true; - this.label36.Location = new System.Drawing.Point(25, 16); + this.label36.Location = new System.Drawing.Point(23, 16); this.label36.Name = "label36"; this.label36.Size = new System.Drawing.Size(43, 13); this.label36.TabIndex = 11; @@ -328,7 +328,7 @@ // passed2Label // this.passed2Label.AutoSize = true; - this.passed2Label.Location = new System.Drawing.Point(74, 118); + this.passed2Label.Location = new System.Drawing.Point(72, 118); this.passed2Label.Name = "passed2Label"; this.passed2Label.Size = new System.Drawing.Size(47, 13); this.passed2Label.TabIndex = 9; @@ -337,7 +337,7 @@ // error2Label // this.error2Label.AutoSize = true; - this.error2Label.Location = new System.Drawing.Point(74, 98); + this.error2Label.Location = new System.Drawing.Point(72, 98); this.error2Label.Name = "error2Label"; this.error2Label.Size = new System.Drawing.Size(34, 13); this.error2Label.TabIndex = 8; @@ -346,7 +346,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(19, 98); + this.label8.Location = new System.Drawing.Point(17, 98); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(49, 13); this.label8.TabIndex = 7; @@ -355,7 +355,7 @@ // volume2Label // this.volume2Label.AutoSize = true; - this.volume2Label.Location = new System.Drawing.Point(74, 77); + this.volume2Label.Location = new System.Drawing.Point(72, 77); this.volume2Label.Name = "volume2Label"; this.volume2Label.Size = new System.Drawing.Size(47, 13); this.volume2Label.TabIndex = 6; @@ -364,7 +364,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(23, 77); + this.label7.Location = new System.Drawing.Point(21, 77); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(45, 13); this.label7.TabIndex = 5; @@ -373,7 +373,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(8, 57); + this.label6.Location = new System.Drawing.Point(6, 57); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(60, 13); this.label6.TabIndex = 4; @@ -382,7 +382,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(30, 36); + this.label5.Location = new System.Drawing.Point(28, 36); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(38, 13); this.label5.TabIndex = 3; @@ -391,7 +391,7 @@ // refPulses2Label // this.refPulses2Label.AutoSize = true; - this.refPulses2Label.Location = new System.Drawing.Point(74, 57); + this.refPulses2Label.Location = new System.Drawing.Point(72, 57); this.refPulses2Label.Name = "refPulses2Label"; this.refPulses2Label.Size = new System.Drawing.Size(56, 13); this.refPulses2Label.TabIndex = 2; @@ -400,7 +400,7 @@ // pulses2Label // this.pulses2Label.AutoSize = true; - this.pulses2Label.Location = new System.Drawing.Point(74, 36); + this.pulses2Label.Location = new System.Drawing.Point(72, 36); this.pulses2Label.Name = "pulses2Label"; this.pulses2Label.Size = new System.Drawing.Size(43, 13); this.pulses2Label.TabIndex = 1; @@ -409,7 +409,7 @@ // sensor2Label // this.sensor2Label.AutoSize = true; - this.sensor2Label.Location = new System.Drawing.Point(74, 16); + this.sensor2Label.Location = new System.Drawing.Point(72, 16); this.sensor2Label.Name = "sensor2Label"; this.sensor2Label.Size = new System.Drawing.Size(44, 13); this.sensor2Label.TabIndex = 0; @@ -428,7 +428,7 @@ this.groupBox3.Controls.Add(this.refPulses3Label); this.groupBox3.Controls.Add(this.pulses3Label); this.groupBox3.Controls.Add(this.sensor3Label); - this.groupBox3.Location = new System.Drawing.Point(311, 221); + this.groupBox3.Location = new System.Drawing.Point(309, 221); this.groupBox3.Name = "groupBox3"; this.groupBox3.Size = new System.Drawing.Size(139, 144); this.groupBox3.TabIndex = 12; @@ -438,7 +438,7 @@ // label38 // this.label38.AutoSize = true; - this.label38.Location = new System.Drawing.Point(25, 16); + this.label38.Location = new System.Drawing.Point(23, 16); this.label38.Name = "label38"; this.label38.Size = new System.Drawing.Size(43, 13); this.label38.TabIndex = 11; @@ -447,7 +447,7 @@ // passed3Label // this.passed3Label.AutoSize = true; - this.passed3Label.Location = new System.Drawing.Point(74, 118); + this.passed3Label.Location = new System.Drawing.Point(72, 118); this.passed3Label.Name = "passed3Label"; this.passed3Label.Size = new System.Drawing.Size(47, 13); this.passed3Label.TabIndex = 9; @@ -456,7 +456,7 @@ // error3Label // this.error3Label.AutoSize = true; - this.error3Label.Location = new System.Drawing.Point(74, 98); + this.error3Label.Location = new System.Drawing.Point(72, 98); this.error3Label.Name = "error3Label"; this.error3Label.Size = new System.Drawing.Size(34, 13); this.error3Label.TabIndex = 8; @@ -465,7 +465,7 @@ // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(19, 98); + this.label12.Location = new System.Drawing.Point(17, 98); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(49, 13); this.label12.TabIndex = 7; @@ -474,7 +474,7 @@ // volume3Label // this.volume3Label.AutoSize = true; - this.volume3Label.Location = new System.Drawing.Point(74, 77); + this.volume3Label.Location = new System.Drawing.Point(72, 77); this.volume3Label.Name = "volume3Label"; this.volume3Label.Size = new System.Drawing.Size(47, 13); this.volume3Label.TabIndex = 6; @@ -483,7 +483,7 @@ // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(23, 77); + this.label11.Location = new System.Drawing.Point(21, 77); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(45, 13); this.label11.TabIndex = 5; @@ -492,7 +492,7 @@ // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(8, 57); + this.label10.Location = new System.Drawing.Point(6, 57); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(60, 13); this.label10.TabIndex = 4; @@ -501,7 +501,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(30, 36); + this.label9.Location = new System.Drawing.Point(28, 36); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(38, 13); this.label9.TabIndex = 3; @@ -510,7 +510,7 @@ // refPulses3Label // this.refPulses3Label.AutoSize = true; - this.refPulses3Label.Location = new System.Drawing.Point(74, 57); + this.refPulses3Label.Location = new System.Drawing.Point(72, 57); this.refPulses3Label.Name = "refPulses3Label"; this.refPulses3Label.Size = new System.Drawing.Size(56, 13); this.refPulses3Label.TabIndex = 2; @@ -519,7 +519,7 @@ // pulses3Label // this.pulses3Label.AutoSize = true; - this.pulses3Label.Location = new System.Drawing.Point(74, 36); + this.pulses3Label.Location = new System.Drawing.Point(72, 36); this.pulses3Label.Name = "pulses3Label"; this.pulses3Label.Size = new System.Drawing.Size(43, 13); this.pulses3Label.TabIndex = 1; @@ -528,7 +528,7 @@ // sensor3Label // this.sensor3Label.AutoSize = true; - this.sensor3Label.Location = new System.Drawing.Point(74, 16); + this.sensor3Label.Location = new System.Drawing.Point(72, 16); this.sensor3Label.Name = "sensor3Label"; this.sensor3Label.Size = new System.Drawing.Size(44, 13); this.sensor3Label.TabIndex = 0; @@ -537,7 +537,7 @@ // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(22, 151); + this.label13.Location = new System.Drawing.Point(20, 151); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(52, 13); this.label13.TabIndex = 13; @@ -546,7 +546,7 @@ // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(6, 190); + this.label14.Location = new System.Drawing.Point(4, 190); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(68, 13); this.label14.TabIndex = 14; @@ -555,7 +555,7 @@ // tInLabel // this.tInLabel.AutoSize = true; - this.tInLabel.Location = new System.Drawing.Point(80, 151); + this.tInLabel.Location = new System.Drawing.Point(78, 151); this.tInLabel.Name = "tInLabel"; this.tInLabel.Size = new System.Drawing.Size(19, 13); this.tInLabel.TabIndex = 15; @@ -564,7 +564,7 @@ // prInLabel // this.prInLabel.AutoSize = true; - this.prInLabel.Location = new System.Drawing.Point(80, 190); + this.prInLabel.Location = new System.Drawing.Point(78, 190); this.prInLabel.Name = "prInLabel"; this.prInLabel.Size = new System.Drawing.Size(25, 13); this.prInLabel.TabIndex = 16; @@ -573,7 +573,7 @@ // prOutLabel // this.prOutLabel.AutoSize = true; - this.prOutLabel.Location = new System.Drawing.Point(641, 190); + this.prOutLabel.Location = new System.Drawing.Point(639, 190); this.prOutLabel.Name = "prOutLabel"; this.prOutLabel.Size = new System.Drawing.Size(33, 13); this.prOutLabel.TabIndex = 20; @@ -582,7 +582,7 @@ // tOutLabel // this.tOutLabel.AutoSize = true; - this.tOutLabel.Location = new System.Drawing.Point(641, 151); + this.tOutLabel.Location = new System.Drawing.Point(639, 151); this.tOutLabel.Name = "tOutLabel"; this.tOutLabel.Size = new System.Drawing.Size(27, 13); this.tOutLabel.TabIndex = 19; @@ -591,7 +591,7 @@ // label17 // this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(555, 190); + this.label17.Location = new System.Drawing.Point(553, 190); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(82, 13); this.label17.TabIndex = 18; @@ -600,7 +600,7 @@ // label18 // this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(571, 151); + this.label18.Location = new System.Drawing.Point(569, 151); this.label18.Name = "label18"; this.label18.Size = new System.Drawing.Size(66, 13); this.label18.TabIndex = 17; @@ -609,7 +609,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(551, 78); + this.label15.Location = new System.Drawing.Point(549, 78); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(86, 13); this.label15.TabIndex = 21; @@ -618,7 +618,7 @@ // tInCmpntLabel // this.tInCmpntLabel.AutoSize = true; - this.tInCmpntLabel.Location = new System.Drawing.Point(80, 131); + this.tInCmpntLabel.Location = new System.Drawing.Point(78, 131); this.tInCmpntLabel.Name = "tInCmpntLabel"; this.tInCmpntLabel.Size = new System.Drawing.Size(49, 13); this.tInCmpntLabel.TabIndex = 22; @@ -627,7 +627,7 @@ // tOutCmpntLabel // this.tOutCmpntLabel.AutoSize = true; - this.tOutCmpntLabel.Location = new System.Drawing.Point(641, 131); + this.tOutCmpntLabel.Location = new System.Drawing.Point(639, 131); this.tOutCmpntLabel.Name = "tOutCmpntLabel"; this.tOutCmpntLabel.Size = new System.Drawing.Size(57, 13); this.tOutCmpntLabel.TabIndex = 23; @@ -636,7 +636,7 @@ // prOutCmpntLabel // this.prOutCmpntLabel.AutoSize = true; - this.prOutCmpntLabel.Location = new System.Drawing.Point(641, 171); + this.prOutCmpntLabel.Location = new System.Drawing.Point(639, 171); this.prOutCmpntLabel.Name = "prOutCmpntLabel"; this.prOutCmpntLabel.Size = new System.Drawing.Size(63, 13); this.prOutCmpntLabel.TabIndex = 24; @@ -645,7 +645,7 @@ // prInCmpntLabel // this.prInCmpntLabel.AutoSize = true; - this.prInCmpntLabel.Location = new System.Drawing.Point(80, 171); + this.prInCmpntLabel.Location = new System.Drawing.Point(78, 171); this.prInCmpntLabel.Name = "prInCmpntLabel"; this.prInCmpntLabel.Size = new System.Drawing.Size(55, 13); this.prInCmpntLabel.TabIndex = 25; @@ -654,7 +654,7 @@ // refFlowLabel // this.refFlowLabel.AutoSize = true; - this.refFlowLabel.Location = new System.Drawing.Point(641, 78); + this.refFlowLabel.Location = new System.Drawing.Point(639, 78); this.refFlowLabel.Name = "refFlowLabel"; this.refFlowLabel.Size = new System.Drawing.Size(41, 13); this.refFlowLabel.TabIndex = 26; @@ -663,7 +663,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(561, 57); + this.label16.Location = new System.Drawing.Point(559, 57); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(76, 13); this.label16.TabIndex = 27; @@ -672,7 +672,7 @@ // refFreqLabel // this.refFreqLabel.AutoSize = true; - this.refFreqLabel.Location = new System.Drawing.Point(641, 57); + this.refFreqLabel.Location = new System.Drawing.Point(639, 57); this.refFreqLabel.Name = "refFreqLabel"; this.refFreqLabel.Size = new System.Drawing.Size(40, 13); this.refFreqLabel.TabIndex = 28; @@ -681,7 +681,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(577, 37); + this.label19.Location = new System.Drawing.Point(575, 37); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(60, 13); this.label19.TabIndex = 29; @@ -690,7 +690,7 @@ // refPulsesLabel // this.refPulsesLabel.AutoSize = true; - this.refPulsesLabel.Location = new System.Drawing.Point(641, 37); + this.refPulsesLabel.Location = new System.Drawing.Point(639, 37); this.refPulsesLabel.Name = "refPulsesLabel"; this.refPulsesLabel.Size = new System.Drawing.Size(50, 13); this.refPulsesLabel.TabIndex = 30; @@ -699,7 +699,7 @@ // refFlowCmpntLabel // this.refFlowCmpntLabel.AutoSize = true; - this.refFlowCmpntLabel.Location = new System.Drawing.Point(641, 17); + this.refFlowCmpntLabel.Location = new System.Drawing.Point(639, 17); this.refFlowCmpntLabel.Name = "refFlowCmpntLabel"; this.refFlowCmpntLabel.Size = new System.Drawing.Size(71, 13); this.refFlowCmpntLabel.TabIndex = 31; @@ -708,7 +708,7 @@ // regValveCmpntLabel // this.regValveCmpntLabel.AutoSize = true; - this.regValveCmpntLabel.Location = new System.Drawing.Point(1014, 58); + this.regValveCmpntLabel.Location = new System.Drawing.Point(993, 58); this.regValveCmpntLabel.Name = "regValveCmpntLabel"; this.regValveCmpntLabel.Size = new System.Drawing.Size(79, 13); this.regValveCmpntLabel.TabIndex = 34; @@ -717,7 +717,7 @@ // regValvePosLabel // this.regValvePosLabel.AutoSize = true; - this.regValvePosLabel.Location = new System.Drawing.Point(1014, 78); + this.regValvePosLabel.Location = new System.Drawing.Point(993, 78); this.regValvePosLabel.Name = "regValvePosLabel"; this.regValvePosLabel.Size = new System.Drawing.Size(67, 13); this.regValvePosLabel.TabIndex = 35; @@ -726,7 +726,7 @@ // label21 // this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(925, 78); + this.label21.Location = new System.Drawing.Point(904, 78); this.label21.Name = "label21"; this.label21.Size = new System.Drawing.Size(85, 13); this.label21.TabIndex = 36; @@ -735,7 +735,7 @@ // tDivCmpntLabel // this.tDivCmpntLabel.AutoSize = true; - this.tDivCmpntLabel.Location = new System.Drawing.Point(1014, 129); + this.tDivCmpntLabel.Location = new System.Drawing.Point(993, 129); this.tDivCmpntLabel.Name = "tDivCmpntLabel"; this.tDivCmpntLabel.Size = new System.Drawing.Size(56, 13); this.tDivCmpntLabel.TabIndex = 39; @@ -744,7 +744,7 @@ // tDivLabel // this.tDivLabel.AutoSize = true; - this.tDivLabel.Location = new System.Drawing.Point(1014, 148); + this.tDivLabel.Location = new System.Drawing.Point(993, 148); this.tDivLabel.Name = "tDivLabel"; this.tDivLabel.Size = new System.Drawing.Size(26, 13); this.tDivLabel.TabIndex = 38; @@ -753,7 +753,7 @@ // label24 // this.label24.AutoSize = true; - this.label24.Location = new System.Drawing.Point(956, 148); + this.label24.Location = new System.Drawing.Point(935, 148); this.label24.Name = "label24"; this.label24.Size = new System.Drawing.Size(54, 13); this.label24.TabIndex = 37; @@ -762,7 +762,7 @@ // scaleCmpntLabel // this.scaleCmpntLabel.AutoSize = true; - this.scaleCmpntLabel.Location = new System.Drawing.Point(1014, 209); + this.scaleCmpntLabel.Location = new System.Drawing.Point(993, 209); this.scaleCmpntLabel.Name = "scaleCmpntLabel"; this.scaleCmpntLabel.Size = new System.Drawing.Size(62, 13); this.scaleCmpntLabel.TabIndex = 40; @@ -771,7 +771,7 @@ // label22 // this.label22.AutoSize = true; - this.label22.Location = new System.Drawing.Point(954, 230); + this.label22.Location = new System.Drawing.Point(933, 230); this.label22.Name = "label22"; this.label22.Size = new System.Drawing.Size(56, 13); this.label22.TabIndex = 41; @@ -780,7 +780,7 @@ // massLabel // this.massLabel.AutoSize = true; - this.massLabel.Location = new System.Drawing.Point(1014, 230); + this.massLabel.Location = new System.Drawing.Point(993, 230); this.massLabel.Name = "massLabel"; this.massLabel.Size = new System.Drawing.Size(31, 13); this.massLabel.TabIndex = 42; @@ -789,7 +789,7 @@ // label23 // this.label23.AutoSize = true; - this.label23.Location = new System.Drawing.Point(934, 250); + this.label23.Location = new System.Drawing.Point(913, 250); this.label23.Name = "label23"; this.label23.Size = new System.Drawing.Size(76, 13); this.label23.TabIndex = 43; @@ -798,7 +798,7 @@ // massDiffLabel // this.massDiffLabel.AutoSize = true; - this.massDiffLabel.Location = new System.Drawing.Point(1014, 250); + this.massDiffLabel.Location = new System.Drawing.Point(993, 250); this.massDiffLabel.Name = "massDiffLabel"; this.massDiffLabel.Size = new System.Drawing.Size(47, 13); this.massDiffLabel.TabIndex = 44; @@ -807,7 +807,7 @@ // label25 // this.label25.AutoSize = true; - this.label25.Location = new System.Drawing.Point(563, 99); + this.label25.Location = new System.Drawing.Point(561, 99); this.label25.Name = "label25"; this.label25.Size = new System.Drawing.Size(78, 13); this.label25.TabIndex = 45; @@ -816,7 +816,7 @@ // refVolumeLabel // this.refVolumeLabel.AutoSize = true; - this.refVolumeLabel.Location = new System.Drawing.Point(641, 99); + this.refVolumeLabel.Location = new System.Drawing.Point(639, 99); this.refVolumeLabel.Name = "refVolumeLabel"; this.refVolumeLabel.Size = new System.Drawing.Size(54, 13); this.refVolumeLabel.TabIndex = 46; @@ -825,7 +825,7 @@ // label26 // this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(954, 271); + this.label26.Location = new System.Drawing.Point(933, 271); this.label26.Name = "label26"; this.label26.Size = new System.Drawing.Size(56, 13); this.label26.TabIndex = 47; @@ -834,7 +834,7 @@ // volumeCtvLabel // this.volumeCtvLabel.AutoSize = true; - this.volumeCtvLabel.Location = new System.Drawing.Point(1014, 271); + this.volumeCtvLabel.Location = new System.Drawing.Point(993, 271); this.volumeCtvLabel.Name = "volumeCtvLabel"; this.volumeCtvLabel.Size = new System.Drawing.Size(57, 13); this.volumeCtvLabel.TabIndex = 48; @@ -843,7 +843,7 @@ // label27 // this.label27.AutoSize = true; - this.label27.Location = new System.Drawing.Point(939, 293); + this.label27.Location = new System.Drawing.Point(918, 293); this.label27.Name = "label27"; this.label27.Size = new System.Drawing.Size(71, 13); this.label27.TabIndex = 49; @@ -852,7 +852,7 @@ // refErrorLabel // this.refErrorLabel.AutoSize = true; - this.refErrorLabel.Location = new System.Drawing.Point(1014, 293); + this.refErrorLabel.Location = new System.Drawing.Point(993, 293); this.refErrorLabel.Name = "refErrorLabel"; this.refErrorLabel.Size = new System.Drawing.Size(41, 13); this.refErrorLabel.TabIndex = 50; @@ -861,7 +861,7 @@ // label28 // this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(276, 21); + this.label28.Location = new System.Drawing.Point(274, 21); this.label28.Name = "label28"; this.label28.Size = new System.Drawing.Size(116, 13); this.label28.TabIndex = 51; @@ -870,7 +870,7 @@ // label29 // this.label29.AutoSize = true; - this.label29.Location = new System.Drawing.Point(272, 41); + this.label29.Location = new System.Drawing.Point(270, 41); this.label29.Name = "label29"; this.label29.Size = new System.Drawing.Size(120, 13); this.label29.TabIndex = 52; @@ -879,7 +879,7 @@ // label20 // this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(303, 61); + this.label20.Location = new System.Drawing.Point(301, 61); this.label20.Name = "label20"; this.label20.Size = new System.Drawing.Size(89, 13); this.label20.TabIndex = 53; @@ -888,7 +888,7 @@ // label30 // this.label30.AutoSize = true; - this.label30.Location = new System.Drawing.Point(300, 103); + this.label30.Location = new System.Drawing.Point(298, 103); this.label30.Name = "label30"; this.label30.Size = new System.Drawing.Size(92, 13); this.label30.TabIndex = 54; @@ -897,7 +897,7 @@ // targetFlowLowLabel // this.targetFlowLowLabel.AutoSize = true; - this.targetFlowLowLabel.Location = new System.Drawing.Point(395, 21); + this.targetFlowLowLabel.Location = new System.Drawing.Point(393, 21); this.targetFlowLowLabel.Name = "targetFlowLowLabel"; this.targetFlowLowLabel.Size = new System.Drawing.Size(76, 13); this.targetFlowLowLabel.TabIndex = 55; @@ -906,7 +906,7 @@ // targetFlowHighLabel // this.targetFlowHighLabel.AutoSize = true; - this.targetFlowHighLabel.Location = new System.Drawing.Point(395, 41); + this.targetFlowHighLabel.Location = new System.Drawing.Point(393, 41); this.targetFlowHighLabel.Name = "targetFlowHighLabel"; this.targetFlowHighLabel.Size = new System.Drawing.Size(78, 13); this.targetFlowHighLabel.TabIndex = 56; @@ -915,7 +915,7 @@ // targetVolumeLabel // this.targetVolumeLabel.AutoSize = true; - this.targetVolumeLabel.Location = new System.Drawing.Point(395, 61); + this.targetVolumeLabel.Location = new System.Drawing.Point(393, 61); this.targetVolumeLabel.Name = "targetVolumeLabel"; this.targetVolumeLabel.Size = new System.Drawing.Size(69, 13); this.targetVolumeLabel.TabIndex = 57; @@ -924,7 +924,7 @@ // label31 // this.label31.AutoSize = true; - this.label31.Location = new System.Drawing.Point(303, 82); + this.label31.Location = new System.Drawing.Point(301, 82); this.label31.Name = "label31"; this.label31.Size = new System.Drawing.Size(89, 13); this.label31.TabIndex = 58; @@ -933,7 +933,7 @@ // targetRefCountLabel // this.targetRefCountLabel.AutoSize = true; - this.targetRefCountLabel.Location = new System.Drawing.Point(395, 82); + this.targetRefCountLabel.Location = new System.Drawing.Point(393, 82); this.targetRefCountLabel.Name = "targetRefCountLabel"; this.targetRefCountLabel.Size = new System.Drawing.Size(79, 13); this.targetRefCountLabel.TabIndex = 59; @@ -942,7 +942,7 @@ // estmtdTimeLabel // this.estmtdTimeLabel.AutoSize = true; - this.estmtdTimeLabel.Location = new System.Drawing.Point(395, 103); + this.estmtdTimeLabel.Location = new System.Drawing.Point(393, 103); this.estmtdTimeLabel.Name = "estmtdTimeLabel"; this.estmtdTimeLabel.Size = new System.Drawing.Size(61, 13); this.estmtdTimeLabel.TabIndex = 60; @@ -951,7 +951,7 @@ // label32 // this.label32.AutoSize = true; - this.label32.Location = new System.Drawing.Point(51, 22); + this.label32.Location = new System.Drawing.Point(49, 22); this.label32.Name = "label32"; this.label32.Size = new System.Drawing.Size(101, 13); this.label32.TabIndex = 61; @@ -960,7 +960,7 @@ // label33 // this.label33.AutoSize = true; - this.label33.Location = new System.Drawing.Point(54, 42); + this.label33.Location = new System.Drawing.Point(52, 42); this.label33.Name = "label33"; this.label33.Size = new System.Drawing.Size(98, 13); this.label33.TabIndex = 62; @@ -969,7 +969,7 @@ // label34 // this.label34.AutoSize = true; - this.label34.Location = new System.Drawing.Point(72, 62); + this.label34.Location = new System.Drawing.Point(70, 62); this.label34.Name = "label34"; this.label34.Size = new System.Drawing.Size(80, 13); this.label34.TabIndex = 63; @@ -978,7 +978,7 @@ // airTempLabel // this.airTempLabel.AutoSize = true; - this.airTempLabel.Location = new System.Drawing.Point(154, 22); + this.airTempLabel.Location = new System.Drawing.Point(152, 22); this.airTempLabel.Name = "airTempLabel"; this.airTempLabel.Size = new System.Drawing.Size(45, 13); this.airTempLabel.TabIndex = 64; @@ -987,7 +987,7 @@ // airPressLabel // this.airPressLabel.AutoSize = true; - this.airPressLabel.Location = new System.Drawing.Point(154, 42); + this.airPressLabel.Location = new System.Drawing.Point(152, 42); this.airPressLabel.Name = "airPressLabel"; this.airPressLabel.Size = new System.Drawing.Size(44, 13); this.airPressLabel.TabIndex = 65; @@ -996,7 +996,7 @@ // airHumiLabel // this.airHumiLabel.AutoSize = true; - this.airHumiLabel.Location = new System.Drawing.Point(154, 62); + this.airHumiLabel.Location = new System.Drawing.Point(152, 62); this.airHumiLabel.Name = "airHumiLabel"; this.airHumiLabel.Size = new System.Drawing.Size(42, 13); this.airHumiLabel.TabIndex = 66; @@ -1005,7 +1005,7 @@ // reservoirPictureBox // this.reservoirPictureBox.Image = ((System.Drawing.Image)(resources.GetObject("reservoirPictureBox.Image"))); - this.reservoirPictureBox.Location = new System.Drawing.Point(949, 386); + this.reservoirPictureBox.Location = new System.Drawing.Point(924, 386); this.reservoirPictureBox.Name = "reservoirPictureBox"; this.reservoirPictureBox.Size = new System.Drawing.Size(142, 109); this.reservoirPictureBox.TabIndex = 67; @@ -1014,7 +1014,7 @@ // pumpPictureBox // this.pumpPictureBox.Image = ((System.Drawing.Image)(resources.GetObject("pumpPictureBox.Image"))); - this.pumpPictureBox.Location = new System.Drawing.Point(825, 458); + this.pumpPictureBox.Location = new System.Drawing.Point(823, 458); this.pumpPictureBox.Name = "pumpPictureBox"; this.pumpPictureBox.Size = new System.Drawing.Size(38, 38); this.pumpPictureBox.TabIndex = 68; @@ -1023,7 +1023,7 @@ // watermeterPictureBox1 // this.watermeterPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("watermeterPictureBox1.Image"))); - this.watermeterPictureBox1.Location = new System.Drawing.Point(68, 371); + this.watermeterPictureBox1.Location = new System.Drawing.Point(66, 371); this.watermeterPictureBox1.Name = "watermeterPictureBox1"; this.watermeterPictureBox1.Size = new System.Drawing.Size(38, 30); this.watermeterPictureBox1.TabIndex = 69; @@ -1032,7 +1032,7 @@ // watermeterPictureBox2 // this.watermeterPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("watermeterPictureBox2.Image"))); - this.watermeterPictureBox2.Location = new System.Drawing.Point(211, 371); + this.watermeterPictureBox2.Location = new System.Drawing.Point(209, 371); this.watermeterPictureBox2.Name = "watermeterPictureBox2"; this.watermeterPictureBox2.Size = new System.Drawing.Size(38, 30); this.watermeterPictureBox2.TabIndex = 70; @@ -1041,20 +1041,20 @@ // watermeterPictureBox3 // this.watermeterPictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("watermeterPictureBox3.Image"))); - this.watermeterPictureBox3.Location = new System.Drawing.Point(356, 371); + this.watermeterPictureBox3.Location = new System.Drawing.Point(354, 371); this.watermeterPictureBox3.Name = "watermeterPictureBox3"; this.watermeterPictureBox3.Size = new System.Drawing.Size(38, 30); this.watermeterPictureBox3.TabIndex = 71; this.watermeterPictureBox3.TabStop = false; // - // pictureBox1 + // watermeterPictureBox4 // - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(499, 371); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(38, 30); - this.pictureBox1.TabIndex = 73; - this.pictureBox1.TabStop = false; + this.watermeterPictureBox4.Image = ((System.Drawing.Image)(resources.GetObject("watermeterPictureBox4.Image"))); + this.watermeterPictureBox4.Location = new System.Drawing.Point(497, 371); + this.watermeterPictureBox4.Name = "watermeterPictureBox4"; + this.watermeterPictureBox4.Size = new System.Drawing.Size(38, 30); + this.watermeterPictureBox4.TabIndex = 73; + this.watermeterPictureBox4.TabStop = false; // // groupBox4 // @@ -1069,7 +1069,7 @@ this.groupBox4.Controls.Add(this.refPulses4Label); this.groupBox4.Controls.Add(this.pulses4Label); this.groupBox4.Controls.Add(this.sensor4Label); - this.groupBox4.Location = new System.Drawing.Point(454, 221); + this.groupBox4.Location = new System.Drawing.Point(452, 221); this.groupBox4.Name = "groupBox4"; this.groupBox4.Size = new System.Drawing.Size(139, 144); this.groupBox4.TabIndex = 72; @@ -1079,7 +1079,7 @@ // label43 // this.label43.AutoSize = true; - this.label43.Location = new System.Drawing.Point(25, 16); + this.label43.Location = new System.Drawing.Point(23, 16); this.label43.Name = "label43"; this.label43.Size = new System.Drawing.Size(43, 13); this.label43.TabIndex = 11; @@ -1088,7 +1088,7 @@ // passed4Label // this.passed4Label.AutoSize = true; - this.passed4Label.Location = new System.Drawing.Point(74, 118); + this.passed4Label.Location = new System.Drawing.Point(72, 118); this.passed4Label.Name = "passed4Label"; this.passed4Label.Size = new System.Drawing.Size(47, 13); this.passed4Label.TabIndex = 9; @@ -1097,7 +1097,7 @@ // error4Label // this.error4Label.AutoSize = true; - this.error4Label.Location = new System.Drawing.Point(74, 98); + this.error4Label.Location = new System.Drawing.Point(72, 98); this.error4Label.Name = "error4Label"; this.error4Label.Size = new System.Drawing.Size(34, 13); this.error4Label.TabIndex = 8; @@ -1106,7 +1106,7 @@ // label37 // this.label37.AutoSize = true; - this.label37.Location = new System.Drawing.Point(19, 98); + this.label37.Location = new System.Drawing.Point(17, 98); this.label37.Name = "label37"; this.label37.Size = new System.Drawing.Size(49, 13); this.label37.TabIndex = 7; @@ -1115,7 +1115,7 @@ // volume4Label // this.volume4Label.AutoSize = true; - this.volume4Label.Location = new System.Drawing.Point(74, 77); + this.volume4Label.Location = new System.Drawing.Point(72, 77); this.volume4Label.Name = "volume4Label"; this.volume4Label.Size = new System.Drawing.Size(47, 13); this.volume4Label.TabIndex = 6; @@ -1124,7 +1124,7 @@ // label39 // this.label39.AutoSize = true; - this.label39.Location = new System.Drawing.Point(23, 77); + this.label39.Location = new System.Drawing.Point(21, 77); this.label39.Name = "label39"; this.label39.Size = new System.Drawing.Size(45, 13); this.label39.TabIndex = 5; @@ -1133,7 +1133,7 @@ // label40 // this.label40.AutoSize = true; - this.label40.Location = new System.Drawing.Point(8, 57); + this.label40.Location = new System.Drawing.Point(6, 57); this.label40.Name = "label40"; this.label40.Size = new System.Drawing.Size(60, 13); this.label40.TabIndex = 4; @@ -1142,7 +1142,7 @@ // label41 // this.label41.AutoSize = true; - this.label41.Location = new System.Drawing.Point(30, 36); + this.label41.Location = new System.Drawing.Point(28, 36); this.label41.Name = "label41"; this.label41.Size = new System.Drawing.Size(38, 13); this.label41.TabIndex = 3; @@ -1151,7 +1151,7 @@ // refPulses4Label // this.refPulses4Label.AutoSize = true; - this.refPulses4Label.Location = new System.Drawing.Point(74, 57); + this.refPulses4Label.Location = new System.Drawing.Point(72, 57); this.refPulses4Label.Name = "refPulses4Label"; this.refPulses4Label.Size = new System.Drawing.Size(56, 13); this.refPulses4Label.TabIndex = 2; @@ -1160,7 +1160,7 @@ // pulses4Label // this.pulses4Label.AutoSize = true; - this.pulses4Label.Location = new System.Drawing.Point(74, 36); + this.pulses4Label.Location = new System.Drawing.Point(72, 36); this.pulses4Label.Name = "pulses4Label"; this.pulses4Label.Size = new System.Drawing.Size(43, 13); this.pulses4Label.TabIndex = 1; @@ -1169,20 +1169,20 @@ // sensor4Label // this.sensor4Label.AutoSize = true; - this.sensor4Label.Location = new System.Drawing.Point(74, 16); + this.sensor4Label.Location = new System.Drawing.Point(72, 16); this.sensor4Label.Name = "sensor4Label"; this.sensor4Label.Size = new System.Drawing.Size(44, 13); this.sensor4Label.TabIndex = 0; this.sensor4Label.Text = "sensor4"; // - // pictureBox2 + // watermeterPictureBox5 // - this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image"))); - this.pictureBox2.Location = new System.Drawing.Point(642, 371); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(38, 30); - this.pictureBox2.TabIndex = 75; - this.pictureBox2.TabStop = false; + this.watermeterPictureBox5.Image = ((System.Drawing.Image)(resources.GetObject("watermeterPictureBox5.Image"))); + this.watermeterPictureBox5.Location = new System.Drawing.Point(640, 371); + this.watermeterPictureBox5.Name = "watermeterPictureBox5"; + this.watermeterPictureBox5.Size = new System.Drawing.Size(38, 30); + this.watermeterPictureBox5.TabIndex = 75; + this.watermeterPictureBox5.TabStop = false; // // groupBox5 // @@ -1197,7 +1197,7 @@ this.groupBox5.Controls.Add(this.refPulses5Label); this.groupBox5.Controls.Add(this.pulses5Label); this.groupBox5.Controls.Add(this.sensor5Label); - this.groupBox5.Location = new System.Drawing.Point(597, 221); + this.groupBox5.Location = new System.Drawing.Point(595, 221); this.groupBox5.Name = "groupBox5"; this.groupBox5.Size = new System.Drawing.Size(139, 144); this.groupBox5.TabIndex = 74; @@ -1207,7 +1207,7 @@ // label42 // this.label42.AutoSize = true; - this.label42.Location = new System.Drawing.Point(25, 16); + this.label42.Location = new System.Drawing.Point(23, 16); this.label42.Name = "label42"; this.label42.Size = new System.Drawing.Size(43, 13); this.label42.TabIndex = 11; @@ -1216,7 +1216,7 @@ // passed5Label // this.passed5Label.AutoSize = true; - this.passed5Label.Location = new System.Drawing.Point(74, 118); + this.passed5Label.Location = new System.Drawing.Point(72, 118); this.passed5Label.Name = "passed5Label"; this.passed5Label.Size = new System.Drawing.Size(47, 13); this.passed5Label.TabIndex = 9; @@ -1225,7 +1225,7 @@ // error5Label // this.error5Label.AutoSize = true; - this.error5Label.Location = new System.Drawing.Point(74, 98); + this.error5Label.Location = new System.Drawing.Point(72, 98); this.error5Label.Name = "error5Label"; this.error5Label.Size = new System.Drawing.Size(34, 13); this.error5Label.TabIndex = 8; @@ -1234,7 +1234,7 @@ // label47 // this.label47.AutoSize = true; - this.label47.Location = new System.Drawing.Point(19, 98); + this.label47.Location = new System.Drawing.Point(17, 98); this.label47.Name = "label47"; this.label47.Size = new System.Drawing.Size(49, 13); this.label47.TabIndex = 7; @@ -1243,7 +1243,7 @@ // volume5Label // this.volume5Label.AutoSize = true; - this.volume5Label.Location = new System.Drawing.Point(74, 77); + this.volume5Label.Location = new System.Drawing.Point(72, 77); this.volume5Label.Name = "volume5Label"; this.volume5Label.Size = new System.Drawing.Size(47, 13); this.volume5Label.TabIndex = 6; @@ -1252,7 +1252,7 @@ // label49 // this.label49.AutoSize = true; - this.label49.Location = new System.Drawing.Point(23, 77); + this.label49.Location = new System.Drawing.Point(21, 77); this.label49.Name = "label49"; this.label49.Size = new System.Drawing.Size(45, 13); this.label49.TabIndex = 5; @@ -1261,7 +1261,7 @@ // label50 // this.label50.AutoSize = true; - this.label50.Location = new System.Drawing.Point(8, 57); + this.label50.Location = new System.Drawing.Point(6, 57); this.label50.Name = "label50"; this.label50.Size = new System.Drawing.Size(60, 13); this.label50.TabIndex = 4; @@ -1270,7 +1270,7 @@ // label51 // this.label51.AutoSize = true; - this.label51.Location = new System.Drawing.Point(30, 36); + this.label51.Location = new System.Drawing.Point(28, 36); this.label51.Name = "label51"; this.label51.Size = new System.Drawing.Size(38, 13); this.label51.TabIndex = 3; @@ -1279,7 +1279,7 @@ // refPulses5Label // this.refPulses5Label.AutoSize = true; - this.refPulses5Label.Location = new System.Drawing.Point(74, 57); + this.refPulses5Label.Location = new System.Drawing.Point(72, 57); this.refPulses5Label.Name = "refPulses5Label"; this.refPulses5Label.Size = new System.Drawing.Size(56, 13); this.refPulses5Label.TabIndex = 2; @@ -1288,7 +1288,7 @@ // pulses5Label // this.pulses5Label.AutoSize = true; - this.pulses5Label.Location = new System.Drawing.Point(74, 36); + this.pulses5Label.Location = new System.Drawing.Point(72, 36); this.pulses5Label.Name = "pulses5Label"; this.pulses5Label.Size = new System.Drawing.Size(43, 13); this.pulses5Label.TabIndex = 1; @@ -1297,20 +1297,20 @@ // sensor5Label // this.sensor5Label.AutoSize = true; - this.sensor5Label.Location = new System.Drawing.Point(74, 16); + this.sensor5Label.Location = new System.Drawing.Point(72, 16); this.sensor5Label.Name = "sensor5Label"; this.sensor5Label.Size = new System.Drawing.Size(44, 13); this.sensor5Label.TabIndex = 0; this.sensor5Label.Text = "sensor5"; // - // pictureBox3 + // watermeterPictureBox6 // - this.pictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox3.Image"))); - this.pictureBox3.Location = new System.Drawing.Point(785, 371); - this.pictureBox3.Name = "pictureBox3"; - this.pictureBox3.Size = new System.Drawing.Size(38, 30); - this.pictureBox3.TabIndex = 77; - this.pictureBox3.TabStop = false; + this.watermeterPictureBox6.Image = ((System.Drawing.Image)(resources.GetObject("watermeterPictureBox6.Image"))); + this.watermeterPictureBox6.Location = new System.Drawing.Point(783, 371); + this.watermeterPictureBox6.Name = "watermeterPictureBox6"; + this.watermeterPictureBox6.Size = new System.Drawing.Size(38, 30); + this.watermeterPictureBox6.TabIndex = 77; + this.watermeterPictureBox6.TabStop = false; // // groupBox6 // @@ -1325,7 +1325,7 @@ this.groupBox6.Controls.Add(this.refPulses6Label); this.groupBox6.Controls.Add(this.pulses6Label); this.groupBox6.Controls.Add(this.sensor6Label); - this.groupBox6.Location = new System.Drawing.Point(740, 221); + this.groupBox6.Location = new System.Drawing.Point(738, 221); this.groupBox6.Name = "groupBox6"; this.groupBox6.Size = new System.Drawing.Size(139, 144); this.groupBox6.TabIndex = 76; @@ -1335,7 +1335,7 @@ // label44 // this.label44.AutoSize = true; - this.label44.Location = new System.Drawing.Point(25, 16); + this.label44.Location = new System.Drawing.Point(23, 16); this.label44.Name = "label44"; this.label44.Size = new System.Drawing.Size(43, 13); this.label44.TabIndex = 11; @@ -1344,7 +1344,7 @@ // passed6Label // this.passed6Label.AutoSize = true; - this.passed6Label.Location = new System.Drawing.Point(74, 118); + this.passed6Label.Location = new System.Drawing.Point(72, 118); this.passed6Label.Name = "passed6Label"; this.passed6Label.Size = new System.Drawing.Size(47, 13); this.passed6Label.TabIndex = 9; @@ -1353,7 +1353,7 @@ // error6Label // this.error6Label.AutoSize = true; - this.error6Label.Location = new System.Drawing.Point(74, 98); + this.error6Label.Location = new System.Drawing.Point(72, 98); this.error6Label.Name = "error6Label"; this.error6Label.Size = new System.Drawing.Size(34, 13); this.error6Label.TabIndex = 8; @@ -1362,7 +1362,7 @@ // label48 // this.label48.AutoSize = true; - this.label48.Location = new System.Drawing.Point(19, 98); + this.label48.Location = new System.Drawing.Point(17, 98); this.label48.Name = "label48"; this.label48.Size = new System.Drawing.Size(49, 13); this.label48.TabIndex = 7; @@ -1371,7 +1371,7 @@ // volume6Label // this.volume6Label.AutoSize = true; - this.volume6Label.Location = new System.Drawing.Point(74, 77); + this.volume6Label.Location = new System.Drawing.Point(72, 77); this.volume6Label.Name = "volume6Label"; this.volume6Label.Size = new System.Drawing.Size(47, 13); this.volume6Label.TabIndex = 6; @@ -1380,7 +1380,7 @@ // label53 // this.label53.AutoSize = true; - this.label53.Location = new System.Drawing.Point(23, 77); + this.label53.Location = new System.Drawing.Point(21, 77); this.label53.Name = "label53"; this.label53.Size = new System.Drawing.Size(45, 13); this.label53.TabIndex = 5; @@ -1389,7 +1389,7 @@ // label54 // this.label54.AutoSize = true; - this.label54.Location = new System.Drawing.Point(8, 57); + this.label54.Location = new System.Drawing.Point(6, 57); this.label54.Name = "label54"; this.label54.Size = new System.Drawing.Size(60, 13); this.label54.TabIndex = 4; @@ -1398,7 +1398,7 @@ // label55 // this.label55.AutoSize = true; - this.label55.Location = new System.Drawing.Point(30, 36); + this.label55.Location = new System.Drawing.Point(28, 36); this.label55.Name = "label55"; this.label55.Size = new System.Drawing.Size(38, 13); this.label55.TabIndex = 3; @@ -1407,7 +1407,7 @@ // refPulses6Label // this.refPulses6Label.AutoSize = true; - this.refPulses6Label.Location = new System.Drawing.Point(74, 57); + this.refPulses6Label.Location = new System.Drawing.Point(72, 57); this.refPulses6Label.Name = "refPulses6Label"; this.refPulses6Label.Size = new System.Drawing.Size(56, 13); this.refPulses6Label.TabIndex = 2; @@ -1416,7 +1416,7 @@ // pulses6Label // this.pulses6Label.AutoSize = true; - this.pulses6Label.Location = new System.Drawing.Point(74, 36); + this.pulses6Label.Location = new System.Drawing.Point(72, 36); this.pulses6Label.Name = "pulses6Label"; this.pulses6Label.Size = new System.Drawing.Size(43, 13); this.pulses6Label.TabIndex = 1; @@ -1425,7 +1425,7 @@ // sensor6Label // this.sensor6Label.AutoSize = true; - this.sensor6Label.Location = new System.Drawing.Point(74, 16); + this.sensor6Label.Location = new System.Drawing.Point(72, 16); this.sensor6Label.Name = "sensor6Label"; this.sensor6Label.Size = new System.Drawing.Size(44, 13); this.sensor6Label.TabIndex = 0; @@ -1436,11 +1436,11 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Control; - this.Controls.Add(this.pictureBox3); + this.Controls.Add(this.watermeterPictureBox6); this.Controls.Add(this.groupBox6); - this.Controls.Add(this.pictureBox2); + this.Controls.Add(this.watermeterPictureBox5); this.Controls.Add(this.groupBox5); - this.Controls.Add(this.pictureBox1); + this.Controls.Add(this.watermeterPictureBox4); this.Controls.Add(this.groupBox4); this.Controls.Add(this.watermeterPictureBox3); this.Controls.Add(this.watermeterPictureBox2); @@ -1517,13 +1517,13 @@ ((System.ComponentModel.ISupportInitialize)(this.watermeterPictureBox1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.watermeterPictureBox2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.watermeterPictureBox3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.watermeterPictureBox4)).EndInit(); this.groupBox4.ResumeLayout(false); this.groupBox4.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.watermeterPictureBox5)).EndInit(); this.groupBox5.ResumeLayout(false); this.groupBox5.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.watermeterPictureBox6)).EndInit(); this.groupBox6.ResumeLayout(false); this.groupBox6.PerformLayout(); this.ResumeLayout(false); @@ -1623,7 +1623,7 @@ private System.Windows.Forms.PictureBox watermeterPictureBox1; private System.Windows.Forms.PictureBox watermeterPictureBox2; private System.Windows.Forms.PictureBox watermeterPictureBox3; - private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.PictureBox watermeterPictureBox4; private System.Windows.Forms.GroupBox groupBox4; private System.Windows.Forms.Label passed4Label; private System.Windows.Forms.Label error4Label; @@ -1635,7 +1635,7 @@ private System.Windows.Forms.Label refPulses4Label; private System.Windows.Forms.Label pulses4Label; private System.Windows.Forms.Label sensor4Label; - private System.Windows.Forms.PictureBox pictureBox2; + private System.Windows.Forms.PictureBox watermeterPictureBox5; private System.Windows.Forms.GroupBox groupBox5; private System.Windows.Forms.Label passed5Label; private System.Windows.Forms.Label error5Label; @@ -1652,7 +1652,7 @@ private System.Windows.Forms.Label label38; private System.Windows.Forms.Label label42; private System.Windows.Forms.Label label43; - private System.Windows.Forms.PictureBox pictureBox3; + private System.Windows.Forms.PictureBox watermeterPictureBox6; private System.Windows.Forms.GroupBox groupBox6; private System.Windows.Forms.Label label44; private System.Windows.Forms.Label passed6Label; diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl.cs b/TestBenchFramework/Screens/ProcessTabPageCtrl.cs index b70634dc9..ab0e25d57 100644 --- a/TestBenchFramework/Screens/ProcessTabPageCtrl.cs +++ b/TestBenchFramework/Screens/ProcessTabPageCtrl.cs @@ -86,11 +86,21 @@ namespace TBF.Screens prOutCmpntLabel.Text = "---"; sensor1Label.Text = "---"; - if (Program.WMsCount >= 2) sensor2Label.Text = "---"; - if (Program.WMsCount >= 3) sensor3Label.Text = "---"; - if (Program.WMsCount >= 4) sensor4Label.Text = "---"; - if (Program.WMsCount >= 5) sensor5Label.Text = "---"; - if (Program.WMsCount >= 6) sensor6Label.Text = "---"; + + if (Program.WMsCount >= 2) { sensor2Label.Text = "---"; } + else { groupBox2.Visible = false; watermeterPictureBox2.Visible = false; } + + if (Program.WMsCount >= 3) { sensor3Label.Text = "---"; } + else { groupBox3.Visible = false; watermeterPictureBox3.Visible = false; } + + if (Program.WMsCount >= 4) { sensor4Label.Text = "---"; } + else { groupBox4.Visible = false; watermeterPictureBox4.Visible = false; } + + if (Program.WMsCount >= 5) { sensor5Label.Text = "---"; } + else { groupBox5.Visible = false; watermeterPictureBox5.Visible = false; } + + if (Program.WMsCount >= 6) { sensor6Label.Text = "---"; } + else { groupBox6.Visible = false; watermeterPictureBox6.Visible = false; } tInCmpntLabel.Text = "---"; tOutCmpntLabel.Text = "---"; diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl.resx b/TestBenchFramework/Screens/ProcessTabPageCtrl.resx index e9600dce4..a5a5d537a 100644 --- a/TestBenchFramework/Screens/ProcessTabPageCtrl.resx +++ b/TestBenchFramework/Screens/ProcessTabPageCtrl.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAAAI4AAABtCAYAAAB3LVkkAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADr0AAA69AUf7kK0AAAEuSURBVHhe7dIxDoAwEAQx/v/pQFJQBaRM7ZN8zbZzPTcg + YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAEuSURBVHhe7dIxDoAwEAQx/v/pQFJQBaRM7ZN8zbZzPTcg mG/AAeGQCIdEOCTCIREOiXBIhEMiHBLhkAiHRDgkwiERDolwSIRDIhwS4ZAIh0Q4JMIhEQ6JcEiEQyIc EuGQCIdEOCTCIREOiXBIhEMiHBLhkAiHRDgkwiERDolwSIRDIhwS4ZAIh0Q4JMIhEQ6JcEiEQyIcEuGQ CIdEOCTCIREOiXBIhEMiHBLhkAiHRDgkwiERDolwSIRDIhwS4ZAIh0Q4JMIhEQ6JcEiEQyIcEuGQCIdE @@ -132,7 +132,7 @@ iVBORw0KGgoAAAANSUhEUgAAACYAAAAmCAYAAACoPemuAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADr0AAA69AUf7kK0AAALTSURBVFhH7Ze9ajJBFIZXjZAiCQT8gYC1vSnUQnIBglhq + YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAALTSURBVFhH7Ze9ajJBFIZXjZAiCQT8gYC1vSnUQnIBglhq EEm0sPAOcgGWgp2kSWGV0jIkvSZgk4hNGiF3kCrdZN/Vs3N29xiV7PDxQYoHdp0z7zw4u8sca7lcqt8Q iUSUZVkBpNp92FssnU47cIlisagajYYLHzs4OHDqR6ORmLeJncQmk4mq1+ueBXu93k5UKhV3TjKZVN1u V1zDz1axQqHgESIkCQkuxlksFuJ6xI9i2WxWDAWShMQmMWyxtCYhig2HQ1UqldyQ01PL3gJL3dzoYElC @@ -150,7 +150,7 @@ iVBORw0KGgoAAAANSUhEUgAAACYAAAAeCAYAAABAFGxuAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADr0AAA69AUf7kK0AAAIfSURBVFhH7dexS2pRHAfw0wukyUChpUkRoqFVF5fGApHW + YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAIfSURBVFhH7dexS2pRHAfw0wukyUChpUkRoqFVF5fGApHW N8TL1cE50L9AHBoFHaPVNWrQFh1cHk+CBwqXtzwIgmqqll/fc+65eo/3p2Xee23owMfi/s79/b54L3Wv sCyLPqrZbJIQwhdcf7fvYNO4/m6fCLYG20vapF6vR6PRiJ0jfSJYBGhJ9yAokUhQvV5nZ60omEP2y1Ay maRisWjMWihYqVRCIz+DOdpg33udTkfNwu/eG3O2H8A19ksa1kHNkx9VkKnf8we4hn4awTjYpT74VYQY @@ -165,7 +165,7 @@ iVBORw0KGgoAAAANSUhEUgAAACYAAAAeCAYAAABAFGxuAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADr0AAA69AUf7kK0AAAIfSURBVFhH7dexS2pRHAfw0wukyUChpUkRoqFVF5fGApHW + YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAIfSURBVFhH7dexS2pRHAfw0wukyUChpUkRoqFVF5fGApHW N8TL1cE50L9AHBoFHaPVNWrQFh1cHk+CBwqXtzwIgmqqll/fc+65eo/3p2Xee23owMfi/s79/b54L3Wv sCyLPqrZbJIQwhdcf7fvYNO4/m6fCLYG20vapF6vR6PRiJ0jfSJYBGhJ9yAokUhQvV5nZ60omEP2y1Ay maRisWjMWihYqVRCIz+DOdpg33udTkfNwu/eG3O2H8A19ksa1kHNkx9VkKnf8we4hn4awTjYpT74VYQY @@ -180,7 +180,7 @@ iVBORw0KGgoAAAANSUhEUgAAACYAAAAeCAYAAABAFGxuAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADr0AAA69AUf7kK0AAAIfSURBVFhH7dexS2pRHAfw0wukyUChpUkRoqFVF5fGApHW + YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAIfSURBVFhH7dexS2pRHAfw0wukyUChpUkRoqFVF5fGApHW N8TL1cE50L9AHBoFHaPVNWrQFh1cHk+CBwqXtzwIgmqqll/fc+65eo/3p2Xee23owMfi/s79/b54L3Wv sCyLPqrZbJIQwhdcf7fvYNO4/m6fCLYG20vapF6vR6PRiJ0jfSJYBGhJ9yAokUhQvV5nZ60omEP2y1Ay maRisWjMWihYqVRCIz+DOdpg33udTkfNwu/eG3O2H8A19ksa1kHNkx9VkKnf8we4hn4awTjYpT74VYQY @@ -192,7 +192,7 @@ n8+zPTk43VzcJk65XMZAGW6+aDSKx5sY22M2i94AIhVFdRKKXCQAAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAACYAAAAeCAYAAABAFGxuAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAIfSURBVFhH7dexS2pRHAfw0wukyUChpUkRoqFVF5fGApHW @@ -207,7 +207,7 @@ n8+zPTk43VzcJk65XMZAGW6+aDSKx5sY22M2i94AIhVFdRKKXCQAAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAACYAAAAeCAYAAABAFGxuAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAIfSURBVFhH7dexS2pRHAfw0wukyUChpUkRoqFVF5fGApHW @@ -222,7 +222,7 @@ n8+zPTk43VzcJk65XMZAGW6+aDSKx5sY22M2i94AIhVFdRKKXCQAAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAACYAAAAeCAYAAABAFGxuAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAIfSURBVFhH7dexS2pRHAfw0wukyUChpUkRoqFVF5fGApHW