diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index dbb30d290..df970c23f 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
-[assembly: AssemblyVersion("2.27.1800.0")]
-[assembly: AssemblyFileVersion("2.27.1800.0")]
+[assembly: AssemblyVersion("2.27.1802.0")]
+[assembly: AssemblyFileVersion("2.27.1802.0")]
diff --git a/TBF/Resources/Strings.Designer.cs b/TBF/Resources/Strings.Designer.cs
index c5ceaf60e..6bffc8ac2 100644
--- a/TBF/Resources/Strings.Designer.cs
+++ b/TBF/Resources/Strings.Designer.cs
@@ -852,6 +852,15 @@ namespace TBF.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Close form keys.
+ ///
+ internal static string Close_form_keys {
+ get {
+ return ResourceManager.GetString("Close_form_keys", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Close the cover.
///
diff --git a/TBF/Resources/Strings.resx b/TBF/Resources/Strings.resx
index f53525c5c..333be7d0a 100644
--- a/TBF/Resources/Strings.resx
+++ b/TBF/Resources/Strings.resx
@@ -2302,4 +2302,7 @@
Database
+
+ Close form keys
+
\ No newline at end of file
diff --git a/TBF/Rig/DataEntry/Standard24/EntryFormCfg.cs b/TBF/Rig/DataEntry/Standard24/EntryFormCfg.cs
index ec0569678..7695d8660 100644
--- a/TBF/Rig/DataEntry/Standard24/EntryFormCfg.cs
+++ b/TBF/Rig/DataEntry/Standard24/EntryFormCfg.cs
@@ -21,6 +21,7 @@ namespace TBF.Rig.DataEntry.Standard24
///
public bool EnterSerialNrsAtTheEnd;
public bool ShowCycleEndForm;
+ public string CloseFormKeys;
/// Private parameterless constructor invoked by all other (public) constructors
EntryFormCfg()
diff --git a/TBF/Rig/DataEntry/Standard24/EntryFormCfgCtrl.cs b/TBF/Rig/DataEntry/Standard24/EntryFormCfgCtrl.cs
index 00a9cb911..225a0ad50 100644
--- a/TBF/Rig/DataEntry/Standard24/EntryFormCfgCtrl.cs
+++ b/TBF/Rig/DataEntry/Standard24/EntryFormCfgCtrl.cs
@@ -40,6 +40,7 @@ namespace TBF.Rig.DataEntry.Standard24
{
enterSNsAtTheEndCheckBox.Text = Strings.Enter_SNs_at_the_end;
showEndStateFormCheckBox.Text = Strings.Show_cycle_end_form;
+ closeKeysLabel.Text = Strings.Close_form_keys;
}
public void Closing()
@@ -53,6 +54,7 @@ namespace TBF.Rig.DataEntry.Standard24
nameTextBox.Text = config.Name;
enterSNsAtTheEndCheckBox.Checked = config.EnterSerialNrsAtTheEnd;
showEndStateFormCheckBox.Checked = config.ShowCycleEndForm;
+ closeKeysTextBox.Text = config.CloseFormKeys;
}
public void Unlock()
@@ -60,6 +62,7 @@ namespace TBF.Rig.DataEntry.Standard24
nameTextBox.Enabled = true;
enterSNsAtTheEndCheckBox.Enabled = true;
showEndStateFormCheckBox.Enabled = true;
+ closeKeysTextBox.Enabled = true;
}
public CfgUpdateFlags VerifyCfg(ref string message)
@@ -77,6 +80,7 @@ namespace TBF.Rig.DataEntry.Standard24
config.Name = nameTextBox.Text;
config.EnterSerialNrsAtTheEnd = enterSNsAtTheEndCheckBox.Checked;
config.ShowCycleEndForm = showEndStateFormCheckBox.Checked;
+ config.CloseFormKeys = closeKeysTextBox.Text;
return flags;
}
diff --git a/TBF/Rig/DataEntry/Standard24/EntryFormCfgCtrl.designer.cs b/TBF/Rig/DataEntry/Standard24/EntryFormCfgCtrl.designer.cs
index 47aff2814..203adb749 100644
--- a/TBF/Rig/DataEntry/Standard24/EntryFormCfgCtrl.designer.cs
+++ b/TBF/Rig/DataEntry/Standard24/EntryFormCfgCtrl.designer.cs
@@ -31,75 +31,96 @@ namespace TBF.Rig.DataEntry.Standard24
///
private void InitializeComponent()
{
- this.nameTextBox = new System.Windows.Forms.TextBox();
- this.nameLabel = new System.Windows.Forms.Label();
- this.classNameLabel = new System.Windows.Forms.Label();
- this.showEndStateFormCheckBox = new System.Windows.Forms.CheckBox();
- this.enterSNsAtTheEndCheckBox = new System.Windows.Forms.CheckBox();
- this.SuspendLayout();
- //
- // nameTextBox
- //
- this.nameTextBox.Enabled = false;
- this.nameTextBox.Location = new System.Drawing.Point(99, 57);
- this.nameTextBox.Name = "nameTextBox";
- this.nameTextBox.Size = new System.Drawing.Size(130, 20);
- this.nameTextBox.TabIndex = 2;
- //
- // nameLabel
- //
- this.nameLabel.AutoSize = true;
- this.nameLabel.Location = new System.Drawing.Point(35, 60);
- this.nameLabel.Name = "nameLabel";
- this.nameLabel.Size = new System.Drawing.Size(35, 13);
- this.nameLabel.TabIndex = 1;
- this.nameLabel.Text = "Name";
- //
- // classNameLabel
- //
- this.classNameLabel.AutoSize = true;
- this.classNameLabel.Location = new System.Drawing.Point(96, 33);
- this.classNameLabel.Name = "classNameLabel";
- this.classNameLabel.Size = new System.Drawing.Size(83, 13);
- this.classNameLabel.TabIndex = 0;
- this.classNameLabel.Text = "ComonentName";
- //
- // showEndStateFormCheckBox
- //
- this.showEndStateFormCheckBox.AutoSize = true;
- this.showEndStateFormCheckBox.Enabled = false;
- this.showEndStateFormCheckBox.Location = new System.Drawing.Point(99, 112);
- this.showEndStateFormCheckBox.Name = "showEndStateFormCheckBox";
- this.showEndStateFormCheckBox.Size = new System.Drawing.Size(151, 17);
- this.showEndStateFormCheckBox.TabIndex = 4;
- this.showEndStateFormCheckBox.Text = "Watermeter end state form";
- this.showEndStateFormCheckBox.UseVisualStyleBackColor = true;
- //
- // enterSNsAtTheEndCheckBox
- //
- this.enterSNsAtTheEndCheckBox.AutoSize = true;
- this.enterSNsAtTheEndCheckBox.Enabled = false;
- this.enterSNsAtTheEndCheckBox.Location = new System.Drawing.Point(99, 89);
- this.enterSNsAtTheEndCheckBox.Name = "enterSNsAtTheEndCheckBox";
- this.enterSNsAtTheEndCheckBox.Size = new System.Drawing.Size(167, 17);
- this.enterSNsAtTheEndCheckBox.TabIndex = 3;
- this.enterSNsAtTheEndCheckBox.Text = "Enter serial number at the end";
- this.enterSNsAtTheEndCheckBox.UseVisualStyleBackColor = true;
- //
- // EntryFormCfgCtrl
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Controls.Add(this.enterSNsAtTheEndCheckBox);
- this.Controls.Add(this.showEndStateFormCheckBox);
- this.Controls.Add(this.nameTextBox);
- this.Controls.Add(this.nameLabel);
- this.Controls.Add(this.classNameLabel);
- this.Name = "EntryFormCfgCtrl";
- this.Size = new System.Drawing.Size(300, 200);
- this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load);
- this.ResumeLayout(false);
- this.PerformLayout();
+ this.nameTextBox = new System.Windows.Forms.TextBox();
+ this.nameLabel = new System.Windows.Forms.Label();
+ this.classNameLabel = new System.Windows.Forms.Label();
+ this.showEndStateFormCheckBox = new System.Windows.Forms.CheckBox();
+ this.enterSNsAtTheEndCheckBox = new System.Windows.Forms.CheckBox();
+ this.closeKeysTextBox = new System.Windows.Forms.TextBox();
+ this.closeKeysLabel = new System.Windows.Forms.Label();
+ this.SuspendLayout();
+ //
+ // nameTextBox
+ //
+ this.nameTextBox.Enabled = false;
+ this.nameTextBox.Location = new System.Drawing.Point(113, 57);
+ this.nameTextBox.Name = "nameTextBox";
+ this.nameTextBox.Size = new System.Drawing.Size(130, 20);
+ this.nameTextBox.TabIndex = 2;
+ //
+ // nameLabel
+ //
+ this.nameLabel.AutoSize = true;
+ this.nameLabel.Location = new System.Drawing.Point(24, 60);
+ this.nameLabel.Name = "nameLabel";
+ this.nameLabel.Size = new System.Drawing.Size(35, 13);
+ this.nameLabel.TabIndex = 1;
+ this.nameLabel.Text = "Name";
+ //
+ // classNameLabel
+ //
+ this.classNameLabel.AutoSize = true;
+ this.classNameLabel.Location = new System.Drawing.Point(110, 33);
+ this.classNameLabel.Name = "classNameLabel";
+ this.classNameLabel.Size = new System.Drawing.Size(83, 13);
+ this.classNameLabel.TabIndex = 0;
+ this.classNameLabel.Text = "ComonentName";
+ //
+ // showEndStateFormCheckBox
+ //
+ this.showEndStateFormCheckBox.AutoSize = true;
+ this.showEndStateFormCheckBox.Enabled = false;
+ this.showEndStateFormCheckBox.Location = new System.Drawing.Point(113, 112);
+ this.showEndStateFormCheckBox.Name = "showEndStateFormCheckBox";
+ this.showEndStateFormCheckBox.Size = new System.Drawing.Size(151, 17);
+ this.showEndStateFormCheckBox.TabIndex = 4;
+ this.showEndStateFormCheckBox.Text = "Watermeter end state form";
+ this.showEndStateFormCheckBox.UseVisualStyleBackColor = true;
+ //
+ // enterSNsAtTheEndCheckBox
+ //
+ this.enterSNsAtTheEndCheckBox.AutoSize = true;
+ this.enterSNsAtTheEndCheckBox.Enabled = false;
+ this.enterSNsAtTheEndCheckBox.Location = new System.Drawing.Point(113, 89);
+ this.enterSNsAtTheEndCheckBox.Name = "enterSNsAtTheEndCheckBox";
+ this.enterSNsAtTheEndCheckBox.Size = new System.Drawing.Size(167, 17);
+ this.enterSNsAtTheEndCheckBox.TabIndex = 3;
+ this.enterSNsAtTheEndCheckBox.Text = "Enter serial number at the end";
+ this.enterSNsAtTheEndCheckBox.UseVisualStyleBackColor = true;
+ //
+ // closeKeysTextBox
+ //
+ this.closeKeysTextBox.Enabled = false;
+ this.closeKeysTextBox.Location = new System.Drawing.Point(113, 142);
+ this.closeKeysTextBox.Name = "closeKeysTextBox";
+ this.closeKeysTextBox.Size = new System.Drawing.Size(36, 20);
+ this.closeKeysTextBox.TabIndex = 6;
+ //
+ // closeKeysLabel
+ //
+ this.closeKeysLabel.AutoSize = true;
+ this.closeKeysLabel.Location = new System.Drawing.Point(24, 145);
+ this.closeKeysLabel.Name = "closeKeysLabel";
+ this.closeKeysLabel.Size = new System.Drawing.Size(81, 13);
+ this.closeKeysLabel.TabIndex = 5;
+ this.closeKeysLabel.Text = "Close form keys";
+ //
+ // EntryFormCfgCtrl
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.closeKeysTextBox);
+ this.Controls.Add(this.closeKeysLabel);
+ this.Controls.Add(this.enterSNsAtTheEndCheckBox);
+ this.Controls.Add(this.showEndStateFormCheckBox);
+ this.Controls.Add(this.nameTextBox);
+ this.Controls.Add(this.nameLabel);
+ this.Controls.Add(this.classNameLabel);
+ this.Name = "EntryFormCfgCtrl";
+ this.Size = new System.Drawing.Size(300, 200);
+ this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load);
+ this.ResumeLayout(false);
+ this.PerformLayout();
}
@@ -110,5 +131,7 @@ namespace TBF.Rig.DataEntry.Standard24
private System.Windows.Forms.Label classNameLabel;
private System.Windows.Forms.CheckBox showEndStateFormCheckBox;
private System.Windows.Forms.CheckBox enterSNsAtTheEndCheckBox;
+ private System.Windows.Forms.TextBox closeKeysTextBox;
+ private System.Windows.Forms.Label closeKeysLabel;
}
}
diff --git a/TBF/Rig/DataEntry/Standard24/EntryFormNoStartEnd.cs b/TBF/Rig/DataEntry/Standard24/EntryFormNoStartEnd.cs
index bffa187fb..f57772b4a 100644
--- a/TBF/Rig/DataEntry/Standard24/EntryFormNoStartEnd.cs
+++ b/TBF/Rig/DataEntry/Standard24/EntryFormNoStartEnd.cs
@@ -40,6 +40,7 @@ namespace TBF.Rig.DataEntry.Standard24
System.Windows.Forms.Form modelessDlg;
public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
+ Config.Unit volumeUnit;
double refVolume;
double errLimLo;
double errLimHi;
@@ -75,6 +76,7 @@ namespace TBF.Rig.DataEntry.Standard24
wmStartStateStr = new string[TBF.Data.WMsCount];
wmEndState = new double[TBF.Data.WMsCount];
wmCycleEndState = new string[TBF.Data.WMsCount];
+ volumeUnit = (TBF.Rig.Sequences.ProcessData.BenchInfo != null) ? TBF.Rig.Sequences.ProcessData.BenchInfo.VolumeUnit : Config.Unit.l;
currentOp = CurrentOp.None;
log.FatalFormat("{0} initialized: {1}", Name, this);
}
@@ -135,13 +137,15 @@ namespace TBF.Rig.DataEntry.Standard24
///
void OpenTestStartStatesDlg(EntryFormNoStartEnd myRef)
{
- myRef.modelessDlg = new TestStartEndForm(TBF.Data.WMsCount, myRef.regReaders, myRef.disabled);
+ myRef.modelessDlg = new TestStartEndForm(TBF.Data.WMsCount, myRef.regReaders, myRef.disabled,
+ myRef.entryFormCfg.CloseFormKeys, volumeUnit);
modelessDlg.Show();
}
///
void OpenTestEndStatesDlg(EntryFormNoStartEnd myRef)
{
- myRef.modelessDlg = new TestStartEndForm(TBF.Data.WMsCount, myRef.regReaders, wmStartStateStr, disabled, refVolume, errLimLo, errLimHi);
+ myRef.modelessDlg = new TestStartEndForm(TBF.Data.WMsCount, myRef.regReaders, wmStartStateStr, disabled,
+ refVolume, errLimLo, errLimHi, volumeUnit);
modelessDlg.Show();
}
@@ -225,6 +229,7 @@ namespace TBF.Rig.DataEntry.Standard24
TestStartEndForm dlg = (modelessDlg as TestStartEndForm);
if (dlg != null)
{
+ volumeUnit = dlg.VolumeUnit;
for (int i = 0; i < dlg.WaterMetersCount; i++)
{
if (!(((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null))))
@@ -241,11 +246,13 @@ namespace TBF.Rig.DataEntry.Standard24
TestStartEndForm dlg = (modelessDlg as TestStartEndForm);
if (dlg != null)
{
+ volumeUnit = dlg.VolumeUnit;
for (int i = 0; i < dlg.WaterMetersCount; i++)
{
if (!(((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null))))
{
- wmEndState[i] = dlg.WMEndState[i];
+ wmStartState[i] = dlg.WMStartState[i];
+ wmEndState[i] = dlg.WMEndState[i];
}
}
}
diff --git a/TBF/Rig/DataEntry/Standard24/TestStartEndForm.cs b/TBF/Rig/DataEntry/Standard24/TestStartEndForm.cs
index 927af064b..533c0ad31 100644
--- a/TBF/Rig/DataEntry/Standard24/TestStartEndForm.cs
+++ b/TBF/Rig/DataEntry/Standard24/TestStartEndForm.cs
@@ -5,6 +5,8 @@ using System;
using System.Collections.Generic;
using System.Windows.Forms;
using log4net;
+using Common;
+using Config;
using TBF.Rig.GenericDevices;
using TBF.Resources;
@@ -22,15 +24,13 @@ namespace TBF.Rig.DataEntry.Standard24
public readonly int WaterMetersCount;
readonly IRegReader[] regReaders;
readonly bool[] disabled;
-
- // To be retrieved after the form closes
- public double[] WMStartState;
+ readonly string closeFormKeys;
// To be retrieved after the form closes
public readonly string[] WMStartStateStr;
-
- // To be retrieved after the form closes
+ public double[] WMStartState;
public double[] WMEndState;
+ public Unit VolumeUnit;
bool endStates; /// false=start states, true=end states
double refVolume;
@@ -89,6 +89,11 @@ namespace TBF.Rig.DataEntry.Standard24
activeTextBoxes = new List();
activeWmNrs = new List();
+ for (Unit u = 0; u < Unit.Count; u++)
+ {
+ if (Units.IsVolume(u)) unitComboBox.Items.Add(u.ToDescription());
+ }
+
completed = false;
StartForceCloseHandler();
}
@@ -98,7 +103,7 @@ namespace TBF.Rig.DataEntry.Standard24
///
/// Number of water meters
/// Information from CycleBeginningForm about availability of water meters
- public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
+ public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, bool[] disabled, string closeFormKeys, Unit initialVolumeUnit)
: this()
{
endStates = false;
@@ -106,12 +111,16 @@ namespace TBF.Rig.DataEntry.Standard24
this.WaterMetersCount = waterMetersCount;
this.regReaders = regReaders;
this.disabled = disabled;
+ this.closeFormKeys = closeFormKeys;
ShuffleTextBoxes();
WMStartState = new double[waterMetersCount];
WMStartStateStr = new string[waterMetersCount];
- }
+
+ VolumeUnit = initialVolumeUnit;
+ unitComboBox.Text = VolumeUnit.ToDescription();
+ }
///
/// Constructor to fill in end states
@@ -123,7 +132,7 @@ namespace TBF.Rig.DataEntry.Standard24
/// Error limit low, it is used to verify the end state, show/hide exclamation if necessary
/// Error limit high, it is used to verify the end state, show/hide exclamation if necessary
public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
- double refVolume, double errLimLo, double errLimHi)
+ double refVolume, double errLimLo, double errLimHi, Unit initialVolumeUnit)
: this()
{
endStates = true;
@@ -141,8 +150,12 @@ namespace TBF.Rig.DataEntry.Standard24
ShuffleTextBoxes();
+ WMStartState = new double[waterMetersCount];
WMEndState = new double[waterMetersCount];
- }
+
+ VolumeUnit = initialVolumeUnit;
+ unitComboBox.Text = VolumeUnit.ToDescription();
+ }
///
/// Make sure the layout of labels/text boxes on the screen
@@ -171,7 +184,7 @@ namespace TBF.Rig.DataEntry.Standard24
}
}
- private void CycleEndForm_Load(object sender, EventArgs e)
+ private void TestStartEndForm_Load(object sender, EventArgs e)
{
Localize();
@@ -228,7 +241,7 @@ namespace TBF.Rig.DataEntry.Standard24
if ((activeTextBoxes.Count > 0) && (activeWmNrs.Count > 0))
{
activeTextBoxes[0].Focus();
- largeTextBox.Text = string.Format("{0} {1}: {2}", Strings.Water_Meter, activeWmNrs[0] + 1, string.Empty);
+ largeTextBox.Text = string.Format("{0}: {1}", activeWmNrs[0] + 1, string.Empty);
}
}
@@ -236,9 +249,7 @@ namespace TBF.Rig.DataEntry.Standard24
{
Text = Strings.Water_Meter_States;
for (int i = 0; i < TextBoxesCount; i++)
- {
- labels[i].Text = string.Format("{0} {1}", Strings.Water_Meter, i + 1);
- }
+ labels[i].Text = (i + 1).ToString();
startLabel.Text = startLabel2.Text = Strings.Start;
endLabel.Text = endLabel2.Text = Strings.End;
okButton.Text = Strings.OkBtnText;
@@ -246,35 +257,32 @@ namespace TBF.Rig.DataEntry.Standard24
private void okButton_Click(object sender, EventArgs eArgs)
{
- try
- {
+ for (int i = 0; i < Math.Min(WaterMetersCount, TextBoxesCount); i++)
+ {
+ double startVol, endVol;
+
if (endStates)
{
- for (int i = 0; i < Math.Min(WaterMetersCount, TextBoxesCount); i++)
+ if (endTextBoxes[i].Visible &&
+ endTextBoxes[i].Enabled &&
+ Utils.TryParseUDouble(startTextBoxes[i].Text, out startVol) &&
+ Utils.TryParseUDouble(endTextBoxes[i].Text, out endVol))
{
- if (endTextBoxes[i].Visible && endTextBoxes[i].Enabled)
- {
- WMEndState[i] = Utils.ParseUDouble(endTextBoxes[i].Text);
- }
+ WMStartState[i] = Units.ConvertFrom(VolumeUnit, startVol);
+ WMEndState[i] = Units.ConvertFrom(VolumeUnit, endVol);
}
}
else
{
- 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.ParseUDouble(startTextBoxes[i].Text);
- }
+ if (startTextBoxes[i].Visible &&
+ startTextBoxes[i].Enabled &&
+ Utils.TryParseUDouble(startTextBoxes[i].Text, out startVol))
+ {
+ WMStartStateStr[i] = startTextBoxes[i].Text;
+ WMStartState[i] = Units.ConvertFrom(VolumeUnit, startVol);
}
}
}
- catch(Exception e)
- {
- log.ErrorFormat("Exception: {0}", e.Message);
- return;
- }
completed = true;
Close();
@@ -317,19 +325,26 @@ namespace TBF.Rig.DataEntry.Standard24
}
}
- double err = 0;
- try
- {
- double endState = Utils.ParseUDouble(endTextBoxes[wmIx].Text);
- double startState = Utils.ParseUDouble(startTextBoxes[wmIx].Text);
- err = 100.0 * (endState - startState - refVolume) / refVolume;
- }
- catch { err = 1000.0f; };
+ if (wmIx < 0 || wmIx >= TextBoxesCount) return;
- bool errorOoR = fixedErrorLimits ? ((err < warningLimLo) || (warningLimHi < err)) : ((err < -6) || (+6 < err));
- exclamations[wmIx].Visible = errorOoR;
- largeExclamationLabel.Visible = errorOoR;
- largeTextBox.Text = string.Format("{0} {1}: {2}", Strings.Water_Meter, wmIx + 1, endTextBoxes[wmIx].Text);
+ double startVol, endVol;
+
+ if (Utils.TryParseUDouble(startTextBoxes[wmIx].Text, out startVol) &&
+ Utils.TryParseUDouble(endTextBoxes[wmIx].Text, out endVol))
+ {
+ double startState = Units.ConvertFrom(VolumeUnit, startVol);
+ double endState = Units.ConvertFrom(VolumeUnit, endVol);
+ double err = (refVolume != 0) ? 100.0 * (endState - startState - refVolume) / refVolume : 1000.0;
+ largeExclamationLabel.Visible =
+ exclamations[wmIx].Visible = fixedErrorLimits ? ((err < warningLimLo) || (warningLimHi < err)) : ((err < -6) || (+6 < err));
+ }
+ else
+ {
+ largeExclamationLabel.Visible =
+ exclamations[wmIx].Visible = !string.IsNullOrEmpty(endTextBoxes[wmIx].Text);
+ }
+
+ largeTextBox.Text = string.Format("{0}: {1}", wmIx + 1, endTextBoxes[wmIx].Text);
}
private void endTextBox1_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox1); }
@@ -390,11 +405,18 @@ namespace TBF.Rig.DataEntry.Standard24
/// TextBox control which received the event
private void ProcKeyPress(object sender, KeyPressEventArgs e, TextBox currentFocusOwner)
{
- if (e.KeyChar == '+')
- {
- /// Process '+' key ..... Form completed
- okButton_Click(sender, e);
- }
+ if (!string.IsNullOrEmpty(closeFormKeys))
+ {
+ /// Close the form if any 'close form key' was pressed
+ for (int ix = 0; ix < closeFormKeys.Length; ix++)
+ {
+ if (e.KeyChar == closeFormKeys[ix])
+ {
+ okButton_Click(sender, e);
+ return;
+ }
+ }
+ }
if (e.KeyChar == '\r')
{
@@ -408,7 +430,7 @@ namespace TBF.Rig.DataEntry.Standard24
/// Change focus to the next enabled text box
int newTBIdx = (i + 1) % activeTextBoxes.Count;
activeTextBoxes[newTBIdx].Focus();
- largeTextBox.Text = string.Format("{0} {1}: {2}", Strings.Water_Meter, activeWmNrs[newTBIdx] + 1, activeTextBoxes[newTBIdx].Text);
+ largeTextBox.Text = string.Format("{0}: {1}", activeWmNrs[newTBIdx] + 1, activeTextBoxes[newTBIdx].Text);
largeExclamationLabel.Visible = false;
return;
}
@@ -473,7 +495,7 @@ namespace TBF.Rig.DataEntry.Standard24
{
if (startTextBoxes[i] == startTBox)
{
- largeTextBox.Text = string.Format("{0} {1}: {2}", Strings.Water_Meter, i + 1, startTextBoxes[i].Text);
+ largeTextBox.Text = string.Format("{0}: {1}", i + 1, startTextBoxes[i].Text);
largeExclamationLabel.Visible = false;
break;
}
@@ -529,5 +551,44 @@ namespace TBF.Rig.DataEntry.Standard24
private void startTextBox22_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox22); }
private void startTextBox23_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox23); }
private void startTextBox24_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox24); }
+
+ private void unitComboBox_TextChanged(object sender, EventArgs e)
+ {
+ unitComboBox_SelectedIndexChanged(sender, e);
+ }
+
+ private void unitComboBox_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ var newUnit = Units.FromDescription(unitComboBox.Text);
+
+ if (Units.IsVolume(newUnit))
+ {
+ VolumeUnit = newUnit;
+
+ if (endStates)
+ {
+ for (int i = 0; i < TextBoxesCount; i++)
+ {
+ double startVol, endVol;
+
+ if (Utils.TryParseUDouble(startTextBoxes[i].Text, out startVol) &&
+ Utils.TryParseUDouble(endTextBoxes[i].Text, out endVol))
+ {
+ double startState = Units.ConvertFrom(VolumeUnit, startVol);
+ double endState = Units.ConvertFrom(VolumeUnit, endVol);
+ double err = (refVolume != 0) ? 100.0 * (endState - startState - refVolume) / refVolume : 1000.0;
+ exclamations[i].Visible = fixedErrorLimits ? ((err < warningLimLo) || (warningLimHi < err)) : ((err < -6) || (+6 < err));
+ }
+ else
+ {
+ exclamations[i].Visible = !string.IsNullOrEmpty(endTextBoxes[i].Text);
+ }
+ }
+
+ largeTextBox.Text = string.Empty;
+ largeExclamationLabel.Visible = false;
+ }
+ }
+ }
}
}
diff --git a/TBF/Rig/DataEntry/Standard24/TestStartEndForm.designer.cs b/TBF/Rig/DataEntry/Standard24/TestStartEndForm.designer.cs
index 408739415..c21a9caaf 100644
--- a/TBF/Rig/DataEntry/Standard24/TestStartEndForm.designer.cs
+++ b/TBF/Rig/DataEntry/Standard24/TestStartEndForm.designer.cs
@@ -134,6 +134,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.label13 = new System.Windows.Forms.Label();
this.largeTextBox = new System.Windows.Forms.TextBox();
this.largeExclamationLabel = new System.Windows.Forms.Label();
+ this.unitComboBox = new System.Windows.Forms.ComboBox();
this.SuspendLayout();
//
// exclamation1
@@ -141,7 +142,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation1.AutoSize = true;
this.exclamation1.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation1.ForeColor = System.Drawing.Color.Red;
- this.exclamation1.Location = new System.Drawing.Point(547, 127);
+ this.exclamation1.Location = new System.Drawing.Point(413, 146);
this.exclamation1.Name = "exclamation1";
this.exclamation1.Size = new System.Drawing.Size(30, 38);
this.exclamation1.TabIndex = 5;
@@ -152,7 +153,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.startTextBox1.Enabled = false;
this.startTextBox1.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox1.Location = new System.Drawing.Point(200, 131);
+ this.startTextBox1.Location = new System.Drawing.Point(66, 150);
this.startTextBox1.Name = "startTextBox1";
this.startTextBox1.Size = new System.Drawing.Size(163, 31);
this.startTextBox1.TabIndex = 3;
@@ -165,7 +166,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endTextBox1.Enabled = false;
this.endTextBox1.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox1.Location = new System.Drawing.Point(382, 131);
+ this.endTextBox1.Location = new System.Drawing.Point(248, 150);
this.endTextBox1.Name = "endTextBox1";
this.endTextBox1.Size = new System.Drawing.Size(163, 31);
this.endTextBox1.TabIndex = 4;
@@ -178,20 +179,21 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label1.Location = new System.Drawing.Point(23, 134);
+ this.label1.Location = new System.Drawing.Point(25, 153);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(144, 23);
+ this.label1.Size = new System.Drawing.Size(22, 23);
this.label1.TabIndex = 2;
- this.label1.Text = "Water Meter 1";
+ this.label1.Text = "1";
this.label1.Visible = false;
//
// okButton
//
+ this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
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(1159, 29);
+ this.okButton.Location = new System.Drawing.Point(999, 29);
this.okButton.Name = "okButton";
- this.okButton.Size = new System.Drawing.Size(98, 63);
+ this.okButton.Size = new System.Drawing.Size(123, 63);
this.okButton.TabIndex = 100;
this.okButton.Text = "OK";
this.okButton.UseVisualStyleBackColor = true;
@@ -202,7 +204,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation3.AutoSize = true;
this.exclamation3.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation3.ForeColor = System.Drawing.Color.Red;
- this.exclamation3.Location = new System.Drawing.Point(547, 215);
+ this.exclamation3.Location = new System.Drawing.Point(413, 234);
this.exclamation3.Name = "exclamation3";
this.exclamation3.Size = new System.Drawing.Size(30, 38);
this.exclamation3.TabIndex = 13;
@@ -213,7 +215,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.startTextBox3.Enabled = false;
this.startTextBox3.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox3.Location = new System.Drawing.Point(200, 219);
+ this.startTextBox3.Location = new System.Drawing.Point(66, 238);
this.startTextBox3.Name = "startTextBox3";
this.startTextBox3.Size = new System.Drawing.Size(163, 31);
this.startTextBox3.TabIndex = 11;
@@ -226,7 +228,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endTextBox3.Enabled = false;
this.endTextBox3.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox3.Location = new System.Drawing.Point(382, 219);
+ this.endTextBox3.Location = new System.Drawing.Point(248, 238);
this.endTextBox3.Name = "endTextBox3";
this.endTextBox3.Size = new System.Drawing.Size(163, 31);
this.endTextBox3.TabIndex = 12;
@@ -239,11 +241,11 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label3.Location = new System.Drawing.Point(23, 222);
+ this.label3.Location = new System.Drawing.Point(25, 241);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(144, 23);
+ this.label3.Size = new System.Drawing.Size(22, 23);
this.label3.TabIndex = 10;
- this.label3.Text = "Water Meter 3";
+ this.label3.Text = "3";
this.label3.Visible = false;
//
// exclamation4
@@ -251,7 +253,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation4.AutoSize = true;
this.exclamation4.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation4.ForeColor = System.Drawing.Color.Red;
- this.exclamation4.Location = new System.Drawing.Point(547, 259);
+ this.exclamation4.Location = new System.Drawing.Point(413, 278);
this.exclamation4.Name = "exclamation4";
this.exclamation4.Size = new System.Drawing.Size(30, 38);
this.exclamation4.TabIndex = 17;
@@ -262,7 +264,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.startTextBox4.Enabled = false;
this.startTextBox4.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox4.Location = new System.Drawing.Point(200, 263);
+ this.startTextBox4.Location = new System.Drawing.Point(66, 282);
this.startTextBox4.Name = "startTextBox4";
this.startTextBox4.Size = new System.Drawing.Size(163, 31);
this.startTextBox4.TabIndex = 15;
@@ -275,7 +277,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endTextBox4.Enabled = false;
this.endTextBox4.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox4.Location = new System.Drawing.Point(382, 263);
+ this.endTextBox4.Location = new System.Drawing.Point(248, 282);
this.endTextBox4.Name = "endTextBox4";
this.endTextBox4.Size = new System.Drawing.Size(163, 31);
this.endTextBox4.TabIndex = 16;
@@ -288,11 +290,11 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label4.Location = new System.Drawing.Point(23, 266);
+ this.label4.Location = new System.Drawing.Point(25, 285);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(144, 23);
+ this.label4.Size = new System.Drawing.Size(22, 23);
this.label4.TabIndex = 14;
- this.label4.Text = "Water Meter 4";
+ this.label4.Text = "4";
this.label4.Visible = false;
//
// exclamation5
@@ -300,7 +302,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation5.AutoSize = true;
this.exclamation5.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation5.ForeColor = System.Drawing.Color.Red;
- this.exclamation5.Location = new System.Drawing.Point(547, 303);
+ this.exclamation5.Location = new System.Drawing.Point(413, 322);
this.exclamation5.Name = "exclamation5";
this.exclamation5.Size = new System.Drawing.Size(30, 38);
this.exclamation5.TabIndex = 21;
@@ -311,7 +313,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.startTextBox5.Enabled = false;
this.startTextBox5.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox5.Location = new System.Drawing.Point(200, 307);
+ this.startTextBox5.Location = new System.Drawing.Point(66, 326);
this.startTextBox5.Name = "startTextBox5";
this.startTextBox5.Size = new System.Drawing.Size(163, 31);
this.startTextBox5.TabIndex = 19;
@@ -324,7 +326,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endTextBox5.Enabled = false;
this.endTextBox5.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox5.Location = new System.Drawing.Point(382, 307);
+ this.endTextBox5.Location = new System.Drawing.Point(248, 326);
this.endTextBox5.Name = "endTextBox5";
this.endTextBox5.Size = new System.Drawing.Size(163, 31);
this.endTextBox5.TabIndex = 20;
@@ -337,11 +339,11 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label5.Location = new System.Drawing.Point(23, 310);
+ this.label5.Location = new System.Drawing.Point(25, 329);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(144, 23);
+ this.label5.Size = new System.Drawing.Size(22, 23);
this.label5.TabIndex = 18;
- this.label5.Text = "Water Meter 5";
+ this.label5.Text = "5";
this.label5.Visible = false;
//
// exclamation6
@@ -349,7 +351,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation6.AutoSize = true;
this.exclamation6.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation6.ForeColor = System.Drawing.Color.Red;
- this.exclamation6.Location = new System.Drawing.Point(547, 347);
+ this.exclamation6.Location = new System.Drawing.Point(413, 366);
this.exclamation6.Name = "exclamation6";
this.exclamation6.Size = new System.Drawing.Size(30, 38);
this.exclamation6.TabIndex = 25;
@@ -360,7 +362,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.startTextBox6.Enabled = false;
this.startTextBox6.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox6.Location = new System.Drawing.Point(200, 351);
+ this.startTextBox6.Location = new System.Drawing.Point(66, 370);
this.startTextBox6.Name = "startTextBox6";
this.startTextBox6.Size = new System.Drawing.Size(163, 31);
this.startTextBox6.TabIndex = 23;
@@ -373,7 +375,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endTextBox6.Enabled = false;
this.endTextBox6.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox6.Location = new System.Drawing.Point(382, 351);
+ this.endTextBox6.Location = new System.Drawing.Point(248, 370);
this.endTextBox6.Name = "endTextBox6";
this.endTextBox6.Size = new System.Drawing.Size(163, 31);
this.endTextBox6.TabIndex = 24;
@@ -386,18 +388,18 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label6.Location = new System.Drawing.Point(23, 354);
+ this.label6.Location = new System.Drawing.Point(25, 373);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(144, 23);
+ this.label6.Size = new System.Drawing.Size(22, 23);
this.label6.TabIndex = 22;
- this.label6.Text = "Water Meter 6";
+ this.label6.Text = "6";
this.label6.Visible = false;
//
// 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(256, 99);
+ this.startLabel.Location = new System.Drawing.Point(122, 118);
this.startLabel.Name = "startLabel";
this.startLabel.Size = new System.Drawing.Size(56, 23);
this.startLabel.TabIndex = 0;
@@ -407,7 +409,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
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(441, 99);
+ this.endLabel.Location = new System.Drawing.Point(307, 118);
this.endLabel.Name = "endLabel";
this.endLabel.Size = new System.Drawing.Size(46, 23);
this.endLabel.TabIndex = 1;
@@ -417,18 +419,18 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label2.Location = new System.Drawing.Point(23, 178);
+ this.label2.Location = new System.Drawing.Point(25, 197);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(144, 23);
+ this.label2.Size = new System.Drawing.Size(22, 23);
this.label2.TabIndex = 6;
- this.label2.Text = "Water Meter 2";
+ this.label2.Text = "2";
this.label2.Visible = false;
//
// endTextBox2
//
this.endTextBox2.Enabled = false;
this.endTextBox2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox2.Location = new System.Drawing.Point(382, 175);
+ this.endTextBox2.Location = new System.Drawing.Point(248, 194);
this.endTextBox2.Name = "endTextBox2";
this.endTextBox2.Size = new System.Drawing.Size(163, 31);
this.endTextBox2.TabIndex = 8;
@@ -441,7 +443,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.startTextBox2.Enabled = false;
this.startTextBox2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox2.Location = new System.Drawing.Point(200, 175);
+ this.startTextBox2.Location = new System.Drawing.Point(66, 194);
this.startTextBox2.Name = "startTextBox2";
this.startTextBox2.Size = new System.Drawing.Size(163, 31);
this.startTextBox2.TabIndex = 7;
@@ -455,7 +457,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation2.AutoSize = true;
this.exclamation2.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation2.ForeColor = System.Drawing.Color.Red;
- this.exclamation2.Location = new System.Drawing.Point(547, 171);
+ this.exclamation2.Location = new System.Drawing.Point(413, 190);
this.exclamation2.Name = "exclamation2";
this.exclamation2.Size = new System.Drawing.Size(30, 38);
this.exclamation2.TabIndex = 9;
@@ -467,7 +469,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation7.AutoSize = true;
this.exclamation7.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation7.ForeColor = System.Drawing.Color.Red;
- this.exclamation7.Location = new System.Drawing.Point(547, 391);
+ this.exclamation7.Location = new System.Drawing.Point(413, 410);
this.exclamation7.Name = "exclamation7";
this.exclamation7.Size = new System.Drawing.Size(30, 38);
this.exclamation7.TabIndex = 29;
@@ -478,7 +480,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.startTextBox7.Enabled = false;
this.startTextBox7.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox7.Location = new System.Drawing.Point(200, 395);
+ this.startTextBox7.Location = new System.Drawing.Point(66, 414);
this.startTextBox7.Name = "startTextBox7";
this.startTextBox7.Size = new System.Drawing.Size(163, 31);
this.startTextBox7.TabIndex = 27;
@@ -491,7 +493,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endTextBox7.Enabled = false;
this.endTextBox7.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox7.Location = new System.Drawing.Point(382, 395);
+ this.endTextBox7.Location = new System.Drawing.Point(248, 414);
this.endTextBox7.Name = "endTextBox7";
this.endTextBox7.Size = new System.Drawing.Size(163, 31);
this.endTextBox7.TabIndex = 28;
@@ -504,11 +506,11 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label7.AutoSize = true;
this.label7.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label7.Location = new System.Drawing.Point(23, 398);
+ this.label7.Location = new System.Drawing.Point(25, 417);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(144, 23);
+ this.label7.Size = new System.Drawing.Size(22, 23);
this.label7.TabIndex = 26;
- this.label7.Text = "Water Meter 7";
+ this.label7.Text = "7";
this.label7.Visible = false;
//
// exclamation8
@@ -516,7 +518,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation8.AutoSize = true;
this.exclamation8.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation8.ForeColor = System.Drawing.Color.Red;
- this.exclamation8.Location = new System.Drawing.Point(547, 435);
+ this.exclamation8.Location = new System.Drawing.Point(413, 454);
this.exclamation8.Name = "exclamation8";
this.exclamation8.Size = new System.Drawing.Size(30, 38);
this.exclamation8.TabIndex = 33;
@@ -527,7 +529,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.startTextBox8.Enabled = false;
this.startTextBox8.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox8.Location = new System.Drawing.Point(200, 439);
+ this.startTextBox8.Location = new System.Drawing.Point(66, 458);
this.startTextBox8.Name = "startTextBox8";
this.startTextBox8.Size = new System.Drawing.Size(163, 31);
this.startTextBox8.TabIndex = 31;
@@ -540,7 +542,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endTextBox8.Enabled = false;
this.endTextBox8.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox8.Location = new System.Drawing.Point(382, 439);
+ this.endTextBox8.Location = new System.Drawing.Point(248, 458);
this.endTextBox8.Name = "endTextBox8";
this.endTextBox8.Size = new System.Drawing.Size(163, 31);
this.endTextBox8.TabIndex = 32;
@@ -553,11 +555,11 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label8.Location = new System.Drawing.Point(23, 442);
+ this.label8.Location = new System.Drawing.Point(25, 461);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(144, 23);
+ this.label8.Size = new System.Drawing.Size(22, 23);
this.label8.TabIndex = 30;
- this.label8.Text = "Water Meter 8";
+ this.label8.Text = "8";
this.label8.Visible = false;
//
// exclamation9
@@ -565,7 +567,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation9.AutoSize = true;
this.exclamation9.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation9.ForeColor = System.Drawing.Color.Red;
- this.exclamation9.Location = new System.Drawing.Point(547, 479);
+ this.exclamation9.Location = new System.Drawing.Point(413, 498);
this.exclamation9.Name = "exclamation9";
this.exclamation9.Size = new System.Drawing.Size(30, 38);
this.exclamation9.TabIndex = 37;
@@ -576,7 +578,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.startTextBox9.Enabled = false;
this.startTextBox9.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox9.Location = new System.Drawing.Point(200, 483);
+ this.startTextBox9.Location = new System.Drawing.Point(66, 502);
this.startTextBox9.Name = "startTextBox9";
this.startTextBox9.Size = new System.Drawing.Size(163, 31);
this.startTextBox9.TabIndex = 35;
@@ -589,7 +591,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endTextBox9.Enabled = false;
this.endTextBox9.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox9.Location = new System.Drawing.Point(382, 483);
+ this.endTextBox9.Location = new System.Drawing.Point(248, 502);
this.endTextBox9.Name = "endTextBox9";
this.endTextBox9.Size = new System.Drawing.Size(163, 31);
this.endTextBox9.TabIndex = 36;
@@ -602,11 +604,11 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label9.AutoSize = true;
this.label9.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label9.Location = new System.Drawing.Point(23, 486);
+ this.label9.Location = new System.Drawing.Point(25, 505);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(144, 23);
+ this.label9.Size = new System.Drawing.Size(22, 23);
this.label9.TabIndex = 34;
- this.label9.Text = "Water Meter 9";
+ this.label9.Text = "9";
this.label9.Visible = false;
//
// exclamation10
@@ -614,7 +616,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation10.AutoSize = true;
this.exclamation10.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation10.ForeColor = System.Drawing.Color.Red;
- this.exclamation10.Location = new System.Drawing.Point(547, 523);
+ this.exclamation10.Location = new System.Drawing.Point(413, 542);
this.exclamation10.Name = "exclamation10";
this.exclamation10.Size = new System.Drawing.Size(30, 38);
this.exclamation10.TabIndex = 41;
@@ -625,7 +627,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.startTextBox10.Enabled = false;
this.startTextBox10.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox10.Location = new System.Drawing.Point(200, 527);
+ this.startTextBox10.Location = new System.Drawing.Point(66, 546);
this.startTextBox10.Name = "startTextBox10";
this.startTextBox10.Size = new System.Drawing.Size(163, 31);
this.startTextBox10.TabIndex = 39;
@@ -638,7 +640,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endTextBox10.Enabled = false;
this.endTextBox10.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox10.Location = new System.Drawing.Point(382, 527);
+ this.endTextBox10.Location = new System.Drawing.Point(248, 546);
this.endTextBox10.Name = "endTextBox10";
this.endTextBox10.Size = new System.Drawing.Size(163, 31);
this.endTextBox10.TabIndex = 40;
@@ -651,11 +653,11 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label10.AutoSize = true;
this.label10.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label10.Location = new System.Drawing.Point(23, 530);
+ this.label10.Location = new System.Drawing.Point(25, 549);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(156, 23);
+ this.label10.Size = new System.Drawing.Size(34, 23);
this.label10.TabIndex = 38;
- this.label10.Text = "Water Meter 10";
+ this.label10.Text = "10";
this.label10.Visible = false;
//
// exclamation11
@@ -663,7 +665,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation11.AutoSize = true;
this.exclamation11.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation11.ForeColor = System.Drawing.Color.Red;
- this.exclamation11.Location = new System.Drawing.Point(547, 567);
+ this.exclamation11.Location = new System.Drawing.Point(413, 586);
this.exclamation11.Name = "exclamation11";
this.exclamation11.Size = new System.Drawing.Size(30, 38);
this.exclamation11.TabIndex = 45;
@@ -674,7 +676,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.startTextBox11.Enabled = false;
this.startTextBox11.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox11.Location = new System.Drawing.Point(200, 571);
+ this.startTextBox11.Location = new System.Drawing.Point(66, 590);
this.startTextBox11.Name = "startTextBox11";
this.startTextBox11.Size = new System.Drawing.Size(163, 31);
this.startTextBox11.TabIndex = 43;
@@ -687,7 +689,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endTextBox11.Enabled = false;
this.endTextBox11.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox11.Location = new System.Drawing.Point(382, 571);
+ this.endTextBox11.Location = new System.Drawing.Point(248, 590);
this.endTextBox11.Name = "endTextBox11";
this.endTextBox11.Size = new System.Drawing.Size(163, 31);
this.endTextBox11.TabIndex = 44;
@@ -700,11 +702,11 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label11.AutoSize = true;
this.label11.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label11.Location = new System.Drawing.Point(23, 574);
+ this.label11.Location = new System.Drawing.Point(25, 593);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(156, 23);
+ this.label11.Size = new System.Drawing.Size(34, 23);
this.label11.TabIndex = 42;
- this.label11.Text = "Water Meter 11";
+ this.label11.Text = "11";
this.label11.Visible = false;
//
// exclamation12
@@ -712,7 +714,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation12.AutoSize = true;
this.exclamation12.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation12.ForeColor = System.Drawing.Color.Red;
- this.exclamation12.Location = new System.Drawing.Point(547, 611);
+ this.exclamation12.Location = new System.Drawing.Point(413, 630);
this.exclamation12.Name = "exclamation12";
this.exclamation12.Size = new System.Drawing.Size(30, 38);
this.exclamation12.TabIndex = 49;
@@ -723,7 +725,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.startTextBox12.Enabled = false;
this.startTextBox12.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox12.Location = new System.Drawing.Point(200, 615);
+ this.startTextBox12.Location = new System.Drawing.Point(66, 634);
this.startTextBox12.Name = "startTextBox12";
this.startTextBox12.Size = new System.Drawing.Size(163, 31);
this.startTextBox12.TabIndex = 47;
@@ -736,7 +738,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endTextBox12.Enabled = false;
this.endTextBox12.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox12.Location = new System.Drawing.Point(382, 615);
+ this.endTextBox12.Location = new System.Drawing.Point(248, 634);
this.endTextBox12.Name = "endTextBox12";
this.endTextBox12.Size = new System.Drawing.Size(163, 31);
this.endTextBox12.TabIndex = 48;
@@ -749,11 +751,11 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label12.AutoSize = true;
this.label12.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label12.Location = new System.Drawing.Point(23, 618);
+ this.label12.Location = new System.Drawing.Point(25, 637);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(156, 23);
+ this.label12.Size = new System.Drawing.Size(34, 23);
this.label12.TabIndex = 46;
- this.label12.Text = "Water Meter 12";
+ this.label12.Text = "12";
this.label12.Visible = false;
//
// exclamation24
@@ -761,7 +763,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation24.AutoSize = true;
this.exclamation24.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation24.ForeColor = System.Drawing.Color.Red;
- this.exclamation24.Location = new System.Drawing.Point(1116, 611);
+ this.exclamation24.Location = new System.Drawing.Point(918, 630);
this.exclamation24.Name = "exclamation24";
this.exclamation24.Size = new System.Drawing.Size(30, 38);
this.exclamation24.TabIndex = 99;
@@ -772,7 +774,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.startTextBox24.Enabled = false;
this.startTextBox24.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox24.Location = new System.Drawing.Point(769, 615);
+ this.startTextBox24.Location = new System.Drawing.Point(571, 634);
this.startTextBox24.Name = "startTextBox24";
this.startTextBox24.Size = new System.Drawing.Size(163, 31);
this.startTextBox24.TabIndex = 97;
@@ -785,7 +787,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endTextBox24.Enabled = false;
this.endTextBox24.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox24.Location = new System.Drawing.Point(951, 615);
+ this.endTextBox24.Location = new System.Drawing.Point(753, 634);
this.endTextBox24.Name = "endTextBox24";
this.endTextBox24.Size = new System.Drawing.Size(163, 31);
this.endTextBox24.TabIndex = 98;
@@ -798,11 +800,11 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label24.AutoSize = true;
this.label24.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label24.Location = new System.Drawing.Point(592, 618);
+ this.label24.Location = new System.Drawing.Point(527, 637);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(156, 23);
+ this.label24.Size = new System.Drawing.Size(34, 23);
this.label24.TabIndex = 96;
- this.label24.Text = "Water Meter 24";
+ this.label24.Text = "24";
this.label24.Visible = false;
//
// exclamation23
@@ -810,7 +812,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation23.AutoSize = true;
this.exclamation23.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation23.ForeColor = System.Drawing.Color.Red;
- this.exclamation23.Location = new System.Drawing.Point(1116, 567);
+ this.exclamation23.Location = new System.Drawing.Point(918, 586);
this.exclamation23.Name = "exclamation23";
this.exclamation23.Size = new System.Drawing.Size(30, 38);
this.exclamation23.TabIndex = 95;
@@ -821,7 +823,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.startTextBox23.Enabled = false;
this.startTextBox23.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox23.Location = new System.Drawing.Point(769, 571);
+ this.startTextBox23.Location = new System.Drawing.Point(571, 590);
this.startTextBox23.Name = "startTextBox23";
this.startTextBox23.Size = new System.Drawing.Size(163, 31);
this.startTextBox23.TabIndex = 93;
@@ -834,7 +836,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endTextBox23.Enabled = false;
this.endTextBox23.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox23.Location = new System.Drawing.Point(951, 571);
+ this.endTextBox23.Location = new System.Drawing.Point(753, 590);
this.endTextBox23.Name = "endTextBox23";
this.endTextBox23.Size = new System.Drawing.Size(163, 31);
this.endTextBox23.TabIndex = 94;
@@ -847,11 +849,11 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label23.AutoSize = true;
this.label23.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label23.Location = new System.Drawing.Point(592, 574);
+ this.label23.Location = new System.Drawing.Point(527, 593);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(156, 23);
+ this.label23.Size = new System.Drawing.Size(34, 23);
this.label23.TabIndex = 92;
- this.label23.Text = "Water Meter 23";
+ this.label23.Text = "23";
this.label23.Visible = false;
//
// exclamation22
@@ -859,7 +861,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation22.AutoSize = true;
this.exclamation22.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation22.ForeColor = System.Drawing.Color.Red;
- this.exclamation22.Location = new System.Drawing.Point(1116, 523);
+ this.exclamation22.Location = new System.Drawing.Point(918, 542);
this.exclamation22.Name = "exclamation22";
this.exclamation22.Size = new System.Drawing.Size(30, 38);
this.exclamation22.TabIndex = 91;
@@ -870,7 +872,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.startTextBox22.Enabled = false;
this.startTextBox22.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox22.Location = new System.Drawing.Point(769, 527);
+ this.startTextBox22.Location = new System.Drawing.Point(571, 546);
this.startTextBox22.Name = "startTextBox22";
this.startTextBox22.Size = new System.Drawing.Size(163, 31);
this.startTextBox22.TabIndex = 89;
@@ -883,7 +885,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endTextBox22.Enabled = false;
this.endTextBox22.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox22.Location = new System.Drawing.Point(951, 527);
+ this.endTextBox22.Location = new System.Drawing.Point(753, 546);
this.endTextBox22.Name = "endTextBox22";
this.endTextBox22.Size = new System.Drawing.Size(163, 31);
this.endTextBox22.TabIndex = 90;
@@ -896,11 +898,11 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label22.AutoSize = true;
this.label22.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label22.Location = new System.Drawing.Point(592, 530);
+ this.label22.Location = new System.Drawing.Point(527, 549);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(156, 23);
+ this.label22.Size = new System.Drawing.Size(34, 23);
this.label22.TabIndex = 88;
- this.label22.Text = "Water Meter 22";
+ this.label22.Text = "22";
this.label22.Visible = false;
//
// exclamation21
@@ -908,7 +910,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation21.AutoSize = true;
this.exclamation21.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation21.ForeColor = System.Drawing.Color.Red;
- this.exclamation21.Location = new System.Drawing.Point(1116, 479);
+ this.exclamation21.Location = new System.Drawing.Point(918, 498);
this.exclamation21.Name = "exclamation21";
this.exclamation21.Size = new System.Drawing.Size(30, 38);
this.exclamation21.TabIndex = 87;
@@ -919,7 +921,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.startTextBox21.Enabled = false;
this.startTextBox21.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox21.Location = new System.Drawing.Point(769, 483);
+ this.startTextBox21.Location = new System.Drawing.Point(571, 502);
this.startTextBox21.Name = "startTextBox21";
this.startTextBox21.Size = new System.Drawing.Size(163, 31);
this.startTextBox21.TabIndex = 85;
@@ -932,7 +934,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endTextBox21.Enabled = false;
this.endTextBox21.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox21.Location = new System.Drawing.Point(951, 483);
+ this.endTextBox21.Location = new System.Drawing.Point(753, 502);
this.endTextBox21.Name = "endTextBox21";
this.endTextBox21.Size = new System.Drawing.Size(163, 31);
this.endTextBox21.TabIndex = 86;
@@ -945,11 +947,11 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label21.AutoSize = true;
this.label21.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label21.Location = new System.Drawing.Point(592, 486);
+ this.label21.Location = new System.Drawing.Point(527, 505);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(156, 23);
+ this.label21.Size = new System.Drawing.Size(34, 23);
this.label21.TabIndex = 84;
- this.label21.Text = "Water Meter 21";
+ this.label21.Text = "21";
this.label21.Visible = false;
//
// exclamation20
@@ -957,7 +959,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation20.AutoSize = true;
this.exclamation20.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation20.ForeColor = System.Drawing.Color.Red;
- this.exclamation20.Location = new System.Drawing.Point(1116, 435);
+ this.exclamation20.Location = new System.Drawing.Point(918, 454);
this.exclamation20.Name = "exclamation20";
this.exclamation20.Size = new System.Drawing.Size(30, 38);
this.exclamation20.TabIndex = 83;
@@ -968,7 +970,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.startTextBox20.Enabled = false;
this.startTextBox20.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox20.Location = new System.Drawing.Point(769, 439);
+ this.startTextBox20.Location = new System.Drawing.Point(571, 458);
this.startTextBox20.Name = "startTextBox20";
this.startTextBox20.Size = new System.Drawing.Size(163, 31);
this.startTextBox20.TabIndex = 81;
@@ -981,7 +983,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endTextBox20.Enabled = false;
this.endTextBox20.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox20.Location = new System.Drawing.Point(951, 439);
+ this.endTextBox20.Location = new System.Drawing.Point(753, 458);
this.endTextBox20.Name = "endTextBox20";
this.endTextBox20.Size = new System.Drawing.Size(163, 31);
this.endTextBox20.TabIndex = 82;
@@ -994,11 +996,11 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label20.AutoSize = true;
this.label20.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label20.Location = new System.Drawing.Point(592, 442);
+ this.label20.Location = new System.Drawing.Point(527, 461);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(156, 23);
+ this.label20.Size = new System.Drawing.Size(34, 23);
this.label20.TabIndex = 80;
- this.label20.Text = "Water Meter 20";
+ this.label20.Text = "20";
this.label20.Visible = false;
//
// exclamation19
@@ -1006,7 +1008,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation19.AutoSize = true;
this.exclamation19.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation19.ForeColor = System.Drawing.Color.Red;
- this.exclamation19.Location = new System.Drawing.Point(1116, 391);
+ this.exclamation19.Location = new System.Drawing.Point(918, 410);
this.exclamation19.Name = "exclamation19";
this.exclamation19.Size = new System.Drawing.Size(30, 38);
this.exclamation19.TabIndex = 79;
@@ -1017,7 +1019,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.startTextBox19.Enabled = false;
this.startTextBox19.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox19.Location = new System.Drawing.Point(769, 395);
+ this.startTextBox19.Location = new System.Drawing.Point(571, 414);
this.startTextBox19.Name = "startTextBox19";
this.startTextBox19.Size = new System.Drawing.Size(163, 31);
this.startTextBox19.TabIndex = 77;
@@ -1030,7 +1032,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endTextBox19.Enabled = false;
this.endTextBox19.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox19.Location = new System.Drawing.Point(951, 395);
+ this.endTextBox19.Location = new System.Drawing.Point(753, 414);
this.endTextBox19.Name = "endTextBox19";
this.endTextBox19.Size = new System.Drawing.Size(163, 31);
this.endTextBox19.TabIndex = 78;
@@ -1043,11 +1045,11 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label19.AutoSize = true;
this.label19.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label19.Location = new System.Drawing.Point(592, 398);
+ this.label19.Location = new System.Drawing.Point(527, 417);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(156, 23);
+ this.label19.Size = new System.Drawing.Size(34, 23);
this.label19.TabIndex = 76;
- this.label19.Text = "Water Meter 19";
+ this.label19.Text = "19";
this.label19.Visible = false;
//
// exclamation18
@@ -1055,7 +1057,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation18.AutoSize = true;
this.exclamation18.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation18.ForeColor = System.Drawing.Color.Red;
- this.exclamation18.Location = new System.Drawing.Point(1116, 347);
+ this.exclamation18.Location = new System.Drawing.Point(918, 366);
this.exclamation18.Name = "exclamation18";
this.exclamation18.Size = new System.Drawing.Size(30, 38);
this.exclamation18.TabIndex = 75;
@@ -1067,7 +1069,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation17.AutoSize = true;
this.exclamation17.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation17.ForeColor = System.Drawing.Color.Red;
- this.exclamation17.Location = new System.Drawing.Point(1116, 303);
+ this.exclamation17.Location = new System.Drawing.Point(918, 322);
this.exclamation17.Name = "exclamation17";
this.exclamation17.Size = new System.Drawing.Size(30, 38);
this.exclamation17.TabIndex = 71;
@@ -1078,7 +1080,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.startTextBox18.Enabled = false;
this.startTextBox18.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox18.Location = new System.Drawing.Point(769, 351);
+ this.startTextBox18.Location = new System.Drawing.Point(571, 370);
this.startTextBox18.Name = "startTextBox18";
this.startTextBox18.Size = new System.Drawing.Size(163, 31);
this.startTextBox18.TabIndex = 73;
@@ -1092,7 +1094,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation16.AutoSize = true;
this.exclamation16.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation16.ForeColor = System.Drawing.Color.Red;
- this.exclamation16.Location = new System.Drawing.Point(1116, 259);
+ this.exclamation16.Location = new System.Drawing.Point(918, 278);
this.exclamation16.Name = "exclamation16";
this.exclamation16.Size = new System.Drawing.Size(30, 38);
this.exclamation16.TabIndex = 67;
@@ -1103,7 +1105,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endTextBox18.Enabled = false;
this.endTextBox18.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox18.Location = new System.Drawing.Point(951, 351);
+ this.endTextBox18.Location = new System.Drawing.Point(753, 370);
this.endTextBox18.Name = "endTextBox18";
this.endTextBox18.Size = new System.Drawing.Size(163, 31);
this.endTextBox18.TabIndex = 74;
@@ -1116,18 +1118,18 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label18.AutoSize = true;
this.label18.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label18.Location = new System.Drawing.Point(592, 354);
+ this.label18.Location = new System.Drawing.Point(527, 373);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(156, 23);
+ this.label18.Size = new System.Drawing.Size(34, 23);
this.label18.TabIndex = 72;
- this.label18.Text = "Water Meter 18";
+ this.label18.Text = "18";
this.label18.Visible = false;
//
// startTextBox17
//
this.startTextBox17.Enabled = false;
this.startTextBox17.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox17.Location = new System.Drawing.Point(769, 307);
+ this.startTextBox17.Location = new System.Drawing.Point(571, 326);
this.startTextBox17.Name = "startTextBox17";
this.startTextBox17.Size = new System.Drawing.Size(163, 31);
this.startTextBox17.TabIndex = 69;
@@ -1141,7 +1143,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation15.AutoSize = true;
this.exclamation15.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation15.ForeColor = System.Drawing.Color.Red;
- this.exclamation15.Location = new System.Drawing.Point(1116, 215);
+ this.exclamation15.Location = new System.Drawing.Point(918, 234);
this.exclamation15.Name = "exclamation15";
this.exclamation15.Size = new System.Drawing.Size(30, 38);
this.exclamation15.TabIndex = 63;
@@ -1152,7 +1154,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endTextBox17.Enabled = false;
this.endTextBox17.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox17.Location = new System.Drawing.Point(951, 307);
+ this.endTextBox17.Location = new System.Drawing.Point(753, 326);
this.endTextBox17.Name = "endTextBox17";
this.endTextBox17.Size = new System.Drawing.Size(163, 31);
this.endTextBox17.TabIndex = 70;
@@ -1165,18 +1167,18 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label17.AutoSize = true;
this.label17.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label17.Location = new System.Drawing.Point(592, 310);
+ this.label17.Location = new System.Drawing.Point(527, 329);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(156, 23);
+ this.label17.Size = new System.Drawing.Size(34, 23);
this.label17.TabIndex = 68;
- this.label17.Text = "Water Meter 17";
+ this.label17.Text = "17";
this.label17.Visible = false;
//
// startTextBox16
//
this.startTextBox16.Enabled = false;
this.startTextBox16.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox16.Location = new System.Drawing.Point(769, 263);
+ this.startTextBox16.Location = new System.Drawing.Point(571, 282);
this.startTextBox16.Name = "startTextBox16";
this.startTextBox16.Size = new System.Drawing.Size(163, 31);
this.startTextBox16.TabIndex = 65;
@@ -1190,7 +1192,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation14.AutoSize = true;
this.exclamation14.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation14.ForeColor = System.Drawing.Color.Red;
- this.exclamation14.Location = new System.Drawing.Point(1116, 171);
+ this.exclamation14.Location = new System.Drawing.Point(918, 190);
this.exclamation14.Name = "exclamation14";
this.exclamation14.Size = new System.Drawing.Size(30, 38);
this.exclamation14.TabIndex = 59;
@@ -1201,7 +1203,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endTextBox16.Enabled = false;
this.endTextBox16.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox16.Location = new System.Drawing.Point(951, 263);
+ this.endTextBox16.Location = new System.Drawing.Point(753, 282);
this.endTextBox16.Name = "endTextBox16";
this.endTextBox16.Size = new System.Drawing.Size(163, 31);
this.endTextBox16.TabIndex = 66;
@@ -1214,18 +1216,18 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label16.AutoSize = true;
this.label16.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label16.Location = new System.Drawing.Point(592, 266);
+ this.label16.Location = new System.Drawing.Point(527, 285);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(156, 23);
+ this.label16.Size = new System.Drawing.Size(34, 23);
this.label16.TabIndex = 64;
- this.label16.Text = "Water Meter 16";
+ this.label16.Text = "16";
this.label16.Visible = false;
//
// startTextBox15
//
this.startTextBox15.Enabled = false;
this.startTextBox15.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox15.Location = new System.Drawing.Point(769, 219);
+ this.startTextBox15.Location = new System.Drawing.Point(571, 238);
this.startTextBox15.Name = "startTextBox15";
this.startTextBox15.Size = new System.Drawing.Size(163, 31);
this.startTextBox15.TabIndex = 61;
@@ -1239,7 +1241,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.exclamation13.AutoSize = true;
this.exclamation13.Font = new System.Drawing.Font("Verdana", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.exclamation13.ForeColor = System.Drawing.Color.Red;
- this.exclamation13.Location = new System.Drawing.Point(1116, 127);
+ this.exclamation13.Location = new System.Drawing.Point(918, 146);
this.exclamation13.Name = "exclamation13";
this.exclamation13.Size = new System.Drawing.Size(30, 38);
this.exclamation13.TabIndex = 55;
@@ -1250,7 +1252,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endTextBox15.Enabled = false;
this.endTextBox15.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox15.Location = new System.Drawing.Point(951, 219);
+ this.endTextBox15.Location = new System.Drawing.Point(753, 238);
this.endTextBox15.Name = "endTextBox15";
this.endTextBox15.Size = new System.Drawing.Size(163, 31);
this.endTextBox15.TabIndex = 62;
@@ -1263,18 +1265,18 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label15.AutoSize = true;
this.label15.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label15.Location = new System.Drawing.Point(592, 222);
+ this.label15.Location = new System.Drawing.Point(527, 241);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(156, 23);
+ this.label15.Size = new System.Drawing.Size(34, 23);
this.label15.TabIndex = 60;
- this.label15.Text = "Water Meter 15";
+ this.label15.Text = "15";
this.label15.Visible = false;
//
// startTextBox14
//
this.startTextBox14.Enabled = false;
this.startTextBox14.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox14.Location = new System.Drawing.Point(769, 175);
+ this.startTextBox14.Location = new System.Drawing.Point(571, 194);
this.startTextBox14.Name = "startTextBox14";
this.startTextBox14.Size = new System.Drawing.Size(163, 31);
this.startTextBox14.TabIndex = 57;
@@ -1287,7 +1289,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endLabel2.AutoSize = true;
this.endLabel2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endLabel2.Location = new System.Drawing.Point(1009, 99);
+ this.endLabel2.Location = new System.Drawing.Point(811, 118);
this.endLabel2.Name = "endLabel2";
this.endLabel2.Size = new System.Drawing.Size(46, 23);
this.endLabel2.TabIndex = 51;
@@ -1297,7 +1299,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endTextBox14.Enabled = false;
this.endTextBox14.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox14.Location = new System.Drawing.Point(951, 175);
+ this.endTextBox14.Location = new System.Drawing.Point(753, 194);
this.endTextBox14.Name = "endTextBox14";
this.endTextBox14.Size = new System.Drawing.Size(163, 31);
this.endTextBox14.TabIndex = 58;
@@ -1310,18 +1312,18 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label14.AutoSize = true;
this.label14.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label14.Location = new System.Drawing.Point(592, 178);
+ this.label14.Location = new System.Drawing.Point(527, 197);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(156, 23);
+ this.label14.Size = new System.Drawing.Size(34, 23);
this.label14.TabIndex = 56;
- this.label14.Text = "Water Meter 14";
+ this.label14.Text = "14";
this.label14.Visible = false;
//
// startTextBox13
//
this.startTextBox13.Enabled = false;
this.startTextBox13.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startTextBox13.Location = new System.Drawing.Point(769, 131);
+ this.startTextBox13.Location = new System.Drawing.Point(571, 150);
this.startTextBox13.Name = "startTextBox13";
this.startTextBox13.Size = new System.Drawing.Size(163, 31);
this.startTextBox13.TabIndex = 53;
@@ -1334,7 +1336,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.startLabel2.AutoSize = true;
this.startLabel2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.startLabel2.Location = new System.Drawing.Point(825, 99);
+ this.startLabel2.Location = new System.Drawing.Point(627, 118);
this.startLabel2.Name = "startLabel2";
this.startLabel2.Size = new System.Drawing.Size(56, 23);
this.startLabel2.TabIndex = 50;
@@ -1344,7 +1346,7 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.endTextBox13.Enabled = false;
this.endTextBox13.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.endTextBox13.Location = new System.Drawing.Point(951, 131);
+ this.endTextBox13.Location = new System.Drawing.Point(753, 150);
this.endTextBox13.Name = "endTextBox13";
this.endTextBox13.Size = new System.Drawing.Size(163, 31);
this.endTextBox13.TabIndex = 54;
@@ -1357,17 +1359,17 @@ namespace TBF.Rig.DataEntry.Standard24
//
this.label13.AutoSize = true;
this.label13.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.label13.Location = new System.Drawing.Point(592, 134);
+ this.label13.Location = new System.Drawing.Point(527, 153);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(156, 23);
+ this.label13.Size = new System.Drawing.Size(34, 23);
this.label13.TabIndex = 52;
- this.label13.Text = "Water Meter 13";
+ this.label13.Text = "13";
this.label13.Visible = false;
//
// largeTextBox
//
this.largeTextBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 48F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.largeTextBox.Location = new System.Drawing.Point(200, 10);
+ this.largeTextBox.Location = new System.Drawing.Point(66, 29);
this.largeTextBox.Name = "largeTextBox";
this.largeTextBox.Size = new System.Drawing.Size(849, 80);
this.largeTextBox.TabIndex = 101;
@@ -1377,19 +1379,32 @@ namespace TBF.Rig.DataEntry.Standard24
this.largeExclamationLabel.AutoSize = true;
this.largeExclamationLabel.Font = new System.Drawing.Font("Verdana", 48F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.largeExclamationLabel.ForeColor = System.Drawing.Color.Red;
- this.largeExclamationLabel.Location = new System.Drawing.Point(1055, 9);
+ this.largeExclamationLabel.Location = new System.Drawing.Point(921, 28);
this.largeExclamationLabel.Name = "largeExclamationLabel";
this.largeExclamationLabel.Size = new System.Drawing.Size(59, 78);
this.largeExclamationLabel.TabIndex = 102;
this.largeExclamationLabel.Text = "!";
this.largeExclamationLabel.Visible = false;
//
+ // unitComboBox
+ //
+ this.unitComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.unitComboBox.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.unitComboBox.FormattingEnabled = true;
+ this.unitComboBox.Location = new System.Drawing.Point(999, 131);
+ this.unitComboBox.Name = "unitComboBox";
+ this.unitComboBox.Size = new System.Drawing.Size(123, 31);
+ this.unitComboBox.TabIndex = 103;
+ this.unitComboBox.SelectedIndexChanged += new System.EventHandler(this.unitComboBox_SelectedIndexChanged);
+ this.unitComboBox.TextChanged += new System.EventHandler(this.unitComboBox_TextChanged);
+ //
// TestStartEndForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGray;
- this.ClientSize = new System.Drawing.Size(1292, 661);
+ this.ClientSize = new System.Drawing.Size(1163, 678);
+ this.Controls.Add(this.unitComboBox);
this.Controls.Add(this.largeExclamationLabel);
this.Controls.Add(this.largeTextBox);
this.Controls.Add(this.exclamation24);
@@ -1499,7 +1514,7 @@ namespace TBF.Rig.DataEntry.Standard24
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "End States";
this.TopMost = true;
- this.Load += new System.EventHandler(this.CycleEndForm_Load);
+ this.Load += new System.EventHandler(this.TestStartEndForm_Load);
this.ResumeLayout(false);
this.PerformLayout();
@@ -1610,6 +1625,7 @@ namespace TBF.Rig.DataEntry.Standard24
private System.Windows.Forms.Label label13;
private System.Windows.Forms.TextBox largeTextBox;
private System.Windows.Forms.Label largeExclamationLabel;
+ private System.Windows.Forms.ComboBox unitComboBox;
}
}
\ No newline at end of file
diff --git a/TBF/Rig/TestMethods/FixedStart/FixedStartSeq.cs b/TBF/Rig/TestMethods/FixedStart/FixedStartSeq.cs
index c2ac1da54..516ec46d7 100644
--- a/TBF/Rig/TestMethods/FixedStart/FixedStartSeq.cs
+++ b/TBF/Rig/TestMethods/FixedStart/FixedStartSeq.cs
@@ -738,12 +738,18 @@ namespace TBF.Rig.TestMethods.FixedStart
{
GenericDevices.IRegReader rr = sensPath.RegisterReaders[i];
- if (rr is Rig.Elde.FixedStartRegisterReader.RegisterReader)
- (rr as Rig.Elde.FixedStartRegisterReader.RegisterReader).EndWMState = dataEntryCmpnt.WMEndState(i);
+ if (rr is Rig.Elde.FixedStartRegisterReader.RegisterReader)
+ {
+ (rr as Rig.Elde.FixedStartRegisterReader.RegisterReader).BeginWMState = dataEntryCmpnt.WMStartState(i);
+ (rr as Rig.Elde.FixedStartRegisterReader.RegisterReader).EndWMState = dataEntryCmpnt.WMEndState(i);
+ }
- if (rr is Rig.Network.Camera.RoiForFixedStart.Roi)
- (rr as Rig.Network.Camera.RoiForFixedStart.Roi).EndWMState = dataEntryCmpnt.WMEndState(i);
- }
+ if (rr is Rig.Network.Camera.RoiForFixedStart.Roi)
+ {
+ (rr as Rig.Network.Camera.RoiForFixedStart.Roi).BeginWMState = dataEntryCmpnt.WMStartState(i);
+ (rr as Rig.Network.Camera.RoiForFixedStart.Roi).EndWMState = dataEntryCmpnt.WMEndState(i);
+ }
+ }
}
if (dataEntryCmpnt is GenericDevices.IDataEntryForCamera && (dataEntryCmpnt as GenericDevices.IDataEntryForCamera).SaveImages)
diff --git a/TBF/Rig/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TBF/Rig/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
index c99f9a22d..1dc3c2ced 100644
--- a/TBF/Rig/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+++ b/TBF/Rig/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
@@ -925,11 +925,17 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollection
{
GenericDevices.IRegReader rr = sensPath.RegisterReaders[i];
- if (rr is Rig.Elde.FixedStartRegisterReader.RegisterReader)
- (rr as Rig.Elde.FixedStartRegisterReader.RegisterReader).EndWMState = dataEntryCmpnt.WMEndState(i);
+ if (rr is Rig.Elde.FixedStartRegisterReader.RegisterReader)
+ {
+ (rr as Rig.Elde.FixedStartRegisterReader.RegisterReader).BeginWMState = dataEntryCmpnt.WMStartState(i);
+ (rr as Rig.Elde.FixedStartRegisterReader.RegisterReader).EndWMState = dataEntryCmpnt.WMEndState(i);
+ }
- if (rr is Rig.Network.Camera.RoiForFixedStart.Roi)
- (rr as Rig.Network.Camera.RoiForFixedStart.Roi).EndWMState = dataEntryCmpnt.WMEndState(i);
+ if (rr is Rig.Network.Camera.RoiForFixedStart.Roi)
+ {
+ (rr as Rig.Network.Camera.RoiForFixedStart.Roi).BeginWMState = dataEntryCmpnt.WMStartState(i);
+ (rr as Rig.Network.Camera.RoiForFixedStart.Roi).EndWMState = dataEntryCmpnt.WMEndState(i);
+ }
}
}
diff --git a/TBF/Rig/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs b/TBF/Rig/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs
index ade0deda3..f638f5ef2 100644
--- a/TBF/Rig/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs
+++ b/TBF/Rig/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs
@@ -659,12 +659,18 @@ namespace TBF.Rig.TestMethods.FixedStartTankCollection
{
GenericDevices.IRegReader rr = sensPath.RegisterReaders[i];
- if (rr is Rig.Elde.FixedStartRegisterReader.RegisterReader)
- (rr as Rig.Elde.FixedStartRegisterReader.RegisterReader).EndWMState = dataEntryCmpnt.WMEndState(i);
+ if (rr is Rig.Elde.FixedStartRegisterReader.RegisterReader)
+ {
+ (rr as Rig.Elde.FixedStartRegisterReader.RegisterReader).BeginWMState = dataEntryCmpnt.WMStartState(i);
+ (rr as Rig.Elde.FixedStartRegisterReader.RegisterReader).EndWMState = dataEntryCmpnt.WMEndState(i);
+ }
- if (rr is Rig.Network.Camera.RoiForFixedStart.Roi)
- (rr as Rig.Network.Camera.RoiForFixedStart.Roi).EndWMState = dataEntryCmpnt.WMEndState(i);
- }
+ if (rr is Rig.Network.Camera.RoiForFixedStart.Roi)
+ {
+ (rr as Rig.Network.Camera.RoiForFixedStart.Roi).BeginWMState = dataEntryCmpnt.WMStartState(i);
+ (rr as Rig.Network.Camera.RoiForFixedStart.Roi).EndWMState = dataEntryCmpnt.WMEndState(i);
+ }
+ }
if (dataEntryCmpnt is GenericDevices.IDataEntryForCamera && (dataEntryCmpnt as GenericDevices.IDataEntryForCamera).SaveImages)
{