More changes in VirtualBench drawing on the Process screen

2014-12-10 14:34:47 +01:00 · 2014-12-10 14:34:47 +01:00 · 42c255e40e
commit 42c255e40e
parent 415adba8cf
10 changed files with 181 additions and 103 deletions
--- a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs
+++ b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs
@ -109,8 +109,8 @@ namespace TBF.BenchControl.Sequences

 			if (e.Contains(Event.CameraOpFailed)) goto error;        /// TODO: resolve in some other way

-            //--------------------------------------------------------------------------------------------
        stop_emptying:
+            //--------------------------------------------------------------------------------------------
            State stopEmptying = State.Create("MainSeq : Stop emptying of water tanks")
                                      .AddOperation(checkUiOp)
                                      .AddOperation(StateMachine.ControlBoard.SetValvesOp(null, allEmptyingValves))
@ -141,7 +141,7 @@ namespace TBF.BenchControl.Sequences
            //--------------------------------------------------------------------------------------------
            Bridge.OnActivity(this, Strings.Measuring_the_weight);
            State.Create("MainSeq : Mesuring the weight for the 1st time")
-                 .AddOperation(checkUiOp)
+                   .AddOperation(checkUiOp)
                 .AddOperation(new MettlerToledo.ReadMassesOp())
                 .EnterState();
            do
--- a/TestBenchFramework/Screens/ProcessTabPageCtrl.Designer.cs
+++ b/TestBenchFramework/Screens/ProcessTabPageCtrl.Designer.cs
@ -161,6 +161,8 @@
            this.refPulses6Label = new System.Windows.Forms.Label();
            this.pulses6Label = new System.Windows.Forms.Label();
            this.sensor6Label = new System.Windows.Forms.Label();
+            this.flowMeterPictureBox = new System.Windows.Forms.PictureBox();
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();
            this.groupBox1.SuspendLayout();
            this.groupBox2.SuspendLayout();
            this.groupBox3.SuspendLayout();
@ -175,6 +177,8 @@
            this.groupBox5.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.watermeterPictureBox6)).BeginInit();
            this.groupBox6.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.flowMeterPictureBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
            this.SuspendLayout();
            // 
            // sensor1Label
@ -609,7 +613,7 @@
            // label15
            // 
            this.label15.AutoSize = true;
-            this.label15.Location = new System.Drawing.Point(549, 78);
+            this.label15.Location = new System.Drawing.Point(898, 153);
            this.label15.Name = "label15";
            this.label15.Size = new System.Drawing.Size(86, 13);
            this.label15.TabIndex = 21;
@ -654,7 +658,7 @@
            // refFlowLabel
            // 
            this.refFlowLabel.AutoSize = true;
-            this.refFlowLabel.Location = new System.Drawing.Point(639, 78);
+            this.refFlowLabel.Location = new System.Drawing.Point(991, 153);
            this.refFlowLabel.Name = "refFlowLabel";
            this.refFlowLabel.Size = new System.Drawing.Size(41, 13);
            this.refFlowLabel.TabIndex = 26;
@ -663,7 +667,7 @@
            // label16
            // 
            this.label16.AutoSize = true;
-            this.label16.Location = new System.Drawing.Point(559, 57);
+            this.label16.Location = new System.Drawing.Point(908, 132);
            this.label16.Name = "label16";
            this.label16.Size = new System.Drawing.Size(76, 13);
            this.label16.TabIndex = 27;
@ -672,7 +676,7 @@
            // refFreqLabel
            // 
            this.refFreqLabel.AutoSize = true;
-            this.refFreqLabel.Location = new System.Drawing.Point(639, 57);
+            this.refFreqLabel.Location = new System.Drawing.Point(991, 132);
            this.refFreqLabel.Name = "refFreqLabel";
            this.refFreqLabel.Size = new System.Drawing.Size(40, 13);
            this.refFreqLabel.TabIndex = 28;
@ -681,7 +685,7 @@
            // label19
            // 
            this.label19.AutoSize = true;
-            this.label19.Location = new System.Drawing.Point(575, 37);
+            this.label19.Location = new System.Drawing.Point(924, 112);
            this.label19.Name = "label19";
            this.label19.Size = new System.Drawing.Size(60, 13);
            this.label19.TabIndex = 29;
@ -690,7 +694,7 @@
            // refPulsesLabel
            // 
            this.refPulsesLabel.AutoSize = true;
-            this.refPulsesLabel.Location = new System.Drawing.Point(639, 37);
+            this.refPulsesLabel.Location = new System.Drawing.Point(991, 112);
            this.refPulsesLabel.Name = "refPulsesLabel";
            this.refPulsesLabel.Size = new System.Drawing.Size(50, 13);
            this.refPulsesLabel.TabIndex = 30;
@ -699,7 +703,7 @@
            // refFlowCmpntLabel
            // 
            this.refFlowCmpntLabel.AutoSize = true;
-            this.refFlowCmpntLabel.Location = new System.Drawing.Point(639, 17);
+            this.refFlowCmpntLabel.Location = new System.Drawing.Point(991, 92);
            this.refFlowCmpntLabel.Name = "refFlowCmpntLabel";
            this.refFlowCmpntLabel.Size = new System.Drawing.Size(71, 13);
            this.refFlowCmpntLabel.TabIndex = 31;
@ -708,7 +712,7 @@
            // regValveCmpntLabel
            // 
            this.regValveCmpntLabel.AutoSize = true;
-            this.regValveCmpntLabel.Location = new System.Drawing.Point(993, 58);
+            this.regValveCmpntLabel.Location = new System.Drawing.Point(639, 37);
            this.regValveCmpntLabel.Name = "regValveCmpntLabel";
            this.regValveCmpntLabel.Size = new System.Drawing.Size(79, 13);
            this.regValveCmpntLabel.TabIndex = 34;
@ -717,7 +721,7 @@
            // regValvePosLabel
            // 
            this.regValvePosLabel.AutoSize = true;
-            this.regValvePosLabel.Location = new System.Drawing.Point(993, 78);
+            this.regValvePosLabel.Location = new System.Drawing.Point(639, 57);
            this.regValvePosLabel.Name = "regValvePosLabel";
            this.regValvePosLabel.Size = new System.Drawing.Size(67, 13);
            this.regValvePosLabel.TabIndex = 35;
@ -726,7 +730,7 @@
            // label21
            // 
            this.label21.AutoSize = true;
-            this.label21.Location = new System.Drawing.Point(904, 78);
+            this.label21.Location = new System.Drawing.Point(550, 57);
            this.label21.Name = "label21";
            this.label21.Size = new System.Drawing.Size(85, 13);
            this.label21.TabIndex = 36;
@ -735,7 +739,7 @@
            // tDivCmpntLabel
            // 
            this.tDivCmpntLabel.AutoSize = true;
-            this.tDivCmpntLabel.Location = new System.Drawing.Point(993, 129);
+            this.tDivCmpntLabel.Location = new System.Drawing.Point(991, 32);
            this.tDivCmpntLabel.Name = "tDivCmpntLabel";
            this.tDivCmpntLabel.Size = new System.Drawing.Size(56, 13);
            this.tDivCmpntLabel.TabIndex = 39;
@ -744,7 +748,7 @@
            // tDivLabel
            // 
            this.tDivLabel.AutoSize = true;
-            this.tDivLabel.Location = new System.Drawing.Point(993, 148);
+            this.tDivLabel.Location = new System.Drawing.Point(991, 51);
            this.tDivLabel.Name = "tDivLabel";
            this.tDivLabel.Size = new System.Drawing.Size(26, 13);
            this.tDivLabel.TabIndex = 38;
@ -753,7 +757,7 @@
            // label24
            // 
            this.label24.AutoSize = true;
-            this.label24.Location = new System.Drawing.Point(935, 148);
+            this.label24.Location = new System.Drawing.Point(933, 51);
            this.label24.Name = "label24";
            this.label24.Size = new System.Drawing.Size(54, 13);
            this.label24.TabIndex = 37;
@ -807,7 +811,7 @@
            // label25
            // 
            this.label25.AutoSize = true;
-            this.label25.Location = new System.Drawing.Point(561, 99);
+            this.label25.Location = new System.Drawing.Point(910, 174);
            this.label25.Name = "label25";
            this.label25.Size = new System.Drawing.Size(78, 13);
            this.label25.TabIndex = 45;
@ -816,7 +820,7 @@
            // refVolumeLabel
            // 
            this.refVolumeLabel.AutoSize = true;
-            this.refVolumeLabel.Location = new System.Drawing.Point(639, 99);
+            this.refVolumeLabel.Location = new System.Drawing.Point(991, 174);
            this.refVolumeLabel.Name = "refVolumeLabel";
            this.refVolumeLabel.Size = new System.Drawing.Size(54, 13);
            this.refVolumeLabel.TabIndex = 46;
@ -1005,7 +1009,7 @@
            // reservoirPictureBox
            // 
            this.reservoirPictureBox.Image = ((System.Drawing.Image)(resources.GetObject("reservoirPictureBox.Image")));
-            this.reservoirPictureBox.Location = new System.Drawing.Point(924, 386);
+            this.reservoirPictureBox.Location = new System.Drawing.Point(880, 386);
            this.reservoirPictureBox.Name = "reservoirPictureBox";
            this.reservoirPictureBox.Size = new System.Drawing.Size(142, 109);
            this.reservoirPictureBox.TabIndex = 67;
@ -1014,7 +1018,7 @@
            // pumpPictureBox
            // 
            this.pumpPictureBox.Image = ((System.Drawing.Image)(resources.GetObject("pumpPictureBox.Image")));
-            this.pumpPictureBox.Location = new System.Drawing.Point(823, 458);
+            this.pumpPictureBox.Location = new System.Drawing.Point(779, 458);
            this.pumpPictureBox.Name = "pumpPictureBox";
            this.pumpPictureBox.Size = new System.Drawing.Size(38, 38);
            this.pumpPictureBox.TabIndex = 68;
@ -1306,7 +1310,7 @@
            // watermeterPictureBox6
            // 
            this.watermeterPictureBox6.Image = ((System.Drawing.Image)(resources.GetObject("watermeterPictureBox6.Image")));
-            this.watermeterPictureBox6.Location = new System.Drawing.Point(783, 371);
+            this.watermeterPictureBox6.Location = new System.Drawing.Point(390, 151);
            this.watermeterPictureBox6.Name = "watermeterPictureBox6";
            this.watermeterPictureBox6.Size = new System.Drawing.Size(38, 30);
            this.watermeterPictureBox6.TabIndex = 77;
@ -1325,7 +1329,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(738, 221);
+            this.groupBox6.Location = new System.Drawing.Point(153, 78);
            this.groupBox6.Name = "groupBox6";
            this.groupBox6.Size = new System.Drawing.Size(139, 144);
            this.groupBox6.TabIndex = 76;
@ -1431,11 +1435,33 @@
            this.sensor6Label.TabIndex = 0;
            this.sensor6Label.Text = "sensor6";
            // 
+            // flowMeterPictureBox
+            // 
+            this.flowMeterPictureBox.ErrorImage = null;
+            this.flowMeterPictureBox.Image = ((System.Drawing.Image)(resources.GetObject("flowMeterPictureBox.Image")));
+            this.flowMeterPictureBox.InitialImage = null;
+            this.flowMeterPictureBox.Location = new System.Drawing.Point(739, 102);
+            this.flowMeterPictureBox.Name = "flowMeterPictureBox";
+            this.flowMeterPictureBox.Size = new System.Drawing.Size(38, 38);
+            this.flowMeterPictureBox.TabIndex = 78;
+            this.flowMeterPictureBox.TabStop = false;
+            // 
+            // pictureBox1
+            // 
+            this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
+            this.pictureBox1.Location = new System.Drawing.Point(739, 45);
+            this.pictureBox1.Name = "pictureBox1";
+            this.pictureBox1.Size = new System.Drawing.Size(38, 35);
+            this.pictureBox1.TabIndex = 79;
+            this.pictureBox1.TabStop = false;
+            // 
            // ProcessTabPageCtrl
            // 
            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.pictureBox1);
+            this.Controls.Add(this.flowMeterPictureBox);
            this.Controls.Add(this.watermeterPictureBox6);
            this.Controls.Add(this.groupBox6);
            this.Controls.Add(this.watermeterPictureBox5);
@ -1527,6 +1553,8 @@
            ((System.ComponentModel.ISupportInitialize)(this.watermeterPictureBox6)).EndInit();
            this.groupBox6.ResumeLayout(false);
            this.groupBox6.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.flowMeterPictureBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
            this.ResumeLayout(false);
            this.PerformLayout();

@ -1666,6 +1694,8 @@
        private System.Windows.Forms.Label refPulses6Label;
        private System.Windows.Forms.Label pulses6Label;
        private System.Windows.Forms.Label sensor6Label;
+        private System.Windows.Forms.PictureBox flowMeterPictureBox;
+        private System.Windows.Forms.PictureBox pictureBox1;


 	}
--- a/TestBenchFramework/Screens/ProcessTabPageCtrl.cs
+++ b/TestBenchFramework/Screens/ProcessTabPageCtrl.cs
@ -434,15 +434,23 @@ namespace TBF.Screens

            System.Drawing.Graphics formGraphics = this.CreateGraphics();

-            formGraphics.FillRectangle(filledBrush, new Rectangle(861, 470, 63, 14));   // tank -> pump
-            formGraphics.FillRectangle(benchBrush, new Rectangle(34, 470, 789, 14));    // pump ->bench horizontal 
-            formGraphics.FillRectangle(benchBrush, new Rectangle(20, 378, 14, 106));    // pump ->bench vertical
-            formGraphics.FillRectangle(benchBrush, new Rectangle(34, 378, 825, 14));    // pump ->bench horizontal
-            //formGraphics.FillRectangle(myBrush, new Rectangle(104, 378, 106, 14));  // WM1-WM2
-            //formGraphics.FillRectangle(myBrush, new Rectangle(174, 378, 106, 14));  // WM2-WM3
-            //formGraphics.FillRectangle(myBrush, new Rectangle(244, 378, 106, 14));  // WM3-WM4
-            //formGraphics.FillRectangle(myBrush, new Rectangle(314, 378, 106, 14));  // WM4-WM5
-            //formGraphics.FillRectangle(myBrush, new Rectangle(384, 378, 106, 14));  // WM5-WM6
+            int diam = 14;          // pipe diameter (pixels)
+            int left = 20;          // left-most pipe x-coordinate
+            int top = 14;           // top-most pipe y-coordinate
+            int bottom = 484;       // bottom-most pipe y-coordinate
+            int benchTop = 378;     // bench-pipe top y-coordinate
+            int pumpLeft = 779;
+            int pumpWdth = 38;
+
+            formGraphics.FillRectangle(filledBrush, new Rectangle(pumpLeft+pumpWdth, bottom-diam, 65, diam));   // tank -> pump
+            formGraphics.FillRectangle(benchBrush, new Rectangle(left, bottom-diam, pumpLeft-left, diam));      // pump ->bench horizontal 
+            formGraphics.FillRectangle(benchBrush, new Rectangle(left, benchTop, diam, 106));                   // pump ->bench vertical
+            formGraphics.FillRectangle(benchBrush, new Rectangle(left + diam, benchTop, 731, diam));            // pump ->bench horizontal
+            formGraphics.FillRectangle(benchBrush, new Rectangle(751, 28, diam, 350));                          // bench -> flowmeter vertical
+            formGraphics.FillRectangle(benchBrush, new Rectangle(751, top, 90, diam));                          // top horizontal
+            formGraphics.FillRectangle(benchBrush, new Rectangle(827, 28, diam, 40));                           // WM3-WM4
+            //formGraphics.FillRectangle(benchBrush, new Rectangle(314, 378, 106, diam));  // WM4-WM5
+            //formGraphics.FillRectangle(benchBrush, new Rectangle(384, 378, 106, diam));  // WM5-WM6

            filledBrush.Dispose();
            formGraphics.Dispose();
--- a/TestBenchFramework/Screens/ProcessTabPageCtrl.resx
+++ b/TestBenchFramework/Screens/ProcessTabPageCtrl.resx
@ -132,109 +132,149 @@
  <data name="pumpPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        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
-        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
+        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
 </value>
  </data>
  <data name="watermeterPictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAACYAAAAeCAYAAABAFGxuAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAIfSURBVFhH7dexS2pRHAfw0wukyUChpUkRoqFVF5fGApHW
-        N8TL1cE50L9AHBoFHaPVNWrQFh1cHk+CBwqXtzwIgmqqll/fc+65eo/3p2Xee23owMfi/s79/b54L3Wv
-        sCyLPqrZbJIQwhdcf7fvYNO4/m6fCLYG20vapF6vR6PRiJ0jfSJYBGhJ9yAokUhQvV5nZ60omEP2y1Ay
-        maRisWjMWihYqVRCIz+DOdpg33udTkfNwu/eG3O2H8A19ksa1kHNkx9VkKnf8we4hn4awTjYpT74VYQY
-        rNHo0+7uI1vzCjFYJnNP7XZb/eTqphCDSVdXNyrc4eF/tj4xJ1ilcquaBGV//84zc2KFwa6vOxSLvXjm
-        2lYYbGvr2TNzYk6wIDj32N7eA1ufCDHY8bGlQu3sPLF1U4jBqtXf7HFeiMEWMw72Eyr64CrIb1POdyBT
-        Op0myQ6Y0l6BaxCEvyBUBjeUzGUHlM9cFzDdJAgnlMvlPM9+KJlrMBjgH24DJ8iAOVeDIPwC/sUEZXM5
-        hVqtRtlsFiduwplu5KdbENRqtYxADmwx1/SGVCpFkYi8tKfwTzddlh2q2+165jmwzVzcpn6/rxoJsaEb
-        L8O+fPINae7rm84zXtwmR6FQUE2FONBDFnEC9vP8rMvnhlPMxW1yGw6HFI/H1QAhzjUuiCT/7Mj6kTon
-        n8+zPTk43VzcJk65XMZAGW6+aDSKx5sY22M2i94AIhVFdRKKXCQAAAAASUVORK5CYII=
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIGSURBVFhH7de/SwJhGAfwtwJpUlBwaVIEcXDVxcUxQaS1
+        QdLVwTnQv0AcGgUdo9U1dNAWHVwiEQKFaAkCwZqq5el53rvT03v8cXqeDQ0fjXu97/PFO+w9MZlMYFO1
+        Wg2EEJbg8vX+iy3i8vW2KHaEznbkgm63C6PRiJ1DtijmQLCjMRLg8/mgUqmwsw5UTEN5UfD7/ZDL5eZm
+        mSqWz+cxyMpimhZS7r12uy1n4d/GG3O5Y8QFWyWCTpCcRy8lRK3XeUJcoJVGaFrsXj34V9hYrFrtQSj0
+        wa4Z2VgsGh1Dq9WS79z6PBuLkUbjQZZLJN7Y9ZkVxYrFgQzZl3j83TBz5oDFms02uN3fhrmKAxbzer8M
+        M2dWFNsH7R4Lh+mXnf+MwsZi6fSLLBUMfrLr82wsVio9ssd5NhYzZ1rsEhXVg4dA3ybN12CnSCQCRCkY
+        UP0gLmAfnpGQHfQM+zGlIO257hAXZLUMJJPJuQ6yx+KBfr+P/3CreAIVTOoC9uEK8Q8mS3ew5XIZYrEY
+        nuhCN2qQlQZIQL1eZ+ev3VoHAgFwOOjSXqNXNXRXSqlOp8POJBvt+Xu9ngwS4lQN3oVy+egJybLHt2w2
+        K0OFOFeHmJFByn5+2eXTM1WMDIdD8Hg8coAQtyquCKGfHVq/kOekUik2k2O6mKZQKOBAKrea0+nE7Y2b
+        zVhuAr/Ce2bVcGWw1gAAAABJRU5ErkJggg==
 </value>
  </data>
  <data name="watermeterPictureBox2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAACYAAAAeCAYAAABAFGxuAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAIfSURBVFhH7dexS2pRHAfw0wukyUChpUkRoqFVF5fGApHW
-        N8TL1cE50L9AHBoFHaPVNWrQFh1cHk+CBwqXtzwIgmqqll/fc+65eo/3p2Xee23owMfi/s79/b54L3Wv
-        sCyLPqrZbJIQwhdcf7fvYNO4/m6fCLYG20vapF6vR6PRiJ0jfSJYBGhJ9yAokUhQvV5nZ60omEP2y1Ay
-        maRisWjMWihYqVRCIz+DOdpg33udTkfNwu/eG3O2H8A19ksa1kHNkx9VkKnf8we4hn4awTjYpT74VYQY
-        rNHo0+7uI1vzCjFYJnNP7XZb/eTqphCDSVdXNyrc4eF/tj4xJ1ilcquaBGV//84zc2KFwa6vOxSLvXjm
-        2lYYbGvr2TNzYk6wIDj32N7eA1ufCDHY8bGlQu3sPLF1U4jBqtXf7HFeiMEWMw72Eyr64CrIb1POdyBT
-        Op0myQ6Y0l6BaxCEvyBUBjeUzGUHlM9cFzDdJAgnlMvlPM9+KJlrMBjgH24DJ8iAOVeDIPwC/sUEZXM5
-        hVqtRtlsFiduwplu5KdbENRqtYxADmwx1/SGVCpFkYi8tKfwTzddlh2q2+165jmwzVzcpn6/rxoJsaEb
-        L8O+fPINae7rm84zXtwmR6FQUE2FONBDFnEC9vP8rMvnhlPMxW1yGw6HFI/H1QAhzjUuiCT/7Mj6kTon
-        n8+zPTk43VzcJk65XMZAGW6+aDSKx5sY22M2i94AIhVFdRKKXCQAAAAASUVORK5CYII=
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIGSURBVFhH7de/SwJhGAfwtwJpUlBwaVIEcXDVxcUxQaS1
+        QdLVwTnQv0AcGgUdo9U1dNAWHVwiEQKFaAkCwZqq5el53rvT03v8cXqeDQ0fjXu97/PFO+w9MZlMYFO1
+        Wg2EEJbg8vX+iy3i8vW2KHaEznbkgm63C6PRiJ1DtijmQLCjMRLg8/mgUqmwsw5UTEN5UfD7/ZDL5eZm
+        mSqWz+cxyMpimhZS7r12uy1n4d/GG3O5Y8QFWyWCTpCcRy8lRK3XeUJcoJVGaFrsXj34V9hYrFrtQSj0
+        wa4Z2VgsGh1Dq9WS79z6PBuLkUbjQZZLJN7Y9ZkVxYrFgQzZl3j83TBz5oDFms02uN3fhrmKAxbzer8M
+        M2dWFNsH7R4Lh+mXnf+MwsZi6fSLLBUMfrLr82wsVio9ssd5NhYzZ1rsEhXVg4dA3ybN12CnSCQCRCkY
+        UP0gLmAfnpGQHfQM+zGlIO257hAXZLUMJJPJuQ6yx+KBfr+P/3CreAIVTOoC9uEK8Q8mS3ew5XIZYrEY
+        nuhCN2qQlQZIQL1eZ+ev3VoHAgFwOOjSXqNXNXRXSqlOp8POJBvt+Xu9ngwS4lQN3oVy+egJybLHt2w2
+        K0OFOFeHmJFByn5+2eXTM1WMDIdD8Hg8coAQtyquCKGfHVq/kOekUik2k2O6mKZQKOBAKrea0+nE7Y2b
+        zVhuAr/Ce2bVcGWw1gAAAABJRU5ErkJggg==
 </value>
  </data>
  <data name="watermeterPictureBox3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAACYAAAAeCAYAAABAFGxuAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAIfSURBVFhH7dexS2pRHAfw0wukyUChpUkRoqFVF5fGApHW
-        N8TL1cE50L9AHBoFHaPVNWrQFh1cHk+CBwqXtzwIgmqqll/fc+65eo/3p2Xee23owMfi/s79/b54L3Wv
-        sCyLPqrZbJIQwhdcf7fvYNO4/m6fCLYG20vapF6vR6PRiJ0jfSJYBGhJ9yAokUhQvV5nZ60omEP2y1Ay
-        maRisWjMWihYqVRCIz+DOdpg33udTkfNwu/eG3O2H8A19ksa1kHNkx9VkKnf8we4hn4awTjYpT74VYQY
-        rNHo0+7uI1vzCjFYJnNP7XZb/eTqphCDSVdXNyrc4eF/tj4xJ1ilcquaBGV//84zc2KFwa6vOxSLvXjm
-        2lYYbGvr2TNzYk6wIDj32N7eA1ufCDHY8bGlQu3sPLF1U4jBqtXf7HFeiMEWMw72Eyr64CrIb1POdyBT
-        Op0myQ6Y0l6BaxCEvyBUBjeUzGUHlM9cFzDdJAgnlMvlPM9+KJlrMBjgH24DJ8iAOVeDIPwC/sUEZXM5
-        hVqtRtlsFiduwplu5KdbENRqtYxADmwx1/SGVCpFkYi8tKfwTzddlh2q2+165jmwzVzcpn6/rxoJsaEb
-        L8O+fPINae7rm84zXtwmR6FQUE2FONBDFnEC9vP8rMvnhlPMxW1yGw6HFI/H1QAhzjUuiCT/7Mj6kTon
-        n8+zPTk43VzcJk65XMZAGW6+aDSKx5sY22M2i94AIhVFdRKKXCQAAAAASUVORK5CYII=
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIGSURBVFhH7de/SwJhGAfwtwJpUlBwaVIEcXDVxcUxQaS1
+        QdLVwTnQv0AcGgUdo9U1dNAWHVwiEQKFaAkCwZqq5el53rvT03v8cXqeDQ0fjXu97/PFO+w9MZlMYFO1
+        Wg2EEJbg8vX+iy3i8vW2KHaEznbkgm63C6PRiJ1DtijmQLCjMRLg8/mgUqmwsw5UTEN5UfD7/ZDL5eZm
+        mSqWz+cxyMpimhZS7r12uy1n4d/GG3O5Y8QFWyWCTpCcRy8lRK3XeUJcoJVGaFrsXj34V9hYrFrtQSj0
+        wa4Z2VgsGh1Dq9WS79z6PBuLkUbjQZZLJN7Y9ZkVxYrFgQzZl3j83TBz5oDFms02uN3fhrmKAxbzer8M
+        M2dWFNsH7R4Lh+mXnf+MwsZi6fSLLBUMfrLr82wsVio9ssd5NhYzZ1rsEhXVg4dA3ybN12CnSCQCRCkY
+        UP0gLmAfnpGQHfQM+zGlIO257hAXZLUMJJPJuQ6yx+KBfr+P/3CreAIVTOoC9uEK8Q8mS3ew5XIZYrEY
+        nuhCN2qQlQZIQL1eZ+ev3VoHAgFwOOjSXqNXNXRXSqlOp8POJBvt+Xu9ngwS4lQN3oVy+egJybLHt2w2
+        K0OFOFeHmJFByn5+2eXTM1WMDIdD8Hg8coAQtyquCKGfHVq/kOekUik2k2O6mKZQKOBAKrea0+nE7Y2b
+        zVhuAr/Ce2bVcGWw1gAAAABJRU5ErkJggg==
 </value>
  </data>
  <data name="watermeterPictureBox4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAACYAAAAeCAYAAABAFGxuAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAIfSURBVFhH7dexS2pRHAfw0wukyUChpUkRoqFVF5fGApHW
-        N8TL1cE50L9AHBoFHaPVNWrQFh1cHk+CBwqXtzwIgmqqll/fc+65eo/3p2Xee23owMfi/s79/b54L3Wv
-        sCyLPqrZbJIQwhdcf7fvYNO4/m6fCLYG20vapF6vR6PRiJ0jfSJYBGhJ9yAokUhQvV5nZ60omEP2y1Ay
-        maRisWjMWihYqVRCIz+DOdpg33udTkfNwu/eG3O2H8A19ksa1kHNkx9VkKnf8we4hn4awTjYpT74VYQY
-        rNHo0+7uI1vzCjFYJnNP7XZb/eTqphCDSVdXNyrc4eF/tj4xJ1ilcquaBGV//84zc2KFwa6vOxSLvXjm
-        2lYYbGvr2TNzYk6wIDj32N7eA1ufCDHY8bGlQu3sPLF1U4jBqtXf7HFeiMEWMw72Eyr64CrIb1POdyBT
-        Op0myQ6Y0l6BaxCEvyBUBjeUzGUHlM9cFzDdJAgnlMvlPM9+KJlrMBjgH24DJ8iAOVeDIPwC/sUEZXM5
-        hVqtRtlsFiduwplu5KdbENRqtYxADmwx1/SGVCpFkYi8tKfwTzddlh2q2+165jmwzVzcpn6/rxoJsaEb
-        L8O+fPINae7rm84zXtwmR6FQUE2FONBDFnEC9vP8rMvnhlPMxW1yGw6HFI/H1QAhzjUuiCT/7Mj6kTon
-        n8+zPTk43VzcJk65XMZAGW6+aDSKx5sY22M2i94AIhVFdRKKXCQAAAAASUVORK5CYII=
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIGSURBVFhH7de/SwJhGAfwtwJpUlBwaVIEcXDVxcUxQaS1
+        QdLVwTnQv0AcGgUdo9U1dNAWHVwiEQKFaAkCwZqq5el53rvT03v8cXqeDQ0fjXu97/PFO+w9MZlMYFO1
+        Wg2EEJbg8vX+iy3i8vW2KHaEznbkgm63C6PRiJ1DtijmQLCjMRLg8/mgUqmwsw5UTEN5UfD7/ZDL5eZm
+        mSqWz+cxyMpimhZS7r12uy1n4d/GG3O5Y8QFWyWCTpCcRy8lRK3XeUJcoJVGaFrsXj34V9hYrFrtQSj0
+        wa4Z2VgsGh1Dq9WS79z6PBuLkUbjQZZLJN7Y9ZkVxYrFgQzZl3j83TBz5oDFms02uN3fhrmKAxbzer8M
+        M2dWFNsH7R4Lh+mXnf+MwsZi6fSLLBUMfrLr82wsVio9ssd5NhYzZ1rsEhXVg4dA3ybN12CnSCQCRCkY
+        UP0gLmAfnpGQHfQM+zGlIO257hAXZLUMJJPJuQ6yx+KBfr+P/3CreAIVTOoC9uEK8Q8mS3ew5XIZYrEY
+        nuhCN2qQlQZIQL1eZ+ev3VoHAgFwOOjSXqNXNXRXSqlOp8POJBvt+Xu9ngwS4lQN3oVy+egJybLHt2w2
+        K0OFOFeHmJFByn5+2eXTM1WMDIdD8Hg8coAQtyquCKGfHVq/kOekUik2k2O6mKZQKOBAKrea0+nE7Y2b
+        zVhuAr/Ce2bVcGWw1gAAAABJRU5ErkJggg==
 </value>
  </data>
  <data name="watermeterPictureBox5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAACYAAAAeCAYAAABAFGxuAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAIfSURBVFhH7dexS2pRHAfw0wukyUChpUkRoqFVF5fGApHW
-        N8TL1cE50L9AHBoFHaPVNWrQFh1cHk+CBwqXtzwIgmqqll/fc+65eo/3p2Xee23owMfi/s79/b54L3Wv
-        sCyLPqrZbJIQwhdcf7fvYNO4/m6fCLYG20vapF6vR6PRiJ0jfSJYBGhJ9yAokUhQvV5nZ60omEP2y1Ay
-        maRisWjMWihYqVRCIz+DOdpg33udTkfNwu/eG3O2H8A19ksa1kHNkx9VkKnf8we4hn4awTjYpT74VYQY
-        rNHo0+7uI1vzCjFYJnNP7XZb/eTqphCDSVdXNyrc4eF/tj4xJ1ilcquaBGV//84zc2KFwa6vOxSLvXjm
-        2lYYbGvr2TNzYk6wIDj32N7eA1ufCDHY8bGlQu3sPLF1U4jBqtXf7HFeiMEWMw72Eyr64CrIb1POdyBT
-        Op0myQ6Y0l6BaxCEvyBUBjeUzGUHlM9cFzDdJAgnlMvlPM9+KJlrMBjgH24DJ8iAOVeDIPwC/sUEZXM5
-        hVqtRtlsFiduwplu5KdbENRqtYxADmwx1/SGVCpFkYi8tKfwTzddlh2q2+165jmwzVzcpn6/rxoJsaEb
-        L8O+fPINae7rm84zXtwmR6FQUE2FONBDFnEC9vP8rMvnhlPMxW1yGw6HFI/H1QAhzjUuiCT/7Mj6kTon
-        n8+zPTk43VzcJk65XMZAGW6+aDSKx5sY22M2i94AIhVFdRKKXCQAAAAASUVORK5CYII=
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIGSURBVFhH7de/SwJhGAfwtwJpUlBwaVIEcXDVxcUxQaS1
+        QdLVwTnQv0AcGgUdo9U1dNAWHVwiEQKFaAkCwZqq5el53rvT03v8cXqeDQ0fjXu97/PFO+w9MZlMYFO1
+        Wg2EEJbg8vX+iy3i8vW2KHaEznbkgm63C6PRiJ1DtijmQLCjMRLg8/mgUqmwsw5UTEN5UfD7/ZDL5eZm
+        mSqWz+cxyMpimhZS7r12uy1n4d/GG3O5Y8QFWyWCTpCcRy8lRK3XeUJcoJVGaFrsXj34V9hYrFrtQSj0
+        wa4Z2VgsGh1Dq9WS79z6PBuLkUbjQZZLJN7Y9ZkVxYrFgQzZl3j83TBz5oDFms02uN3fhrmKAxbzer8M
+        M2dWFNsH7R4Lh+mXnf+MwsZi6fSLLBUMfrLr82wsVio9ssd5NhYzZ1rsEhXVg4dA3ybN12CnSCQCRCkY
+        UP0gLmAfnpGQHfQM+zGlIO257hAXZLUMJJPJuQ6yx+KBfr+P/3CreAIVTOoC9uEK8Q8mS3ew5XIZYrEY
+        nuhCN2qQlQZIQL1eZ+ev3VoHAgFwOOjSXqNXNXRXSqlOp8POJBvt+Xu9ngwS4lQN3oVy+egJybLHt2w2
+        K0OFOFeHmJFByn5+2eXTM1WMDIdD8Hg8coAQtyquCKGfHVq/kOekUik2k2O6mKZQKOBAKrea0+nE7Y2b
+        zVhuAr/Ce2bVcGWw1gAAAABJRU5ErkJggg==
 </value>
  </data>
  <data name="watermeterPictureBox6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAACYAAAAeCAYAAABAFGxuAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAIfSURBVFhH7dexS2pRHAfw0wukyUChpUkRoqFVF5fGApHW
-        N8TL1cE50L9AHBoFHaPVNWrQFh1cHk+CBwqXtzwIgmqqll/fc+65eo/3p2Xee23owMfi/s79/b54L3Wv
-        sCyLPqrZbJIQwhdcf7fvYNO4/m6fCLYG20vapF6vR6PRiJ0jfSJYBGhJ9yAokUhQvV5nZ60omEP2y1Ay
-        maRisWjMWihYqVRCIz+DOdpg33udTkfNwu/eG3O2H8A19ksa1kHNkx9VkKnf8we4hn4awTjYpT74VYQY
-        rNHo0+7uI1vzCjFYJnNP7XZb/eTqphCDSVdXNyrc4eF/tj4xJ1ilcquaBGV//84zc2KFwa6vOxSLvXjm
-        2lYYbGvr2TNzYk6wIDj32N7eA1ufCDHY8bGlQu3sPLF1U4jBqtXf7HFeiMEWMw72Eyr64CrIb1POdyBT
-        Op0myQ6Y0l6BaxCEvyBUBjeUzGUHlM9cFzDdJAgnlMvlPM9+KJlrMBjgH24DJ8iAOVeDIPwC/sUEZXM5
-        hVqtRtlsFiduwplu5KdbENRqtYxADmwx1/SGVCpFkYi8tKfwTzddlh2q2+165jmwzVzcpn6/rxoJsaEb
-        L8O+fPINae7rm84zXtwmR6FQUE2FONBDFnEC9vP8rMvnhlPMxW1yGw6HFI/H1QAhzjUuiCT/7Mj6kTon
-        n8+zPTk43VzcJk65XMZAGW6+aDSKx5sY22M2i94AIhVFdRKKXCQAAAAASUVORK5CYII=
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIGSURBVFhH7de/SwJhGAfwtwJpUlBwaVIEcXDVxcUxQaS1
+        QdLVwTnQv0AcGgUdo9U1dNAWHVwiEQKFaAkCwZqq5el53rvT03v8cXqeDQ0fjXu97/PFO+w9MZlMYFO1
+        Wg2EEJbg8vX+iy3i8vW2KHaEznbkgm63C6PRiJ1DtijmQLCjMRLg8/mgUqmwsw5UTEN5UfD7/ZDL5eZm
+        mSqWz+cxyMpimhZS7r12uy1n4d/GG3O5Y8QFWyWCTpCcRy8lRK3XeUJcoJVGaFrsXj34V9hYrFrtQSj0
+        wa4Z2VgsGh1Dq9WS79z6PBuLkUbjQZZLJN7Y9ZkVxYrFgQzZl3j83TBz5oDFms02uN3fhrmKAxbzer8M
+        M2dWFNsH7R4Lh+mXnf+MwsZi6fSLLBUMfrLr82wsVio9ssd5NhYzZ1rsEhXVg4dA3ybN12CnSCQCRCkY
+        UP0gLmAfnpGQHfQM+zGlIO257hAXZLUMJJPJuQ6yx+KBfr+P/3CreAIVTOoC9uEK8Q8mS3ew5XIZYrEY
+        nuhCN2qQlQZIQL1eZ+ev3VoHAgFwOOjSXqNXNXRXSqlOp8POJBvt+Xu9ngwS4lQN3oVy+egJybLHt2w2
+        K0OFOFeHmJFByn5+2eXTM1WMDIdD8Hg8coAQtyquCKGfHVq/kOekUik2k2O6mKZQKOBAKrea0+nE7Y2b
+        zVhuAr/Ce2bVcGWw1gAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="flowMeterPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACYAAAAmCAYAAACoPemuAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAN+SURBVFhHtZi5SgRBEIbbW8QjkRXBKxPWEwRF1EjQSBDE
+        RFBxDdRdEDxBUDDyJXwBH8DAzNxQQdDIR9g3aOfv3emp6qkd5zL4PHqqqn/6qO5qVa1WdVwqlYpWSqVG
+        iumztrZm2NraqtlLRo3IW9j6+rphZGQkbO8aS3x8fOiDg4Owc0ImJib04+OjjYvR8Tk5OeH2VIBEuVzm
+        DqC9XauODq3u76MZH6/Zuf4en5+f+ufnx7Czs8O+tba2RgsbR2DiYNjb0+ruThbSCPj097M46ByiNjY2
+        WPvKyopZa6Kwl5cXY2AdOju1mp+XO03C7q5WU1NMiM/g4KD++vrSs7OzjYUxUZg2qZMsjI0xUT09PXZa
+        8T80hISFpu/8XA6ehclJ1kdLS0u0MLbQMVL/IWpxMeiD0Oktl+/vb6vFCkNKsIZYU1LQrFBRXV21NjKt
+        T09PYWEsT+Wx0F28HGbjg+vr4BtpDwmjH1nAPFhYCGJjpKgogIGofz87OwuEsV2InEOdsrK0FMT2dp9o
+        A3wbDytsYGCg1ogFf3srO6bB2X3q5ka2A9vb1s4Ks45xjpm4zM0FcbGZrq5kO5/9fWtfLBYdYZJDGpaX
+        g5i9vbKNRP1cLRQKWnV3d+crbHo6iAeSLI26sKamJvwmQSTjJHjnnI2FG8LFhWzXCH4TsX/IxnGhO7uv
+        T7b5C1HYzIxsHAc6UkCyiUOuI+ZeY5JOHyU3YXT3pZ0+ChWWOl3QPIWFLtkkpS7MpAsmDHcxycHFzeiX
+        l7JdEo6PtWpuNvGssC4crOgAiiUnCj37kDzzOsJI5n94eKgJGxoaCjqLOsTpLSHvO5sf18PMIn68vr4G
+        H1DNSI7u9P119iUBxUc9LgoRKwyYg9PvFNUMdaQ3T1xdom4JaSAz9vz8zIWhQrad47zznaTrcJ6cntr4
+        o6OjRgsTZv7xBQDPKPI6nAcofuo7Eby/v8vCULa3tbVxMUC6DmcFy4X0sedtOqqFCbONxMEgBc6C8x5S
+        KpXCGtwG9y3BgGmVOkgD1hSZPuBqAEwYfXVB2Y4KmQbIVNYhJQwPs3iHh4dMDMUKo+9TeODw21Eh02AG
+        FA7I1JIAytERy+gUd025GGGbm5vMCa8uvgHKdlTI9LsFR1gUzpQBpAS6+xqh7JunR4cX7O3tTTQEq6ur
+        rJOk+MkzDp59zYlOXyP+83GYU9W/sZE2jpG87/4AAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACYAAAAjCAYAAAD48HgdAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAN0SURBVFhHxZg5SDNBGIZHiTZBEA9UEESE2ARvxIMIVuJV
+        qY0iKoithSBok87CIFgZwUIQlEDEo7EQBRuJKNiYSsFSsDJaeRTf7zvLbvb4drObqH/xNNmZ93symWsj
+        UqkU6RkeHiYhxH9B72ERA1NTU2zH3+T29tbgwIqdnp7KxvPzgoh+j89PQUVFgmZnZy0OrBg4OzuTcuEw
+        H5orT0/KSE1OTrL1bcXAxcWF7Hxzw4fnAnILCwvZusBRDAQCARny9sYXyIbVVWcpkFEMBINBKijgi3hl
+        eVkZrYeHB7aWiisxdb5VVvLF3ILFhJyRkRG2jh5XYiAej8vQtTW+qBuqqwUNDQ2x+WZci4GlpSUpt7nJ
+        F7bj40NQcbGg/v5+NpfDkxhoaGiQcqkUL8GB9kofPpPDsxioqKiQhd7feRE9h4eC8vPz6erqSuu/sbFB
+        VVVVEp/Pp4mD7u5u2SYrsUQiIUP8fl5GZXtbKZZMJi0ZJycn37t+kZRWpe7u7rTnWYmBo6MjGeY03/C8
+        tbVV6zM3N0dtbW2aiMri4qL8svr8rMWAWiQWs0oFg4La29tpfHycxsbGDCItLS20srIin4XDYTY7JzFQ
+        X18vix0cpKUCAeOIgNHRUZqentb6mUfITM5ioLa2lpqarDJYJJ2dnWyfTGQthvsTMMuocH284Flsd3eX
+        SktLKS8vzyLz/CyorOwPxSYmJqirq8sigom7t7cnf8re3vQcwzN8xmW5xVZsZmZGHracTCQS0dph8vf0
+        pKUAFgLa4pk+0wsGMezIjY2NFpm+vj65tPVtQU1NDYVCRikVbCHou7W1ZennBoOYuvQBNkanm8Dx8bFs
+        hyOHEwN1dUoWNmMuwwmDWHNzM0WjUUMDDvV+lkjwQnpwbPn9fnp8fGSz7HA1+fXEYjEplUzyImZw0KM9
+        9jQuzw7PYpiD5eWCvr54EY54XJHDlYnL5PAk1tHR8T0P+eKZiEYVOYw4l23GtRjOOgRzRd0yMKDI7e/v
+        szX0uBI7Pz+XgevrfEEv4IUGWVwdPRnF7u/vZdDODl8oG3w+XIuCbD0VR7HLy0t5JuqvND/B66syaniZ
+        5uoCR7FQKCQDXl74ArkQiSjvAtfX12xtW7HBwUEqKfG2LXgFf9jgi2PDNtdnxRYWFmQHnHe/jd1isIip
+        b0B/Df4sTHuk6B/rrIep2LXHGgAAAABJRU5ErkJggg==
 </value>
  </data>
 </root>
--- a/TestBenchFramework/pic/flowmeter.png
+++ b/TestBenchFramework/pic/flowmeter.png
--- a/TestBenchFramework/pic/regulvalve.png
+++ b/TestBenchFramework/pic/regulvalve.png
--- a/TestBenchFramework/pic/reservoir.png
+++ b/TestBenchFramework/pic/reservoir.png
--- a/TestBenchFramework/pic/valve-closed.png
+++ b/TestBenchFramework/pic/valve-closed.png
--- a/TestBenchFramework/pic/valve-open.png
+++ b/TestBenchFramework/pic/valve-open.png
--- a/TestBenchFramework/pic/watermeter.png
+++ b/TestBenchFramework/pic/watermeter.png