Compare commits

...
88 changed files with 183 additions and 168 deletions
+2 -2
View File
@@ -19,7 +19,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
<DefineConstants>TRACE;DEBUG;DEWA_300</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -30,7 +30,7 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;MUNICH</DefineConstants>
<DefineConstants>TRACE;DEWA_300</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
+2 -2
View File
@@ -19,7 +19,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
<DefineConstants>TRACE;DEBUG;DEWA_300</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
@@ -29,7 +29,7 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;MUNICH</DefineConstants>
<DefineConstants>TRACE;DEWA_300</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
+2 -2
View File
@@ -21,7 +21,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
<DefineConstants>TRACE;DEBUG;DEWA_300</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -32,7 +32,7 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;MUNICH</DefineConstants>
<DefineConstants>TRACE;DEWA_300</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
@@ -364,7 +364,7 @@ namespace TBF.BenchControl.DataEntry.Combined
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoSize = true;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(732, 593);
this.Controls.Add(this.orderGroupBox);
this.Controls.Add(this.clearButton);
@@ -379,7 +379,7 @@ namespace TBF.BenchControl.DataEntry.Combined
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(822, 542);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox2);
@@ -299,7 +299,7 @@ namespace TBF.BenchControl.DataEntry.Combined
//{
// double endState = Utils.ParseUDouble(main1EndTextBox.Text);
// double startState = Utils.ParseUDouble(main1StartTextBox.Text);
// err = 100.0 * (endState - startState - refVolume) / refVolume;
// err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
//}
//catch { };
@@ -313,7 +313,7 @@ namespace TBF.BenchControl.DataEntry.Combined
//{
// double endState = Utils.ParseUDouble(aux1EndTextBox.Text);
// double startState = Utils.ParseUDouble(aux1StartTextBox.Text);
// err = 100.0 * (endState - startState - refVolume) / refVolume;
// err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
//}
//catch { err = 1000.0f; };
@@ -327,7 +327,7 @@ namespace TBF.BenchControl.DataEntry.Combined
//{
// double endState = Utils.ParseUDouble(main2EndTextBox.Text);
// double startState = Utils.ParseUDouble(main2StartTextBox.Text);
// err = 100.0 * (endState - startState - refVolume) / refVolume;
// err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
//}
//catch { err = 1000.0f; };
@@ -341,7 +341,7 @@ namespace TBF.BenchControl.DataEntry.Combined
//{
// double endState = Utils.ParseUDouble(aux2EndTextBox.Text);
// double startState = Utils.ParseUDouble(aux2StartTextBox.Text);
// err = 100.0 * (endState - startState - refVolume) / refVolume;
// err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
//}
//catch { err = 1000.0f; };
@@ -355,7 +355,7 @@ namespace TBF.BenchControl.DataEntry.Combined
//{
// double endState = Utils.ParseUDouble(main3EndTextBox.Text);
// double startState = Utils.ParseUDouble(main3StartTextBox.Text);
// err = 100.0 * (endState - startState - refVolume) / refVolume;
// err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
//}
//catch { err = 1000.0f; };
@@ -369,7 +369,7 @@ namespace TBF.BenchControl.DataEntry.Combined
//{
// double endState = Utils.ParseUDouble(aux3EndTextBox.Text);
// double startState = Utils.ParseUDouble(aux3StartTextBox.Text);
// err = 100.0 * (endState - startState - refVolume) / refVolume;
// err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
//}
//catch { err = 1000.0f; };
@@ -420,7 +420,7 @@ namespace TBF.BenchControl.DataEntry.Combined
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(729, 471);
this.Controls.Add(this.endLabel);
this.Controls.Add(this.startLabel);
@@ -881,7 +881,7 @@ namespace TBF.BenchControl.DataEntry.Fewa
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.Controls.Add(this.suffixComboBox24);
this.Controls.Add(this.suffixComboBox23);
this.Controls.Add(this.suffixComboBox22);
+1 -1
View File
@@ -532,7 +532,7 @@ namespace TBF.BenchControl.DataEntry.Fewa
//
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(959, 489);
this.Controls.Add(this.textBox24);
this.Controls.Add(this.label24);
@@ -322,7 +322,7 @@ namespace TBF.BenchControl.DataEntry.Fewa
{
double endState = Utils.ParseUDouble(endTextBoxes[wmIx].Text);
double startState = Utils.ParseUDouble(startTextBoxes[wmIx].Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
@@ -1388,7 +1388,7 @@ namespace TBF.BenchControl.DataEntry.Fewa
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(1292, 661);
this.Controls.Add(this.largeExclamationLabel);
this.Controls.Add(this.largeTextBox);
@@ -575,7 +575,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.Controls.Add(this.pictureBox12);
this.Controls.Add(this.pictureBox11);
this.Controls.Add(this.pictureBox10);
@@ -248,7 +248,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(559, 566);
this.Controls.Add(this.groupBox6);
this.Controls.Add(this.groupBox5);
@@ -363,7 +363,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
{
double endState = Utils.ParseUDouble(endTextBox1.Text);
double startState = Utils.ParseUDouble(startTextBox1.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { };
exclamation1.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -375,7 +375,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
{
double endState = Utils.ParseUDouble(endTextBox2.Text);
double startState = Utils.ParseUDouble(startTextBox2.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation2.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -387,7 +387,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
{
double endState = Utils.ParseUDouble(endTextBox3.Text);
double startState = Utils.ParseUDouble(startTextBox3.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation3.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -399,7 +399,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
{
double endState = Utils.ParseUDouble(endTextBox4.Text);
double startState = Utils.ParseUDouble(startTextBox4.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation4.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -411,7 +411,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
{
double endState = Utils.ParseUDouble(endTextBox5.Text);
double startState = Utils.ParseUDouble(startTextBox5.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation5.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -423,7 +423,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
{
double endState = Utils.ParseUDouble(endTextBox6.Text);
double startState = Utils.ParseUDouble(startTextBox6.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation6.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -435,7 +435,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
{
double endState = Utils.ParseUDouble(endTextBox7.Text);
double startState = Utils.ParseUDouble(startTextBox7.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation7.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -447,7 +447,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
{
double endState = Utils.ParseUDouble(endTextBox8.Text);
double startState = Utils.ParseUDouble(startTextBox8.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation8.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -459,7 +459,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
{
double endState = Utils.ParseUDouble(endTextBox9.Text);
double startState = Utils.ParseUDouble(startTextBox9.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation9.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -472,7 +472,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
{
double endState = Utils.ParseUDouble(endTextBox10.Text);
double startState = Utils.ParseUDouble(startTextBox10.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation10.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -485,7 +485,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
{
double endState = Utils.ParseUDouble(endTextBox11.Text);
double startState = Utils.ParseUDouble(startTextBox11.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation11.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -497,7 +497,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
{
double endState = Utils.ParseUDouble(endTextBox12.Text);
double startState = Utils.ParseUDouble(startTextBox12.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation12.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -1316,7 +1316,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(1292, 613);
this.Controls.Add(this.unitsLabel);
this.Controls.Add(this.unitsComboBox);
@@ -389,7 +389,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.Controls.Add(this.pictureBox6);
this.Controls.Add(this.pictureBox5);
this.Controls.Add(this.pictureBox4);
@@ -248,7 +248,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(559, 566);
this.Controls.Add(this.groupBox6);
this.Controls.Add(this.groupBox5);
@@ -355,7 +355,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
{
double endState = Utils.ParseUDouble(endTextBox1.Text);
double startState = Utils.ParseUDouble(startTextBox1.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { };
exclamation1.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -367,7 +367,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
{
double endState = Utils.ParseUDouble(endTextBox2.Text);
double startState = Utils.ParseUDouble(startTextBox2.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation2.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -379,7 +379,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
{
double endState = Utils.ParseUDouble(endTextBox3.Text);
double startState = Utils.ParseUDouble(startTextBox3.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation3.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -391,7 +391,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
{
double endState = Utils.ParseUDouble(endTextBox4.Text);
double startState = Utils.ParseUDouble(startTextBox4.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation4.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -403,7 +403,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
{
double endState = Utils.ParseUDouble(endTextBox5.Text);
double startState = Utils.ParseUDouble(startTextBox5.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation5.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -415,7 +415,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
{
double endState = Utils.ParseUDouble(endTextBox6.Text);
double startState = Utils.ParseUDouble(startTextBox6.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation6.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -716,7 +716,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(1292, 338);
this.Controls.Add(this.unitsLabel);
this.Controls.Add(this.unitsComboBox);
@@ -210,7 +210,7 @@ namespace TBF.BenchControl.DataEntry.Munich
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoSize = true;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(687, 492);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox2);
+1 -1
View File
@@ -455,7 +455,7 @@ namespace TBF.BenchControl.DataEntry.Munich
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(822, 542);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox2);
@@ -239,7 +239,7 @@ namespace TBF.BenchControl.DataEntry.Munich3
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.Controls.Add(this.groupBox6);
this.Controls.Add(this.groupBox5);
this.Controls.Add(this.groupBox4);
+1 -1
View File
@@ -437,7 +437,7 @@ namespace TBF.BenchControl.DataEntry.Munich3
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(719, 746);
this.Controls.Add(this.groupBox6);
this.Controls.Add(this.groupBox5);
@@ -238,7 +238,7 @@ namespace TBF.BenchControl.DataEntry.Munich3
{
double endState = Utils.ParseUDouble(endTextBoxes[i].Text) * regReaders[i].LtrsPerPulse; ;
double startState = Utils.ParseUDouble(startTextBoxes[i].Text) * regReaders[i].LtrsPerPulse; ;
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
@@ -438,7 +438,7 @@ namespace TBF.BenchControl.DataEntry.Munich3
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(729, 586);
this.Controls.Add(this.endLabel);
this.Controls.Add(this.startLabel);
@@ -625,7 +625,7 @@ namespace TBF.BenchControl.DataEntry.Single
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.Controls.Add(this.checkBox24);
this.Controls.Add(this.comboBox24);
this.Controls.Add(this.label24);
+1 -1
View File
@@ -532,7 +532,7 @@ namespace TBF.BenchControl.DataEntry.Single
//
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(959, 489);
this.Controls.Add(this.textBox24);
this.Controls.Add(this.label24);
@@ -277,7 +277,7 @@ namespace TBF.BenchControl.DataEntry.Single
{
double endState = Utils.ParseUDouble(endTextBoxes[wmIx].Text);
double startState = Utils.ParseUDouble(startTextBoxes[wmIx].Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
@@ -47,7 +47,7 @@ namespace TBF.BenchControl.DataEntry.Single
//
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.BackColor = System.Drawing.Color.DarkGoldenrod;
this.splitContainer1.Panel2.BackColor = System.Drawing.Color.DarkGray;
this.splitContainer1.Size = new System.Drawing.Size(270, 237);
this.splitContainer1.SplitterDistance = 90;
this.splitContainer1.SplitterWidth = 1;
@@ -575,7 +575,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.Controls.Add(this.pictureBox12);
this.Controls.Add(this.pictureBox11);
this.Controls.Add(this.pictureBox10);
@@ -292,7 +292,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
//
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(542, 489);
this.Controls.Add(this.textBox12);
this.Controls.Add(this.label12);
@@ -298,7 +298,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
{
double endState = Utils.ParseUDouble(endTextBox1.Text);
double startState = Utils.ParseUDouble(startTextBox1.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { };
exclamation1.Visible = fixedErrorLimits ? ((err < warningLimLo) || (warningLimHi < err)) : ((err < -6) || (+6 < err));
@@ -310,7 +310,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
{
double endState = Utils.ParseUDouble(endTextBox2.Text);
double startState = Utils.ParseUDouble(startTextBox2.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation2.Visible = fixedErrorLimits ? ((err < warningLimLo) || (warningLimHi < err)) : ((err < -6) || (+6 < err));
@@ -322,7 +322,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
{
double endState = Utils.ParseUDouble(endTextBox3.Text);
double startState = Utils.ParseUDouble(startTextBox3.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation3.Visible = fixedErrorLimits ? ((err < warningLimLo) || (warningLimHi < err)) : ((err < -6) || (+6 < err));
@@ -334,7 +334,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
{
double endState = Utils.ParseUDouble(endTextBox4.Text);
double startState = Utils.ParseUDouble(startTextBox4.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation4.Visible = fixedErrorLimits ? ((err < warningLimLo) || (warningLimHi < err)) : ((err < -6) || (+6 < err));
@@ -346,7 +346,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
{
double endState = Utils.ParseUDouble(endTextBox5.Text);
double startState = Utils.ParseUDouble(startTextBox5.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation5.Visible = fixedErrorLimits ? ((err < warningLimLo) || (warningLimHi < err)) : ((err < -6) || (+6 < err));
@@ -358,7 +358,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
{
double endState = Utils.ParseUDouble(endTextBox6.Text);
double startState = Utils.ParseUDouble(startTextBox6.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation6.Visible = fixedErrorLimits ? ((err < warningLimLo) || (warningLimHi < err)) : ((err < -6) || (+6 < err));
@@ -370,7 +370,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
{
double endState = Utils.ParseUDouble(endTextBox7.Text);
double startState = Utils.ParseUDouble(startTextBox7.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation7.Visible = fixedErrorLimits ? ((err < warningLimLo) || (warningLimHi < err)) : ((err < -6) || (+6 < err));
@@ -382,7 +382,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
{
double endState = Utils.ParseUDouble(endTextBox8.Text);
double startState = Utils.ParseUDouble(startTextBox8.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation8.Visible = fixedErrorLimits ? ((err < warningLimLo) || (warningLimHi < err)) : ((err < -6) || (+6 < err));
@@ -394,7 +394,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
{
double endState = Utils.ParseUDouble(endTextBox9.Text);
double startState = Utils.ParseUDouble(startTextBox9.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation9.Visible = fixedErrorLimits ? ((err < warningLimLo) || (warningLimHi < err)) : ((err < -6) || (+6 < err));
@@ -407,7 +407,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
{
double endState = Utils.ParseUDouble(endTextBox10.Text);
double startState = Utils.ParseUDouble(startTextBox10.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation10.Visible = fixedErrorLimits ? ((err < warningLimLo) || (warningLimHi < err)) : ((err < -6) || (+6 < err));
@@ -420,7 +420,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
{
double endState = Utils.ParseUDouble(endTextBox11.Text);
double startState = Utils.ParseUDouble(startTextBox11.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation11.Visible = fixedErrorLimits ? ((err < warningLimLo) || (warningLimHi < err)) : ((err < -6) || (+6 < err));
@@ -432,7 +432,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
{
double endState = Utils.ParseUDouble(endTextBox12.Text);
double startState = Utils.ParseUDouble(startTextBox12.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation12.Visible = fixedErrorLimits ? ((err < warningLimLo) || (warningLimHi < err)) : ((err < -6) || (+6 < err));
@@ -672,7 +672,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(753, 613);
this.Controls.Add(this.exclamation12);
this.Controls.Add(this.startTextBox12);
@@ -301,7 +301,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox1.Text);
float startState = Utils.ParseUFloat(startTextBox1.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { };
exclamation1.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -313,7 +313,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox2.Text);
float startState = Utils.ParseUFloat(startTextBox2.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation2.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -325,7 +325,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox3.Text);
float startState = Utils.ParseUFloat(startTextBox3.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation3.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -337,7 +337,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox4.Text);
float startState = Utils.ParseUFloat(startTextBox4.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation4.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -349,7 +349,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox5.Text);
float startState = Utils.ParseUFloat(startTextBox5.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation5.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -361,7 +361,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox6.Text);
float startState = Utils.ParseUFloat(startTextBox6.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation6.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -373,7 +373,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox7.Text);
float startState = Utils.ParseUFloat(startTextBox7.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation7.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -385,7 +385,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox8.Text);
float startState = Utils.ParseUFloat(startTextBox8.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation8.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -397,7 +397,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox9.Text);
float startState = Utils.ParseUFloat(startTextBox9.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation9.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -410,7 +410,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox10.Text);
float startState = Utils.ParseUFloat(startTextBox10.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation10.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -423,7 +423,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox11.Text);
float startState = Utils.ParseUFloat(startTextBox11.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation11.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -435,7 +435,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox12.Text);
float startState = Utils.ParseUFloat(startTextBox12.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation12.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -447,7 +447,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox13.Text);
float startState = Utils.ParseUFloat(startTextBox13.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation13.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -459,7 +459,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox14.Text);
float startState = Utils.ParseUFloat(startTextBox14.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation14.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -471,7 +471,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox15.Text);
float startState = Utils.ParseUFloat(startTextBox15.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation15.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -483,7 +483,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox16.Text);
float startState = Utils.ParseUFloat(startTextBox16.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation16.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -495,7 +495,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox17.Text);
float startState = Utils.ParseUFloat(startTextBox17.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation17.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -507,7 +507,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox18.Text);
float startState = Utils.ParseUFloat(startTextBox18.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation18.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -519,7 +519,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox19.Text);
float startState = Utils.ParseUFloat(startTextBox19.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation19.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -531,7 +531,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox20.Text);
float startState = Utils.ParseUFloat(startTextBox20.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation20.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -543,7 +543,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox21.Text);
float startState = Utils.ParseUFloat(startTextBox21.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation21.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -555,7 +555,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox22.Text);
float startState = Utils.ParseUFloat(startTextBox22.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation22.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -567,7 +567,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox23.Text);
float startState = Utils.ParseUFloat(startTextBox23.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation23.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -579,7 +579,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
float endState = Utils.ParseUFloat(endTextBox24.Text);
float startState = Utils.ParseUFloat(startTextBox24.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation24.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -1822,7 +1822,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(1354, 630);
this.Controls.Add(this.mid2TextBox24);
this.Controls.Add(this.mid2TextBox23);
@@ -625,7 +625,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.Controls.Add(this.checkBox24);
this.Controls.Add(this.comboBox24);
this.Controls.Add(this.label24);
@@ -532,7 +532,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
//
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(959, 489);
this.Controls.Add(this.textBox24);
this.Controls.Add(this.label24);
@@ -322,7 +322,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
double endState = Utils.ParseUDouble(endTextBoxes[wmIx].Text);
double startState = Utils.ParseUDouble(startTextBoxes[wmIx].Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
@@ -1388,7 +1388,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(1292, 661);
this.Controls.Add(this.largeExclamationLabel);
this.Controls.Add(this.largeTextBox);
@@ -1176,7 +1176,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.Controls.Add(this.checkBox48);
this.Controls.Add(this.comboBox48);
this.Controls.Add(this.label48);
@@ -248,7 +248,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(559, 566);
this.Controls.Add(this.groupBox6);
this.Controls.Add(this.groupBox5);
@@ -330,7 +330,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
{
double endState = Utils.ParseUDouble(endTextBoxes[wmIx].Text);
double startState = Utils.ParseUDouble(startTextBoxes[wmIx].Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
@@ -2660,7 +2660,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(1267, 805);
this.Controls.Add(this.largeExclamationLabel);
this.Controls.Add(this.largeTextBox);
@@ -256,7 +256,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.Controls.Add(this.remarkComboBox5);
this.Controls.Add(this.remarkComboBox4);
this.Controls.Add(this.remarkComboBox3);
@@ -261,7 +261,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
//
this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 23F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(1001, 349);
this.Controls.Add(this.batchRemarkButton);
this.Controls.Add(this.remarkTextBox6);
@@ -215,7 +215,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
{
double endState = Utils.ParseUDouble(wmEndStateTextBox1.Text);
double startState = Utils.ParseUDouble(wmStartStateTextBox1.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { };
@@ -229,7 +229,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
{
double endState = Utils.ParseUDouble(wmEndStateTextBox2.Text);
double startState = Utils.ParseUDouble(wmStartStateTextBox2.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
@@ -243,7 +243,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
{
double endState = Utils.ParseUDouble(wmEndStateTextBox3.Text);
double startState = Utils.ParseUDouble(wmStartStateTextBox3.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
@@ -257,7 +257,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
{
double endState = Utils.ParseUDouble(wmEndStateTextBox4.Text);
double startState = Utils.ParseUDouble(wmStartStateTextBox4.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
@@ -271,7 +271,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
{
double endState = Utils.ParseUDouble(wmEndStateTextBox5.Text);
double startState = Utils.ParseUDouble(wmStartStateTextBox5.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
@@ -285,7 +285,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
{
double endState = Utils.ParseUDouble(wmEndStateTextBox6.Text);
double startState = Utils.ParseUDouble(wmStartStateTextBox6.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
@@ -438,7 +438,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(729, 586);
this.Controls.Add(this.endLabel);
this.Controls.Add(this.startLabel);
@@ -625,7 +625,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.Controls.Add(this.checkBox24);
this.Controls.Add(this.comboBox24);
this.Controls.Add(this.label24);
@@ -532,7 +532,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
//
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(959, 489);
this.Controls.Add(this.textBox24);
this.Controls.Add(this.label24);
@@ -437,7 +437,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(719, 746);
this.Controls.Add(this.groupBox6);
this.Controls.Add(this.groupBox5);
@@ -1438,7 +1438,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(1146, 885);
this.Controls.Add(this.rotateImageButton);
this.Controls.Add(this.pictureBox1);
@@ -269,7 +269,7 @@ namespace TBF.BenchControl.DataEntry.WMStates
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.Controls.Add(this.groupBox6);
this.Controls.Add(this.groupBox5);
this.Controls.Add(this.groupBox4);
@@ -248,7 +248,7 @@ namespace TBF.BenchControl.DataEntry.WMStates
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(559, 565);
this.Controls.Add(this.groupBox6);
this.Controls.Add(this.groupBox5);
@@ -72,7 +72,7 @@ namespace TBF.BenchControl.DataEntry.iPerl
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.Controls.Add(this.pictureBox);
this.Controls.Add(this.orderGroupBox);
this.Controls.Add(this.okButton);
+1 -1
View File
@@ -248,7 +248,7 @@ namespace TBF.BenchControl.DataEntry.iPerl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(559, 566);
this.Controls.Add(this.groupBox6);
this.Controls.Add(this.groupBox5);
@@ -291,7 +291,7 @@ namespace TBF.BenchControl.DataEntry.iPerl
{
double endState = Utils.ParseUDouble(endStateTB.Text);
double startState = Utils.ParseUDouble(startStateTB.Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
exclamation.Visible = (err < warningLimLo) || (warningLimHi < err);
@@ -2494,7 +2494,7 @@ namespace TBF.BenchControl.DataEntry.iPerl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(1267, 758);
this.Controls.Add(this.exclamation48);
this.Controls.Add(this.endTextBox48);
@@ -61,7 +61,7 @@ namespace TBF.BenchControl.Modbus.QuidoRS
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Goldenrod;
this.BackColor = System.Drawing.Color.Cornsilk;
this.ClientSize = new System.Drawing.Size(454, 201);
this.Controls.Add(this.messageLabel);
this.Controls.Add(this.okButton);
+1 -1
View File
@@ -74,7 +74,7 @@ namespace TBF.BenchControl.Operations
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Goldenrod;
this.BackColor = System.Drawing.Color.Cornsilk;
this.ClientSize = new System.Drawing.Size(587, 201);
this.Controls.Add(this.questionLabel);
this.Controls.Add(this.noButton);
@@ -24,7 +24,7 @@ namespace TBF.BenchControl.Operations
}
public LargeMessageBoxOp(string message)
: this (message, Color.Goldenrod)
: this (message, Color.Cornsilk)
{
}
+1 -1
View File
@@ -61,7 +61,7 @@ namespace TBF.BenchControl.Operations
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Goldenrod;
this.BackColor = System.Drawing.Color.Cornsilk;
this.ClientSize = new System.Drawing.Size(454, 201);
this.Controls.Add(this.messageLabel);
this.Controls.Add(this.okButton);
+1 -1
View File
@@ -24,7 +24,7 @@ namespace TBF.BenchControl.Operations
}
public MessageBoxOp(string message)
: this (message, Color.Goldenrod)
: this (message, Color.Cornsilk)
{
}
@@ -1176,7 +1176,7 @@ namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.Controls.Add(this.checkBox48);
this.Controls.Add(this.comboBox48);
this.Controls.Add(this.label48);
@@ -355,7 +355,7 @@ namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio
{
double endState = Utils.ParseUDouble(endTextBoxes[wmIx].Text);
double startState = Utils.ParseUDouble(startTextBoxes[wmIx].Text);
err = 100.0 * (endState - startState - refVolume) / refVolume;
err = 100.0 * (Math.Abs(endState - startState) - refVolume) / refVolume;
}
catch { err = 1000.0f; };
@@ -2638,7 +2638,7 @@ namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(1267, 748);
this.Controls.Add(this.exclamation48);
this.Controls.Add(this.endTextBox48);
@@ -254,7 +254,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(868, 565);
this.Controls.Add(this.groupBox6);
this.Controls.Add(this.groupBox5);
@@ -314,7 +314,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(731, 592);
this.Controls.Add(this.wmErrorTextBox12);
this.Controls.Add(this.wmErrorLabel12);
@@ -578,7 +578,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(1267, 592);
this.Controls.Add(this.wmErrorTextBox24);
this.Controls.Add(this.wmErrorLabel24);
@@ -858,7 +858,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
meterRslt.PulsesPerLiter = regReader.PulsesPerLtr;
meterRslt.VolumeStart = regReader.BeginWMState; /// [l]
meterRslt.VolumeEnd = regReader.EndWMState; /// [l]
meterRslt.VolumeMeter = meterRslt.VolumeEnd - meterRslt.VolumeStart; /// [l]
meterRslt.VolumeMeter = Math.Abs(meterRslt.VolumeEnd - meterRslt.VolumeStart); /// [l]
meterRslt.VolumeRef = tstRslt.VolumeCTV; /// [l]
meterRslt.PulsesMeter = meterRslt.VolumeMeter;
meterRslt.PulsesMaster = tstRslt.PulsesMaster;
@@ -973,7 +973,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
meterRslt.PulsesPerLiter = regReader.PulsesPerLtr;
meterRslt.VolumeStart = regReader.BeginWMState;
meterRslt.VolumeEnd = regReader.EndWMState;
meterRslt.VolumeMeter = meterRslt.VolumeEnd - meterRslt.VolumeStart;
meterRslt.VolumeMeter = Math.Abs(meterRslt.VolumeEnd - meterRslt.VolumeStart);
meterRslt.VolumeRef = tstRslt.VolumeCTV; /// liter
meterRslt.PulsesMeter = meterRslt.VolumeMeter;
meterRslt.PulsesMaster = tstRslt.PulsesMaster;
@@ -619,7 +619,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
meterRslt.PulsesPerLiter = 1.0f;
meterRslt.VolumeStart = regReader.BeginWMState;
meterRslt.VolumeEnd = regReader.EndWMState;
meterRslt.VolumeMeter = meterRslt.VolumeEnd - meterRslt.VolumeStart;
meterRslt.VolumeMeter = Math.Abs(meterRslt.VolumeEnd - meterRslt.VolumeStart);
meterRslt.VolumeRef = tstRslt.VolumeCTV; /// liter
meterRslt.PulsesMeter = meterRslt.VolumeMeter;
meterRslt.PulsesMaster = tstRslt.PulsesMaster;
@@ -937,7 +937,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
meterRslt.PulsesPerLiter = regReader.PulsesPerLtr;
meterRslt.VolumeStart = regReader.BeginWMState; /// [l] From forms/images
meterRslt.VolumeEnd = regReader.EndWMState; /// [l] From forms/images
meterRslt.VolumeMeter = meterRslt.VolumeEnd - meterRslt.VolumeStart; /// [l]
meterRslt.VolumeMeter = Math.Abs(meterRslt.VolumeEnd - meterRslt.VolumeStart); /// [l]
meterRslt.VolumeRef = tstRslt.VolumeCTV; /// [l]
meterRslt.PulsesMeter = meterRslt.VolumeMeter * regReader.PulsesPerLtr;
meterRslt.PulsesMaster = tstRslt.PulsesMaster;
@@ -982,7 +982,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
meterRslt.PulsesPerLiter = regReader.PulsesPerLtr;
meterRslt.VolumeStart = regReader.BeginWMState; /// From forms/images
meterRslt.VolumeEnd = regReader.EndWMState; /// From forms/images
meterRslt.VolumeMeter = meterRslt.VolumeEnd - meterRslt.VolumeStart;
meterRslt.VolumeMeter = Math.Abs(meterRslt.VolumeEnd - meterRslt.VolumeStart);
meterRslt.VolumeRef = tstRslt.VolumeCTV; /// liter
meterRslt.PulsesMeter = meterRslt.VolumeMeter * regReader.PulsesPerLtr;
meterRslt.PulsesMaster = tstRslt.PulsesMaster;
@@ -1082,7 +1082,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
meterRslt.PulsesPerLiter = regReader.PulsesPerLtr;
meterRslt.VolumeStart = regReader.BeginWMState; /// [l] From forms/images
meterRslt.VolumeEnd = regReader.EndWMState; /// [l] From forms/images
meterRslt.VolumeMeter = meterRslt.VolumeEnd - meterRslt.VolumeStart; /// [l]
meterRslt.VolumeMeter = Math.Abs(meterRslt.VolumeEnd - meterRslt.VolumeStart); /// [l]
meterRslt.VolumeRef = tstRslt.VolumeCTV; /// [l]
meterRslt.PulsesMeter = meterRslt.VolumeMeter * regReader.PulsesPerLtr;
meterRslt.PulsesMaster = tstRslt.PulsesMaster;
@@ -1127,7 +1127,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
meterRslt.PulsesPerLiter = regReader.PulsesPerLtr;
meterRslt.VolumeStart = regReader.BeginWMState; /// From forms/images
meterRslt.VolumeEnd = regReader.EndWMState; /// From forms/images
meterRslt.VolumeMeter = meterRslt.VolumeEnd - meterRslt.VolumeStart;
meterRslt.VolumeMeter = Math.Abs(meterRslt.VolumeEnd - meterRslt.VolumeStart);
meterRslt.VolumeRef = tstRslt.VolumeCTV; /// liter
meterRslt.PulsesMeter = meterRslt.VolumeMeter * regReader.PulsesPerLtr;
meterRslt.PulsesMaster = tstRslt.PulsesMaster;
@@ -1037,7 +1037,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
meterRslt.PulsesPerLiter = regReader.PulsesPerLtr;
meterRslt.VolumeStart = regReader.BeginWMState; /// [l]
meterRslt.VolumeEnd = regReader.EndWMState; /// [l]
meterRslt.VolumeMeter = meterRslt.VolumeEnd - meterRslt.VolumeStart; /// [l]
meterRslt.VolumeMeter = Math.Abs(meterRslt.VolumeEnd - meterRslt.VolumeStart); /// [l]
meterRslt.VolumeRef = tstRslt.VolumeCTV; /// [l]
meterRslt.PulsesMeter = meterRslt.VolumeMeter;
meterRslt.PulsesMaster = tstRslt.PulsesMaster;
@@ -1152,7 +1152,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
meterRslt.PulsesPerLiter = regReader.PulsesPerLtr;
meterRslt.VolumeStart = regReader.BeginWMState;
meterRslt.VolumeEnd = regReader.EndWMState;
meterRslt.VolumeMeter = meterRslt.VolumeEnd - meterRslt.VolumeStart;
meterRslt.VolumeMeter = Math.Abs(meterRslt.VolumeEnd - meterRslt.VolumeStart);
meterRslt.VolumeRef = tstRslt.VolumeCTV; /// liter
meterRslt.PulsesMeter = meterRslt.VolumeMeter;
meterRslt.PulsesMaster = tstRslt.PulsesMaster;
@@ -768,7 +768,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
meterRslt.PulsesPerLiter = regReader.PulsesPerLtr;
meterRslt.VolumeStart = regReader.BeginWMState; /// [l]
meterRslt.VolumeEnd = regReader.EndWMState; /// [l]
meterRslt.VolumeMeter = meterRslt.VolumeEnd - meterRslt.VolumeStart; /// [l]
meterRslt.VolumeMeter = Math.Abs(meterRslt.VolumeEnd - meterRslt.VolumeStart); /// [l]
meterRslt.VolumeRef = tstRslt.VolumeCTV; /// [l]
meterRslt.PulsesMeter = meterRslt.VolumeMeter;
meterRslt.PulsesMaster = tstRslt.PulsesMaster;
@@ -813,7 +813,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
meterRslt.PulsesPerLiter = regReader.PulsesPerLtr;
meterRslt.VolumeStart = regReader.BeginWMState;
meterRslt.VolumeEnd = regReader.EndWMState;
meterRslt.VolumeMeter = meterRslt.VolumeEnd - meterRslt.VolumeStart;
meterRslt.VolumeMeter = Math.Abs(meterRslt.VolumeEnd - meterRslt.VolumeStart);
meterRslt.VolumeRef = tstRslt.VolumeCTV; /// liter
meterRslt.PulsesMeter = meterRslt.VolumeMeter;
meterRslt.PulsesMaster = tstRslt.PulsesMaster;
@@ -508,7 +508,7 @@ namespace TBF.BenchControl.TestMethods.ManualEntry
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(735, 706);
this.Controls.Add(this.promptLabel);
this.Controls.Add(this.groupBox7);
@@ -241,7 +241,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(868, 565);
this.Controls.Add(this.groupBox6);
this.Controls.Add(this.groupBox5);
@@ -301,7 +301,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(731, 592);
this.Controls.Add(this.wmPulsesCountTextBox12);
this.Controls.Add(this.wmPulsesCountLabel12);
@@ -565,7 +565,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(1267, 592);
this.Controls.Add(this.wmPulsesCountTextBox24);
this.Controls.Add(this.wmPulsesCountLabel24);
@@ -201,7 +201,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(523, 565);
this.Controls.Add(this.groupBox6);
this.Controls.Add(this.groupBox5);
@@ -350,7 +350,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(731, 592);
this.Controls.Add(this.pulsesCountOKCheckBox12);
this.Controls.Add(this.pulsesCountOKCheckBox11);
@@ -650,7 +650,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(1267, 592);
this.Controls.Add(this.pulsesCountOKCheckBox24);
this.Controls.Add(this.pulsesCountOKCheckBox23);
@@ -73,7 +73,7 @@ namespace TBF.BenchControl.Various.ManualLevelMsrmnt
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.BackColor = System.Drawing.Color.DarkGray;
this.ClientSize = new System.Drawing.Size(571, 123);
this.Controls.Add(this.okButton);
this.Controls.Add(this.waterLevelGroupBox);
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.25.1405.0")]
[assembly: AssemblyFileVersion("2.25.1405.0")]
[assembly: AssemblyVersion("2.25.1730.0")]
[assembly: AssemblyFileVersion("2.25.1730.0")]
+21 -7
View File
@@ -3,32 +3,42 @@
<Language>en</Language>
<TestBenches>
<DatabaseSettings>
<BenchName>Test Bench</BenchName>
<BenchName>DEWA PT300</BenchName>
<IsRealBench>true</IsRealBench>
<ProceduresDBSettings>
<DbType>MySql</DbType>
<ConnectionString>SERVER=localhost; DATABASE=testbench; UID=root; PASSWORD=; CHARSET=utf8;</ConnectionString>
<ConnectionString>SERVER=localhost; DATABASE=dewa300; UID=root; PASSWORD=; CHARSET=utf8;</ConnectionString>
</ProceduresDBSettings>
<WaterMetersDBSettings>
<DbType>MySql</DbType>
<ConnectionString>SERVER=localhost; DATABASE=testbench-r; UID=root; PASSWORD=; CHARSET=utf8;</ConnectionString>
<ConnectionString>SERVER=localhost; DATABASE=dewa300-r; UID=root; PASSWORD=; CHARSET=utf8;</ConnectionString>
</WaterMetersDBSettings>
<UsersDBSettings>
<DbType>MySql</DbType>
<ConnectionString />
</UsersDBSettings>
</DatabaseSettings>
</TestBenches>
<LastBench>Test Bench</LastBench>
<LoginMethod>UserName</LoginMethod>
<LastBench>DEWA PT300</LastBench>
<BatchNr>1</BatchNr>
<RealDensity>998.2008</RealDensity>
<AtTemperature>20</AtTemperature>
<RightPaneHorizSplitterDistance>25</RightPaneHorizSplitterDistance>
<MainWndLeft>75</MainWndLeft>
<MainWndTop>5</MainWndTop>
<TopPaneVerticalSplitterDistance>596</TopPaneVerticalSplitterDistance>
<MainWndLeft>76</MainWndLeft>
<MainWndTop>21</MainWndTop>
<MainWndWidth>1250</MainWndWidth>
<MainWndHeight>750</MainWndHeight>
<ManiWndMaximized>false</ManiWndMaximized>
<ManiWndMaximized>true</ManiWndMaximized>
<ComponentsDlgLeft>200</ComponentsDlgLeft>
<ComponentsDlgTop>100</ComponentsDlgTop>
<ComponentsDlgWidth>850</ComponentsDlgWidth>
<ComponentsDlgHeight>500</ComponentsDlgHeight>
<PopupResultsLeft>0</PopupResultsLeft>
<PopupResultsTop>0</PopupResultsTop>
<PopupResultsWidth>0</PopupResultsWidth>
<PopupResultsHeight>0</PopupResultsHeight>
<PathsDlgLeft>0</PathsDlgLeft>
<PathsDlgTop>0</PathsDlgTop>
<PathsDlgWidth>0</PathsDlgWidth>
@@ -53,6 +63,10 @@
<OneProcedureDlgHeight>0</OneProcedureDlgHeight>
<PrintOrderLeft>0</PrintOrderLeft>
<PrintOrderTop>0</PrintOrderTop>
<EnduranceDlgLeft>0</EnduranceDlgLeft>
<EnduranceDlgTop>0</EnduranceDlgTop>
<EnduranceDlgWidth>0</EnduranceDlgWidth>
<EnduranceDlgHeight>0</EnduranceDlgHeight>
<PrintOrderOnlyGoodResult>false</PrintOrderOnlyGoodResult>
<PrintOrderOnlyLastResult>false</PrintOrderOnlyLastResult>
<ResultsConfigMeters>Vertically</ResultsConfigMeters>
+2 -1
View File
@@ -60,10 +60,11 @@
<logger name="NHibernate"> <level value="ERROR" /> </logger>
<logger name="TBF.BenchControl.StateMachine"> <level value="INFO" /> </logger>
<logger name="TBF.BenchControl.State"> <level value="WARN" /> </logger>
<logger name="TBF.BenchControl.Elde.ControlComdWrap"> <level value="WARN" /> </logger>
<logger name="TBF.BenchControl.Elde.ControlComWrap"> <level value="WARN" /> </logger>
<logger name="TBF.BenchControl.Elde.Pump"> <level value="WARN" /> </logger>
<logger name="TBF.BenchControl.Elde.PumpWithFM"> <level value="WARN" /> </logger>
<logger name="TBF.BenchControl.MettlerToledo"> <level value="WARN" /> </logger>
<logger name="TBF.BenchControl.Fomulas"> <level value="FATAL" /> </logger>
<logger name="TBF.BenchControl.Elde.StartMeasurementOp"> <level value="WARN" /> </logger>
<logger name="TBF.BenchControl.Modbus"> <level value="DEBUG" /> </logger>
</log4net>
+6 -6
View File
@@ -39,7 +39,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;MUNICH;CAMERA</DefineConstants>
<DefineConstants>TRACE;DEBUG;DEWA_300;CAMERA;STABLE_MASS_EXTRAS;TEST_PROFILES</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -50,7 +50,7 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;MUNICH;CAMERA</DefineConstants>
<DefineConstants>TRACE;DEWA_300;CAMERA;STABLE_MASS_EXTRAS;TEST_PROFILES</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
@@ -60,7 +60,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;MUNICH;CAMERA</DefineConstants>
<DefineConstants>TRACE;DEBUG;DEWA_300;CAMERA;STABLE_MASS_EXTRAS;TEST_PROFILES</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
@@ -70,7 +70,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE;MUNICH;CAMERA</DefineConstants>
<DefineConstants>TRACE;DEWA_300;CAMERA;STABLE_MASS_EXTRAS;TEST_PROFILES</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
@@ -101,8 +101,8 @@
<SignManifests>false</SignManifests>
</PropertyGroup>
<ItemGroup>
<Reference Include="ControlComponent3Munich">
<HintPath>..\packages\ControlBoard\Munich\ControlComponent3Munich.dll</HintPath>
<Reference Include="ControlComponent3U">
<HintPath>..\packages\ControlBoard\DEWA_300\ControlComponent3U.dll</HintPath>
</Reference>
<Reference Include="FluentNHibernate">
<HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
+2 -2
View File
@@ -54,9 +54,9 @@ namespace TBF.UI
this.horizontalSplitContainer = new System.Windows.Forms.SplitContainer();
this.mainTabControl = new System.Windows.Forms.TabControl();
this.homeTabPage = new System.Windows.Forms.TabPage();
this.ctrlBrdComponent = new ControlComponent3Munich.UserControl1();
this.ctrlBrdComponent = new ControlComponent_Torino2015.UserControl1();
this.processTabPage = new System.Windows.Forms.TabPage();
this.processTabPageCtrl = new TBF.UI.Process.ProcessTabPageCtrl6();
this.processTabPageCtrl = new TBF.UI.Process.ProcessTabPageCtrl24();
this.insertTabPage = new System.Windows.Forms.TabPage();
this.resultsTabPage = new System.Windows.Forms.TabPage();
this.resultsTabPageCtrl = new TBF.UI.ResultsMI.ResultsTabPageCtrl();