DataEntry.Standard form for TestStartEnd.

TestBenchFramework/BenchControl/DataEntry/Standard/EntryForm.cs

@@ -123,13 +123,13 @@ namespace TBF.BenchControl.DataEntry.Standard
 		///
 		void OpenTestStartStatesDlg(EntryForm myRef)
 		{
-			myRef.modelessDlg = new TestStartForm(Program.WMsCount, entryFormCfg.Units);
+			myRef.modelessDlg = new TestStartEndForm(Program.WMsCount, disabled);
 			modelessDlg.Show();
 		}
 		///
 		void OpenTestEndStatesDlg(EntryForm myRef)
 		{
-			myRef.modelessDlg = new TestEndForm(Program.WMsCount, entryFormCfg.Units, wmStartStateStr);
+			myRef.modelessDlg = new TestStartEndForm(Program.WMsCount, wmStartStateStr, disabled);
 			modelessDlg.Show();
 		}
 
@@ -202,9 +202,9 @@ namespace TBF.BenchControl.DataEntry.Standard
 						wmStartStateStr[i] = dlg.WMStartStateStr[i];
 					}
 				}
-				else if (modelessDlg is TestEndForm)
+				else if (modelessDlg is TestStartEndForm)
 				{
-					TestEndForm dlg = (modelessDlg as TestEndForm);
+					TestStartEndForm dlg = (modelessDlg as TestStartEndForm);
 
 					for (int i = 0; i < dlg.WaterMetersCount; i++)
 					{

TestBenchFramework/BenchControl/DataEntry/Standard/TestEndForm.cs

@@ -1,158 +0,0 @@
-///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
-///
-using System;
-using System.Windows.Forms;
-using log4net;
-using TBF.Resources;
-
-namespace TBF.BenchControl.DataEntry.Standard
-{
-	public partial class TestEndForm : Form, GenericDevices.IHasCompleted
-    {
-		private static readonly ILog log = LogManager.GetLogger(typeof(TestEndForm));
-
-		/// <summary> Number of text boxes for serial numbers </summary>
-        public readonly int WaterMetersCount;
-		public readonly Entities.UnitsVolume Units;
-
-		// To be retrieved after the form closes
-		public readonly string[] WMStartStateStr;
-
-		// To be retrieved after the form closes
-        public float[] WMEndState;
-
-		// Set to 'true' when the form closes
-        public bool Completed { get { return completed; } }
-		bool completed;
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
-		public TestEndForm(int waterMetersCount, Entities.UnitsVolume units, string[] wmStartStateStr)
-        {
-            this.WaterMetersCount = waterMetersCount;
-			this.Units = units;
-			this.WMStartStateStr = wmStartStateStr;
-			if (wmStartStateStr == null || wmStartStateStr.Length != WaterMetersCount)
-				throw (new Exception("Invalid 3rd argument"));
-            InitializeComponent();
-            WMEndState = new float[WaterMetersCount];
-            completed = false;
-			StartForceCloseHandler();
-		}
-
-        /// <summary> Parameterless constructor for all watermeters </summary>
-        public TestEndForm()
-			: this(Program.WMsCount, Entities.UnitsVolume.CubicMtr, new string[Program.WMsCount])
-        {
-			for (int i = 0; i < Program.WMsCount; i++) WMStartStateStr[i] = string.Empty;
-		}
-
-		private void CycleEndForm_Load(object sender, EventArgs e)
-		{
-            Localize();
-
-            Height = 95 + 90 * WaterMetersCount;
-
-			groupBox1.Visible = false;
-			groupBox2.Visible = false;
-			groupBox3.Visible = false;
-			groupBox4.Visible = false;
-			groupBox5.Visible = false;
-			groupBox6.Visible = false;
-
-			if (WaterMetersCount >= 1)
-			{
-				groupBox1.Visible = true;
-				wmStartStateTextBox1.Text = WMStartStateStr[0];
-			}
-			if (WaterMetersCount >= 2)
-			{
-				groupBox2.Visible = true;
-				wmStartStateTextBox2.Text = WMStartStateStr[1];
-			}
-			if (WaterMetersCount >= 3)
-			{
-				groupBox3.Visible = true;
-				wmStartStateTextBox3.Text = WMStartStateStr[2];
-			}
-			if (WaterMetersCount >= 4)
-			{
-				groupBox4.Visible = true;
-				wmStartStateTextBox4.Text = WMStartStateStr[3];
-			}
-			if (WaterMetersCount >= 5)
-			{
-				groupBox5.Visible = true;
-				wmStartStateTextBox5.Text = WMStartStateStr[4];
-			}
-			if (WaterMetersCount >= 6)
-			{
-				groupBox6.Visible = true;
-				wmStartStateTextBox6.Text = WMStartStateStr[5];
-			}
-		}
-
-		void Localize()
-		{
-			Text = Strings.Water_Meter_States;
-			groupBox1.Text = Strings.Water_Meter + " 1";
-			groupBox2.Text = Strings.Water_Meter + " 2";
-			groupBox3.Text = Strings.Water_Meter + " 3";
-			groupBox4.Text = Strings.Water_Meter + " 4";
-			groupBox5.Text = Strings.Water_Meter + " 5";
-			groupBox6.Text = Strings.Water_Meter + " 6";
-			wmStateLabel1.Text = Strings.WMState;
-			wmStateLabel2.Text = Strings.WMState;
-			wmStateLabel3.Text = Strings.WMState;
-			wmStateLabel4.Text = Strings.WMState;
-			wmStateLabel5.Text = Strings.WMState;
-			wmStateLabel6.Text = Strings.WMState;
-			okButton.Text = Strings.OkBtnText;
-		}
-
-		private void okButton_Click(object sender, EventArgs e)
-		{
-            try
-            {
-				/// Factor to convert the entered volume to liters
-				float factor = (Units == Entities.UnitsVolume.CubicMtr) ? 1000.0f : 1.0f;
-
-                if (WaterMetersCount >= 1) WMEndState[0] = factor * Utils.ParseUFloat(wmEndStateTextBox1.Text);
-				if (WaterMetersCount >= 2) WMEndState[1] = factor * Utils.ParseUFloat(wmEndStateTextBox2.Text);
-				if (WaterMetersCount >= 3) WMEndState[2] = factor * Utils.ParseUFloat(wmEndStateTextBox3.Text);
-				if (WaterMetersCount >= 4) WMEndState[3] = factor * Utils.ParseUFloat(wmEndStateTextBox4.Text);
-				if (WaterMetersCount >= 5) WMEndState[4] = factor * Utils.ParseUFloat(wmEndStateTextBox5.Text);
-				if (WaterMetersCount >= 6) WMEndState[5] = factor * Utils.ParseUFloat(wmEndStateTextBox6.Text);
-            }
-            catch
-            {
-                return;
-            }
-
-			completed = true;
-			Close();
-		}
-
-		#region Forced close handling
-
-		public void StartForceCloseHandler()
-		{
-			UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args)
-			{
-				if (InvokeRequired) { Invoke(new EventHandler<EventArgs>(OnForceClose), sender, args); }
-				else OnForceClose(sender, args);
-			};
-		}
-
-		void OnForceClose(object sender, EventArgs args)
-		{
-			DialogResult = DialogResult.Cancel;
-			Close();
-		}
-
-		#endregion
-	}
-}

TestBenchFramework/BenchControl/DataEntry/Standard/TestStartEndForm.cs

@@ -0,0 +1,188 @@
+///
+/// Copyright (c) 2013-2015 Sensus Metering Systems
+///
+using System;
+using System.Windows.Forms;
+using log4net;
+using TBF.Resources;
+
+namespace TBF.BenchControl.DataEntry.Standard
+{
+	public partial class TestStartEndForm : Form, GenericDevices.IHasCompleted
+    {
+		private static readonly ILog log = LogManager.GetLogger(typeof(TestStartEndForm));
+
+		// Set to 'true' when the form closes
+		public bool Completed { get { return completed; } }
+		bool completed;
+
+		/// <summary> Number of text boxes for serial numbers </summary>
+        public readonly int WaterMetersCount;
+
+		readonly bool[] disabled;
+
+		// To be retrieved after the form closes
+		public float[] WMStartState;
+
+		// To be retrieved after the form closes
+		public readonly string[] WMStartStateStr;
+
+		// To be retrieved after the form closes
+        public float[] WMEndState;
+
+		bool endStates;
+
+		/// <summary>
+		/// Constructor to fill in start states
+		/// </summary>
+		/// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
+		public TestStartEndForm(int waterMetersCount, bool[] disabled)
+		{
+			endStates = false;
+
+			this.WaterMetersCount = waterMetersCount;
+			this.disabled = disabled;
+
+			InitializeComponent();
+			WMStartState = new float[waterMetersCount];
+			completed = false;
+			StartForceCloseHandler();
+		}
+
+        /// <summary>
+        /// Constructor to fill in end states
+        /// </summary>
+        /// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
+		public TestStartEndForm(int waterMetersCount, string[] wmStartStateStr, bool[] disabled)
+        {
+			endStates = true;
+
+			this.WaterMetersCount = waterMetersCount;
+			this.WMStartStateStr = wmStartStateStr;
+			if (wmStartStateStr == null || wmStartStateStr.Length != waterMetersCount)
+				throw (new Exception("Invalid 'wmStartStateStr' argument"));
+			this.disabled = disabled;
+
+			InitializeComponent();
+            WMEndState = new float[waterMetersCount];
+            completed = false;
+			StartForceCloseHandler();
+		}
+
+        /// <summary> Parameterless constructor for all watermeters </summary>
+        public TestStartEndForm()
+			: this(Program.WMsCount, null)
+        {
+		}
+
+		private void CycleEndForm_Load(object sender, EventArgs e)
+		{
+            Localize();
+
+            Height = 115 + 90 * WaterMetersCount;
+
+			if (WaterMetersCount < 1) groupBox1.Visible = false;
+			if (WaterMetersCount < 2) groupBox2.Visible = false;
+			if (WaterMetersCount < 3) groupBox3.Visible = false;
+			if (WaterMetersCount < 4) groupBox4.Visible = false;
+			if (WaterMetersCount < 5) groupBox5.Visible = false;
+			if (WaterMetersCount < 6) groupBox6.Visible = false;
+
+			if (endStates)
+			{
+				if (WaterMetersCount >= 1) wmStartStateTextBox1.Text = WMStartStateStr[0];
+				if (WaterMetersCount >= 2) wmStartStateTextBox2.Text = WMStartStateStr[1];
+				if (WaterMetersCount >= 3) wmStartStateTextBox3.Text = WMStartStateStr[2];
+				if (WaterMetersCount >= 4) wmStartStateTextBox4.Text = WMStartStateStr[3];
+				if (WaterMetersCount >= 5) wmStartStateTextBox5.Text = WMStartStateStr[4];
+				if (WaterMetersCount >= 6) wmStartStateTextBox6.Text = WMStartStateStr[5];
+				wmEndStateTextBox1.Enabled = (disabled == null || disabled.Length < 1 || !disabled[0]);
+				wmEndStateTextBox2.Enabled = (disabled == null || disabled.Length < 2 || !disabled[1]);
+				wmEndStateTextBox3.Enabled = (disabled == null || disabled.Length < 3 || !disabled[2]);
+				wmEndStateTextBox4.Enabled = (disabled == null || disabled.Length < 4 || !disabled[3]);
+				wmEndStateTextBox5.Enabled = (disabled == null || disabled.Length < 5 || !disabled[4]);
+				wmEndStateTextBox6.Enabled = (disabled == null || disabled.Length < 6 || !disabled[5]);
+			}
+			else
+			{
+				wmStartStateTextBox1.Enabled = (disabled == null || disabled.Length < 1 || !disabled[0]);
+				wmStartStateTextBox2.Enabled = (disabled == null || disabled.Length < 2 || !disabled[1]);
+				wmStartStateTextBox3.Enabled = (disabled == null || disabled.Length < 3 || !disabled[2]);
+				wmStartStateTextBox4.Enabled = (disabled == null || disabled.Length < 4 || !disabled[3]);
+				wmStartStateTextBox5.Enabled = (disabled == null || disabled.Length < 5 || !disabled[4]);
+				wmStartStateTextBox6.Enabled = (disabled == null || disabled.Length < 6 || !disabled[5]);
+			}
+		}
+
+		void Localize()
+		{
+			Text = Strings.Water_Meter_States;
+			groupBox1.Text = Strings.Water_Meter + " 1";
+			groupBox2.Text = Strings.Water_Meter + " 2";
+			groupBox3.Text = Strings.Water_Meter + " 3";
+			groupBox4.Text = Strings.Water_Meter + " 4";
+			groupBox5.Text = Strings.Water_Meter + " 5";
+			groupBox6.Text = Strings.Water_Meter + " 6";
+			wmStateLabel1.Text = Strings.WMState;
+			wmStateLabel2.Text = Strings.WMState;
+			wmStateLabel3.Text = Strings.WMState;
+			wmStateLabel4.Text = Strings.WMState;
+			wmStateLabel5.Text = Strings.WMState;
+			wmStateLabel6.Text = Strings.WMState;
+			startLabel.Text = Strings.Start;
+			endLabel.Text = Strings.End;
+			okButton.Text = Strings.OkBtnText;
+		}
+
+		private void okButton_Click(object sender, EventArgs e)
+		{
+            try
+            {
+				if (endStates)
+				{
+					if (wmEndStateTextBox1.Enabled) WMEndState[0] = Utils.ParseUFloat(wmEndStateTextBox1.Text);
+					if (wmEndStateTextBox2.Enabled) WMEndState[1] = Utils.ParseUFloat(wmEndStateTextBox2.Text);
+					if (wmEndStateTextBox3.Enabled) WMEndState[2] = Utils.ParseUFloat(wmEndStateTextBox3.Text);
+					if (wmEndStateTextBox4.Enabled) WMEndState[3] = Utils.ParseUFloat(wmEndStateTextBox4.Text);
+					if (wmEndStateTextBox5.Enabled) WMEndState[4] = Utils.ParseUFloat(wmEndStateTextBox5.Text);
+					if (wmEndStateTextBox6.Enabled) WMEndState[5] = Utils.ParseUFloat(wmEndStateTextBox6.Text);
+				}
+				else
+				{
+					if (wmStartStateTextBox1.Enabled) WMStartState[0] = Utils.ParseUFloat(wmStartStateTextBox1.Text);
+					if (wmStartStateTextBox2.Enabled) WMStartState[1] = Utils.ParseUFloat(wmStartStateTextBox2.Text);
+					if (wmStartStateTextBox3.Enabled) WMStartState[2] = Utils.ParseUFloat(wmStartStateTextBox3.Text);
+					if (wmStartStateTextBox4.Enabled) WMStartState[3] = Utils.ParseUFloat(wmStartStateTextBox4.Text);
+					if (wmStartStateTextBox5.Enabled) WMStartState[4] = Utils.ParseUFloat(wmStartStateTextBox5.Text);
+					if (wmStartStateTextBox6.Enabled) WMStartState[5] = Utils.ParseUFloat(wmStartStateTextBox6.Text);
+				}
+			}
+            catch
+            {
+                return;
+            }
+
+			completed = true;
+			Close();
+		}
+
+		#region Forced close handling
+
+		public void StartForceCloseHandler()
+		{
+			UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args)
+			{
+				if (InvokeRequired) { Invoke(new EventHandler<EventArgs>(OnForceClose), sender, args); }
+				else OnForceClose(sender, args);
+			};
+		}
+
+		void OnForceClose(object sender, EventArgs args)
+		{
+			DialogResult = DialogResult.Cancel;
+			Close();
+		}
+
+		#endregion
+	}
+}

TestBenchFramework/BenchControl/DataEntry/Standard/TestStartEndForm.designer.cs

@@ -3,7 +3,7 @@
 ///
 namespace TBF.BenchControl.DataEntry.Standard
 {
-    partial class TestEndForm
+    partial class TestStartEndForm
     {
         /// <summary>
         /// Required designer variable.
@@ -56,6 +56,8 @@ namespace TBF.BenchControl.DataEntry.Standard
 			this.wmStartStateTextBox6 = new System.Windows.Forms.TextBox();
 			this.wmEndStateTextBox6 = new System.Windows.Forms.TextBox();
 			this.wmStateLabel6 = new System.Windows.Forms.Label();
+			this.startLabel = new System.Windows.Forms.Label();
+			this.endLabel = new System.Windows.Forms.Label();
 			this.groupBox2.SuspendLayout();
 			this.groupBox1.SuspendLayout();
 			this.groupBox3.SuspendLayout();
@@ -71,7 +73,7 @@ namespace TBF.BenchControl.DataEntry.Standard
 			this.groupBox2.Controls.Add(this.wmStateLabel2);
 			this.groupBox2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
 			this.groupBox2.ForeColor = System.Drawing.Color.Black;
-			this.groupBox2.Location = new System.Drawing.Point(25, 102);
+			this.groupBox2.Location = new System.Drawing.Point(25, 122);
 			this.groupBox2.Name = "groupBox2";
 			this.groupBox2.Size = new System.Drawing.Size(538, 81);
 			this.groupBox2.TabIndex = 2;
@@ -81,14 +83,15 @@ namespace TBF.BenchControl.DataEntry.Standard
 			// wmStartStateTextBox2
 			// 
 			this.wmStartStateTextBox2.Enabled = false;
-			this.wmStartStateTextBox2.Location = new System.Drawing.Point(174, 31);
+			this.wmStartStateTextBox2.Location = new System.Drawing.Point(164, 31);
 			this.wmStartStateTextBox2.Name = "wmStartStateTextBox2";
 			this.wmStartStateTextBox2.Size = new System.Drawing.Size(163, 31);
 			this.wmStartStateTextBox2.TabIndex = 3;
 			// 
 			// wmEndStateTextBox2
 			// 
-			this.wmEndStateTextBox2.Location = new System.Drawing.Point(355, 31);
+			this.wmEndStateTextBox2.Enabled = false;
+			this.wmEndStateTextBox2.Location = new System.Drawing.Point(350, 31);
 			this.wmEndStateTextBox2.Name = "wmEndStateTextBox2";
 			this.wmEndStateTextBox2.Size = new System.Drawing.Size(163, 31);
 			this.wmEndStateTextBox2.TabIndex = 1;
@@ -109,7 +112,7 @@ namespace TBF.BenchControl.DataEntry.Standard
 			this.groupBox1.Controls.Add(this.wmStateLabel1);
 			this.groupBox1.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
 			this.groupBox1.ForeColor = System.Drawing.Color.Black;
-			this.groupBox1.Location = new System.Drawing.Point(25, 12);
+			this.groupBox1.Location = new System.Drawing.Point(25, 32);
 			this.groupBox1.Name = "groupBox1";
 			this.groupBox1.Size = new System.Drawing.Size(538, 81);
 			this.groupBox1.TabIndex = 1;
@@ -119,14 +122,15 @@ namespace TBF.BenchControl.DataEntry.Standard
 			// wmStartStateTextBox1
 			// 
 			this.wmStartStateTextBox1.Enabled = false;
-			this.wmStartStateTextBox1.Location = new System.Drawing.Point(174, 31);
+			this.wmStartStateTextBox1.Location = new System.Drawing.Point(164, 31);
 			this.wmStartStateTextBox1.Name = "wmStartStateTextBox1";
 			this.wmStartStateTextBox1.Size = new System.Drawing.Size(163, 31);
 			this.wmStartStateTextBox1.TabIndex = 2;
 			// 
 			// wmEndStateTextBox1
 			// 
-			this.wmEndStateTextBox1.Location = new System.Drawing.Point(355, 31);
+			this.wmEndStateTextBox1.Enabled = false;
+			this.wmEndStateTextBox1.Location = new System.Drawing.Point(350, 31);
 			this.wmEndStateTextBox1.Name = "wmEndStateTextBox1";
 			this.wmEndStateTextBox1.Size = new System.Drawing.Size(163, 31);
 			this.wmEndStateTextBox1.TabIndex = 1;
@@ -144,7 +148,7 @@ namespace TBF.BenchControl.DataEntry.Standard
 			// 
 			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(593, 26);
+			this.okButton.Location = new System.Drawing.Point(593, 46);
 			this.okButton.Name = "okButton";
 			this.okButton.Size = new System.Drawing.Size(98, 63);
 			this.okButton.TabIndex = 7;
@@ -159,7 +163,7 @@ namespace TBF.BenchControl.DataEntry.Standard
 			this.groupBox3.Controls.Add(this.wmStateLabel3);
 			this.groupBox3.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
 			this.groupBox3.ForeColor = System.Drawing.Color.Black;
-			this.groupBox3.Location = new System.Drawing.Point(25, 192);
+			this.groupBox3.Location = new System.Drawing.Point(25, 212);
 			this.groupBox3.Name = "groupBox3";
 			this.groupBox3.Size = new System.Drawing.Size(538, 81);
 			this.groupBox3.TabIndex = 3;
@@ -169,14 +173,15 @@ namespace TBF.BenchControl.DataEntry.Standard
 			// wmStartStateTextBox3
 			// 
 			this.wmStartStateTextBox3.Enabled = false;
-			this.wmStartStateTextBox3.Location = new System.Drawing.Point(174, 31);
+			this.wmStartStateTextBox3.Location = new System.Drawing.Point(164, 31);
 			this.wmStartStateTextBox3.Name = "wmStartStateTextBox3";
 			this.wmStartStateTextBox3.Size = new System.Drawing.Size(163, 31);
 			this.wmStartStateTextBox3.TabIndex = 4;
 			// 
 			// wmEndStateTextBox3
 			// 
-			this.wmEndStateTextBox3.Location = new System.Drawing.Point(355, 31);
+			this.wmEndStateTextBox3.Enabled = false;
+			this.wmEndStateTextBox3.Location = new System.Drawing.Point(350, 31);
 			this.wmEndStateTextBox3.Name = "wmEndStateTextBox3";
 			this.wmEndStateTextBox3.Size = new System.Drawing.Size(163, 31);
 			this.wmEndStateTextBox3.TabIndex = 1;
@@ -197,7 +202,7 @@ namespace TBF.BenchControl.DataEntry.Standard
 			this.groupBox4.Controls.Add(this.wmStateLabel4);
 			this.groupBox4.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
 			this.groupBox4.ForeColor = System.Drawing.Color.Black;
-			this.groupBox4.Location = new System.Drawing.Point(25, 282);
+			this.groupBox4.Location = new System.Drawing.Point(25, 302);
 			this.groupBox4.Name = "groupBox4";
 			this.groupBox4.Size = new System.Drawing.Size(538, 81);
 			this.groupBox4.TabIndex = 4;
@@ -207,14 +212,15 @@ namespace TBF.BenchControl.DataEntry.Standard
 			// wmStartStateTextBox4
 			// 
 			this.wmStartStateTextBox4.Enabled = false;
-			this.wmStartStateTextBox4.Location = new System.Drawing.Point(174, 31);
+			this.wmStartStateTextBox4.Location = new System.Drawing.Point(164, 31);
 			this.wmStartStateTextBox4.Name = "wmStartStateTextBox4";
 			this.wmStartStateTextBox4.Size = new System.Drawing.Size(163, 31);
 			this.wmStartStateTextBox4.TabIndex = 4;
 			// 
 			// wmEndStateTextBox4
 			// 
-			this.wmEndStateTextBox4.Location = new System.Drawing.Point(355, 31);
+			this.wmEndStateTextBox4.Enabled = false;
+			this.wmEndStateTextBox4.Location = new System.Drawing.Point(350, 31);
 			this.wmEndStateTextBox4.Name = "wmEndStateTextBox4";
 			this.wmEndStateTextBox4.Size = new System.Drawing.Size(163, 31);
 			this.wmEndStateTextBox4.TabIndex = 1;
@@ -235,7 +241,7 @@ namespace TBF.BenchControl.DataEntry.Standard
 			this.groupBox5.Controls.Add(this.wmStateLabel5);
 			this.groupBox5.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
 			this.groupBox5.ForeColor = System.Drawing.Color.Black;
-			this.groupBox5.Location = new System.Drawing.Point(25, 372);
+			this.groupBox5.Location = new System.Drawing.Point(25, 392);
 			this.groupBox5.Name = "groupBox5";
 			this.groupBox5.Size = new System.Drawing.Size(538, 81);
 			this.groupBox5.TabIndex = 5;
@@ -245,14 +251,15 @@ namespace TBF.BenchControl.DataEntry.Standard
 			// wmStartStateTextBox5
 			// 
 			this.wmStartStateTextBox5.Enabled = false;
-			this.wmStartStateTextBox5.Location = new System.Drawing.Point(174, 31);
+			this.wmStartStateTextBox5.Location = new System.Drawing.Point(164, 31);
 			this.wmStartStateTextBox5.Name = "wmStartStateTextBox5";
 			this.wmStartStateTextBox5.Size = new System.Drawing.Size(163, 31);
 			this.wmStartStateTextBox5.TabIndex = 4;
 			// 
 			// wmEndStateTextBox5
 			// 
-			this.wmEndStateTextBox5.Location = new System.Drawing.Point(355, 31);
+			this.wmEndStateTextBox5.Enabled = false;
+			this.wmEndStateTextBox5.Location = new System.Drawing.Point(350, 31);
 			this.wmEndStateTextBox5.Name = "wmEndStateTextBox5";
 			this.wmEndStateTextBox5.Size = new System.Drawing.Size(163, 31);
 			this.wmEndStateTextBox5.TabIndex = 1;
@@ -273,7 +280,7 @@ namespace TBF.BenchControl.DataEntry.Standard
 			this.groupBox6.Controls.Add(this.wmStateLabel6);
 			this.groupBox6.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
 			this.groupBox6.ForeColor = System.Drawing.Color.Black;
-			this.groupBox6.Location = new System.Drawing.Point(25, 462);
+			this.groupBox6.Location = new System.Drawing.Point(25, 482);
 			this.groupBox6.Name = "groupBox6";
 			this.groupBox6.Size = new System.Drawing.Size(538, 81);
 			this.groupBox6.TabIndex = 6;
@@ -283,14 +290,15 @@ namespace TBF.BenchControl.DataEntry.Standard
 			// wmStartStateTextBox6
 			// 
 			this.wmStartStateTextBox6.Enabled = false;
-			this.wmStartStateTextBox6.Location = new System.Drawing.Point(174, 31);
+			this.wmStartStateTextBox6.Location = new System.Drawing.Point(164, 31);
 			this.wmStartStateTextBox6.Name = "wmStartStateTextBox6";
 			this.wmStartStateTextBox6.Size = new System.Drawing.Size(163, 31);
 			this.wmStartStateTextBox6.TabIndex = 4;
 			// 
 			// wmEndStateTextBox6
 			// 
-			this.wmEndStateTextBox6.Location = new System.Drawing.Point(355, 31);
+			this.wmEndStateTextBox6.Enabled = false;
+			this.wmEndStateTextBox6.Location = new System.Drawing.Point(350, 31);
 			this.wmEndStateTextBox6.Name = "wmEndStateTextBox6";
 			this.wmEndStateTextBox6.Size = new System.Drawing.Size(163, 31);
 			this.wmEndStateTextBox6.TabIndex = 1;
@@ -304,12 +312,34 @@ namespace TBF.BenchControl.DataEntry.Standard
 			this.wmStateLabel6.TabIndex = 0;
 			this.wmStateLabel6.Text = "State:";
 			// 
-			// TestEndForm
+			// startLabel
+			// 
+			this.startLabel.AutoSize = true;
+			this.startLabel.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+			this.startLabel.Location = new System.Drawing.Point(245, 11);
+			this.startLabel.Name = "startLabel";
+			this.startLabel.Size = new System.Drawing.Size(56, 23);
+			this.startLabel.TabIndex = 8;
+			this.startLabel.Text = "Start";
+			// 
+			// endLabel
+			// 
+			this.endLabel.AutoSize = true;
+			this.endLabel.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+			this.endLabel.Location = new System.Drawing.Point(431, 11);
+			this.endLabel.Name = "endLabel";
+			this.endLabel.Size = new System.Drawing.Size(46, 23);
+			this.endLabel.TabIndex = 9;
+			this.endLabel.Text = "End";
+			// 
+			// TestStartEndForm
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.BackColor = System.Drawing.Color.DarkGoldenrod;
-			this.ClientSize = new System.Drawing.Size(718, 565);
+			this.ClientSize = new System.Drawing.Size(718, 586);
+			this.Controls.Add(this.endLabel);
+			this.Controls.Add(this.startLabel);
 			this.Controls.Add(this.groupBox6);
 			this.Controls.Add(this.groupBox5);
 			this.Controls.Add(this.groupBox4);
@@ -318,7 +348,7 @@ namespace TBF.BenchControl.DataEntry.Standard
 			this.Controls.Add(this.groupBox2);
 			this.Controls.Add(this.groupBox1);
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-			this.Name = "TestEndForm";
+			this.Name = "TestStartEndForm";
 			this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
 			this.Text = "End States";
 			this.TopMost = true;
@@ -336,6 +366,7 @@ namespace TBF.BenchControl.DataEntry.Standard
 			this.groupBox6.ResumeLayout(false);
 			this.groupBox6.PerformLayout();
 			this.ResumeLayout(false);
+			this.PerformLayout();
 
         }
 
@@ -366,6 +397,8 @@ namespace TBF.BenchControl.DataEntry.Standard
 		private System.Windows.Forms.TextBox wmStartStateTextBox4;
 		private System.Windows.Forms.TextBox wmStartStateTextBox5;
 		private System.Windows.Forms.TextBox wmStartStateTextBox6;
+		private System.Windows.Forms.Label startLabel;
+		private System.Windows.Forms.Label endLabel;
 
 	}
 }

TestBenchFramework/Resources/Strings.Designer.cs

@@ -708,6 +708,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to End.
+        /// </summary>
+        internal static string End {
+            get {
+                return ResourceManager.GetString("End", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to End State.
         /// </summary>
@@ -2076,6 +2085,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Start.
+        /// </summary>
+        internal static string Start {
+            get {
+                return ResourceManager.GetString("Start", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Start the pump.
         /// </summary>
@@ -2755,7 +2773,7 @@ namespace TBF.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to State:.
+        ///   Looks up a localized string similar to State [liter].
         /// </summary>
         internal static string WMState {
             get {

TestBenchFramework/Resources/Strings.resx

@@ -842,7 +842,7 @@
     <value>S/N:</value>
   </data>
   <data name="WMState" xml:space="preserve">
-    <value>State:</value>
+    <value>State [liter]</value>
   </data>
   <data name="Detection_failed" xml:space="preserve">
     <value>Detection failed</value>
@@ -1027,4 +1027,10 @@
   <data name="TimeFlow2Start_chdr" xml:space="preserve">
     <value>T flow stab. - start [s]</value>
   </data>
+  <data name="End" xml:space="preserve">
+    <value>End</value>
+  </data>
+  <data name="Start" xml:space="preserve">
+    <value>Start</value>
+  </data>
 </root>

TestBenchFramework/TBF.csproj

@@ -150,11 +150,11 @@
       <DependentUpon>AmbientCfgCtrl.cs</DependentUpon>
     </Compile>
     <Compile Include="BenchControl\Ambient\Greco\Factory.cs" />
-    <Compile Include="BenchControl\DataEntry\Standard\TestEndForm.cs">
+    <Compile Include="BenchControl\DataEntry\Standard\TestStartEndForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="BenchControl\DataEntry\Standard\TestEndForm.designer.cs">
+    <Compile Include="BenchControl\DataEntry\Standard\TestStartEndForm.designer.cs">
-      <DependentUpon>TestEndForm.cs</DependentUpon>
+      <DependentUpon>TestStartEndForm.cs</DependentUpon>
     </Compile>
     <Compile Include="BenchControl\DataEntry\Standard\TestStartForm.cs">
       <SubType>Form</SubType>
@@ -1170,8 +1170,8 @@
     <EmbeddedResource Include="BenchControl\DataEntry\Standard\EntryFormCfgCtrl.resx">
       <DependentUpon>EntryFormCfgCtrl.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="BenchControl\DataEntry\Standard\TestEndForm.resx">
+    <EmbeddedResource Include="BenchControl\DataEntry\Standard\TestStartEndForm.resx">
-      <DependentUpon>TestEndForm.cs</DependentUpon>
+      <DependentUpon>TestStartEndForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="BenchControl\DataEntry\Standard\TestStartForm.resx">
       <DependentUpon>TestStartForm.cs</DependentUpon>