michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MOre bug-fixes in DataEntry.Standard24, version 1.5.51.

Browse Source
This commit is contained in:
Milan Hanajik
2015-05-26 14:34:56 +02:00
parent 7831e510d8
commit d7363c773f
2 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.cs
+38 -35
View File
@@ -43,43 +43,9 @@ namespace TBF.BenchControl.DataEntry.Standard24
IList<TextBox> enabledTextBoxes; IList<TextBox> enabledTextBoxes;
/// <summary> /// <summary>
/// Constructor to fill in start states /// Parameterless constructor iniitalizing common part
/// </summary> /// </summary>
/// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
public TestStartEndForm(int waterMetersCount, bool[] disabled)
{
endStates = false;
this.WaterMetersCount = waterMetersCount;
this.disabled = disabled;
WMStartState = new float[waterMetersCount];
WMStartStateStr = new string[waterMetersCount];
}
/// <summary>
/// Constructor to fill in end states
/// </summary>
/// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
public TestStartEndForm(int waterMetersCount, string[] wmStartStateStr, bool[] disabled,
float refVolume, float errLimLo, float errLimHi)
{
endStates = true;
this.WaterMetersCount = waterMetersCount;
if (wmStartStateStr == null || wmStartStateStr.Length != waterMetersCount)
throw (new Exception("Invalid 'wmStartStateStr' argument"));
this.WMStartStateStr = wmStartStateStr;
this.disabled = disabled;
this.refVolume = refVolume;
this.warningLimLo = 2 * errLimLo;
this.warningLimHi = 2 * errLimHi;
WMEndState = new float[waterMetersCount];
}
/// <summary> Parameterless constructor for all watermeters </summary>
public TestStartEndForm() public TestStartEndForm()
: this(Program.WMsCount, null)
{ {
InitializeComponent(); InitializeComponent();
@@ -103,6 +69,43 @@ namespace TBF.BenchControl.DataEntry.Standard24
StartForceCloseHandler(); StartForceCloseHandler();
} }
/// <summary>
/// Constructor to fill in start states
/// </summary>
/// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
public TestStartEndForm(int waterMetersCount, bool[] disabled)
: this()
{
endStates = false;
this.WaterMetersCount = waterMetersCount;
this.disabled = disabled;
WMStartState = new float[waterMetersCount];
WMStartStateStr = new string[waterMetersCount];
}
/// <summary>
/// Constructor to fill in end states
/// </summary>
/// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
public TestStartEndForm(int waterMetersCount, string[] wmStartStateStr, bool[] disabled,
float refVolume, float errLimLo, float errLimHi)
: this()
{
endStates = true;
this.WaterMetersCount = waterMetersCount;
if (wmStartStateStr == null || wmStartStateStr.Length != waterMetersCount)
throw (new Exception("Invalid 'wmStartStateStr' argument"));
this.WMStartStateStr = wmStartStateStr;
this.disabled = disabled;
this.refVolume = refVolume;
this.warningLimLo = 2 * errLimLo;
this.warningLimHi = 2 * errLimHi;
WMEndState = new float[waterMetersCount];
}
private void CycleEndForm_Load(object sender, EventArgs e) private void CycleEndForm_Load(object sender, EventArgs e)
{ {
Localize(); Localize();
TestBenchFramework/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("1.5.50.1")] [assembly: AssemblyVersion("1.5.51.1")]
[assembly: AssemblyFileVersion("1.5.50.1")] [assembly: AssemblyFileVersion("1.5.51.1")]