From 09254b7065c207b5dfad4b516615b200fdc31b8c Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 26 May 2015 13:47:08 +0200 Subject: [PATCH] More bug fixes (?), version 1.5.49 --- .../DataEntry/Standard24/TestStartEndForm.cs | 80 +++++++------------ TestBenchFramework/Properties/AssemblyInfo.cs | 4 +- 2 files changed, 29 insertions(+), 55 deletions(-) diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.cs index 2e9cc7da9..ef7b46703 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.cs @@ -36,6 +36,8 @@ namespace TBF.BenchControl.DataEntry.Standard24 float warningLimLo; /// limit to display exclamation mark, typically 2x errLimLo float warningLimHi; /// limit to display exclamation mark, typically 2x errLimHi + const int TextBoxesCount = 24; + /// TextBox[] startTextBoxes; TextBox[] endTextBoxes; IList enabledTextBoxes; @@ -96,6 +98,7 @@ namespace TBF.BenchControl.DataEntry.Standard24 InitializeComponent(); WMEndState = new float[waterMetersCount]; completed = false; + StartForceCloseHandler(); } @@ -138,10 +141,14 @@ namespace TBF.BenchControl.DataEntry.Standard24 if (endStates) { - for (int i = 0; i < 24; i++) + for (int i = 0; i < TextBoxesCount; i++) { - if (WaterMetersCount > i) startTextBoxes[i].Text = WMStartStateStr[i]; - if (disabled != null && disabled.Length > i && disabled[i]) + if (WMStartStateStr != null && i < WMStartStateStr.Length) + { + startTextBoxes[i].Text = WMStartStateStr[i]; + } + + if (disabled != null && i < disabled.Length && disabled[i]) { endTextBoxes[i].Enabled = false; } @@ -154,9 +161,9 @@ namespace TBF.BenchControl.DataEntry.Standard24 } else { - for (int i = 0; i < 24; i++) + for (int i = 0; i < TextBoxesCount; i++) { - if (disabled != null && disabled.Length > i && disabled[i]) + if (disabled != null && i < disabled.Length && disabled[i]) { startTextBoxes[i].Enabled = false; } @@ -207,57 +214,24 @@ namespace TBF.BenchControl.DataEntry.Standard24 { if (endStates) { - if (endTextBox1.Visible && endTextBox1.Enabled) WMEndState[0] = Utils.ParseUFloat(endTextBox1.Text); - if (endTextBox2.Visible && endTextBox2.Enabled) WMEndState[1] = Utils.ParseUFloat(endTextBox2.Text); - if (endTextBox3.Visible && endTextBox3.Enabled) WMEndState[2] = Utils.ParseUFloat(endTextBox3.Text); - if (endTextBox4.Visible && endTextBox4.Enabled) WMEndState[3] = Utils.ParseUFloat(endTextBox4.Text); - if (endTextBox5.Visible && endTextBox5.Enabled) WMEndState[4] = Utils.ParseUFloat(endTextBox5.Text); - if (endTextBox6.Visible && endTextBox6.Enabled) WMEndState[5] = Utils.ParseUFloat(endTextBox6.Text); - if (endTextBox7.Visible && endTextBox7.Enabled) WMEndState[6] = Utils.ParseUFloat(endTextBox7.Text); - if (endTextBox8.Visible && endTextBox8.Enabled) WMEndState[7] = Utils.ParseUFloat(endTextBox8.Text); - if (endTextBox9.Visible && endTextBox9.Enabled) WMEndState[8] = Utils.ParseUFloat(endTextBox9.Text); - if (endTextBox10.Visible && endTextBox10.Enabled) WMEndState[9] = Utils.ParseUFloat(endTextBox10.Text); - if (endTextBox11.Visible && endTextBox11.Enabled) WMEndState[10] = Utils.ParseUFloat(endTextBox11.Text); - if (endTextBox12.Visible && endTextBox12.Enabled) WMEndState[11] = Utils.ParseUFloat(endTextBox12.Text); - if (endTextBox13.Visible && endTextBox13.Enabled) WMEndState[12] = Utils.ParseUFloat(endTextBox13.Text); - if (endTextBox14.Visible && endTextBox14.Enabled) WMEndState[13] = Utils.ParseUFloat(endTextBox14.Text); - if (endTextBox15.Visible && endTextBox15.Enabled) WMEndState[14] = Utils.ParseUFloat(endTextBox15.Text); - if (endTextBox16.Visible && endTextBox16.Enabled) WMEndState[15] = Utils.ParseUFloat(endTextBox16.Text); - if (endTextBox17.Visible && endTextBox17.Enabled) WMEndState[16] = Utils.ParseUFloat(endTextBox17.Text); - if (endTextBox18.Visible && endTextBox18.Enabled) WMEndState[17] = Utils.ParseUFloat(endTextBox18.Text); - if (endTextBox19.Visible && endTextBox19.Enabled) WMEndState[18] = Utils.ParseUFloat(endTextBox19.Text); - if (endTextBox20.Visible && endTextBox20.Enabled) WMEndState[19] = Utils.ParseUFloat(endTextBox20.Text); - if (endTextBox21.Visible && endTextBox21.Enabled) WMEndState[20] = Utils.ParseUFloat(endTextBox21.Text); - if (endTextBox22.Visible && endTextBox22.Enabled) WMEndState[21] = Utils.ParseUFloat(endTextBox22.Text); - if (endTextBox23.Visible && endTextBox23.Enabled) WMEndState[22] = Utils.ParseUFloat(endTextBox23.Text); - if (endTextBox24.Visible && endTextBox24.Enabled) WMEndState[23] = Utils.ParseUFloat(endTextBox24.Text); + for (int i = 0; i < Math.Min(WaterMetersCount, TextBoxesCount); i++) + { + if (endTextBoxes[i].Visible && endTextBoxes[i].Enabled) + { + WMEndState[i] = Utils.ParseUFloat(endTextBoxes[i].Text); + } + } } else { - if (startTextBox1.Visible && startTextBox1.Enabled) { WMStartStateStr[0] = startTextBox1.Text; WMStartState[0] = Utils.ParseUFloat(startTextBox1.Text); } - if (startTextBox2.Visible && startTextBox2.Enabled) { WMStartStateStr[1] = startTextBox2.Text; WMStartState[1] = Utils.ParseUFloat(startTextBox2.Text); } - if (startTextBox3.Visible && startTextBox3.Enabled) { WMStartStateStr[2] = startTextBox3.Text; WMStartState[2] = Utils.ParseUFloat(startTextBox3.Text); } - if (startTextBox4.Visible && startTextBox4.Enabled) { WMStartStateStr[3] = startTextBox4.Text; WMStartState[3] = Utils.ParseUFloat(startTextBox4.Text); } - if (startTextBox5.Visible && startTextBox5.Enabled) { WMStartStateStr[4] = startTextBox5.Text; WMStartState[4] = Utils.ParseUFloat(startTextBox5.Text); } - if (startTextBox6.Visible && startTextBox6.Enabled) { WMStartStateStr[5] = startTextBox6.Text; WMStartState[5] = Utils.ParseUFloat(startTextBox6.Text); } - if (startTextBox7.Visible && startTextBox7.Enabled) { WMStartStateStr[6] = startTextBox7.Text; WMStartState[6] = Utils.ParseUFloat(startTextBox7.Text); } - if (startTextBox8.Visible && startTextBox8.Enabled) { WMStartStateStr[7] = startTextBox8.Text; WMStartState[7] = Utils.ParseUFloat(startTextBox8.Text); } - if (startTextBox9.Visible && startTextBox9.Enabled) { WMStartStateStr[8] = startTextBox9.Text; WMStartState[8] = Utils.ParseUFloat(startTextBox9.Text); } - if (startTextBox10.Visible && startTextBox10.Enabled) { WMStartStateStr[9] = startTextBox10.Text; WMStartState[9] = Utils.ParseUFloat(startTextBox10.Text); } - if (startTextBox11.Visible && startTextBox11.Enabled) { WMStartStateStr[10] = startTextBox11.Text; WMStartState[10] = Utils.ParseUFloat(startTextBox11.Text); } - if (startTextBox12.Visible && startTextBox12.Enabled) { WMStartStateStr[11] = startTextBox12.Text; WMStartState[11] = Utils.ParseUFloat(startTextBox12.Text); } - if (startTextBox13.Visible && startTextBox13.Enabled) { WMStartStateStr[12] = startTextBox13.Text; WMStartState[12] = Utils.ParseUFloat(startTextBox13.Text); } - if (startTextBox14.Visible && startTextBox14.Enabled) { WMStartStateStr[13] = startTextBox14.Text; WMStartState[13] = Utils.ParseUFloat(startTextBox14.Text); } - if (startTextBox15.Visible && startTextBox15.Enabled) { WMStartStateStr[14] = startTextBox15.Text; WMStartState[14] = Utils.ParseUFloat(startTextBox15.Text); } - if (startTextBox16.Visible && startTextBox16.Enabled) { WMStartStateStr[15] = startTextBox16.Text; WMStartState[15] = Utils.ParseUFloat(startTextBox16.Text); } - if (startTextBox17.Visible && startTextBox17.Enabled) { WMStartStateStr[16] = startTextBox17.Text; WMStartState[16] = Utils.ParseUFloat(startTextBox17.Text); } - if (startTextBox18.Visible && startTextBox18.Enabled) { WMStartStateStr[17] = startTextBox18.Text; WMStartState[17] = Utils.ParseUFloat(startTextBox18.Text); } - if (startTextBox19.Visible && startTextBox19.Enabled) { WMStartStateStr[18] = startTextBox19.Text; WMStartState[18] = Utils.ParseUFloat(startTextBox19.Text); } - if (startTextBox20.Visible && startTextBox20.Enabled) { WMStartStateStr[19] = startTextBox20.Text; WMStartState[19] = Utils.ParseUFloat(startTextBox20.Text); } - if (startTextBox21.Visible && startTextBox21.Enabled) { WMStartStateStr[20] = startTextBox21.Text; WMStartState[20] = Utils.ParseUFloat(startTextBox21.Text); } - if (startTextBox22.Visible && startTextBox22.Enabled) { WMStartStateStr[21] = startTextBox22.Text; WMStartState[21] = Utils.ParseUFloat(startTextBox22.Text); } - if (startTextBox23.Visible && startTextBox23.Enabled) { WMStartStateStr[22] = startTextBox23.Text; WMStartState[22] = Utils.ParseUFloat(startTextBox23.Text); } - if (startTextBox24.Visible && startTextBox24.Enabled) { WMStartStateStr[23] = startTextBox24.Text; WMStartState[23] = Utils.ParseUFloat(startTextBox24.Text); } + for (int i = 0; i < Math.Min(WaterMetersCount, TextBoxesCount); i++) + { + if (startTextBoxes[i].Visible && startTextBoxes[i].Enabled) + { + WMStartStateStr[i] = startTextBoxes[i].Text; + WMStartState[i] = Utils.ParseUFloat(startTextBoxes[i].Text); + } + } } } catch(Exception e) diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 9582dfd87..922a04733 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("1.5.48.1")] -[assembly: AssemblyFileVersion("1.5.48.1")] +[assembly: AssemblyVersion("1.5.49.1")] +[assembly: AssemblyFileVersion("1.5.49.1")]