Reconfigured for iPerl

Config/Config.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;IZRAEL_200</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</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;IZRAEL_200</DefineConstants>
+    <DefineConstants>TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

Config/Entities/IperlEnums.cs

@@ -25,6 +25,14 @@ 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) or 1=class1, 2=class2, 3=class3
-        public virtual float ErrLimHi { get; set; }			/// in [%] (usually > 0) or -Qn in m3/h
+        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 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 float GetErrLimLo(float flow)
+        public virtual double GetErrLimLo(double volumeCTV, double testTime)
         {
             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);
-                float Qp = Math.Abs(ErrLimHi);
-                float Q = Math.Max(flow, 0.00001f);     /// to avoid division by zero
+                double Qp = Math.Abs(ErrLimHi);
+                double Q = (testTime == 0) ? 1 : Math.Max(3.6 * volumeCTV / testTime, 0.00001); /// Div. by zero avoided
 
                 /// Calculate the error limit of a heat meter
                 switch (metrClass)
                 {
                     default:
-                    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);
+                    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);
                 }
             }
         }
 
-        public virtual float GetErrLimHi(float flow)
+        public virtual double GetErrLimHi(double volumeCTV, double testTime)
         {
             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);
-                float Qp = Math.Abs(ErrLimHi);
-                float Q = Math.Max(flow, 0.00001f);     /// to avoid division by zero
+                double Qp = Math.Abs(ErrLimHi);
+                double Q = (testTime == 0) ? 1 : Math.Max(3.6 * volumeCTV / testTime, 0.00001); /// Div. by zero avoided
 
                 /// Calculate the error limit of a heat meter
                 switch (metrClass)
                 {
                     default:
-                    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);
+                    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);
                 }
             }
         }

Config/Entities/TransitionSequence.cs

@@ -1,7 +1,10 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
 ///
+using System;
 using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
 
 namespace Config.Entities
 {
@@ -37,5 +40,56 @@ 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,8 +1,10 @@
 ///
-/// Copyright (c) 2013-2015, 2017 Sensus Metering Systems
+/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
 
 namespace Config.Entities
 {
@@ -61,5 +63,64 @@ 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,8 +1,9 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
+using System.IO;
 
 namespace Config.Entities
 {
@@ -35,5 +36,24 @@ 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.1110.0")]
-[assembly: AssemblyFileVersion("2.18.1110.0")]
+[assembly: AssemblyVersion("2.18.1122.0")]
+[assembly: AssemblyFileVersion("2.18.1122.0")]

DeviceTest/DeviceTestDlg.cs

@@ -276,7 +276,14 @@ namespace DeviceTest
 				radioButton3.Text = "SelectTank 3";
 				radioButton4.Text = "SelectTank -";
 			}
-			else radioButton1.Text = "spare";
+            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";
 		}
 		/// 
 		void UpdateOperations2(string className)
@@ -296,7 +303,14 @@ namespace DeviceTest
 				radioButton23.Text = "SelectTank 3";
 				radioButton24.Text = "SelectTank -";
 			}
-			else radioButton21.Text = "spare";
+            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";
 		}
 		/// 
 		void UpdateOperations3(string className)
@@ -316,7 +330,14 @@ namespace DeviceTest
 				radioButton33.Text = "SelectTank 3";
 				radioButton34.Text = "SelectTank -";
 			}
-			else radioButton31.Text = "spare";
+            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";
 		}
 
 
@@ -672,6 +693,13 @@ 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)
@@ -704,6 +732,13 @@ 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)
@@ -736,6 +771,13 @@ 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/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)
-		public virtual double ErrLimHi				{ get; set; }	/// [%] (usually > 0)
+        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 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 = Math.Max(FlowMean, 0.00001);     /// to avoid division by zero
+                double Q = (TestTime == 0) ? 1 : Math.Max(3.6 * VolumeCTV / TestTime, 0.00001); /// Div. by zero avoided
 
                 /// 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 = Math.Max(FlowMean, 0.00001);     /// to avoid division by zero
+                double Q = (TestTime == 0) ? 1 : Math.Max(3.6 * VolumeCTV / TestTime, 0.00001); /// Div. by zero avoided
 
                 /// 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; }	/// 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 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 PurchaseOrder		{ get; set; }
 		public virtual int    YearOfProduction  { get; set; }
 		public virtual int    WMPosition        { get; set; }
@@ -57,7 +57,6 @@ 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
@@ -73,9 +72,29 @@ 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; }	/// Not mapped to DB !!! 0=unknown (saving to Oracle failed), >=1 ... pruefindex
 		public virtual int	  HydrPruefung		{ get; set; }	/// Not mapped to DB !!!
+        public virtual int    WMTypeRevision    { get; set; }	/// Not mapped to DB !!!
+        public virtual object TestInfos         { get; set; }	/// SensusTestInfo[] array fetched at the beginning of the cycle, not mapped to DB !!!
 #endif
 		public virtual WaterMeterData WaterMeterData { get; set; }
 		public virtual Batch Batch { get; set; }
@@ -262,7 +281,12 @@ namespace Results.Entities
 					{
 						return mtr;
 					}
-				}
+                    else if (meterId == Config.Entities.CompoundMeterId.SingleOrCompound &&
+                             mtr.CompoundMeterId == (byte)Config.Entities.CompoundMeterId.HeatMeterEnergy)
+                    {
+                        return mtr;
+                    }
+                }
 			}
 			return null;
 		}
@@ -324,6 +348,12 @@ namespace Results.Entities
 		public WaterMeter()
 		{
 			MeterTestRslts = new List<MeterTestRslt>();
+#if ORACLE_DB
+            Pruefindex = 1;
+            HydrPruefung = 0;
+            WMTypeRevision = 0;
+            TestInfos = null;
+#endif
 		}
 
 
@@ -346,7 +376,6 @@ namespace Results.Entities
 			ArchivePath = src.ArchivePath;
 			Remark = src.Remark;
 #if IPERL
-		    SerialNrEx = src.SerialNrEx;
 		    OrigCalibFactor = src.OrigCalibFactor;
 		    CalibFactor = src.CalibFactor;
 		    Q2ErrWOCorrection = src.Q2ErrWOCorrection;
@@ -360,9 +389,26 @@ 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;
+            TestInfos = src.TestInfos;
 #endif
             foreach (var mtr in MeterTestRslts)
             {
@@ -379,7 +425,7 @@ namespace Results.Entities
 		{
 			StringBuilder sb = new StringBuilder(80);
 #if IPERL
-			sb.AppendFormat("PCB:{0} S/N:{1} ", SerialNr, SerialNrEx);
+			sb.AppendFormat("PCB:{0} S/N:{1} ", SerialNr, SerialNrAux);
 #else
 			sb.AppendFormat("S/N:{0} ", SerialNr);
 #endif

Results/Entities/WaterMeterData.cs

@@ -54,7 +54,6 @@ namespace Results.Entities
 
 #if ORACLE_DB
 		public virtual int WMTypeId { get; set; }
-		public virtual int WMTypeRev { get; set; }
 #endif
 
         public WaterMeterData()
@@ -111,7 +110,6 @@ 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

@@ -45,7 +45,7 @@ namespace Results.Forms
         Results.BatchResults results;
         MetersKind metersKind;
 
-        ListView firstListView;
+        OneWMResultsCtrl firstListView;
         public int[] rsltsClmnWidths;
         int rsltsClmnCount { get { return (rsltsClmnWidths != null) ? rsltsClmnWidths.Length : 0; } }
 
@@ -150,9 +150,9 @@ namespace Results.Forms
                 {
                     if (results.WaterMeters[i] != null && !results.WaterMeters[i].Disabled)
                     {
-                        ListView lview = (TestsArrangement == TestsArrangement.Rows)
-                                       ? GetResultsTestsAreRows(results.WaterMeters[i], i + 1)
-                                       : GetResultsTestsAreColumns(results.WaterMeters[i], i + 1);
+                        OneWMResultsCtrl lview = (TestsArrangement == TestsArrangement.Rows)
+                                               ? GetResultsTestsAreRows(results.WaterMeters[i], i + 1)
+                                               : GetResultsTestsAreColumns(results.WaterMeters[i], i + 1);
                         if (lview != null)
                         {
                             flowLayoutPanel.Controls.Add(lview);
@@ -182,19 +182,9 @@ namespace Results.Forms
         /// Get an empty ListView control with appropriate parameters.
         /// </summary>
         /// <returns>ListView control</returns>
-        ListView GetListView()
+        OneWMResultsCtrl GetListView()
         {
-            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;
+            return new OneWMResultsCtrl(Color.White, lvWidth, lvHeight);
         }
 
 
@@ -225,11 +215,16 @@ namespace Results.Forms
         /// </summary>
         /// <param name="mtr">Water meter number (1-based): 1 .. Config.Data.WMsCount</param>
         /// <returns>ListView object</returns>
-        ListView GetResultsTestsAreRows(Results.Entities.WaterMeter wMtr, int printedWMNr)
+        OneWMResultsCtrl GetResultsTestsAreRows(Results.Entities.WaterMeter wMtr, int printedWMNr)
         {
             metersKind = wMtr.Compound() ? MetersKind.Combined : (wMtr.HeatMeter() ? MetersKind.HeatMeter : MetersKind.Single);
 
-            ListView lview = GetListView();
+            OneWMResultsCtrl lview = GetListView();
+#if ORACLE_DB
+            lview.Caption = string.Format("PCB {0}  {1} {2}", (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr), Strings.repetition, (wMtr.Pruefindex % 100));
+#else
+            lview.Caption = string.Format("s/n = {0}", string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr);
+#endif
 
             IList<Results.WMeterRsltItemSpec> items = GetRsltItems(metersKind);
 
@@ -290,11 +285,16 @@ namespace Results.Forms
         /// </summary>
         /// <param name="mtr">Water meter number (1-based): 1 .. Config.Data.WMsCount</param>
         /// <returns>ListView object</returns>
-        ListView GetResultsTestsAreColumns(Results.Entities.WaterMeter wMtr, int printedWMNr)
+        OneWMResultsCtrl GetResultsTestsAreColumns(Results.Entities.WaterMeter wMtr, int printedWMNr)
         {
             metersKind = wMtr.Compound() ? MetersKind.Combined : (wMtr.HeatMeter() ? MetersKind.HeatMeter : MetersKind.Single);
 
-            ListView lview = GetListView();
+            OneWMResultsCtrl lview = GetListView();
+#if ORACLE_DB
+            lview.Caption = string.Format("PCB {0}  {1} {2}", (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr), Strings.repetition, (wMtr.Pruefindex % 100));
+#else
+            lview.Caption = string.Format("s/n = {0}", string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr);
+#endif
 
             IList<Results.WMeterRsltItemSpec> items = GetRsltItems(metersKind);
 

Results/Forms/OneWMResultsCtrl.Designer.cs

@@ -0,0 +1,102 @@
+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

@@ -0,0 +1,26 @@
+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/Forms/OneWMResultsCtrl.resx

@@ -0,0 +1,120 @@
+<?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>

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,7 +270,28 @@ 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,7 +54,6 @@ namespace Results.Mappings
 #endif
 #if ORACLE_DB
 			Map(x => x.WMTypeId);
-			Map(x => x.WMTypeRev);
 #endif
         }
 	}

Results/Mappings/WaterMeterMap.cs

@@ -28,7 +28,6 @@ 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);
@@ -36,14 +35,29 @@ namespace Results.Mappings
             Map(x => x.Q2ErrWOCorrection);
 			Map(x => x.Q2CorrectionDone);
 			Map(x => x.Q2Correction);
-            Map(x => x.Q2CorrRL).Column("Q2CorrRFlow");
-            Map(x => x.Q2CorrLR).Column("Q2CorrLFlow");
+            Map(x => x.Q2CorrRL);
+            Map(x => x.Q2CorrLR);
             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

@@ -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.1110.0")]
-[assembly: AssemblyFileVersion("2.18.1110.0")]
+[assembly: AssemblyVersion("2.18.1142.0")]
+[assembly: AssemblyFileVersion("2.18.1142.0")]

Results/Resources/Strings.Designer.cs

@@ -798,6 +798,15 @@ 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>

Results/Resources/Strings.cs.resx

@@ -255,4 +255,7 @@
   <data name="Batch" xml:space="preserve">
     <value>Dávka</value>
   </data>
+  <data name="repetition" xml:space="preserve">
+    <value>opakování</value>
+  </data>
 </root>

Results/Resources/Strings.resx

@@ -741,4 +741,7 @@
   <data name="Batch" xml:space="preserve">
     <value>Batch</value>
   </data>
+  <data name="repetition" xml:space="preserve">
+    <value>repetition</value>
+  </data>
 </root>

Results/Results.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;IZRAEL_200</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</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;IZRAEL_200</DefineConstants>
+    <DefineConstants>TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -80,6 +80,12 @@
     <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>
@@ -159,6 +165,9 @@
     <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,6 +31,21 @@ 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).

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) == 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)));
+            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));
 
 			///
 			/// Mass
@@ -314,7 +314,8 @@ 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)));
+            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));
 #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))));
@@ -371,8 +372,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)));
-			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.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.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)));
@@ -407,8 +408,10 @@ 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))));
-            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))));
+            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));
 #endif
 
 #if IPERL
@@ -418,14 +421,31 @@ namespace Results
             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.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.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.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())));
@@ -447,6 +467,7 @@ 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)));
@@ -460,7 +481,8 @@ namespace Results
 
         public static string FormatStr(string format, string value)
         {
-            return  string.IsNullOrEmpty(format) ? value : string.Format(format, value);
+            string valueEx = string.IsNullOrEmpty(value) ? string.Empty : value;
+            return  string.IsNullOrEmpty(format) ? valueEx : string.Format(format, valueEx);
         }
 
         public static string FormatBool(string format, bool value)
@@ -476,6 +498,23 @@ 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(138, 20);
+            this.batchNrTextBox.Size = new System.Drawing.Size(80, 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(138, 20);
+            this.procedureTextBox.Size = new System.Drawing.Size(360, 20);
             this.procedureTextBox.TabIndex = 0;
             // 
-            // ProcedureFilter
+            // ProcedureFilterUI
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.groupBox1);
-            this.Name = "ProcedureFilter";
+            this.Name = "ProcedureFilterUI";
             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(138, 20);
+            this.procedureTextBox.Size = new System.Drawing.Size(80, 20);
             this.procedureTextBox.TabIndex = 0;
             // 
-            // QnFilter
+            // QnFilterUI
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.groupBox1);
-            this.Name = "QnFilter";
+            this.Name = "QnFilterUI";
             this.Size = new System.Drawing.Size(835, 40);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();

ResultsBrowser/Filters/SerialNrFilter.cs

@@ -30,7 +30,6 @@ namespace ResultsBrowser.Filters
         ///
         public string SerialNr;
 
-
         private SerialNrFilterUI userIface;
 
         public SerialNrFilter()
@@ -42,21 +41,50 @@ 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)
                 {
-                    IList<WaterMeter> wms = se.QueryOver<WaterMeter>()
-                                              .Where(x => (x.SerialNr == SerialNr))
-                                              .List<WaterMeter>();
-                    foreach (var wm in wms) filteredWaterMeters.Add(wm);
+                    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);
+                    }
                 }
             }
             else
             {
                 foreach (var wm in waterMeters)
                 {
-                    if (wm.SerialNr == SerialNr) filteredWaterMeters.Add(wm);
+                    if (serialNumbers.Contains(wm.SerialNr)) filteredWaterMeters.Add(wm);
                 }
             }
 

ResultsBrowser/Filters/SerialNrFilterUI.Designer.cs

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

ResultsBrowser/Filters/SerialNrFilterUI.cs

@@ -35,5 +35,14 @@ 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(138, 20);
+            this.wmPositionTextBox.Size = new System.Drawing.Size(80, 20);
             this.wmPositionTextBox.TabIndex = 0;
             // 
             // WMPositionFilterUI

ResultsBrowser/Forms/HistogramCtrl.Designer.cs

@@ -0,0 +1,76 @@
+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

@@ -0,0 +1,42 @@
+///
+/// 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/HistogramCtrl.resx

@@ -0,0 +1,120 @@
+<?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/HistogramDlg.Designer.cs

@@ -0,0 +1,150 @@
+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

@@ -0,0 +1,152 @@
+///
+/// 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

@@ -0,0 +1,120 @@
+<?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

@@ -0,0 +1,91 @@
+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

@@ -0,0 +1,67 @@
+///
+/// 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

@@ -0,0 +1,120 @@
+<?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,4 +1,7 @@
-using System;
+///
+/// Copyright (c) 2016-2019 Sensus Slovensko a.s.
+///
+using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
 using Results.Entities;
@@ -11,22 +14,7 @@ namespace ResultsBrowser.Forms
     public partial class StatisticsDlg : Form
     {
         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;
+        StatisticsOptionsDlg options;
 
         IList<string> rowValues;
         IList<string> columnValues;
@@ -36,23 +24,14 @@ namespace ResultsBrowser.Forms
 		string title;
 
 
-		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,
+		public StatisticsDlg(IList<WaterMeter> waterMeters, StatisticsOptionsDlg options,
 							 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);
@@ -66,26 +45,6 @@ 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)
@@ -105,16 +64,16 @@ namespace ResultsBrowser.Forms
                 ///
                 foreach (var wm in waterMeters)
                 {
-                    string value = rowItem.Print(wm);
-					if (rowItem2 != null) value = value + " | " + rowItem2.Print(wm);
-					if (rowItem3 != null) value = value + " | " + rowItem3.Print(wm);
+                    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);
 					if (!rowValues.Contains(value)) rowValues.Add(value);
 
-                    if (twoDim)
+                    if (options.TwoDim)
                     {
-                        value = columnItem.Print(wm);
-						if (columnItem2 != null) value = value + " | " + columnItem2.Print(wm);
-						if (columnItem3 != null) value = value + " | " + columnItem3.Print(wm);
+                        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);
 						if (!columnValues.Contains(value)) columnValues.Add(value);
                     }
                 }
@@ -129,17 +88,17 @@ namespace ResultsBrowser.Forms
                 {
                     for (int row = 0; row < rowValues.Count; row++)
                     {
-						string rowValue = rowItem.Print(wm);
-						if (rowItem2 != null) rowValue = rowValue + " | " + rowItem2.Print(wm);
-						if (rowItem3 != null) rowValue = rowValue + " | " + rowItem3.Print(wm);
+						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);
 
-                        if (twoDim)
+                        if (options.TwoDim)
                         {
                             for (int column = 0; column < columnsCount; column++)
                             {
-								string columnValue = columnItem.Print(wm);
-								if (columnItem2 != null) columnValue = columnValue + " | " + columnItem2.Print(wm);
-								if (columnItem3 != null) columnValue = columnValue + " | " + columnItem3.Print(wm);
+								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);
 
 								if (rowValue == rowValues[row] && columnValue == columnValues[column])
 								{
@@ -164,7 +123,7 @@ namespace ResultsBrowser.Forms
                 statisticsListView.Columns.Add(" ", 200);
                 for (int column = 0; column < columnsCount; column++)
                 {
-                    statisticsListView.Columns.Add((twoDim ? columnValues[column] : Strings.Count), 70);
+                    statisticsListView.Columns.Add((options.TwoDim ? columnValues[column] : Strings.Count), 70);
                 }
 
                 for (int row = 0; row < rowValues.Count; row++)
@@ -197,7 +156,7 @@ namespace ResultsBrowser.Forms
 			table[0, 0] = string.Empty;
 			for (int column = 0; column < columnsCount; column++)
 			{
-				table[0, column + 1] = (twoDim ? columnValues[column] : Strings.Count);
+				table[0, column + 1] = (options.TwoDim ? columnValues[column] : Strings.Count);
 			}
 
 			for (int row = 0; row < rowValues.Count; row++)
@@ -234,7 +193,7 @@ namespace ResultsBrowser.Forms
                 {
                     using (TextWriter writer = new StreamWriter(dlg.FileName, false, System.Text.Encoding.UTF8))
                     {
-                        if (twoDim)
+                        if (options.TwoDim)
                         {
                             /// Write column headers
                             for (int i = 0; i < columnValues.Count; i++)
@@ -245,7 +204,7 @@ namespace ResultsBrowser.Forms
                         }
                         else
                         {
-                            writer.WriteLine(string.Format("\"{0}\";\"{1}\"", rowItem.Caption, Strings.Count));
+                            writer.WriteLine(string.Format("\"{0}\";\"{1}\"", options.RowItem.Caption, Strings.Count));
                         }
 
                         int nrColumns = Math.Max(1, columnValues.Count);

ResultsBrowser/Forms/StatisticsOptionsDlg.cs

@@ -1,4 +1,7 @@
-using System;
+///
+/// Copyright (c) 2016-2019 Sensus Slovensko a.s.
+///
+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.1114.0")]
-[assembly: AssemblyFileVersion("2.18.1114.0")]
+[assembly: AssemblyVersion("2.18.1146.0")]
+[assembly: AssemblyFileVersion("2.18.1146.0")]

ResultsBrowser/Resources/Strings.cs.resx

@@ -240,4 +240,7 @@
   <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,4 +828,7 @@
   <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,6 +1257,15 @@ 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;IZRAEL_200</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</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;IZRAEL_200</DefineConstants>
+    <DefineConstants>TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -60,6 +60,7 @@
     </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" />
@@ -133,6 +134,24 @@
     <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>
@@ -202,6 +221,15 @@
     <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,10 +34,13 @@
             this.filtersFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
             this.resultsGroupBox = new System.Windows.Forms.GroupBox();
             this.resultsListView = new System.Windows.Forms.ListView();
-            this.printerConfigBtn = new System.Windows.Forms.Button();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.histogramBtn = new System.Windows.Forms.Button();
             this.statisticsBtn = new System.Windows.Forms.Button();
-            this.printQueryResultsBtn = 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.formatOfResultsBtn = new System.Windows.Forms.Button();
             this.clearFiltersBtn = new System.Windows.Forms.Button();
             this.settingsBtn = new System.Windows.Forms.Button();
@@ -62,6 +65,8 @@
             this.hSplitContainer.SuspendLayout();
             this.filtersGroupBox.SuspendLayout();
             this.resultsGroupBox.SuspendLayout();
+            this.groupBox1.SuspendLayout();
+            this.outputGroupBox.SuspendLayout();
             this.testBenchesGroupBox.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -79,10 +84,9 @@
             // 
             // 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);
@@ -154,6 +158,68 @@
             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);
@@ -164,36 +230,6 @@
             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);
@@ -370,6 +406,8 @@
             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);
@@ -402,5 +440,8 @@
         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,4 +1,7 @@
-using System;
+///
+/// Copyright (c) 2016-2019 Sensus Slovensko a.s.
+///
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Windows.Forms;
@@ -489,7 +492,7 @@ namespace ResultsBrowser
 			IList<Results.WMeterRsltItemSpec> items = Results.WMeterRsltItemSpec.FromStrArray(filtersConfig.ResultItems);
 
             ///
-            /// Enter options
+            /// Statistics options
             ///
             Forms.StatisticsOptionsDlg optionsDlg = new Forms.StatisticsOptionsDlg(items);
             if (optionsDlg.ShowDialog() != DialogResult.OK) return;
@@ -497,16 +500,31 @@ namespace ResultsBrowser
             ///
             /// Calculate statistics
             ///
-            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);
+            Forms.StatisticsDlg statisticsDlg = new Forms.StatisticsDlg(waterMeters, optionsDlg, 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>

TBF/BenchControl/Ambient/Comet/Ambient.cs

@@ -27,16 +27,13 @@ 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()
 		{
@@ -64,6 +61,7 @@ namespace TBF.BenchControl.Ambient.Comet
 				temperature = 20.0f;
 				humidity = 40.0f;
 				pressure = 1.0f;
+
 				msrmntTimeStamp = StateMachine.Time;
 				msrmntState = MsrmntState.Valid;
 				return;
@@ -73,7 +71,9 @@ namespace TBF.BenchControl.Ambient.Comet
 			serialPort = new SerialPort(comPortName, ambientCfg.BaudRate, ambientCfg.Parity, ambientCfg.DataBits, ambientCfg.StopBits);
 			serialPort.Handshake = ambientCfg.Handshake;
 			serialPort.Open();
-			msrmntState = MsrmntState.Busy;
+
+            msrmntTimeStamp = 0;
+            msrmntState = MsrmntState.Busy;
 
             log.FatalFormat("Successfully initialized device {0}", ToString());
         }
@@ -81,114 +81,102 @@ namespace TBF.BenchControl.Ambient.Comet
         /// <summary>Run this device</summary>
         public void RunDeviceBefore()
         {
-			if (ambientCfg.DebugLevel == DebugMode.Simulate ||
-				ambientCfg.DebugLevel == DebugMode.FailureDuringOperation)
-			{
-				msrmntTimeStamp = StateMachine.Time;
-				return;
-			}
+            if ((ambientCfg.DebugLevel == DebugMode.Normal) && (serialPort != null))
+            {
+                ///
+                /// Read response
+                /// 
+                try
+                {
+                    int receivedBytes = serialPort.BytesToRead;
 
-			if (serialPort == null)
-			{
-				log.ErrorFormat("{0} - RunDeviceBefore() - serial port closed", Name);
-				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));
 
-			try
-			{
-				int receivedBytes = serialPort.BytesToRead;
+                        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;
 
-				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[5] * 256 + (int)byteArr[6];
+                            humidity = (float)value / 10.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;
+                            value = (int)byteArr[9] * 256 + (int)byteArr[10];
+                            pressure = (float)value / 10000.0f;
 
-						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);
+                            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 = null;
+                }
+                catch (Exception e)
+                {
+                    DebugLevel = DebugMode.FailureDuringOperation;
+                    //serialPort.Close();   /// ?
+                    serialPort = null;
 
-				log.FatalFormat("Ambient: Serail port read failure : {0}", e.Message);
-				if (e.InnerException != null)
-				{
-					log.FatalFormat("InnerMessage : {0}", e.InnerException.Message);
-				}
-			}
+                    log.FatalFormat("Ambient: Serial 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.Simulate ||
-				ambientCfg.DebugLevel == DebugMode.FailureDuringOperation)
-			{
-				return;
-			}
+            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 (serialPort == null)
-			{
-				log.ErrorFormat("{0} - RunDeviceAfter() - serial port closed", Name);
-				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);
 
-			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.Debug(Telegram.LogTelegram("Sending ", msg));
+                        serialPort.Write(msg, 0, msg.Length);
+                    }
+                    catch (Exception e)
+                    {
+                        DebugLevel = DebugMode.FailureDuringOperation;
+                        //serialPort.Close();   /// ?
+                        serialPort = null;
 
-					/// 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);
-				}
-			}
+                        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 (serialPort != null)
+            if ((ambientCfg.DebugLevel == DebugMode.Normal) && (serialPort != null))
 			{
 				serialPort.Close();
 				serialPort = null;
@@ -206,18 +194,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>
@@ -226,9 +214,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/Elde/ControlComWrap.cs

@@ -94,9 +94,9 @@ namespace TBF.BenchControl.Elde
             return ctrlBrdComponent.Analogy[rvNr1 - 1];             /// Fixes bug: RValvePosition returns 0 all the time
         }
         public float DivSamples(int time, int divIx0)
-        {
-#if MUNICH || IZRAEL_200
-            return ctrlBrdComponent.DIVSamples[time, 0];
+		{
+#if MUNICH
+			return ctrlBrdComponent.DIVSamples[time, 0];
 #else
 			return ctrlBrdComponent.DIVSamples[time, divIx0];
 #endif

TBF/BenchControl/GenericDevices/IParallelOutput.cs

@@ -0,0 +1,15 @@
+///
+/// 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

@@ -0,0 +1,12 @@
+///
+/// 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.Batch batchResults);
+        IOperation ReadStartInfoOp(Results.Entities.WaterMeter[] waterMeters);
     }
 }

TBF/BenchControl/Modbus/Common/Modbus.cs

@@ -28,6 +28,7 @@ namespace TBF.BenchControl.Modbus.Common
 		/// Private fields
 		SerialPort serialPort;
         DateTime lastSerialPortWrite;
+        bool initialRunDeviceCommComplete;
 
 		public Queue<byte[]>[] ReceivedTelegrams
 		{
@@ -82,6 +83,8 @@ 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);
 		}
 
@@ -99,7 +102,7 @@ namespace TBF.BenchControl.Modbus.Common
 
 			Telegram.UpdateTelegramCRC(message);
 
-            if ((DateTime.Now - lastSerialPortWrite) > new TimeSpan(0, 0, 0, 0, 100))
+            if ((DateTime.Now - lastSerialPortWrite) > new TimeSpan(0, 0, 0, 0, 100) && initialRunDeviceCommComplete)
             {
                 /// More then 100 ms since last 'send' --> do not enqueue the message
                 SendMessageNow(message);
@@ -174,12 +177,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);
+                }
 			}
 		}
 
@@ -188,6 +191,16 @@ 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());
@@ -197,15 +210,27 @@ 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() { }
+		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;
+            }
+        }
 	}
 }

TBF/BenchControl/Modbus/QuidoRS/Factory.cs

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

TBF/BenchControl/Modbus/QuidoRS/QuidoRS.cs

@@ -1,15 +1,17 @@
 ///
-/// Copyright (c) 2015 Sensus Metering Systems
+/// Copyright (c) 2015-2019 Sensus Slovensko a.s.
 ///
 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
+    public class QuidoRS : ComponentBase, IDevice, GenericDevices.IParallelOutput
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(QuidoRS));
         public override string ToString() { return string.Format("QuidoRS({0})", Cfg.ToString(1)); }
@@ -60,12 +62,22 @@ namespace TBF.BenchControl.Modbus.QuidoRS
 
             if (modbus.ReceivedTelegrams[quidoRSCfg.ModbusAddress].Count > 0)
             {
-                modbus.ReceivedTelegrams[quidoRSCfg.ModbusAddress].Dequeue();
+				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);
+                }
             }
         }
 
 		public void RunDeviceAfter() { }
-		public void StopDevice() { }
+		public void StopDevice() { SendOutputs(0); }
 		public void StopDevice2() { }
 
 
@@ -124,19 +136,19 @@ namespace TBF.BenchControl.Modbus.QuidoRS
 
         private void SendOutputs(ushort outputs)
 		{
-            byte[] msg = new byte[11];
+            byte addr = quidoRSCfg.ModbusAddress;
+            byte cmd = (byte)Function.ForceMultipleCoils;
+            byte dataLo = (byte)(outputs & 0xFF);
+            byte dataHi = (byte)(outputs >> 8);	
 
-			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);
+			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_8_8)
+			{
+                modbus.SendMessage(new byte[] { addr, cmd, 0, 0, 0, 8, 1, dataLo, 0, 0 });                                                    
+            }
 
             lastOutputsChange = DateTime.Now;
         }
@@ -145,22 +157,29 @@ namespace TBF.BenchControl.Modbus.QuidoRS
 		/// <summary>
 		/// Events:  SetOpututsDone, Error
 		/// </summary>
-		/// <param name="outValue">Reference to a variable for the pressure in Bar</param>
-		/// <returns>SetOutputsOp instance reference casted to IOperaton</returns>
+		/// <param name="outValue">Parallel output data</param>
+		/// <returns>SetOutputsOp operation casted to IOperaton</returns>
 		public IOperation SetOutputsOp(ushort outValue)
 		{
 			return new SetOutputsOp(this, outValue);
 		}
 
 		/// <summary>
-		/// Events:  pressureDone, Error
+		/// Events:  Event.None
 		/// </summary>
-		/// <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)
+        /// <returns>ShowBenchWaitingOp operation casted to generic IOperaton</returns>
+		public IOperation ShowBenchWaitingOp()
 		{
-			return new SetOutputsOp(this, outValue, setOutputsDone);
+            return new ShowBenchWaitingOp(this);
 		}
-	}
+
+        /// <summary>
+        /// Events:  Event.None
+        /// </summary>
+        /// <returns>ShowBenchErrorOp operation casted to generic IOperaton</returns>
+        public IOperation ShowBenchErrorOp()
+        {
+            return new ShowBenchErrorOp(this);
+        }
+    }
 }

TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2016 Sensus Metering Systems
+/// Copyright (c) 2015-2019 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -9,6 +9,13 @@ using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Modbus.QuidoRS
 {
+    public enum QuidoVariant
+    {
+        QuidoRS_2_16,
+        QuidoRS_8_8,
+        Count
+    }
+
     public class QuidoRSCfg : ComponentCfgBase, Generic.IChildComponentCfg
 	{
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(QuidoRSCfg) })[0];
@@ -19,7 +26,8 @@ namespace TBF.BenchControl.Modbus.QuidoRS
 		///
 		/// Serialized parameters 
 		///
-		public byte ModbusAddress;		/// 1..255
+		public byte ModbusAddress;		/// 1..247
+        public QuidoVariant Variant;    /// 'QuidoRS_2_16' or 'QuidoRS_8_8'
         public bool WatchdogEnabled;
         public int WatchdogBitNr;       /// 0..15
 
@@ -29,7 +37,8 @@ namespace TBF.BenchControl.Modbus.QuidoRS
             Name = "QuidoRS";
             ParentName = "Modbus";
             ModbusAddress = 49;
-            WatchdogEnabled = true;
+            Variant = QuidoVariant.QuidoRS_2_16;
+            WatchdogEnabled = false;
             WatchdogBitNr = 4;
         }
 
@@ -41,9 +50,10 @@ namespace TBF.BenchControl.Modbus.QuidoRS
 
 		public string ToString(int i)
 		{
-			return string.Format("Name={0}, ModbusAddr={1}, Parent={2}",
+			return string.Format("Name={0}, ModbusAddress={1}, Variant={2}, Parent={2}",
                                  Name,
 								 ModbusAddress,
+                                 Variant,
 								 (string.IsNullOrEmpty(ParentName) ? "-" : ParentName));
 		}
 	}

TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfgCtrl.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015 Sensus Metering Systems
+/// Copyright (c) 2015-2019 Sensus Slovensko a.s.
 ///
 using System;
 using System.Windows.Forms;
@@ -46,6 +46,8 @@ namespace TBF.BenchControl.Modbus.QuidoRS
 				}
 			}
 
+            for (QuidoVariant v = 0; v < QuidoVariant.Count; v++) variantComboBox.Items.Add(v.ToString());
+
 			Redraw();
 		}
 
@@ -61,6 +63,7 @@ namespace TBF.BenchControl.Modbus.QuidoRS
 			nameTextBox.Text = config.Name;
 			parentNameComboBox.Text = string.IsNullOrEmpty(config.ParentName) ? "---" : config.ParentName;
 			modbusAddressTextBox.Text = config.ModbusAddress.ToString();
+            variantComboBox.Text = config.Variant.ToString();
             watchdogCheckBox.Checked = config.WatchdogEnabled;
             watchdogBitNrTextBox.Text = config.WatchdogBitNr.ToString();
 		}
@@ -70,6 +73,7 @@ namespace TBF.BenchControl.Modbus.QuidoRS
 			nameTextBox.Enabled = true;
 			parentNameComboBox.Enabled = true;
 			modbusAddressTextBox.Enabled = true;
+            variantComboBox.Enabled = true;
             watchdogCheckBox.Enabled = true;
             watchdogBitNrTextBox.Enabled = true;
 		}
@@ -84,11 +88,16 @@ namespace TBF.BenchControl.Modbus.QuidoRS
 				flags |= CfgUpdateFlags.Error;
 				message += Environment.NewLine + "Invalid 'Parent Name'";
 			}
-			if (!int.TryParse(modbusAddressTextBox.Text, out dummy) || dummy < 0 || dummy > 255)
+			if (!int.TryParse(modbusAddressTextBox.Text, out dummy) || dummy < 1 || dummy > 247)
 			{
 				flags |= CfgUpdateFlags.Error;
 				message += Environment.NewLine + "'Modbus Address' should be between 0 and 255";
 			}
+            if (!variantComboBox.Items.Contains(variantComboBox.Text))
+            {
+                flags |= CfgUpdateFlags.Error;
+                message += Environment.NewLine + "Invalid 'Variant'";
+            }
             if (!int.TryParse(watchdogBitNrTextBox.Text, out dummy) || dummy < 0 || dummy > 15)
             {
                 flags |= CfgUpdateFlags.Error;
@@ -106,6 +115,10 @@ namespace TBF.BenchControl.Modbus.QuidoRS
 			config.Name = nameTextBox.Text;
 			config.ParentName = parentNameComboBox.Text.Equals("---") ? string.Empty : parentNameComboBox.Text;
 			config.ModbusAddress = (byte)int.Parse(modbusAddressTextBox.Text);
+            for (QuidoVariant v = 0; v < QuidoVariant.Count; v++)
+            {
+                if (variantComboBox.Text == v.ToString()) { config.Variant = v; break; }
+            }
             config.WatchdogEnabled = watchdogCheckBox.Checked;
             config.WatchdogBitNr = int.Parse(watchdogBitNrTextBox.Text);
 

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

@@ -41,6 +41,8 @@ namespace TBF.BenchControl.Modbus.QuidoRS
             this.watchdogCheckBox = new System.Windows.Forms.CheckBox();
             this.watchdogBitNrTextBox = new System.Windows.Forms.TextBox();
             this.watchdogBitNrLabel = new System.Windows.Forms.Label();
+            this.variantComboBox = new System.Windows.Forms.ComboBox();
+            this.variantLabel = new System.Windows.Forms.Label();
             this.SuspendLayout();
             // 
             // parentNameLabel
@@ -84,7 +86,7 @@ namespace TBF.BenchControl.Modbus.QuidoRS
             this.modbusAddressLabel.Location = new System.Drawing.Point(28, 108);
             this.modbusAddressLabel.Name = "modbusAddressLabel";
             this.modbusAddressLabel.Size = new System.Drawing.Size(86, 13);
-            this.modbusAddressLabel.TabIndex = 7;
+            this.modbusAddressLabel.TabIndex = 5;
             this.modbusAddressLabel.Text = "Modbus Address";
             // 
             // modbusAddressTextBox
@@ -93,7 +95,7 @@ namespace TBF.BenchControl.Modbus.QuidoRS
             this.modbusAddressTextBox.Location = new System.Drawing.Point(138, 105);
             this.modbusAddressTextBox.Name = "modbusAddressTextBox";
             this.modbusAddressTextBox.Size = new System.Drawing.Size(46, 20);
-            this.modbusAddressTextBox.TabIndex = 8;
+            this.modbusAddressTextBox.TabIndex = 6;
             // 
             // parentNameComboBox
             // 
@@ -108,7 +110,7 @@ namespace TBF.BenchControl.Modbus.QuidoRS
             // 
             this.watchdogCheckBox.AutoSize = true;
             this.watchdogCheckBox.Enabled = false;
-            this.watchdogCheckBox.Location = new System.Drawing.Point(31, 131);
+            this.watchdogCheckBox.Location = new System.Drawing.Point(31, 164);
             this.watchdogCheckBox.Name = "watchdogCheckBox";
             this.watchdogCheckBox.Size = new System.Drawing.Size(99, 17);
             this.watchdogCheckBox.TabIndex = 9;
@@ -118,7 +120,7 @@ namespace TBF.BenchControl.Modbus.QuidoRS
             // watchdogBitNrTextBox
             // 
             this.watchdogBitNrTextBox.Enabled = false;
-            this.watchdogBitNrTextBox.Location = new System.Drawing.Point(138, 153);
+            this.watchdogBitNrTextBox.Location = new System.Drawing.Point(138, 186);
             this.watchdogBitNrTextBox.Name = "watchdogBitNrTextBox";
             this.watchdogBitNrTextBox.Size = new System.Drawing.Size(46, 20);
             this.watchdogBitNrTextBox.TabIndex = 11;
@@ -126,16 +128,36 @@ namespace TBF.BenchControl.Modbus.QuidoRS
             // watchdogBitNrLabel
             // 
             this.watchdogBitNrLabel.AutoSize = true;
-            this.watchdogBitNrLabel.Location = new System.Drawing.Point(28, 156);
+            this.watchdogBitNrLabel.Location = new System.Drawing.Point(28, 189);
             this.watchdogBitNrLabel.Name = "watchdogBitNrLabel";
             this.watchdogBitNrLabel.Size = new System.Drawing.Size(81, 13);
             this.watchdogBitNrLabel.TabIndex = 10;
             this.watchdogBitNrLabel.Text = "Watchdog bit #";
             // 
+            // variantComboBox
+            // 
+            this.variantComboBox.Enabled = false;
+            this.variantComboBox.FormattingEnabled = true;
+            this.variantComboBox.Location = new System.Drawing.Point(138, 131);
+            this.variantComboBox.Name = "variantComboBox";
+            this.variantComboBox.Size = new System.Drawing.Size(130, 21);
+            this.variantComboBox.TabIndex = 8;
+            // 
+            // variantLabel
+            // 
+            this.variantLabel.AutoSize = true;
+            this.variantLabel.Location = new System.Drawing.Point(28, 134);
+            this.variantLabel.Name = "variantLabel";
+            this.variantLabel.Size = new System.Drawing.Size(40, 13);
+            this.variantLabel.TabIndex = 7;
+            this.variantLabel.Text = "Variant";
+            // 
             // QuidoRSCfgCtrl
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.variantComboBox);
+            this.Controls.Add(this.variantLabel);
             this.Controls.Add(this.watchdogBitNrTextBox);
             this.Controls.Add(this.watchdogBitNrLabel);
             this.Controls.Add(this.watchdogCheckBox);
@@ -147,7 +169,7 @@ namespace TBF.BenchControl.Modbus.QuidoRS
             this.Controls.Add(this.nameLabel);
             this.Controls.Add(this.componentNameLabel);
             this.Name = "QuidoRSCfgCtrl";
-            this.Size = new System.Drawing.Size(300, 200);
+            this.Size = new System.Drawing.Size(374, 268);
             this.Load += new System.EventHandler(this.QuidoRSCfgCtrl_Load);
             this.ResumeLayout(false);
             this.PerformLayout();
@@ -166,5 +188,7 @@ namespace TBF.BenchControl.Modbus.QuidoRS
         private System.Windows.Forms.CheckBox watchdogCheckBox;
         private System.Windows.Forms.TextBox watchdogBitNrTextBox;
         private System.Windows.Forms.Label watchdogBitNrLabel;
+        private System.Windows.Forms.ComboBox variantComboBox;
+        private System.Windows.Forms.Label variantLabel;
 	}
 }

TBF/BenchControl/Modbus/QuidoRS/SetOutputsOp.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015 Sensus Metering Systems
+/// Copyright (c) 2015 Sensus Slovensko a.s.
 ///
 using System;
 using log4net;

TBF/BenchControl/Modbus/QuidoRS/ShowBenchErrorOp.cs

@@ -0,0 +1,51 @@
+///
+/// Copyright (c) 2019 Sensus Slovensko a.s.
+///
+using System;
+using log4net;
+using TBF.Boxes;
+
+namespace TBF.BenchControl.Modbus.QuidoRS
+{
+    public class ShowBenchErrorOp : IOperation
+    {
+        private static readonly ILog log = LogManager.GetLogger(typeof(ShowBenchErrorOp));
+        public override string ToString() { return string.Format("ShowBenchErrorOp(.)"); }
+
+        const ushort BenchReadyValue = 0x01;
+        const ushort BenchErrorValue = 0x06;
+
+        /// Set by the constructor
+        readonly QuidoRS quidoRS;
+
+        /// <summary>
+        /// Events:  Event.None
+        /// </summary>
+        /// <param name="quidoRS">Pressure meter reference</param>
+        public ShowBenchErrorOp(QuidoRS quidoRS)
+        {
+            if (quidoRS == null) throw new ArgumentNullException("quidoRS");
+            this.quidoRS = quidoRS;
+
+            log.Debug(this.ToString());
+        }
+
+        /// <summary>Start this operation</summary>
+        public void Start()
+        {
+            quidoRS.SetOutputs(BenchErrorValue);
+        }
+
+        /// <summary>Run this operation</summary>
+        public Event Run()
+        {
+            return Event.None;
+        }
+
+        /// <summary>Stop this operation</summary>
+        public void Stop()
+        {
+            quidoRS.SetOutputs(BenchReadyValue);
+        }
+    }
+}

TBF/BenchControl/Modbus/QuidoRS/ShowBenchWaitingOp.cs

@@ -0,0 +1,51 @@
+///
+/// Copyright (c) 2019 Sensus Slovensko a.s.
+///
+using System;
+using log4net;
+using TBF.Boxes;
+
+namespace TBF.BenchControl.Modbus.QuidoRS
+{
+    public class ShowBenchWaitingOp : IOperation
+    {
+        private static readonly ILog log = LogManager.GetLogger(typeof(ShowBenchWaitingOp));
+        public override string ToString() { return string.Format("ShowBenchWaitingOp(.)"); }
+
+        const ushort BenchReadyValue = 0x01;
+        const ushort BenchWaitingValue = 0x06;
+
+        /// Set by the constructor
+        readonly QuidoRS quidoRS;
+
+        /// <summary>
+        /// Events:  Event.None
+        /// </summary>
+        /// <param name="quidoRS">Pressure meter reference</param>
+        public ShowBenchWaitingOp(QuidoRS quidoRS)
+        {
+            if (quidoRS == null) throw new ArgumentNullException("quidoRS");
+            this.quidoRS = quidoRS;
+
+            log.Debug(this.ToString());
+        }
+
+        /// <summary>Start this operation</summary>
+        public void Start()
+        {
+            quidoRS.SetOutputs(BenchWaitingValue);
+        }
+
+        /// <summary>Run this operation</summary>
+        public Event Run()
+        {
+            return Event.None;
+        }
+
+        /// <summary>Stop this operation</summary>
+        public void Stop()
+        {
+            quidoRS.SetOutputs(BenchReadyValue);
+        }
+    }
+}

TBF/BenchControl/Operations/LargeMessageBoxForm.Designer.cs

@@ -0,0 +1,86 @@
+///
+/// Copyright (c) 2019 Sensus Metering Systems
+///
+namespace TBF.BenchControl.Operations
+{
+	partial class LargeMessageBoxForm
+	{
+		/// <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(452, 523);
+            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, 29);
+            this.messageLabel.Name = "messageLabel";
+            this.messageLabel.Size = new System.Drawing.Size(91, 23);
+            this.messageLabel.TabIndex = 4;
+            this.messageLabel.Text = "Message";
+            // 
+            // LargeMessageBoxForm
+            // 
+            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(1002, 617);
+            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 = "LargeMessageBoxForm";
+            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            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/Operations/LargeMessageBoxForm.cs

@@ -0,0 +1,99 @@
+///
+/// Copyright (c) 2019 Sensus Slovensko a.s.
+///
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using log4net;
+using TBF.Resources;
+
+namespace TBF.BenchControl.Operations
+{
+	public partial class LargeMessageBoxForm : Form
+	{
+        static readonly ILog log = LogManager.GetLogger(typeof(LargeMessageBoxForm));
+
+		/// Set to 'true' when the form closes
+		public bool Completed { get { return completed; } }
+		bool completed;
+
+
+		public LargeMessageBoxForm(string message, Color backgroundColor)
+		{
+			InitializeComponent();
+            //ControlBox = false;
+
+			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 LargeMessageBoxOp.
+        /// </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/Operations/LargeMessageBoxForm.resx

@@ -0,0 +1,120 @@
+<?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/Operations/LargeMessageBoxOp.cs

@@ -0,0 +1,76 @@
+///
+/// Copyright (c) 2019 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using TBF.BenchControl;
+using TBF.Resources;
+
+namespace TBF.BenchControl.Operations
+{
+	public class LargeMessageBoxOp : IOperation
+	{
+        LargeMessageBoxForm form;
+
+		string message;
+        Color backColor;
+		bool completed = false;
+
+		/// <returns>Reference to the operation</returns>
+		public LargeMessageBoxOp()
+            : this(Strings.Message)
+		{
+		}
+
+        public LargeMessageBoxOp(string message)
+            : this (message, Color.Goldenrod)
+        {
+        }
+
+		public LargeMessageBoxOp(string message, Color backColor)
+		{
+			this.message = message;
+            this.backColor = backColor;
+		}
+
+        delegate void MessageBoxFormDlgt(LargeMessageBoxOp myRef);
+        /// 
+        void OpenFormDlg(LargeMessageBoxOp myRef)
+        {
+			myRef.form = new LargeMessageBoxForm(message, backColor);
+            form.Show();
+        }
+
+		/// <summary>Start this operation</summary>
+		public void Start()
+		{
+			completed = false;
+			Program.MainWnd.Invoke(new MessageBoxFormDlgt(OpenFormDlg), this);
+		}
+
+		/// <summary>Run this operation</summary>
+		/// <returns>Event.ResultsPrinted</returns>
+		public Event Run()
+		{
+			if (completed || form.Completed)
+			{
+				completed = true;
+				form = null;
+				return Event.OK;
+			}
+
+			return Event.None;
+		}
+
+		/// <summary>Stop this operation</summary>
+		public void Stop()
+		{
+			if (form != null)
+			{
+                form.OnCloseThisForm(this, null);
+				form = null;
+			}
+		}
+	}
+}

TBF/BenchControl/Output/DB/SensusOracle/DatabaseCfg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2019 Sensus Slovensko a.s.
 ///
 using System;
 using System.Xml.Serialization;
@@ -39,6 +39,7 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
 		public int Baujahr;				/// Written to the database
 		public bool ReadStartInfo;
 		public bool SaveResults;
+        public bool StartInfoIsRequired;
 
 
 		/// Private parameterless constructor invoked by all other (public) constructors
@@ -51,6 +52,7 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
 			Baujahr = 2015;
 			ReadStartInfo = true;
 			SaveResults = true;
+            StartInfoIsRequired = false;
 		}
 
         public DatabaseCfg(IComponentFactory factory)
@@ -61,12 +63,14 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
 
 		public string ToString(int i)
 		{
-			return string.Format("BenchId={0}, DBUsed={1}, Baujahr={2}, ReadStartInfo={3}, SaveResults={4}",
+            return string.Format("Name={0}, BenchId={1}, DB={2}, Bjahr={3}, RdStartInfo={4}, SaveRslts={5}, StartInfoRqrd={6}",
+                                 Name,
 								 TestBenchId,
 								 DBUsed,
 								 Baujahr,
 								 ReadStartInfo,
-								 SaveResults);
+								 SaveResults,
+                                 StartInfoIsRequired);
 		}
 	}
 }

TBF/BenchControl/Output/DB/SensusOracle/DatabaseCfgCtrl.cs

@@ -52,6 +52,7 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
 			baujahrTextBox.Text = config.Baujahr.ToString();
 			readStartInfoCheckBox.Checked = config.ReadStartInfo;
 			saveResultsCheckBox.Checked = config.SaveResults;
+            startInfoIsRequiredCheckBox.Checked = config.StartInfoIsRequired;
 		}
 
 		public void Unlock()
@@ -62,6 +63,7 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
 			baujahrTextBox.Enabled = true;
 			readStartInfoCheckBox.Enabled = true;
 			saveResultsCheckBox.Enabled = true;
+            startInfoIsRequiredCheckBox.Enabled = true;
 		}
 
 		public CfgUpdateFlags VerifyCfg(ref string message)
@@ -135,6 +137,11 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
 				config.SaveResults = saveResultsCheckBox.Checked;
 				flags = CfgUpdateFlags.RestartRqrd;
 			}
+            if (startInfoIsRequiredCheckBox.Checked != config.StartInfoIsRequired)
+            {
+                config.StartInfoIsRequired = startInfoIsRequiredCheckBox.Checked;
+                flags = CfgUpdateFlags.RestartRqrd;
+            }
 
 			return flags;
 		}

TBF/BenchControl/Output/DB/SensusOracle/DatabaseCfgCtrl.designer.cs

@@ -42,6 +42,7 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
             this.dbUsedLabel = new System.Windows.Forms.Label();
             this.baujahrTextBox = new System.Windows.Forms.TextBox();
             this.baujahrLabel = new System.Windows.Forms.Label();
+            this.startInfoIsRequiredCheckBox = new System.Windows.Forms.CheckBox();
             this.SuspendLayout();
             // 
             // nameTextBox
@@ -74,7 +75,7 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
             // 
             this.readStartInfoCheckBox.AutoSize = true;
             this.readStartInfoCheckBox.Enabled = false;
-            this.readStartInfoCheckBox.Location = new System.Drawing.Point(111, 144);
+            this.readStartInfoCheckBox.Location = new System.Drawing.Point(111, 136);
             this.readStartInfoCheckBox.Name = "readStartInfoCheckBox";
             this.readStartInfoCheckBox.Size = new System.Drawing.Size(95, 17);
             this.readStartInfoCheckBox.TabIndex = 15;
@@ -85,7 +86,7 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
             // 
             this.saveResultsCheckBox.AutoSize = true;
             this.saveResultsCheckBox.Enabled = false;
-            this.saveResultsCheckBox.Location = new System.Drawing.Point(111, 167);
+            this.saveResultsCheckBox.Location = new System.Drawing.Point(111, 159);
             this.saveResultsCheckBox.Name = "saveResultsCheckBox";
             this.saveResultsCheckBox.Size = new System.Drawing.Size(84, 17);
             this.saveResultsCheckBox.TabIndex = 16;
@@ -144,10 +145,22 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
             this.baujahrLabel.TabIndex = 7;
             this.baujahrLabel.Text = "Baujahr";
             // 
+            // startInfoIsRequiredCheckBox
+            // 
+            this.startInfoIsRequiredCheckBox.AutoSize = true;
+            this.startInfoIsRequiredCheckBox.Enabled = false;
+            this.startInfoIsRequiredCheckBox.Location = new System.Drawing.Point(110, 182);
+            this.startInfoIsRequiredCheckBox.Name = "startInfoIsRequiredCheckBox";
+            this.startInfoIsRequiredCheckBox.Size = new System.Drawing.Size(119, 17);
+            this.startInfoIsRequiredCheckBox.TabIndex = 17;
+            this.startInfoIsRequiredCheckBox.Text = "Start info is required";
+            this.startInfoIsRequiredCheckBox.UseVisualStyleBackColor = true;
+            // 
             // DatabaseCfgCtrl
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.startInfoIsRequiredCheckBox);
             this.Controls.Add(this.baujahrTextBox);
             this.Controls.Add(this.baujahrLabel);
             this.Controls.Add(this.dbUsedComboBox);
@@ -180,5 +193,6 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
 		private System.Windows.Forms.Label dbUsedLabel;
 		private System.Windows.Forms.TextBox baujahrTextBox;
         private System.Windows.Forms.Label baujahrLabel;
+        private System.Windows.Forms.CheckBox startInfoIsRequiredCheckBox;
 	}
 }

TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs

@@ -23,8 +23,6 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
 
         WriterCfg writerCfg;
 
-        SensusTestInfo[] testInfos;
-
         enum CurrentOp
         {
             None,
@@ -51,8 +49,6 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
 			writerCfg = cfg as WriterCfg;
             currentOp = CurrentOp.None;
 
-            testInfos = SensusTestInfo.GetTestInfos(writerCfg.LogType);
-
 			log.Debug(this.ToString());
 		}
 
@@ -176,13 +172,22 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
                 return Retv.Error;          /// No logger
             }
 
+
             Results.Entities.WaterMeter wm0 = null;
             foreach (var m in batch.WaterMeters) if (m != null) { wm0 = m; break; }
             if (wm0 == null)
             {
                 return Retv.Error;          /// Not a single watermeter in the batch
             }
-            
+
+
+            SensusTestInfo[] testInfos = wm0.TestInfos as SensusTestInfo[];
+            if (testInfos == null)
+            {
+                return Retv.Error;          /// No test infos
+            }
+
+
             Results.Entities.WaterMeterData wmData = wm0.WaterMeterData;
 
             Results.Entities.MeterTestRslt[] wm0trs = new Results.Entities.MeterTestRslt[testInfos.Length];
@@ -213,11 +218,11 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
                 logger.WriteLine(string.Format("Qn={0}",                wmData.Q3_Qn.ToString("F1", Program.AltCulture)));
                 logger.WriteLine(string.Format("Impulsrate=1"));
 				logger.WriteLine(string.Format("WZid={0}",              wmData.WMTypeId));
-				logger.WriteLine(string.Format("RevWzTyp={0}",          wmData.WMTypeRev));
+                logger.WriteLine(string.Format("RevWzTyp={0}",          wm0.WMTypeRevision));
 				logger.WriteLine(string.Format("RevPruefstandWzTyp=2"));
 
                 for (int j = 0; j < testInfos.Length; j++)
-                {
+                {  
                     string fId = testInfos[j].PruefungsNrStr;
                     string qBz = testInfos[j].QBezeichnung;
                     Results.Entities.MeterTestRslt wm0r = wm0trs[j];
@@ -225,7 +230,7 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
 
                     if (wm0r != null)
                     {
-                        logger.WriteLine(string.Format("Durchfluss{0}={1}",         fId, Units.ConvertTo(Unit.lph, wm0r.Qfrom()).ToString("F1", Program.AltCulture)));
+                        logger.WriteLine(string.Format("Durchfluss{0}={1}",         fId, Units.ConvertTo(Unit.lph, (wm0r.Qfrom() + wm0r.Qto()) / 2).ToString("F1", Program.AltCulture)));
                         logger.WriteLine(string.Format("Prüfzeit{0}={1}",           fId, wm0r.TargetTime().ToString("F0")));
                         logger.WriteLine(string.Format("Prüfbereich100_110{0}={1}", fId, (pb_100_110 ? 1 : 0)));
                         logger.WriteLine(string.Format("PrüfbereichMin{0}={1}",     fId, (pb_100_110 ? 100 : 90)));
@@ -233,8 +238,8 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
                         logger.WriteLine(string.Format("QBezeichnung{0}={1}",       fId, qBz));
                         if (fId != "-1")
                         {
-                            logger.WriteLine(string.Format("PosFehlergrenze{0}={1}", fId, wm0r.ErrLimHi().ToString("F1", Program.AltCulture)));
-                            logger.WriteLine(string.Format("NegFehlergrenze{0}={1}", fId, wm0r.ErrLimLo().ToString("F1", Program.AltCulture)));
+                            logger.WriteLine(string.Format("PosFehlergrenze{0}={1}", fId, (wm0r.ErrLimHi() - wm0r.Uncertainty()).ToString("F1", Program.AltCulture)));
+                            logger.WriteLine(string.Format("NegFehlergrenze{0}={1}", fId, (wm0r.ErrLimLo() + wm0r.Uncertainty()).ToString("F1", Program.AltCulture)));
                             logger.WriteLine(string.Format("PosFehlergrenzeWarm{0}=0,0", fId));
                             logger.WriteLine(string.Format("NegFehlergrenzeWarm{0}=0,0", fId));
                         }
@@ -291,7 +296,7 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
                     }
 
 					logger.WriteLine();
-					logger.WriteLine(string.Format("[Zählerdaten_{0}]", i + 1));
+                    logger.WriteLine(string.Format("[Zählerdaten_{0}]", wMtr.WMPosition));
 
                     if (testRsltIsMissing)
 					{
@@ -353,8 +358,8 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
 						logger.WriteLine(string.Format("JustierWert=0,2"));					            /// 0,2
 						logger.WriteLine(string.Format("Corrected2Hz={0}",          wMtr.Hz2CorrectionDone ? 1 : 0));
 						logger.WriteLine(string.Format("Q2Corrected={0}",           wMtr.Q2CorrectionDone ? 1 : 0));
-						logger.WriteLine(string.Format("Q2CorrectionRight={0}",     wMtr.Q2CorrRL));
-						logger.WriteLine(string.Format("Q2CorrectionLeft={0}",      wMtr.Q2CorrLR));
+						logger.WriteLine(string.Format("Q2CorrectionRight={0}",     wMtr.Q2CorrLR));
+						logger.WriteLine(string.Format("Q2CorrectionLeft={0}",      wMtr.Q2CorrRL));
 						logger.WriteLine(string.Format("Q2CorrectionFlowRight={0}", wMtr.Q2CorrFlowRight));
 						logger.WriteLine(string.Format("FlowDirectionRight={0}",    wMtr.Q2CorrFlowRight));
 						logger.WriteLine(string.Format("Position={0}",              wMtr.WMPosition));

TBF/BenchControl/Output/FileWriters/IperlLogger/WriterCfg.cs

@@ -17,7 +17,6 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
 
         public IComponentCfgCtrl GetControl() { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
 
-        public LogType LogType;
 		public string DestinationPath;	/// Directory path into which the logs will be saved
 		public bool YearFolders;
 		public bool MonthFolders;
@@ -42,7 +41,6 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
 
         public void InitializeAll()
         {
-            LogType = LogType.Just_Q1Q2Q3;
             DestinationPath = Program.HomeDir + "Logs\\";
             YearFolders = true;
             MonthFolders = true;
@@ -51,7 +49,6 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
 
         string[] paramNames = new string[]
 		    {
-                "Log type",
                 "Destination path",
                 "Year folders",
                 "Month folders",
@@ -64,14 +61,9 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
         {
             switch (i)
             {
-                case 0:
-                    IList<string> list1 = new List<string>();
-                    for (LogType lt = 0; lt < LogType.Count; lt++) list1.Add(lt.ToString());
-                    return list1;
-
+                case 1:
                 case 2:
                 case 3:
-                case 4:
                     IList<string> list2 = new List<string>();
                     list2.Add(Strings.yes);
                     list2.Add(Strings.no);
@@ -85,9 +77,8 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
         {
             if (i == -1)
             {
-                return string.Format("{0}: LogType={1}, Dest.={2}, Y={3}, M={4}, D={5}",
+                return string.Format("{0}: Dest.={1}, Y={2}, M={3}, D={4}",
                                      Name,
-                                     LogType,
                                      DestinationPath,
                                      YearFolders,
                                      MonthFolders,
@@ -96,11 +87,10 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
 
             switch (i)
             {
-                case 0: return LogType.ToString();
-                case 1: return DestinationPath;
-                case 2: return YearFolders ? Strings.yes : Strings.no;
-                case 3: return MonthFolders ? Strings.yes : Strings.no;
-                case 4: return DayFolders ? Strings.yes : Strings.no;
+                case 0: return DestinationPath;
+                case 1: return YearFolders ? Strings.yes : Strings.no;
+                case 2: return MonthFolders ? Strings.yes : Strings.no;
+                case 3: return DayFolders ? Strings.yes : Strings.no;
                 default: return string.Empty;
             }
         }
@@ -109,21 +99,10 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
         {
             switch (i)
             {
-                case 0:
-                    for (LogType lt = 0; lt < LogType.Count; lt++)
-                    {
-                        if (lt.ToString() == strValue)
-                        {
-                            LogType = lt;
-                            return CfgUpdateFlags.RestartRqrd;
-                        }
-                    }
-                    return CfgUpdateFlags.None;
-
-                case 1: DestinationPath = strValue; return CfgUpdateFlags.RestartRqrd;
-                case 2: YearFolders = (strValue == Strings.yes); return CfgUpdateFlags.RestartRqrd;
-                case 3: MonthFolders = (strValue == Strings.yes); return CfgUpdateFlags.RestartRqrd;
-                case 4: DayFolders = (strValue == Strings.yes); return CfgUpdateFlags.RestartRqrd;
+                case 0: DestinationPath = strValue; return CfgUpdateFlags.RestartRqrd;
+                case 1: YearFolders = (strValue == Strings.yes); return CfgUpdateFlags.RestartRqrd;
+                case 2: MonthFolders = (strValue == Strings.yes); return CfgUpdateFlags.RestartRqrd;
+                case 3: DayFolders = (strValue == Strings.yes); return CfgUpdateFlags.RestartRqrd;
 
                 default: return CfgUpdateFlags.None;
             }
@@ -136,16 +115,10 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
             switch (i)
             {
                 case 0:
-                    for (LogType lt = 0; lt < LogType.Count; lt++)
-                    {
-                        if (lt.ToString() == strValue) return true;
-                    }
-                    break;
-                case 1:
                     return true;
+                case 1:
                 case 2:
                 case 3:
-                case 4:
                     if (strValue == Strings.yes || strValue == Strings.no) return true;
                     break;
                 default:
@@ -159,7 +132,6 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
 
         void CopyContentTo(WriterCfg prms)
         {
-            prms.LogType = this.LogType;
             prms.DestinationPath = this.DestinationPath;
             prms.YearFolders = this.YearFolders;
             prms.MonthFolders = this.MonthFolders;

TBF/BenchControl/Output/SensusTestInfo.cs

@@ -8,11 +8,14 @@ namespace TBF.BenchControl.Output
 {
     public enum LogType
     {
+        Auto,
         Just_Q1Q2Q3,
-		Just_Q1Q2Q2adjQ3,	/// Greece
+        Just_Q1Q2Q2adjQ3,	/// Greece
         Just_Q1Q2__Q3,
         DEWA,           	/// Q1, Q2adj, Q2, Q3, Q4
         Suez,           	/// two directions
+        Suez_Repeatability, /// Q3(1/3), Q3(2/3), Q3(3/3), Q2(1/3), Q2(2/3), Q2(3/3), Q1(1/3), Q1(2/3), Q1(3/3) 
+        Suez_EMP,           /// Q4 ... Q1 (12 flow rates)
         Count
     }
 
@@ -54,9 +57,9 @@ namespace TBF.BenchControl.Output
         /// <returns>true when two test info-s are compatible</returns>
         public static bool AreCompatible(IList<SensusTestInfo> oraDbTInfo, SensusTestInfo[] myCompleteTInfo)
         {
-            if (oraDbTInfo.Count != myCompleteTInfo.Length) return false;
+            if ((oraDbTInfo == null) || (myCompleteTInfo == null) || (oraDbTInfo.Count > myCompleteTInfo.Length)) return false;
 
-            for (int i = 0; i < myCompleteTInfo.Length; i++)
+            for (int i = 0; i < oraDbTInfo.Count; i++)
             {
                 if (oraDbTInfo[i].PruefungsNr != myCompleteTInfo[i].PruefungsNr)
                 {
@@ -82,15 +85,15 @@ namespace TBF.BenchControl.Output
         {
             switch (logType)
             {
-                default:
                 case LogType.Just_Q1Q2Q3:
 
                     return new SensusTestInfo[]
                     {
-                        new SensusTestInfo(-1, "-1", "Just", Range.R90_100,  "Adjustment"),
-                        new SensusTestInfo( 1, "01", "Q1",   Range.R100_110, "Q1"),
-                        new SensusTestInfo( 2, "02", "Q2",   Range.R100_110, "Q2"),
-                        new SensusTestInfo( 3, "03", "Q3",   Range.R90_100,  "Q3"),
+                        new SensusTestInfo( -1, "-1", "Just", Range.R90_100,  "Adjustment"),
+                        new SensusTestInfo(  1, "01", "Q1",   Range.R100_110, "Q1"),
+                        new SensusTestInfo(  2,   "", "Q2",   Range.R100_110, "Q2"),
+                        new SensusTestInfo(  3, "03", "Q3",   Range.R90_100,  "Q3"),
+                        new SensusTestInfo( 99, "02", "Q2",   Range.R100_110, "Q2adj"),         /// <-- This is to generate opto-data
                     };
 
                 case LogType.Just_Q1Q2Q2adjQ3:
@@ -108,10 +111,11 @@ namespace TBF.BenchControl.Output
 
                     return new SensusTestInfo[]
                     {
-                        new SensusTestInfo(-1, "-1", "Just", Range.R90_100,  "Adjustment"),
-                        new SensusTestInfo( 1, "01", "Q1",   Range.R100_110, "Q1"),
-                        new SensusTestInfo( 2, "02", "Q2",   Range.R100_110, "Q2"),
-                        new SensusTestInfo( 5, "05", "Q3",   Range.R90_100,  "Q3"),
+                        new SensusTestInfo( -1, "-1", "Just", Range.R90_100,  "Adjustment"),
+                        new SensusTestInfo(  1, "01", "Q1",   Range.R100_110, "Q1"),
+                        new SensusTestInfo(  2,   "", "Q2",   Range.R100_110, "Q2"),
+                        new SensusTestInfo(  5, "05", "Q3",   Range.R90_100,  "Q3"),
+                        new SensusTestInfo( 99, "02", "Q2",   Range.R100_110, "Q2adj"),         /// <-- This is to generate opto-data
                     };
 
                 case LogType.DEWA:
@@ -141,7 +145,49 @@ namespace TBF.BenchControl.Output
                         new SensusTestInfo( 8, "08", "Q2",   Range.R100_110, "Q2_rl"),
                         new SensusTestInfo(10, "10", "Q3",   Range.R90_100,  "Q3_rl"),
                     };
+
+                case LogType.Suez_Repeatability:
+
+                    return new SensusTestInfo[]
+                    {
+                        new SensusTestInfo( 1, "01", "Q1 (3/3)", Range.R100_110, "Q1 (3/3)"),
+                        new SensusTestInfo( 2, "02", "Q1 (2/3)", Range.R100_110, "Q1 (2/3)"),
+                        new SensusTestInfo( 3, "03", "Q1 (1/3)", Range.R100_110, "Q1 (1/3)"),
+                        new SensusTestInfo( 4, "04", "Q2 (3/3)", Range.R100_110, "Q2 (3/3)"),
+                        new SensusTestInfo( 5, "05", "Q2 (2/3)", Range.R100_110, "Q2 (2/3)"),
+                        new SensusTestInfo( 6, "06", "Q2 (1/3)", Range.R100_110, "Q2 (1/3)"),
+                        new SensusTestInfo( 7, "07", "Q2 (3/3)", Range.R90_100,  "Q2 (3/3)"),
+                        new SensusTestInfo( 8, "08", "Q3 (2/3)", Range.R90_100,  "Q3 (2/3)"),
+                        new SensusTestInfo( 9, "09", "Q3 (1/3)", Range.R90_100,  "Q3 (1/3)"),
+                    };
+
+                case LogType.Suez_EMP:
+
+                    return new SensusTestInfo[]
+                    {
+                        new SensusTestInfo( 1, "01", "Q1",    Range.R100_110, "Q1"),
+                        new SensusTestInfo( 2, "02", "Q2",    Range.R100_110, "Q2"),
+                        new SensusTestInfo( 3, "03", "Q0,09", Range.R100_110, "Q0,09"),
+                        new SensusTestInfo( 4, "04", "Q0,16", Range.R100_110, "Q0,16"),
+                        new SensusTestInfo( 5, "05", "Q0,35", Range.R100_110, "Q0,35"),
+                        new SensusTestInfo( 6, "06", "Q0,65", Range.R100_110, "Q0,65"),
+                        new SensusTestInfo( 7, "07", "Q1,35", Range.R100_110, "Q1,35"),
+                        new SensusTestInfo( 8, "08", "Q2,5",  Range.R100_110, "Q2,5"),
+                        new SensusTestInfo( 9, "09", "Q5",    Range.R100_110, "Q5"),
+                        new SensusTestInfo(10, "10", "Q8",    Range.R100_110, "Q8"),
+                        new SensusTestInfo(11, "11", "Q3",    Range.R90_100,  "Q3"),
+                        new SensusTestInfo(12, "12", "Q4",    Range.R90_100,  "Q4"),
+                    };
+
+                default:
+
+                    return null;
             }
         }
+
+        public override string ToString()
+        {
+            return string.Format("{0}-'{1}'-'{2}'-'{3}'-{4}", PruefungsNr, PruefungsNrStr, QBezeichnung, TestName, Range);
+        }
     }
 }

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

@@ -0,0 +1,739 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using log4net;
+using TBF.Resources;
+
+namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio
+{
+	public partial class CycleBeginningForm : Form, GenericDevices.IHasCompleted
+    {
+		private static readonly ILog log = LogManager.GetLogger(typeof(CycleBeginningForm));
+
+		/// <summary> Number of water meters </summary>
+        public readonly int WaterMetersCount;
+
+		/// To be retrieved after the form is closed
+		public string PurchaseOrder;
+		public string[] SNText;
+		public bool[] Disabled;
+
+		/// Set to 'true' when the form closes
+        public bool Completed { get { return completed; } }
+		bool completed;
+
+		/// <summary> Number of text boxes for serial numbers </summary>
+		int textBoxesCount;
+		Label[] labels;
+		ComboBox[] comboBoxes;
+		CheckBox[] checkBoxes;
+		IList<ComboBox> enabledComboBoxes;
+
+
+		/// <summary> Parameterless constructor for common functionality </summary>
+		public CycleBeginningForm()
+		{
+			InitializeComponent();
+			ControlBox = false;
+
+			textBoxesCount = 48;
+			labels = new Label[]
+				{
+					label1,  label2,  label3,  label4,  label5,  label6,  label7,  label8,  label9,  label10,
+					label11, label12, label13, label14, label15, label16, label17, label18, label19, label20,
+					label21, label22, label23, label24, label25, label26, label27, label28, label29, label30,
+					label31, label32, label33, label34, label35, label36, label37, label38, label39, label40,
+					label41, label42, label43, label44, label45, label46, label47, label48,
+				};
+			comboBoxes = new ComboBox[]
+				{
+					comboBox1,  comboBox2,  comboBox3,  comboBox4,  comboBox5,  comboBox6,  comboBox7,  comboBox8,  comboBox9,  comboBox10,
+					comboBox11, comboBox12, comboBox13, comboBox14, comboBox15, comboBox16, comboBox17, comboBox18, comboBox19, comboBox20,
+					comboBox21, comboBox22, comboBox23, comboBox24, comboBox25, comboBox26, comboBox27, comboBox28, comboBox29, comboBox30,
+					comboBox31, comboBox32, comboBox33, comboBox34, comboBox35, comboBox36, comboBox37, comboBox38, comboBox39, comboBox40,
+					comboBox41, comboBox42, comboBox43, comboBox44, comboBox45, comboBox46, comboBox47, comboBox48,
+				};
+			checkBoxes = new CheckBox[]
+				{
+					checkBox1,  checkBox2,  checkBox3,  checkBox4,  checkBox5,  checkBox6,  checkBox7,  checkBox8,  checkBox9,  checkBox10,
+					checkBox11, checkBox12, checkBox13, checkBox14, checkBox15, checkBox16, checkBox17, checkBox18, checkBox19, checkBox20,
+					checkBox21, checkBox22, checkBox23, checkBox24, checkBox25, checkBox26, checkBox27, checkBox28, checkBox29, checkBox30,
+					checkBox31, checkBox32, checkBox33, checkBox34, checkBox35, checkBox36, checkBox37, checkBox38, checkBox39, checkBox40,
+					checkBox41, checkBox42, checkBox43, checkBox44, checkBox45, checkBox46, checkBox47, checkBox48,
+				};
+			enabledComboBoxes = new List<ComboBox>();
+
+			completed = false;
+			StartForceCloseHandler();
+		}
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
+        public CycleBeginningForm(int waterMetersCount)
+			: this()
+        {
+            this.WaterMetersCount = waterMetersCount;
+            SNText = new string[WaterMetersCount];
+			Disabled = new bool[WaterMetersCount];
+
+			ShuffleTextBoxes(Config.Data.WMsCount, Config.Data.LineSize);
+
+            //Height = 147 + WaterMetersCount * 90;
+        }
+
+		/// <summary>
+		/// Make sure the layout of labels/text boxes on the screen
+		/// corresponds to the layout of watermeters of the test bench.
+		/// </summary>
+		/// <param name="wmsCount">Number of watermeters</param>
+		/// <param name="lineSize">Number of watermeters in one line</param>
+		void ShuffleTextBoxes(int wmsCount, int lineSize)
+		{
+			if (wmsCount < textBoxesCount && lineSize > 0)
+			{
+				int nrLines = (wmsCount + lineSize - 1) / lineSize;
+				int gap = (textBoxesCount - wmsCount) / nrLines;
+
+				int dest = 0;
+				for (int l = 0; l < nrLines; l++)
+				{
+					for (int i = 0; i < lineSize; i++)
+					{
+						labels[dest] = labels[l * lineSize + l * gap + i];
+						comboBoxes[dest] = comboBoxes[l * lineSize + l * gap + i];
+						checkBoxes[dest] = checkBoxes[l * lineSize + l * gap + i];
+						dest++;
+					}
+				}
+				textBoxesCount = wmsCount;
+			}
+		}
+
+        private void CycleBeginningForm_Load(object sender, EventArgs e)
+        {
+			Localize();
+			
+			PrepareOrderCombo(orderComboBox);
+
+			for (int i = 0; i < textBoxesCount; i++)
+			{
+				if (Program.LocalSettings.LastSNTextsCount == textBoxesCount)
+				{
+                    comboBoxes[i].Items.Add((Program.LocalSettings.LastSNTexts[i] == null) ? string.Empty : Program.LocalSettings.LastSNTexts[i]);
+				}
+				labels[i].Visible = comboBoxes[i].Visible = checkBoxes[i].Visible = true;
+				enabledComboBoxes.Add(comboBoxes[i]);
+			}
+		}
+
+		void Localize()
+		{
+			Text = Strings.Data;
+			orderGroupBox.Text = Strings.Purchase_order;
+			for (int i = 0; i < textBoxesCount; i++)
+			{
+				labels[i].Text = Strings.Serial_Number + " " + (i + 1).ToString();
+			}
+			okButton.Text = Strings.OkBtnText;
+			clearButton.Text = Strings.ClearBtnText;
+		}
+
+		/// <summary>
+		/// Load Purchase order combo box items from the LocalSettings PurchaseOrderHistory array
+		/// </summary>
+		/// <param name="orderComboBox">Puchase order ComboBox</param>
+		void PrepareOrderCombo(ComboBox orderComboBox)
+		{
+			for (int i = 0; i < Program.LocalSettings.PurchaseOrderHistoryCount; i++)
+			{
+				orderComboBox.Items.Add(Program.LocalSettings.PurchaseOrderHistory[i]);
+			}
+
+			if (orderComboBox.Items.Count > 0)
+			{
+				orderComboBox.Text = orderComboBox.Items[0].ToString();
+			}
+		}
+
+		private void okButton_Click(object sender, EventArgs e)
+        {
+			PurchaseOrder = orderComboBox.Text;
+			Program.LocalSettings.UpdateHistory(orderComboBox.Text,
+												ref Program.LocalSettings.PurchaseOrderHistory
+#if FUZHOU_150 || FUZHOU_300
+												, 20
+#endif
+												);
+
+			Program.LocalSettings.LastSNTexts = SNText;
+
+			for (int i = 0; i < Math.Min(WaterMetersCount, textBoxesCount); i++)
+			{
+				SNText[i] = comboBoxes[i].Text;
+				Disabled[i] = !checkBoxes[i].Checked;
+			}
+
+            completed = true;
+            Close();
+        }
+
+		/// <summary>
+		/// When one combo box is updated using drop-down menu, all combo boxes
+		/// are updated by this function.
+		/// </summary>
+		private void UpdateAllCombos()
+		{
+			for (int i = 0; i < Math.Min(WaterMetersCount, textBoxesCount); i++)
+			{
+				comboBoxes[i].Text = Program.LocalSettings.LastSNTexts[i];
+				checkBoxes[i].Checked = !string.IsNullOrEmpty(comboBoxes[i].Text);
+			}
+		}
+
+		private void clearButton_Click(object sender, EventArgs e)
+		{
+			for (int i = 0; i < Math.Min(WaterMetersCount, textBoxesCount); i++)
+			{			
+				comboBoxes[i].Text = string.Empty;
+				checkBoxes[i].Checked = false;
+			}
+		}
+
+
+		private void comboBox1_TextChanged(object sender, EventArgs e) { checkBox1.Checked = true; }
+		private void comboBox2_TextChanged(object sender, EventArgs e) { checkBox2.Checked = true; }
+		private void comboBox3_TextChanged(object sender, EventArgs e) { checkBox3.Checked = true; }
+		private void comboBox4_TextChanged(object sender, EventArgs e) { checkBox4.Checked = true; }
+		private void comboBox5_TextChanged(object sender, EventArgs e) { checkBox5.Checked = true; }
+		private void comboBox6_TextChanged(object sender, EventArgs e) { checkBox6.Checked = true; }
+		private void comboBox7_TextChanged(object sender, EventArgs e) { checkBox7.Checked = true; }
+		private void comboBox8_TextChanged(object sender, EventArgs e) { checkBox8.Checked = true; }
+		private void comboBox9_TextChanged(object sender, EventArgs e) { checkBox9.Checked = true; }
+		private void comboBox10_TextChanged(object sender, EventArgs e) { checkBox10.Checked = true; }
+		private void comboBox11_TextChanged(object sender, EventArgs e) { checkBox11.Checked = true; }
+		private void comboBox12_TextChanged(object sender, EventArgs e) { checkBox12.Checked = true; }
+		private void comboBox13_TextChanged(object sender, EventArgs e) { checkBox13.Checked = true; }
+		private void comboBox14_TextChanged(object sender, EventArgs e) { checkBox14.Checked = true; }
+		private void comboBox15_TextChanged(object sender, EventArgs e) { checkBox15.Checked = true; }
+		private void comboBox16_TextChanged(object sender, EventArgs e) { checkBox16.Checked = true; }
+		private void comboBox17_TextChanged(object sender, EventArgs e) { checkBox17.Checked = true; }
+		private void comboBox18_TextChanged(object sender, EventArgs e) { checkBox18.Checked = true; }
+		private void comboBox19_TextChanged(object sender, EventArgs e) { checkBox19.Checked = true; }
+		private void comboBox20_TextChanged(object sender, EventArgs e) { checkBox20.Checked = true; }
+		private void comboBox21_TextChanged(object sender, EventArgs e) { checkBox21.Checked = true; }
+		private void comboBox22_TextChanged(object sender, EventArgs e) { checkBox22.Checked = true; }
+		private void comboBox23_TextChanged(object sender, EventArgs e) { checkBox23.Checked = true; }
+		private void comboBox24_TextChanged(object sender, EventArgs e) { checkBox24.Checked = true; }
+		private void comboBox25_TextChanged(object sender, EventArgs e) { checkBox25.Checked = true; }
+		private void comboBox26_TextChanged(object sender, EventArgs e) { checkBox26.Checked = true; }
+		private void comboBox27_TextChanged(object sender, EventArgs e) { checkBox27.Checked = true; }
+		private void comboBox28_TextChanged(object sender, EventArgs e) { checkBox28.Checked = true; }
+		private void comboBox29_TextChanged(object sender, EventArgs e) { checkBox29.Checked = true; }
+		private void comboBox30_TextChanged(object sender, EventArgs e) { checkBox30.Checked = true; }
+		private void comboBox31_TextChanged(object sender, EventArgs e) { checkBox31.Checked = true; }
+		private void comboBox32_TextChanged(object sender, EventArgs e) { checkBox32.Checked = true; }
+		private void comboBox33_TextChanged(object sender, EventArgs e) { checkBox33.Checked = true; }
+		private void comboBox34_TextChanged(object sender, EventArgs e) { checkBox34.Checked = true; }
+		private void comboBox35_TextChanged(object sender, EventArgs e) { checkBox35.Checked = true; }
+		private void comboBox36_TextChanged(object sender, EventArgs e) { checkBox36.Checked = true; }
+		private void comboBox37_TextChanged(object sender, EventArgs e) { checkBox37.Checked = true; }
+		private void comboBox38_TextChanged(object sender, EventArgs e) { checkBox38.Checked = true; }
+		private void comboBox39_TextChanged(object sender, EventArgs e) { checkBox39.Checked = true; }
+		private void comboBox40_TextChanged(object sender, EventArgs e) { checkBox40.Checked = true; }
+		private void comboBox41_TextChanged(object sender, EventArgs e) { checkBox41.Checked = true; }
+		private void comboBox42_TextChanged(object sender, EventArgs e) { checkBox42.Checked = true; }
+		private void comboBox43_TextChanged(object sender, EventArgs e) { checkBox43.Checked = true; }
+		private void comboBox44_TextChanged(object sender, EventArgs e) { checkBox44.Checked = true; }
+		private void comboBox45_TextChanged(object sender, EventArgs e) { checkBox45.Checked = true; }
+		private void comboBox46_TextChanged(object sender, EventArgs e) { checkBox46.Checked = true; }
+		private void comboBox47_TextChanged(object sender, EventArgs e) { checkBox47.Checked = true; }
+		private void comboBox48_TextChanged(object sender, EventArgs e) { checkBox48.Checked = true; }
+
+		private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox1.Text.Equals(comboBox1.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox2_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox2.Text.Equals(comboBox2.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox3_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox3.Text.Equals(comboBox3.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox4_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox4.Text.Equals(comboBox4.Items[0])) UpdateAllCombos();
+			}
+		}
+ 
+		private void comboBox5_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox5.Text.Equals(comboBox5.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox6_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox6.Text.Equals(comboBox6.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox7_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox7.Text.Equals(comboBox7.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox8_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox8.Text.Equals(comboBox8.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox9_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox9.Text.Equals(comboBox9.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox10_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox10.Text.Equals(comboBox10.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox11_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox11.Text.Equals(comboBox11.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox12_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox12.Text.Equals(comboBox12.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox13_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox13.Text.Equals(comboBox13.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox14_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox14.Text.Equals(comboBox14.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox15_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox15.Text.Equals(comboBox15.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox16_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox16.Text.Equals(comboBox16.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox17_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox17.Text.Equals(comboBox17.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox18_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox18.Text.Equals(comboBox18.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox19_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox19.Text.Equals(comboBox19.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox20_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox20.Text.Equals(comboBox20.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox21_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox21.Text.Equals(comboBox21.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox22_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox22.Text.Equals(comboBox22.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox23_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox23.Text.Equals(comboBox23.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox24_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox24.Text.Equals(comboBox24.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox25_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox25.Text.Equals(comboBox25.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox26_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox26.Text.Equals(comboBox26.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox27_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox27.Text.Equals(comboBox27.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox28_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox28.Text.Equals(comboBox28.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox29_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox29.Text.Equals(comboBox29.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox30_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox30.Text.Equals(comboBox30.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox31_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox31.Text.Equals(comboBox31.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox32_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox32.Text.Equals(comboBox32.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox33_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox33.Text.Equals(comboBox33.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox34_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox34.Text.Equals(comboBox34.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox35_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox35.Text.Equals(comboBox35.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox36_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox36.Text.Equals(comboBox36.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox37_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox37.Text.Equals(comboBox37.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox38_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox38.Text.Equals(comboBox38.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox39_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox39.Text.Equals(comboBox39.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox40_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox40.Text.Equals(comboBox40.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox41_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox41.Text.Equals(comboBox41.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox42_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox42.Text.Equals(comboBox42.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox43_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox43.Text.Equals(comboBox43.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox44_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox44.Text.Equals(comboBox44.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox45_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox45.Text.Equals(comboBox45.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox46_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox46.Text.Equals(comboBox46.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox47_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox47.Text.Equals(comboBox47.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox48_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox48.Text.Equals(comboBox48.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		#region Forced close handling
+
+		public void StartForceCloseHandler()
+		{
+			UiBridge.Bridge.CloseModelessFormHandler += 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
+
+		/// <summary>
+		/// Process a key press within any enabled text boxe
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		/// <param name="currentFocusOwner">TextBox control which received the event</param>
+		private void ProcKeyPress(object sender, KeyPressEventArgs e, ComboBox currentFocusOwner)
+		{
+			if (e.KeyChar == '+')
+			{
+				/// Process '+' key ..... Form completed
+				okButton_Click(sender, e);
+			}
+			if (e.KeyChar == '\r')
+			{
+				/// Process <enter> key ..... Next text field
+				if (enabledComboBoxes.Count < 2) return;		/// There is just one enabled textbox
+
+				for (int i = 0; i < enabledComboBoxes.Count; i++)
+				{
+					if (enabledComboBoxes[i] == currentFocusOwner)
+					{
+						/// Change focus to the next enabled text box
+						enabledComboBoxes[(i + 1) % enabledComboBoxes.Count].Focus();
+						return;
+					}
+				}
+			}
+		}
+
+		private void comboBox1_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox1); }
+		private void comboBox2_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox2); }
+		private void comboBox3_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox3); }
+		private void comboBox4_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox4); }
+		private void comboBox5_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox5); }
+		private void comboBox6_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox6); }
+		private void comboBox7_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox7); }
+		private void comboBox8_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox8); }
+		private void comboBox9_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox9); }
+		private void comboBox10_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox10); }
+		private void comboBox11_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox11); }
+		private void comboBox12_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox12); }
+		private void comboBox13_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox13); }
+		private void comboBox14_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox14); }
+		private void comboBox15_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox15); }
+		private void comboBox16_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox16); }
+		private void comboBox17_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox17); }
+		private void comboBox18_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox18); }
+		private void comboBox19_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox19); }
+		private void comboBox20_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox20); }
+		private void comboBox21_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox21); }
+		private void comboBox22_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox22); }
+		private void comboBox23_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox23); }
+		private void comboBox24_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox24); }
+		private void comboBox25_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox25); }
+		private void comboBox26_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox26); }
+		private void comboBox27_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox27); }
+		private void comboBox28_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox28); }
+		private void comboBox29_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox29); }
+		private void comboBox30_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox30); }
+		private void comboBox31_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox31); }
+		private void comboBox32_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox32); }
+		private void comboBox33_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox33); }
+		private void comboBox34_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox34); }
+		private void comboBox35_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox35); }
+		private void comboBox36_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox36); }
+		private void comboBox37_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox37); }
+		private void comboBox38_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox38); }
+		private void comboBox39_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox39); }
+		private void comboBox40_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox40); }
+		private void comboBox41_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox41); }
+		private void comboBox42_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox42); }
+		private void comboBox43_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox43); }
+		private void comboBox44_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox44); }
+		private void comboBox45_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox45); }
+		private void comboBox46_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox46); }
+		private void comboBox47_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox47); }
+		private void comboBox48_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox48); }
+	}
+}

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

@@ -0,0 +1,284 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using log4net;
+using Config.Entities;
+using TBF.BenchControl;
+using TBF.BenchControl.GenericDevices;
+
+namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio
+{
+	public class EntryForm : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasWMStatesForm, IReceivesDataFromRadio
+	{
+        private static readonly ILog log = LogManager.GetLogger(typeof(EntryForm));
+        public override string ToString() { return string.Format("DataEntry.Standard48({0})", Cfg.ToString(1)); }
+
+		public bool UsesCameras() { return false; }
+
+        readonly EntryFormCfg entryFormCfg;
+
+        KPackE.Radio.Radio radio;           /// Reference to KPackE.Radio component
+
+		IRegisterReader[] regReaders;
+
+		/// <summary>
+		/// Properties set by the Begin, End and WMStates form
+		/// </summary>
+		string purchaseOrder;
+		public string PurchaseOrder { get { return purchaseOrder; } }
+
+		bool[] disabled;				/// This array is shared between forms
+
+		string[] wmCycleEndState;
+		public string WMCycleEndState(int wmNr) { return (wmNr >= 0 && wmNr < wmCycleEndState.Length) ? wmCycleEndState[wmNr] : string.Empty; }
+
+		double[] wmStartState;
+		public double WMStartState(int wmNr) { return (wmNr >= 0 && wmNr < wmStartState.Length) ? wmStartState[wmNr] : 0; }
+
+		double[] wmEndState;
+		public double WMEndState(int wmNr) { return (wmNr >= 0 && wmNr < wmEndState.Length) ? wmEndState[wmNr] : 0; }
+
+		string[] wmStartStateStr;
+		
+
+        System.Windows.Forms.Form modelessDlg;
+
+		double refVolume;
+		double errLimLo;
+		double errLimHi;
+
+		bool resultSaved;								/// Set in Run() when results are saved
+
+		Results.Entities.WaterMeter[] waterMeters;		/// Reference to ...ProcessData.BatchRslts.WaterMeters[]
+
+		public enum CurrentOp
+		{
+			None,
+			ShowFormAtCycleBeginning,
+			EnterTestStartStates,
+			EnterTestEndStates,
+		}
+
+		CurrentOp currentOp;
+
+
+		public EntryForm()
+		{
+		}
+
+        public EntryForm(Generic.IComponentCfg cfg, IList<Generic.IComponent> components)
+			: base(cfg)
+		{
+			entryFormCfg = cfg as EntryFormCfg;
+
+            radio = (KPackE.Radio.Radio)TbfComponents.FindComponent(entryFormCfg.Radio, components);
+            if (radio == null) throw new Exception("Cannot find Radio");
+            radio.EntryForm = this;
+
+			disabled = new bool[Config.Data.WMsCount];
+			wmStartState = new double[Config.Data.WMsCount];
+			wmStartStateStr = new string[Config.Data.WMsCount];
+			wmEndState = new double[Config.Data.WMsCount];
+			wmCycleEndState = new string[Config.Data.WMsCount];
+
+			currentOp = CurrentOp.None;
+            log.Debug(this.ToString());
+        }
+
+		/// <returns>Reference to the operation</returns>
+		public IOperation ShowCycleBeginFormOp()
+		{
+			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
+			currentOp = CurrentOp.ShowFormAtCycleBeginning;
+			this.waterMeters = TBF.BenchControl.Sequences.ProcessData.BatchRslts.WaterMeters;
+			return this;
+		}
+
+        /// <returns>Reference to the operation</returns>
+        public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
+        {
+			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
+			currentOp = CurrentOp.EnterTestStartStates;
+			this.regReaders = regReaders;
+			return this;
+		}
+
+		/// <returns>Reference to the operation</returns>
+		public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
+		{
+			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
+			currentOp = CurrentOp.EnterTestEndStates;
+			this.regReaders = regReaders;
+			this.refVolume = refVolume;
+			this.errLimLo = errLimLo;
+			this.errLimHi = errLimHi;
+			return this;
+		}
+
+        delegate void EntryFormDlgt(EntryForm myRef);
+        /// 
+        void OpenBeginningDlg(EntryForm myRef)
+        {
+            myRef.modelessDlg = new CycleBeginningForm(Config.Data.WMsCount);
+            modelessDlg.Show();
+        }
+		///
+		void OpenTestStartStatesDlg(EntryForm myRef)
+		{
+            myRef.modelessDlg = new TestStartEndForm(myRef.waterMeters, myRef.regReaders, disabled);
+			modelessDlg.Show();
+		}
+		///
+		void OpenTestEndStatesDlg(EntryForm myRef)
+		{
+            myRef.modelessDlg = new TestStartEndForm(myRef.waterMeters, myRef.regReaders, wmStartStateStr, disabled, refVolume, errLimLo, errLimHi);
+			modelessDlg.Show();
+		}
+
+
+        public void WMStateReceived(string serialNr, double wmState)
+        {
+            if (modelessDlg is IReceivesDataFromRadio)
+            {
+                (modelessDlg as IReceivesDataFromRadio).WMStateReceived(serialNr, wmState);
+            }
+        }
+
+
+		/// <summary>Start this operation</summary>
+		public void Start()
+		{
+			resultSaved = false;
+			switch (currentOp)
+            {
+                case CurrentOp.ShowFormAtCycleBeginning:
+					Program.MainWnd.Invoke(new EntryFormDlgt(OpenBeginningDlg), this);
+                    break;
+
+				case CurrentOp.EnterTestStartStates:
+                    BindRegisterReadersToRadio(waterMeters, regReaders, false);
+					Program.MainWnd.Invoke(new EntryFormDlgt(OpenTestStartStatesDlg), this);
+					break;
+
+				case CurrentOp.EnterTestEndStates:
+                    BindRegisterReadersToRadio(waterMeters, regReaders, true);
+					Program.MainWnd.Invoke(new EntryFormDlgt(OpenTestEndStatesDlg), this);
+					break;
+			}
+		}
+
+		/// <summary>Run this operation</summary>
+		/// <returns>Event.ResultsPrinted</returns>
+		public Event Run()
+		{
+			if ((modelessDlg is IHasCompleted) && !(modelessDlg as IHasCompleted).Completed)
+			{
+				return Event.ModelessFormIsOpen;
+			}
+
+			if (!resultSaved)		/// This is to save the result only once
+			{
+				if (currentOp == CurrentOp.ShowFormAtCycleBeginning)
+				{
+					CycleBeginningForm dlg = (modelessDlg as CycleBeginningForm);
+					if (dlg != null)
+					{
+					    purchaseOrder = dlg.PurchaseOrder;
+
+					    for (int i = 0; i < Math.Min(dlg.WaterMetersCount, waterMeters.Length); i++)
+					    {
+						    if (waterMeters[i] != null)
+						    {
+							    waterMeters[i].SerialNr = dlg.SNText[i];
+							    disabled[i] = waterMeters[i].Disabled = dlg.Disabled[i];
+						    }
+					    }
+				    }
+				}
+                else if ((modelessDlg is TestStartEndForm) && (currentOp == CurrentOp.EnterTestStartStates))
+				{
+                    /// Fixed start test - start
+					TestStartEndForm dlg = (modelessDlg as TestStartEndForm);
+                    if (dlg != null)
+                    {
+                        for (int i = 0; i < dlg.WaterMetersCount; i++)
+                        {
+							if (!(((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null))))
+							{
+	                            wmStartState[i] = dlg.WMStartState[i];
+		                        wmStartStateStr[i] = dlg.WMStartStateStr[i];
+							}
+                        }
+                    }
+                }
+                else if ((modelessDlg is TestStartEndForm) && (currentOp == CurrentOp.EnterTestEndStates))
+                {
+                    /// Fixed start test - end
+                    TestStartEndForm dlg = (modelessDlg as TestStartEndForm);
+                    if (dlg != null)
+                    {
+                        for (int i = 0; i < dlg.WaterMetersCount; i++)
+                        {
+							if (!(((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null))))
+							{
+								wmEndState[i] = dlg.WMEndState[i];
+							}
+                        }
+                    }
+                }
+                resultSaved = true;
+				modelessDlg = null;
+			}
+
+			return Event.ModelessFormClosed;		/// Form closed
+		}
+
+		/// <summary>Stop this operation</summary>
+		public void Stop()
+		{
+			if (modelessDlg is IHasCompleted)
+			{
+				UiBridge.Bridge.OnCloseModelessForm(this, null);
+				modelessDlg = null;
+			}
+			currentOp = CurrentOp.None;
+		}
+
+
+        void BindRegisterReadersToRadio(Results.Entities.WaterMeter[] wMeters, IRegisterReader[] rReaders, bool isEndOfTest)
+        {
+            radio.RegReaders.Clear();
+
+            for (int i = 0; i < Math.Min(wMeters.Length, rReaders.Length); i++)
+            {
+                RegisterReader.RegisterReader regReader = rReaders[i] as RegisterReader.RegisterReader;
+                if (regReader != null)
+                {
+                    if ((wMeters[i] != null) && !string.IsNullOrEmpty(wMeters[i].SerialNr))
+                    {
+                        regReader.SerialNr = wMeters[i].SerialNr;
+                        regReader.IsEndOfTest = isEndOfTest;
+                        radio.RegReaders.Add(regReader);
+                    }
+                }
+            }
+        }
+
+		/// <summary>
+		/// Updates test results with the information collected in watermeters.
+		/// </summary>
+		/// <param name="batchResults">Test results to be updated with the information</param>
+		public void UpdateTestResults(Results.BatchResults batchResults)
+		{
+			foreach (var wm in batchResults.WaterMeters)
+			{
+                if ((wm != null) && !wm.Disabled && (PurchaseOrder != null))
+                {
+                    wm.PurchaseOrder = PurchaseOrder;   /// PurchaseOrder == null if form button OK  has not been used => no update
+                }
+            }
+		}
+	}
+}

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

@@ -0,0 +1,43 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml.Serialization;
+using TBF.BenchControl.Generic;
+
+namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio
+{
+	public class EntryFormCfg : ComponentCfgBase, Generic.IComponentCfg
+	{
+		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EntryFormCfg) })[0];
+		public override XmlSerializer GetSerializer() { return Serializer; }
+
+		public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
+
+		///
+		/// Serialized parameters
+		///
+        public string Radio;        /// Name of a radio component
+
+		/// Private parameterless constructor invoked by all other (public) constructors
+		EntryFormCfg()
+        {
+			Name = "DataEntryForRadio";
+            Radio = "KPackE.Radio";
+            ParentName = string.Empty;
+        }
+
+        public EntryFormCfg(IComponentFactory factory)
+            : this()
+        {
+            this.Factory = factory;
+        }
+
+        public string ToString(int i)
+        {
+            return string.Format("Name={0}, Radio={1}", Name, Radio);
+        }
+    }
+}

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

@@ -0,0 +1,99 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
+using System.Windows.Forms;
+using Config.Entities;
+using TBF.BenchControl.Generic;
+
+namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio
+{
+	public partial class EntryFormCfgCtrl : UserControl, IComponentCfgCtrl
+	{
+        ComponentParametersDlg parent;
+
+        public bool ShowMore { get { return false; } }
+
+		EntryFormCfg config;
+		public IComponentCfg Config
+		{
+			get { return config as IComponentCfg; }
+			set
+			{
+				config = value as EntryFormCfg;
+				Redraw();
+			}
+		}
+
+		public EntryFormCfgCtrl()
+		{
+			InitializeComponent();
+		}
+
+		private void EntryFormCfgCtrl_Load(object sender, EventArgs e)
+		{
+			Localize();
+
+            parent = ParentForm as ComponentParametersDlg;
+            if (parent == null) return;
+
+            if (parent.TbfComponents != null)
+            {
+                foreach (var cmpnt in parent.TbfComponents)
+                {
+                    if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Radio.Factory)
+                    {
+                        radioComboBox.Items.Add(cmpnt.Name);
+                    }
+                }
+            }
+
+            Redraw();
+		}
+
+		void Localize()
+		{
+        }
+
+		public void Closing()
+		{
+		}
+
+		void Redraw()
+		{
+			if (config == null) return;			/// Control was not loaded, settings were not changed
+			classNameLabel.Text = config.Factory.ClassName;
+			nameTextBox.Text = config.Name;
+            radioComboBox.Text = config.Radio;
+		}
+
+		public void Unlock()
+		{
+			nameTextBox.Enabled = true;
+            radioComboBox.Enabled = true;
+        }
+
+		public CfgUpdateFlags VerifyCfg(ref string message)
+		{
+            CfgUpdateFlags flags = CfgUpdateFlags.None;
+            if (!radioComboBox.Items.Contains(radioComboBox.Text))
+            {
+                flags |= CfgUpdateFlags.Error;
+                message += Environment.NewLine + "Invalid 'Radio'";
+            }
+            return flags;
+		}
+
+		public CfgUpdateFlags UpdateCfg()
+		{
+			CfgUpdateFlags flags = CfgUpdateFlags.RestartRqrd;
+
+			if (config == null) return CfgUpdateFlags.Error;	/// Control was not loaded, settings were not changed
+
+			config.Name = nameTextBox.Text;
+            config.Radio = radioComboBox.Text;
+
+			return flags;
+		}
+	}
+}

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

@@ -0,0 +1,110 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio
+{
+	partial class EntryFormCfgCtrl
+	{
+		/// <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.nameTextBox = new System.Windows.Forms.TextBox();
+            this.nameLabel = new System.Windows.Forms.Label();
+            this.classNameLabel = new System.Windows.Forms.Label();
+            this.radioLabel = new System.Windows.Forms.Label();
+            this.radioComboBox = new System.Windows.Forms.ComboBox();
+            this.SuspendLayout();
+            // 
+            // nameTextBox
+            // 
+            this.nameTextBox.Enabled = false;
+            this.nameTextBox.Location = new System.Drawing.Point(99, 57);
+            this.nameTextBox.Name = "nameTextBox";
+            this.nameTextBox.Size = new System.Drawing.Size(164, 20);
+            this.nameTextBox.TabIndex = 2;
+            // 
+            // nameLabel
+            // 
+            this.nameLabel.AutoSize = true;
+            this.nameLabel.Location = new System.Drawing.Point(35, 60);
+            this.nameLabel.Name = "nameLabel";
+            this.nameLabel.Size = new System.Drawing.Size(35, 13);
+            this.nameLabel.TabIndex = 1;
+            this.nameLabel.Text = "Name";
+            // 
+            // classNameLabel
+            // 
+            this.classNameLabel.AutoSize = true;
+            this.classNameLabel.Location = new System.Drawing.Point(96, 33);
+            this.classNameLabel.Name = "classNameLabel";
+            this.classNameLabel.Size = new System.Drawing.Size(83, 13);
+            this.classNameLabel.TabIndex = 0;
+            this.classNameLabel.Text = "ComonentName";
+            // 
+            // radioLabel
+            // 
+            this.radioLabel.AutoSize = true;
+            this.radioLabel.Location = new System.Drawing.Point(35, 86);
+            this.radioLabel.Name = "radioLabel";
+            this.radioLabel.Size = new System.Drawing.Size(35, 13);
+            this.radioLabel.TabIndex = 3;
+            this.radioLabel.Text = "Radio";
+            // 
+            // radioComboBox
+            // 
+            this.radioComboBox.Enabled = false;
+            this.radioComboBox.FormattingEnabled = true;
+            this.radioComboBox.Location = new System.Drawing.Point(99, 83);
+            this.radioComboBox.Name = "radioComboBox";
+            this.radioComboBox.Size = new System.Drawing.Size(164, 21);
+            this.radioComboBox.TabIndex = 4;
+            // 
+            // EntryFormCfgCtrl
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.radioComboBox);
+            this.Controls.Add(this.radioLabel);
+            this.Controls.Add(this.nameTextBox);
+            this.Controls.Add(this.nameLabel);
+            this.Controls.Add(this.classNameLabel);
+            this.Name = "EntryFormCfgCtrl";
+            this.Size = new System.Drawing.Size(300, 200);
+            this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.TextBox nameTextBox;
+		private System.Windows.Forms.Label nameLabel;
+        private System.Windows.Forms.Label classNameLabel;
+        private System.Windows.Forms.Label radioLabel;
+        private System.Windows.Forms.ComboBox radioComboBox;
+	}
+}

TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/EntryFormCfgCtrl.resx

@@ -0,0 +1,120 @@
+<?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/RegisterReaders/KPackE/DataEntryForRadio/Factory.cs

@@ -0,0 +1,26 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System.Collections.Generic;
+using TBF.BenchControl.Generic;
+
+namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio
+{
+	public class Factory : IComponentFactory
+	{
+		public string ClassName { get { return "DataEntry-KPackE-Radio"; } }
+
+		public void ResetStaticProperties() { EntryForm.ResetStaticProperties(); }
+
+		public IComponent DummyComponent() { return new EntryForm(); }
+
+		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new EntryForm(cfg, components); }
+
+		public IComponentCfg DefaultConfig() { return new EntryFormCfg(this); }
+
+		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
+		{
+			return ComponentCfgBase.CreateFromDbEntity(EntryFormCfg.Serializer, component, this);
+		}
+	}
+}

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

@@ -0,0 +1,707 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using log4net;
+using TBF.BenchControl.GenericDevices;
+using TBF.Resources;
+
+namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio
+{
+	public partial class TestStartEndForm : Form, GenericDevices.IHasCompleted, GenericDevices.IReceivesDataFromRadio
+    {
+		private static readonly ILog log = LogManager.GetLogger(typeof(TestStartEndForm));
+
+		// Set to 'true' when the form closes
+		public bool Completed { get { return completed; } }
+		bool completed;
+
+		/// <summary> Number of text boxes for serial numbers </summary>
+        public readonly int WaterMetersCount;
+        readonly Results.Entities.WaterMeter[] waterMeters;
+		readonly IRegisterReader[] regReaders;
+		readonly bool[] disabled;
+
+		// To be retrieved after the form closes
+		public double[] WMStartState;
+
+		// To be retrieved after the form closes
+		public readonly string[] WMStartStateStr;
+
+		// To be retrieved after the form closes
+        public double[] WMEndState;
+
+		bool endStates;			/// false=start states, true=end states
+		double refVolume;
+		double warningLimLo;	/// limit to display exclamation mark, typically 2x errLimLo
+		double warningLimHi;	/// limit to display exclamation mark, typically 2x errLimHi
+        bool fixedErrorLimits;  /// false in case of calculated error limits
+
+		int TextBoxesCount;
+		///
+		Label[] labels;
+		TextBox[] startTextBoxes;
+		TextBox[] endTextBoxes;
+        Label[] exclamations;
+        ///
+        IList<TextBox> activeTextBoxes;
+        IList<int> activeWmNrs;
+
+		/// <summary>
+		/// Parameterless constructor initializing common part for start and endstate form
+		/// </summary>
+		public TestStartEndForm()
+		{
+			InitializeComponent();
+			ControlBox = false;
+
+			TextBoxesCount = 48;
+
+			labels = new Label[]
+				{
+					label1,  label2,  label3,  label4,  label5,  label6,  label7,  label8,  label9,  label10,
+					label11, label12, label13, label14, label15, label16, label17, label18, label19, label20,
+					label21, label22, label23, label24, label25, label26, label27, label28, label29, label30,
+					label31, label32, label33, label34, label35, label36, label37, label38, label39, label40,
+					label41, label42, label43, label44, label45, label46, label47, label48,
+				};
+			startTextBoxes = new TextBox[]
+				{
+					startTextBox1,  startTextBox2,  startTextBox3,  startTextBox4,  startTextBox5,  startTextBox6,  startTextBox7,  startTextBox8,  startTextBox9,  startTextBox10,
+                    startTextBox11, startTextBox12, startTextBox13, startTextBox14, startTextBox15, startTextBox16, startTextBox17, startTextBox18, startTextBox19, startTextBox20,
+                    startTextBox21, startTextBox22, startTextBox23, startTextBox24, startTextBox25, startTextBox26, startTextBox27, startTextBox28, startTextBox29, startTextBox30,
+                    startTextBox31, startTextBox32, startTextBox33, startTextBox34, startTextBox35, startTextBox36, startTextBox37, startTextBox38, startTextBox39, startTextBox40,
+                    startTextBox41, startTextBox42, startTextBox43, startTextBox44, startTextBox45, startTextBox46, startTextBox47, startTextBox48,
+				};
+			endTextBoxes = new TextBox[]
+				{
+					endTextBox1,  endTextBox2,  endTextBox3,  endTextBox4,  endTextBox5,  endTextBox6,  endTextBox7,  endTextBox8,  endTextBox9, endTextBox10,
+                    endTextBox11, endTextBox12, endTextBox13, endTextBox14, endTextBox15, endTextBox16, endTextBox17, endTextBox18, endTextBox19, endTextBox20,
+                    endTextBox21, endTextBox22, endTextBox23, endTextBox24, endTextBox25, endTextBox26, endTextBox27, endTextBox28, endTextBox29, endTextBox30,
+                    endTextBox31, endTextBox32, endTextBox33, endTextBox34, endTextBox35, endTextBox36, endTextBox37, endTextBox38, endTextBox39, endTextBox40,
+                    endTextBox41, endTextBox42, endTextBox43, endTextBox44, endTextBox45, endTextBox46, endTextBox47, endTextBox48,
+				};
+            exclamations = new Label[]
+                {
+					exclamation1, exclamation2, exclamation3, exclamation4, exclamation5, exclamation6,
+					exclamation7, exclamation8, exclamation9, exclamation10, exclamation11, exclamation12,
+					exclamation13, exclamation14, exclamation15, exclamation16, exclamation17, exclamation18,
+					exclamation19, exclamation20, exclamation21, exclamation22, exclamation23, exclamation24,
+					exclamation25, exclamation26, exclamation27, exclamation28, exclamation29, exclamation30,
+					exclamation31, exclamation32, exclamation33, exclamation34, exclamation35, exclamation36,
+					exclamation37, exclamation38, exclamation39, exclamation40, exclamation41, exclamation42,
+					exclamation43, exclamation44, exclamation45, exclamation46, exclamation47, exclamation48,
+                };
+
+			activeTextBoxes = new List<TextBox>();
+            activeWmNrs = new List<int>();
+
+			completed = false;
+			StartForceCloseHandler();
+		}
+
+		/// <summary>
+		/// Constructor to fill in start states
+		/// </summary>
+		/// <param name="waterMetersCount">Number of water meters</param>
+		/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
+        public TestStartEndForm(Results.Entities.WaterMeter[] waterMeters, IRegisterReader[] regReaders, bool[] disabled)
+			: this()
+		{
+			endStates = false;
+
+			this.WaterMetersCount = waterMeters.Length;
+            this.waterMeters = waterMeters;
+			this.regReaders = regReaders;
+			this.disabled = disabled;
+
+			ShuffleTextBoxes();
+
+			WMStartState = new double[WaterMetersCount];
+			WMStartStateStr = new string[WaterMetersCount];
+		}
+
+        /// <summary>
+        /// Constructor to fill in end states
+        /// </summary>
+		/// <param name="waterMetersCount">Number of water meters</param>
+		/// <param name="wmStartStateStr">Information entered on test start</param>
+		/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
+		/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
+		/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
+		/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
+        public TestStartEndForm(Results.Entities.WaterMeter[] waterMeters, IRegisterReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
+								double refVolume, double errLimLo, double errLimHi)
+			: this()
+        {
+			endStates = true;
+
+            this.WaterMetersCount = waterMeters.Length;
+            this.waterMeters = waterMeters;
+            this.regReaders = regReaders;
+			if (wmStartStateStr == null || wmStartStateStr.Length != WaterMetersCount)
+				throw (new Exception("Invalid 'wmStartStateStr' argument"));
+			this.WMStartStateStr = wmStartStateStr;
+			this.disabled = disabled;
+            this.refVolume = refVolume;
+            this.warningLimLo = 2 * errLimLo;
+            this.warningLimHi = 2 * errLimHi;
+            this.fixedErrorLimits = (errLimHi > errLimLo);
+
+			ShuffleTextBoxes();
+
+            WMEndState = new double[WaterMetersCount];
+		}
+
+		/// <summary>
+		/// Make sure the layout of labels/text boxes on the screen
+		/// corresponds to the layout of watermeters of the test bench.
+		/// </summary>
+		void ShuffleTextBoxes()
+		{
+			if (TextBoxesCount > WaterMetersCount)
+			{
+				int nrLines = WaterMetersCount / Config.Data.LineSize;
+				int gap = (TextBoxesCount - WaterMetersCount) / nrLines;
+
+				int dest = 0;
+				for (int l = 0; l < nrLines; l++)
+				{
+					for (int i = 0; i < Config.Data.LineSize; i++)
+					{
+						labels[dest] = labels[l * Config.Data.LineSize + l * gap + i];
+						startTextBoxes[dest] = startTextBoxes[l * Config.Data.LineSize + l * gap + i];
+						endTextBoxes[dest] = endTextBoxes[l * Config.Data.LineSize + l * gap + i];
+                        exclamations[dest] = exclamations[l * Config.Data.LineSize + l * gap + i];
+                        dest++;
+					}
+				}
+				TextBoxesCount = WaterMetersCount;
+			}
+		}
+
+		private void CycleEndForm_Load(object sender, EventArgs e)
+		{
+            Localize();
+
+            //Height = 115 + 90 * WaterMetersCount;
+
+			for (int i = 0; i < TextBoxesCount; i++)
+			{
+				if (i < WaterMetersCount)
+				{
+					labels[i].Visible = startTextBoxes[i].Visible = endTextBoxes[i].Visible = true;
+				}
+			}
+
+            if (endStates)
+			{
+                /// End of test
+				for (int i = 0; i < TextBoxesCount; i++)
+				{
+					if (WMStartStateStr != null && i < WMStartStateStr.Length)
+					{
+						startTextBoxes[i].Text = WMStartStateStr[i];
+					}
+
+					if (((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null)))
+					{
+						endTextBoxes[i].Enabled = false;
+					}
+					else
+					{
+						endTextBoxes[i].Enabled = true;
+						activeTextBoxes.Add(endTextBoxes[i]);
+                        activeWmNrs.Add(i);
+                    }
+				}
+			}
+			else
+			{ 
+                /// Start of test
+				for (int i = 0; i < TextBoxesCount; i++)
+				{
+					if (((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null)))
+					{
+						startTextBoxes[i].Enabled = false;
+					}
+					else
+					{
+						startTextBoxes[i].Enabled = true;
+						activeTextBoxes.Add(startTextBoxes[i]);
+                        activeWmNrs.Add(i);
+                    }
+				}
+			}
+
+            if ((activeTextBoxes.Count > 0) && (activeWmNrs.Count > 0))
+            {
+                activeTextBoxes[0].Focus();
+            }
+		}
+
+		void Localize()
+		{
+			Text = Strings.Water_Meter_States;
+			for (int i = 0; i < TextBoxesCount; i++)
+			{
+				labels[i].Text = string.Format("{0} {1}", Strings.Water_Meter, i + 1);
+			}
+            startLabel.Text = start2Label.Text = Strings.Start;
+            endLabel.Text = end2Label.Text = Strings.End;
+			okButton.Text = Strings.OkBtnText;
+		}
+
+
+        delegate void StateReceivedDlgt(string serialNr, double wmState);
+        /// 
+        public void WMStateReceived(string serialNr, double wmState)
+        {
+            StateReceivedDlgt dlgt = OnWMStateReceived;
+            Invoke(dlgt, new object[] { serialNr, wmState });
+        }
+        /// 
+        void OnWMStateReceived(string serialNr, double wmState)
+        {
+            int count = Math.Min(WaterMetersCount, Math.Min(startTextBoxes.Length, endTextBoxes.Length));
+            for (int i = 0; i < count; i++)
+            {
+                if ((waterMeters[i] != null) && (waterMeters[i].SerialNr == serialNr))
+                {
+                    (endStates ? endTextBoxes[i] : startTextBoxes[i]).Text = wmState.ToString();
+                    break;
+                }
+            }
+        }
+
+
+        private void okButton_Click(object sender, EventArgs eArgs)
+		{
+            try
+            {
+				if (endStates)
+				{
+					for (int i = 0; i < Math.Min(WaterMetersCount, TextBoxesCount); i++)
+					{
+						if (endTextBoxes[i].Visible && endTextBoxes[i].Enabled)
+						{
+							WMEndState[i] = Utils.ParseUDouble(endTextBoxes[i].Text);
+						}
+					}
+				}
+				else
+				{
+					for (int i = 0; i < Math.Min(WaterMetersCount, TextBoxesCount); i++)
+					{
+						if (startTextBoxes[i].Visible && startTextBoxes[i].Enabled)
+						{
+							WMStartStateStr[i] = startTextBoxes[i].Text;
+							WMStartState[i] = Utils.ParseUDouble(startTextBoxes[i].Text);
+						}
+					}
+				}
+			}
+            catch(Exception e)
+            {
+				log.ErrorFormat("Exception: {0}", e.Message);
+                return;
+            }
+
+			completed = true;
+			Close();
+		}
+
+		#region Forced close handling
+
+		public void StartForceCloseHandler()
+		{
+			UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args)
+			{
+				if (InvokeRequired) { Invoke(new EventHandler<EventArgs>(OnForceClose), sender, args); }
+				else OnForceClose(sender, args);
+			};
+		}
+
+		void OnForceClose(object sender, EventArgs args)
+		{
+			DialogResult = DialogResult.Cancel;
+			Close();
+		}
+
+		#endregion
+
+
+        /// <summary>
+        /// Calculate the approximate error and verify whether it is within limits.
+        /// Make an exclamation mark visible if out of range.
+        /// Similar event handler is implemented for all endTextBoxes (1..24).
+        /// </summary>
+        private void ProcEndTextChanged(object sender, EventArgs e, TextBox endTBox)
+        {
+            int wmIx = -1;
+            for (int i = 0; i < endTextBoxes.Length; i++)
+            {
+                if (endTextBoxes[i] == endTBox)
+                {
+                    wmIx = i;
+                    break;
+                }
+            }
+
+            double err = 0;
+            try
+            {
+                double endState = Utils.ParseUDouble(endTextBoxes[wmIx].Text);
+                double startState = Utils.ParseUDouble(startTextBoxes[wmIx].Text);
+                err = 100.0 * (endState - startState - refVolume) / refVolume;
+            }
+            catch { err = 1000.0f; };
+
+            bool errorOoR = fixedErrorLimits ? ((err < warningLimLo) || (warningLimHi < err)) : ((err < -6) || (+6 < err));
+            exclamations[wmIx].Visible = errorOoR;
+        }
+
+        private void endTextBox1_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox1); }
+        private void endTextBox2_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox2); }
+        private void endTextBox3_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox3); }
+        private void endTextBox4_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox4); }
+        private void endTextBox5_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox5); }
+        private void endTextBox6_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox6); }
+        private void endTextBox7_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox7); }
+        private void endTextBox8_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox8); }
+        private void endTextBox9_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox9); }
+        private void endTextBox10_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox10); }
+        private void endTextBox11_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox11); }
+        private void endTextBox12_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox12); }
+        private void endTextBox13_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox13); }
+        private void endTextBox14_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox14); }
+        private void endTextBox15_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox15); }
+        private void endTextBox16_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox16); }
+        private void endTextBox17_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox17); }
+        private void endTextBox18_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox18); }
+        private void endTextBox19_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox19); }
+        private void endTextBox20_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox20); }
+        private void endTextBox21_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox21); }
+        private void endTextBox22_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox22); }
+        private void endTextBox23_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox23); }
+        private void endTextBox24_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox24); }
+        private void endTextBox25_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox25); }
+        private void endTextBox26_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox26); }
+        private void endTextBox27_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox27); }
+        private void endTextBox28_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox28); }
+        private void endTextBox29_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox29); }
+        private void endTextBox30_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox30); }
+        private void endTextBox31_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox31); }
+        private void endTextBox32_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox32); }
+        private void endTextBox33_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox33); }
+        private void endTextBox34_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox34); }
+        private void endTextBox35_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox35); }
+        private void endTextBox36_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox36); }
+        private void endTextBox37_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox37); }
+        private void endTextBox38_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox38); }
+        private void endTextBox39_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox39); }
+        private void endTextBox40_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox40); }
+        private void endTextBox41_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox41); }
+        private void endTextBox42_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox42); }
+        private void endTextBox43_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox43); }
+        private void endTextBox44_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox44); }
+        private void endTextBox45_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox45); }
+        private void endTextBox46_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox46); }
+        private void endTextBox47_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox47); }
+        private void endTextBox48_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox48); }
+
+        private void endTextBox1_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox1); }
+        private void endTextBox2_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox2); }
+        private void endTextBox3_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox3); }
+        private void endTextBox4_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox4); }
+        private void endTextBox5_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox5); }
+        private void endTextBox6_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox6); }
+        private void endTextBox7_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox7); }
+        private void endTextBox8_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox8); }
+        private void endTextBox9_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox9); }
+        private void endTextBox10_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox10); }
+        private void endTextBox11_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox11); }
+        private void endTextBox12_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox12); }
+        private void endTextBox13_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox13); }
+        private void endTextBox14_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox14); }
+        private void endTextBox15_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox15); }
+        private void endTextBox16_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox16); }
+        private void endTextBox17_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox17); }
+        private void endTextBox18_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox18); }
+        private void endTextBox19_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox19); }
+        private void endTextBox20_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox20); }
+        private void endTextBox21_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox21); }
+        private void endTextBox22_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox22); }
+        private void endTextBox23_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox23); }
+        private void endTextBox24_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox24); }
+        private void endTextBox25_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox25); }
+        private void endTextBox26_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox26); }
+        private void endTextBox27_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox27); }
+        private void endTextBox28_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox28); }
+        private void endTextBox29_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox29); }
+        private void endTextBox30_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox30); }
+        private void endTextBox31_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox31); }
+        private void endTextBox32_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox32); }
+        private void endTextBox33_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox33); }
+        private void endTextBox34_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox34); }
+        private void endTextBox35_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox35); }
+        private void endTextBox36_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox36); }
+        private void endTextBox37_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox37); }
+        private void endTextBox38_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox38); }
+        private void endTextBox39_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox39); }
+        private void endTextBox40_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox40); }
+        private void endTextBox41_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox41); }
+        private void endTextBox42_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox42); }
+        private void endTextBox43_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox43); }
+        private void endTextBox44_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox44); }
+        private void endTextBox45_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox45); }
+        private void endTextBox46_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox46); }
+        private void endTextBox47_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox47); }
+        private void endTextBox48_MouseClick(object sndr, MouseEventArgs e) { ProcEndTextChanged(sndr, e, endTextBox48); }
+
+		/// <summary>
+		/// Process a key press within any enabled text boxe
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		/// <param name="currentFocusOwner">TextBox control which received the event</param>
+		private void ProcKeyPress(object sender, KeyPressEventArgs e, TextBox currentFocusOwner)
+		{
+			if (e.KeyChar == '+')
+			{
+				/// Process '+' key ..... Form completed
+				okButton_Click(sender, e);
+			}
+
+            if (e.KeyChar == '\r')
+            {
+                /// Process <enter> key ..... Next text field
+                if (activeTextBoxes.Count < 2) return;		/// There is just one enabled textbox
+
+                for (int i = 0; i < activeTextBoxes.Count; i++)
+                {
+                    if (activeTextBoxes[i] == currentFocusOwner)
+                    {
+                        /// Index of the next active text box
+                        int newTBIdx = (i + 1) % activeTextBoxes.Count;
+
+                        /// Change focus to the next active text box
+                        activeTextBoxes[newTBIdx].Focus();
+                        return;
+                    }
+                }
+            }
+        }
+
+		private void startTextBox1_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox1); }
+		private void startTextBox2_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox2); }
+		private void startTextBox3_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox3); }
+		private void startTextBox4_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox4); }
+		private void startTextBox5_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox5); }
+		private void startTextBox6_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox6); }
+		private void startTextBox7_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox7); }
+		private void startTextBox8_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox8); }
+		private void startTextBox9_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox9); }
+		private void startTextBox10_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox10); }
+		private void startTextBox11_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox11); }
+		private void startTextBox12_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox12); }
+		private void startTextBox13_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox13); }
+		private void startTextBox14_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox14); }
+		private void startTextBox15_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox15); }
+		private void startTextBox16_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox16); }
+		private void startTextBox17_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox17); }
+		private void startTextBox18_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox18); }
+		private void startTextBox19_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox19); }
+		private void startTextBox20_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox20); }
+		private void startTextBox21_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox21); }
+		private void startTextBox22_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox22); }
+		private void startTextBox23_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox23); }
+		private void startTextBox24_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox24); }
+        private void startTextBox25_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox25); }
+        private void startTextBox26_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox26); }
+        private void startTextBox27_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox27); }
+        private void startTextBox28_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox28); }
+        private void startTextBox29_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox29); }
+        private void startTextBox30_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox30); }
+        private void startTextBox31_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox31); }
+        private void startTextBox32_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox32); }
+        private void startTextBox33_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox33); }
+        private void startTextBox34_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox34); }
+        private void startTextBox35_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox35); }
+        private void startTextBox36_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox36); }
+        private void startTextBox37_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox37); }
+        private void startTextBox38_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox38); }
+        private void startTextBox39_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox39); }
+        private void startTextBox40_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox40); }
+        private void startTextBox41_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox41); }
+        private void startTextBox42_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox42); }
+        private void startTextBox43_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox43); }
+        private void startTextBox44_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox44); }
+        private void startTextBox45_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox45); }
+        private void startTextBox46_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox46); }
+        private void startTextBox47_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox47); }
+        private void startTextBox48_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox48); }
+
+		private void endTextBox1_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox1); }
+		private void endTextBox2_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox2); }
+		private void endTextBox3_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox3); }
+		private void endTextBox4_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox4); }
+		private void endTextBox5_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox5); }
+		private void endTextBox6_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox6); }
+		private void endTextBox7_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox7); }
+		private void endTextBox8_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox8); }
+		private void endTextBox9_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox9); }
+		private void endTextBox10_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox10); }
+		private void endTextBox11_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox11); }
+		private void endTextBox12_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox12); }
+		private void endTextBox13_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox13); }
+		private void endTextBox14_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox14); }
+		private void endTextBox15_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox15); }
+		private void endTextBox16_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox16); }
+		private void endTextBox17_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox17); }
+		private void endTextBox18_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox18); }
+		private void endTextBox19_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox19); }
+		private void endTextBox20_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox20); }
+		private void endTextBox21_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox21); }
+		private void endTextBox22_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox22); }
+		private void endTextBox23_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox23); }
+		private void endTextBox24_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox24); }
+        private void endTextBox25_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox25); }
+        private void endTextBox26_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox26); }
+        private void endTextBox27_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox27); }
+        private void endTextBox28_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox28); }
+        private void endTextBox29_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox29); }
+        private void endTextBox30_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox30); }
+        private void endTextBox31_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox31); }
+        private void endTextBox32_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox32); }
+        private void endTextBox33_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox33); }
+        private void endTextBox34_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox34); }
+        private void endTextBox35_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox35); }
+        private void endTextBox36_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox36); }
+        private void endTextBox37_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox37); }
+        private void endTextBox38_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox38); }
+        private void endTextBox39_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox39); }
+        private void endTextBox40_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox40); }
+        private void endTextBox41_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox41); }
+        private void endTextBox42_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox42); }
+        private void endTextBox43_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox43); }
+        private void endTextBox44_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox44); }
+        private void endTextBox45_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox45); }
+        private void endTextBox46_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox46); }
+        private void endTextBox47_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox47); }
+        private void endTextBox48_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox48); }
+
+
+        private void ProcStartTextChanged(object sender, EventArgs e, TextBox startTBox)
+        {
+            for (int i = 0; i < startTextBoxes.Length; i++)
+            {
+                if (startTextBoxes[i] == startTBox)
+                {
+                    /// wmIx == i
+                    break;
+                }
+            }
+        }
+
+        private void startTextBox1_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox1); }
+        private void startTextBox2_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox2); }
+        private void startTextBox3_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox3); }
+        private void startTextBox4_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox4); }
+        private void startTextBox5_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox5); }
+        private void startTextBox6_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox6); }
+        private void startTextBox7_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox7); }
+        private void startTextBox8_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox8); }
+        private void startTextBox9_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox9); }
+        private void startTextBox10_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox10); }
+        private void startTextBox11_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox11); }
+        private void startTextBox12_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox12); }
+        private void startTextBox13_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox13); }
+        private void startTextBox14_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox14); }
+        private void startTextBox15_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox15); }
+        private void startTextBox16_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox16); }
+        private void startTextBox17_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox17); }
+        private void startTextBox18_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox18); }
+        private void startTextBox19_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox19); }
+        private void startTextBox20_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox20); }
+        private void startTextBox21_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox21); }
+        private void startTextBox22_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox22); }
+        private void startTextBox23_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox23); }
+        private void startTextBox24_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox24); }
+        private void startTextBox25_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox25); }
+        private void startTextBox26_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox26); }
+        private void startTextBox27_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox27); }
+        private void startTextBox28_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox28); }
+        private void startTextBox29_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox29); }
+        private void startTextBox30_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox30); }
+        private void startTextBox31_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox31); }
+        private void startTextBox32_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox32); }
+        private void startTextBox33_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox33); }
+        private void startTextBox34_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox34); }
+        private void startTextBox35_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox35); }
+        private void startTextBox36_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox36); }
+        private void startTextBox37_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox37); }
+        private void startTextBox38_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox38); }
+        private void startTextBox39_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox39); }
+        private void startTextBox40_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox40); }
+        private void startTextBox41_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox41); }
+        private void startTextBox42_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox42); }
+        private void startTextBox43_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox43); }
+        private void startTextBox44_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox44); }
+        private void startTextBox45_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox45); }
+        private void startTextBox46_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox46); }
+        private void startTextBox47_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox47); }
+        private void startTextBox48_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox48); }
+
+        private void startTextBox1_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox1); }
+        private void startTextBox2_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox2); }
+        private void startTextBox3_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox3); }
+        private void startTextBox4_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox4); }
+        private void startTextBox5_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox5); }
+        private void startTextBox6_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox6); }
+        private void startTextBox7_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox7); }
+        private void startTextBox8_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox8); }
+        private void startTextBox9_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox9); }
+        private void startTextBox10_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox10); }
+        private void startTextBox11_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox11); }
+        private void startTextBox12_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox12); }
+        private void startTextBox13_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox13); }
+        private void startTextBox14_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox14); }
+        private void startTextBox15_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox15); }
+        private void startTextBox16_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox16); }
+        private void startTextBox17_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox17); }
+        private void startTextBox18_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox18); }
+        private void startTextBox19_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox19); }
+        private void startTextBox20_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox20); }
+        private void startTextBox21_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox21); }
+        private void startTextBox22_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox22); }
+        private void startTextBox23_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox23); }
+        private void startTextBox24_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox24); }
+        private void startTextBox25_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox25); }
+        private void startTextBox26_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox26); }
+        private void startTextBox27_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox27); }
+        private void startTextBox28_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox28); }
+        private void startTextBox29_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox29); }
+        private void startTextBox30_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox30); }
+        private void startTextBox31_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox31); }
+        private void startTextBox32_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox32); }
+        private void startTextBox33_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox33); }
+        private void startTextBox34_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox34); }
+        private void startTextBox35_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox35); }
+        private void startTextBox36_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox36); }
+        private void startTextBox37_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox37); }
+        private void startTextBox38_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox38); }
+        private void startTextBox39_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox39); }
+        private void startTextBox40_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox40); }
+        private void startTextBox41_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox41); }
+        private void startTextBox42_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox42); }
+        private void startTextBox43_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox43); }
+        private void startTextBox44_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox44); }
+        private void startTextBox45_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox45); }
+        private void startTextBox46_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox46); }
+        private void startTextBox47_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox47); }
+        private void startTextBox48_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox48); }
+    }
+}

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

@@ -0,0 +1,120 @@
+<?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/RegisterReaders/KPackE/Radio/Factory.cs

@@ -0,0 +1,26 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System.Collections.Generic;
+using TBF.BenchControl.Generic;
+
+namespace TBF.BenchControl.RegisterReaders.KPackE.Radio
+{
+	public class Factory : IComponentFactory
+	{
+        public string ClassName { get { return this.GetType().Namespace.Substring(17); } }
+
+		public void ResetStaticProperties() { Radio.ResetStaticProperties(); }
+
+		public IComponent DummyComponent() { return new Radio(); }
+
+		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Radio(cfg); }
+
+		public IComponentCfg DefaultConfig() { return new RadioCfg(this); }
+
+		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
+        {
+            return ComponentCfgBase.CreateFromDbEntity(RadioCfg.Serializer, component, this);
+        }
+	}
+}

TBF/BenchControl/RegisterReaders/KPackE/Radio/Radio.cs

@@ -0,0 +1,288 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO.Ports;
+using System.Text;
+using System.Threading;
+using Config.Entities;
+using log4net;
+using TBF.BenchControl.Generic;
+using TBF.Boxes;
+using TBF.BenchControl.GenericDevices;
+
+namespace TBF.BenchControl.RegisterReaders.KPackE.Radio
+{
+    /// <summary>
+	/// Root component for Modbus communication via serial port (RS485)
+	/// </summary>
+	public class Radio : ComponentBase, IDevice
+    {
+		private static readonly ILog log = LogManager.GetLogger(typeof(Radio));
+		public override string ToString() { return string.Format("Radio({0})", Cfg.ToString(1)); }
+
+        enum KPackE_Type
+        {
+            Reading = 0,
+            RSSI = 1,
+            Delta = 2,
+            SmartMeterEvent = 5,
+            Event = 7,
+        }
+
+        enum KPackE_Original
+        {
+            Repeated = 0,
+            Original = 1,
+        }
+
+        ///
+        /// Definition of telegrams and telegram frames
+        ///
+        static readonly byte[] Ack = new byte[] { 0x06 };
+        static readonly byte[] HartBeatTelegram = new byte[] { 0x0A, 0x30, 0x30, 0x20, 0x4F, 0x4B, 0x41, 0x59, 0x20, 0x40, 0x0D };  // <LF>00 OKAY @<CR> (11 bytes)
+        static readonly byte[] KPackETelegramFrame = new byte[] { 0x02, 0x0F, 0x4D, 0x45, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x03, 0, 0x0A, 0x0D };
+        static readonly int MinRcvdTlgrmLen = Math.Min(HartBeatTelegram.Length, KPackETelegramFrame.Length);
+        static readonly int MaxRcvdTlgrmLen = Math.Max(HartBeatTelegram.Length, KPackETelegramFrame.Length);
+
+        ///
+        /// Private fields
+        ///
+        private readonly RadioCfg radioCfg;
+
+		SerialPort serialPort;
+        DateTime lastSerialPortWrite;
+        DateTime lastTelegramReceived;
+        IList<byte> data;                       /// Received and not yet processed data
+
+        /// <summary>
+        /// Returns true when the last telegram is not older then 60 seconds
+        /// </summary>
+        public bool IsRadioOn()
+        {
+            return (DateTime.Now - lastTelegramReceived) < new TimeSpan(0, 0, 60); 
+        }
+
+
+        public IList<RegisterReader.RegisterReader> RegReaders;
+        public IReceivesDataFromRadio EntryForm;
+
+
+		public Radio()
+		{
+		}
+
+		/// <summary>
+		/// 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 Radio(Generic.IComponentCfg cfg)
+            : base(cfg)
+        {
+            RegReaders = new List<RegisterReader.RegisterReader>();
+
+			serialPort = null;
+			radioCfg = cfg as RadioCfg;
+            data = new List<byte>();
+
+			log.Debug(this.ToString());
+		}
+
+		~Radio()
+		{
+		}
+
+
+		public void Initialize()
+		{
+			if (radioCfg.DebugLevel == DebugMode.Simulate)
+			{
+				serialPort = null;
+				log.FatalFormat("{0} - Device simulated", Name);
+				return;
+			}
+
+            lastTelegramReceived = DateTime.MinValue;
+
+			string comPortName = "COM" + radioCfg.ComPortNr.ToString();
+			serialPort = new SerialPort(comPortName, radioCfg.BaudRate, radioCfg.Parity, radioCfg.DataBits, radioCfg.StopBits);
+			serialPort.Handshake = radioCfg.Handshake;
+			serialPort.Open();
+
+			//stopWorkerThread = false;
+			//workerThread = new Thread(Worker);
+			//workerThread.Start();
+
+            log.FatalFormat("{0} - Device successfully initialized", Name);
+		}
+
+
+        public void SendAcknowledgeNow()
+        {
+            serialPort.Write(Ack, 0, Ack.Length);
+            lastSerialPortWrite = DateTime.Now;
+
+            string s = Telegram.LogTelegram(string.Format("{0} - Sending message ", Name), Ack);
+            Debug.WriteLine(s);
+            log.Debug(s);
+        }
+
+
+        /// <summary>Run this device</summary>
+        public void RunDeviceBefore()
+        {
+            if (serialPort != null) ReadDataFromSerialPort();
+        }
+
+        /// <summary>Run this device</summary>
+        public void RunDeviceAfter()
+        {
+            if (serialPort != null) ReadDataFromSerialPort();
+        }
+
+        void ReadDataFromSerialPort()
+        {
+            /// Append any new data to the data buffer
+			int receivedBytesCount = serialPort.BytesToRead;
+			if (receivedBytesCount > 0)
+			{
+                byte[] receivedData = new byte[receivedBytesCount];
+                serialPort.Read(receivedData, 0, receivedBytesCount);
+                {
+                    string s = Telegram.LogTelegram(string.Format("{0} received ", Name), receivedData);
+                    Debug.WriteLine(s);
+                    log.Debug(s);
+                }
+                foreach (var b in receivedData) data.Add(b);
+            }
+
+            if (data.Count >= MinRcvdTlgrmLen)
+            {
+                for (int offset = 0; offset <= (data.Count - MinRcvdTlgrmLen); offset++)
+                {
+                    if (DataFitFrame(data, offset, KPackETelegramFrame) &&
+                        (data[offset + 14] == Telegram.ClaculateTelegramChecksum(SubArray(data, offset + 2, 12))))
+                    {
+                        /// Read the telegram
+                        KPackE_Type type = (KPackE_Type)((data[offset + 4] >> 5) & 0x07);
+                        KPackE_Original original = ((data[offset + 4] & 0x10) != 0) ? KPackE_Original.Original : KPackE_Original.Repeated;
+                        int slotNumber = (data[offset + 4] & 0x0F);
+                        long reading = (((data[offset + 5] * 256 + data[offset + 6]) * 256 + data[offset + 7]) * 256 + data[offset + 8]) * 16 + ((data[offset + 9] >> 4) & 0x0F);
+                        int account = ((data[offset + 9] & 0x0F) * 256 + data[offset + 10]) * 256 + data[offset + 11];
+                        int rssi = data[offset + 12];
+
+                        if (type == KPackE_Type.Reading)
+                        {
+                            string serialNr = account.ToString();
+                            foreach (var rr in RegReaders)
+                            {
+                                if (rr.SerialNr == serialNr)
+                                {
+                                    double wmState = (double)reading;
+                                    rr.WMStateReceived(wmState);
+                                    EntryForm.WMStateReceived(serialNr, wmState);
+                                    break;
+                                }
+                            }
+                        }
+
+                        lastTelegramReceived = DateTime.Now;
+                        SendAcknowledgeNow();
+
+                        /// Remove processed data from the buffer
+                        for (int i = 0; i < offset + KPackETelegramFrame.Length; i++) data.RemoveAt(0);
+
+                        string s;
+                        if (type == KPackE_Type.Reading)
+                        {
+                            s = string.Format("{0} processed KPackE telegram: s/n = {1} reading = {2}", Name, account, reading);
+                        }
+                        else
+                        {
+                            s = string.Format("{0} processed KPackE telegram: s/n = {1} {2}", Name, account, type);
+                        }
+                        Debug.WriteLine(s);
+                        log.Info(s);
+
+                        break;
+                    }
+                    else if (DataFitFrame(data, offset, HartBeatTelegram))
+                    {
+                        /// acknowledge hart beat telegram
+                        lastTelegramReceived = DateTime.Now;
+                        SendAcknowledgeNow();
+
+                        /// Remove processed data from the buffer
+                        for (int i = 0; i < offset + HartBeatTelegram.Length; i++) data.RemoveAt(0);
+
+                        string s = string.Format("{0} processed HartBeat telegram", Name);
+                        Debug.WriteLine(s);
+                        log.Debug(s);
+                        
+                        break;
+                    }
+                }
+			}
+
+            string ss = string.Format("{0}: {1} unprocessed bytes in the data buffer", Name, data.Count);
+            Debug.WriteLine(ss);
+            log.Debug(ss);
+        }
+
+        /// <summary>
+        /// Compares received data bytes with a telegram frame.
+        /// Zero bytes in the telegram frame are ignored, nonzero bytes must fit.
+        /// </summary>
+        /// <param name="data">Data bytes</param>
+        /// <param name="offset">Offset of the fitted frame within data</param>
+        /// <param name="telegramFrame">Telegram frame</param>
+        /// <returns>true when data fit the frame</returns>
+        bool DataFitFrame(IList<byte> data, int offset, byte[] telegramFrame)
+        {
+            if ((data.Count - offset) < telegramFrame.Length)
+            {
+                return false;       /// Not enough data
+            }
+
+            for (int i = 0; i < telegramFrame.Length; i++)
+            {
+                if ((telegramFrame[i] != 0) && (telegramFrame[i] != data[i + offset]))
+                {
+                    return false;   /// Data do not fit nonzero frame bytes (zero frame bytes are ignored)
+                }
+            }
+
+            return true;            /// Data fit the telegram frame
+        }
+
+        /// <summary>
+        /// Get a sub-array
+        /// </summary>
+        public static byte[] SubArray(IList<byte> data, int index, int length)
+        {
+            if (data.Count < index + length) return new byte[1] { 0 };
+
+            byte[] result = new byte[length];
+            for (int i = 0; i < length; i++) result[i] = data[index + i];
+            return result;
+        }
+
+
+        /// <summary>Stop this device</summary>
+        public void StopDevice()
+        {
+			if (serialPort != null)
+			{
+				//stopWorkerThread = true;
+				//workerThread.Join(2000);
+				serialPort.Close();
+				serialPort = null;
+			}
+		}
+
+		public void StopDevice2() { }
+	}
+}

TBF/BenchControl/RegisterReaders/KPackE/Radio/RadioCfg.cs

@@ -0,0 +1,53 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
+using System.IO.Ports;
+using System.Xml.Serialization;
+using TBF.BenchControl.Generic;
+
+namespace TBF.BenchControl.RegisterReaders.KPackE.Radio
+{
+    public class RadioCfg : ComponentCfgBase, Generic.IComponentCfg
+	{
+		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(RadioCfg) })[0];
+		public override XmlSerializer GetSerializer() { return Serializer; }
+
+		public IComponentCfgCtrl GetControl() { return new RadioCfgCtrl(); }
+
+		///
+		/// Serialized parameters 
+		///
+		public int ComPortNr;
+        public int BaudRate;
+        public Parity Parity;
+        public int DataBits;
+        public StopBits StopBits;
+        public Handshake Handshake;
+
+		/// Private parameterless constructor invoked by all other (public) constructors
+		RadioCfg()
+		{
+            Name = "KPackE.Radio";
+            ParentName = string.Empty;
+            ComPortNr = 3;
+            BaudRate = 38400;
+            Parity = System.IO.Ports.Parity.None;
+            DataBits = 8;
+            StopBits = System.IO.Ports.StopBits.One;
+            Handshake = System.IO.Ports.Handshake.None;
+        }
+
+        public RadioCfg(IComponentFactory factory)
+            : this()
+        {
+            this.Factory = factory;
+        }
+
+		public string ToString(int i)
+		{
+            return string.Format("Name={0}, Com{1}, {2}Bd, {3}-bits, parity={4}, stopBits={5}, {6}",
+                                 Name, ComPortNr, BaudRate, DataBits, Parity, StopBits, Handshake);
+		}
+	}
+}

TBF/BenchControl/RegisterReaders/KPackE/Radio/RadioCfgCtrl.cs

@@ -0,0 +1,171 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
+using System.Windows.Forms;
+using System.IO.Ports;
+using Config.Entities;
+using TBF.BenchControl.Generic;
+using TBF.Resources;
+
+namespace TBF.BenchControl.RegisterReaders.KPackE.Radio
+{
+	public partial class RadioCfgCtrl : UserControl, IComponentCfgCtrl
+	{
+		public bool ShowMore { get { return false; } }
+
+		RadioCfg config;
+		public IComponentCfg Config
+		{
+			get { return config as IComponentCfg; }
+			set
+			{
+				config = value as RadioCfg;
+				Redraw();
+			}
+		}
+
+		public RadioCfgCtrl()
+		{
+			InitializeComponent();
+
+			parityComboBox.Items.Add(Parity.None.ToString());
+			parityComboBox.Items.Add(Parity.Even.ToString());
+			parityComboBox.Items.Add(Parity.Odd.ToString());
+
+			stopBitsComboBox.Items.Add(StopBits.None.ToString());
+			stopBitsComboBox.Items.Add(StopBits.One.ToString());
+			stopBitsComboBox.Items.Add(StopBits.OnePointFive.ToString());
+			stopBitsComboBox.Items.Add(StopBits.Two.ToString());
+
+			handshakeComboBox.Items.Add(Handshake.None.ToString());
+			handshakeComboBox.Items.Add(Handshake.RequestToSend.ToString());
+			handshakeComboBox.Items.Add(Handshake.XOnXOff.ToString());
+		}
+
+		int GetParityIx(Parity par)
+		{
+			if (par == Parity.None) return 0;
+			if (par == Parity.Even) return 0;
+			if (par == Parity.Odd) return 0;
+			return -1;
+		}
+		Parity GetParity(string str)
+		{
+			if (str.Equals(Parity.None.ToString())) return Parity.None;
+			if (str.Equals(Parity.Even.ToString())) return Parity.Even;
+			if (str.Equals(Parity.Odd.ToString())) return Parity.Odd;
+			return (Parity)(-1);
+		}
+
+		int GetStopBitsIx(StopBits sb)
+		{
+			if (sb == StopBits.None) return 0;
+			if (sb == StopBits.One) return 1;
+			if (sb == StopBits.OnePointFive) return 2;
+			if (sb == StopBits.Two) return 3;
+			return -1;
+		}
+		StopBits GetStopBits(string str)
+		{
+			if (str.Equals(StopBits.None.ToString())) return StopBits.None;
+			if (str.Equals(StopBits.One.ToString())) return StopBits.One;
+			if (str.Equals(StopBits.OnePointFive.ToString())) return StopBits.OnePointFive;
+			if (str.Equals(StopBits.Two.ToString())) return StopBits.Two;
+			return (StopBits)(-1);
+		}
+
+		int GetHandshakeIx(Handshake par)
+		{
+			if (par == Handshake.None) return 0;
+			if (par == Handshake.RequestToSend) return 0;
+			if (par == Handshake.XOnXOff) return 0;
+			return -1;
+		}
+		Handshake GetHandshake(string str)
+		{
+			if (str.Equals(Handshake.None.ToString())) return Handshake.None;
+			if (str.Equals(Handshake.RequestToSend.ToString())) return Handshake.RequestToSend;
+			if (str.Equals(Handshake.XOnXOff.ToString())) return Handshake.XOnXOff;
+			return (Handshake)(-1);
+		}
+
+		private void ModbusCfgCtrl_Load(object sender, EventArgs e)
+		{
+			nameLabel.Text = Strings.Name;
+			Redraw();
+		}
+
+		public void Closing()
+		{
+		}
+
+		void Redraw()
+		{
+			if (config == null) return;			/// Control was not loaded, settings were not changed
+
+			classNameLabel.Text = config.Factory.ClassName;
+			nameTextBox.Text = config.Name;
+			comPortNrTextBox.Text = config.ComPortNr.ToString();
+			baudRateTextBox.Text = config.BaudRate.ToString();
+			parityComboBox.Text = config.Parity.ToString();
+			dataBitsTextBox.Text = config.DataBits.ToString();
+			stopBitsComboBox.Text = config.StopBits.ToString();
+			handshakeComboBox.Text = config.Handshake.ToString();
+		}
+
+		public void Unlock()
+		{
+			nameTextBox.Enabled = true;
+			comPortNrTextBox.Enabled = true;
+			baudRateTextBox.Enabled = true;
+			parityComboBox.Enabled = true;
+			dataBitsTextBox.Enabled = true;
+			stopBitsComboBox.Enabled = true;
+			handshakeComboBox.Enabled = true;
+		}
+
+		public CfgUpdateFlags UpdateCfg()
+		{
+			CfgUpdateFlags flags = CfgUpdateFlags.RestartRqrd;
+
+			if (config == null) return CfgUpdateFlags.Error;	/// Control was not loaded, settings were not changed
+
+			config.Name = nameTextBox.Text;
+			config.ComPortNr = int.Parse(comPortNrTextBox.Text);
+			config.BaudRate = int.Parse(baudRateTextBox.Text);
+			config.Parity = GetParity(parityComboBox.SelectedItem.ToString());
+			config.DataBits = int.Parse(dataBitsTextBox.Text);
+			config.StopBits = GetStopBits(stopBitsComboBox.SelectedItem.ToString());
+			config.Handshake = GetHandshake(handshakeComboBox.SelectedItem.ToString());
+
+			return flags;
+		}
+
+		public CfgUpdateFlags VerifyCfg(ref string message)
+		{
+            CfgUpdateFlags flags = CfgUpdateFlags.None;
+
+			int dummy;
+			if (!int.TryParse(comPortNrTextBox.Text, out dummy) || dummy < 1 || dummy > 999)
+			{
+				flags |= CfgUpdateFlags.Error;
+				message += Environment.NewLine + "'Serial Port Number' is not valid";
+			}
+
+			if (!int.TryParse(baudRateTextBox.Text, out dummy) || dummy < 150 || dummy > 115200)
+			{
+				flags |= CfgUpdateFlags.Error;
+				message += Environment.NewLine + "'Baud Rate' is not valid";
+			}
+
+			if (!int.TryParse(dataBitsTextBox.Text, out dummy) || dummy < 7 || dummy > 8)
+			{
+				flags |= CfgUpdateFlags.Error;
+				message += Environment.NewLine + "'Data Bits' is not valid";
+			}
+
+			return flags;
+		}
+	}
+}

TBF/BenchControl/RegisterReaders/KPackE/Radio/RadioCfgCtrl.designer.cs

@@ -0,0 +1,229 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+namespace TBF.BenchControl.RegisterReaders.KPackE.Radio
+{
+	partial class RadioCfgCtrl
+	{
+		/// <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.comPortNrTextBox = new System.Windows.Forms.TextBox();
+			this.label1 = new System.Windows.Forms.Label();
+			this.baudRateLabel = new System.Windows.Forms.Label();
+			this.baudRateTextBox = new System.Windows.Forms.TextBox();
+			this.partityLabel = new System.Windows.Forms.Label();
+			this.dataBitsLabel = new System.Windows.Forms.Label();
+			this.dataBitsTextBox = new System.Windows.Forms.TextBox();
+			this.stopBitsLabel = new System.Windows.Forms.Label();
+			this.handshakeLabel = new System.Windows.Forms.Label();
+			this.nameTextBox = new System.Windows.Forms.TextBox();
+			this.nameLabel = new System.Windows.Forms.Label();
+			this.classNameLabel = new System.Windows.Forms.Label();
+			this.parityComboBox = new System.Windows.Forms.ComboBox();
+			this.stopBitsComboBox = new System.Windows.Forms.ComboBox();
+			this.handshakeComboBox = new System.Windows.Forms.ComboBox();
+			this.SuspendLayout();
+			// 
+			// comPortNrTextBox
+			// 
+			this.comPortNrTextBox.Enabled = false;
+			this.comPortNrTextBox.Location = new System.Drawing.Point(140, 52);
+			this.comPortNrTextBox.Name = "comPortNrTextBox";
+			this.comPortNrTextBox.Size = new System.Drawing.Size(34, 20);
+			this.comPortNrTextBox.TabIndex = 4;
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(29, 55);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(98, 13);
+			this.label1.TabIndex = 3;
+			this.label1.Text = "Serial Port Number:";
+			// 
+			// baudRateLabel
+			// 
+			this.baudRateLabel.AutoSize = true;
+			this.baudRateLabel.Location = new System.Drawing.Point(29, 79);
+			this.baudRateLabel.Name = "baudRateLabel";
+			this.baudRateLabel.Size = new System.Drawing.Size(58, 13);
+			this.baudRateLabel.TabIndex = 5;
+			this.baudRateLabel.Text = "Baud Rate";
+			// 
+			// baudRateTextBox
+			// 
+			this.baudRateTextBox.Enabled = false;
+			this.baudRateTextBox.Location = new System.Drawing.Point(140, 76);
+			this.baudRateTextBox.Name = "baudRateTextBox";
+			this.baudRateTextBox.Size = new System.Drawing.Size(130, 20);
+			this.baudRateTextBox.TabIndex = 6;
+			// 
+			// partityLabel
+			// 
+			this.partityLabel.AutoSize = true;
+			this.partityLabel.Location = new System.Drawing.Point(29, 103);
+			this.partityLabel.Name = "partityLabel";
+			this.partityLabel.Size = new System.Drawing.Size(33, 13);
+			this.partityLabel.TabIndex = 7;
+			this.partityLabel.Text = "Parity";
+			// 
+			// dataBitsLabel
+			// 
+			this.dataBitsLabel.AutoSize = true;
+			this.dataBitsLabel.Location = new System.Drawing.Point(29, 127);
+			this.dataBitsLabel.Name = "dataBitsLabel";
+			this.dataBitsLabel.Size = new System.Drawing.Size(50, 13);
+			this.dataBitsLabel.TabIndex = 9;
+			this.dataBitsLabel.Text = "Data Bits";
+			// 
+			// dataBitsTextBox
+			// 
+			this.dataBitsTextBox.Enabled = false;
+			this.dataBitsTextBox.Location = new System.Drawing.Point(140, 124);
+			this.dataBitsTextBox.Name = "dataBitsTextBox";
+			this.dataBitsTextBox.Size = new System.Drawing.Size(34, 20);
+			this.dataBitsTextBox.TabIndex = 10;
+			// 
+			// stopBitsLabel
+			// 
+			this.stopBitsLabel.AutoSize = true;
+			this.stopBitsLabel.Location = new System.Drawing.Point(29, 151);
+			this.stopBitsLabel.Name = "stopBitsLabel";
+			this.stopBitsLabel.Size = new System.Drawing.Size(49, 13);
+			this.stopBitsLabel.TabIndex = 11;
+			this.stopBitsLabel.Text = "Stop Bits";
+			// 
+			// handshakeLabel
+			// 
+			this.handshakeLabel.AutoSize = true;
+			this.handshakeLabel.Location = new System.Drawing.Point(29, 175);
+			this.handshakeLabel.Name = "handshakeLabel";
+			this.handshakeLabel.Size = new System.Drawing.Size(62, 13);
+			this.handshakeLabel.TabIndex = 13;
+			this.handshakeLabel.Text = "Handshake";
+			// 
+			// nameTextBox
+			// 
+			this.nameTextBox.Enabled = false;
+			this.nameTextBox.Location = new System.Drawing.Point(140, 28);
+			this.nameTextBox.Name = "nameTextBox";
+			this.nameTextBox.Size = new System.Drawing.Size(130, 20);
+			this.nameTextBox.TabIndex = 2;
+			// 
+			// nameLabel
+			// 
+			this.nameLabel.AutoSize = true;
+			this.nameLabel.Location = new System.Drawing.Point(30, 31);
+			this.nameLabel.Name = "nameLabel";
+			this.nameLabel.Size = new System.Drawing.Size(35, 13);
+			this.nameLabel.TabIndex = 1;
+			this.nameLabel.Text = "Name";
+			// 
+			// classNameLabel
+			// 
+			this.classNameLabel.AutoSize = true;
+			this.classNameLabel.Location = new System.Drawing.Point(137, 7);
+			this.classNameLabel.Name = "classNameLabel";
+			this.classNameLabel.Size = new System.Drawing.Size(83, 13);
+			this.classNameLabel.TabIndex = 0;
+			this.classNameLabel.Text = "ComonentName";
+			// 
+			// parityComboBox
+			// 
+			this.parityComboBox.Enabled = false;
+			this.parityComboBox.FormattingEnabled = true;
+			this.parityComboBox.Location = new System.Drawing.Point(140, 100);
+			this.parityComboBox.Name = "parityComboBox";
+			this.parityComboBox.Size = new System.Drawing.Size(130, 21);
+			this.parityComboBox.TabIndex = 8;
+			// 
+			// stopBitsComboBox
+			// 
+			this.stopBitsComboBox.Enabled = false;
+			this.stopBitsComboBox.FormattingEnabled = true;
+			this.stopBitsComboBox.Location = new System.Drawing.Point(140, 148);
+			this.stopBitsComboBox.Name = "stopBitsComboBox";
+			this.stopBitsComboBox.Size = new System.Drawing.Size(130, 21);
+			this.stopBitsComboBox.TabIndex = 12;
+			// 
+			// handshakeComboBox
+			// 
+			this.handshakeComboBox.Enabled = false;
+			this.handshakeComboBox.FormattingEnabled = true;
+			this.handshakeComboBox.Location = new System.Drawing.Point(140, 172);
+			this.handshakeComboBox.Name = "handshakeComboBox";
+			this.handshakeComboBox.Size = new System.Drawing.Size(130, 21);
+			this.handshakeComboBox.TabIndex = 14;
+			// 
+			// AmbientCfgCtrl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.BackColor = System.Drawing.SystemColors.Control;
+			this.Controls.Add(this.handshakeComboBox);
+			this.Controls.Add(this.stopBitsComboBox);
+			this.Controls.Add(this.parityComboBox);
+			this.Controls.Add(this.nameTextBox);
+			this.Controls.Add(this.nameLabel);
+			this.Controls.Add(this.classNameLabel);
+			this.Controls.Add(this.handshakeLabel);
+			this.Controls.Add(this.stopBitsLabel);
+			this.Controls.Add(this.dataBitsTextBox);
+			this.Controls.Add(this.dataBitsLabel);
+			this.Controls.Add(this.partityLabel);
+			this.Controls.Add(this.baudRateTextBox);
+			this.Controls.Add(this.baudRateLabel);
+			this.Controls.Add(this.comPortNrTextBox);
+			this.Controls.Add(this.label1);
+			this.Name = "AmbientCfgCtrl";
+			this.Size = new System.Drawing.Size(300, 240);
+			this.Load += new System.EventHandler(this.ModbusCfgCtrl_Load);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.TextBox comPortNrTextBox;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label baudRateLabel;
+		private System.Windows.Forms.TextBox baudRateTextBox;
+		private System.Windows.Forms.Label partityLabel;
+		private System.Windows.Forms.Label dataBitsLabel;
+		private System.Windows.Forms.TextBox dataBitsTextBox;
+		private System.Windows.Forms.Label stopBitsLabel;
+		private System.Windows.Forms.Label handshakeLabel;
+		private System.Windows.Forms.TextBox nameTextBox;
+		private System.Windows.Forms.Label nameLabel;
+		private System.Windows.Forms.Label classNameLabel;
+		private System.Windows.Forms.ComboBox parityComboBox;
+		private System.Windows.Forms.ComboBox stopBitsComboBox;
+		private System.Windows.Forms.ComboBox handshakeComboBox;
+
+	}
+}

TBF/BenchControl/RegisterReaders/KPackE/Radio/RadioCfgCtrl.resx

@@ -0,0 +1,120 @@
+<?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/RegisterReaders/KPackE/RegisterReader/Factory.cs

@@ -0,0 +1,26 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System.Collections.Generic;
+using TBF.BenchControl.Generic;
+
+namespace TBF.BenchControl.RegisterReaders.KPackE.RegisterReader
+{
+	public class Factory : IComponentFactory
+	{
+        public string ClassName { get { return this.GetType().Namespace.Substring(17); } }
+
+		public void ResetStaticProperties() { RegisterReader.ResetStaticProperties(); }
+
+		public IComponent DummyComponent() { return new RegisterReader(); }
+
+		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new RegisterReader(cfg, components); }
+
+		public IComponentCfg DefaultConfig() { return new RegisterReaderCfg(this); }
+
+		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
+		{
+			return ComponentCfgBase.CreateFromDbEntity(RegisterReaderCfg.Serializer, component, this);
+		}
+	}
+}

TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/ProcedureParams.cs

@@ -0,0 +1,118 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
+using System.IO;
+using System.Text;
+using System.Xml.Serialization;
+using Config.Entities;
+using TBF.BenchControl.Generic;
+using TBF.Resources;
+
+namespace TBF.BenchControl.RegisterReaders.KPackE.RegisterReader
+{
+	public class ProcedureParams : ProcedureParamsBase, IParamsProvider, IProcedureParams
+	{
+		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ProcedureParams) })[0];
+        public override XmlSerializer GetSerializer() { return Serializer; }
+
+		public double PulsesPerLtr;		/// Target low limit of the flow increase or decrease
+
+		public override void InitializeAll()
+		{
+			PulsesPerLtr = 1.0;
+		}
+
+		string[] paramNames = new string[]
+		{
+			Strings.PulsesPerLtr,
+		};
+		public override string ParamName(int i) { return paramNames[i]; }
+		public override int ParamsCount() { return paramNames.Length; }
+
+		public override string ToString(int i)
+		{
+			switch (i)
+			{
+				case 0: return PulsesPerLtr.ToString();
+				default: return string.Empty;
+			}
+		}
+
+		/// Retrieves parameters from UI controls
+		public CfgUpdateFlags UpdateParam(int i, string strValue)
+		{
+			switch (i)
+			{
+                case 0: PulsesPerLtr = Utils.ParseUDouble(strValue); return CfgUpdateFlags.None;
+                default: return CfgUpdateFlags.None;
+			}
+		}
+
+		/// Verifies whether strings in UI controls represent valid parameters
+		public bool ValidateParam(int i, string strValue, out string message)
+		{
+			message = string.Empty;
+
+			double dummy;
+			switch (i)
+			{
+				case 0:
+					if (Utils.TryParseUDouble(strValue, out dummy)) return true;
+					break;
+				default:
+					message = "Invalid index";
+					return false;
+			}
+
+			message = ParamName(i) + " is invalid";
+			return false;
+		}
+
+		void CopyContentTo(ProcedureParams prms)
+		{
+			prms.PulsesPerLtr = this.PulsesPerLtr;
+		}
+
+		public IParamsProvider Clone()
+		{
+			ProcedureParams pars = new ProcedureParams();
+			CopyContentTo(pars);
+			return pars;
+		}
+
+		public override void UpdateFromDbEntity(ComponentProcedure dbEntity)
+		{
+			if (dbEntity == null) return;
+			try
+			{
+				ProcedureParams tmp = Serializer.Deserialize(new StringReader(dbEntity.Parameters)) as ProcedureParams;
+
+				procedureParamsEntity = dbEntity;
+				componentName = dbEntity.CmpntName;
+				procedure = dbEntity.Procedure;
+
+				if (tmp != null) tmp.CopyContentTo(this);
+			}
+			catch
+			{
+			}
+		}
+
+
+		public ProcedureParams()
+		{
+		}
+
+		public ProcedureParams(bool initialize)
+		{
+			if (initialize) InitializeAll();
+		}
+
+		public ProcedureParams(ComponentProcedure procedureParamsEntity, string componentName, Procedure procedure)
+		{
+			this.procedureParamsEntity = procedureParamsEntity;
+			this.componentName = componentName;
+		}
+	}
+}

TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReader.cs

@@ -0,0 +1,139 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using log4net;
+using TBF.Boxes;
+
+namespace TBF.BenchControl.RegisterReaders.KPackE.RegisterReader
+{
+	public class RegisterReader : ComponentBase, GenericDevices.IRegisterReader, IOperation
+	{
+		private static readonly ILog log = LogManager.GetLogger(typeof(RegisterReader));
+        public override string ToString() { return string.Format("KPackE.RegisterReader({0})", Cfg.ToString(1)); }
+
+        readonly RegisterReaderCfg registerReaderCfg;
+        readonly Radio.Radio radio;
+		readonly TBF.BenchControl.Elde.ControlBoardDev controlBoard;
+
+
+        public Config.Entities.RegisterReaderType RegisterReaderType { get { return Config.Entities.RegisterReaderType.Manual; } }
+        public double PulsesPerLtr { get { return registerReaderCfg.ProcParams.PulsesPerLtr; } }
+		public double LtrsPerPulse { get { return (PulsesPerLtr <= float.Epsilon) ? 1.0 : (1 / PulsesPerLtr); } }
+
+        /// <summary>
+        /// Writen to by DataEntryForRadio component
+        /// </summary>
+        public string SerialNr;     /// Serial number of the respective water meter
+        public bool IsEndOfTest;    /// false at the beginning oftest, true at the end of test
+
+        /// <summary>
+        /// Called by Radio when data for SerialNr were received
+        /// </summary>
+        /// <param name="wmState"></param>
+        public void WMStateReceived(double wmState)
+        {
+            if (IsEndOfTest)
+            {
+                endWMState = wmState;
+            }
+            else
+            {
+                beginWMState = wmState;
+            }
+        }
+
+
+		double beginWMState;
+		public double BeginWMState
+		{
+			get { return beginWMState; }
+			set { beginWMState = value; }
+		}
+
+		double endWMState;
+		public double EndWMState
+		{
+			get { return endWMState; }
+			set { endWMState = value; }
+		}
+
+		public double WMVolume { get { return endWMState - beginWMState; } }
+
+		public int WMPulses { get { return (int)(WMVolume / LtrsPerPulse); } }
+
+		int wmRefPulses;
+		public int WMRefPulses { get { return wmRefPulses; } }
+
+
+
+		public RegisterReader()
+		{
+		}
+
+		public RegisterReader(Generic.IComponentCfg cfg, IList<Generic.IComponent> components)
+			: base(cfg)
+		{
+            registerReaderCfg = cfg as RegisterReaderCfg;
+
+			/// Control board is used to read reference flowmeter pulses
+            radio = (Radio.Radio)TbfComponents.FindComponent(cfg.ParentName, components);
+            if (radio == null) throw new Exception(string.Format("Cannot find a parent of {0}", Name));
+
+            controlBoard = StateMachine.ControlBoard;
+
+			Clear();
+
+			log.Debug(this.ToString());
+		}
+
+		public void Clear()
+		{
+			log.DebugFormat("{0}:Clear()", Name);
+			beginWMState = 0;
+			endWMState = 0;
+			wmRefPulses = 0;
+		}
+
+
+		public void TestCompleted()
+		{
+			log.DebugFormat("{0}:TestCompleted()", Name);
+			ReadPulses();
+		}
+
+		/// <summary>
+		/// Events:  Event.ReadRegisterDone
+		/// </summary>
+		/// <returns>ReadWaterMeter instance reference casted to IOperaton</returns>
+		public IOperation ReadRegisterOp()
+		{
+			return this;
+		}
+
+		private void ReadPulses()
+		{
+            wmRefPulses = (controlBoard != null) ? controlBoard.EtPulses(0) : 0;
+		}
+
+		/// <summary>Start this operation</summary>
+		public void Start()
+		{
+			ReadPulses();
+		}
+
+		/// <summary>Run this operation</summary>
+		/// <returns>eventDone</returns>
+		public Event Run()
+		{
+			ReadPulses();
+			return Event.ReadRegisterDone;
+		}
+
+		/// <summary>Stop this operation</summary>
+		public void Stop()
+		{
+		}
+    }
+}

TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReaderCfg.cs

@@ -0,0 +1,47 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml.Serialization;
+using Config.Entities;
+using TBF.BenchControl.Generic;
+
+namespace TBF.BenchControl.RegisterReaders.KPackE.RegisterReader
+{
+    public class RegisterReaderCfg : ComponentCfgBase, Generic.IChildComponentCfg
+	{
+		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(RegisterReaderCfg) })[0];
+		public override XmlSerializer GetSerializer() { return Serializer; }
+
+		public IComponentCfgCtrl GetControl() { return new RegisterReaderCfgCtrl(); }
+
+		/// <summary> Procedure parameters </summary>
+		[XmlIgnore]
+		public ProcedureParams ProcParams;
+		public override IParamsProvider GetRuntimeProcParamsProvider() { return ProcParams; }
+        public override IParamsProvider CreateProcParamsProvider() { return new ProcedureParams(true); }
+
+		/// Private parameterless constructor invoked by all other (public) constructors
+		RegisterReaderCfg()
+		{
+            Name = "RF-Register";
+            ParentName = "Radio";
+            ProcParams = new ProcedureParams(true);
+        }
+
+        public RegisterReaderCfg(IComponentFactory factory)
+            : this()
+        {
+            this.Factory = factory;
+        }
+
+		public string ToString(int i)
+		{
+            return string.Format("Name={0}, Parent={1}",
+                                 Name,
+                                 (string.IsNullOrEmpty(ParentName) ? "-" : ParentName));
+		}
+	}
+}

TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReaderCfgCtrl.Designer.cs

@@ -0,0 +1,110 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+namespace TBF.BenchControl.RegisterReaders.KPackE.RegisterReader
+{
+	partial class RegisterReaderCfgCtrl
+	{
+		/// <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.parentNameLabel = new System.Windows.Forms.Label();
+            this.nameTextBox = new System.Windows.Forms.TextBox();
+            this.nameLabel = new System.Windows.Forms.Label();
+            this.componentNameLabel = new System.Windows.Forms.Label();
+            this.parentNameComboBox = new System.Windows.Forms.ComboBox();
+            this.SuspendLayout();
+            // 
+            // parentNameLabel
+            // 
+            this.parentNameLabel.AutoSize = true;
+            this.parentNameLabel.Location = new System.Drawing.Point(26, 96);
+            this.parentNameLabel.Name = "parentNameLabel";
+            this.parentNameLabel.Size = new System.Drawing.Size(69, 13);
+            this.parentNameLabel.TabIndex = 3;
+            this.parentNameLabel.Text = "Parent Name";
+            // 
+            // nameTextBox
+            // 
+            this.nameTextBox.Enabled = false;
+            this.nameTextBox.Location = new System.Drawing.Point(136, 67);
+            this.nameTextBox.Name = "nameTextBox";
+            this.nameTextBox.Size = new System.Drawing.Size(130, 20);
+            this.nameTextBox.TabIndex = 2;
+            // 
+            // nameLabel
+            // 
+            this.nameLabel.AutoSize = true;
+            this.nameLabel.Location = new System.Drawing.Point(26, 70);
+            this.nameLabel.Name = "nameLabel";
+            this.nameLabel.Size = new System.Drawing.Size(35, 13);
+            this.nameLabel.TabIndex = 1;
+            this.nameLabel.Text = "Name";
+            // 
+            // componentNameLabel
+            // 
+            this.componentNameLabel.AutoSize = true;
+            this.componentNameLabel.Location = new System.Drawing.Point(133, 43);
+            this.componentNameLabel.Name = "componentNameLabel";
+            this.componentNameLabel.Size = new System.Drawing.Size(83, 13);
+            this.componentNameLabel.TabIndex = 0;
+            this.componentNameLabel.Text = "ComonentName";
+            // 
+            // parentNameComboBox
+            // 
+            this.parentNameComboBox.Enabled = false;
+            this.parentNameComboBox.FormattingEnabled = true;
+            this.parentNameComboBox.Location = new System.Drawing.Point(136, 93);
+            this.parentNameComboBox.Name = "parentNameComboBox";
+            this.parentNameComboBox.Size = new System.Drawing.Size(130, 21);
+            this.parentNameComboBox.TabIndex = 4;
+            // 
+            // RegisterReaderCfgCtrl
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.parentNameComboBox);
+            this.Controls.Add(this.parentNameLabel);
+            this.Controls.Add(this.nameTextBox);
+            this.Controls.Add(this.nameLabel);
+            this.Controls.Add(this.componentNameLabel);
+            this.Name = "RegisterReaderCfgCtrl";
+            this.Size = new System.Drawing.Size(300, 200);
+            this.Load += new System.EventHandler(this.RegisterReaderCfgCtrl_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+		}
+
+		#endregion
+
+        private System.Windows.Forms.Label parentNameLabel;
+		private System.Windows.Forms.TextBox nameTextBox;
+		private System.Windows.Forms.Label nameLabel;
+		private System.Windows.Forms.Label componentNameLabel;
+		private System.Windows.Forms.ComboBox parentNameComboBox;
+	}
+}

TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReaderCfgCtrl.cs

@@ -0,0 +1,95 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
+using System.Windows.Forms;
+using Config.Entities;
+using TBF.BenchControl.Generic;
+
+namespace TBF.BenchControl.RegisterReaders.KPackE.RegisterReader
+{
+	public partial class RegisterReaderCfgCtrl : UserControl, IComponentCfgCtrl
+	{
+		ComponentParametersDlg parent;
+
+		public bool ShowMore { get { return false; } }
+
+		RegisterReaderCfg config;
+		public IComponentCfg Config
+		{
+			get { return config as IComponentCfg; }
+			set
+			{
+				config = value as RegisterReaderCfg;
+				Redraw();
+			}
+		}
+
+		public RegisterReaderCfgCtrl()
+		{
+			InitializeComponent();
+		}
+
+		private void RegisterReaderCfgCtrl_Load(object sender, EventArgs e)
+		{
+			parent = ParentForm as ComponentParametersDlg;
+			if (parent == null) return;
+
+			if (parent.TbfComponents != null)
+			{
+				foreach (var cmpnt in parent.TbfComponents)
+				{
+					if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Radio.Factory)
+					{
+						parentNameComboBox.Items.Add(cmpnt.Name);
+					}
+				}
+			}
+
+			Redraw();
+		}
+
+		public void Closing()
+		{
+		}
+
+		void Redraw()
+		{
+			if (config == null) return;			/// Control was not loaded, settings were not changed
+												
+			componentNameLabel.Text = config.Factory.ClassName;
+			nameTextBox.Text = config.Name;
+			parentNameComboBox.Text = string.IsNullOrEmpty(config.ParentName) ? "---" : config.ParentName;
+		}
+
+		public void Unlock()
+		{
+			nameTextBox.Enabled = true;
+			parentNameComboBox.Enabled = true;
+		}
+
+		public CfgUpdateFlags VerifyCfg(ref string message)
+		{
+            CfgUpdateFlags flags = CfgUpdateFlags.None;
+
+			if (!parentNameComboBox.Items.Contains(parentNameComboBox.Text))
+			{
+				flags |= CfgUpdateFlags.Error;
+				message += Environment.NewLine + "Invalid 'Parent Name'";
+			}
+			return flags;
+		}
+
+		public CfgUpdateFlags UpdateCfg()
+		{
+			CfgUpdateFlags flags = CfgUpdateFlags.RestartRqrd;
+
+			if (config == null) return CfgUpdateFlags.Error;	/// Control was not loaded, settings were not changed
+
+			config.Name = nameTextBox.Text;
+			config.ParentName = parentNameComboBox.Text.Equals("---") ? string.Empty : parentNameComboBox.Text;
+
+			return flags;
+		}
+	}
+}