ver. 2.25.1731

Config/Config.csproj

@@ -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>

Results/Output/Printers/Zapiska/ZapiskaPrintDocument.cs

@@ -28,9 +28,11 @@ namespace Results.Output.Printers.Zapiska
         readonly float leftMarginCommon1;
         readonly float leftMarginCommon2;
         readonly float leftMarginCommon3;
+        readonly float leftMarginCommon4;
         readonly float leftMarginBelow1;
         readonly float leftMarginBelow2;
         readonly float leftMarginBelow3;
+        readonly float leftMarginBelow4;
 
 		readonly float spacingOne;
         readonly float spacingOne4Header;
@@ -63,10 +65,12 @@ namespace Results.Output.Printers.Zapiska
         IList<WMeterRsltItemSpec> commonItems1;
 		IList<WMeterRsltItemSpec> commonItems2;
 		IList<WMeterRsltItemSpec> commonItems3;
-		IList<WMeterRsltItemSpec> selectedItems;
+        IList<WMeterRsltItemSpec> commonItems4;
+        IList<WMeterRsltItemSpec> selectedItems;
         IList<WMeterRsltItemSpec> belowItems1;
         IList<WMeterRsltItemSpec> belowItems2;
         IList<WMeterRsltItemSpec> belowItems3;
+        IList<WMeterRsltItemSpec> belowItems4;
         string footer;
 
 		///
@@ -96,10 +100,12 @@ namespace Results.Output.Printers.Zapiska
 			commonItems1 = Results.WMeterRsltItemSpec.FromStrArray(cfg.CommonItems1);
 			commonItems2 = Results.WMeterRsltItemSpec.FromStrArray(cfg.CommonItems2);
 			commonItems3 = Results.WMeterRsltItemSpec.FromStrArray(cfg.CommonItems3);
-			selectedItems = Results.WMeterRsltItemSpec.FromStrArray(cfg.SelectedItems);
+            commonItems4 = Results.WMeterRsltItemSpec.FromStrArray(cfg.CommonItems4);
+            selectedItems = Results.WMeterRsltItemSpec.FromStrArray(cfg.SelectedItems);
             belowItems1 = Results.WMeterRsltItemSpec.FromStrArray(cfg.BelowItems1);
             belowItems2 = Results.WMeterRsltItemSpec.FromStrArray(cfg.BelowItems2);
             belowItems3 = Results.WMeterRsltItemSpec.FromStrArray(cfg.BelowItems3);
+            belowItems4 = Results.WMeterRsltItemSpec.FromStrArray(cfg.BelowItems4);
             footer = string.IsNullOrEmpty(cfg.Footer) ? string.Empty : cfg.Footer.Replace("~", Environment.NewLine);
 
 			/// Initialize fonts
@@ -125,10 +131,12 @@ namespace Results.Output.Printers.Zapiska
             leftMarginCommon1 = leftMargin + printWidth * 0.01f * cfg.ColW0Pct;
             leftMarginCommon2 = leftMargin + printWidth * 0.01f * (cfg.ColW0Pct + cfg.ColW1Pct);
             leftMarginCommon3 = leftMargin + printWidth * 0.01f * (cfg.ColW0Pct + cfg.ColW1Pct + cfg.ColW2Pct);
+            leftMarginCommon4 = leftMargin + printWidth * 0.01f * (cfg.ColW0Pct + cfg.ColW1Pct + cfg.ColW2Pct + cfg.ColW3Pct);
 
             leftMarginBelow1 = leftMargin + printWidth * 0.01f * cfg.BelowW0Pct;
             leftMarginBelow2 = leftMargin + printWidth * 0.01f * (cfg.BelowW0Pct + cfg.BelowW1Pct);
             leftMarginBelow3 = leftMargin + printWidth * 0.01f * (cfg.BelowW0Pct + cfg.BelowW1Pct + cfg.BelowW2Pct);
+            leftMarginBelow4 = leftMargin + printWidth * 0.01f * (cfg.BelowW0Pct + cfg.BelowW1Pct + cfg.BelowW2Pct + cfg.BelowW3Pct);
 
             spacingOne = System.Windows.Forms.TextRenderer.MeasureText("Abcgq", font).Height;
 			spacingOne4Header = System.Windows.Forms.TextRenderer.MeasureText("Abcgq", headerFont).Height;
@@ -181,7 +189,7 @@ namespace Results.Output.Printers.Zapiska
                 titleHeight = System.Windows.Forms.TextRenderer.MeasureText(header, titleFont).Height;
                 commonTop = cfg.TopMargin + titleHeight + spacingOne4Header;
 
-                int commonCount = Math.Max(commonItems1.Count, Math.Max(commonItems2.Count, commonItems3.Count));
+                int commonCount = Math.Max(commonItems1.Count, Math.Max(commonItems2.Count, Math.Max(commonItems3.Count, commonItems4.Count)));
                 commonHeight = commonCount * spacingOne;
                 bodyTop = commonTop + commonHeight + spacingOne4Header;
 
@@ -212,7 +220,7 @@ namespace Results.Output.Printers.Zapiska
                 ///----------------
                 ///  Common items
                 ///----------------
-				for (int n = 1; n <= 3; n++)
+				for (int n = 1; n <= 4; n++)
 				{
 					IList<WMeterRsltItemSpec> commonItems;
 					float lMargin;
@@ -222,7 +230,8 @@ namespace Results.Output.Printers.Zapiska
                         case 1:  commonItems = commonItems1;  lMargin = leftMarginCommon1;  break;
 						case 2:  commonItems = commonItems2;  lMargin = leftMarginCommon2;  break;
 						case 3:  commonItems = commonItems3;  lMargin = leftMarginCommon3;  break;
-					}
+                        case 4:  commonItems = commonItems4;  lMargin = leftMarginCommon4;  break;
+                    }
 
 					if (commonItems.Count == 0) continue;	/// Common part is empty
 
@@ -279,7 +288,7 @@ namespace Results.Output.Printers.Zapiska
             ///----------------
             ///  Below items
             ///----------------
-            for (int n = 1; n <= 3; n++)
+            for (int n = 1; n <= 4; n++)
             {
                 IList<WMeterRsltItemSpec> belowItems;
                 float lMargin;
@@ -289,6 +298,7 @@ namespace Results.Output.Printers.Zapiska
                     case 1:  belowItems = belowItems1;  lMargin = leftMarginBelow1;  break;
                     case 2:  belowItems = belowItems2;  lMargin = leftMarginBelow2;  break;
                     case 3:  belowItems = belowItems3;  lMargin = leftMarginBelow3;  break;
+                    case 4:  belowItems = belowItems4;  lMargin = leftMarginBelow4;  break;
                 }
 
                 if (belowItems.Count == 0) continue;	/// Below part is empty

Results/Output/Printers/Zapiska/ZapiskaPrinterCfg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2017 Sensus Slovensko a.s.
+/// Copyright (c) 2017-2021 Sensus Slovensko a.s.
 ///
 
 namespace Results.Output.Printers.Zapiska
@@ -31,16 +31,20 @@ namespace Results.Output.Printers.Zapiska
         public int ColW0Pct;
         public int ColW1Pct;
 		public int ColW2Pct;
-		public string[] CommonItems1;
+        public int ColW3Pct;
+        public string[] CommonItems1;
 		public string[] CommonItems2;
 		public string[] CommonItems3;
-		public string[] SelectedItems;
+        public string[] CommonItems4;
+        public string[] SelectedItems;
         public int BelowW0Pct;
         public int BelowW1Pct;
         public int BelowW2Pct;
+        public int BelowW3Pct;
         public string[] BelowItems1;
         public string[] BelowItems2;
         public string[] BelowItems3;
-		public string Footer;
+        public string[] BelowItems4;
+        public string Footer;
 	}
 }

Results/Results.csproj

@@ -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>

ResultsBrowser/ResultsBrowser.csproj

@@ -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>

TBF/BenchControl/DataEntry/Combined/CycleBeginningForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Combined/CycleEndForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Combined/TestStartEndForm.cs

@@ -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; };
 

TBF/BenchControl/DataEntry/Combined/TestStartEndForm.designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Fewa/CycleBeginningForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Fewa/CycleEndForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Fewa/TestStartEndForm.cs

@@ -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; };
 

TBF/BenchControl/DataEntry/Fewa/TestStartEndForm.designer.cs

@@ -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);

TBF/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/HeatMeters12/CycleEndForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.cs

@@ -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);

TBF/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.designer.cs

@@ -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);

TBF/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/HeatMeters6/CycleEndForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.cs

@@ -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);

TBF/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Munich/CycleBeginningForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Munich/CycleEndForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Munich3/CycleEndForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.cs

@@ -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; };
 

TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Single/CycleBeginningForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Single/CycleEndForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Single/TestStartEndForm.cs

@@ -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; };
 

TBF/BenchControl/DataEntry/Single/TestStartEndForm.designer.cs

@@ -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;

TBF/BenchControl/DataEntry/Standard12/CycleBeginningForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Standard12/CycleEndForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Standard12/TestStartEndForm.cs

@@ -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));

TBF/BenchControl/DataEntry/Standard12/TestStartEndForm.designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Standard24/AdvancedFixedStartTestForm.cs

@@ -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);

TBF/BenchControl/DataEntry/Standard24/AdvancedFixedStartTestForm.designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Standard24/CycleBeginningForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Standard24/CycleEndForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Standard24/TestStartEndForm.cs

@@ -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; };
 

TBF/BenchControl/DataEntry/Standard24/TestStartEndForm.designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Standard48/CycleBeginningForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Standard48/CycleEndForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Standard48/TestStartEndForm.cs

@@ -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; };
 

TBF/BenchControl/DataEntry/Standard48/TestStartEndForm.designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Standard6/CycleEndForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/Standard6/TestStartEndForm.cs

@@ -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; };
 

TBF/BenchControl/DataEntry/Standard6/TestStartEndForm.designer.cs

@@ -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);

TBF/BenchControl/DataEntry/StandardCamera/CycleBeginningForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/StandardCamera/CycleEndForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.designer.cs

@@ -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);

TBF/BenchControl/DataEntry/StandardCamera/TestStartEndForm.designer.cs

@@ -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);

TBF/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.designer.cs

@@ -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);

TBF/BenchControl/DataEntry/WMStates/WMStatesForm.designer.cs

@@ -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);

TBF/BenchControl/DataEntry/iPerl/CycleBeginningForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/iPerl/CycleEndForm.Designer.cs

@@ -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);

TBF/BenchControl/DataEntry/iPerl/TestStartEndForm.cs

@@ -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);

TBF/BenchControl/DataEntry/iPerl/TestStartEndForm.designer.cs

@@ -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);

TBF/BenchControl/Modbus/QuidoRS/ConfirmationForm.designer.cs

@@ -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);

TBF/BenchControl/Operations/AskYesNoForm.Designer.cs

@@ -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);

TBF/BenchControl/Operations/LargeMessageBoxOp.cs

@@ -24,7 +24,7 @@ namespace TBF.BenchControl.Operations
 		}
 
         public LargeMessageBoxOp(string message)
-            : this (message, Color.Goldenrod)
+            : this (message, Color.Cornsilk)
         {
         }
 

TBF/BenchControl/Operations/MessageBoxForm.Designer.cs

@@ -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);

TBF/BenchControl/Operations/MessageBoxOp.cs

@@ -24,7 +24,7 @@ namespace TBF.BenchControl.Operations
 		}
 
         public MessageBoxOp(string message)
-            : this (message, Color.Goldenrod)
+            : this (message, Color.Cornsilk)
         {
         }
 

TBF/BenchControl/Output/Printers/Zapiska/Printer.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2017 Sensus Slovensko a.s.
+/// Copyright (c) 2017-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -199,16 +199,20 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
                     ColW0Pct = printerCfg.ColW0Pct,
                     ColW1Pct = printerCfg.ColW1Pct,
 					ColW2Pct = printerCfg.ColW2Pct,
-					CommonItems1 = printerCfg.CommonItems1,
+                    ColW3Pct = printerCfg.ColW3Pct,
+                    CommonItems1 = printerCfg.CommonItems1,
 					CommonItems2 = printerCfg.CommonItems2,
 					CommonItems3 = printerCfg.CommonItems3,
-					SelectedItems = printerCfg.SelectedItems,
+                    CommonItems4 = printerCfg.CommonItems4,
+                    SelectedItems = printerCfg.SelectedItems,
                     BelowW0Pct = printerCfg.BelowW0Pct,
                     BelowW1Pct = printerCfg.BelowW1Pct,
                     BelowW2Pct = printerCfg.BelowW2Pct,
+                    BelowW3Pct = printerCfg.BelowW3Pct,
                     BelowItems1 = printerCfg.BelowItems1,
                     BelowItems2 = printerCfg.BelowItems2,
                     BelowItems3 = printerCfg.BelowItems3,
+                    BelowItems4 = printerCfg.BelowItems4,
                     Footer = printerCfg.Footer,
 				};
 

TBF/BenchControl/Output/Printers/Zapiska/PrinterCfg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2017 Sensus Slovensko a.s.
+/// Copyright (c) 2017-2021 Sensus Slovensko a.s.
 ///
 using System.Xml.Serialization;
 using Config.Entities;
@@ -46,6 +46,8 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
         public string[] CommonItems2;
         public int ColW2Pct;
 		public string[] CommonItems3;
+        public int ColW3Pct;
+        public string[] CommonItems4;
 
 		public string[] SelectedItems;
         
@@ -55,6 +57,8 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
         public string[] BelowItems2;
         public int BelowW2Pct;
         public string[] BelowItems3;
+        public int BelowW3Pct;
+        public string[] BelowItems4;
         
         public string Footer;
         public string DocName;

TBF/BenchControl/Output/Printers/Zapiska/PrinterCfgCtrl.Designer.cs

@@ -68,16 +68,10 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
             this.commonItems3Button = new System.Windows.Forms.Button();
             this.colW2TextBox = new System.Windows.Forms.TextBox();
             this.colW1TextBox = new System.Windows.Forms.TextBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
-            this.label6 = new System.Windows.Forms.Label();
             this.colW0TextBox = new System.Windows.Forms.TextBox();
-            this.label7 = new System.Windows.Forms.Label();
             this.belowW0TextBox = new System.Windows.Forms.TextBox();
             this.label8 = new System.Windows.Forms.Label();
-            this.label9 = new System.Windows.Forms.Label();
-            this.label10 = new System.Windows.Forms.Label();
             this.belowW2TextBox = new System.Windows.Forms.TextBox();
             this.belowW1TextBox = new System.Windows.Forms.TextBox();
             this.belowItems3Button = new System.Windows.Forms.Button();
@@ -93,6 +87,10 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
             this.footerFontLabel = new System.Windows.Forms.Label();
             this.templateTextBox = new System.Windows.Forms.TextBox();
             this.templateLabel = new System.Windows.Forms.Label();
+            this.colW3TextBox = new System.Windows.Forms.TextBox();
+            this.belowW3TextBox = new System.Windows.Forms.TextBox();
+            this.commonItems4Button = new System.Windows.Forms.Button();
+            this.belowItems4Button = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
             // nameTextBox
@@ -204,9 +202,9 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
             // commonItems1Button
             // 
             this.commonItems1Button.Enabled = false;
-            this.commonItems1Button.Location = new System.Drawing.Point(301, 240);
+            this.commonItems1Button.Location = new System.Drawing.Point(273, 240);
             this.commonItems1Button.Name = "commonItems1Button";
-            this.commonItems1Button.Size = new System.Drawing.Size(47, 23);
+            this.commonItems1Button.Size = new System.Drawing.Size(42, 23);
             this.commonItems1Button.TabIndex = 33;
             this.commonItems1Button.Text = "Col. 1";
             this.commonItems1Button.UseVisualStyleBackColor = true;
@@ -215,9 +213,9 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
             // footerButton
             // 
             this.footerButton.Enabled = false;
-            this.footerButton.Location = new System.Drawing.Point(142, 306);
+            this.footerButton.Location = new System.Drawing.Point(141, 306);
             this.footerButton.Name = "footerButton";
-            this.footerButton.Size = new System.Drawing.Size(312, 23);
+            this.footerButton.Size = new System.Drawing.Size(309, 23);
             this.footerButton.TabIndex = 37;
             this.footerButton.Text = "Footer";
             this.footerButton.UseVisualStyleBackColor = true;
@@ -226,9 +224,9 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
             // headerButton
             // 
             this.headerButton.Enabled = false;
-            this.headerButton.Location = new System.Drawing.Point(142, 218);
+            this.headerButton.Location = new System.Drawing.Point(141, 218);
             this.headerButton.Name = "headerButton";
-            this.headerButton.Size = new System.Drawing.Size(312, 23);
+            this.headerButton.Size = new System.Drawing.Size(309, 23);
             this.headerButton.TabIndex = 27;
             this.headerButton.Text = "Title";
             this.headerButton.UseVisualStyleBackColor = true;
@@ -237,9 +235,9 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
             // testItemsButton
             // 
             this.testItemsButton.Enabled = false;
-            this.testItemsButton.Location = new System.Drawing.Point(142, 262);
+            this.testItemsButton.Location = new System.Drawing.Point(141, 262);
             this.testItemsButton.Name = "testItemsButton";
-            this.testItemsButton.Size = new System.Drawing.Size(312, 23);
+            this.testItemsButton.Size = new System.Drawing.Size(309, 23);
             this.testItemsButton.TabIndex = 36;
             this.testItemsButton.Text = "Water meter items";
             this.testItemsButton.UseVisualStyleBackColor = true;
@@ -406,9 +404,9 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
             // commonItems2Button
             // 
             this.commonItems2Button.Enabled = false;
-            this.commonItems2Button.Location = new System.Drawing.Point(354, 240);
+            this.commonItems2Button.Location = new System.Drawing.Point(318, 240);
             this.commonItems2Button.Name = "commonItems2Button";
-            this.commonItems2Button.Size = new System.Drawing.Size(47, 23);
+            this.commonItems2Button.Size = new System.Drawing.Size(42, 23);
             this.commonItems2Button.TabIndex = 34;
             this.commonItems2Button.Text = "Col. 2";
             this.commonItems2Button.UseVisualStyleBackColor = true;
@@ -417,9 +415,9 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
             // commonItems3Button
             // 
             this.commonItems3Button.Enabled = false;
-            this.commonItems3Button.Location = new System.Drawing.Point(407, 240);
+            this.commonItems3Button.Location = new System.Drawing.Point(363, 240);
             this.commonItems3Button.Name = "commonItems3Button";
-            this.commonItems3Button.Size = new System.Drawing.Size(47, 23);
+            this.commonItems3Button.Size = new System.Drawing.Size(42, 23);
             this.commonItems3Button.TabIndex = 35;
             this.commonItems3Button.Text = "Col. 3";
             this.commonItems3Button.UseVisualStyleBackColor = true;
@@ -428,37 +426,19 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
             // colW2TextBox
             // 
             this.colW2TextBox.Enabled = false;
-            this.colW2TextBox.Location = new System.Drawing.Point(245, 241);
+            this.colW2TextBox.Location = new System.Drawing.Point(208, 241);
             this.colW2TextBox.Name = "colW2TextBox";
-            this.colW2TextBox.Size = new System.Drawing.Size(30, 20);
+            this.colW2TextBox.Size = new System.Drawing.Size(28, 20);
             this.colW2TextBox.TabIndex = 31;
             // 
             // colW1TextBox
             // 
             this.colW1TextBox.Enabled = false;
-            this.colW1TextBox.Location = new System.Drawing.Point(192, 241);
+            this.colW1TextBox.Location = new System.Drawing.Point(175, 241);
             this.colW1TextBox.Name = "colW1TextBox";
-            this.colW1TextBox.Size = new System.Drawing.Size(30, 20);
+            this.colW1TextBox.Size = new System.Drawing.Size(28, 20);
             this.colW1TextBox.TabIndex = 29;
             // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(222, 244);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(15, 13);
-            this.label3.TabIndex = 30;
-            this.label3.Text = "%";
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(275, 244);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(15, 13);
-            this.label4.TabIndex = 32;
-            this.label4.Text = "%";
-            // 
             // label5
             // 
             this.label5.AutoSize = true;
@@ -468,38 +448,20 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
             this.label5.TabIndex = 28;
             this.label5.Text = "Column widths in %";
             // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(172, 244);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(15, 13);
-            this.label6.TabIndex = 40;
-            this.label6.Text = "%";
-            // 
             // colW0TextBox
             // 
             this.colW0TextBox.Enabled = false;
             this.colW0TextBox.Location = new System.Drawing.Point(142, 241);
             this.colW0TextBox.Name = "colW0TextBox";
-            this.colW0TextBox.Size = new System.Drawing.Size(30, 20);
+            this.colW0TextBox.Size = new System.Drawing.Size(28, 20);
             this.colW0TextBox.TabIndex = 39;
             // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(172, 289);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(15, 13);
-            this.label7.TabIndex = 50;
-            this.label7.Text = "%";
-            // 
             // belowW0TextBox
             // 
             this.belowW0TextBox.Enabled = false;
             this.belowW0TextBox.Location = new System.Drawing.Point(142, 286);
             this.belowW0TextBox.Name = "belowW0TextBox";
-            this.belowW0TextBox.Size = new System.Drawing.Size(30, 20);
+            this.belowW0TextBox.Size = new System.Drawing.Size(28, 20);
             this.belowW0TextBox.TabIndex = 49;
             // 
             // label8
@@ -511,46 +473,28 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
             this.label8.TabIndex = 41;
             this.label8.Text = "Column widths in %";
             // 
-            // label9
-            // 
-            this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(275, 289);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(15, 13);
-            this.label9.TabIndex = 45;
-            this.label9.Text = "%";
-            // 
-            // label10
-            // 
-            this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(222, 289);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(15, 13);
-            this.label10.TabIndex = 43;
-            this.label10.Text = "%";
-            // 
             // belowW2TextBox
             // 
             this.belowW2TextBox.Enabled = false;
-            this.belowW2TextBox.Location = new System.Drawing.Point(245, 286);
+            this.belowW2TextBox.Location = new System.Drawing.Point(208, 286);
             this.belowW2TextBox.Name = "belowW2TextBox";
-            this.belowW2TextBox.Size = new System.Drawing.Size(30, 20);
+            this.belowW2TextBox.Size = new System.Drawing.Size(28, 20);
             this.belowW2TextBox.TabIndex = 44;
             // 
             // belowW1TextBox
             // 
             this.belowW1TextBox.Enabled = false;
-            this.belowW1TextBox.Location = new System.Drawing.Point(192, 286);
+            this.belowW1TextBox.Location = new System.Drawing.Point(175, 286);
             this.belowW1TextBox.Name = "belowW1TextBox";
-            this.belowW1TextBox.Size = new System.Drawing.Size(30, 20);
+            this.belowW1TextBox.Size = new System.Drawing.Size(28, 20);
             this.belowW1TextBox.TabIndex = 42;
             // 
             // belowItems3Button
             // 
             this.belowItems3Button.Enabled = false;
-            this.belowItems3Button.Location = new System.Drawing.Point(407, 284);
+            this.belowItems3Button.Location = new System.Drawing.Point(363, 284);
             this.belowItems3Button.Name = "belowItems3Button";
-            this.belowItems3Button.Size = new System.Drawing.Size(47, 23);
+            this.belowItems3Button.Size = new System.Drawing.Size(42, 23);
             this.belowItems3Button.TabIndex = 48;
             this.belowItems3Button.Text = "Col. 3";
             this.belowItems3Button.UseVisualStyleBackColor = true;
@@ -559,9 +503,9 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
             // belowItems2Button
             // 
             this.belowItems2Button.Enabled = false;
-            this.belowItems2Button.Location = new System.Drawing.Point(354, 284);
+            this.belowItems2Button.Location = new System.Drawing.Point(318, 284);
             this.belowItems2Button.Name = "belowItems2Button";
-            this.belowItems2Button.Size = new System.Drawing.Size(47, 23);
+            this.belowItems2Button.Size = new System.Drawing.Size(42, 23);
             this.belowItems2Button.TabIndex = 47;
             this.belowItems2Button.Text = "Col. 2";
             this.belowItems2Button.UseVisualStyleBackColor = true;
@@ -570,9 +514,9 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
             // belowItems1Button
             // 
             this.belowItems1Button.Enabled = false;
-            this.belowItems1Button.Location = new System.Drawing.Point(301, 284);
+            this.belowItems1Button.Location = new System.Drawing.Point(273, 284);
             this.belowItems1Button.Name = "belowItems1Button";
-            this.belowItems1Button.Size = new System.Drawing.Size(47, 23);
+            this.belowItems1Button.Size = new System.Drawing.Size(42, 23);
             this.belowItems1Button.TabIndex = 46;
             this.belowItems1Button.Text = "Col. 1";
             this.belowItems1Button.UseVisualStyleBackColor = true;
@@ -669,10 +613,52 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
             this.templateLabel.TabIndex = 59;
             this.templateLabel.Text = "Template";
             // 
+            // colW3TextBox
+            // 
+            this.colW3TextBox.Enabled = false;
+            this.colW3TextBox.Location = new System.Drawing.Point(241, 241);
+            this.colW3TextBox.Name = "colW3TextBox";
+            this.colW3TextBox.Size = new System.Drawing.Size(28, 20);
+            this.colW3TextBox.TabIndex = 61;
+            // 
+            // belowW3TextBox
+            // 
+            this.belowW3TextBox.Enabled = false;
+            this.belowW3TextBox.Location = new System.Drawing.Point(241, 286);
+            this.belowW3TextBox.Name = "belowW3TextBox";
+            this.belowW3TextBox.Size = new System.Drawing.Size(28, 20);
+            this.belowW3TextBox.TabIndex = 62;
+            // 
+            // commonItems4Button
+            // 
+            this.commonItems4Button.Enabled = false;
+            this.commonItems4Button.Location = new System.Drawing.Point(408, 240);
+            this.commonItems4Button.Name = "commonItems4Button";
+            this.commonItems4Button.Size = new System.Drawing.Size(42, 23);
+            this.commonItems4Button.TabIndex = 63;
+            this.commonItems4Button.Text = "Col. 4";
+            this.commonItems4Button.UseVisualStyleBackColor = true;
+            this.commonItems4Button.Click += new System.EventHandler(this.commonItems4Button_Click);
+            // 
+            // belowItems4Button
+            // 
+            this.belowItems4Button.Enabled = false;
+            this.belowItems4Button.Location = new System.Drawing.Point(408, 284);
+            this.belowItems4Button.Name = "belowItems4Button";
+            this.belowItems4Button.Size = new System.Drawing.Size(42, 23);
+            this.belowItems4Button.TabIndex = 64;
+            this.belowItems4Button.Text = "Col. 4";
+            this.belowItems4Button.UseVisualStyleBackColor = true;
+            this.belowItems4Button.Click += new System.EventHandler(this.belowItems4Button_Click);
+            // 
             // PrinterCfgCtrl
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.belowItems4Button);
+            this.Controls.Add(this.commonItems4Button);
+            this.Controls.Add(this.belowW3TextBox);
+            this.Controls.Add(this.colW3TextBox);
             this.Controls.Add(this.templateTextBox);
             this.Controls.Add(this.templateLabel);
             this.Controls.Add(this.footerItalicCheckBox);
@@ -683,21 +669,15 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
             this.Controls.Add(this.docNameTextBox);
             this.Controls.Add(this.docNameLabel);
             this.Controls.Add(this.goodOnlyCheckBox);
-            this.Controls.Add(this.label7);
             this.Controls.Add(this.belowW0TextBox);
             this.Controls.Add(this.label8);
-            this.Controls.Add(this.label9);
-            this.Controls.Add(this.label10);
             this.Controls.Add(this.belowW2TextBox);
             this.Controls.Add(this.belowW1TextBox);
             this.Controls.Add(this.belowItems3Button);
             this.Controls.Add(this.belowItems2Button);
             this.Controls.Add(this.belowItems1Button);
-            this.Controls.Add(this.label6);
             this.Controls.Add(this.colW0TextBox);
             this.Controls.Add(this.label5);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.label3);
             this.Controls.Add(this.colW2TextBox);
             this.Controls.Add(this.colW1TextBox);
             this.Controls.Add(this.commonItems3Button);
@@ -781,17 +761,11 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
 		private System.Windows.Forms.Button commonItems2Button;
 		private System.Windows.Forms.Button commonItems3Button;
 		private System.Windows.Forms.TextBox colW2TextBox;
-		private System.Windows.Forms.TextBox colW1TextBox;
-		private System.Windows.Forms.Label label3;
-		private System.Windows.Forms.Label label4;
-		private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.TextBox colW1TextBox;
+        private System.Windows.Forms.Label label5;
         private System.Windows.Forms.TextBox colW0TextBox;
-        private System.Windows.Forms.Label label7;
         private System.Windows.Forms.TextBox belowW0TextBox;
         private System.Windows.Forms.Label label8;
-        private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.Label label10;
         private System.Windows.Forms.TextBox belowW2TextBox;
         private System.Windows.Forms.TextBox belowW1TextBox;
         private System.Windows.Forms.Button belowItems3Button;
@@ -807,5 +781,9 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
         private System.Windows.Forms.Label footerFontLabel;
         private System.Windows.Forms.TextBox templateTextBox;
         private System.Windows.Forms.Label templateLabel;
+        private System.Windows.Forms.TextBox colW3TextBox;
+        private System.Windows.Forms.TextBox belowW3TextBox;
+        private System.Windows.Forms.Button commonItems4Button;
+        private System.Windows.Forms.Button belowItems4Button;
 	}
 }

TBF/BenchControl/Output/Printers/Zapiska/PrinterCfgCtrl.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2017 Sensus Slovensko a.s.
+/// Copyright (c) 2017-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -33,10 +33,12 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
 		string[] commonItems1;
 		string[] commonItems2;
 		string[] commonItems3;
-		string[] testItems;
+        string[] commonItems4;
+        string[] testItems;
         string[] belowItems1;
         string[] belowItems2;
         string[] belowItems3;
+        string[] belowItems4;
         string footer;
 
 		public PrinterCfgCtrl()
@@ -64,10 +66,12 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
 			commonItems1 = config.CommonItems1;
 			commonItems2 = config.CommonItems2;
 			commonItems3 = config.CommonItems3;
-			testItems = config.SelectedItems;
+            commonItems4 = config.CommonItems4;
+            testItems = config.SelectedItems;
             belowItems1 = config.BelowItems1;
             belowItems2 = config.BelowItems2;
             belowItems3 = config.BelowItems3;
+            belowItems4 = config.BelowItems4;
             footer = config.Footer;
 
 			Redraw();
@@ -78,10 +82,11 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
 			nameLabel.Text = Strings.Name;
 			cultureLabel.Text = "Culture";
 			headerButton.Text = Strings.Header;
-			commonItems1Button.Text = "Common 1";
-			commonItems2Button.Text = "Common 2";
-			commonItems3Button.Text = "Common 3";
-			testItemsButton.Text = "Test items";
+			commonItems1Button.Text = "Col. 1";
+			commonItems2Button.Text = "Col. 2";
+			commonItems3Button.Text = "Col. 3";
+            commonItems4Button.Text = "Col. 4";
+            testItemsButton.Text = "Test items";
 			footerButton.Text = Strings.Footer;
 		}
 
@@ -123,10 +128,12 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
             colW0TextBox.Text = config.ColW0Pct.ToString();
             colW1TextBox.Text = config.ColW1Pct.ToString();
 			colW2TextBox.Text = config.ColW2Pct.ToString();
+            colW3TextBox.Text = config.ColW3Pct.ToString();
 
             belowW0TextBox.Text = config.BelowW0Pct.ToString();
             belowW1TextBox.Text = config.BelowW1Pct.ToString();
             belowW2TextBox.Text = config.BelowW2Pct.ToString();
+            belowW3TextBox.Text = config.BelowW3Pct.ToString();
 
 			supressPrintingCheckBox.Checked = config.SupressPrinting;
             goodOnlyCheckBox.Checked = config.GoodOnly;
@@ -166,16 +173,20 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
             colW0TextBox.Enabled = true;
             colW1TextBox.Enabled = true;
 			colW2TextBox.Enabled = true;
-			commonItems1Button.Enabled = true;
+            colW3TextBox.Enabled = true;
+            commonItems1Button.Enabled = true;
 			commonItems2Button.Enabled = true;
 			commonItems3Button.Enabled = true;
-			testItemsButton.Enabled = true;
+            commonItems4Button.Enabled = true;
+            testItemsButton.Enabled = true;
             belowW0TextBox.Enabled = true;
             belowW1TextBox.Enabled = true;
             belowW2TextBox.Enabled = true;
+            belowW3TextBox.Enabled = true;
             belowItems1Button.Enabled = true;
             belowItems2Button.Enabled = true;
             belowItems3Button.Enabled = true;
+            belowItems4Button.Enabled = true;
             footerButton.Enabled = true;
             docNameTextBox.Enabled = true;
         }
@@ -190,7 +201,7 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
 				flags |= CfgUpdateFlags.Error;
 			}
 
-            int dummy, dummy2, dummy3;
+            int dummy, dummy2, dummy3, dummy4;
 			if (!int.TryParse(topMarginTextBox.Text, out dummy) || dummy < 0 || dummy > 500)
 			{
 				message += Environment.NewLine + "'Top margin' should be between 0 and 500";
@@ -257,7 +268,13 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
 				flags |= CfgUpdateFlags.Error;
 			}
 
-			if (dummy + dummy2 + dummy3 > 100)
+            if (!int.TryParse(colW3TextBox.Text, out dummy4) || dummy4 < 0 || dummy4 > 100)
+            {
+                message += Environment.NewLine + "Column width 3 should be between 0 and 100";
+                flags |= CfgUpdateFlags.Error;
+            }
+
+            if (dummy + dummy2 + dummy3 + dummy4 > 100)
 			{
 				message += Environment.NewLine + "Sum of column widths should be <= 100";
 				flags |= CfgUpdateFlags.Error;
@@ -281,7 +298,13 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
                 flags |= CfgUpdateFlags.Error;
             }
 
-            if (dummy + dummy2 + dummy3 > 100)
+            if (!int.TryParse(belowW3TextBox.Text, out dummy4) || dummy4 < 0 || dummy4 > 100)
+            {
+                message += Environment.NewLine + "Column width 3 should be between 0 and 100";
+                flags |= CfgUpdateFlags.Error;
+            }
+
+            if (dummy + dummy2 + dummy3 + dummy4 > 100)
             {
                 message += Environment.NewLine + "Sum of column widths should be <= 100";
                 flags |= CfgUpdateFlags.Error;
@@ -348,9 +371,11 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
             flags |= UpdateDifferent(ref config.ColW0Pct, colW0TextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
             flags |= UpdateDifferent(ref config.ColW1Pct, colW1TextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
             flags |= UpdateDifferent(ref config.ColW2Pct, colW2TextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
+            flags |= UpdateDifferent(ref config.ColW3Pct, colW3TextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
             flags |= UpdateDifferent(ref config.BelowW0Pct, belowW0TextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
             flags |= UpdateDifferent(ref config.BelowW1Pct, belowW1TextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
             flags |= UpdateDifferent(ref config.BelowW2Pct, belowW2TextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
+            flags |= UpdateDifferent(ref config.BelowW3Pct, belowW3TextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
 
             flags |= UpdateDifferent(ref config.Header, header, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
             flags |= UpdateDifferent(ref config.Footer, footer, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
@@ -358,12 +383,14 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
             flags |= UpdateDifferent(ref config.CommonItems1, commonItems1, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
             flags |= UpdateDifferent(ref config.CommonItems2, commonItems2, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
             flags |= UpdateDifferent(ref config.CommonItems3, commonItems3, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
+            flags |= UpdateDifferent(ref config.CommonItems4, commonItems4, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
 
             flags |= UpdateDifferent(ref config.SelectedItems, testItems, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
 
             flags |= UpdateDifferent(ref config.BelowItems1, belowItems1, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
             flags |= UpdateDifferent(ref config.BelowItems2, belowItems2, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
             flags |= UpdateDifferent(ref config.BelowItems3, belowItems3, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
+            flags |= UpdateDifferent(ref config.BelowItems4, belowItems4, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
 
             for (Culture i = 0; i < Culture.Count; i++)
             {
@@ -436,6 +463,20 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
 			}
 		}
 
+        private void commonItems4Button_Click(object sender, EventArgs e)
+        {
+            Results.Forms.ResultsConfigDlg dlg = new Results.Forms.ResultsConfigDlg()
+            {
+                MetersKind = config.MetersKind,
+                SelectedItems = Results.WMeterRsltItemSpec.FromStrArray(commonItems4),
+            };
+
+            if (dlg.ShowDialog() == DialogResult.OK)
+            {
+                commonItems4 = Results.WMeterRsltItemSpec.ToStrArray(dlg.SelectedItems);
+            }
+        }
+
 		private void testItemsButton_Click(object sender, EventArgs e)
 		{
 			Results.Forms.ResultsConfigDlg dlg = new Results.Forms.ResultsConfigDlg()
@@ -491,6 +532,20 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
             }
         }
 
+        private void belowItems4Button_Click(object sender, EventArgs e)
+        {
+            Results.Forms.ResultsConfigDlg dlg = new Results.Forms.ResultsConfigDlg()
+            {
+                MetersKind = config.MetersKind,
+                SelectedItems = Results.WMeterRsltItemSpec.FromStrArray(belowItems4),
+            };
+
+            if (dlg.ShowDialog() == DialogResult.OK)
+            {
+                belowItems4 = Results.WMeterRsltItemSpec.ToStrArray(dlg.SelectedItems);
+            }
+        }
+
 		private void footerButton_Click(object sender, EventArgs e)
 		{
 			HeaderFooterDlg dlg = new HeaderFooterDlg(false, string.IsNullOrEmpty(footer) ? string.Empty : footer.Replace("~", Environment.NewLine));

TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/CycleBeginningForm.Designer.cs

@@ -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);

TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/TestStartEndForm.cs

@@ -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; };
 

TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/TestStartEndForm.designer.cs

@@ -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);

TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm.designer.cs

@@ -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);

TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm12.designer.cs

@@ -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);

TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm24.designer.cs

@@ -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);

TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs

@@ -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;

TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs

@@ -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;

TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs

@@ -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;

TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs

@@ -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;

TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs

@@ -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;

TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs

@@ -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;

TBF/BenchControl/TestMethods/ManualEntry/ManualEntryForm.designer.cs

@@ -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);

TBF/BenchControl/TestMethods/PulsesTest/WMPulsesForm.designer.cs

@@ -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);

TBF/BenchControl/TestMethods/PulsesTest/WMPulsesForm12.designer.cs

@@ -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);

TBF/BenchControl/TestMethods/PulsesTest/WMPulsesForm24.designer.cs

@@ -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);

TBF/BenchControl/TestMethods/PulsesTestManual/ManualPulsesForm.designer.cs

@@ -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);

TBF/BenchControl/TestMethods/PulsesTestManual/ManualPulsesForm12.designer.cs

@@ -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);

TBF/BenchControl/TestMethods/PulsesTestManual/ManualPulsesForm24.designer.cs

@@ -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);

TBF/BenchControl/Various/ManualLevelMsrmnt/WaterLevelForm.designer.cs

@@ -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);

TBF/Properties/AssemblyInfo.cs

@@ -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.1731.0")]
+[assembly: AssemblyFileVersion("2.25.1731.0")]

TBF/SampleConfig/config.xml

@@ -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>

TBF/SampleConfig/log4netConfig.xml

@@ -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>

TBF/TBF.csproj

@@ -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>

TBF/UI/MainWnd.Designer.cs

@@ -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();