IZRAEL_200 bug fix, ver. 2.18.1150

.gitattributes

@@ -1,2 +0,0 @@
-# Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto

Config/Config.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;IZRAEL_200</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -28,7 +28,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;IZRAEL_200</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

Config/Data.cs

@@ -20,7 +20,7 @@ namespace Config
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = WMsCount / LineSize;
-#elif FUZHOU_300 || FUZHOU_150 || IZRAEL_200 || PUCHONG_200 || GENESIS || SLM_150 || PETERSBURG_200 || DEWA_300
+#elif FUZHOU_300 || FUZHOU_150 || IZRAEL_200 || PUCHONG_200 || GENESIS || SLM_150 || PETERSBURG_200
 		public const int WMsCount = 6;
 		public const int LineSize = 6;
 		public const int CompoundWMsCount = 3;

Config/Entities/Enums.cs

@@ -498,75 +498,4 @@ namespace Config.Entities
 #endif
 		Count
 	}
-
-
-    public enum ErrorFlagShift
-    {
-        E1 = 0,
-        E2,
-        E3,
-        E4,
-        E5,
-        E6,
-        E7,
-        E8,
-        E9,
-        E10,
-        E11,
-        E12,
-        E13,
-        E14,
-        E15,
-        E16,
-        E17,
-        E18,
-        E19,
-        E20,
-        E21,
-        E22,
-        E23,
-        E24,
-        E25,
-        E26,
-        E27,
-        E28,
-        E29,
-        E30,
-        E31,
-    }
-
-    public enum ErrorFlagMask
-    {
-        E1 = (1 << (int)ErrorFlagShift.E1),
-        E2 = (1 << (int)ErrorFlagShift.E2),
-        E3 = (1 << (int)ErrorFlagShift.E3),
-        E4 = (1 << (int)ErrorFlagShift.E4),
-        E5 = (1 << (int)ErrorFlagShift.E5),
-        E6 = (1 << (int)ErrorFlagShift.E6),
-        E7 = (1 << (int)ErrorFlagShift.E7),
-        E8 = (1 << (int)ErrorFlagShift.E8),
-        E9 = (1 << (int)ErrorFlagShift.E9),
-        E10 = (1 << (int)ErrorFlagShift.E10),
-        E11 = (1 << (int)ErrorFlagShift.E11),
-        E12 = (1 << (int)ErrorFlagShift.E12),
-        E13 = (1 << (int)ErrorFlagShift.E13),
-        E14 = (1 << (int)ErrorFlagShift.E14),
-        E15 = (1 << (int)ErrorFlagShift.E15),
-        E16 = (1 << (int)ErrorFlagShift.E16),
-        E17 = (1 << (int)ErrorFlagShift.E17),
-        E18 = (1 << (int)ErrorFlagShift.E18),
-        E19 = (1 << (int)ErrorFlagShift.E19),
-        E20 = (1 << (int)ErrorFlagShift.E20),
-        E21 = (1 << (int)ErrorFlagShift.E21),
-        E22 = (1 << (int)ErrorFlagShift.E22),
-        E23 = (1 << (int)ErrorFlagShift.E23),
-        E24 = (1 << (int)ErrorFlagShift.E24),
-        E25 = (1 << (int)ErrorFlagShift.E25),
-        E26 = (1 << (int)ErrorFlagShift.E26),
-        E27 = (1 << (int)ErrorFlagShift.E27),
-        E28 = (1 << (int)ErrorFlagShift.E28),
-        E29 = (1 << (int)ErrorFlagShift.E29),
-        E30 = (1 << (int)ErrorFlagShift.E30),
-        E31 = (1 << (int)ErrorFlagShift.E31),
-    }
 }

Config/Entities/IperlEnums.cs

@@ -25,14 +25,6 @@ namespace Config.Entities
         Count
     }
 
-    public enum Counting
-    {
-        Arbitrary,
-        Positive,
-        Negative,
-        Count
-    }
-
     public enum OptoHeadState
     {
         Disabled,

Config/Entities/Test.cs

@@ -25,8 +25,8 @@ namespace Config.Entities
 		public virtual float Volume { get; set; }			/// Test volume (target) in [l]
         public virtual float TstTime { get; set; }			/// Test time (estimate) in [s]
         public virtual string Method { get; set; }
-        public virtual float ErrLimLo { get; set; }			/// in [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
-        public virtual float ErrLimHi { get; set; }			/// in [%] usually > 0, in case of heat meters: -Qn in m3/h
+        public virtual float ErrLimLo { get; set; }			/// in [%] (usually < 0) or 1=class1, 2=class2, 3=class3
+        public virtual float ErrLimHi { get; set; }			/// in [%] (usually > 0) or -Qn in m3/h
         public virtual float Uncertainty { get; set; }		///	int [%] makes error limits tighter: 0 <= Uncertainty <= abs(ErrLimXx)
         public virtual int Repeats { get; set; }
         public virtual bool DoDraining { get; set; }
@@ -310,50 +310,50 @@ namespace Config.Entities
             return null;
         }
 
-        public virtual double GetErrLimLo(double volumeCTV, double testTime)
+        public virtual float GetErrLimLo(float flow)
         {
             if (ErrLimLo <= ErrLimHi)
             {
-                return ErrLimLo;                        /// Error limit of a water meter
+                return ErrLimLo;        /// Error limit of a water meter
             }
             else
             {
                 /// Metrological class and nominal flow of a heat meter
                 int metrClass = (int)Math.Round(ErrLimLo);
-                double Qp = Math.Abs(ErrLimHi);
-                double Q = (testTime == 0) ? 1 : Math.Max(3.6 * volumeCTV / testTime, 0.00001); /// Div. by zero avoided
+                float Qp = Math.Abs(ErrLimHi);
+                float Q = Math.Max(flow, 0.00001f);     /// to avoid division by zero
 
                 /// Calculate the error limit of a heat meter
                 switch (metrClass)
                 {
                     default:
-                    case 1: return -Math.Min(3.5, 1.0 + 0.01 * Qp / Q);
-                    case 2: return -Math.Min(5.0, 2.0 + 0.02 * Qp / Q);
-                    case 3: return -Math.Min(5.0, 3.0 + 0.05 * Qp / Q);
+                    case 1: return -Math.Min(3.5f, 1.0f + 0.01f * Qp / Q);
+                    case 2: return -Math.Min(5.0f, 2.0f + 0.02f * Qp / Q);
+                    case 3: return -Math.Min(5.0f, 3.0f + 0.05f * Qp / Q);
                 }
             }
         }
 
-        public virtual double GetErrLimHi(double volumeCTV, double testTime)
+        public virtual float GetErrLimHi(float flow)
         {
             if (ErrLimLo <= ErrLimHi)
             {
-                return ErrLimHi;                        /// Error limit of a water meter
+                return ErrLimHi;        /// Error limit of a water meter
             }
             else
             {
                 /// Metrological class and nominal flow of a heat meter
                 int metrClass = (int)Math.Round(ErrLimLo);
-                double Qp = Math.Abs(ErrLimHi);
-                double Q = (testTime == 0) ? 1 : Math.Max(3.6 * volumeCTV / testTime, 0.00001); /// Div. by zero avoided
+                float Qp = Math.Abs(ErrLimHi);
+                float Q = Math.Max(flow, 0.00001f);     /// to avoid division by zero
 
                 /// Calculate the error limit of a heat meter
                 switch (metrClass)
                 {
                     default:
-                    case 1: return +Math.Min(3.5, 1.0 + 0.01 * Qp / Q);
-                    case 2: return +Math.Min(5.0, 2.0 + 0.02 * Qp / Q);
-                    case 3: return +Math.Min(5.0, 3.0 + 0.05 * Qp / Q);
+                    case 1: return +Math.Min(3.5f, 1.0f + 0.01f * Qp / Q);
+                    case 2: return +Math.Min(5.0f, 2.0f + 0.02f * Qp / Q);
+                    case 3: return +Math.Min(5.0f, 3.0f + 0.05f * Qp / Q);
                 }
             }
         }

Config/Entities/TransitionSequence.cs

@@ -1,10 +1,7 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
-using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
 
 namespace Config.Entities
 {
@@ -40,56 +37,5 @@ namespace Config.Entities
 			foreach (var step in TransitionSteps) { result.TransitionSteps.Add(step.Clone()); }
             return result;
         }
-
-        public virtual void Export(StreamWriter output)
-        {
-            output.WriteLine(ItemNr.ToString(CultureInfo.InvariantCulture));
-            output.WriteLine(Name);
-            output.WriteLine(Description);
-
-            foreach (var step in TransitionSteps) { step.Export(output); }
-            output.WriteLine();
-
-            output.Close();
-        }
-
-        public static TransitionSequence Import(StreamReader input)
-        {
-            TransitionSequence result = new TransitionSequence();
-
-            result.ItemNr = int.Parse(input.ReadLine(), CultureInfo.InvariantCulture);
-            result.Name = input.ReadLine();
-            result.Description = input.ReadLine();
-
-            while (true)
-            {
-                TransitionStep step = TransitionStep.Import(input, result);
-                if (step == null)
-                    break;
-                else
-                    result.TransitionSteps.Add(step);
-            }
-
-            return result;
-        }
-
-        public virtual string Compare(StreamReader inp)
-        {
-            System.Text.StringBuilder diff = new System.Text.StringBuilder();
-            const string fmt = "{0} = {1}\r\n (in the file {2})\r\n";
-            string ln;
-
-            ln = inp.ReadLine();            /// skip ItemNr
-            ln = inp.ReadLine(); if (ln != Name) { diff.AppendFormat(fmt, "Name", Name, ln); };
-            ln = inp.ReadLine(); if (ln != Description) { diff.AppendFormat(fmt, "Description", Description, ln); };
-
-            //foreach (var step in TransitionSteps)
-            //{
-            //    string testDiff = step.Compare(inp);
-            //    if (testDiff.Contains(
-            //}
-
-            return diff.ToString();
-        }
-    }
+	}
 }

Config/Entities/TransitionStep.cs

@@ -1,10 +1,8 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015, 2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
 
 namespace Config.Entities
 {
@@ -63,64 +61,5 @@ namespace Config.Entities
             result += indent + "PumpsWithFMPct = " + PumpWithFMPcts + Environment.NewLine;
             return result;
 		}
-
-        public virtual void Export(StreamWriter output)
-        {
-            CultureInfo ci = CultureInfo.InvariantCulture;
-
-            output.WriteLine(ItemNr.ToString(ci));
-            output.WriteLine(Duration.ToString(ci));
-            output.WriteLine(Message);
-            output.WriteLine(EndCondition);
-            output.WriteLine(ValvesOpen);
-            output.WriteLine(ValvesClose);
-            output.WriteLine(RegulValvesPct);
-            output.WriteLine(PumpWithFMPcts);
-        }
-
-        public static TransitionStep Import(StreamReader input, TransitionSequence newSequence)
-        {
-            string firstLine = input.ReadLine();
-            if (string.IsNullOrEmpty(firstLine))
-            {
-                return null;
-            }
-
-            CultureInfo ci = CultureInfo.InvariantCulture;
-            int itemNr = int.Parse(firstLine, ci);
-            TransitionStep tst = new TransitionStep(itemNr, newSequence);
-
-            tst.Duration = int.Parse(input.ReadLine(), ci);
-            tst.Message = input.ReadLine();
-            tst.EndCondition = input.ReadLine();
-            tst.ValvesOpen = input.ReadLine();
-            tst.ValvesClose = input.ReadLine();
-            tst.RegulValvesPct = input.ReadLine();
-            tst.PumpWithFMPcts = input.ReadLine();
-
-            return tst;
-        }
-
-        public virtual string Compare(StreamReader inp)
-        {
-            System.Text.StringBuilder diff = new System.Text.StringBuilder();
-            string fmt = string.Format("Step {0} : ", ItemNr) + "{0} = {1}\r\n (in the file {2})\r\n";
-            string ln;
-            CultureInfo ci = CultureInfo.InvariantCulture;
-
-            string firstLine = inp.ReadLine();
-            if (string.IsNullOrEmpty(firstLine)) return string.Format("TransitionStep {0} is missing in the compared file\r\n", ItemNr);
-
-            if (ItemNr.ToString() != firstLine) { diff.AppendFormat(fmt, "ItemNr", ItemNr, firstLine); };
-            ln = inp.ReadLine(); if (ln != Duration.ToString(ci)) { diff.AppendFormat(fmt, "Duration", Duration.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != Message) { diff.AppendFormat(fmt, "Message", Message, ln); };
-            ln = inp.ReadLine(); if (ln != EndCondition) { diff.AppendFormat(fmt, "EndCondition", EndCondition, ln); };
-            ln = inp.ReadLine(); if (ln != ValvesOpen) { diff.AppendFormat(fmt, "ValvesOpen", ValvesOpen, ln); };
-            ln = inp.ReadLine(); if (ln != ValvesClose) { diff.AppendFormat(fmt, "ValvesClose", ValvesClose, ln); };
-            ln = inp.ReadLine(); if (ln != RegulValvesPct) { diff.AppendFormat(fmt, "RegulValvesPct", RegulValvesPct, ln); };
-            ln = inp.ReadLine(); if (ln != PumpWithFMPcts) { diff.AppendFormat(fmt, "PumpWithFMPcts", PumpWithFMPcts, ln); };
-
-            return diff.ToString();
-        }
 	}
 }

Config/Entities/VirtualBenchSequence.cs

@@ -1,9 +1,8 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
-using System.IO;
 
 namespace Config.Entities
 {
@@ -36,24 +35,5 @@ namespace Config.Entities
             foreach (var step in VirtualBenchSteps) { result.VirtualBenchSteps.Add(step.Clone()); }
             return result;
         }
-
-        public virtual void Export(StreamWriter output)
-        {
-            /// TODO
-        }
-
-        public static VirtualBenchSequence Import(StreamReader input)
-        {
-            VirtualBenchSequence result = new VirtualBenchSequence();
-            /// TODO
-            return result;
-        }
-
-        public virtual string Compare(StreamReader inp)
-        {
-            System.Text.StringBuilder diff = new System.Text.StringBuilder();
-            /// TODO
-            return diff.ToString();
-        }
     }
 }

Config/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.18.1151.0")]
-[assembly: AssemblyFileVersion("2.18.1151.0")]
+[assembly: AssemblyVersion("2.18.1110.0")]
+[assembly: AssemblyFileVersion("2.18.1110.0")]

DeviceTest/DeviceTestDlg.cs

@@ -276,14 +276,7 @@ namespace DeviceTest
 				radioButton3.Text = "SelectTank 3";
 				radioButton4.Text = "SelectTank -";
 			}
-            else if (className == "Modbus.QuidoRS")
-            {
-                radioButton1.Text = "Close relay 1";
-                radioButton2.Text = "Close relay 2";
-                radioButton3.Text = "Close relay 3";
-                radioButton4.Text = "Open all relays";
-            }
-            else radioButton1.Text = "spare";
+			else radioButton1.Text = "spare";
 		}
 		/// 
 		void UpdateOperations2(string className)
@@ -303,14 +296,7 @@ namespace DeviceTest
 				radioButton23.Text = "SelectTank 3";
 				radioButton24.Text = "SelectTank -";
 			}
-            else if (className == "Modbus.QuidoRS")
-            {
-                radioButton21.Text = "Close relay 1";
-                radioButton22.Text = "Close relay 2";
-                radioButton23.Text = "Close relay 3";
-                radioButton24.Text = "Open all relays";
-            }
-            else radioButton21.Text = "spare";
+			else radioButton21.Text = "spare";
 		}
 		/// 
 		void UpdateOperations3(string className)
@@ -330,14 +316,7 @@ namespace DeviceTest
 				radioButton33.Text = "SelectTank 3";
 				radioButton34.Text = "SelectTank -";
 			}
-            else if (className == "Modbus.QuidoRS")
-            {
-                radioButton31.Text = "Close relay 1";
-                radioButton32.Text = "Close relay 2";
-                radioButton33.Text = "Close relay 3";
-                radioButton34.Text = "Open all relays";
-            }
-            else radioButton31.Text = "spare";
+			else radioButton31.Text = "spare";
 		}
 
 
@@ -693,13 +672,6 @@ namespace DeviceTest
 				//operation3 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(3);
 				//operation4 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(0);
 			}
-            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
-            {
-                operation1 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
-                operation2 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
-                operation3 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
-                operation4 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
-            }
 
 
 			if (tbfComponent2forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
@@ -732,13 +704,6 @@ namespace DeviceTest
                 //operation23 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(3);
                 //operation24 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(0);
 			}
-            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
-            {
-                operation21 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
-                operation22 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
-                operation23 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
-                operation24 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
-            }
 
 
 			if (tbfComponent3forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
@@ -771,13 +736,6 @@ namespace DeviceTest
 				//operation33 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(3);
 				//operation34 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(0);
 			}
-            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
-            {
-                operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
-                operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
-                operation33 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
-                operation34 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
-            }
 
 
             int time = 0;

Results/Entities/MeterTestRslt.cs

@@ -25,7 +25,6 @@ namespace Results.Entities
  
 		/// Main result
 		public virtual double Error			  { get; set; }		/// [%]
-        public virtual int    ErrorIndicators { get; set; }		/// Not mapped to DB !!!, bit24=E25, bit25=E26, bit26=E27, bit27=E28
         public virtual double KorrErrQ        { get; set; }     /// [%] not mapped to results DB, saved to Oracle DB
 		public virtual bool   TestDone		  { get; set; }		/// true = test was completed
 		public virtual bool   Passed		  { get; set; }		/// true = test passed, water meter is OK

Results/Entities/TestData.cs

@@ -20,8 +20,8 @@ namespace Results.Entities
 		public virtual double TargetVolume			{ get; set; }	/// [l] target test volume
 		public virtual double TargetTime			{ get; set; }	/// [s] target test time
 		public virtual string Method				{ get; set; }
-        public virtual double ErrLimLo              { get; set; }	/// [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
-        public virtual double ErrLimHi              { get; set; }	/// [%] usually > 0, in case of heat meters: -Qn in m3/h
+		public virtual double ErrLimLo				{ get; set; }	/// [%] (usually < 0)
+		public virtual double ErrLimHi				{ get; set; }	/// [%] (usually > 0)
 		public virtual double Uncertainty			{ get; set; }	///	[%] makes error limits tighter: 0 <= Uncertainty <= abs(ErrLimXx)
 		public virtual bool   DoControlWaterTemp	{ get; set; }
 		public virtual float  TempLimLo				{ get; set; }

Results/Entities/TestRslt.cs

@@ -148,7 +148,7 @@ namespace Results.Entities
                 /// Metrological class and nominal flow of a heat meter
                 int metrClass = (int)Math.Round(TestData.ErrLimLo);
                 double Qp = Math.Abs(TestData.ErrLimHi);
-                double Q = (TestTime == 0) ? 1 : Math.Max(3.6 * VolumeCTV / TestTime, 0.00001); /// Div. by zero avoided
+                double Q = Math.Max(FlowMean, 0.00001);     /// to avoid division by zero
 
                 /// Calculate the error limit of a heat meter
                 switch (metrClass)
@@ -172,7 +172,7 @@ namespace Results.Entities
                 /// Metrological class and nominal flow of a heat meter
                 int metrClass = (int)Math.Round(TestData.ErrLimLo);
                 double Qp = Math.Abs(TestData.ErrLimHi);
-                double Q = (TestTime == 0) ? 1 : Math.Max(3.6 * VolumeCTV / TestTime, 0.00001); /// Div. by zero avoided
+                double Q = Math.Max(FlowMean, 0.00001);     /// to avoid division by zero
 
                 /// Calculate the error limit of a heat meter
                 switch (metrClass)

Results/Entities/WaterMeter.cs

@@ -41,8 +41,8 @@ namespace Results.Entities
     public class WaterMeter
 	{
 		public virtual int    Id				{ get; protected set; }
-        public virtual string SerialNr          { get; set; }	/// S/N _or_ S/N of the main meter of a compound meter _or_ PCB Number of an iPerl water meter
-        public virtual string SerialNrAux       { get; set; }	/// S/N of the aux. meter of a compound meter _or_ a complete assigned S/N of an iPerl water meter
+		public virtual string SerialNr			{ get; set; }	/// Main s/n for compound meters, PCB Number for iPerl water meter
+		public virtual string SerialNrAux		{ get; set; }	/// Aux s/n for compound meters, Serial number for iPerl water meter
 		public virtual string PurchaseOrder		{ get; set; }
 		public virtual int    YearOfProduction  { get; set; }
 		public virtual int    WMPosition        { get; set; }
@@ -57,11 +57,14 @@ namespace Results.Entities
 		public virtual string Remark			{ get; set; }
 
 #if IPERL
+		public virtual int    SerialNrEx        { get; set; }	/// Aux s/n for compound meters, Serial number for iPerl water meter
 		public virtual double OrigCalibFactor   { get; set; }	/// Original iPerl calibration factor used during the test
         public virtual double CalibFactor       { get; set; }	/// iPerl calibration factor used during the test
         public virtual double OrigCalibFactorLNA{ get; set; }	/// Original iPerl LNA calibration factor used during the test
         public virtual double CalibFactorLNA    { get; set; }	/// iPerl LNA calibration factor used during the test
         public virtual double Q2ErrWOCorrection { get; set; }
+		public virtual bool   Q2CorrectionDone  { get; set; }   /// true = iPerl Q2 correction was done
+        public virtual double Q2Correction      { get; set; }	/// !!! obsolete
         public virtual int    Q2CorrRL          { get; set; }	/// iPerl Q2 correction for the R-flow written to iPerl
         public virtual int    Q2CorrLR          { get; set; }	/// iPerl Q2 correction for the L-flow written to iPerl
         public virtual int    Q2CorrFlowRight   { get; set; }	/// 1 = right to left
@@ -70,35 +73,11 @@ namespace Results.Entities
 		public virtual int    Hz2Correction     { get; set; }	/// iPerl Q2 correction used during the test
 		public virtual string FWVersion         { get; set; }
 #endif
-#if TURA_SPECIAL
-        /// <summary>
-        /// Data from a production test bench (in case of tests on iPerl special)
-        /// </summary>
-        public virtual int    AssignedSerialNr  { get; set; }
-        public virtual string CompleteSerialNr  { get; set; }
-        public virtual string RadioAddress      { get; set; }
-        public virtual int    PaletteNr         { get; set; }
-        public virtual int    UmkartonNr        { get; set; }
-        public virtual string ProdTestBench     { get; set; }
-        public virtual int    ProdWMPosition    { get; set; }
-        public virtual string ProdUserName      { get; set; }
-        public virtual string ProdPurchaseOrder { get; set; }
-        public virtual bool   ProdPassed        { get; set; }
-        public virtual int    ProdResultCode    { get; set; }
-        public virtual int    ProdQ2CorrRL      { get; set; }	/// iPerl Q2 correction for the R-flow written to iPerl
-        public virtual int    ProdQ2CorrLR      { get; set; }	/// iPerl Q2 correction for the L-flow written to iPerl
-#endif
 #if ORACLE_DB
-		public virtual int	  Pruefindex	    { get; set; }	/// >= 1 ... pruefindex
-		public virtual int	  HydrPruefung		{ get; set; }
-        public virtual int    WMTypeRevision    { get; set; }	/// Not mapped to DB !!!
-        public virtual object RawTestInfos      { get; set; }	/// IList<SensusTestInfo> fetched from Oracle at the beginning of the cycle, not mapped to DB !!!
-        public virtual object CompleteTestInfos { get; set; }	/// SensusTestInfo[] obtained as a best match at the beginning of the cycle, not mapped to DB !!!
+		public virtual int	  Pruefindex	    { get; set; }	/// Not mapped to DB !!! 0=unknown (saving to Oracle failed), >=1 ... pruefindex
+		public virtual int	  HydrPruefung		{ get; set; }	/// Not mapped to DB !!!
 #endif
-		public virtual int	  ProcessId	        { get; set; }	/// Not mapped to DB !!!    Tracing DB Process ID
-        public virtual bool   IsLastRecordOk    { get; set; }	/// Not mapped to DB !!!    Previous record verification result
-
-        public virtual WaterMeterData WaterMeterData { get; set; }
+		public virtual WaterMeterData WaterMeterData { get; set; }
 		public virtual Batch Batch { get; set; }
 		public virtual IList<MeterTestRslt> MeterTestRslts { get; set; }
 
@@ -283,12 +262,7 @@ namespace Results.Entities
 					{
 						return mtr;
 					}
-                    else if (meterId == Config.Entities.CompoundMeterId.SingleOrCompound &&
-                             mtr.CompoundMeterId == (byte)Config.Entities.CompoundMeterId.HeatMeterEnergy)
-                    {
-                        return mtr;
-                    }
-                }
+				}
 			}
 			return null;
 		}
@@ -350,15 +324,6 @@ namespace Results.Entities
 		public WaterMeter()
 		{
 			MeterTestRslts = new List<MeterTestRslt>();
-#if ORACLE_DB
-            Pruefindex = 1;
-            HydrPruefung = 0;
-            WMTypeRevision = 0;
-            RawTestInfos = null;
-            CompleteTestInfos = null;
-#endif
-            ProcessId = 0;
-            IsLastRecordOk = false;
 		}
 
 
@@ -381,9 +346,12 @@ namespace Results.Entities
 			ArchivePath = src.ArchivePath;
 			Remark = src.Remark;
 #if IPERL
+		    SerialNrEx = src.SerialNrEx;
 		    OrigCalibFactor = src.OrigCalibFactor;
 		    CalibFactor = src.CalibFactor;
 		    Q2ErrWOCorrection = src.Q2ErrWOCorrection;
+		    Q2CorrectionDone = src.Q2CorrectionDone;
+            Q2Correction = src.Q2Correction;
             Q2CorrRL = src.Q2CorrRL;
             Q2CorrLR = src.Q2CorrLR;
             Q2CorrFlowRight = src.Q2CorrFlowRight;
@@ -392,31 +360,10 @@ namespace Results.Entities
 		    Hz2Correction = src.Hz2Correction;
 			FWVersion = src.FWVersion;
 #endif
-#if TURA_SPECIAL
-            AssignedSerialNr = src.AssignedSerialNr;
-            CompleteSerialNr = src.CompleteSerialNr;
-            RadioAddress = src.RadioAddress;
-            PaletteNr = src.PaletteNr;
-            UmkartonNr = src.UmkartonNr;
-            ProdTestBench = src.ProdTestBench;
-            ProdWMPosition = src.ProdWMPosition;
-            ProdUserName = src.ProdUserName;
-            ProdPurchaseOrder = src.ProdPurchaseOrder;
-            ProdPassed = src.ProdPassed;
-            ProdResultCode = src.ProdResultCode;
-            ProdQ2CorrRL = src.ProdQ2CorrRL;
-            ProdQ2CorrLR = src.ProdQ2CorrLR;
-#endif
 #if ORACLE_DB
-            Pruefindex = src.Pruefindex;
+		    Pruefindex = src.Pruefindex;
 		    HydrPruefung = src.HydrPruefung;
-            WMTypeRevision = src.WMTypeRevision;
-            RawTestInfos = src.RawTestInfos;
-            CompleteTestInfos = src.CompleteTestInfos;
 #endif
-            ProcessId = src.ProcessId;
-            IsLastRecordOk = src.IsLastRecordOk;
-
             foreach (var mtr in MeterTestRslts)
             {
                 MeterTestRslt srcMtr = src.GetMeterTestRslt(mtr.Name(), (Config.Entities.CompoundMeterId)mtr.CompoundMeterId);
@@ -432,7 +379,7 @@ namespace Results.Entities
 		{
 			StringBuilder sb = new StringBuilder(80);
 #if IPERL
-			sb.AppendFormat("PCB:{0} S/N:{1} ", SerialNr, SerialNrAux);
+			sb.AppendFormat("PCB:{0} S/N:{1} ", SerialNr, SerialNrEx);
 #else
 			sb.AppendFormat("S/N:{0} ", SerialNr);
 #endif

Results/Entities/WaterMeterData.cs

@@ -54,6 +54,7 @@ namespace Results.Entities
 
 #if ORACLE_DB
 		public virtual int WMTypeId { get; set; }
+		public virtual int WMTypeRev { get; set; }
 #endif
 
         public WaterMeterData()
@@ -110,6 +111,7 @@ namespace Results.Entities
 
 #if ORACLE_DB
             if (WMTypeId != wmd.WMTypeId) return false;
+            if (WMTypeRev != wmd.WMTypeRev) return false;
 #endif
             return true;
 		}

Results/Forms/BatchResultsDlg.cs

@@ -16,16 +16,6 @@ namespace Results.Forms
     {
         static readonly ILog log = LogManager.GetLogger(typeof(BatchResultsDlg));
 
-
-        static readonly Color NotCompletedColor = Color.White;
-        static readonly Color OkColor = Color.LightGreen;
-        static readonly Color NokColor = Color.LightPink;
-        static readonly Color RejectColor = Color.Magenta;
-        static readonly Color ProductionTracing = Color.RoyalBlue;
-        static readonly Color WrongDirection = Color.Gold;
-        static readonly Color WrongQ2FactorsColor = Color.Red;
-
-
         DateTime lastRedraw;
         DateTime lastSizeChange;
         bool loaded;
@@ -55,7 +45,7 @@ namespace Results.Forms
         Results.BatchResults results;
         MetersKind metersKind;
 
-        OneWMResultsCtrl firstListView;
+        ListView firstListView;
         public int[] rsltsClmnWidths;
         int rsltsClmnCount { get { return (rsltsClmnWidths != null) ? rsltsClmnWidths.Length : 0; } }
 
@@ -160,9 +150,9 @@ namespace Results.Forms
                 {
                     if (results.WaterMeters[i] != null && !results.WaterMeters[i].Disabled)
                     {
-                        OneWMResultsCtrl lview = (TestsArrangement == TestsArrangement.Rows)
-                                               ? GetResultsTestsAreRows(results.WaterMeters[i], i + 1)
-                                               : GetResultsTestsAreColumns(results.WaterMeters[i], i + 1);
+                        ListView lview = (TestsArrangement == TestsArrangement.Rows)
+                                       ? GetResultsTestsAreRows(results.WaterMeters[i], i + 1)
+                                       : GetResultsTestsAreColumns(results.WaterMeters[i], i + 1);
                         if (lview != null)
                         {
                             flowLayoutPanel.Controls.Add(lview);
@@ -188,16 +178,24 @@ namespace Results.Forms
             this.ResumeLayout(false);
         }
 
-
         /// <summary>
         /// Get an empty ListView control with appropriate parameters.
         /// </summary>
         /// <returns>ListView control</returns>
-        OneWMResultsCtrl GetListView(Color backColor)
+        ListView GetListView()
         {
-            return new OneWMResultsCtrl(backColor, lvWidth, lvHeight);
+            ListView lview = new ListView();
+            lview.AllowColumnReorder = false;
+            lview.Dock = System.Windows.Forms.DockStyle.None;
+            lview.FullRowSelect = true;
+            lview.GridLines = true;
+            lview.Location = new System.Drawing.Point(0, 0);
+            lview.Size = new System.Drawing.Size(lvWidth, lvHeight);
+            lview.TabIndex = 0;
+            lview.UseCompatibleStateImageBehavior = false;
+            lview.View = System.Windows.Forms.View.Details;
+            return lview;
         }
-        OneWMResultsCtrl GetListView() { return GetListView(Color.White); }
 
 
         /// <summary>
@@ -211,10 +209,8 @@ namespace Results.Forms
 
             foreach (var mtr in wMtr.MeterTestRslts)
             {
-                if ((mtr.CompoundMeterId == (byte)CompoundMeterId.Single || mtr.CompoundMeterId == (byte)CompoundMeterId.Compound || mtr.CompoundMeterId == (byte)CompoundMeterId.HeatMeterEnergy)
-                      && mtr.TestDone
-                      && (mtr.Publish() != Config.Entities.Publish.Never)
-                      && (mtr.Publish() != Config.Entities.Publish.Internal))
+				if (mtr.IsPilotRslt() && mtr.TestDone && (mtr.Publish() != Config.Entities.Publish.Never)
+													  && (mtr.Publish() != Config.Entities.Publish.Internal))
                 {
                     testNames.Add(mtr.Name());
                 }
@@ -223,75 +219,17 @@ namespace Results.Forms
             return testNames;
         }
 
-        /// <summary>
-        /// Get color for highlighting results and an apporpriate text message.
-        /// </summary>
-        /// <param name="wMtr">Water meter results entity</param>
-        /// <param name="message">Appropriate message</param>
-        /// <returns>Color for results</returns>
-        Color GetColorOfResults(Results.Entities.WaterMeter wMtr, out string message)
-        {
-            bool wmtrCompleted = wMtr.CompletedFromTests();
-            bool wmtrPassed = wMtr.PassedFromTests();
-
-            if ((wMtr.ErrorFlags & (int)ErrorFlagMask.E28) != 0)
-            {
-                message = Strings.Previous_step_is_missing_or_NOK;
-                return ProductionTracing;
-            }
-            else if ((wMtr.ErrorFlags & (int)ErrorFlagMask.E27) != 0)
-            {
-                message = Strings.Wrong_iPerl_counting_direction;
-                return WrongDirection;
-            }
-            else if ((wMtr.ErrorFlags & (int)ErrorFlagMask.E26) != 0)
-            {
-                message = Strings.Invalid_Q2_correction_factors;
-                return WrongQ2FactorsColor;
-            }
-            else if ((wMtr.ErrorFlags & (int)ErrorFlagMask.E25) != 0)
-            {
-                message = Strings.Test_repetition_count_exceeded_upper_limit;
-                return RejectColor;
-            }
-            else if (wmtrPassed)
-            {
-                /// Water meter passed (therefore is was also completed)
-                message = Strings.Passed;
-                return OkColor;
-            }
-            else if (wmtrCompleted)
-            {
-                /// Water meter was completed but did not pass => Failed
-                message = Strings.Failed;
-                return NokColor;
-            }
-            else
-            {
-                /// Water meter was not completed yet => did not pass, did not fail
-                message = Strings.Test_in_progress;
-                return NotCompletedColor;
-            }
-        }
-
 
         /// <summary>
         /// Get a ListView control filled with results of the meter 'mtr'
         /// </summary>
         /// <param name="mtr">Water meter number (1-based): 1 .. Config.Data.WMsCount</param>
         /// <returns>ListView object</returns>
-        OneWMResultsCtrl GetResultsTestsAreRows(Results.Entities.WaterMeter wMtr, int printedWMNr)
+        ListView GetResultsTestsAreRows(Results.Entities.WaterMeter wMtr, int printedWMNr)
         {
             metersKind = wMtr.Compound() ? MetersKind.Combined : (wMtr.HeatMeter() ? MetersKind.HeatMeter : MetersKind.Single);
 
-            string message = string.Empty;
-            Color commonBackColor = GetColorOfResults(wMtr, out message);
-            OneWMResultsCtrl lview = GetListView(commonBackColor);
-#if ORACLE_DB
-            lview.Caption = string.Format("{0} ({1}) {2}", (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr), (wMtr.Pruefindex % 100), message);
-#else
-            lview.Caption = string.Format("s/n = {0}", string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr);
-#endif
+            ListView lview = GetListView();
 
             IList<Results.WMeterRsltItemSpec> items = GetRsltItems(metersKind);
 
@@ -352,18 +290,11 @@ namespace Results.Forms
         /// </summary>
         /// <param name="mtr">Water meter number (1-based): 1 .. Config.Data.WMsCount</param>
         /// <returns>ListView object</returns>
-        OneWMResultsCtrl GetResultsTestsAreColumns(Results.Entities.WaterMeter wMtr, int printedWMNr)
+        ListView GetResultsTestsAreColumns(Results.Entities.WaterMeter wMtr, int printedWMNr)
         {
             metersKind = wMtr.Compound() ? MetersKind.Combined : (wMtr.HeatMeter() ? MetersKind.HeatMeter : MetersKind.Single);
 
-            string message;
-            Color commonBackColor = GetColorOfResults(wMtr, out message);
-            OneWMResultsCtrl lview = GetListView(commonBackColor);
-#if ORACLE_DB
-            lview.Caption = string.Format("{0} ({1}) {2}", (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr), (wMtr.Pruefindex % 100), message);
-#else
-            lview.Caption = string.Format("s/n = {0}", string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr);
-#endif
+            ListView lview = GetListView();
 
             IList<Results.WMeterRsltItemSpec> items = GetRsltItems(metersKind);
 

Results/Forms/OneWMResultsCtrl.Designer.cs

@@ -1,102 +0,0 @@
-namespace Results.Forms
-{
-    partial class OneWMResultsCtrl
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.tBox = new System.Windows.Forms.TextBox();
-            this.lView = new System.Windows.Forms.ListView();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
-            this.splitContainer1.Panel1.SuspendLayout();
-            this.splitContainer1.Panel2.SuspendLayout();
-            this.splitContainer1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // splitContainer1
-            // 
-            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
-            this.splitContainer1.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer1.Name = "splitContainer1";
-            this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
-            // 
-            // splitContainer1.Panel1
-            // 
-            this.splitContainer1.Panel1.Controls.Add(this.tBox);
-            // 
-            // splitContainer1.Panel2
-            // 
-            this.splitContainer1.Panel2.Controls.Add(this.lView);
-            this.splitContainer1.Size = new System.Drawing.Size(352, 318);
-            this.splitContainer1.SplitterDistance = 25;
-            this.splitContainer1.SplitterWidth = 1;
-            this.splitContainer1.TabIndex = 0;
-            // 
-            // tBox
-            // 
-            this.tBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tBox.Location = new System.Drawing.Point(0, 0);
-            this.tBox.Name = "tBox";
-            this.tBox.Size = new System.Drawing.Size(352, 20);
-            this.tBox.TabIndex = 0;
-            // 
-            // lView
-            // 
-            this.lView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.lView.FullRowSelect = true;
-            this.lView.GridLines = true;
-            this.lView.Location = new System.Drawing.Point(0, 0);
-            this.lView.Name = "lView";
-            this.lView.Size = new System.Drawing.Size(352, 292);
-            this.lView.TabIndex = 0;
-            this.lView.UseCompatibleStateImageBehavior = false;
-            this.lView.View = System.Windows.Forms.View.Details;
-            // 
-            // OneWMResultsCtrl
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.splitContainer1);
-            this.Name = "OneWMResultsCtrl";
-            this.Size = new System.Drawing.Size(352, 318);
-            this.splitContainer1.Panel1.ResumeLayout(false);
-            this.splitContainer1.Panel1.PerformLayout();
-            this.splitContainer1.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
-            this.splitContainer1.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.SplitContainer splitContainer1;
-        private System.Windows.Forms.TextBox tBox;
-        private System.Windows.Forms.ListView lView;
-    }
-}

Results/Forms/OneWMResultsCtrl.cs

@@ -1,26 +0,0 @@
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace Results.Forms
-{
-    public partial class OneWMResultsCtrl : UserControl
-    {
-        public OneWMResultsCtrl()
-        {
-            InitializeComponent();
-        }
-
-        public OneWMResultsCtrl(Color backColor, int lvWidth, int lvHeight)
-            : this()
-        {
-            lView.BackColor = backColor;
-            tBox.BackColor = backColor;
-            Size = new System.Drawing.Size(lvWidth, lvHeight);
-        }
-
-        public string Caption { get { return tBox.Text; } set { tBox.Text = value; } }
-        public ListView.ColumnHeaderCollection Columns { get { return lView.Columns; } }
-        public ListView.ListViewItemCollection Items { get { return lView.Items; } }
-        public Color BColor { set { lView.BackColor = value; tBox.BackColor = value; } }
-    }
-}

Results/ItemID.cs

@@ -91,85 +91,85 @@ namespace Results
         T_Lo_start,                     /// 81
         T_Lo_end,                       /// 82
         T_Lo_avg,                       /// 83
-        P_delta_mean,                   /// 84
-        P_delta_start,                  /// 85
-        P_delta_end,                    /// 86
-        Meter_type,						/// 87   Single, Compound or HeatMeter
-        Volume_main,					/// 88
-        Volume_aux,					    /// 89
-        Start_volume,					/// 90
-        Start_volume_main,				/// 91
-        Start_volume_aux,				/// 92
-        End_volume,				        /// 93
-        End_volume_main,				/// 94
-        End_volume_aux,				    /// 95   
-        Error_main,						/// 96
-        Error_aux,						/// 97
-        Serial_Nr_main,					/// 98
-        Serial_Nr_aux,					/// 99
-        End_state_main,					/// 100
-        End_state_aux,					/// 101
-        Q_rise,							/// 102
-        Q_fall,							/// 103
+		P_delta_mean,                   /// 84
+		P_delta_start,                  /// 85
+		P_delta_end,                    /// 86
+		Meter_type,						/// 87   Single, Compound or HeatMeter
+		Volume_main,					/// 88
+		Volume_aux,					    /// 89
+		Start_volume,					/// 90
+		Start_volume_main,				/// 91
+		Start_volume_aux,				/// 92
+		End_volume,				        /// 93
+		End_volume_main,				/// 94
+		End_volume_aux,				    /// 95   
+		Error_main,						/// 96
+		Error_aux,						/// 97
+		Serial_Nr_main,					/// 98
+		Serial_Nr_aux,					/// 99
+		End_state_main,					/// 100
+		End_state_aux,					/// 101
+		Q_rise,							/// 102
+		Q_fall,							/// 103
 
-        /// iPerl
+		/// iPerl
         OrigCalibFactor,            	/// 104
-        CalibFactor,	                /// 105
-        Q2ErrWOCorrection,              /// 106
-        Q2CorrectionDone,               /// 107
+		CalibFactor,	                /// 105
+		Q2ErrWOCorrection,              /// 106
+		Q2CorrectionDone,               /// 107
         Q2CorrRFlow,	                /// 108
         Q2CorrLFlow,                	/// 109
         Q2CorrFlowRight,            	/// 110
 
-        Q_ref_mean,						/// 111
-        T_up_start,						/// 112
-        T_up_end,						/// 113
-        T_up_avg,						/// 114
-        T_down_start,					/// 115
-        T_down_end,						/// 116
-        T_down_avg,						/// 117
-        T_div_start,					/// 118
-        T_div_end,						/// 119
-        T_div_avg,						/// 120
-        P_up_avg,						/// 121
-        P_down_avg,						/// 122
-        P_delta_avg,					/// 123
-
-        TestDone,						/// 124
-        TestPassed,						/// 125
+		Q_ref_mean,						/// 111
+		T_up_start,						/// 112
+		T_up_end,						/// 113
+		T_up_avg,						/// 114
+		T_down_start,					/// 115
+		T_down_end,						/// 116
+		T_down_avg,						/// 117
+		T_div_start,					/// 118
+		T_div_end,						/// 119
+		T_div_avg,						/// 120
+		P_up_avg,						/// 121
+		P_down_avg,						/// 122
+		P_delta_avg,					/// 123
+		
+		TestDone,						/// 124
+		TestPassed,						/// 125
 
         /// iPerl
         FW_Version,            	        /// 126
 
-        Mass_start_raw,					/// 127
-        Mass_start,						/// 128
-        Mass_end_raw,					/// 129
-        Mass_end,						/// 130
-        Mass,							/// 131
-        Buoyancy,						/// 132
-        Density_correction,				/// 133
+		Mass_start_raw,					/// 127
+		Mass_start,						/// 128
+		Mass_end_raw,					/// 129
+		Mass_end,						/// 130
+		Mass,							/// 131
+		Buoyancy,						/// 132
+		Density_correction,				/// 133
 
-        ErrorFlags,						/// 134
-        E1,								/// 135
-        E2,								/// 136
-        E3,								/// 137
-        E4,								/// 138
-        E5,								/// 139
-        E6,								/// 140
-        E7,								/// 141
-        E8,								/// 142
-        E9,								/// 143
-        E10,							/// 144
-        E11,							/// 145
-        E12,							/// 146
-        E13,							/// 147
-        E14,							/// 148
-        E15,							/// 149
-        E16,							/// 150
+		ErrorFlags,						/// 134
+		E1,								/// 135
+		E2,								/// 136
+		E3,								/// 137
+		E4,								/// 138
+		E5,								/// 139
+		E6,								/// 140
+		E7,								/// 141
+		E8,								/// 142
+		E9,								/// 143
+		E10,							/// 144
+		E11,							/// 145
+		E12,							/// 146
+		E13,							/// 147
+		E14,							/// 148
+		E15,							/// 149
+		E16,							/// 150
 
-        Table_row_nr,					/// 151
-        Table_column_nr,				/// 152
-        WMRemark,                       /// 153
+		Table_row_nr,					/// 151
+		Table_column_nr,				/// 152
+		WMRemark,                       /// 153
 
         User_description,               /// 154
         Legalizator,                    /// 155
@@ -181,7 +181,7 @@ namespace Results
         Diverter_start_time,            /// 159
         Diverter_end_time,              /// 160
         Q_sensitivity,                  /// 161
-
+                                    
         Q_ref_min,                      /// 162
         Q_ref_max,                      /// 163
         Q_ref_start,                    /// 164
@@ -210,7 +210,7 @@ namespace Results
         Rho_Wa_calc,                    /// 183
 
         Formatted_WM_ID,                /// 184, Formated WM ID string:
-        ///      {0}=start DateTime {1}-end DateTime, {2}=batch nr., {3}=wm pos.(1..max), {4}=s/n string
+                                        ///      {0}=start DateTime {1}-end DateTime, {2}=batch nr., {3}=wm pos.(1..max), {4}=s/n string
         E21,							/// 185
 
         T_line_mean,					/// 186
@@ -262,7 +262,7 @@ namespace Results
         Bench_address5,                 /// 227  'Address 5' from IBenchInfo
 
         Max_test_index,                 /// 228  MaxPruefindex % 100
-        VolumeCTV,						/// 229
+		VolumeCTV,						/// 229
 
         /// iPerl
         LastError,                      /// 230  For iPerl previous test result (test with Proefindex-1)
@@ -270,28 +270,7 @@ namespace Results
         CalibFactorLNA,	                /// 232
 
         WM_remark,                      /// 233
-
-        /// iPerl special
-        Prod_AssignedSerialNr,          /// 234
-        Prod_CompleteSerialNr,          /// 235
-        Prod_RadioAddress,              /// 236
-        Prod_PaletteNr,                 /// 237
-        Prod_UmkartonNr,                /// 238
-        Prod_TestBench,                 /// 239
-        Prod_WMPosition,                /// 240
-        Prod_UserName,                  /// 241
-        Prod_PurchaseOrder,             /// 242
-        Prod_Passed,                    /// 243
-        Prod_ResultCode,                /// 244
-        Prod_Q2CorrRL,	                /// 245
-        Prod_Q2CorrLR,                  /// 246
-
-        TestPartStr,                    /// 247
-        
-        Error_heat_mtr_vol,              /// 248
-        Energy_start,
-        Energy_end,
-
+                                        
         Count,
     }
 }

Results/Mappings/WaterMeterDataMap.cs

@@ -54,6 +54,7 @@ namespace Results.Mappings
 #endif
 #if ORACLE_DB
 			Map(x => x.WMTypeId);
+			Map(x => x.WMTypeRev);
 #endif
         }
 	}

Results/Mappings/WaterMeterMap.cs

@@ -28,34 +28,22 @@ namespace Results.Mappings
 				.CustomType("StringClob")
 				.CustomSqlType("varchar(2000)");
 #if IPERL
+			Map(x => x.SerialNrEx);
 			Map(x => x.OrigCalibFactor);
 			Map(x => x.CalibFactor);
             Map(x => x.OrigCalibFactorLNA);
             Map(x => x.CalibFactorLNA);
             Map(x => x.Q2ErrWOCorrection);
-            Map(x => x.Q2CorrRL);
-            Map(x => x.Q2CorrLR);
+			Map(x => x.Q2CorrectionDone);
+			Map(x => x.Q2Correction);
+            Map(x => x.Q2CorrRL).Column("Q2CorrRFlow");
+            Map(x => x.Q2CorrLR).Column("Q2CorrLFlow");
             Map(x => x.Q2CorrFlowRight);
 			Map(x => x.Diff2Hz8Hz);
 			Map(x => x.Hz2CorrectionDone);
 			Map(x => x.Hz2Correction);
 			Map(x => x.FWVersion);
 #endif
-#if TURA_SPECIAL
-            Map(x => x.AssignedSerialNr);
-            Map(x => x.CompleteSerialNr);
-            Map(x => x.RadioAddress);
-            Map(x => x.PaletteNr);
-            Map(x => x.UmkartonNr);
-            Map(x => x.ProdTestBench);
-            Map(x => x.ProdWMPosition);
-            Map(x => x.ProdUserName);
-            Map(x => x.ProdPurchaseOrder);
-            Map(x => x.ProdPassed);
-            Map(x => x.ProdResultCode);
-            Map(x => x.ProdQ2CorrRL);
-            Map(x => x.ProdQ2CorrLR);
-#endif
 #if ORACLE_DB
             Map(x => x.Pruefindex);
             Map(x => x.HydrPruefung);

Results/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Sensus")]
 [assembly: AssemblyProduct("Results")]
-[assembly: AssemblyCopyright("Copyright © 2013 - 2019 Sensus Slovensko, a.s.")]
+[assembly: AssemblyCopyright("Copyright © 2013 - 2018 Sensus Slovensko, a.s.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.18.1183.0")]
-[assembly: AssemblyFileVersion("2.18.1183.0")]
+[assembly: AssemblyVersion("2.18.1110.0")]
+[assembly: AssemblyFileVersion("2.18.1110.0")]

Results/Resources/Strings.Designer.cs

@@ -384,15 +384,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to NOK.
-        /// </summary>
-        internal static string Failed {
-            get {
-                return ResourceManager.GetString("Failed", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Failed meters count.
         /// </summary>
@@ -456,15 +447,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid Q2 correction factors.
-        /// </summary>
-        internal static string Invalid_Q2_correction_factors {
-            get {
-                return ResourceManager.GetString("Invalid_Q2_correction_factors", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Item.
         /// </summary>
@@ -645,15 +627,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to OK.
-        /// </summary>
-        internal static string Passed {
-            get {
-                return ResourceManager.GetString("Passed", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Passed meters count.
         /// </summary>
@@ -690,15 +663,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Previous step is missing or NOK.
-        /// </summary>
-        internal static string Previous_step_is_missing_or_NOK {
-            get {
-                return ResourceManager.GetString("Previous_step_is_missing_or_NOK", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Procedure.
         /// </summary>
@@ -834,15 +798,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to repetition.
-        /// </summary>
-        internal static string repetition {
-            get {
-                return ResourceManager.GetString("repetition", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Result.
         /// </summary>
@@ -1068,15 +1023,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Test in progress.
-        /// </summary>
-        internal static string Test_in_progress {
-            get {
-                return ResourceManager.GetString("Test_in_progress", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Test method.
         /// </summary>
@@ -1095,15 +1041,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Test repetition count exceeded upper limit.
-        /// </summary>
-        internal static string Test_repetition_count_exceeded_upper_limit {
-            get {
-                return ResourceManager.GetString("Test_repetition_count_exceeded_upper_limit", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Test vol..
         /// </summary>
@@ -1977,15 +1914,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Wrong iPerl counting direction.
-        /// </summary>
-        internal static string Wrong_iPerl_counting_direction {
-            get {
-                return ResourceManager.GetString("Wrong_iPerl_counting_direction", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Year.
         /// </summary>

Results/Resources/Strings.cs.resx

@@ -255,28 +255,4 @@
   <data name="Batch" xml:space="preserve">
     <value>Dávka</value>
   </data>
-  <data name="repetition" xml:space="preserve">
-    <value>opakování</value>
-  </data>
-  <data name="Invalid_Q2_correction_factors" xml:space="preserve">
-    <value>Nesprávne Q2 korekčné faktory</value>
-  </data>
-  <data name="Previous_step_is_missing_or_NOK" xml:space="preserve">
-    <value>Predchádzajúci krok chýba alebo neprešiel</value>
-  </data>
-  <data name="Test_repetition_count_exceeded_upper_limit" xml:space="preserve">
-    <value>Počet opakovaní testu prekročil dovolené maximum</value>
-  </data>
-  <data name="Wrong_iPerl_counting_direction" xml:space="preserve">
-    <value>Nesprávny smer počítania iPerlu</value>
-  </data>
-  <data name="Failed" xml:space="preserve">
-    <value>NOK</value>
-  </data>
-  <data name="Passed" xml:space="preserve">
-    <value>OK</value>
-  </data>
-  <data name="Test_in_progress" xml:space="preserve">
-    <value>Probíhá test</value>
-  </data>
 </root>

Results/Resources/Strings.resx

@@ -741,28 +741,4 @@
   <data name="Batch" xml:space="preserve">
     <value>Batch</value>
   </data>
-  <data name="repetition" xml:space="preserve">
-    <value>repetition</value>
-  </data>
-  <data name="Invalid_Q2_correction_factors" xml:space="preserve">
-    <value>Invalid Q2 correction factors</value>
-  </data>
-  <data name="Previous_step_is_missing_or_NOK" xml:space="preserve">
-    <value>Previous step is missing or NOK</value>
-  </data>
-  <data name="Test_repetition_count_exceeded_upper_limit" xml:space="preserve">
-    <value>Test repetition count exceeded upper limit</value>
-  </data>
-  <data name="Wrong_iPerl_counting_direction" xml:space="preserve">
-    <value>Wrong iPerl counting direction</value>
-  </data>
-  <data name="Failed" xml:space="preserve">
-    <value>NOK</value>
-  </data>
-  <data name="Passed" xml:space="preserve">
-    <value>OK</value>
-  </data>
-  <data name="Test_in_progress" xml:space="preserve">
-    <value>Test in progress</value>
-  </data>
 </root>

Results/Results.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;IZRAEL_200</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -27,7 +27,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;IZRAEL_200</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -80,12 +80,6 @@
     <Compile Include="Forms\ListViewExtensions.cs" />
     <Compile Include="Forms\LviIntColumnComparer.cs" />
     <Compile Include="Forms\LviTextColumnComparer.cs" />
-    <Compile Include="Forms\OneWMResultsCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Forms\OneWMResultsCtrl.Designer.cs">
-      <DependentUpon>OneWMResultsCtrl.cs</DependentUpon>
-    </Compile>
     <Compile Include="Forms\ResultsConfigCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -165,9 +159,6 @@
     <EmbeddedResource Include="Forms\ListViewEx.resx">
       <DependentUpon>ListViewEx.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\OneWMResultsCtrl.resx">
-      <DependentUpon>OneWMResultsCtrl.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Forms\ResultsConfigCtrl.resx">
       <DependentUpon>ResultsConfigCtrl.cs</DependentUpon>
     </EmbeddedResource>

Results/Utils.cs

@@ -31,31 +31,16 @@ namespace Results
             }
         }
 
-        public static string BenchNameFromOracleBenchID(int id)
-        {
-            switch (id)
-            {
-                case 4: return "WR9";
-                case 5: return "WR10";
-                case 6: return "WR11";
-                case 7: return "PT7";
-                case 8: return "WR13";
-                case 9: return "WR15";
-                case 10: return "WR14";
-                default: return string.Empty;
-            }
-        }
-
 
         /// <summary>
-        /// Converts ErrorFlags integer to string. Supports up to 31 flags (E1..E31, i.e. bit0..bit30).
+        /// Converts ErrorFlags integer to string. Supports up to 31 flags (E1..E31).
         /// </summary>
         /// <param name="errorFlags">Input</param>
         /// <returns>Output string</returns>
         public static string ErrorFlagsStr(int errorFlags)
         {
             StringBuilder sb = new StringBuilder();
-            for (int i = 0; i < 31; i++)
+            for (int i = 0; i < 30; i++)
             {
                 if ((errorFlags & (1 << i)) != 0)
                 {

Results/WMeterRsltItemSpec.cs

@@ -155,16 +155,16 @@ namespace Results
             ///
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_volume,       Strings.Test_vol + "()",                                                  Quantity.Volume, ItemCategory.TestData,    (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).TargetVolume())));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.VolumeCTV,		  string.Format("{0} CTV ()", Strings.VName_Vol),							Quantity.Volume, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetTestRslt(t).VolumeCTV)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume,            string.Format("{0} Mt. ()", Strings.VName_Vol), Strings.Tooltip_Vol_Mt,   Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).VolumeMeter) : ((w.GetMeterTestRslt(t) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeMeter) : string.Empty)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_volume,  string.Format("{0} rm ()", Strings.VName_Vol), Strings.Tooltip_Vol_rm,    Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).VolumeRef) : ((w.GetMeterTestRslt(t) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeRef) : string.Empty)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume_main,       string.Format("{0} {1} ()", Strings.VName_Vol, Strings.main),             Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).VolumeMeter) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume_aux,        string.Format("{0} {1} ()", Strings.VName_Vol, Strings.aux),              Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).VolumeMeter) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume,      Strings.Start_volume + "()",                                              Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).VolumeStart) : ((w.GetMeterTestRslt(t) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeStart) : string.Empty)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume_main, Strings.Start_volume_main + "()",                                         Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).VolumeStart) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume_aux,  Strings.Start_volume_aux + "()",                                          Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).VolumeStart) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume,        Strings.End_volume + "()",                                                Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).VolumeEnd) : ((w.GetMeterTestRslt(t) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeEnd) : string.Empty)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume_main,   Strings.End_volume_main + "()",                                           Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).VolumeEnd) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume_aux,    Strings.End_volume_aux + "()",                                            Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).VolumeEnd) : string.Empty));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume,			  string.Format("{0} Mt. ()", Strings.VName_Vol), Strings.Tooltip_Vol_Mt,	Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeMeter)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_volume,  string.Format("{0} rm ()",  Strings.VName_Vol), Strings.Tooltip_Vol_rm,   Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeRef)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume_main,       string.Format("{0} {1} ()", Strings.VName_Vol,  Strings.main),            Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeMeter)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume_aux,        string.Format("{0} {1} ()", Strings.VName_Vol,  Strings.aux),             Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeMeter)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume,      Strings.Start_volume + "()",                                              Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume_main, Strings.Start_volume_main + "()",                                         Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume_aux,  Strings.Start_volume_aux + "()",                                          Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume,        Strings.End_volume + "()",                                                Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume_main,   Strings.End_volume_main + "()",                                           Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume_aux,    Strings.End_volume_aux + "()",                                            Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeEnd)));
 
 			///
 			/// Mass
@@ -314,8 +314,7 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, string.Format("{0} rel. ()", Strings.VName_Error), Strings.Tooltip_E_rel, Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "0" : FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t).Error)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.LastError, string.Format("{0} rel. last ()", Strings.VName_Error), Strings.Tooltip_E_rel_last, Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "0" : FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t).LastError)));
 #else
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, string.Format("{0} rel. ()", Strings.VName_Error), Strings.Tooltip_E_rel, Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) != null) ? FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t).Error) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_heat_mtr_vol, string.Format("{0} rel.hm.vol. ()", Strings.VName_Error),    Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume) != null) ? FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).Error) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, string.Format("{0} rel. ()", Strings.VName_Error), Strings.Tooltip_E_rel, Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t).Error)));
 #endif
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed, Strings.Result, Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => string.IsNullOrEmpty(t) ? w.PassedColorStr(f)
                                                                                                                                                                       : ((w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PassedColorStr(f))));
@@ -372,8 +371,8 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Degree__liter,    "Degree per liter ()",      Quantity.PulsePerLtr, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).IsCamera() ? w.GetMeterTestRslt(t).PulsesPerLiter : 0)));
 
 			/// Water meters results (combined)
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_main,     Strings.Err_main + "()", Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) != null) ? FormatDbl(u, f, p, "V2",  w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).Error) : string.Empty));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_aux,      Strings.Err_aux + "()",  Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) != null) ? FormatDbl(u, f, p, "V2",  w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).Error) : string.Empty));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_main,     Strings.Err_main + "()", Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) == null) ? "" : FormatDbl(u, f, p, "V2",  w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).Error)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_aux,      Strings.Err_aux + "()",  Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) == null) ? "" : FormatDbl(u, f, p, "V2",  w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).Error)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr_main, string.Format("{0} {1}", Strings.sn, Strings.main), Strings.Tooltip_sn_main, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.SerialNr)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr_aux,  string.Format("{0} {1}", Strings.sn, Strings.aux),  Strings.Tooltip_sn_aux,  Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.SerialNrAux)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state_main, Strings.EndState_main,   Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.EndState)));
@@ -408,10 +407,8 @@ namespace Results
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Meter_type,  Strings.Meter_type,  Quantity.String, ItemCategory.Other,       (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Compound ? Strings.Compound : (w.WaterMeterData.HeatMeter ? Strings.Heat_meter : Strings.Single))));
 
 #if HEAT_METERS
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy,           Strings.Energy + " ()",       Quantity.Energy, ItemCategory.Other,	(w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeMeter) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy_start,     Strings.Energy + " start ()", Quantity.Energy, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeStart) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy_end,       Strings.Energy + " end ()",   Quantity.Energy, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeEnd) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_energy, Strings.Energy_ref + " ()",   Quantity.Energy, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeRef) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy,              Strings.Energy + "()",      Quantity.Energy,        ItemCategory.Other,	(w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) == null) ? "" : FormatDbl(u, f, p, "F1", (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeMeter))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_energy,    Strings.Energy_ref + "()",  Quantity.Energy,        ItemCategory.Other,	(w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) == null) ? "" : FormatDbl(u, f, p, "F1", (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeRef))));
 #endif
 
 #if IPERL
@@ -420,32 +417,15 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.OrigCalibFactorLNA,"iPerl OrigCalibFactorLNA",Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.OrigCalibFactorLNA)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.CalibFactorLNA,    "iPerl CalibFactorLNA",    Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.CalibFactorLNA)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2ErrWOCorrection, "iPerl Q2ErrWOCorrection", Quantity.Error,  ItemCategory.MeterResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.Q2ErrWOCorrection)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrectionDone,  "iPerl Q2CorrectionDone",  Quantity.Boolean,ItemCategory.MeterResult, (w, t, u, f, p) => (((w.Q2CorrRL != 0) || (w.Q2CorrLR != 0)) ? Strings.Yes : Strings.No)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrRFlow,       "iPerl Q2Corr RL",         Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrRL)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrLFlow,       "iPerl Q2Corr LR",         Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrLR)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrectionDone,  "iPerl Q2CorrectionDone",  Quantity.Boolean,ItemCategory.MeterResult, (w, t, u, f, p) => (w.Q2CorrectionDone ? Strings.Yes : Strings.No)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrRFlow,       "iPerl Q2Corr R-L",        Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrRL)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrLFlow,       "iPerl Q2Corr L-R",        Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrLR)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrFlowRight,   "iPerl Q2CorrFlowRight",   Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrFlowRight)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.FW_Version,        "iPerl FW version",        Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.FWVersion)));
   #if ORACLE_DB
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Max_test_index,    "iPerl test index",       Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, (w.Pruefindex % 100))));
   #endif
 #endif
-
-#if TURA_SPECIAL
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_AssignedSerialNr, "iPerl assigned s/n",        Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.AssignedSerialNr)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_CompleteSerialNr, "iPerl complete s/n",        Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.CompleteSerialNr)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_RadioAddress,     "iPerl radio address",       Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.RadioAddress)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_PaletteNr,        "iPerl palette nr.",         Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.PaletteNr)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_UmkartonNr,       "iPerl umkarton nr.",        Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.UmkartonNr)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_TestBench,        "Prod iPerl test bench",     Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.ProdTestBench)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_WMPosition,       "Prod iPerl WM position",    Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.ProdWMPosition)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_UserName,         "Prod iPerl user name",      Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.ProdUserName)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_PurchaseOrder,    "Prod iPerl purchase order", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.ProdPurchaseOrder)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_Passed,           "Prod iPerl passed",         Quantity.Boolean,ItemCategory.MeterResult, (w, t, u, f, p) => FormatBool(f,w.ProdPassed)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_ResultCode,       "Prod iPerl result code",    Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.ProdResultCode)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_Q2CorrRL,         "Prod iPerl Q2Corr RL",      Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.ProdQ2CorrRL)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_Q2CorrLR,         "Prod iPerl Q2Corr LR",      Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.ProdQ2CorrLR)));
-#endif
-
             AllItems.Add(new WMeterRsltItemSpec(ItemID.TestDone,     Strings.Test_done + "()",   Quantity.Boolean, ItemCategory.TestResult,  (w, t, u, f, p) => FormatBool(f, (w.GetMeterTestRslt(t) != null) && w.GetMeterTestRslt(t).TestDone)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.TestPassed,   Strings.Test_passed + "()", Quantity.Boolean, ItemCategory.TestResult,  (w, t, u, f, p) => FormatBool(f, (w.GetMeterTestRslt(t) != null) && w.GetMeterTestRslt(t).Passed)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.ErrorFlags,   Strings.Error_flags + "()", Quantity.String,  ItemCategory.TestResult,  (w, t, u, f, p) => FormatStr(f, (w.GetTestRslt(t) != null) ? w.GetTestRslt(t).ErrorFlagsStr() : w.ErrorFlagsStr())));
@@ -467,7 +447,6 @@ namespace Results
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.E15, "E15 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x4000) != 0) ? Strings.Yes : Strings.No));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.E16, "E16 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x8000) != 0) ? Strings.Yes : Strings.No));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.E21, "E21 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x100000) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.TestPartStr, "Test part str.", Quantity.String, ItemCategory.TestResult, (w, t, u, f, p) => FormatEnum(f, (w.GetMeterTestRslt(t) != null) ? w.GetMeterTestRslt(t).TestRslt.Part : 0)));
 
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Table_row_nr, "Table row #", Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? TableRowNr.ToString() : string.Format(f, TableRowNr)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Table_column_nr, "Table column #", Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? TableColumnNr.ToString() : string.Format(f, TableColumnNr)));
@@ -481,8 +460,7 @@ namespace Results
 
         public static string FormatStr(string format, string value)
         {
-            string valueEx = string.IsNullOrEmpty(value) ? string.Empty : value;
-            return  string.IsNullOrEmpty(format) ? valueEx : string.Format(format, valueEx);
+            return  string.IsNullOrEmpty(format) ? value : string.Format(format, value);
         }
 
         public static string FormatBool(string format, bool value)
@@ -498,23 +476,6 @@ namespace Results
             }
         }
 
-        public static string FormatEnum(string format, int value)
-        {
-            if (string.IsNullOrEmpty(format))
-            {
-                return value.ToString();
-            }
-            else
-            {
-                string[] texts = format.Split(new char[] { '~' });
-
-                if (value >= 0 && value < texts.Length)
-                    return texts[value];
-                else
-                    return value.ToString();
-            }
-        }
-
         public static string FormatInt(string format, int value)
         {
             return string.IsNullOrEmpty(format) ? value.ToString() : string.Format(format, value);

ResultsBrowser/Filters/BatchNrFilterUI.Designer.cs

@@ -48,7 +48,7 @@
             // 
             this.batchNrTextBox.Location = new System.Drawing.Point(132, 13);
             this.batchNrTextBox.Name = "batchNrTextBox";
-            this.batchNrTextBox.Size = new System.Drawing.Size(80, 20);
+            this.batchNrTextBox.Size = new System.Drawing.Size(138, 20);
             this.batchNrTextBox.TabIndex = 0;
             // 
             // BatchNrFilterUI

ResultsBrowser/Filters/ProcedureFilterUI.Designer.cs

@@ -48,15 +48,15 @@
             // 
             this.procedureTextBox.Location = new System.Drawing.Point(132, 13);
             this.procedureTextBox.Name = "procedureTextBox";
-            this.procedureTextBox.Size = new System.Drawing.Size(360, 20);
+            this.procedureTextBox.Size = new System.Drawing.Size(138, 20);
             this.procedureTextBox.TabIndex = 0;
             // 
-            // ProcedureFilterUI
+            // ProcedureFilter
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.groupBox1);
-            this.Name = "ProcedureFilterUI";
+            this.Name = "ProcedureFilter";
             this.Size = new System.Drawing.Size(835, 40);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();

ResultsBrowser/Filters/QnFilterUI.Designer.cs

@@ -48,15 +48,15 @@
             // 
             this.procedureTextBox.Location = new System.Drawing.Point(132, 13);
             this.procedureTextBox.Name = "procedureTextBox";
-            this.procedureTextBox.Size = new System.Drawing.Size(80, 20);
+            this.procedureTextBox.Size = new System.Drawing.Size(138, 20);
             this.procedureTextBox.TabIndex = 0;
             // 
-            // QnFilterUI
+            // QnFilter
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.groupBox1);
-            this.Name = "QnFilterUI";
+            this.Name = "QnFilter";
             this.Size = new System.Drawing.Size(835, 40);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();

ResultsBrowser/Filters/SerialNrFilter.cs

@@ -30,6 +30,7 @@ namespace ResultsBrowser.Filters
         ///
         public string SerialNr;
 
+
         private SerialNrFilterUI userIface;
 
         public SerialNrFilter()
@@ -41,50 +42,21 @@ namespace ResultsBrowser.Filters
         {
             IList<WaterMeter> filteredWaterMeters = new List<WaterMeter>();
 
-            if (string.IsNullOrEmpty(SerialNr)) return filteredWaterMeters;     /// Empty s/n => Return an empty list of WM-s
-
-            IList<string> serialNumbers = new List<string>();
-            ///
-            if (SerialNr[0] == '@')
-            {
-                try
-                {
-                    TextReader rdr = new StreamReader(SerialNr.Substring(1));
-                    string line = rdr.ReadLine();
-                    while (!string.IsNullOrEmpty(line))
-                    {
-                        serialNumbers.Add(line);
-                        line = rdr.ReadLine();
-                    }
-                }
-                catch (Exception)
-                {
-                    return filteredWaterMeters;
-                }
-            }
-            else
-            {
-                serialNumbers.Add(SerialNr);
-            }
-
             if (waterMeters == null)
             {
                 foreach (var se in sessions)
                 {
-                    foreach (var oneSerialNr in serialNumbers)
-                    {
-                        IList<WaterMeter> wms = se.QueryOver<WaterMeter>()
-                                                  .Where(x => (x.SerialNr == oneSerialNr))
-                                                  .List<WaterMeter>();
-                        foreach (var wm in wms) filteredWaterMeters.Add(wm);
-                    }
+                    IList<WaterMeter> wms = se.QueryOver<WaterMeter>()
+                                              .Where(x => (x.SerialNr == SerialNr))
+                                              .List<WaterMeter>();
+                    foreach (var wm in wms) filteredWaterMeters.Add(wm);
                 }
             }
             else
             {
                 foreach (var wm in waterMeters)
                 {
-                    if (serialNumbers.Contains(wm.SerialNr)) filteredWaterMeters.Add(wm);
+                    if (wm.SerialNr == SerialNr) filteredWaterMeters.Add(wm);
                 }
             }
 

ResultsBrowser/Filters/SerialNrFilterUI.Designer.cs

@@ -48,16 +48,15 @@
             // 
             this.serialNrTextBox.Location = new System.Drawing.Point(132, 13);
             this.serialNrTextBox.Name = "serialNrTextBox";
-            this.serialNrTextBox.Size = new System.Drawing.Size(360, 20);
+            this.serialNrTextBox.Size = new System.Drawing.Size(138, 20);
             this.serialNrTextBox.TabIndex = 0;
-            this.serialNrTextBox.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.serialNrTextBox_MouseDoubleClick);
             // 
-            // SerialNrFilterUI
+            // SerialNrFilter
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.groupBox1);
-            this.Name = "SerialNrFilterUI";
+            this.Name = "SerialNrFilter";
             this.Size = new System.Drawing.Size(835, 40);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();

ResultsBrowser/Filters/SerialNrFilterUI.cs

@@ -35,14 +35,5 @@ namespace ResultsBrowser.Filters
 		{
             data.SerialNr = serialNrTextBox.Text;
 		}
-
-        private void serialNrTextBox_MouseDoubleClick(object sender, MouseEventArgs e)
-        {
-            OpenFileDialog dlg = new OpenFileDialog();
-            if (dlg.ShowDialog() == DialogResult.OK)
-            {
-                serialNrTextBox.Text = string.Format("@{0}", dlg.FileName);
-            }
-        }
     }
 }

ResultsBrowser/Filters/WMPositionFilterUI.Designer.cs

@@ -48,7 +48,7 @@
             // 
             this.wmPositionTextBox.Location = new System.Drawing.Point(132, 13);
             this.wmPositionTextBox.Name = "wmPositionTextBox";
-            this.wmPositionTextBox.Size = new System.Drawing.Size(80, 20);
+            this.wmPositionTextBox.Size = new System.Drawing.Size(138, 20);
             this.wmPositionTextBox.TabIndex = 0;
             // 
             // WMPositionFilterUI

ResultsBrowser/Forms/HistogramCtrl.Designer.cs

@@ -1,76 +0,0 @@
-namespace ResultsBrowser.Forms
-{
-	partial class HistogramCtrl
-	{
-		/// <summary> 
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary> 
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Component Designer generated code
-
-		/// <summary> 
-		/// Required method for Designer support - do not modify 
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
-			System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
-			System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
-			System.Windows.Forms.DataVisualization.Charting.Title title1 = new System.Windows.Forms.DataVisualization.Charting.Title();
-			this.myChart = new System.Windows.Forms.DataVisualization.Charting.Chart();
-			((System.ComponentModel.ISupportInitialize)(this.myChart)).BeginInit();
-			this.SuspendLayout();
-			// 
-			// myChart
-			// 
-			chartArea1.Name = "ChartArea1";
-			this.myChart.ChartAreas.Add(chartArea1);
-			this.myChart.Dock = System.Windows.Forms.DockStyle.Fill;
-			legend1.Name = "Legend1";
-			this.myChart.Legends.Add(legend1);
-			this.myChart.Location = new System.Drawing.Point(0, 0);
-			this.myChart.Name = "myChart";
-			this.myChart.Palette = System.Windows.Forms.DataVisualization.Charting.ChartColorPalette.Bright;
-			series1.ChartArea = "ChartArea1";
-			series1.Legend = "Legend1";
-			series1.Name = "Series1";
-			this.myChart.Series.Add(series1);
-			this.myChart.Size = new System.Drawing.Size(400, 300);
-			this.myChart.TabIndex = 0;
-			this.myChart.Text = "chart1";
-			title1.Name = "Title1";
-			title1.Text = "Title1";
-			this.myChart.Titles.Add(title1);
-			// 
-			// HistogramCtrl
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.Controls.Add(this.myChart);
-			this.Name = "HistogramCtrl";
-			this.Size = new System.Drawing.Size(400, 300);
-			((System.ComponentModel.ISupportInitialize)(this.myChart)).EndInit();
-			this.ResumeLayout(false);
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.DataVisualization.Charting.Chart myChart;
-	}
-}

ResultsBrowser/Forms/HistogramCtrl.cs

@@ -1,42 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-using System.Windows.Forms.DataVisualization.Charting;
-
-namespace ResultsBrowser.Forms
-{
-	public partial class HistogramCtrl : UserControl
-	{
-        /// <summary>
-        /// Create user control that displays a bar chart iwth custom X-axis labels.
-        /// </summary>
-        /// <param name="title">Title of the chart displayed at the top</param>
-        /// <param name="values">Values = bar lengths</param>
-        /// <param name="labels">Labels for the X-axis</param>
-		public HistogramCtrl(string title, double[] values, string[] labels)
-		{
-			InitializeComponent();
-
-			if (myChart.Titles.Count > 0) myChart.Titles[0].Text = title;
-
-            if ((myChart.Series.Count > 0) && (values != null))
-			{
-                int startOffset = -1;
-                int endOffset = 1;
-                for (int i = 0; i < Math.Min(values.Length + 1, labels.Length); i++)
-				{
-                    if (i < values.Length) myChart.Series[0].Points.Add(values[i]);
-                    if (!string.IsNullOrEmpty(labels[i]))
-                    {
-                        myChart.ChartAreas[0].AxisX.CustomLabels.Add(new System.Windows.Forms.DataVisualization.Charting.CustomLabel(startOffset, endOffset, labels[i], 0, LabelMarkStyle.None));
-                    }
-                    startOffset = startOffset + 1;
-                    endOffset = endOffset + 1;
-                }
-			}
-		}
-	}
-}

ResultsBrowser/Forms/HistogramDlg.Designer.cs

@@ -1,150 +0,0 @@
-namespace ResultsBrowser.Forms
-{
-    partial class HistogramDlg
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
-            this.exportButton = new System.Windows.Forms.Button();
-            this.printButton = new System.Windows.Forms.Button();
-            this.closeButton = new System.Windows.Forms.Button();
-            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
-            this.splitContainer1.Panel1.SuspendLayout();
-            this.splitContainer1.Panel2.SuspendLayout();
-            this.splitContainer1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
-            this.splitContainer2.Panel2.SuspendLayout();
-            this.splitContainer2.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // splitContainer1
-            // 
-            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
-            this.splitContainer1.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer1.Name = "splitContainer1";
-            this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
-            // 
-            // splitContainer1.Panel1
-            // 
-            this.splitContainer1.Panel1.Controls.Add(this.flowLayoutPanel1);
-            // 
-            // splitContainer1.Panel2
-            // 
-            this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
-            this.splitContainer1.Size = new System.Drawing.Size(572, 409);
-            this.splitContainer1.SplitterDistance = 320;
-            this.splitContainer1.TabIndex = 0;
-            // 
-            // splitContainer2
-            // 
-            this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
-            this.splitContainer2.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer2.Name = "splitContainer2";
-            // 
-            // splitContainer2.Panel2
-            // 
-            this.splitContainer2.Panel2.Controls.Add(this.exportButton);
-            this.splitContainer2.Panel2.Controls.Add(this.printButton);
-            this.splitContainer2.Panel2.Controls.Add(this.closeButton);
-            this.splitContainer2.Size = new System.Drawing.Size(572, 85);
-            this.splitContainer2.SplitterDistance = 249;
-            this.splitContainer2.TabIndex = 0;
-            // 
-            // exportButton
-            // 
-            this.exportButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.exportButton.Location = new System.Drawing.Point(103, 21);
-            this.exportButton.Name = "exportButton";
-            this.exportButton.Size = new System.Drawing.Size(94, 41);
-            this.exportButton.TabIndex = 1;
-            this.exportButton.Text = "Export";
-            this.exportButton.UseVisualStyleBackColor = true;
-            // 
-            // printButton
-            // 
-            this.printButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.printButton.Location = new System.Drawing.Point(4, 21);
-            this.printButton.Name = "printButton";
-            this.printButton.Size = new System.Drawing.Size(94, 41);
-            this.printButton.TabIndex = 0;
-            this.printButton.Text = "Print";
-            this.printButton.UseVisualStyleBackColor = true;
-            // 
-            // closeButton
-            // 
-            this.closeButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.closeButton.Location = new System.Drawing.Point(203, 21);
-            this.closeButton.Name = "closeButton";
-            this.closeButton.Size = new System.Drawing.Size(94, 41);
-            this.closeButton.TabIndex = 2;
-            this.closeButton.Text = "Close";
-            this.closeButton.UseVisualStyleBackColor = true;
-            this.closeButton.Click += new System.EventHandler(this.closeButton_Click);
-            // 
-            // flowLayoutPanel1
-            // 
-            this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);
-            this.flowLayoutPanel1.Name = "flowLayoutPanel1";
-            this.flowLayoutPanel1.Size = new System.Drawing.Size(572, 320);
-            this.flowLayoutPanel1.TabIndex = 0;
-            // 
-            // HistogramDlg
-            // 
-            this.AcceptButton = this.closeButton;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(572, 409);
-            this.Controls.Add(this.splitContainer1);
-            this.Name = "HistogramDlg";
-            this.Text = "HistogramDlg";
-            this.Load += new System.EventHandler(this.HistogramDlg_Load);
-            this.splitContainer1.Panel1.ResumeLayout(false);
-            this.splitContainer1.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
-            this.splitContainer1.ResumeLayout(false);
-            this.splitContainer2.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
-            this.splitContainer2.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.SplitContainer splitContainer1;
-        private System.Windows.Forms.SplitContainer splitContainer2;
-        private System.Windows.Forms.Button closeButton;
-		private System.Windows.Forms.Button printButton;
-        private System.Windows.Forms.Button exportButton;
-        private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
-    }
-}

ResultsBrowser/Forms/HistogramDlg.cs

@@ -1,152 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Globalization;
-using System.IO;
-using System.Windows.Forms;
-using System.Windows.Forms.DataVisualization.Charting;
-using Results.Entities;
-using ResultsBrowser.Resources;
-using ResultsBrowser.Output.Printers.Statistics;
-
-namespace ResultsBrowser.Forms
-{
-    public partial class HistogramDlg : Form
-    {
-        const int NrBins = 11;
-
-        IList<WaterMeter> waterMeters;
-        HistogramOptionsDlg options;
-
-        public HistogramDlg(IList<WaterMeter> waterMeters, HistogramOptionsDlg options, string title)
-        {
-            InitializeComponent();
-
-            this.waterMeters = waterMeters;
-            this.options = options;
-			Text = title;
-
-            closeButton.Text = Strings.OkBtnText;
-			printButton.Text = Strings.Print;
-        }
-
-        private void HistogramDlg_Load(object sender, EventArgs e)
-        {
-            CalculateAndDraw();
-        }
-
-        void CalculateAndDraw()
-        {
-            for (int i = 0; i < options.SelectedItems.Count; i++)
-            {
-                Results.WMeterRsltItemSpec item = options.SelectedItems[i];
-
-                try
-                {
-                    /// Find minimum and maximum
-                    double min = Double.MaxValue;
-                    double max = Double.MinValue;
-                    double sum = 0;
-                    int count = 0;
-                    foreach (var wm in waterMeters)
-                    {
-                        string strValue = item.Print(wm);
-                        double value;
-			            if (!double.TryParse(strValue, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign, CultureInfo.CurrentCulture, out value) &&
-			                !double.TryParse(strValue, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign, CultureInfo.InvariantCulture, out value))
-                        {
-                            throw new Exception(string.Format("{0} is not a number, cannot calculate histogram", item.Caption));
-                        }
-
-                        sum += value;
-                        count++;
-                        if (min > value) min = value;
-                        if (max < value) max = value;
-                    }
-
-                    double mean = (count != 0) ? (sum / count) : 0;     /// Prevent division by zero
-
-                    ///
-                    /// Determine limits for bins
-                    /// 
-                    double[] binHiLim;
-                    string[] labels;
-                    if ((-0.55 <= min) && (max <= 0.55))
-                    {
-                        labels   = new string[] { "-0.6",    "", "-0.4",    "", "-0.2",    "",   "0",   "", "0.2",   "", "0.4",   "", "0.6" };
-                        binHiLim = new double[] {  -0.45,  -0.35, -0.25,  -0.15, -0.05,  0.05, 0.15,  0.25, 0.35,  0.45, 0.55 };
-                    }
-                    else if ((-1.1 <= min) && (max <= 1.1))
-                    {
-                        labels   = new string[] { "-1.2",   "", "-0.8",   "", "-0.4",   "",  "0",  "", "0.4",  "", "0.8",  "", "1.2" };
-                        binHiLim = new double[] { -0.9,   -0.7, -0.5,   -0.3, -0.1,  0.1, 0.3,   0.5, 0.7,   0.9, 1.1 };
-                    }
-                    else if ((-2.2 <= min) && (max <= 2.2))
-                    {
-                        labels = new string[] { "-2.4", "", "-1.6", "", "-0.8", "", "0", "", "0.8", "", "1.6", "", "2.4" };
-                        binHiLim = new double[] { -1.8, -1.4, -1.0, -0.6, -0.2, 0.2, 0.6, 1.0, 1.4, 1.8, 2.2 };
-                    }
-                    else if ((-4.4 <= min) && (max <= 4.4))
-                    {
-                        labels   = new string[] { "-4.8", "", "-3.2", "", "-1.6", "", "0", "", "1.6", "", "3.2", "", "4.8" };
-                        binHiLim = new double[] { -3.6, -2.8, -2.0, -1.2, -0.4, 0.4, 1.2, 2.0, 2.8, 3.6, 4.4  };
-                    }
-                    else
-                    {
-                        labels   = new string[] { "-9.6",   "", "-6.4",   "", "-3.2",   "", "0",  "", "3.2",  "", "6.4",  "", "9.6" };
-                        binHiLim = new double[] { -7.2,   -5.6, -4.0,   -2.4, -0.8, 0.8, 2.4,   4.0, 5.6,   7.2, 8.8 };
-                    }
-
-                    int nrBins = Math.Min(labels.Length - 1, binHiLim.Length + 1);
-
-                    double[] bins = new double[nrBins];
-                    for (int j = 0; j < nrBins; j++) bins[j] = 0;
-
-					/// Calculate bins
-                    foreach (var wm in waterMeters)
-                    {
-                        string strValue = item.Print(wm);
-                        double value;
-			            if (!double.TryParse(strValue, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign, CultureInfo.CurrentCulture, out value) &&
-			                !double.TryParse(strValue, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign, CultureInfo.InvariantCulture, out value))
-                        {
-                            throw new Exception(string.Format("{0} is not a number, cannot calculate histogram", item.Caption));
-                        }
-
-                        for (int j = 0; j < nrBins - 1; j++)
-                        {
-                            if (value < binHiLim[j])
-                            {
-                                bins[j] += 1.0;
-                                break;
-                            }
-                        }
-                        if (value >= binHiLim[nrBins - 2])
-                        {
-                            bins[nrBins - 1] += 1.0;
-                        }
-                    }
-
-                    ///
-                    /// Draw
-                    ///
-					HistogramCtrl histo = new HistogramCtrl(string.Format("{0}   mean = {1}", item.Caption, mean.ToString("F3")), bins, labels);
-					flowLayoutPanel1.Controls.Add(histo);
-                }
-                catch (Exception exc)
-                {
-					string msg = exc.Message;
-                }
-            }
-        }
-
-        private void closeButton_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.OK;
-            Close();
-        }
-    }
-}

ResultsBrowser/Forms/HistogramDlg.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

ResultsBrowser/Forms/HistogramOptionsDlg.Designer.cs

@@ -1,91 +0,0 @@
-namespace ResultsBrowser.Forms
-{
-    partial class HistogramOptionsDlg
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.cancelButton = new System.Windows.Forms.Button();
-            this.okButton = new System.Windows.Forms.Button();
-            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
-            this.SuspendLayout();
-            // 
-            // cancelButton
-            // 
-            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.cancelButton.Location = new System.Drawing.Point(380, 302);
-            this.cancelButton.Name = "cancelButton";
-            this.cancelButton.Size = new System.Drawing.Size(95, 38);
-            this.cancelButton.TabIndex = 9;
-            this.cancelButton.Text = "Cancel";
-            this.cancelButton.UseVisualStyleBackColor = true;
-            this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
-            // 
-            // okButton
-            // 
-            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.okButton.Location = new System.Drawing.Point(269, 302);
-            this.okButton.Name = "okButton";
-            this.okButton.Size = new System.Drawing.Size(95, 38);
-            this.okButton.TabIndex = 8;
-            this.okButton.Text = "OK";
-            this.okButton.UseVisualStyleBackColor = true;
-            this.okButton.Click += new System.EventHandler(this.okButton_Click);
-            // 
-            // flowLayoutPanel1
-            // 
-            this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
-            this.flowLayoutPanel1.Location = new System.Drawing.Point(12, 12);
-            this.flowLayoutPanel1.Name = "flowLayoutPanel1";
-            this.flowLayoutPanel1.Size = new System.Drawing.Size(479, 271);
-            this.flowLayoutPanel1.TabIndex = 10;
-            // 
-            // HistogramOptionsDlg
-            // 
-            this.AcceptButton = this.okButton;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.CancelButton = this.cancelButton;
-            this.ClientSize = new System.Drawing.Size(503, 355);
-            this.Controls.Add(this.flowLayoutPanel1);
-            this.Controls.Add(this.cancelButton);
-            this.Controls.Add(this.okButton);
-            this.Name = "HistogramOptionsDlg";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "HistogramOptionsDlg";
-            this.Load += new System.EventHandler(this.HistogramOptionsDlg_Load);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Button cancelButton;
-        private System.Windows.Forms.Button okButton;
-        private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
-    }
-}

ResultsBrowser/Forms/HistogramOptionsDlg.cs

@@ -1,67 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-using ResultsBrowser.Resources;
-
-namespace ResultsBrowser.Forms
-{
-    public partial class HistogramOptionsDlg : Form
-    {
-		IList<Results.WMeterRsltItemSpec> items;
-        public IList<Results.WMeterRsltItemSpec> SelectedItems;
-
-        IList<CheckBox> checkBoxes; 
-
-		public HistogramOptionsDlg(IList<Results.WMeterRsltItemSpec> items)
-        {
-            InitializeComponent();
-			this.items = items;
-
-            checkBoxes = new List<CheckBox>();
-        }
-
-        private void HistogramOptionsDlg_Load(object sender, EventArgs e)
-        {
-            Localize();
-
-			foreach (var item in items)
-			{
-                CheckBox cb = new CheckBox();
-                cb.Text = item.Caption;
-                cb.Checked = false;
-                flowLayoutPanel1.Controls.Add(cb);
-                checkBoxes.Add(cb);
-			}
-		}
-
-        void Localize()
-        {
-            Text = Strings.Statistics;
-            okButton.Text = Strings.OkBtnText;
-            cancelButton.Text = Strings.CancelBtnText;
-		}
-
-        private void okButton_Click(object sender, EventArgs e)
-        {
-            SelectedItems = new List<Results.WMeterRsltItemSpec>();
-            for (int i = 0; i < items.Count; i++)
-            {
-                if (checkBoxes[i].Checked) SelectedItems.Add(items[i]);
-            }
-
-            //Program.LocalSettings.RowItemCaption = RowItem.Caption;
-            // ...
-            //Program.LocalSettings.Save();
-
-            DialogResult = DialogResult.OK;
-            Close();
-        }
-
-        private void cancelButton_Click(object sender, EventArgs e)
-        {
-        }
-    }
-}

ResultsBrowser/Forms/HistogramOptionsDlg.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

ResultsBrowser/Forms/StatisticsDlg.cs

@@ -1,7 +1,4 @@
-///
-/// Copyright (c) 2016-2019 Sensus Slovensko a.s.
-///
-using System;
+using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
 using Results.Entities;
@@ -14,7 +11,22 @@ namespace ResultsBrowser.Forms
     public partial class StatisticsDlg : Form
     {
         IList<WaterMeter> waterMeters;
-        StatisticsOptionsDlg options;
+
+        bool twoDim;
+
+        Results.WMeterRsltItemSpec rowItem;
+		Results.WMeterRsltItemSpec rowItem2;
+		Results.WMeterRsltItemSpec rowItem3;
+		Results.WMeterRsltItemSpec columnItem;
+		Results.WMeterRsltItemSpec columnItem2;
+		Results.WMeterRsltItemSpec columnItem3;
+
+		string rowTestSpec;
+		string rowTestSpec2;
+		string rowTestSpec3;
+		string columnTestSpec;
+		string columnTestSpec2;
+		string columnTestSpec3;
 
         IList<string> rowValues;
         IList<string> columnValues;
@@ -24,14 +36,23 @@ namespace ResultsBrowser.Forms
 		string title;
 
 
-		public StatisticsDlg(IList<WaterMeter> waterMeters, StatisticsOptionsDlg options,
+		public StatisticsDlg(IList<WaterMeter> waterMeters, bool twoDim,
+							 Results.WMeterRsltItemSpec rowItem,
+							 Results.WMeterRsltItemSpec rowItem2,
+							 Results.WMeterRsltItemSpec rowItem3,
+							 Results.WMeterRsltItemSpec columnItem,
+							 Results.WMeterRsltItemSpec columnItem2,
+							 Results.WMeterRsltItemSpec columnItem3,
+							 string rowTestSpec,
+							 string rowTestSpec2,
+							 string rowTestSpec3,
+							 string columnTestSpec,
+							 string columnTestSpec2,
+							 string columnTestSpec3,
 							 DateTime startDate, DateTime endDate)
         {
             InitializeComponent();
 
-            this.waterMeters = waterMeters;
-            this.options = options;
-
 			if (!string.IsNullOrEmpty(Program.LocalSettings.TimePeriodFormat) && (startDate != new DateTime(0)) && (endDate != new DateTime(0)))
 			{
 				title = string.Format(Program.LocalSettings.TimePeriodFormat, startDate, endDate);
@@ -45,6 +66,26 @@ namespace ResultsBrowser.Forms
 
             closeButton.Text = Strings.OkBtnText;
 			printButton.Text = Strings.Print;
+
+            this.waterMeters = waterMeters;
+
+            this.twoDim = twoDim;
+
+			this.rowItem = rowItem;
+			this.rowItem2 = rowItem2;
+			this.rowItem3 = rowItem3;
+
+			this.columnItem = columnItem;
+			this.columnItem2 = columnItem2;
+			this.columnItem3 = columnItem3;
+
+            this.rowTestSpec = rowTestSpec;
+			this.rowTestSpec2 = rowTestSpec2;
+			this.rowTestSpec3 = rowTestSpec3;
+
+			this.columnTestSpec = columnTestSpec;
+			this.columnTestSpec2 = columnTestSpec2;
+			this.columnTestSpec3 = columnTestSpec3;
         }
 
         private void StatisticsDlg_Load(object sender, EventArgs e)
@@ -64,16 +105,16 @@ namespace ResultsBrowser.Forms
                 ///
                 foreach (var wm in waterMeters)
                 {
-                    string value = options.RowItem.Print(wm);
-					if (options.RowItem2 != null) value = value + " | " + options.RowItem2.Print(wm);
-					if (options.RowItem3 != null) value = value + " | " + options.RowItem3.Print(wm);
+                    string value = rowItem.Print(wm);
+					if (rowItem2 != null) value = value + " | " + rowItem2.Print(wm);
+					if (rowItem3 != null) value = value + " | " + rowItem3.Print(wm);
 					if (!rowValues.Contains(value)) rowValues.Add(value);
 
-                    if (options.TwoDim)
+                    if (twoDim)
                     {
-                        value = options.ColumnItem.Print(wm);
-						if (options.ColumnItem2 != null) value = value + " | " + options.ColumnItem2.Print(wm);
-						if (options.ColumnItem3 != null) value = value + " | " + options.ColumnItem3.Print(wm);
+                        value = columnItem.Print(wm);
+						if (columnItem2 != null) value = value + " | " + columnItem2.Print(wm);
+						if (columnItem3 != null) value = value + " | " + columnItem3.Print(wm);
 						if (!columnValues.Contains(value)) columnValues.Add(value);
                     }
                 }
@@ -88,17 +129,17 @@ namespace ResultsBrowser.Forms
                 {
                     for (int row = 0; row < rowValues.Count; row++)
                     {
-						string rowValue = options.RowItem.Print(wm);
-						if (options.RowItem2 != null) rowValue = rowValue + " | " + options.RowItem2.Print(wm);
-						if (options.RowItem3 != null) rowValue = rowValue + " | " + options.RowItem3.Print(wm);
+						string rowValue = rowItem.Print(wm);
+						if (rowItem2 != null) rowValue = rowValue + " | " + rowItem2.Print(wm);
+						if (rowItem3 != null) rowValue = rowValue + " | " + rowItem3.Print(wm);
 
-                        if (options.TwoDim)
+                        if (twoDim)
                         {
                             for (int column = 0; column < columnsCount; column++)
                             {
-								string columnValue = options.ColumnItem.Print(wm);
-								if (options.ColumnItem2 != null) columnValue = columnValue + " | " + options.ColumnItem2.Print(wm);
-								if (options.ColumnItem3 != null) columnValue = columnValue + " | " + options.ColumnItem3.Print(wm);
+								string columnValue = columnItem.Print(wm);
+								if (columnItem2 != null) columnValue = columnValue + " | " + columnItem2.Print(wm);
+								if (columnItem3 != null) columnValue = columnValue + " | " + columnItem3.Print(wm);
 
 								if (rowValue == rowValues[row] && columnValue == columnValues[column])
 								{
@@ -123,7 +164,7 @@ namespace ResultsBrowser.Forms
                 statisticsListView.Columns.Add(" ", 200);
                 for (int column = 0; column < columnsCount; column++)
                 {
-                    statisticsListView.Columns.Add((options.TwoDim ? columnValues[column] : Strings.Count), 70);
+                    statisticsListView.Columns.Add((twoDim ? columnValues[column] : Strings.Count), 70);
                 }
 
                 for (int row = 0; row < rowValues.Count; row++)
@@ -156,7 +197,7 @@ namespace ResultsBrowser.Forms
 			table[0, 0] = string.Empty;
 			for (int column = 0; column < columnsCount; column++)
 			{
-				table[0, column + 1] = (options.TwoDim ? columnValues[column] : Strings.Count);
+				table[0, column + 1] = (twoDim ? columnValues[column] : Strings.Count);
 			}
 
 			for (int row = 0; row < rowValues.Count; row++)
@@ -193,7 +234,7 @@ namespace ResultsBrowser.Forms
                 {
                     using (TextWriter writer = new StreamWriter(dlg.FileName, false, System.Text.Encoding.UTF8))
                     {
-                        if (options.TwoDim)
+                        if (twoDim)
                         {
                             /// Write column headers
                             for (int i = 0; i < columnValues.Count; i++)
@@ -204,7 +245,7 @@ namespace ResultsBrowser.Forms
                         }
                         else
                         {
-                            writer.WriteLine(string.Format("\"{0}\";\"{1}\"", options.RowItem.Caption, Strings.Count));
+                            writer.WriteLine(string.Format("\"{0}\";\"{1}\"", rowItem.Caption, Strings.Count));
                         }
 
                         int nrColumns = Math.Max(1, columnValues.Count);

ResultsBrowser/Forms/StatisticsOptionsDlg.cs

@@ -1,7 +1,4 @@
-///
-/// Copyright (c) 2016-2019 Sensus Slovensko a.s.
-///
-using System;
+using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
 using ResultsBrowser.Resources;

ResultsBrowser/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.18.1146.0")]
-[assembly: AssemblyFileVersion("2.18.1146.0")]
+[assembly: AssemblyVersion("2.18.1114.0")]
+[assembly: AssemblyFileVersion("2.18.1114.0")]

ResultsBrowser/Resources/Strings.cs.resx

@@ -240,7 +240,4 @@
   <data name="Add_data_from_Oracle" xml:space="preserve">
     <value>Dohledej údaje z Oracle</value>
   </data>
-  <data name="Histograms" xml:space="preserve">
-    <value>Histogramy</value>
-  </data>
 </root>

ResultsBrowser/Resources/Strings.resx

@@ -828,7 +828,4 @@
   <data name="Add_data_from_Oracle" xml:space="preserve">
     <value>Add data from Oracle</value>
   </data>
-  <data name="Histograms" xml:space="preserve">
-    <value>Histograms</value>
-  </data>
 </root>

ResultsBrowser/Resources/Strings1.Designer.cs

@@ -1257,15 +1257,6 @@ namespace ResultsBrowser.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Histograms.
-        /// </summary>
-        internal static string Histograms {
-            get {
-                return ResourceManager.GetString("Histograms", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Horizontally.
         /// </summary>

ResultsBrowser/ResultsBrowser.csproj

@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;IZRAEL_200</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -31,7 +31,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;IZRAEL_200</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -60,7 +60,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Windows.Forms.DataVisualization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -134,24 +133,6 @@
     <Compile Include="Forms\DatabaseSettingsDlg.Designer.cs">
       <DependentUpon>DatabaseSettingsDlg.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\HistogramCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Forms\HistogramCtrl.Designer.cs">
-      <DependentUpon>HistogramCtrl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\HistogramDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\HistogramDlg.Designer.cs">
-      <DependentUpon>HistogramDlg.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\HistogramOptionsDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\HistogramOptionsDlg.Designer.cs">
-      <DependentUpon>HistogramOptionsDlg.cs</DependentUpon>
-    </Compile>
     <Compile Include="Forms\NoBenchOrDatabaseDlg.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -221,15 +202,6 @@
     <EmbeddedResource Include="Forms\DatabaseSettingsDlg.resx">
       <DependentUpon>DatabaseSettingsDlg.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\HistogramCtrl.resx">
-      <DependentUpon>HistogramCtrl.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\HistogramDlg.resx">
-      <DependentUpon>HistogramDlg.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\HistogramOptionsDlg.resx">
-      <DependentUpon>HistogramOptionsDlg.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Forms\NoBenchOrDatabaseDlg.resx">
       <DependentUpon>NoBenchOrDatabaseDlg.cs</DependentUpon>
     </EmbeddedResource>

ResultsBrowser/ResultsBrowserWnd.Designer.cs

@@ -34,13 +34,10 @@
             this.filtersFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
             this.resultsGroupBox = new System.Windows.Forms.GroupBox();
             this.resultsListView = new System.Windows.Forms.ListView();
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.histogramBtn = new System.Windows.Forms.Button();
-            this.statisticsBtn = new System.Windows.Forms.Button();
-            this.outputGroupBox = new System.Windows.Forms.GroupBox();
-            this.exportQueryResultsBtn = new System.Windows.Forms.Button();
-            this.printQueryResultsBtn = new System.Windows.Forms.Button();
             this.printerConfigBtn = new System.Windows.Forms.Button();
+            this.statisticsBtn = new System.Windows.Forms.Button();
+            this.printQueryResultsBtn = new System.Windows.Forms.Button();
+            this.exportQueryResultsBtn = new System.Windows.Forms.Button();
             this.formatOfResultsBtn = new System.Windows.Forms.Button();
             this.clearFiltersBtn = new System.Windows.Forms.Button();
             this.settingsBtn = new System.Windows.Forms.Button();
@@ -65,8 +62,6 @@
             this.hSplitContainer.SuspendLayout();
             this.filtersGroupBox.SuspendLayout();
             this.resultsGroupBox.SuspendLayout();
-            this.groupBox1.SuspendLayout();
-            this.outputGroupBox.SuspendLayout();
             this.testBenchesGroupBox.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -84,9 +79,10 @@
             // 
             // vSplitContainer.Panel2
             // 
-            this.vSplitContainer.Panel2.Controls.Add(this.groupBox1);
-            this.vSplitContainer.Panel2.Controls.Add(this.outputGroupBox);
             this.vSplitContainer.Panel2.Controls.Add(this.printerConfigBtn);
+            this.vSplitContainer.Panel2.Controls.Add(this.statisticsBtn);
+            this.vSplitContainer.Panel2.Controls.Add(this.printQueryResultsBtn);
+            this.vSplitContainer.Panel2.Controls.Add(this.exportQueryResultsBtn);
             this.vSplitContainer.Panel2.Controls.Add(this.formatOfResultsBtn);
             this.vSplitContainer.Panel2.Controls.Add(this.clearFiltersBtn);
             this.vSplitContainer.Panel2.Controls.Add(this.settingsBtn);
@@ -158,68 +154,6 @@
             this.resultsListView.UseCompatibleStateImageBehavior = false;
             this.resultsListView.View = System.Windows.Forms.View.Details;
             // 
-            // groupBox1
-            // 
-            this.groupBox1.Controls.Add(this.histogramBtn);
-            this.groupBox1.Controls.Add(this.statisticsBtn);
-            this.groupBox1.Location = new System.Drawing.Point(8, 608);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(125, 93);
-            this.groupBox1.TabIndex = 13;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "Analysis";
-            // 
-            // histogramBtn
-            // 
-            this.histogramBtn.Location = new System.Drawing.Point(5, 55);
-            this.histogramBtn.Name = "histogramBtn";
-            this.histogramBtn.Size = new System.Drawing.Size(114, 32);
-            this.histogramBtn.TabIndex = 11;
-            this.histogramBtn.Text = "Histograms";
-            this.histogramBtn.UseVisualStyleBackColor = true;
-            this.histogramBtn.Click += new System.EventHandler(this.histogramBtn_Click);
-            // 
-            // statisticsBtn
-            // 
-            this.statisticsBtn.Location = new System.Drawing.Point(5, 18);
-            this.statisticsBtn.Name = "statisticsBtn";
-            this.statisticsBtn.Size = new System.Drawing.Size(114, 32);
-            this.statisticsBtn.TabIndex = 10;
-            this.statisticsBtn.Text = "Statistics";
-            this.statisticsBtn.UseVisualStyleBackColor = true;
-            this.statisticsBtn.Click += new System.EventHandler(this.statisticsBtn_Click);
-            // 
-            // outputGroupBox
-            // 
-            this.outputGroupBox.Controls.Add(this.exportQueryResultsBtn);
-            this.outputGroupBox.Controls.Add(this.printQueryResultsBtn);
-            this.outputGroupBox.Location = new System.Drawing.Point(8, 509);
-            this.outputGroupBox.Name = "outputGroupBox";
-            this.outputGroupBox.Size = new System.Drawing.Size(125, 93);
-            this.outputGroupBox.TabIndex = 12;
-            this.outputGroupBox.TabStop = false;
-            this.outputGroupBox.Text = "Output";
-            // 
-            // exportQueryResultsBtn
-            // 
-            this.exportQueryResultsBtn.Location = new System.Drawing.Point(5, 18);
-            this.exportQueryResultsBtn.Name = "exportQueryResultsBtn";
-            this.exportQueryResultsBtn.Size = new System.Drawing.Size(114, 32);
-            this.exportQueryResultsBtn.TabIndex = 8;
-            this.exportQueryResultsBtn.Text = "Export query results";
-            this.exportQueryResultsBtn.UseVisualStyleBackColor = true;
-            this.exportQueryResultsBtn.Click += new System.EventHandler(this.exportQueryResultsBtn_Click);
-            // 
-            // printQueryResultsBtn
-            // 
-            this.printQueryResultsBtn.Location = new System.Drawing.Point(5, 55);
-            this.printQueryResultsBtn.Name = "printQueryResultsBtn";
-            this.printQueryResultsBtn.Size = new System.Drawing.Size(113, 32);
-            this.printQueryResultsBtn.TabIndex = 9;
-            this.printQueryResultsBtn.Text = "Print query results";
-            this.printQueryResultsBtn.UseVisualStyleBackColor = true;
-            this.printQueryResultsBtn.Click += new System.EventHandler(this.printQueryResultsBtn_Click);
-            // 
             // printerConfigBtn
             // 
             this.printerConfigBtn.Location = new System.Drawing.Point(8, 316);
@@ -230,6 +164,36 @@
             this.printerConfigBtn.UseVisualStyleBackColor = true;
             this.printerConfigBtn.Click += new System.EventHandler(this.printerConfigBtn_Click);
             // 
+            // statisticsBtn
+            // 
+            this.statisticsBtn.Location = new System.Drawing.Point(8, 621);
+            this.statisticsBtn.Name = "statisticsBtn";
+            this.statisticsBtn.Size = new System.Drawing.Size(125, 35);
+            this.statisticsBtn.TabIndex = 10;
+            this.statisticsBtn.Text = "Statistics";
+            this.statisticsBtn.UseVisualStyleBackColor = true;
+            this.statisticsBtn.Click += new System.EventHandler(this.statisticsBtn_Click);
+            // 
+            // printQueryResultsBtn
+            // 
+            this.printQueryResultsBtn.Location = new System.Drawing.Point(8, 548);
+            this.printQueryResultsBtn.Name = "printQueryResultsBtn";
+            this.printQueryResultsBtn.Size = new System.Drawing.Size(125, 35);
+            this.printQueryResultsBtn.TabIndex = 9;
+            this.printQueryResultsBtn.Text = "Print query results";
+            this.printQueryResultsBtn.UseVisualStyleBackColor = true;
+            this.printQueryResultsBtn.Click += new System.EventHandler(this.printQueryResultsBtn_Click);
+            // 
+            // exportQueryResultsBtn
+            // 
+            this.exportQueryResultsBtn.Location = new System.Drawing.Point(8, 508);
+            this.exportQueryResultsBtn.Name = "exportQueryResultsBtn";
+            this.exportQueryResultsBtn.Size = new System.Drawing.Size(125, 35);
+            this.exportQueryResultsBtn.TabIndex = 8;
+            this.exportQueryResultsBtn.Text = "Export query results";
+            this.exportQueryResultsBtn.UseVisualStyleBackColor = true;
+            this.exportQueryResultsBtn.Click += new System.EventHandler(this.exportQueryResultsBtn_Click);
+            // 
             // formatOfResultsBtn
             // 
             this.formatOfResultsBtn.Location = new System.Drawing.Point(8, 276);
@@ -406,8 +370,6 @@
             this.hSplitContainer.ResumeLayout(false);
             this.filtersGroupBox.ResumeLayout(false);
             this.resultsGroupBox.ResumeLayout(false);
-            this.groupBox1.ResumeLayout(false);
-            this.outputGroupBox.ResumeLayout(false);
             this.testBenchesGroupBox.ResumeLayout(false);
             this.testBenchesGroupBox.PerformLayout();
             this.ResumeLayout(false);
@@ -440,8 +402,5 @@
         private System.Windows.Forms.RadioButton checkBox4;
 		private System.Windows.Forms.Button printerConfigBtn;
         private System.Windows.Forms.RadioButton checkBox6;
-        private System.Windows.Forms.GroupBox groupBox1;
-        private System.Windows.Forms.GroupBox outputGroupBox;
-        private System.Windows.Forms.Button histogramBtn;
     }
 }

ResultsBrowser/ResultsBrowserWnd.cs

@@ -1,7 +1,4 @@
-///
-/// Copyright (c) 2016-2019 Sensus Slovensko a.s.
-///
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Windows.Forms;
@@ -492,7 +489,7 @@ namespace ResultsBrowser
 			IList<Results.WMeterRsltItemSpec> items = Results.WMeterRsltItemSpec.FromStrArray(filtersConfig.ResultItems);
 
             ///
-            /// Statistics options
+            /// Enter options
             ///
             Forms.StatisticsOptionsDlg optionsDlg = new Forms.StatisticsOptionsDlg(items);
             if (optionsDlg.ShowDialog() != DialogResult.OK) return;
@@ -500,31 +497,16 @@ namespace ResultsBrowser
             ///
             /// Calculate statistics
             ///
-            Forms.StatisticsDlg statisticsDlg = new Forms.StatisticsDlg(waterMeters, optionsDlg, timePeriodStart, timePeriodEnd);
+            Forms.StatisticsDlg statisticsDlg = new Forms.StatisticsDlg(waterMeters, optionsDlg.TwoDim,
+																		optionsDlg.RowItem, optionsDlg.RowItem2, optionsDlg.RowItem3,
+																		optionsDlg.ColumnItem, optionsDlg.ColumnItem2, optionsDlg.ColumnItem3,
+																		optionsDlg.RowTestSpecifier, optionsDlg.RowTestSpecifier2, optionsDlg.RowTestSpecifier3,
+																		optionsDlg.ColumnTestSpecifier, optionsDlg.ColumnTestSpecifier2, optionsDlg.ColumnTestSpecifier3,
+																		timePeriodStart, timePeriodEnd);
             statisticsDlg.ShowDialog();
         }
 
 
-        private void histogramBtn_Click(object sender, EventArgs e)
-        {
-            if (waterMeters == null || waterMeters.Count == 0) return;
-
-            IList<Results.WMeterRsltItemSpec> items = Results.WMeterRsltItemSpec.FromStrArray(filtersConfig.ResultItems);
-
-            ///
-            /// Histogram options
-            ///
-            Forms.HistogramOptionsDlg optionsDlg = new Forms.HistogramOptionsDlg(items);
-            if (optionsDlg.ShowDialog() != DialogResult.OK) return;
-
-            ///
-            /// Calculate and display histograms
-            ///
-            Forms.HistogramDlg histogramDlg = new Forms.HistogramDlg(waterMeters, optionsDlg, "Histogramy");
-            histogramDlg.ShowDialog();
-        }
-
-
 		/// <summary>
 		/// Updates component factory
 		/// </summary>

Statistics/LocalSettings.cs

@@ -18,6 +18,7 @@ namespace Statistics
     [XmlRootAttribute("Statistics")]
     public class LocalSettings
     {
+        public const int BenchesCount = 6;
         public const int FlowsCount = 5;
 
 
@@ -46,166 +47,115 @@ namespace Statistics
             return ((ConnectionStrings != null) && (i >= 0) && (i < ConnectionStrings.Length)) ? ConnectionStrings[i] : string.Empty;
         }
 
-        ///
-        /// MID-s
-        ///
-        public string[] MidNames;
-
         ///
         /// Flow settings
         ///
+        public bool[] FlowEnabledWMs;
         public bool[] FlowEnabledI1;
         public bool[] FlowEnabledI2;
         public bool[] FlowEnabledI3;
         public bool[] FlowEnabledI4;
-        public bool[] FlowEnabledI5;
-        public bool[] FlowEnabledI6;
-        public bool[] FlowEnabledI7;
-        
-        
-        /// <summary>
-        /// Get flow enabled info
-        /// </summary>
-        /// <param name="midId">1-based MID id</param>
-        /// <param name="i">0-based flow id</param>
-        /// <returns>true = enabled</returns>
-        public bool GetFlowEnabled(int midId, int i)
+        /// 
+        public bool GetFlowEnabled(UserControls.MidId midId, int i)
         {
             switch (midId)
             {
-                case 1: return ((FlowEnabledI1 != null) && (i >= 0) && (i < FlowEnabledI1.Length)) ? FlowEnabledI1[i] : false;
-                case 2: return ((FlowEnabledI2 != null) && (i >= 0) && (i < FlowEnabledI2.Length)) ? FlowEnabledI2[i] : false;
-                case 3: return ((FlowEnabledI3 != null) && (i >= 0) && (i < FlowEnabledI3.Length)) ? FlowEnabledI3[i] : false;
-                case 4: return ((FlowEnabledI4 != null) && (i >= 0) && (i < FlowEnabledI4.Length)) ? FlowEnabledI4[i] : false;
-                case 5: return ((FlowEnabledI5 != null) && (i >= 0) && (i < FlowEnabledI5.Length)) ? FlowEnabledI5[i] : false;
-                case 6: return ((FlowEnabledI6 != null) && (i >= 0) && (i < FlowEnabledI6.Length)) ? FlowEnabledI6[i] : false;
-                case 7: return ((FlowEnabledI7 != null) && (i >= 0) && (i < FlowEnabledI7.Length)) ? FlowEnabledI7[i] : false;
+                case UserControls.MidId.WaterMeters:
+                    return ((FlowEnabledWMs != null) && (i >= 0) && (i < FlowEnabledWMs.Length)) ? FlowEnabledWMs[i] : false;
+                case UserControls.MidId.I1: return ((FlowEnabledI1 != null) && (i >= 0) && (i < FlowEnabledI1.Length)) ? FlowEnabledI1[i] : false;
+                case UserControls.MidId.I2: return ((FlowEnabledI2 != null) && (i >= 0) && (i < FlowEnabledI2.Length)) ? FlowEnabledI2[i] : false;
+                case UserControls.MidId.I3: return ((FlowEnabledI3 != null) && (i >= 0) && (i < FlowEnabledI3.Length)) ? FlowEnabledI3[i] : false;
+                case UserControls.MidId.I4: return ((FlowEnabledI4 != null) && (i >= 0) && (i < FlowEnabledI4.Length)) ? FlowEnabledI4[i] : false;
                 default:                    
                     return false;
             }
         }
-
-        /// <summary>
-        /// Set flow enabled info
-        /// </summary>
-        /// <param name="midId">1-based MID id</param>
-        /// <param name="i">0-based flow id</param>
-        /// <param name="value">true = enabled</param>
-        public void SetFlowEnabled(int midId, int i, bool value)
+        /// 
+        public void SetFlowEnabled(UserControls.MidId midId, int i, bool value)
         {
             switch (midId)
             {
-                case 1: if ((FlowEnabledI1 != null) && (i >= 0) && (i < FlowEnabledI1.Length)) { FlowEnabledI1[i] = value; }; break;
-                case 2: if ((FlowEnabledI2 != null) && (i >= 0) && (i < FlowEnabledI2.Length)) { FlowEnabledI2[i] = value; }; break;
-                case 3: if ((FlowEnabledI3 != null) && (i >= 0) && (i < FlowEnabledI3.Length)) { FlowEnabledI3[i] = value; }; break;
-                case 4: if ((FlowEnabledI4 != null) && (i >= 0) && (i < FlowEnabledI4.Length)) { FlowEnabledI4[i] = value; }; break;
-                case 5: if ((FlowEnabledI5 != null) && (i >= 0) && (i < FlowEnabledI5.Length)) { FlowEnabledI5[i] = value; }; break;
-                case 6: if ((FlowEnabledI6 != null) && (i >= 0) && (i < FlowEnabledI6.Length)) { FlowEnabledI6[i] = value; }; break;
-                case 7: if ((FlowEnabledI7 != null) && (i >= 0) && (i < FlowEnabledI7.Length)) { FlowEnabledI7[i] = value; }; break;
+                case UserControls.MidId.WaterMeters:
+                    if ((FlowEnabledWMs != null) && (i >= 0) && (i < FlowEnabledWMs.Length)) { FlowEnabledWMs[i] = value; };
+                    break;
+                case UserControls.MidId.I1: if ((FlowEnabledI1 != null) && (i >= 0) && (i < FlowEnabledI1.Length)) { FlowEnabledI1[i] = value; }; break;
+                case UserControls.MidId.I2: if ((FlowEnabledI2 != null) && (i >= 0) && (i < FlowEnabledI2.Length)) { FlowEnabledI2[i] = value; }; break;
+                case UserControls.MidId.I3: if ((FlowEnabledI3 != null) && (i >= 0) && (i < FlowEnabledI3.Length)) { FlowEnabledI3[i] = value; }; break;
+                case UserControls.MidId.I4: if ((FlowEnabledI4 != null) && (i >= 0) && (i < FlowEnabledI4.Length)) { FlowEnabledI4[i] = value; }; break;
                 default:
                     break;
             }
         }
 
+        public double[] FlowFromWMs;
         public double[] FlowFromI1;
         public double[] FlowFromI2;
         public double[] FlowFromI3;
         public double[] FlowFromI4;
-        public double[] FlowFromI5;
-        public double[] FlowFromI6;
-        public double[] FlowFromI7;
-
-        /// <summary>
-        /// Get lower limit of the flow
-        /// </summary>
-        /// <param name="midId">1-based MID id</param>
-        /// <param name="i">0-based flow id</param>
-        /// <returns>Flow in m3/h</returns>
-        public double GetFlowFrom(int midId, int i)
+        /// 
+        public double GetFlowFrom(UserControls.MidId midId, int i)
         {
             switch (midId)
             {
-                case 1: return ((FlowFromI1 != null) && (i >= 0) && (i < FlowFromI1.Length)) ? FlowFromI1[i] : 0;
-                case 2: return ((FlowFromI2 != null) && (i >= 0) && (i < FlowFromI2.Length)) ? FlowFromI2[i] : 0;
-                case 3: return ((FlowFromI3 != null) && (i >= 0) && (i < FlowFromI3.Length)) ? FlowFromI3[i] : 0;
-                case 4: return ((FlowFromI4 != null) && (i >= 0) && (i < FlowFromI4.Length)) ? FlowFromI4[i] : 0;
-                case 5: return ((FlowFromI5 != null) && (i >= 0) && (i < FlowFromI5.Length)) ? FlowFromI5[i] : 0;
-                case 6: return ((FlowFromI6 != null) && (i >= 0) && (i < FlowFromI6.Length)) ? FlowFromI6[i] : 0;
-                case 7: return ((FlowFromI7 != null) && (i >= 0) && (i < FlowFromI7.Length)) ? FlowFromI7[i] : 0;
+                case UserControls.MidId.WaterMeters:
+                    return ((FlowFromWMs != null) && (i >= 0) && (i < FlowFromWMs.Length)) ? FlowFromWMs[i] : 0;
+                case UserControls.MidId.I1: return ((FlowFromI1 != null) && (i >= 0) && (i < FlowFromI1.Length)) ? FlowFromI1[i] : 0;
+                case UserControls.MidId.I2: return ((FlowFromI2 != null) && (i >= 0) && (i < FlowFromI2.Length)) ? FlowFromI2[i] : 0;
+                case UserControls.MidId.I3: return ((FlowFromI3 != null) && (i >= 0) && (i < FlowFromI3.Length)) ? FlowFromI3[i] : 0;
+                case UserControls.MidId.I4: return ((FlowFromI4 != null) && (i >= 0) && (i < FlowFromI4.Length)) ? FlowFromI4[i] : 0;
                 default:
                     return 0;
             }
         }
-
-        /// <summary>
-        /// Set lower limit of the flow
-        /// </summary>
-        /// <param name="midId">1-based MID id</param>
-        /// <param name="i">0-based flow id</param>
-        /// <param name="value">Flow in m3/h</param>
-        public void SetFlowFrom(int midId, int i, double value)
+        /// 
+        public void SetFlowFrom(UserControls.MidId midId, int i, double value)
         {
             switch (midId)
             {
-                case 1: if ((FlowFromI1 != null) && (i >= 0) && (i < FlowFromI1.Length)) { FlowFromI1[i] = value; }; break;
-                case 2: if ((FlowFromI2 != null) && (i >= 0) && (i < FlowFromI2.Length)) { FlowFromI2[i] = value; }; break;
-                case 3: if ((FlowFromI3 != null) && (i >= 0) && (i < FlowFromI3.Length)) { FlowFromI3[i] = value; }; break;
-                case 4: if ((FlowFromI4 != null) && (i >= 0) && (i < FlowFromI4.Length)) { FlowFromI4[i] = value; }; break;
-                case 5: if ((FlowFromI5 != null) && (i >= 0) && (i < FlowFromI5.Length)) { FlowFromI5[i] = value; }; break;
-                case 6: if ((FlowFromI6 != null) && (i >= 0) && (i < FlowFromI6.Length)) { FlowFromI6[i] = value; }; break;
-                case 7: if ((FlowFromI7 != null) && (i >= 0) && (i < FlowFromI7.Length)) { FlowFromI7[i] = value; }; break;
+                case UserControls.MidId.WaterMeters:
+                    if ((FlowFromWMs != null) && (i >= 0) && (i < FlowFromWMs.Length)) { FlowFromWMs[i] = value; };
+                    break;
+                case UserControls.MidId.I1: if ((FlowFromI1 != null) && (i >= 0) && (i < FlowFromI1.Length)) { FlowFromI1[i] = value; }; break;
+                case UserControls.MidId.I2: if ((FlowFromI2 != null) && (i >= 0) && (i < FlowFromI2.Length)) { FlowFromI2[i] = value; }; break;
+                case UserControls.MidId.I3: if ((FlowFromI3 != null) && (i >= 0) && (i < FlowFromI3.Length)) { FlowFromI3[i] = value; }; break;
+                case UserControls.MidId.I4: if ((FlowFromI4 != null) && (i >= 0) && (i < FlowFromI4.Length)) { FlowFromI4[i] = value; }; break;
                 default:
                     break;
             }
         }
 
+        public double[] FlowToWMs;
         public double[] FlowToI1;
         public double[] FlowToI2;
         public double[] FlowToI3;
         public double[] FlowToI4;
-        public double[] FlowToI5;
-        public double[] FlowToI6;
-        public double[] FlowToI7;
-
-        /// <summary>
-        /// Get upper limit of the flow
-        /// </summary>
-        /// <param name="midId">1-based MID id</param>
-        /// <param name="i">0-based flow id</param>
-        /// <returns>Flow in m3/h</returns>
-        public double GetFlowTo(int midId, int i)
+        /// 
+        public double GetFlowTo(UserControls.MidId midId, int i)
         {
             switch (midId)
             {
-                case 1: return ((FlowToI1 != null) && (i >= 0) && (i < FlowToI1.Length)) ? FlowToI1[i] : 0;
-                case 2: return ((FlowToI2 != null) && (i >= 0) && (i < FlowToI2.Length)) ? FlowToI2[i] : 0;
-                case 3: return ((FlowToI3 != null) && (i >= 0) && (i < FlowToI3.Length)) ? FlowToI3[i] : 0;
-                case 4: return ((FlowToI4 != null) && (i >= 0) && (i < FlowToI4.Length)) ? FlowToI4[i] : 0;
-                case 5: return ((FlowToI5 != null) && (i >= 0) && (i < FlowToI5.Length)) ? FlowToI5[i] : 0;
-                case 6: return ((FlowToI6 != null) && (i >= 0) && (i < FlowToI6.Length)) ? FlowToI6[i] : 0;
-                case 7: return ((FlowToI7 != null) && (i >= 0) && (i < FlowToI7.Length)) ? FlowToI7[i] : 0;
+                case UserControls.MidId.WaterMeters:
+                    return ((FlowToWMs != null) && (i >= 0) && (i < FlowToWMs.Length)) ? FlowToWMs[i] : 0;
+                case UserControls.MidId.I1: return ((FlowToI1 != null) && (i >= 0) && (i < FlowToI1.Length)) ? FlowToI1[i] : 0;
+                case UserControls.MidId.I2: return ((FlowToI2 != null) && (i >= 0) && (i < FlowToI2.Length)) ? FlowToI2[i] : 0;
+                case UserControls.MidId.I3: return ((FlowToI3 != null) && (i >= 0) && (i < FlowToI3.Length)) ? FlowToI3[i] : 0;
+                case UserControls.MidId.I4: return ((FlowToI4 != null) && (i >= 0) && (i < FlowToI4.Length)) ? FlowToI4[i] : 0;
                 default:
                     return 0;
             }
         }
-
-        /// <summary>
-        /// Set upper limit of the flow
-        /// </summary>
-        /// <param name="midId">1-based MID id</param>
-        /// <param name="i">0-based flow id</param>
-        /// <param name="value">Flow in m3/h</param>
-        public void SetFlowTo(int midId, int i, double value)
+        /// 
+        public void SetFlowTo(UserControls.MidId midId, int i, double value)
         {
             switch (midId)
             {
-                case 1: if ((FlowToI1 != null) && (i >= 0) && (i < FlowToI1.Length)) { FlowToI1[i] = value; }; break;
-                case 2: if ((FlowToI2 != null) && (i >= 0) && (i < FlowToI2.Length)) { FlowToI2[i] = value; }; break;
-                case 3: if ((FlowToI3 != null) && (i >= 0) && (i < FlowToI3.Length)) { FlowToI3[i] = value; }; break;
-                case 4: if ((FlowToI4 != null) && (i >= 0) && (i < FlowToI4.Length)) { FlowToI4[i] = value; }; break;
-                case 5: if ((FlowToI5 != null) && (i >= 0) && (i < FlowToI5.Length)) { FlowToI5[i] = value; }; break;
-                case 6: if ((FlowToI6 != null) && (i >= 0) && (i < FlowToI6.Length)) { FlowToI6[i] = value; }; break;
-                case 7: if ((FlowToI7 != null) && (i >= 0) && (i < FlowToI7.Length)) { FlowToI7[i] = value; }; break;
+                case UserControls.MidId.WaterMeters:
+                    if ((FlowToWMs != null) && (i >= 0) && (i < FlowToWMs.Length)) { FlowToWMs[i] = value; };
+                    break;
+                case UserControls.MidId.I1: if ((FlowToI1 != null) && (i >= 0) && (i < FlowToI1.Length)) { FlowToI1[i] = value; }; break;
+                case UserControls.MidId.I2: if ((FlowToI2 != null) && (i >= 0) && (i < FlowToI2.Length)) { FlowToI2[i] = value; }; break;
+                case UserControls.MidId.I3: if ((FlowToI3 != null) && (i >= 0) && (i < FlowToI3.Length)) { FlowToI3[i] = value; }; break;
+                case UserControls.MidId.I4: if ((FlowToI4 != null) && (i >= 0) && (i < FlowToI4.Length)) { FlowToI4[i] = value; }; break;
                 default:
                     break;
             }
@@ -230,18 +180,6 @@ namespace Statistics
         /// </summary>
         public LocalSettings()
         {
-#if GENESIS
-            Language = "DE";
-
-            BenchNames = new string[] { "Genesis" };
-
-            ConnectionStrings = new string[]
-            {
-                "SERVER=localhost; DATABASE=genesis-r; UID=root; PASSWORD=; CHARSET=utf8;",
-            };
-
-            MidNames = new string[] { string.Empty, "I11", "I12", "I2", "I3", "I4", "I5" };     /// Index is MID-id
-#else
             Language = "SK";
 
             BenchNames = new string[] { "WR10", "WR11", "WR13", "WR14", "WR15", "PT7" };
@@ -256,31 +194,23 @@ namespace Statistics
                 "SERVER=10.42.129.26; DATABASE=iperlspecial-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;",
             };
 
-            MidNames = new string[] { string.Empty, "I1", "I2", "I3", "I4" };       /// Index is MID-id
-#endif
+            FlowEnabledWMs = new bool[FlowsCount];
             FlowEnabledI1 = new bool[FlowsCount];
             FlowEnabledI2 = new bool[FlowsCount];
             FlowEnabledI3 = new bool[FlowsCount];
             FlowEnabledI4 = new bool[FlowsCount];
-            FlowEnabledI5 = new bool[FlowsCount];
-            FlowEnabledI6 = new bool[FlowsCount];
-            FlowEnabledI7 = new bool[FlowsCount];
 
+            FlowFromWMs = new double[FlowsCount];
             FlowFromI1 = new double[FlowsCount];
             FlowFromI2 = new double[FlowsCount];
             FlowFromI3 = new double[FlowsCount];
             FlowFromI4 = new double[FlowsCount];
-            FlowFromI5 = new double[FlowsCount];
-            FlowFromI6 = new double[FlowsCount];
-            FlowFromI7 = new double[FlowsCount];
 
+            FlowToWMs = new double[FlowsCount];
             FlowToI1 = new double[FlowsCount];
             FlowToI2 = new double[FlowsCount];
             FlowToI3 = new double[FlowsCount];
             FlowToI4 = new double[FlowsCount];
-            FlowToI5 = new double[FlowsCount];
-            FlowToI6 = new double[FlowsCount];
-            FlowToI7 = new double[FlowsCount];
 
             SelectedRadioButtonNumber = 1;
         }

Statistics/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.18.1154.0")]
-[assembly: AssemblyFileVersion("2.18.1154.0")]
+[assembly: AssemblyVersion("2.18.1108.0")]
+[assembly: AssemblyFileVersion("2.18.1108.0")]

Statistics/Statistics.csproj

@@ -80,6 +80,7 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UserControls\Enums.cs" />
     <Compile Include="UserControls\MidOrWaterMetersCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>

Statistics/StatisticsDlg.Designer.cs

@@ -39,11 +39,27 @@
             this.dateTimeFromPicker = new System.Windows.Forms.DateTimePicker();
             this.dateTimeToPicker = new System.Windows.Forms.DateTimePicker();
             this.midsTabControl = new System.Windows.Forms.TabControl();
+            this.wr10TabPage = new System.Windows.Forms.TabPage();
+            this.wmsBenchesControl = new Statistics.UserControls.MidOrWaterMetersCtrl();
+            this.wr11TabPage = new System.Windows.Forms.TabPage();
+            this.i1BenchesControl = new Statistics.UserControls.MidOrWaterMetersCtrl();
+            this.wr13TabPage = new System.Windows.Forms.TabPage();
+            this.i2BbenchesControl = new Statistics.UserControls.MidOrWaterMetersCtrl();
+            this.wr14TabPage = new System.Windows.Forms.TabPage();
+            this.i3BenchesControl = new Statistics.UserControls.MidOrWaterMetersCtrl();
+            this.wr15TabPage = new System.Windows.Forms.TabPage();
+            this.i4BenchesControl = new Statistics.UserControls.MidOrWaterMetersCtrl();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
             this.splitContainer1.Panel2.SuspendLayout();
             this.splitContainer1.SuspendLayout();
             this.timePeriodGroupBox.SuspendLayout();
+            this.midsTabControl.SuspendLayout();
+            this.wr10TabPage.SuspendLayout();
+            this.wr11TabPage.SuspendLayout();
+            this.wr13TabPage.SuspendLayout();
+            this.wr14TabPage.SuspendLayout();
+            this.wr15TabPage.SuspendLayout();
             this.SuspendLayout();
             // 
             // splitContainer1
@@ -161,6 +177,11 @@
             // 
             // midsTabControl
             // 
+            this.midsTabControl.Controls.Add(this.wr10TabPage);
+            this.midsTabControl.Controls.Add(this.wr11TabPage);
+            this.midsTabControl.Controls.Add(this.wr13TabPage);
+            this.midsTabControl.Controls.Add(this.wr14TabPage);
+            this.midsTabControl.Controls.Add(this.wr15TabPage);
             this.midsTabControl.Dock = System.Windows.Forms.DockStyle.Fill;
             this.midsTabControl.Location = new System.Drawing.Point(0, 0);
             this.midsTabControl.Name = "midsTabControl";
@@ -168,6 +189,101 @@
             this.midsTabControl.Size = new System.Drawing.Size(1368, 732);
             this.midsTabControl.TabIndex = 0;
             // 
+            // wr10TabPage
+            // 
+            this.wr10TabPage.Controls.Add(this.wmsBenchesControl);
+            this.wr10TabPage.Location = new System.Drawing.Point(4, 22);
+            this.wr10TabPage.Name = "wr10TabPage";
+            this.wr10TabPage.Padding = new System.Windows.Forms.Padding(3);
+            this.wr10TabPage.Size = new System.Drawing.Size(1360, 706);
+            this.wr10TabPage.TabIndex = 0;
+            this.wr10TabPage.Text = "Water meters";
+            this.wr10TabPage.UseVisualStyleBackColor = true;
+            // 
+            // wmsBenchesControl
+            // 
+            this.wmsBenchesControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.wmsBenchesControl.Location = new System.Drawing.Point(3, 3);
+            this.wmsBenchesControl.Name = "wmsBenchesControl";
+            this.wmsBenchesControl.Size = new System.Drawing.Size(1354, 700);
+            this.wmsBenchesControl.TabIndex = 0;
+            // 
+            // wr11TabPage
+            // 
+            this.wr11TabPage.Controls.Add(this.i1BenchesControl);
+            this.wr11TabPage.Location = new System.Drawing.Point(4, 22);
+            this.wr11TabPage.Name = "wr11TabPage";
+            this.wr11TabPage.Padding = new System.Windows.Forms.Padding(3);
+            this.wr11TabPage.Size = new System.Drawing.Size(1360, 706);
+            this.wr11TabPage.TabIndex = 1;
+            this.wr11TabPage.Text = "I1";
+            this.wr11TabPage.UseVisualStyleBackColor = true;
+            // 
+            // i1BenchesControl
+            // 
+            this.i1BenchesControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.i1BenchesControl.Location = new System.Drawing.Point(3, 3);
+            this.i1BenchesControl.Name = "i1BenchesControl";
+            this.i1BenchesControl.Size = new System.Drawing.Size(1354, 700);
+            this.i1BenchesControl.TabIndex = 0;
+            // 
+            // wr13TabPage
+            // 
+            this.wr13TabPage.Controls.Add(this.i2BbenchesControl);
+            this.wr13TabPage.Location = new System.Drawing.Point(4, 22);
+            this.wr13TabPage.Name = "wr13TabPage";
+            this.wr13TabPage.Padding = new System.Windows.Forms.Padding(3);
+            this.wr13TabPage.Size = new System.Drawing.Size(1360, 706);
+            this.wr13TabPage.TabIndex = 2;
+            this.wr13TabPage.Text = "I2";
+            this.wr13TabPage.UseVisualStyleBackColor = true;
+            // 
+            // i2BbenchesControl
+            // 
+            this.i2BbenchesControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.i2BbenchesControl.Location = new System.Drawing.Point(3, 3);
+            this.i2BbenchesControl.Name = "i2BbenchesControl";
+            this.i2BbenchesControl.Size = new System.Drawing.Size(1354, 700);
+            this.i2BbenchesControl.TabIndex = 0;
+            // 
+            // wr14TabPage
+            // 
+            this.wr14TabPage.Controls.Add(this.i3BenchesControl);
+            this.wr14TabPage.Location = new System.Drawing.Point(4, 22);
+            this.wr14TabPage.Name = "wr14TabPage";
+            this.wr14TabPage.Padding = new System.Windows.Forms.Padding(3);
+            this.wr14TabPage.Size = new System.Drawing.Size(1360, 706);
+            this.wr14TabPage.TabIndex = 3;
+            this.wr14TabPage.Text = "I3";
+            this.wr14TabPage.UseVisualStyleBackColor = true;
+            // 
+            // i3BenchesControl
+            // 
+            this.i3BenchesControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.i3BenchesControl.Location = new System.Drawing.Point(3, 3);
+            this.i3BenchesControl.Name = "i3BenchesControl";
+            this.i3BenchesControl.Size = new System.Drawing.Size(1354, 700);
+            this.i3BenchesControl.TabIndex = 0;
+            // 
+            // wr15TabPage
+            // 
+            this.wr15TabPage.Controls.Add(this.i4BenchesControl);
+            this.wr15TabPage.Location = new System.Drawing.Point(4, 22);
+            this.wr15TabPage.Name = "wr15TabPage";
+            this.wr15TabPage.Padding = new System.Windows.Forms.Padding(3);
+            this.wr15TabPage.Size = new System.Drawing.Size(1360, 706);
+            this.wr15TabPage.TabIndex = 4;
+            this.wr15TabPage.Text = "I4";
+            this.wr15TabPage.UseVisualStyleBackColor = true;
+            // 
+            // i4BenchesControl
+            // 
+            this.i4BenchesControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.i4BenchesControl.Location = new System.Drawing.Point(3, 3);
+            this.i4BenchesControl.Name = "i4BenchesControl";
+            this.i4BenchesControl.Size = new System.Drawing.Size(1354, 700);
+            this.i4BenchesControl.TabIndex = 0;
+            // 
             // StatisticsDlg
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -175,7 +291,7 @@
             this.ClientSize = new System.Drawing.Size(1368, 826);
             this.Controls.Add(this.splitContainer1);
             this.Name = "StatisticsDlg";
-            this.Text = "MID Statistics";
+            this.Text = "Statistics";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.StatisticsDlg_FormClosing);
             this.Load += new System.EventHandler(this.StatisticsDlg_Load);
             this.splitContainer1.Panel1.ResumeLayout(false);
@@ -185,6 +301,12 @@
             this.splitContainer1.ResumeLayout(false);
             this.timePeriodGroupBox.ResumeLayout(false);
             this.timePeriodGroupBox.PerformLayout();
+            this.midsTabControl.ResumeLayout(false);
+            this.wr10TabPage.ResumeLayout(false);
+            this.wr11TabPage.ResumeLayout(false);
+            this.wr13TabPage.ResumeLayout(false);
+            this.wr14TabPage.ResumeLayout(false);
+            this.wr15TabPage.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -192,16 +314,26 @@
         #endregion
 
         private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.TabControl midsTabControl;
+        private System.Windows.Forms.TabPage wr10TabPage;
+        private System.Windows.Forms.TabPage wr11TabPage;
+        private System.Windows.Forms.TabPage wr13TabPage;
+        private System.Windows.Forms.TabPage wr14TabPage;
+        private System.Windows.Forms.TabPage wr15TabPage;
         private System.Windows.Forms.GroupBox timePeriodGroupBox;
         private System.Windows.Forms.DateTimePicker dateTimeFromPicker;
         private System.Windows.Forms.DateTimePicker dateTimeToPicker;
         private System.Windows.Forms.Label toLabel1;
         private System.Windows.Forms.Label fromLabel1;
+        private UserControls.MidOrWaterMetersCtrl wmsBenchesControl;
+        private UserControls.MidOrWaterMetersCtrl i1BenchesControl;
+        private UserControls.MidOrWaterMetersCtrl i2BbenchesControl;
+        private UserControls.MidOrWaterMetersCtrl i3BenchesControl;
+        private UserControls.MidOrWaterMetersCtrl i4BenchesControl;
         private System.Windows.Forms.RadioButton radioButton3;
         private System.Windows.Forms.RadioButton radioButton2;
         private System.Windows.Forms.RadioButton radioButton1;
         private System.Windows.Forms.RadioButton radioButton4;
-        private System.Windows.Forms.TabControl midsTabControl;
     }
 }
 

Statistics/StatisticsDlg.cs

@@ -24,7 +24,7 @@ namespace Statistics
 {
     public partial class StatisticsDlg : Form
     {
-        static ISessionFactory[] sessionFactories = new ISessionFactory[Program.LocalSettings.ConnectionStrings.Length];
+        static ISessionFactory[] sessionFactories = new ISessionFactory[LocalSettings.BenchesCount];
 
 
         public StatisticsDlg()
@@ -33,19 +33,14 @@ namespace Statistics
             
             ///ManageCheckGroupBox(timePeriodCheckBox, timePeriodGroupBox);
 
-            for (int midId = 1; midId < Program.LocalSettings.MidNames.Length; midId++)
+            for (MidId midId = 0; midId < MidId.Count; midId++)
             {
-                TabPage tp = new TabPage();
-                tp.Text = Program.LocalSettings.MidNames[midId];
-
-                MidOrWaterMetersCtrl ctrl = new MidOrWaterMetersCtrl();
-                ctrl.MidId = midId;
-                ctrl.Parent = this;
-                ctrl.Dock = DockStyle.Fill;
-
-                tp.Controls.Add(ctrl);
-                midsTabControl.TabPages.Add(tp);
+                int i = (int)midId;
+                midsTabControl.TabPages[i].Text = midId.ToString();
+                (midsTabControl.TabPages[i].Controls[0] as MidOrWaterMetersCtrl).MidId = midId;
+                (midsTabControl.TabPages[i].Controls[0] as MidOrWaterMetersCtrl).Parent = this;
             }
+            midsTabControl.TabPages[0].Text = Strings.Water_meters;
 
             radioButton1.Checked = true;
             timePeriodGroupBox.Enabled = false;
@@ -55,7 +50,7 @@ namespace Statistics
 
         void Localize()
         {
-            Text = string.Format("MID {0}", Strings.Statistics);
+            Text = Strings.Statistics;
             //timePeriodCheckBox.Text = Strings.Time_period;
             fromLabel1.Text = Strings.From;
             toLabel1.Text = Strings.To;
@@ -81,12 +76,12 @@ namespace Statistics
                 case 4: radioButton4.Checked = true; break;
             }
 
-            for (int i = 1; i < Program.LocalSettings.MidNames.Length; i++)
+            for (int i = 0; i < (int)MidId.Count; i++)
             {
-                (midsTabControl.TabPages[i - 1].Controls[0] as MidOrWaterMetersCtrl).Data2UI();
+                (midsTabControl.TabPages[i].Controls[0] as MidOrWaterMetersCtrl).Data2UI();
             }
 
-            for (int i = 0; i < Program.LocalSettings.ConnectionStrings.Length; i++)
+            for (int i = 0; i < LocalSettings.BenchesCount; i++)
             {
                 if (!string.IsNullOrEmpty(Program.LocalSettings.GetConnectionString(i)))
                 {
@@ -133,18 +128,18 @@ namespace Statistics
         //}
 
 
-        /// <summary>
-        /// Called by a child form.
-        /// Reads and returns results from DB required by the child form to update it's content.
-        /// </summary>
-        /// <param name="benchId">0-based bench Id.</param>
-        /// <param name="midId">1-based MID Id.</param>
-        /// <returns>Required test results</returns>
-        public IList<TestRslt> UpdateRequest(int benchId, int midId)
+        public IList<TestRslt> UpdateRequest(int benchId, MidId midId)
         {
-            if ((benchId < 0) || (benchId >= Program.LocalSettings.BenchNames.Length) || (sessionFactories[benchId] == null))
+            if ((benchId < 0) || (benchId >= LocalSettings.BenchesCount) || (sessionFactories[benchId] == null) || (midId == MidId.WaterMeters))
             {
-                MessageBox.Show(string.Format("Cannot load statistics of {0}", Program.LocalSettings.GetBenchName(benchId)));
+                if (midId == MidId.WaterMeters)
+                {
+                    MessageBox.Show("Loading statistics of water meters is not implemented yet");
+                }
+                else
+                {
+                    MessageBox.Show(string.Format("Cannot load statistics of {0}", Program.LocalSettings.GetBenchName(benchId)));
+                }
                 return null;
             }
 
@@ -169,7 +164,7 @@ namespace Statistics
             {
                 ISession session = sessionFactories[benchId].OpenSession();
                 var listOfComponentsWithFlowmeter = session.QueryOver<Components>()
-                                                           .Where(x => (x.Flowmeter == Program.LocalSettings.MidNames[midId]))
+                                                           .Where(x => (x.Flowmeter == midId.ToString()))
                                                            .List();
                 IList<TestRslt> testRslts = new List<TestRslt>();
                 foreach (var cmpnts in listOfComponentsWithFlowmeter)
@@ -253,12 +248,9 @@ namespace Statistics
             else if (radioButton4.Checked) ls.SelectedRadioButtonNumber = 4;
             else ls.SelectedRadioButtonNumber = 0;
 
-            for (int i = 1; i < Math.Min(Program.LocalSettings.MidNames.Length, midsTabControl.TabPages.Count + 1); i++)
+            for (int i = 0; i < (int)MidId.Count; i++)
             {
-                if (midsTabControl.TabPages[i - 1].Controls.Count > 0 && midsTabControl.TabPages[i - 1].Controls[0] is MidOrWaterMetersCtrl)
-                {
-                    (midsTabControl.TabPages[i - 1].Controls[0] as MidOrWaterMetersCtrl).UI2Data();
-                }
+                (midsTabControl.TabPages[i].Controls[0] as MidOrWaterMetersCtrl).UI2Data();
             }
 
             ls.Save();

Statistics/UserControls/Enums.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Statistics.UserControls
+{
+    public enum MidId
+    {
+        ///  When converted to 'int' it's the MID number, 0 = water meters
+        WaterMeters,
+        I1,
+        I2,
+        I3,
+        I4,
+        Count
+    }
+}

Statistics/UserControls/MidOrWaterMetersCtrl.Designer.cs

@@ -29,26 +29,6 @@
         private void InitializeComponent()
         {
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.flow5GroupBox = new System.Windows.Forms.GroupBox();
-            this.flow5ToExclamation = new System.Windows.Forms.Label();
-            this.flow5FromExclamation = new System.Windows.Forms.Label();
-            this.label9 = new System.Windows.Forms.Label();
-            this.label10 = new System.Windows.Forms.Label();
-            this.toLabel6 = new System.Windows.Forms.Label();
-            this.fromLabel6 = new System.Windows.Forms.Label();
-            this.flow5ToTextBox = new System.Windows.Forms.TextBox();
-            this.flow5FromTextBox = new System.Windows.Forms.TextBox();
-            this.flow5CheckBox = new System.Windows.Forms.CheckBox();
-            this.flow4GroupBox = new System.Windows.Forms.GroupBox();
-            this.flow4ToExclamation = new System.Windows.Forms.Label();
-            this.flow4FromExclamation = new System.Windows.Forms.Label();
-            this.label7 = new System.Windows.Forms.Label();
-            this.label8 = new System.Windows.Forms.Label();
-            this.toLabel5 = new System.Windows.Forms.Label();
-            this.fromLabel5 = new System.Windows.Forms.Label();
-            this.flow4ToTextBox = new System.Windows.Forms.TextBox();
-            this.flow4FromTextBox = new System.Windows.Forms.TextBox();
-            this.flow4CheckBox = new System.Windows.Forms.CheckBox();
             this.flow3GroupBox = new System.Windows.Forms.GroupBox();
             this.flow3ToExclamation = new System.Windows.Forms.Label();
             this.flow3FromExclamation = new System.Windows.Forms.Label();
@@ -80,15 +60,54 @@
             this.flow1FromTextBox = new System.Windows.Forms.TextBox();
             this.flow1CheckBox = new System.Windows.Forms.CheckBox();
             this.benchesTabControl = new System.Windows.Forms.TabControl();
+            this.tabPage1 = new System.Windows.Forms.TabPage();
+            this.tabPage2 = new System.Windows.Forms.TabPage();
+            this.tabPage3 = new System.Windows.Forms.TabPage();
+            this.tabPage4 = new System.Windows.Forms.TabPage();
+            this.tabPage5 = new System.Windows.Forms.TabPage();
+            this.tabPage6 = new System.Windows.Forms.TabPage();
+            this.flow4GroupBox = new System.Windows.Forms.GroupBox();
+            this.flow4ToExclamation = new System.Windows.Forms.Label();
+            this.flow4FromExclamation = new System.Windows.Forms.Label();
+            this.label7 = new System.Windows.Forms.Label();
+            this.label8 = new System.Windows.Forms.Label();
+            this.toLabel5 = new System.Windows.Forms.Label();
+            this.fromLabel5 = new System.Windows.Forms.Label();
+            this.flow4ToTextBox = new System.Windows.Forms.TextBox();
+            this.flow4FromTextBox = new System.Windows.Forms.TextBox();
+            this.flow4CheckBox = new System.Windows.Forms.CheckBox();
+            this.flow5GroupBox = new System.Windows.Forms.GroupBox();
+            this.flow5ToExclamation = new System.Windows.Forms.Label();
+            this.flow5FromExclamation = new System.Windows.Forms.Label();
+            this.label9 = new System.Windows.Forms.Label();
+            this.label10 = new System.Windows.Forms.Label();
+            this.toLabel6 = new System.Windows.Forms.Label();
+            this.fromLabel6 = new System.Windows.Forms.Label();
+            this.flow5ToTextBox = new System.Windows.Forms.TextBox();
+            this.flow5FromTextBox = new System.Windows.Forms.TextBox();
+            this.flow5CheckBox = new System.Windows.Forms.CheckBox();
+            this.wr10StatisticsCtrl1 = new Statistics.UserControls.StatisticsCtrl();
+            this.wr11StatisticsCtrl = new Statistics.UserControls.StatisticsCtrl();
+            this.wr13StatisticsCtrl = new Statistics.UserControls.StatisticsCtrl();
+            this.wr14StatisticsCtrl = new Statistics.UserControls.StatisticsCtrl();
+            this.wr15StatisticsCtrl = new Statistics.UserControls.StatisticsCtrl();
+            this.pt7StatisticsCtrl = new Statistics.UserControls.StatisticsCtrl();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
             this.splitContainer1.Panel2.SuspendLayout();
             this.splitContainer1.SuspendLayout();
-            this.flow5GroupBox.SuspendLayout();
-            this.flow4GroupBox.SuspendLayout();
             this.flow3GroupBox.SuspendLayout();
             this.flow2GroupBox.SuspendLayout();
             this.flow1GroupBox.SuspendLayout();
+            this.benchesTabControl.SuspendLayout();
+            this.tabPage1.SuspendLayout();
+            this.tabPage2.SuspendLayout();
+            this.tabPage3.SuspendLayout();
+            this.tabPage4.SuspendLayout();
+            this.tabPage5.SuspendLayout();
+            this.tabPage6.SuspendLayout();
+            this.flow4GroupBox.SuspendLayout();
+            this.flow5GroupBox.SuspendLayout();
             this.SuspendLayout();
             // 
             // splitContainer1
@@ -115,210 +134,6 @@
             this.splitContainer1.SplitterDistance = 90;
             this.splitContainer1.TabIndex = 0;
             // 
-            // flow5GroupBox
-            // 
-            this.flow5GroupBox.Controls.Add(this.flow5ToExclamation);
-            this.flow5GroupBox.Controls.Add(this.flow5FromExclamation);
-            this.flow5GroupBox.Controls.Add(this.label9);
-            this.flow5GroupBox.Controls.Add(this.label10);
-            this.flow5GroupBox.Controls.Add(this.toLabel6);
-            this.flow5GroupBox.Controls.Add(this.fromLabel6);
-            this.flow5GroupBox.Controls.Add(this.flow5ToTextBox);
-            this.flow5GroupBox.Controls.Add(this.flow5FromTextBox);
-            this.flow5GroupBox.Controls.Add(this.flow5CheckBox);
-            this.flow5GroupBox.Location = new System.Drawing.Point(939, 7);
-            this.flow5GroupBox.Name = "flow5GroupBox";
-            this.flow5GroupBox.Size = new System.Drawing.Size(221, 77);
-            this.flow5GroupBox.TabIndex = 8;
-            this.flow5GroupBox.TabStop = false;
-            // 
-            // flow5ToExclamation
-            // 
-            this.flow5ToExclamation.AutoSize = true;
-            this.flow5ToExclamation.ForeColor = System.Drawing.Color.Red;
-            this.flow5ToExclamation.Location = new System.Drawing.Point(167, 48);
-            this.flow5ToExclamation.Name = "flow5ToExclamation";
-            this.flow5ToExclamation.Size = new System.Drawing.Size(10, 13);
-            this.flow5ToExclamation.TabIndex = 9;
-            this.flow5ToExclamation.Text = "!";
-            this.flow5ToExclamation.Visible = false;
-            // 
-            // flow5FromExclamation
-            // 
-            this.flow5FromExclamation.AutoSize = true;
-            this.flow5FromExclamation.ForeColor = System.Drawing.Color.Red;
-            this.flow5FromExclamation.Location = new System.Drawing.Point(167, 24);
-            this.flow5FromExclamation.Name = "flow5FromExclamation";
-            this.flow5FromExclamation.Size = new System.Drawing.Size(10, 13);
-            this.flow5FromExclamation.TabIndex = 8;
-            this.flow5FromExclamation.Text = "!";
-            this.flow5FromExclamation.Visible = false;
-            // 
-            // label9
-            // 
-            this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(178, 48);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(32, 13);
-            this.label9.TabIndex = 6;
-            this.label9.Text = "m3/h";
-            // 
-            // label10
-            // 
-            this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(177, 23);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(32, 13);
-            this.label10.TabIndex = 5;
-            this.label10.Text = "m3/h";
-            // 
-            // toLabel6
-            // 
-            this.toLabel6.AutoSize = true;
-            this.toLabel6.Location = new System.Drawing.Point(14, 48);
-            this.toLabel6.Name = "toLabel6";
-            this.toLabel6.Size = new System.Drawing.Size(20, 13);
-            this.toLabel6.TabIndex = 4;
-            this.toLabel6.Text = "To";
-            // 
-            // fromLabel6
-            // 
-            this.fromLabel6.AutoSize = true;
-            this.fromLabel6.Location = new System.Drawing.Point(14, 23);
-            this.fromLabel6.Name = "fromLabel6";
-            this.fromLabel6.Size = new System.Drawing.Size(30, 13);
-            this.fromLabel6.TabIndex = 3;
-            this.fromLabel6.Text = "From";
-            // 
-            // flow5ToTextBox
-            // 
-            this.flow5ToTextBox.Location = new System.Drawing.Point(65, 45);
-            this.flow5ToTextBox.Name = "flow5ToTextBox";
-            this.flow5ToTextBox.Size = new System.Drawing.Size(100, 20);
-            this.flow5ToTextBox.TabIndex = 2;
-            this.flow5ToTextBox.TextChanged += new System.EventHandler(this.flow5ToTextBox_TextChanged);
-            // 
-            // flow5FromTextBox
-            // 
-            this.flow5FromTextBox.Location = new System.Drawing.Point(65, 20);
-            this.flow5FromTextBox.Name = "flow5FromTextBox";
-            this.flow5FromTextBox.Size = new System.Drawing.Size(100, 20);
-            this.flow5FromTextBox.TabIndex = 1;
-            this.flow5FromTextBox.TextChanged += new System.EventHandler(this.flow5FromTextBox_TextChanged);
-            // 
-            // flow5CheckBox
-            // 
-            this.flow5CheckBox.AutoSize = true;
-            this.flow5CheckBox.Location = new System.Drawing.Point(10, 0);
-            this.flow5CheckBox.Name = "flow5CheckBox";
-            this.flow5CheckBox.Size = new System.Drawing.Size(57, 17);
-            this.flow5CheckBox.TabIndex = 0;
-            this.flow5CheckBox.Text = "Flow 5";
-            this.flow5CheckBox.UseVisualStyleBackColor = true;
-            this.flow5CheckBox.CheckedChanged += new System.EventHandler(this.flow5CheckBox_CheckedChanged);
-            // 
-            // flow4GroupBox
-            // 
-            this.flow4GroupBox.Controls.Add(this.flow4ToExclamation);
-            this.flow4GroupBox.Controls.Add(this.flow4FromExclamation);
-            this.flow4GroupBox.Controls.Add(this.label7);
-            this.flow4GroupBox.Controls.Add(this.label8);
-            this.flow4GroupBox.Controls.Add(this.toLabel5);
-            this.flow4GroupBox.Controls.Add(this.fromLabel5);
-            this.flow4GroupBox.Controls.Add(this.flow4ToTextBox);
-            this.flow4GroupBox.Controls.Add(this.flow4FromTextBox);
-            this.flow4GroupBox.Controls.Add(this.flow4CheckBox);
-            this.flow4GroupBox.Location = new System.Drawing.Point(706, 7);
-            this.flow4GroupBox.Name = "flow4GroupBox";
-            this.flow4GroupBox.Size = new System.Drawing.Size(221, 77);
-            this.flow4GroupBox.TabIndex = 7;
-            this.flow4GroupBox.TabStop = false;
-            // 
-            // flow4ToExclamation
-            // 
-            this.flow4ToExclamation.AutoSize = true;
-            this.flow4ToExclamation.ForeColor = System.Drawing.Color.Red;
-            this.flow4ToExclamation.Location = new System.Drawing.Point(167, 48);
-            this.flow4ToExclamation.Name = "flow4ToExclamation";
-            this.flow4ToExclamation.Size = new System.Drawing.Size(10, 13);
-            this.flow4ToExclamation.TabIndex = 9;
-            this.flow4ToExclamation.Text = "!";
-            this.flow4ToExclamation.Visible = false;
-            // 
-            // flow4FromExclamation
-            // 
-            this.flow4FromExclamation.AutoSize = true;
-            this.flow4FromExclamation.ForeColor = System.Drawing.Color.Red;
-            this.flow4FromExclamation.Location = new System.Drawing.Point(167, 24);
-            this.flow4FromExclamation.Name = "flow4FromExclamation";
-            this.flow4FromExclamation.Size = new System.Drawing.Size(10, 13);
-            this.flow4FromExclamation.TabIndex = 8;
-            this.flow4FromExclamation.Text = "!";
-            this.flow4FromExclamation.Visible = false;
-            // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(178, 48);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(32, 13);
-            this.label7.TabIndex = 6;
-            this.label7.Text = "m3/h";
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(177, 23);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(32, 13);
-            this.label8.TabIndex = 5;
-            this.label8.Text = "m3/h";
-            // 
-            // toLabel5
-            // 
-            this.toLabel5.AutoSize = true;
-            this.toLabel5.Location = new System.Drawing.Point(14, 48);
-            this.toLabel5.Name = "toLabel5";
-            this.toLabel5.Size = new System.Drawing.Size(20, 13);
-            this.toLabel5.TabIndex = 4;
-            this.toLabel5.Text = "To";
-            // 
-            // fromLabel5
-            // 
-            this.fromLabel5.AutoSize = true;
-            this.fromLabel5.Location = new System.Drawing.Point(14, 23);
-            this.fromLabel5.Name = "fromLabel5";
-            this.fromLabel5.Size = new System.Drawing.Size(30, 13);
-            this.fromLabel5.TabIndex = 3;
-            this.fromLabel5.Text = "From";
-            // 
-            // flow4ToTextBox
-            // 
-            this.flow4ToTextBox.Location = new System.Drawing.Point(65, 45);
-            this.flow4ToTextBox.Name = "flow4ToTextBox";
-            this.flow4ToTextBox.Size = new System.Drawing.Size(100, 20);
-            this.flow4ToTextBox.TabIndex = 2;
-            this.flow4ToTextBox.TextChanged += new System.EventHandler(this.flow4ToTextBox_TextChanged);
-            // 
-            // flow4FromTextBox
-            // 
-            this.flow4FromTextBox.Location = new System.Drawing.Point(65, 20);
-            this.flow4FromTextBox.Name = "flow4FromTextBox";
-            this.flow4FromTextBox.Size = new System.Drawing.Size(100, 20);
-            this.flow4FromTextBox.TabIndex = 1;
-            this.flow4FromTextBox.TextChanged += new System.EventHandler(this.flow4FromTextBox_TextChanged);
-            // 
-            // flow4CheckBox
-            // 
-            this.flow4CheckBox.AutoSize = true;
-            this.flow4CheckBox.Location = new System.Drawing.Point(10, 0);
-            this.flow4CheckBox.Name = "flow4CheckBox";
-            this.flow4CheckBox.Size = new System.Drawing.Size(57, 17);
-            this.flow4CheckBox.TabIndex = 0;
-            this.flow4CheckBox.Text = "Flow 4";
-            this.flow4CheckBox.UseVisualStyleBackColor = true;
-            this.flow4CheckBox.CheckedChanged += new System.EventHandler(this.flow4CheckBox_CheckedChanged);
-            // 
             // flow3GroupBox
             // 
             this.flow3GroupBox.Controls.Add(this.flow3ToExclamation);
@@ -627,6 +442,12 @@
             // 
             // benchesTabControl
             // 
+            this.benchesTabControl.Controls.Add(this.tabPage1);
+            this.benchesTabControl.Controls.Add(this.tabPage2);
+            this.benchesTabControl.Controls.Add(this.tabPage3);
+            this.benchesTabControl.Controls.Add(this.tabPage4);
+            this.benchesTabControl.Controls.Add(this.tabPage5);
+            this.benchesTabControl.Controls.Add(this.tabPage6);
             this.benchesTabControl.Dock = System.Windows.Forms.DockStyle.Fill;
             this.benchesTabControl.Location = new System.Drawing.Point(0, 0);
             this.benchesTabControl.Name = "benchesTabControl";
@@ -634,6 +455,320 @@
             this.benchesTabControl.Size = new System.Drawing.Size(1202, 356);
             this.benchesTabControl.TabIndex = 0;
             // 
+            // tabPage1
+            // 
+            this.tabPage1.Controls.Add(this.wr10StatisticsCtrl1);
+            this.tabPage1.Location = new System.Drawing.Point(4, 22);
+            this.tabPage1.Name = "tabPage1";
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage1.Size = new System.Drawing.Size(1194, 330);
+            this.tabPage1.TabIndex = 0;
+            this.tabPage1.Text = "WR10";
+            this.tabPage1.UseVisualStyleBackColor = true;
+            // 
+            // tabPage2
+            // 
+            this.tabPage2.Controls.Add(this.wr11StatisticsCtrl);
+            this.tabPage2.Location = new System.Drawing.Point(4, 22);
+            this.tabPage2.Name = "tabPage2";
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage2.Size = new System.Drawing.Size(1194, 330);
+            this.tabPage2.TabIndex = 1;
+            this.tabPage2.Text = "WR11";
+            this.tabPage2.UseVisualStyleBackColor = true;
+            // 
+            // tabPage3
+            // 
+            this.tabPage3.Controls.Add(this.wr13StatisticsCtrl);
+            this.tabPage3.Location = new System.Drawing.Point(4, 22);
+            this.tabPage3.Name = "tabPage3";
+            this.tabPage3.Size = new System.Drawing.Size(1194, 330);
+            this.tabPage3.TabIndex = 2;
+            this.tabPage3.Text = "WR13";
+            this.tabPage3.UseVisualStyleBackColor = true;
+            // 
+            // tabPage4
+            // 
+            this.tabPage4.Controls.Add(this.wr14StatisticsCtrl);
+            this.tabPage4.Location = new System.Drawing.Point(4, 22);
+            this.tabPage4.Name = "tabPage4";
+            this.tabPage4.Size = new System.Drawing.Size(1194, 330);
+            this.tabPage4.TabIndex = 3;
+            this.tabPage4.Text = "WR14";
+            this.tabPage4.UseVisualStyleBackColor = true;
+            // 
+            // tabPage5
+            // 
+            this.tabPage5.Controls.Add(this.wr15StatisticsCtrl);
+            this.tabPage5.Location = new System.Drawing.Point(4, 22);
+            this.tabPage5.Name = "tabPage5";
+            this.tabPage5.Size = new System.Drawing.Size(1194, 330);
+            this.tabPage5.TabIndex = 4;
+            this.tabPage5.Text = "WR15";
+            this.tabPage5.UseVisualStyleBackColor = true;
+            // 
+            // tabPage6
+            // 
+            this.tabPage6.Controls.Add(this.pt7StatisticsCtrl);
+            this.tabPage6.Location = new System.Drawing.Point(4, 22);
+            this.tabPage6.Name = "tabPage6";
+            this.tabPage6.Size = new System.Drawing.Size(1194, 330);
+            this.tabPage6.TabIndex = 5;
+            this.tabPage6.Text = "PT7";
+            this.tabPage6.UseVisualStyleBackColor = true;
+            // 
+            // flow4GroupBox
+            // 
+            this.flow4GroupBox.Controls.Add(this.flow4ToExclamation);
+            this.flow4GroupBox.Controls.Add(this.flow4FromExclamation);
+            this.flow4GroupBox.Controls.Add(this.label7);
+            this.flow4GroupBox.Controls.Add(this.label8);
+            this.flow4GroupBox.Controls.Add(this.toLabel5);
+            this.flow4GroupBox.Controls.Add(this.fromLabel5);
+            this.flow4GroupBox.Controls.Add(this.flow4ToTextBox);
+            this.flow4GroupBox.Controls.Add(this.flow4FromTextBox);
+            this.flow4GroupBox.Controls.Add(this.flow4CheckBox);
+            this.flow4GroupBox.Location = new System.Drawing.Point(706, 7);
+            this.flow4GroupBox.Name = "flow4GroupBox";
+            this.flow4GroupBox.Size = new System.Drawing.Size(221, 77);
+            this.flow4GroupBox.TabIndex = 7;
+            this.flow4GroupBox.TabStop = false;
+            // 
+            // flow4ToExclamation
+            // 
+            this.flow4ToExclamation.AutoSize = true;
+            this.flow4ToExclamation.ForeColor = System.Drawing.Color.Red;
+            this.flow4ToExclamation.Location = new System.Drawing.Point(167, 48);
+            this.flow4ToExclamation.Name = "flow4ToExclamation";
+            this.flow4ToExclamation.Size = new System.Drawing.Size(10, 13);
+            this.flow4ToExclamation.TabIndex = 9;
+            this.flow4ToExclamation.Text = "!";
+            this.flow4ToExclamation.Visible = false;
+            // 
+            // flow4FromExclamation
+            // 
+            this.flow4FromExclamation.AutoSize = true;
+            this.flow4FromExclamation.ForeColor = System.Drawing.Color.Red;
+            this.flow4FromExclamation.Location = new System.Drawing.Point(167, 24);
+            this.flow4FromExclamation.Name = "flow4FromExclamation";
+            this.flow4FromExclamation.Size = new System.Drawing.Size(10, 13);
+            this.flow4FromExclamation.TabIndex = 8;
+            this.flow4FromExclamation.Text = "!";
+            this.flow4FromExclamation.Visible = false;
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Location = new System.Drawing.Point(178, 48);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(32, 13);
+            this.label7.TabIndex = 6;
+            this.label7.Text = "m3/h";
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Location = new System.Drawing.Point(177, 23);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(32, 13);
+            this.label8.TabIndex = 5;
+            this.label8.Text = "m3/h";
+            // 
+            // toLabel5
+            // 
+            this.toLabel5.AutoSize = true;
+            this.toLabel5.Location = new System.Drawing.Point(14, 48);
+            this.toLabel5.Name = "toLabel5";
+            this.toLabel5.Size = new System.Drawing.Size(20, 13);
+            this.toLabel5.TabIndex = 4;
+            this.toLabel5.Text = "To";
+            // 
+            // fromLabel5
+            // 
+            this.fromLabel5.AutoSize = true;
+            this.fromLabel5.Location = new System.Drawing.Point(14, 23);
+            this.fromLabel5.Name = "fromLabel5";
+            this.fromLabel5.Size = new System.Drawing.Size(30, 13);
+            this.fromLabel5.TabIndex = 3;
+            this.fromLabel5.Text = "From";
+            // 
+            // flow4ToTextBox
+            // 
+            this.flow4ToTextBox.Location = new System.Drawing.Point(65, 45);
+            this.flow4ToTextBox.Name = "flow4ToTextBox";
+            this.flow4ToTextBox.Size = new System.Drawing.Size(100, 20);
+            this.flow4ToTextBox.TabIndex = 2;
+            this.flow4ToTextBox.TextChanged += new System.EventHandler(this.flow4ToTextBox_TextChanged);
+            // 
+            // flow4FromTextBox
+            // 
+            this.flow4FromTextBox.Location = new System.Drawing.Point(65, 20);
+            this.flow4FromTextBox.Name = "flow4FromTextBox";
+            this.flow4FromTextBox.Size = new System.Drawing.Size(100, 20);
+            this.flow4FromTextBox.TabIndex = 1;
+            this.flow4FromTextBox.TextChanged += new System.EventHandler(this.flow4FromTextBox_TextChanged);
+            // 
+            // flow4CheckBox
+            // 
+            this.flow4CheckBox.AutoSize = true;
+            this.flow4CheckBox.Location = new System.Drawing.Point(10, 0);
+            this.flow4CheckBox.Name = "flow4CheckBox";
+            this.flow4CheckBox.Size = new System.Drawing.Size(57, 17);
+            this.flow4CheckBox.TabIndex = 0;
+            this.flow4CheckBox.Text = "Flow 4";
+            this.flow4CheckBox.UseVisualStyleBackColor = true;
+            this.flow4CheckBox.CheckedChanged += new System.EventHandler(this.flow4CheckBox_CheckedChanged);
+            // 
+            // flow5GroupBox
+            // 
+            this.flow5GroupBox.Controls.Add(this.flow5ToExclamation);
+            this.flow5GroupBox.Controls.Add(this.flow5FromExclamation);
+            this.flow5GroupBox.Controls.Add(this.label9);
+            this.flow5GroupBox.Controls.Add(this.label10);
+            this.flow5GroupBox.Controls.Add(this.toLabel6);
+            this.flow5GroupBox.Controls.Add(this.fromLabel6);
+            this.flow5GroupBox.Controls.Add(this.flow5ToTextBox);
+            this.flow5GroupBox.Controls.Add(this.flow5FromTextBox);
+            this.flow5GroupBox.Controls.Add(this.flow5CheckBox);
+            this.flow5GroupBox.Location = new System.Drawing.Point(939, 7);
+            this.flow5GroupBox.Name = "flow5GroupBox";
+            this.flow5GroupBox.Size = new System.Drawing.Size(221, 77);
+            this.flow5GroupBox.TabIndex = 8;
+            this.flow5GroupBox.TabStop = false;
+            // 
+            // flow5ToExclamation
+            // 
+            this.flow5ToExclamation.AutoSize = true;
+            this.flow5ToExclamation.ForeColor = System.Drawing.Color.Red;
+            this.flow5ToExclamation.Location = new System.Drawing.Point(167, 48);
+            this.flow5ToExclamation.Name = "flow5ToExclamation";
+            this.flow5ToExclamation.Size = new System.Drawing.Size(10, 13);
+            this.flow5ToExclamation.TabIndex = 9;
+            this.flow5ToExclamation.Text = "!";
+            this.flow5ToExclamation.Visible = false;
+            // 
+            // flow5FromExclamation
+            // 
+            this.flow5FromExclamation.AutoSize = true;
+            this.flow5FromExclamation.ForeColor = System.Drawing.Color.Red;
+            this.flow5FromExclamation.Location = new System.Drawing.Point(167, 24);
+            this.flow5FromExclamation.Name = "flow5FromExclamation";
+            this.flow5FromExclamation.Size = new System.Drawing.Size(10, 13);
+            this.flow5FromExclamation.TabIndex = 8;
+            this.flow5FromExclamation.Text = "!";
+            this.flow5FromExclamation.Visible = false;
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.Location = new System.Drawing.Point(178, 48);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(32, 13);
+            this.label9.TabIndex = 6;
+            this.label9.Text = "m3/h";
+            // 
+            // label10
+            // 
+            this.label10.AutoSize = true;
+            this.label10.Location = new System.Drawing.Point(177, 23);
+            this.label10.Name = "label10";
+            this.label10.Size = new System.Drawing.Size(32, 13);
+            this.label10.TabIndex = 5;
+            this.label10.Text = "m3/h";
+            // 
+            // toLabel6
+            // 
+            this.toLabel6.AutoSize = true;
+            this.toLabel6.Location = new System.Drawing.Point(14, 48);
+            this.toLabel6.Name = "toLabel6";
+            this.toLabel6.Size = new System.Drawing.Size(20, 13);
+            this.toLabel6.TabIndex = 4;
+            this.toLabel6.Text = "To";
+            // 
+            // fromLabel6
+            // 
+            this.fromLabel6.AutoSize = true;
+            this.fromLabel6.Location = new System.Drawing.Point(14, 23);
+            this.fromLabel6.Name = "fromLabel6";
+            this.fromLabel6.Size = new System.Drawing.Size(30, 13);
+            this.fromLabel6.TabIndex = 3;
+            this.fromLabel6.Text = "From";
+            // 
+            // flow5ToTextBox
+            // 
+            this.flow5ToTextBox.Location = new System.Drawing.Point(65, 45);
+            this.flow5ToTextBox.Name = "flow5ToTextBox";
+            this.flow5ToTextBox.Size = new System.Drawing.Size(100, 20);
+            this.flow5ToTextBox.TabIndex = 2;
+            this.flow5ToTextBox.TextChanged += new System.EventHandler(this.flow5ToTextBox_TextChanged);
+            // 
+            // flow5FromTextBox
+            // 
+            this.flow5FromTextBox.Location = new System.Drawing.Point(65, 20);
+            this.flow5FromTextBox.Name = "flow5FromTextBox";
+            this.flow5FromTextBox.Size = new System.Drawing.Size(100, 20);
+            this.flow5FromTextBox.TabIndex = 1;
+            this.flow5FromTextBox.TextChanged += new System.EventHandler(this.flow5FromTextBox_TextChanged);
+            // 
+            // flow5CheckBox
+            // 
+            this.flow5CheckBox.AutoSize = true;
+            this.flow5CheckBox.Location = new System.Drawing.Point(10, 0);
+            this.flow5CheckBox.Name = "flow5CheckBox";
+            this.flow5CheckBox.Size = new System.Drawing.Size(57, 17);
+            this.flow5CheckBox.TabIndex = 0;
+            this.flow5CheckBox.Text = "Flow 5";
+            this.flow5CheckBox.UseVisualStyleBackColor = true;
+            this.flow5CheckBox.CheckedChanged += new System.EventHandler(this.flow5CheckBox_CheckedChanged);
+            // 
+            // wr10StatisticsCtrl1
+            // 
+            this.wr10StatisticsCtrl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.wr10StatisticsCtrl1.Location = new System.Drawing.Point(3, 3);
+            this.wr10StatisticsCtrl1.Name = "wr10StatisticsCtrl1";
+            this.wr10StatisticsCtrl1.Size = new System.Drawing.Size(1188, 324);
+            this.wr10StatisticsCtrl1.TabIndex = 0;
+            // 
+            // wr11StatisticsCtrl
+            // 
+            this.wr11StatisticsCtrl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.wr11StatisticsCtrl.Location = new System.Drawing.Point(3, 3);
+            this.wr11StatisticsCtrl.Name = "wr11StatisticsCtrl";
+            this.wr11StatisticsCtrl.Size = new System.Drawing.Size(1188, 324);
+            this.wr11StatisticsCtrl.TabIndex = 0;
+            // 
+            // wr13StatisticsCtrl
+            // 
+            this.wr13StatisticsCtrl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.wr13StatisticsCtrl.Location = new System.Drawing.Point(0, 0);
+            this.wr13StatisticsCtrl.Name = "wr13StatisticsCtrl";
+            this.wr13StatisticsCtrl.Size = new System.Drawing.Size(1194, 330);
+            this.wr13StatisticsCtrl.TabIndex = 0;
+            // 
+            // wr14StatisticsCtrl
+            // 
+            this.wr14StatisticsCtrl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.wr14StatisticsCtrl.Location = new System.Drawing.Point(0, 0);
+            this.wr14StatisticsCtrl.Name = "wr14StatisticsCtrl";
+            this.wr14StatisticsCtrl.Size = new System.Drawing.Size(1194, 330);
+            this.wr14StatisticsCtrl.TabIndex = 0;
+            // 
+            // wr15StatisticsCtrl
+            // 
+            this.wr15StatisticsCtrl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.wr15StatisticsCtrl.Location = new System.Drawing.Point(0, 0);
+            this.wr15StatisticsCtrl.Name = "wr15StatisticsCtrl";
+            this.wr15StatisticsCtrl.Size = new System.Drawing.Size(1194, 330);
+            this.wr15StatisticsCtrl.TabIndex = 0;
+            // 
+            // pt7StatisticsCtrl
+            // 
+            this.pt7StatisticsCtrl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pt7StatisticsCtrl.Location = new System.Drawing.Point(0, 0);
+            this.pt7StatisticsCtrl.Name = "pt7StatisticsCtrl";
+            this.pt7StatisticsCtrl.Size = new System.Drawing.Size(1194, 330);
+            this.pt7StatisticsCtrl.TabIndex = 0;
+            // 
             // MidOrWaterMetersCtrl
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -645,16 +780,23 @@
             this.splitContainer1.Panel2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
             this.splitContainer1.ResumeLayout(false);
-            this.flow5GroupBox.ResumeLayout(false);
-            this.flow5GroupBox.PerformLayout();
-            this.flow4GroupBox.ResumeLayout(false);
-            this.flow4GroupBox.PerformLayout();
             this.flow3GroupBox.ResumeLayout(false);
             this.flow3GroupBox.PerformLayout();
             this.flow2GroupBox.ResumeLayout(false);
             this.flow2GroupBox.PerformLayout();
             this.flow1GroupBox.ResumeLayout(false);
             this.flow1GroupBox.PerformLayout();
+            this.benchesTabControl.ResumeLayout(false);
+            this.tabPage1.ResumeLayout(false);
+            this.tabPage2.ResumeLayout(false);
+            this.tabPage3.ResumeLayout(false);
+            this.tabPage4.ResumeLayout(false);
+            this.tabPage5.ResumeLayout(false);
+            this.tabPage6.ResumeLayout(false);
+            this.flow4GroupBox.ResumeLayout(false);
+            this.flow4GroupBox.PerformLayout();
+            this.flow5GroupBox.ResumeLayout(false);
+            this.flow5GroupBox.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -663,6 +805,18 @@
 
         private System.Windows.Forms.SplitContainer splitContainer1;
         private System.Windows.Forms.TabControl benchesTabControl;
+        private System.Windows.Forms.TabPage tabPage1;
+        private System.Windows.Forms.TabPage tabPage2;
+        private System.Windows.Forms.TabPage tabPage3;
+        private System.Windows.Forms.TabPage tabPage4;
+        private System.Windows.Forms.TabPage tabPage5;
+        private System.Windows.Forms.TabPage tabPage6;
+        private StatisticsCtrl wr10StatisticsCtrl1;
+        private StatisticsCtrl wr11StatisticsCtrl;
+        private StatisticsCtrl wr13StatisticsCtrl;
+        private StatisticsCtrl wr14StatisticsCtrl;
+        private StatisticsCtrl wr15StatisticsCtrl;
+        private StatisticsCtrl pt7StatisticsCtrl;
         private System.Windows.Forms.GroupBox flow3GroupBox;
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Label label4;

Statistics/UserControls/MidOrWaterMetersCtrl.cs

@@ -13,7 +13,7 @@ namespace Statistics.UserControls
 {
     public partial class MidOrWaterMetersCtrl : UserControl
     {
-        public int MidId;               /// 1-based MID Id.
+        public MidId MidId;
         public StatisticsDlg Parent;
 
 
@@ -96,16 +96,14 @@ namespace Statistics.UserControls
             ManageCheckGroupBox(flow4CheckBox, flow4GroupBox);
             ManageCheckGroupBox(flow5CheckBox, flow5GroupBox);
 
-            for (int i = 0; i < Program.LocalSettings.BenchNames.Length; i++)
+            for (int i = 0; i < benchesTabControl.TabPages.Count; i++ )
             {
-                TabPage tp = new TabPage();
-                tp.Text = Program.LocalSettings.BenchNames[i];
-                StatisticsCtrl statistics = new StatisticsCtrl();
-                statistics.Id = i;
-                statistics.MidCtrl = this;
-                statistics.Dock = DockStyle.Fill;
-                tp.Controls.Add(statistics);
-                benchesTabControl.TabPages.Add(tp);
+                TabPage tp = benchesTabControl.TabPages[i];
+                if ((tp.Controls.Count > 0) && (tp.Controls[0] is StatisticsCtrl))
+                {
+                    (tp.Controls[0] as StatisticsCtrl).Id = i;
+                    (tp.Controls[0] as StatisticsCtrl).MidCtrl = this;
+                }
             }
         }
 

TBF/BenchControl/Ambient/Comet/Ambient.cs

@@ -27,13 +27,16 @@ namespace TBF.BenchControl.Ambient.Comet
 
 		/// <summary>The state of the measurement</summary>
 		MsrmntState msrmntState;
-        int msrmntTimeStamp;
 
+        ///
 		/// Measured values when MsrmntState == MsrmntState.Valid
+        ///
         float temperature;      /// [°C]
         float pressure;         /// [bar]
         float humidity;         /// [R%]
 
+		/// <summary>Measurement time stamp when MsrmntState == MsrmntState.Valid</summary>
+		int msrmntTimeStamp;
 
 		public Ambient()
 		{
@@ -61,7 +64,6 @@ namespace TBF.BenchControl.Ambient.Comet
 				temperature = 20.0f;
 				humidity = 40.0f;
 				pressure = 1.0f;
-
 				msrmntTimeStamp = StateMachine.Time;
 				msrmntState = MsrmntState.Valid;
 				return;
@@ -71,9 +73,7 @@ namespace TBF.BenchControl.Ambient.Comet
 			serialPort = new SerialPort(comPortName, ambientCfg.BaudRate, ambientCfg.Parity, ambientCfg.DataBits, ambientCfg.StopBits);
 			serialPort.Handshake = ambientCfg.Handshake;
 			serialPort.Open();
-
-            msrmntTimeStamp = 0;
-            msrmntState = MsrmntState.Busy;
+			msrmntState = MsrmntState.Busy;
 
             log.FatalFormat("Successfully initialized device {0}", ToString());
         }
@@ -81,103 +81,114 @@ namespace TBF.BenchControl.Ambient.Comet
         /// <summary>Run this device</summary>
         public void RunDeviceBefore()
         {
-            if ((ambientCfg.DebugLevel == DebugMode.Normal) && (serialPort != null))
-            {
-                ///
-                /// Read response
-                /// 
-                try
-                {
-                    int receivedBytes = serialPort.BytesToRead;
+			if (ambientCfg.DebugLevel == DebugMode.Simulate ||
+				ambientCfg.DebugLevel == DebugMode.FailureDuringOperation)
+			{
+				msrmntTimeStamp = StateMachine.Time;
+				return;
+			}
 
-                    if (receivedBytes >= 13)
-                    {
-                        byte[] byteArr = new byte[receivedBytes];
-                        for (int i = 0; i < receivedBytes; i++) byteArr[i] = (byte)serialPort.ReadByte();
-                        log.Debug(Telegram.LogTelegram("Received ", byteArr));
+			if (serialPort == null)
+			{
+				log.ErrorFormat("{0} - RunDeviceBefore() - serial port closed", Name);
+				return;
+			}
 
-                        if ((receivedBytes == 13) && (byteArr[0] == 1) && (byteArr[1] == 3) && (byteArr[2] == 8) && Telegram.VerifyTelegramCRC(byteArr))
-                        {
-                            int value = (int)byteArr[3] * 256 + (int)byteArr[4];
-                            temperature = (float)value / 10.0f;
+			try
+			{
+				int receivedBytes = serialPort.BytesToRead;
 
-                            value = (int)byteArr[5] * 256 + (int)byteArr[6];
-                            humidity = (float)value / 10.0f;
+				if (receivedBytes >= 13)
+				{
+					byte[] byteArr = new byte[receivedBytes];
+					for (int i = 0; i < receivedBytes; i++) byteArr[i] = (byte)serialPort.ReadByte();
+					log.Debug(Telegram.LogTelegram("Received ", byteArr));
 
-                            value = (int)byteArr[9] * 256 + (int)byteArr[10];
-                            pressure = (float)value / 10000.0f;
+					if ((receivedBytes == 13) && (byteArr[0] == 1) && (byteArr[1] == 3) && (byteArr[2] == 8) && Telegram.VerifyTelegramCRC(byteArr))
+					{
+						int value = (int)byteArr[3] * 256 + (int)byteArr[4];
+						temperature = (float)value / 10.0f;
 
-                            UpdateProcessData(temperature, pressure, humidity);
-                            msrmntTimeStamp = StateMachine.Time;
-                            msrmntState = MsrmntState.Valid;
-                            log.InfoFormat("Ambient: temperature = {0:F1} C, humidity = {1:F1} %, pressure = {2:F0} mbar", temperature, humidity, 1000 * pressure);
-                        }
+						value = (int)byteArr[5] * 256 + (int)byteArr[6];
+						humidity = (float)value / 10.0f;
+
+						value = (int)byteArr[9] * 256 + (int)byteArr[10];
+						pressure = (float)value / 10000.0f;
+
+						msrmntTimeStamp = StateMachine.Time;
+						msrmntState = MsrmntState.Valid;
+                        log.InfoFormat("Ambient: temperature = {0:F1} C, humidity = {1:F1} %, pressure = {2:F0} mbar", temperature, humidity, 1000 * pressure);
                     }
-                }
-                catch (Exception e)
-                {
-                    DebugLevel = DebugMode.FailureDuringOperation;
-                    //serialPort.Close();   /// ?
-                    serialPort = null;
+				}
+			}
+			catch (Exception e)
+			{
+				DebugLevel = DebugMode.FailureDuringOperation;
+				serialPort = null;
 
-                    log.FatalFormat("Ambient: Serial port read failure : {0}", e.Message);
-                    if (e.InnerException != null)
-                    {
-                        log.FatalFormat("InnerMessage : {0}", e.InnerException.Message);
-                    }
-                }
-            }
+				log.FatalFormat("Ambient: Serail port read failure : {0}", e.Message);
+				if (e.InnerException != null)
+				{
+					log.FatalFormat("InnerMessage : {0}", e.InnerException.Message);
+				}
+			}
 		}
 
         /// <summary>Run this device</summary>
         public void RunDeviceAfter()
         {
-            if ((ambientCfg.DebugLevel == DebugMode.Normal) && (serialPort != null))
-            {
-                if ((StateMachine.Time % 10) == 0)
-                {
-                    ///
-                    /// Send request once per 10 seconds
-                    ///
-                    try
-                    {
-                        /// Read four registers: 0x31, 0x32, 0x33, 0x34
-                        UInt16 regAddr = 0x0030;    /// register addr. = 0x31 (Modbus!)
-                        UInt16 count = 4;
+			if (ambientCfg.DebugLevel == DebugMode.Simulate ||
+				ambientCfg.DebugLevel == DebugMode.FailureDuringOperation)
+			{
+				return;
+			}
 
-                        /// Prepare data to be sent
-                        byte[] msg = new byte[8];
-                        msg[0] = 1;							/// (byte)ambientCfg.BusAddress;
-                        msg[1] = 3;							/// CMD = Read registers
-                        msg[2] = (byte)(regAddr >> 8);		/// Control Word Hi
-                        msg[3] = (byte)(regAddr & 0xFF);	/// Control Word Lo
-                        msg[4] = (byte)(count >> 8);		/// Serial Com Reference Hi
-                        msg[5] = (byte)(count & 0xFF);		/// Serial Com Reference Lo
-                        Telegram.UpdateTelegramCRC(msg);
+			if (serialPort == null)
+			{
+				log.ErrorFormat("{0} - RunDeviceAfter() - serial port closed", Name);
+				return;
+			}
 
-                        log.Debug(Telegram.LogTelegram("Sending ", msg));
-                        serialPort.Write(msg, 0, msg.Length);
-                    }
-                    catch (Exception e)
-                    {
-                        DebugLevel = DebugMode.FailureDuringOperation;
-                        //serialPort.Close();   /// ?
-                        serialPort = null;
+			try
+			{
+				/// Each 10 seconds
+				if ((StateMachine.Time % 10) == 0)
+				{
+					/// Read four registers: 0x31, 0x32, 0x33, 0x34
+					UInt16 regAddr = 0x0030;    /// register addr. = 0x31 (Modbus!)
+					UInt16 count = 4;
 
-                        log.FatalFormat("Ambient: Serail port read failure : {0}", e.Message);
-                        if (e.InnerException != null)
-                        {
-                            log.FatalFormat("InnerMessage : {0}", e.InnerException.Message);
-                        }
-                    }
-                }
-            }
+					/// Prepare data to be sent
+					byte[] msg = new byte[8];
+					msg[0] = 1;							/// (byte)ambientCfg.BusAddress;
+					msg[1] = 3;							/// CMD = Read registers
+					msg[2] = (byte)(regAddr >> 8);		/// Control Word Hi
+					msg[3] = (byte)(regAddr & 0xFF);	/// Control Word Lo
+					msg[4] = (byte)(count >> 8);		/// Serial Com Reference Hi
+					msg[5] = (byte)(count & 0xFF);		/// Serial Com Reference Lo
+					Telegram.UpdateTelegramCRC(msg);
+
+					log.Debug(Telegram.LogTelegram("Sending ", msg));
+					serialPort.Write(msg, 0, msg.Length);
+				}
+			}
+			catch (Exception e)
+			{
+				DebugLevel = DebugMode.FailureDuringOperation;
+				serialPort = null;
+
+				log.FatalFormat("Ambient: Serail port read failure : {0}", e.Message);
+				if (e.InnerException != null)
+				{
+					log.FatalFormat("InnerMessage : {0}", e.InnerException.Message);
+				}
+			}
 		}
 
         /// <summary>Stop this device</summary>
         public void StopDevice()
         {
-            if ((ambientCfg.DebugLevel == DebugMode.Normal) && (serialPort != null))
+			if (serialPort != null)
 			{
 				serialPort.Close();
 				serialPort = null;
@@ -186,14 +197,6 @@ namespace TBF.BenchControl.Ambient.Comet
 
 		public void StopDevice2() { }
 
-        void UpdateProcessData(float temperature, float pressure, float humidity)
-        {
-            TBF.BenchControl.Sequences.ProcessData.AmbTemp.Val = temperature;
-            TBF.BenchControl.Sequences.ProcessData.AmbPress.Val = pressure;
-            TBF.BenchControl.Sequences.ProcessData.AmbHumi.Val = humidity;
-        }
-
-
 		///
 		/// Boxes for the operation result
 		///
@@ -203,18 +206,18 @@ namespace TBF.BenchControl.Ambient.Comet
 
 		public IOperation ReadAmbientOp(FloatBox temperature, FloatBox pressure, FloatBox humidity)
 		{
-			this.tempBox = temperature;
+			this.tempBox     = temperature;
 			this.pressureBox = pressure;
-			this.humiBox = humidity;
+			this.humiBox     = humidity;
 			return this;
 		}
 
 		/// <summary>Start this operation</summary>
 		public void Start()
 		{
-            if (tempBox != null) tempBox.Val = temperature;
+            if (tempBox     != null) tempBox.Val     = temperature;
             if (pressureBox != null) pressureBox.Val = pressure;
-            if (humiBox != null) humiBox.Val = humidity;
+            if (humiBox     != null) humiBox.Val     = humidity;
         }
 
 		/// <summary>Run this operation</summary>
@@ -223,9 +226,9 @@ namespace TBF.BenchControl.Ambient.Comet
 		/// </returns>
 		public Event Run()
 		{
-            if (tempBox != null) tempBox.Val = temperature;
+            if (tempBox     != null) tempBox.Val     = temperature;
             if (pressureBox != null) pressureBox.Val = pressure;
-            if (humiBox != null) humiBox.Val = humidity;
+            if (humiBox     != null) humiBox.Val     = humidity;
             return Event.AmbientDone;
 		}
 

TBF/BenchControl/Ambient/Greco/Ambient.cs

@@ -133,10 +133,9 @@ namespace TBF.BenchControl.Ambient.Greco
 						temperature = t;
 						humidity = h;
 						pressure = p / 1000.0F;
-
-                        UpdateProcessData(temperature, pressure, humidity);
-                        msrmntTimeStamp = StateMachine.Time;
+						msrmntTimeStamp = StateMachine.Time;
 						msrmntState = MsrmntState.Valid;
+
                         log.InfoFormat("Ambient: temperature = {0:F1} C, humidity = {1:F1} %, pressure = {2:F0} mbar", temperature, humidity, 1000 * pressure);
                     }
 					else
@@ -171,13 +170,6 @@ namespace TBF.BenchControl.Ambient.Greco
 
 		public void StopDevice2() { }
 
-        void UpdateProcessData(float temperature, float pressure, float humidity)
-        {
-            TBF.BenchControl.Sequences.ProcessData.AmbTemp.Val = temperature;
-            TBF.BenchControl.Sequences.ProcessData.AmbPress.Val = pressure;
-            TBF.BenchControl.Sequences.ProcessData.AmbHumi.Val = humidity;
-        }
-
 		///
 		/// Boxes for the operation result
 		///

TBF/BenchControl/DataEntry/Combined/EntryForm.cs

@@ -41,7 +41,6 @@ namespace TBF.BenchControl.DataEntry.Combined
 
 
         System.Windows.Forms.Form modelessDlg;
-        public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
 
 		double refVolume;
 		double errLimLo;

TBF/BenchControl/DataEntry/HeatMeters12/EntryForm.cs

@@ -52,7 +52,6 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
 
 
         System.Windows.Forms.Form modelessDlg;
-        public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
 
 		double refVolume;
         double errLimLo;

TBF/BenchControl/DataEntry/HeatMeters6/EntryForm.cs

@@ -52,7 +52,6 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
 
 
         System.Windows.Forms.Form modelessDlg;
-        public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
 
         double refVolume;
         double errLimLo;

TBF/BenchControl/DataEntry/Munich/EntryForm.cs

@@ -41,7 +41,6 @@ namespace TBF.BenchControl.DataEntry.Munich
 
 
         System.Windows.Forms.Form modelessDlg;
-        public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
 
 		bool resultSaved;							/// Set in Run() when results are saved
 

TBF/BenchControl/DataEntry/Munich3/EntryForm.cs

@@ -44,7 +44,6 @@ namespace TBF.BenchControl.DataEntry.Munich3
 
 
         System.Windows.Forms.Form modelessDlg;
-        public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
 
 		double refVolume;
 		double errLimLo;

TBF/BenchControl/DataEntry/Single/EntryFormNoStartEnd.cs

@@ -41,7 +41,6 @@ namespace TBF.BenchControl.DataEntry.Single
 		
 
         System.Windows.Forms.Form modelessDlg;
-        public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
 
 		double refVolume;
 		double errLimLo;

TBF/BenchControl/DataEntry/Standard12/EntryFormNoStartEnd.cs

@@ -41,7 +41,6 @@ namespace TBF.BenchControl.DataEntry.Standard12
 
 
         System.Windows.Forms.Form modelessDlg;
-        public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
 
 		double refVolume;
 		double errLimLo;

TBF/BenchControl/DataEntry/Standard24/EntryFormNoStartEnd.cs

@@ -41,7 +41,6 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		
 
         System.Windows.Forms.Form modelessDlg;
-        public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
 
 		double refVolume;
 		double errLimLo;

TBF/BenchControl/DataEntry/Standard48/EntryFormNoStartEnd.cs

@@ -41,7 +41,6 @@ namespace TBF.BenchControl.DataEntry.Standard48
 		
 
         System.Windows.Forms.Form modelessDlg;
-        public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
 
 		double refVolume;
 		double errLimLo;

TBF/BenchControl/DataEntry/Standard6/EntryFormNoStartEnd.cs

@@ -40,7 +40,6 @@ namespace TBF.BenchControl.DataEntry.Standard6
 		
 
         System.Windows.Forms.Form modelessDlg;
-        public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
 
 		double refVolume;
 		double errLimLo;

TBF/BenchControl/DataEntry/StandardCamera/EntryForm.cs

@@ -90,7 +90,6 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
 		
 
         System.Windows.Forms.Form modelessDlg;
-        public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
 
 		double refVolume;
 		double errLimLo;

TBF/BenchControl/DataEntry/WMStates/EntryForm.cs

@@ -47,7 +47,6 @@ namespace TBF.BenchControl.DataEntry.WMStates
 
 
         System.Windows.Forms.Form modelessDlg;
-        public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
 
 		bool resultSaved;
 

TBF/BenchControl/DataEntry/iPerl/EntryForm.cs

@@ -41,7 +41,6 @@ namespace TBF.BenchControl.DataEntry.iPerl
 		
 
         System.Windows.Forms.Form modelessDlg;
-        public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
 
 		double refVolume;
 		double errLimLo;

TBF/BenchControl/Elde/Common.cs

@@ -19,7 +19,7 @@ namespace TBF.BenchControl.Elde
         EnduranceCycleStop = 13,
     }
 
-#if FUZHOU_300 || IZRAEL_200 || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TURA_IPERL || TURA_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_200 || SLM_50 || GENESIS || MALTA_WSD25 || SLM_END || WARSAW_END || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || DEWA_300 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50
+#if FUZHOU_300 || IZRAEL_200 || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TURA_IPERL || TURA_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_200 || SLM_50 || GENESIS || MALTA_WSD25 || SLM_END || WARSAW_END || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50
     public enum StatusP : ulong
     {
         RefFlowMeterMask  = 0x7,                /// bits 0,1,2

TBF/BenchControl/Elde/ControlBoardDev.cs

@@ -122,12 +122,8 @@ namespace TBF.BenchControl.Elde
         /// Initialization data updated by constructors of children components
         /// and sent to 'controlCom2panel' by SendCalibData() method.
         ///
-#if DEWA_300
-        public float[,] TempCalibData = new float[16, 5];
-#else
         public float[,] TempCalibData = new float[8, 5];
-#endif
-        public uint[] DiverterEdge;			/// Created and initialized in this.Initialize() 
+		public uint[] DiverterEdge;			/// Created and initialized in this.Initialize() 
         public byte MeretProtocol = 0;
 
         // Array length is the reference flowmeters count plus one
@@ -142,13 +138,6 @@ namespace TBF.BenchControl.Elde
 														 {100,500}, {100,500}, {100,500}, {100,500} };
         public byte[] MeretRS485Address = new byte[4];
         public float[] EtCalib = new float[7] { 1, 1, 1, 1, 1, 1, 1 };
-#elif DEWA_300
-        public uint[,] RegValveCalib = new uint[16, 2] { {100,500}, {100,500}, {100,500}, {100,500},
-														 {100,500}, {100,500}, {100,500}, {100,500}, 
-														 {100,500}, {100,500}, {100,500}, {100,500}, 
-														 {100,500}, {100,500}, {100,500}, {100,500} };
-        public byte[] MeretRS485Address = new byte[4];
-        public float[] EtCalib = new float[8] { 1, 1, 1, 1, 1, 1, 1, 1 };
 #elif MUNICH || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TORUN_50 || CEVAK_40 || TURA_IPERL || TURA_SPECIAL || MURES_40 || FUZHOU_50 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FUZHOU_100
         public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}};
 		public byte[] MeretRS485Address = new byte[4];

TBF/BenchControl/Elde/ControlComWrap.cs

@@ -56,13 +56,13 @@ namespace TBF.BenchControl.Elde
 		public float Pressure(int prsNr0) { return ctrlBrdComponent.pressure[prsNr0]; }
 		public float Temperature(int tmpNr0) { return ctrlBrdComponent.temperature[tmpNr0]; }
 		public RegulValveState RegulValveState(int rvNr1) { return (RegulValveState)ctrlBrdComponent.rValveStatus[rvNr1 - 1]; }
-#if GENESIS || BERLIN || PETERSBURG_200 || DEWA_300
+#if GENESIS || BERLIN || PETERSBURG_200
 		public UInt128 RRoute { get { return ((UInt128)ctrlBrdComponent.rRouteH << 64) | (UInt128)ctrlBrdComponent.rRoute; } }
 #else
         public UInt128 RRoute { get { return ctrlBrdComponent.rRoute; } }
 #endif
 
-#if GENESIS || KEMPNO_50 || KRAKOW_50 || BAHRAIN_50 || BADGER_STREDNA_TRAT || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50 || DEWA_300
+#if GENESIS || KEMPNO_50 || KRAKOW_50 || BAHRAIN_50 || BADGER_STREDNA_TRAT || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50
         public uint DivTime(int id) { return ctrlBrdComponent.divTime[id]; }
         public void SetDivLimit(int divNo, uint limLoPct, uint limHiPct)
         {
@@ -353,7 +353,7 @@ namespace TBF.BenchControl.Elde
 			bool bit39 = (route & 0x00FC000000000000) != 0;		/// true if any of bits 50 through 55 is set
 			route = route & 0xFF03FFFFFFFFFFFF;
 			if (bit39) route = route | 0x0000008000000000;
-#elif PETERSBURG_200 || DEWA_300
+#elif PETERSBURG_200
 			///
 			/// The following code deals with the situation that all pumps share bit #80.
 			/// In settings the bits of pumps should be sent as follows: P1=64, P2=65, P3=66, P4=67 and P5=68
@@ -388,7 +388,7 @@ namespace TBF.BenchControl.Elde
             uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses };
             ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)(route & (UInt128)0xFFFFFFFFFFFFFFFF), (ulong)(route >> 64), pulsesArr, (uint)testMethods,
                                          Convert.ToSingle(filterConstants[0]), fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs);
-#elif GENESIS || DEWA_300
+#elif GENESIS
             uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses };
             ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)(route & (UInt128)0xFFFFFFFFFFFFFFFF), (ulong)(route >> 64), pulsesArr, (uint)testMethods,
                                          filterConstants, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs);

TBF/BenchControl/Elde/Diverter/Diverter.cs

@@ -74,7 +74,6 @@ namespace TBF.BenchControl.Elde.Diverter
 				if (divertersSoFar != null)
 				{
 					for (int i = 0; i < divertersSoFar.Length; i++) Diverters[i] = divertersSoFar[i];
-
 				}
 
 				Diverters[nextIdx - 1] = this;
@@ -108,8 +107,6 @@ namespace TBF.BenchControl.Elde.Diverter
             flowMtrNr4Cmd = divNrFromName;
 #elif CEVAK_200
 			flowMtrNr4Cmd = (divNrFromName == 4) ? 5 : divNrFromName;
-#elif DEWA_300
-			flowMtrNr4Cmd = divNrFromName + 2;              /// Div1: 1,2,3, Div2: 4, Div3: 5, Div4: 6, Div5: 7
 #else
             flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : 3;
 #endif

TBF/BenchControl/Elde/FlowMeter/FlowMeter.cs

@@ -16,13 +16,13 @@ namespace TBF.BenchControl.Elde.FlowMeter
 		readonly FlowMeterCfg flowMeterCfg;
         readonly ControlBoardDev controlBoard;
 
-        public int Idx1 { get { return flowMeterCfg.Idx1; } }
+        public int Idx1 { get { return flowMeterCfg.Idx1; } }		
         public float NominalFlow { get { return flowMeterCfg.NominalFlow; } }
         public float LtrPerPulse { get { return flowMeterCfg.NominalFlow / 7200.0f; } } /// Nominal frequency is 2000 Hz
 
         public float LtrPerPulseCorrected(double flow, int rangeIx)
         {
-            if (flow < 0.1 * NominalFlow) return LtrPerPulse;     /// No correction for small flow
+            if (flow < 0.1 * NominalFlow) return LtrPerPulse;     /// No correction for small flow   
 
             /// Apply correction
             var rangeCorrections = new List<Config.Entities.MeasurementCorrection>();

TBF/BenchControl/Elde/PressureMeter/PressureMeter.cs

@@ -58,9 +58,7 @@ namespace TBF.BenchControl.Elde.PressureMeter
         /// <returns>Pressure in mBar</returns>
         public float ReadPressure()
         {
-            double rawPressure = Config.Units.ConvertFrom(Config.Unit.kPa, ControlBoard.Pressure(Idx0));
-            double correctedPressure = Config.Formulas.CorrectedValue(rawPressure, Corrections);
-            return (float)correctedPressure;
+            return (float)Config.Units.ConvertFrom(Config.Unit.kPa, ControlBoard.Pressure(Idx0));
         }
 
 

TBF/BenchControl/Elde/RegulValve/SetFlowOp.cs

@@ -58,7 +58,6 @@ namespace TBF.BenchControl.Elde.RegulValve
 		float targetPositionLo;
 		float targetPositionHi;
 
-        int startTime;
         int expireTime;
 		DoubleBox flowBox;
         int flowWithinBoundsTime;
@@ -166,10 +165,6 @@ namespace TBF.BenchControl.Elde.RegulValve
 		/// <summary>Start this operation</summary>
 		public void Start()
         {
-            startTime = StateMachine.Time;
-            expireTime = StateMachine.Time + timeout;
-            if (expireTime < 0) expireTime = int.MaxValue;
-
             double flowMtrFreq = flowMeter.ReadFrequency();
             double flow = flowMeter.ReadFlow();
 
@@ -199,6 +194,9 @@ namespace TBF.BenchControl.Elde.RegulValve
 				opState = OpState.ValveMoveToFlow1;
 			}
 
+            expireTime = StateMachine.Time + timeout;
+            if (expireTime < 0) expireTime = int.MaxValue;
+
             TestMethods tm = 0;
             StopDevs sd = 0;
 			// '_regulValve.RegulValveCfg.PidCoef' replaced by a casted operation parameter 'pidCoef'
@@ -223,7 +221,7 @@ namespace TBF.BenchControl.Elde.RegulValve
             }
 
             log.InfoFormat("SetFlowOp:Run(T={0}) rv#={1} pos={2}% freq={3} flow={4} opState={5}",
-                            StateMachine.Time - startTime, regulValveNr, rvPosition.ToString("F1"), flowMtrFreq, flow, opState);
+                            StateMachine.Time - expireTime + timeout, regulValveNr, rvPosition.ToString("F1"), flowMtrFreq, flow, opState);
 
             if (StateMachine.Time > expireTime)
             {

TBF/BenchControl/Elde/TempMeter/TempMeter.cs

@@ -18,7 +18,7 @@ namespace TBF.BenchControl.Elde.TempMeter
 		
 		public readonly ControlBoardDev ControlBoard;
 
-		public int Idx0 { get { return tempMtrCfg.Idx0; } }		/// 0..15
+		public int Idx0 { get { return tempMtrCfg.Idx0; } }		/// 0..7
 		public double A1 { get { return tempMtrCfg.A1; } }
 		public double A2 { get { return tempMtrCfg.A2; } }
 		public double A3 { get { return tempMtrCfg.A3; } }

TBF/BenchControl/Elde/TempMeter/TempMeterCfg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2016 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -19,7 +19,7 @@ namespace TBF.BenchControl.Elde.TempMeter
 		///
 		/// Serialized parameters 
 		///
-		public int Idx0;	    /// 0 .. 15
+		public int Idx0;	    /// 0..7										
 		public double A1;
 		public double A2;
 		public double A3;

TBF/BenchControl/Elde/TempMeter/TempMeterCfgCtrl.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2016 Sensus Metering Systems
 ///
 using System;
 using System.IO;
@@ -96,10 +96,10 @@ namespace TBF.BenchControl.Elde.TempMeter
 				flags |= CfgUpdateFlags.Error;
 				message += Environment.NewLine + "Invalid 'Parent Name'";
 			}
-			if (!int.TryParse(positionTextBox.Text, out dummy) || dummy < 0 || dummy > 15)
+			if (!int.TryParse(positionTextBox.Text, out dummy) || dummy < 0 || dummy > 7)
 			{
 				flags |= CfgUpdateFlags.Error;
-				message += Environment.NewLine + "'Position' should be between 0 and 15";
+				message += Environment.NewLine + "'Position' should be between 0 and 7";
 			}
 
 			double fdummy;
@@ -167,46 +167,36 @@ namespace TBF.BenchControl.Elde.TempMeter
 			if (!string.IsNullOrEmpty(lastImportFileName)) dlg.FileName = lastImportFileName;
 			if (dlg.ShowDialog() == DialogResult.OK)
 			{
-				using (TextReader reader = new StreamReader(dlg.FileName))
+				try
 				{
-				    try
-				    {
-                        string startOfLine = string.Format("Calch{0} =", positionTextBox.Text);
-                        bool channelFound = false;
-                        string line;
-						
-                        do
+					using (TextReader reader = new StreamReader(dlg.FileName))
+					{
+						double tmp;
+						string lineID = string.Format("Calch{0} =", positionTextBox.Text);
+
+						do
 						{
-							line = reader.ReadLine();
-							if (!string.IsNullOrEmpty(line) && (line.IndexOf(startOfLine) == 0))
+							string line = reader.ReadLine();
+							if (line != null && line.IndexOf(lineID) == 0)
 							{
-								string[] factors = line.Substring(startOfLine.Length).Split(new char[] { ',' });
+								string[] factors = line.Substring(lineID.Length).Split(new char[] { ',' });
 								int count = factors.Length;
-                                double tmp;
-                                if (count >= 1 && Utils.TryParseEDouble(factors[0].Trim(), out tmp)) a1TextBox.Text = factors[0].Trim();
+								if (count >= 1 && Utils.TryParseEDouble(factors[0].Trim(), out tmp)) a1TextBox.Text = factors[0].Trim();
 								if (count >= 2 && Utils.TryParseEDouble(factors[1].Trim(), out tmp)) a2TextBox.Text = factors[1].Trim();
 								if (count >= 3 && Utils.TryParseEDouble(factors[2].Trim(), out tmp)) a3TextBox.Text = factors[2].Trim();
 								if (count >= 4 && Utils.TryParseEDouble(factors[3].Trim(), out tmp)) a4TextBox.Text = factors[3].Trim();
 								if (count >= 5 && Utils.TryParseEDouble(factors[4].Trim(), out tmp)) a5TextBox.Text = factors[4].Trim();
-                                channelFound = true;
 								lastImportFileName = dlg.FileName;
 								break;
 							}
 						}
-                        while (line != null);
-
-                        if (!channelFound)
-                        {
-                            MessageBox.Show(string.Format("Calibration factors for channel {0} not found.", positionTextBox.Text),
-                                            "Warning", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-                        }
-                    }
-                    catch
-                    {
-                        MessageBox.Show("Wrong file format, import failed.",
-                                        "Error", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-                    }
-                }
+						while (lineID != null);
+					}
+				}
+				catch
+				{
+					MessageBox.Show("Import failed", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+				}
 			}
 		}
 	}

TBF/BenchControl/Events.cs

@@ -164,13 +164,11 @@ namespace TBF.BenchControl
         Error,                      /// Many ops.: Fatal error occurred
         OpArgumentError,
         ConfigurationError,
-        RecoverableError,           /// Something like flow setting or mass measurement timeout
         Yes,
         No,
         Next,                       /// To move to the next state when debugging
         OK,
         Retry,
-        Continue,
         Abort,
         TimerBusy,
         SetOutputsDone,

TBF/BenchControl/GenericDevices/IDataEntry.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System.Collections.Generic;
 using Config.Entities;
@@ -9,11 +9,6 @@ namespace TBF.BenchControl.GenericDevices
 {
 	public interface IDataEntry : IComponent
 	{
-        /// <summary>
-        /// true when DataEntry dialog was completed or when it does not support IHasCompleted (to avoid TBF freeze).
-        /// </summary>
-        bool Completed { get; }
-
         /// <summary>
         /// Updates test results with the information collected in watermeters.
         /// </summary>

TBF/BenchControl/GenericDevices/IHasCompleted.cs

@@ -5,11 +5,8 @@ using System;
 
 namespace TBF.BenchControl.GenericDevices
 {
-    public interface IHasCompleted
+    interface IHasCompleted
     {
-        /// <summary>
-        /// true when a dialog was completed
-        /// </summary>
         bool Completed { get; }
     }
 }

TBF/BenchControl/GenericDevices/IParallelOutput.cs

@@ -1,15 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using TBF.BenchControl.Generic;
-
-namespace TBF.BenchControl.GenericDevices
-{
-    public interface IParallelOutput : IComponent
-    {
-        IOperation SetOutputsOp(ushort outValue);
-        IOperation ShowBenchWaitingOp();
-        IOperation ShowBenchErrorOp();
-    }
-}

TBF/BenchControl/GenericDevices/IReceivesDataFromRadio.cs

@@ -1,12 +0,0 @@
-///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
-///
-using System;
-
-namespace TBF.BenchControl.GenericDevices
-{
-    public interface IReceivesDataFromRadio
-    {
-        void WMStateReceived(string serialNr, double wmState);
-    }
-}

TBF/BenchControl/GenericDevices/IStartInfoReader.cs

@@ -11,6 +11,6 @@ namespace TBF.BenchControl.GenericDevices
         /// Reads information on start of a cycle,  Events:  Event.InfoRead
         /// </summary>
         /// <returns>Reference to the operation</returns>
-        IOperation ReadStartInfoOp(Results.Entities.WaterMeter[] waterMeters);
+        IOperation ReadStartInfoOp(Results.Entities.Batch batchResults);
     }
 }

TBF/BenchControl/Keithley/Multimeter_2010_RS232/Multimeter.cs

@@ -63,8 +63,8 @@ namespace TBF.BenchControl.Keithley.Multimeter_2010_RS232
 		}
 
 		/// <summary>
-		/// Keithley mulltimeter connected via serial interface (RS232)
-		/// Connection settings: 9600Bd 8-bits no-parity 1-stop-bit flow control: none
+		/// Ambient temperature / humidity / pressure meter 'Greco' connected via serial interface (RS232)
+		/// Connection settings: 19200 Bd 8-bits No-parity 1-stop-bit Flow control: none or hardware.
 		/// </summary>
 		public Multimeter(Generic.IComponentCfg cfg)
             : base(cfg)

TBF/BenchControl/Modbus/Common/Modbus.cs

@@ -28,7 +28,6 @@ namespace TBF.BenchControl.Modbus.Common
 		/// Private fields
 		SerialPort serialPort;
         DateTime lastSerialPortWrite;
-        bool initialRunDeviceCommComplete;
 
 		public Queue<byte[]>[] ReceivedTelegrams
 		{
@@ -83,8 +82,6 @@ namespace TBF.BenchControl.Modbus.Common
 			//workerThread = new Thread(Worker);
 			//workerThread.Start();
 
-            initialRunDeviceCommComplete = false;   /// Causes search for Quido RS modules in the first RunDeviceAfter() call
-
             log.FatalFormat("{0} - Device successfully initialized", Name);
 		}
 
@@ -102,7 +99,7 @@ namespace TBF.BenchControl.Modbus.Common
 
 			Telegram.UpdateTelegramCRC(message);
 
-            if ((DateTime.Now - lastSerialPortWrite) > new TimeSpan(0, 0, 0, 0, 100) && initialRunDeviceCommComplete)
+            if ((DateTime.Now - lastSerialPortWrite) > new TimeSpan(0, 0, 0, 0, 100))
             {
                 /// More then 100 ms since last 'send' --> do not enqueue the message
                 SendMessageNow(message);
@@ -177,12 +174,12 @@ namespace TBF.BenchControl.Modbus.Common
 					Debug.WriteLine(s);
 					log.Debug(s);
 				}
-                else
-                {
-                    string s = Telegram.LogTelegram(string.Format("{0} - Invalid data received ", Name), buffer);
-                    Debug.WriteLine(s);
-                    log.Debug(s);
-                }
+				else
+				{
+					string s = Telegram.LogTelegram(string.Format("{0} - Invalid data received ", Name), buffer);
+					Debug.WriteLine(s);
+					log.Debug(s);
+				}
 			}
 		}
 
@@ -191,16 +188,6 @@ namespace TBF.BenchControl.Modbus.Common
         {
             if (serialPort == null) return;
 
-            if (!initialRunDeviceCommComplete)
-            {
-                initialRunDeviceCommComplete = true;    /// Prevent 2nd invocation of the subsequent code
-
-                /// Search Quido RS modules
-                byte[] searchTelegram = new byte[] { 0xF8, 0x11, 0, 0 };
-                Telegram.UpdateTelegramCRC(searchTelegram);
-                SendMessageNow(searchTelegram);
-            }
-
             if (telegramsToSend.Count > 0 && (DateTime.Now - lastSerialPortWrite) > new TimeSpan(0, 0, 0, 0, 500))
             {
                 SendMessageNow(telegramsToSend.Dequeue());
@@ -210,27 +197,15 @@ namespace TBF.BenchControl.Modbus.Common
         /// <summary>Stop this device</summary>
         public void StopDevice()
         {
+			if (serialPort != null)
+			{
+				//stopWorkerThread = true;
+				//workerThread.Join(2000);
+				serialPort.Close();
+				serialPort = null;
+			}
 		}
 
-		public void StopDevice2()
-        {
-            if (serialPort != null)
-            {
-                /// Send telegrams currently in the queue
-                while (telegramsToSend.Count > 0)
-                {
-                    while ((DateTime.Now - lastSerialPortWrite) <= new TimeSpan(0, 0, 0, 0, 200))
-                    {
-                        Thread.Sleep(100);
-                    }
-                    SendMessageNow(telegramsToSend.Dequeue());
-                }
-
-                //stopWorkerThread = true;
-                //workerThread.Join(2000);
-                serialPort.Close();
-                serialPort = null;
-            }
-        }
+		public void StopDevice2() { }
 	}
 }

TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeter.cs

@@ -33,6 +33,9 @@ namespace TBF.BenchControl.Modbus.PressureMeter.Meret
 			modbus = (GenericDevices.IModbus)TbfComponents.FindComponent(cfg.ParentName, components);
 			if (modbus == null) throw new Exception("Cannot find " + Name + " parent");
 
+			/// Connect to handler
+			//ModbusAddress.MeretRS485Address[Idx0] = ModbusAddress;
+
 			log.Debug(this.ToString());
 		}
 
@@ -48,9 +51,7 @@ namespace TBF.BenchControl.Modbus.PressureMeter.Meret
 		/// <returns>Pressure in mBar</returns>
 		public float ReadPressure()
 		{
-            double rawPressure = Config.Units.ConvertFrom(Config.Unit.kPa, receivedPressure);
-            double correctedPressure = Config.Formulas.CorrectedValue(rawPressure, Corrections);
-            return (float)correctedPressure;
+			return (float)Config.Units.ConvertFrom(Config.Unit.kPa, receivedPressure);
 		}
 
 		/// <summary>

TBF/BenchControl/Modbus/QuidoRS/ConfirmationForm.cs

@@ -1,98 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-using log4net;
-using TBF.Resources;
-
-namespace TBF.BenchControl.Modbus.QuidoRS
-{
-	public partial class ConfirmationForm : Form
-	{
-        static readonly ILog log = LogManager.GetLogger(typeof(ConfirmationForm));
-
-		/// Set to 'true' when the form closes
-		public bool Completed { get { return completed; } }
-		bool completed;
-
-
-		public ConfirmationForm(string message, Color backgroundColor)
-		{
-			InitializeComponent();
-
-			Localize();
-			messageLabel.Text = message;
-            BackColor = backgroundColor;
-
-			float textWidth = Graphics.FromImage(new Bitmap(1, 1)).MeasureString(messageLabel.Text, messageLabel.Font).Width;
-			int rqrdFormWidth = (int)textWidth + 80;	/// Form width calculated from the text width
-
-			if (rqrdFormWidth > Width)
-			{
-				int shift = (rqrdFormWidth - Width) / 2;
-				Width = rqrdFormWidth;
-				okButton.Left += shift;
-			}
-
-			completed = false;
-			StartForceCloseHandler();
-		}
-
-		void Localize()
-		{
-			okButton.Text = Strings.OkBtnText;
-		}
-
-		private void okButton_Click(object sender, EventArgs e)
-		{
-			completed = true;
-			Close();
-		}
-
-        private void MessageBoxForm_FormClosing(object sender, FormClosingEventArgs e)
-        {
-            completed = true;
-        }
-
-		#region Forced close handling
-
-        /// <summary>
-        /// Used by CoverTest, AskYesNoOp and MessageBoxOp.
-        /// </summary>
-        public void OnCloseThisForm(object sender, EventArgs args)
-        {
-            if (CloseThisFormHandler == null) return;
-            try
-            {
-                CloseThisFormHandler(sender, null);
-            }
-            catch (Exception e)
-            {
-                log.Error("CloseThisFormHandler(...) failed", e);
-            }
-        }
-
-        public event EventHandler<EventArgs> CloseThisFormHandler;
-
-		public void StartForceCloseHandler()
-		{
-            CloseThisFormHandler += delegate(object sender, EventArgs args)
-			{
-				if (InvokeRequired)
-                    Invoke(new EventHandler<EventArgs>(OnForceClose), sender, args);
-				else
-                    OnForceClose(sender, args);
-			};
-		}
-
-		private void OnForceClose(object sender, EventArgs args)
-		{
-			DialogResult = DialogResult.Cancel;
-			Close();
-		}
-
-		#endregion
-	}
-}

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

@@ -1,85 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-namespace TBF.BenchControl.Modbus.QuidoRS
-{
-	partial class ConfirmationForm
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-            this.okButton = new System.Windows.Forms.Button();
-            this.messageLabel = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // okButton
-            // 
-            this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.okButton.ForeColor = System.Drawing.Color.Black;
-            this.okButton.Location = new System.Drawing.Point(177, 99);
-            this.okButton.Name = "okButton";
-            this.okButton.Size = new System.Drawing.Size(98, 63);
-            this.okButton.TabIndex = 1;
-            this.okButton.Text = "OK";
-            this.okButton.UseVisualStyleBackColor = true;
-            this.okButton.Click += new System.EventHandler(this.okButton_Click);
-            // 
-            // messageLabel
-            // 
-            this.messageLabel.AutoSize = true;
-            this.messageLabel.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.messageLabel.Location = new System.Drawing.Point(34, 39);
-            this.messageLabel.Name = "messageLabel";
-            this.messageLabel.Size = new System.Drawing.Size(91, 23);
-            this.messageLabel.TabIndex = 4;
-            this.messageLabel.Text = "Message";
-            // 
-            // ConfirmationForm
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = System.Drawing.Color.Goldenrod;
-            this.ClientSize = new System.Drawing.Size(454, 201);
-            this.Controls.Add(this.messageLabel);
-            this.Controls.Add(this.okButton);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "ConfirmationForm";
-            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
-            this.TopMost = true;
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MessageBoxForm_FormClosing);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-		}
-
-		#endregion
-
-        private System.Windows.Forms.Button okButton;
-		private System.Windows.Forms.Label messageLabel;
-	}
-}

TBF/BenchControl/Modbus/QuidoRS/ConfirmationForm.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

TBF/BenchControl/Modbus/QuidoRS/Factory.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2016 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2016 Sensus Metering Systems
 ///
 using System.Collections.Generic;
 using TBF.BenchControl.Generic;

TBF/BenchControl/Modbus/QuidoRS/QuidoRS.cs

@@ -1,17 +1,15 @@
 ///
-/// Copyright (c) 2015-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2015 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
 using log4net;
 using TBF.BenchControl.Generic;
 using TBF.Boxes;
-using System.Text;
-using System.Diagnostics;
 
 namespace TBF.BenchControl.Modbus.QuidoRS
 {
-    public class QuidoRS : ComponentBase, IDevice, GenericDevices.IParallelOutput
+    public class QuidoRS : ComponentBase, IDevice
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(QuidoRS));
         public override string ToString() { return string.Format("QuidoRS({0})", Cfg.ToString(1)); }
@@ -19,8 +17,6 @@ namespace TBF.BenchControl.Modbus.QuidoRS
 		readonly QuidoRSCfg quidoRSCfg;
 	    readonly GenericDevices.IModbus modbus;
 
-        public QuidoVariant Variant { get { return quidoRSCfg.Variant; } }
-
         private ushort currentOutputs;
         private DateTime lastOutputsChange;
 
@@ -64,22 +60,12 @@ namespace TBF.BenchControl.Modbus.QuidoRS
 
             if (modbus.ReceivedTelegrams[quidoRSCfg.ModbusAddress].Count > 0)
             {
-				byte[] telegram = modbus.ReceivedTelegrams[quidoRSCfg.ModbusAddress].Dequeue();
-
-                if ((telegram.Length >= 8) && (telegram[1] == 0x11) && (telegram[2] == telegram.Length - 5))
-                {
-                    int msgLen = telegram.Length - 7;
-                    byte modbusAddress = telegram[3];
-                    string msg = Encoding.ASCII.GetString(telegram, 5, msgLen);
-                    string s = string.Format("QuidoRS detected: Address={0}, Message={1}", modbusAddress, msg);
-                    Debug.WriteLine(s);
-                    log.Warn(s);
-                }
+                modbus.ReceivedTelegrams[quidoRSCfg.ModbusAddress].Dequeue();
             }
         }
 
 		public void RunDeviceAfter() { }
-		public void StopDevice() { SendOutputs(0); }
+		public void StopDevice() { }
 		public void StopDevice2() { }
 
 
@@ -138,23 +124,19 @@ namespace TBF.BenchControl.Modbus.QuidoRS
 
         private void SendOutputs(ushort outputs)
 		{
-            byte addr = quidoRSCfg.ModbusAddress;
-            byte cmd = (byte)Function.ForceMultipleCoils;
-            byte dataLo = (byte)(outputs & 0xFF);
-            byte dataHi = (byte)(outputs >> 8);	
+            byte[] msg = new byte[11];
 
-			if (quidoRSCfg.Variant == QuidoVariant.QuidoRS_2_16)
-			{
-                modbus.SendMessage(new byte[] { addr, cmd, 0, 0, 0, 16, 2, dataLo, dataHi, 0, 0 });
-            }
-            else if (quidoRSCfg.Variant == QuidoVariant.QuidoRS_4_4)
-            {
-                modbus.SendMessage(new byte[] { addr, cmd, 0, 0, 0, 4, 1, dataLo, 0, 0 });
-            }
-            else if (quidoRSCfg.Variant == QuidoVariant.QuidoRS_8_8)
-			{
-                modbus.SendMessage(new byte[] { addr, cmd, 0, 0, 0, 8, 1, dataLo, 0, 0 });                                                    
-            }
+			msg[0] = quidoRSCfg.ModbusAddress;
+			msg[1] = (byte)Function.ForceMultipleCoils;
+			msg[2] = 0;										/// Data Hi
+			msg[3] = 0;										/// Data Lo
+			msg[4] = 0;										/// Nr. of coils Hi
+			msg[5] = 16;									/// Nr. of coils Lo
+			msg[6] = 2;										/// Byte count
+			msg[7] = (byte)(outputs & 0xFF);				/// Output data Lo
+			msg[8] = (byte)(outputs >> 8);					/// Output data Hi
+
+			modbus.SendMessage(msg);
 
             lastOutputsChange = DateTime.Now;
         }
@@ -163,29 +145,22 @@ namespace TBF.BenchControl.Modbus.QuidoRS
 		/// <summary>
 		/// Events:  SetOpututsDone, Error
 		/// </summary>
-		/// <param name="outValue">Parallel output data</param>
-		/// <returns>SetOutputsOp operation casted to IOperaton</returns>
+		/// <param name="outValue">Reference to a variable for the pressure in Bar</param>
+		/// <returns>SetOutputsOp instance reference casted to IOperaton</returns>
 		public IOperation SetOutputsOp(ushort outValue)
 		{
 			return new SetOutputsOp(this, outValue);
 		}
 
 		/// <summary>
-		/// Events:  Event.None
+		/// Events:  pressureDone, Error
 		/// </summary>
-        /// <returns>ShowBenchWaitingOp operation casted to generic IOperaton</returns>
-		public IOperation ShowBenchWaitingOp()
+		/// <param name="outValue">Reference to a variable for the pressure in Bar</param>
+		/// <param name="setOutputsDone">Event returned when SetOutput is done</param>
+		/// <returns>SetOutputsOp instance reference casted to IOperaton</returns>
+		public IOperation ReadPressureOp(ushort outValue, Event setOutputsDone)
 		{
-            return new ShowBenchWaitingOp(this);
+			return new SetOutputsOp(this, outValue, setOutputsDone);
 		}
-
-        /// <summary>
-        /// Events:  Event.None
-        /// </summary>
-        /// <returns>ShowBenchErrorOp operation casted to generic IOperaton</returns>
-        public IOperation ShowBenchErrorOp()
-        {
-            return new ShowBenchErrorOp(this);
-        }
-    }
+	}
 }