Additional wait for the correct ControlBoard response in [s]

.gitignore

@@ -26,6 +26,8 @@ GenericTest/bin/
 GenericTest/obj/
 GraphLib/bin/
 GraphLib/obj/
+LabelPrinting/bin/
+LabelPrinting/obj/
 MergeResultsDBs/bin/
 MergeResultsDBs/obj/
 OrderManagement/bin/
@@ -44,6 +46,8 @@ ResultsBrowser/bin/
 ResultsBrowser/obj/
 ResultsParser/bin/
 ResultsParser/obj/
+S640TestApp/bin/
+S640TestApp/obj/
 SharedDatabase/bin
 SharedDatabase/obj
 SchematicDrawing/bin

Common/Common.csproj

@@ -17,7 +17,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;LANG_PL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -25,7 +25,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;LANG_PL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

Common/CurrentUser.cs

@@ -96,6 +96,16 @@ namespace Common
                 return string.Format("{0},{1},{2}", User().UserName, User2.UserName, User3.UserName);
         }
 
+        public static string GetEncodedString(string legalizator)
+        {
+            if (User() == null || User().UserName == null) return string.Empty;
+            return string.Format("{0}~{1}~{2}",
+                                 User().UserName,
+                                 User().FullName == null ? string.Empty : User().FullName,
+                                 legalizator == null ? string.Empty : legalizator);
+        }
+                
+
         /// <summary>
         /// Return the current user number or 0
         /// </summary>

Common/Enums.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -185,16 +185,70 @@ namespace Common
 		Count,
 	}
 
+    public enum FlowNames
+    {
+        QnQtQmin = 0,
+        Q3Q2Q1 = 1,
+        QpQi = 2,
+        Count,
+    }
+
     public enum ProfileType
     {
         Q3R,
         QnClassColdWater,
         QnClassHotWater,
         QpQi,
+        CompoundQ3RQ3R,
+        CompoundQnClassQnClass,
+        CompoundQ3RQnClass,
+        CompoundQnClassQ3R,
+        CompoundQpQiQpQi,
         Manual,
         Count,
     }
 
+    public enum FlowId
+    {
+        Any,
+        Q4,
+        Q3,
+        Q2,
+        Q1,
+        Q4Main,
+        Q3Main,
+        Q2Main,
+        Q1Main,
+        Q4Aux,
+        Q3Aux,
+        Q2Aux,
+        Q1Aux,
+        Qmax,
+        Qn,
+        Qt,
+        Qmin,
+        QmaxMain,
+        QnMain,
+        QtMain,
+        QminMain,
+        QmaxAux,
+        QnAux,
+        QtAux,
+        QminAux,
+        Qp,
+        Qp10,
+        Qi,
+        QpMain,
+        Qp10Main,
+        QiMain,
+        QpAux,
+        Qp10Aux,
+        QiAux,
+        Qdetected,
+        Qfall,
+        Qrise,
+    }
+
     public enum ErrorLimitType
     {
         Manual,
@@ -266,11 +320,13 @@ namespace Common
         [Description("V")]      V,         /// vertical
         [Description("STR")]    S,         /// standrohre
         [Description("F")]      F,         /// fall
+        [Description("H/V")]    HV,        /// horizontal / vertical
 #else
-        [Description("H")] H,              /// horizontal
-        [Description("V")] V,              /// vertical
-        [Description("S")] S,              /// steig
-        [Description("F")] F,              /// fall
+        [Description("H")]      H,         /// horizontal
+        [Description("V")]      V,         /// vertical
+        [Description("S")]      S,         /// steig
+        [Description("F")]      F,         /// fall
+        [Description("H/V")]    HV,        /// horizontal / vertical
 #endif
 		Count
     }
@@ -464,8 +520,10 @@ namespace Common
     public enum TestProfile
     {
         UserDefined,
+        UserDefinedCompound,
         UserDefinedHeatMeter,
         Protected,                  /// The first protected one
+        ProtectedCompound,
         ProtectedHeatMeter,
     }
 
@@ -640,7 +698,16 @@ namespace Common
         Count,
     }
 
-	public enum ImageRotation
+    public enum DivResolution : int
+    {
+        [Description("1 ms (0.25 s)")]  _1ms = 0,
+        [Description("2 ms (0.5 s)")]   _2ms = 1,
+        [Description("4 ms (1 s)")]     _4ms = 2,
+        [Description("8 ms (2 s)")]     _8ms = 3,
+        Count,
+    }
+
+    public enum ImageRotation
 	{
 		[Description("0 deg")]		None,
 		[Description("90 deg")]		Deg90,

Common/Forms/MessageEventArgs.cs

@@ -1,4 +1,7 @@
-using System;
+///
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
+///
+using System;
 
 namespace Common.Forms
 {

Common/Forms/ModelessForm.cs

@@ -1,4 +1,7 @@
-using System;
+///
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
+///
+using System;
 using System.Drawing;
 using System.Windows.Forms;
 
@@ -53,20 +56,20 @@ namespace Common.Forms
         public event EventHandler<MessageEventArgs> UpdateMessageHandler;
         void OnUpdateMessage(object sender, MessageEventArgs args)
         {
-            if (args.Message != null) label1.Text = args.Message;
+            if (args != null && args.Message != null) label1.Text = args.Message;
         }
 
 
         /// <summary>
         /// Called from the state machine when an operation forces a modeless dialog close.
         /// </summary>
-        public static void CloseForm()
+        public void CloseForm()
         {
             if (CloseFormHandler == null) return;
             try { CloseFormHandler(null, null); }
             catch (Exception) { }
         }
-        static public event EventHandler<EventArgs> CloseFormHandler;
+        public event EventHandler<EventArgs> CloseFormHandler;
         void OnCloseForm(object sender, EventArgs args)
         {
             DialogResult = DialogResult.Cancel;

Common/Utils.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2021-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
 ///
 using System;
 
@@ -20,6 +20,29 @@ namespace Common
             return (format == "F0") ? value.ToString("F0") : value.ToString(format).TrimEnd(new char[] { '0' });
         }
 
+        public static FlowNames ProfileType2FlowNames(ProfileType pt, bool isAux = false)
+        {
+            switch (pt)
+            {
+                case ProfileType.Q3R:
+                case ProfileType.CompoundQ3RQ3R:
+                    return FlowNames.Q3Q2Q1;
+                case ProfileType.CompoundQ3RQnClass:
+                    return isAux ? FlowNames.QnQtQmin : FlowNames.Q3Q2Q1;
+                case ProfileType.QnClassColdWater:
+                case ProfileType.QnClassHotWater:
+                case ProfileType.CompoundQnClassQnClass:
+                    return FlowNames.QnQtQmin;
+                case ProfileType.CompoundQnClassQ3R:
+                    return isAux ? FlowNames.Q3Q2Q1 : FlowNames.QnQtQmin;
+                case ProfileType.QpQi:
+                case ProfileType.CompoundQpQiQpQi:
+                    return FlowNames.QpQi;
+                default:
+                    return FlowNames.Q3Q2Q1;
+            }
+        }
+
         public static string SignificantDigitsToFmt(double value, int sigDigits)
         {
             if (sigDigits == 6)

Config/Entities/PTest.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2019-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2019-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Globalization;
@@ -16,7 +16,9 @@ namespace Config.Entities
         public virtual int Id { get; protected set; }
         public virtual int ItemNr { get; set; }
         public virtual string Name { get; set; }
-        public virtual int Part { get; set; }				    /// Part=0 ... test of all WM-s                                                               /// Part>0 ... part of a set of tests with the same Name: subset of WM-s is given by MetersPath
+        public virtual int Part { get; set; }                   /// Part=0 ... test of all WM-s    
+                                                                /// Part>0 ... part of a set of tests with the same Name: subset of WM-s is given by MetersPath
+        public virtual FlowId FlowId { get; set; }
         public virtual double CoefQfrom { get; set; }           /// Water flow low limit in [m3/h]
         public virtual double CoefQto { get; set; }				/// Water flow high limit in [m3/h]
         public virtual double ErrLimLo { get; set; }			/// in [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
@@ -186,6 +188,7 @@ namespace Config.Entities
 
             output.WriteLine(Name);
             output.WriteLine(Part);
+            output.WriteLine(((ushort)FlowId).ToString(ci));
             output.WriteLine(CoefQfrom.ToString(ci));
             output.WriteLine(CoefQto.ToString(ci));
             output.WriteLine(ErrLimLo.ToString(ci));
@@ -245,6 +248,7 @@ namespace Config.Entities
 
             tst.Name = firstLine;
             tst.Part = int.Parse(input.ReadLine());
+            tst.FlowId = (FlowId)ushort.Parse(input.ReadLine(), ci);
             tst.CoefQfrom = double.Parse(input.ReadLine(), ci);
 			tst.CoefQto = double.Parse(input.ReadLine(), ci);
 			tst.ErrLimLo = double.Parse(input.ReadLine(), ci);
@@ -306,6 +310,7 @@ namespace Config.Entities
 
                                  if (Name != firstLine)               { diff.AppendFormat(fmt, "Name", Name, firstLine); };
             ln = inp.ReadLine(); if (ln != Part.ToString())           { diff.AppendFormat(fmt, "Part", Part.ToString(), ln); };
+            ln = inp.ReadLine(); if (ln != ((ushort)FlowId).ToString()){diff.AppendFormat(fmt, "FlowId", ((ushort)FlowId).ToString(), ln); };
             ln = inp.ReadLine(); if (ln != CoefQfrom.ToString(ci))    { diff.AppendFormat(fmt, "CoefQfrom", CoefQfrom.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != CoefQto.ToString(ci))      { diff.AppendFormat(fmt, "CoefQto", CoefQto.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != ErrLimLo.ToString(ci))     { diff.AppendFormat(fmt, "ErrLimLo", ErrLimLo.ToString(ci), ln); };

Config/Entities/Procedure.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -47,7 +47,7 @@ namespace Config.Entities
         public virtual int AltProcPeriod { get; set; }			/// Period of alternative procedures (0 = no alt. procedure)
 
         public virtual float DN { get; set; }                   /// Not mapped to DB, valid in ProceduresCtrl for procedure filtering only
-        public virtual float Qn { get; set; }                   ///   - ' ' -
+        public virtual double Qn { get; set; }                  ///   - ' ' -
         public virtual string MClass { get; set; }              ///   - ' ' -
         public virtual string Producer { get; set; }            ///   - ' ' -
 

Config/Entities/Test.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -19,14 +19,15 @@ namespace Config.Entities
         public virtual string Name { get; set; }	
 		public virtual int Part { get; set; }				/// Part=0 ... test of all WM-s
 															/// Part>0 ... part of a set of tests with the same Name: subset of WM-s is given by MetersPath
-        public virtual TestProfile Profile { get; set; }    /// UserDefined, Protected, UserDefinedHeatMeter, ProtectedHeatMeter
+        public virtual TestProfile Profile { get; set; }    /// UserDefined, UserDefinedCompound, UserDefinedHeatMeter, Protected, ProtectedCompound, ProtectedHeatMeter
         public virtual sbyte Publish { get; set; }			/// 0=no, 1=in all protocols, 2=on screen, 3=internal
 		public virtual bool DoEvaluate { get; set; }
-        public virtual double Qtg { get; set; }             /// Target water flow [m3/h]
-        public virtual double Qfrom { get; set; }			/// Water flow low limit in [m3/h]
-        public virtual double Qto { get; set; }				/// Water flow high limit in [m3/h]
+        public virtual double Qtg { get; set; }             /// When == -1 => Qtg is determined by the test method, otherwise Qtg is in [m3/h], 
+        public virtual double Qfrom { get; set; }			/// Water flow low limit in [m3/h] or in [%] of Qtg
+        public virtual double Qto { get; set; }				/// Water flow high limit in [m3/h] or in [%] of Qtg
+        public virtual bool IsFromToInPct { get; set; }     /// true: Qfrom and Qto are in % of Qtg, false: Qfrom and Qto are in [m3/h]
 		public virtual double Volume { get; set; }			/// Test volume (target) in [l]
-        public virtual double TestTime { get; set; }			/// Test time (estimate) in [s]
+        public virtual double TestTime { get; set; }	    /// Test time (estimate) in [s]
         public virtual string Method { get; set; }
         public virtual float ErrLimLo { get; set; }			/// in [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
         public virtual float ErrLimHi { get; set; }			/// in [%] usually > 0, in case of heat meters: -Qn in m3/h
@@ -57,6 +58,11 @@ namespace Config.Entities
 		public virtual string TransBetween { get; set; }
 		public virtual string TransAfter { get; set; }
 
+        public virtual IList<ComponentTest> MoreParams { get; set; }
+
+        public virtual Procedure Procedure { get; set; }
+
+        /// Additional stuff not mapped into the database
         public virtual bool IsOuterLoopStart { get; set; }   /// Not mapped to database
         public virtual bool IsOuterLoopEnd { get; set; }     /// Not mapped to database
 
@@ -73,11 +79,15 @@ namespace Config.Entities
         public virtual Unit PressUnit { get; set; }          /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
         public virtual Unit LengthUnit { get; set; }         /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
 
-		public virtual IList<ComponentTest> MoreParams { get; set; }
-
-		public virtual Procedure Procedure { get; set; }
-
-        /// ------------- Additional stuff not mapped into the database -------------
+        /// Wrappers        
+        public virtual double QfromM3ph()
+        {
+            return !IsFromToInPct ? Qfrom : Qtg >= 0 ? Qtg * Qfrom / 100 : 0;
+        }
+        public virtual double QtoM3ph()
+        {
+            return !IsFromToInPct ? Qto : Qtg >= 0 ? Qtg * Qto / 100 : 0;
+        }
 
         public Test()
         {
@@ -90,6 +100,7 @@ namespace Config.Entities
             Profile = TestProfile.UserDefined;
             Publish = (sbyte)Common.Publish.Always;
 			DoEvaluate = true;
+            IsFromToInPct = false;
             ErrLimLo = -2.0f;				/// [%] lower error limit
             ErrLimHi = 2.0f;				/// [%] upper error limit
             Uncertainty = 0;
@@ -159,7 +170,8 @@ namespace Config.Entities
             result.Qtg = Qtg;
 			result.Qfrom = Qfrom;
             result.Qto = Qto;
-			result.Volume = Volume;
+            result.IsFromToInPct = IsFromToInPct;
+            result.Volume = Volume;
 			result.TestTime = TestTime;
 			result.Method = Method;
 			result.ErrLimLo = ErrLimLo;
@@ -192,6 +204,7 @@ namespace Config.Entities
 			result.TransAfter = TransAfter;
             result.VolumeUnit = VolumeUnit;
             result.FlowUnit = FlowUnit;
+            result.FlowUnit = FlowUnit;
             result.MassUnit = MassUnit;
             result.TempUnit = TempUnit;
             result.PressUnit = PressUnit;
@@ -212,6 +225,7 @@ namespace Config.Entities
             output.WriteLine(Qtg.ToString(ci));
             output.WriteLine(Qfrom.ToString(ci));
             output.WriteLine(Qto.ToString(ci));
+            output.WriteLine(IsFromToInPct.ToString());
             output.WriteLine(Volume.ToString(ci));
             output.WriteLine(TestTime.ToString(ci));
             output.WriteLine(Method);
@@ -264,6 +278,7 @@ namespace Config.Entities
             tst.Qtg = double.Parse(input.ReadLine(), ci);
             tst.Qfrom = double.Parse(input.ReadLine(), ci);
             tst.Qto = double.Parse(input.ReadLine(), ci);
+            tst.IsFromToInPct = bool.Parse(input.ReadLine());
             tst.Volume = double.Parse(input.ReadLine(), ci);
             tst.TestTime = double.Parse(input.ReadLine(), ci);
             tst.Method = input.ReadLine();
@@ -293,8 +308,11 @@ namespace Config.Entities
             tst.TransBetween = input.ReadLine();
             string line = input.ReadLine();
             tst.Profile = line.Equals(TestProfile.ProtectedHeatMeter.ToString()) ? TestProfile.ProtectedHeatMeter
-                          : line.Equals(TestProfile.UserDefinedHeatMeter.ToString()) ? TestProfile.UserDefinedHeatMeter
-                          : line.Equals(TestProfile.Protected.ToString()) ? TestProfile.Protected : TestProfile.UserDefined;  /// UserDefined is the default
+                        : line.Equals(TestProfile.ProtectedCompound.ToString()) ? TestProfile.ProtectedCompound
+                        : line.Equals(TestProfile.Protected.ToString()) ? TestProfile.Protected
+                        : line.Equals(TestProfile.UserDefinedHeatMeter.ToString()) ? TestProfile.UserDefinedHeatMeter
+                        : line.Equals(TestProfile.UserDefinedCompound.ToString()) ? TestProfile.UserDefinedCompound
+                        : TestProfile.UserDefined;  /// UserDefined is the default
             tst.TransAfter = input.ReadLine();
 
             while (true)
@@ -327,6 +345,7 @@ namespace Config.Entities
             ln = inp.ReadLine(); if (ln != Qtg.ToString(ci))                { diff.AppendFormat(fmt, "Qtg", Qtg.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Qfrom.ToString(ci))              { diff.AppendFormat(fmt, "Qfrom", Qfrom.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Qto.ToString(ci))                { diff.AppendFormat(fmt, "Qto", Qto.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != IsFromToInPct.ToString())        { diff.AppendFormat(fmt, "IsFromToInPct", IsFromToInPct.ToString(), ln); };
             ln = inp.ReadLine(); if (ln != Volume.ToString(ci))             { diff.AppendFormat(fmt, "Volume", Volume.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != TestTime.ToString(ci))           { diff.AppendFormat(fmt, "TstTime", TestTime.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Method)                          { diff.AppendFormat(fmt, "Method", Method, ln); };
@@ -334,11 +353,11 @@ namespace Config.Entities
             ln = inp.ReadLine(); if (ln != ErrLimHi.ToString(ci))           { diff.AppendFormat(fmt, "ErrLimHi", ErrLimHi.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Uncertainty.ToString(ci))        { diff.AppendFormat(fmt, "Uncertainty", Uncertainty.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Repeats.ToString(ci))            { diff.AppendFormat(fmt, "Repeats", Repeats.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != DoDraining.ToString(ci))         { diff.AppendFormat(fmt, "DoDraining", DoDraining.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != DoDrainingAfter.ToString(ci))    { diff.AppendFormat(fmt, "DoDrainingAfter", DoDrainingAfter.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != DoDraining.ToString())           { diff.AppendFormat(fmt, "DoDraining", DoDraining.ToString(), ln); };
+            ln = inp.ReadLine(); if (ln != DoDrainingAfter.ToString())      { diff.AppendFormat(fmt, "DoDrainingAfter", DoDrainingAfter.ToString(), ln); };
             ln = inp.ReadLine(); if (ln != TempLimLo.ToString(ci))          { diff.AppendFormat(fmt, "TempLimLo", TempLimLo.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != TempLimHi.ToString(ci))          { diff.AppendFormat(fmt, "TempLimHi", TempLimHi.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != TempControl)                  { diff.AppendFormat(fmt, "TempController", TempControl, ln); };
+            ln = inp.ReadLine(); if (ln != TempControl)                     { diff.AppendFormat(fmt, "TempController", TempControl, ln); };
             ln = inp.ReadLine(); if (ln != PumpPower.ToString(ci))          { diff.AppendFormat(fmt, "PumpPower", PumpPower.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != MassRepeats.ToString(ci))        { diff.AppendFormat(fmt, "MassRepeats", MassRepeats.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != MassSpread.ToString(ci))         { diff.AppendFormat(fmt, "MassSpread", MassSpread.ToString(ci), ln); };

Config/FluentCommon.cs

@@ -128,7 +128,7 @@ namespace Config
                             case GID.Administrators:
 #if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
                             case GID.TraceabilityManagement:
-#elif KEMPNO_50 || KRAKOW_50 || TORUN_50 || WARSAW_50 || WARSAW_END
+#elif LANG_PL
                             case GID.MetrologicalAuthority:
                             case GID.WaterMeterAuthority:
 #endif

Config/Mappings/ComponentMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Config.Entities;
@@ -19,7 +19,7 @@ namespace Config.Mappings
 			Map(x => x.LogLevel);
 			Map(x => x.Parameters)
 				.CustomType("StringClob")
-				.CustomSqlType("varchar(8000)");
+				.CustomSqlType("varchar(12000)");
 			HasMany(x => x.Corrections)
 				.OrderBy("Measurement")
 				.Cascade.All();

Config/Mappings/PTestMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
+/// Copyright (c) 2019-2023 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Config.Entities;
@@ -14,6 +14,7 @@ namespace Config.Mappings
             Map(x => x.ItemNr);
 			Map(x => x.Name);
             Map(x => x.Part);
+            Map(x => x.FlowId);
             Map(x => x.CoefQfrom);
 			Map(x => x.CoefQto);
             Map(x => x.ErrLimLo);

Config/Mappings/TestMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2017 Sensus Metering Systems
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Config.Entities;
@@ -20,7 +20,8 @@ namespace Config.Mappings
             Map(x => x.Qtg);
             Map(x => x.Qfrom);
 			Map(x => x.Qto);
-			Map(x => x.Volume);
+            Map(x => x.IsFromToInPct);
+            Map(x => x.Volume);
 			Map(x => x.TestTime);
 			Map(x => x.Repeats);
             Map(x => x.DoDraining);

DataStreamInterfaceTest/bin/Debug/DataStreamInterfaceTest.exe.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    </startup>
+</configuration>

DataStreamInterfaceTest/obj/Debug/DataStreamInterfaceTest.csproj.CoreCompileInputs.cache

@@ -0,0 +1 @@
+22fa51b09dbd9afa4c5d73fd5d4267426f09bc510527f701d437b89d74765cc0

DataStreamInterfaceTest/obj/Debug/DataStreamInterfaceTest.csproj.FileListAbsolute.txt

@@ -0,0 +1,18 @@
+C:\VSProjects\proj9\tbf\DataStreamInterfaceTest\bin\Debug\Doc\Software interface for datastream water meters.docx
+C:\VSProjects\proj9\tbf\DataStreamInterfaceTest\bin\Debug\DataStreamInterfaceTest.exe.config
+C:\VSProjects\proj9\tbf\DataStreamInterfaceTest\bin\Debug\DataStreamInterfaceTest.exe
+C:\VSProjects\proj9\tbf\DataStreamInterfaceTest\bin\Debug\DataStreamInterfaceTest.pdb
+C:\VSProjects\proj9\tbf\DataStreamInterfaceTest\bin\Debug\DataStreamInterface.dll
+C:\VSProjects\proj9\tbf\DataStreamInterfaceTest\bin\Debug\DataStreamInterface.pdb
+C:\VSProjects\proj9\tbf\DataStreamInterfaceTest\obj\Debug\DataStreamInterfaceTest.csproj.AssemblyReference.cache
+C:\VSProjects\proj9\tbf\DataStreamInterfaceTest\obj\Debug\DataStreamInterfaceTest.DemoMainWnd.resources
+C:\VSProjects\proj9\tbf\DataStreamInterfaceTest\obj\Debug\DataStreamInterfaceTest.GetDblValueDlg.resources
+C:\VSProjects\proj9\tbf\DataStreamInterfaceTest\obj\Debug\DataStreamInterfaceTest.GetFrameBoundariesDlg.resources
+C:\VSProjects\proj9\tbf\DataStreamInterfaceTest\obj\Debug\DataStreamInterfaceTest.GetIntegerNumberDlg.resources
+C:\VSProjects\proj9\tbf\DataStreamInterfaceTest\obj\Debug\DataStreamInterfaceTest.GetStateDlg.resources
+C:\VSProjects\proj9\tbf\DataStreamInterfaceTest\obj\Debug\DataStreamInterfaceTest.Properties.Resources.resources
+C:\VSProjects\proj9\tbf\DataStreamInterfaceTest\obj\Debug\DataStreamInterfaceTest.csproj.GenerateResource.cache
+C:\VSProjects\proj9\tbf\DataStreamInterfaceTest\obj\Debug\DataStreamInterfaceTest.csproj.CoreCompileInputs.cache
+C:\VSProjects\proj9\tbf\DataStreamInterfaceTest\obj\Debug\DataStre.F4216CC0.Up2Date
+C:\VSProjects\proj9\tbf\DataStreamInterfaceTest\obj\Debug\DataStreamInterfaceTest.exe
+C:\VSProjects\proj9\tbf\DataStreamInterfaceTest\obj\Debug\DataStreamInterfaceTest.pdb

GenericTest/GenericTestDlg.cs

@@ -65,7 +65,8 @@ namespace GenericTest
         const int ActivityMsgsCount = 7;
         ActivityEventArgs[] activityEvents;         /// Activity messages displayed in the main window
 
-		
+        Common.Forms.ModelessForm modelessForm;
+
         NHibernate.ISession dbSession;              /// MySQL database session
         static OracleConnection oracleConn;         /// Oracle database connection (server is in Stara Tura)
 #if RF_TEST_400_900
@@ -115,7 +116,8 @@ namespace GenericTest
             UpdateTitle();
 
             /// Open a modeless form that is closed after initialization and loading the main window
-            new Thread(() => Application.Run(new Common.Forms.ModelessForm("Loading workflows from a database"))).Start();
+            modelessForm = new Common.Forms.ModelessForm("Loading workflows from a database");
+            new Thread(() => Application.Run(modelessForm)).Start();
 
 
             activityEvents = new ActivityEventArgs[ActivityMsgsCount];
@@ -159,7 +161,7 @@ namespace GenericTest
                 StarSensorReading();
             }
 
-            Common.Forms.ModelessForm.CloseForm();   /// Close the modeless information form
+            if (modelessForm != null) modelessForm.CloseForm();   /// Close the modeless information form
         }
 
         private void startButton_Click(object sender, EventArgs e)

GenericTest/Program.cs

@@ -174,7 +174,7 @@ namespace GenericTest
 			{
                 if (exc is QuitAppException)
                 {
-                    Common.Forms.ModelessForm.CloseForm();
+                    //Common.Forms.ModelessForm.CloseForm();
                     log.FatalFormat(Strings.Program_was_not_started_0, exc.Message);
                     MessageBox.Show(exc.Message,
                                     Strings.Warning,

LabelPrinting/App.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    </startup>
+</configuration>

LabelPrinting/Cnst.cs

@@ -0,0 +1,7 @@
+namespace LabelPrinting
+{
+    public class Cnst
+    {
+        public const int ExtraPieces = 10;
+    }
+}

LabelPrinting/LabelPrinting.csproj

@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{E4531D13-317C-4D9F-809F-5533B5C3C8BF}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>LabelPrinting</RootNamespace>
+    <AssemblyName>LabelPrinting</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>LabelPrinting.Program</StartupObject>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="FluentNHibernate, Version=2.0.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="Gma.QrCodeNet.Encoding">
+      <HintPath>..\packages\QrCode.Net.0.4.0.0\net40\Gma.QrCodeNet.Encoding.dll</HintPath>
+    </Reference>
+    <Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net">
+      <HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="MySql.Data">
+      <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\NHibernate.4.0.4.4000\lib\net40\NHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Cnst.cs" />
+    <Compile Include="LocalSettings.cs" />
+    <Compile Include="MainWnd.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MainWnd.Designer.cs">
+      <DependentUpon>MainWnd.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Printers\DataMatrixAndTextPrintDoc.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Resources\Strings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Strings.resx</DependentUpon>
+    </Compile>
+    <Compile Include="SettingsDlg.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SettingsDlg.Designer.cs">
+      <DependentUpon>SettingsDlg.cs</DependentUpon>
+    </Compile>
+    <EmbeddedResource Include="MainWnd.resx">
+      <DependentUpon>MainWnd.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <EmbeddedResource Include="Resources\Strings.cs.resx" />
+    <EmbeddedResource Include="Resources\Strings.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Strings.sk.resx" />
+    <EmbeddedResource Include="SettingsDlg.resx">
+      <DependentUpon>SettingsDlg.cs</DependentUpon>
+    </EmbeddedResource>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Common\Common.csproj">
+      <Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
+      <Name>Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Config\Config.csproj">
+      <Project>{743df7db-c7b6-42eb-986d-0f485e5588e4}</Project>
+      <Name>Config</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\DataMatrix4Net\DataMatrix4Net.csproj">
+      <Project>{7cd2b5b4-3304-4151-b8b4-76a8b8af9b06}</Project>
+      <Name>DataMatrix4Net</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\GenCode128\GenCode128.csproj">
+      <Project>{32817bf9-e380-4467-9c7f-936f4b122bc7}</Project>
+      <Name>GenCode128</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Results\Results.csproj">
+      <Project>{9d0dcc88-dc81-47eb-9fdd-4c3907871bfb}</Project>
+      <Name>Results</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\SharedDatabase\SharedDatabase.csproj">
+      <Project>{211b5e3f-9996-48a7-abde-c878dd2d71c2}</Project>
+      <Name>SharedDatabase</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\TBF\TBF.csproj">
+      <Project>{8648fd92-cda1-4c3a-b5f9-fe547ce1fa48}</Project>
+      <Name>TBF</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Users\Users.csproj">
+      <Project>{6e5cb0e9-e1b6-4e5d-ac6e-b1049e180f2b}</Project>
+      <Name>Users</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <Content Include="SampleConfig\log4netConfig.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

LabelPrinting/LocalSettings.cs

@@ -0,0 +1,245 @@
+///
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
+///
+using System;
+using System.IO;
+using System.Security.Cryptography;
+using System.Text;
+using System.Xml.Serialization;
+
+namespace LabelPrinting
+{
+    /// <summary>
+    /// Class to be serialized to an XML file...
+    /// </summary>
+    [XmlRootAttribute("SNPrinting")]
+    public class LocalSettings
+    {
+        static XmlSerializer serializer = XmlSerializer.FromTypes(new[] { typeof(LocalSettings) })[0];
+
+        /// Configuration file ecryption/decryption key and initialization vector
+        static byte[] key = new byte[] { 83, 254, 105, 64, 184, 201, 195, 127, 52, 99, 77, 45, 252, 132, 163, 156 };
+        static byte[] IV = new byte[] { 189, 23, 137, 56, 204, 241, 242, 118, 28, 89, 9, 198, 224, 111, 186, 125 };
+
+        public Mode Mode;
+        public string Language;             /// User interface language used as CultureInfo(..) constructor argument
+        public int DelayBetweenLabels;      /// Delay between printing two consecutive labels in ms
+        public bool IsUserLoginRequired;    /// true = require user login on program start-up
+        public string LabelPrinterCfg;
+        public string TracingDBConnString;  /// Connection string to MySQL database with production tracing records
+        public string UsersDBConnString;    /// Connection string to MySQL database with authorized users
+        public string[] SapNumberHistory;   /// SAP number history
+        public string[] SeparatorHistory;   /// Separator history
+        public int CurrentSNTrail;          /// Serial number trail to be printed now
+        public int RemainingSNsCount;       /// Remaining count of serial numbers to be printed in this session
+
+
+        /// Parameterless constructor required by serialization
+        public LocalSettings() { }
+
+        public LocalSettings(bool createNew)
+        {
+            if (createNew)
+            {
+                Mode = Mode.TbfLabelPrinter;
+                Language = "EN";
+                DelayBetweenLabels = 1000;
+                IsUserLoginRequired = false;
+                LabelPrinterCfg = new TBF.Rig.Output.Printers.Label.Factory().DefaultConfig().CreateDbEntity().Parameters;
+                TracingDBConnString = string.Empty;
+                UsersDBConnString = string.Empty;
+                SapNumberHistory = new string[] { };
+                SeparatorHistory = new string[] { "4VQ" };
+                CurrentSNTrail = 1;
+                RemainingSNsCount = 1;
+            }
+        }
+
+        /// <summary>
+        /// Load public fields of this class from the XML file.
+        /// </summary>
+		/// <returns>LocalSettings object or null when Load() fails</returns>
+		public static LocalSettings Load(string fileName)
+        {
+            try
+            {
+                bool isEncrypted = true;
+                using (StreamReader reader = new StreamReader(fileName))
+                {
+                    isEncrypted = !reader.ReadLine().StartsWith("<?xml version=");
+                    reader.Close();
+                }
+
+                if (isEncrypted)
+                {
+                    /// Write settings to a string
+                    StringBuilder plain = new StringBuilder();
+
+                    using (RijndaelManaged aes = new RijndaelManaged { Padding = PaddingMode.Zeros })
+                    {
+                        using (FileStream fsCrypt = new FileStream(fileName, FileMode.Open))
+                        {
+                            using (ICryptoTransform decryptor = aes.CreateDecryptor(key, IV))
+                            {
+                                using (CryptoStream cs = new CryptoStream(fsCrypt, decryptor, CryptoStreamMode.Read))
+                                {
+                                    using (MemoryStream mStream = new MemoryStream())
+                                    {
+                                        using (var writer = new BinaryWriter(mStream))
+                                        {
+                                            int data;
+                                            while ((data = cs.ReadByte()) != -1)
+                                            {
+                                                if (data != 0) writer.Write((byte)data);
+                                            }
+                                            writer.Flush();
+                                            mStream.Position = 0;
+
+                                            using (var reader = new StreamReader(mStream))
+                                            {
+                                                return serializer.Deserialize(reader) as LocalSettings;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    using (StreamReader reader = new StreamReader(fileName))
+                    {
+                        return serializer.Deserialize(reader) as LocalSettings;
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                string msg = e.Message;
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Save public fields of this class to the XML file.
+        /// </summary>
+        public void Save()
+        {
+            try
+            {
+                /// Encrypt and write to file 'Program.LocalSettingsFileName'
+                using (RijndaelManaged aes = new RijndaelManaged { Padding = PaddingMode.Zeros })
+                {
+                    using (FileStream fsCrypt = new FileStream(Program.LocalSettingsFileName, FileMode.Create))
+                    {
+                        using (ICryptoTransform encryptor = aes.CreateEncryptor(key, IV))
+                        {
+                            using (CryptoStream cs = new CryptoStream(fsCrypt, encryptor, CryptoStreamMode.Write))
+                            {
+                                using (MemoryStream mStream = new MemoryStream())
+                                {
+                                    using (var writer = new StreamWriter(mStream))
+                                    {
+                                        /// Serialize and write settings to a memory stream
+                                        serializer.Serialize(writer, this);
+                                        writer.Flush();
+                                        mStream.Position = 0;
+
+                                        using (var reader = new StreamReader(mStream))
+                                        {
+                                            /// Encrypt and write to file 'Program.LocalSettingsFileName'
+                                            int data;
+                                            while ((data = mStream.ReadByte()) != -1) cs.WriteByte((byte)data);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                string msg = e.Message;
+            }
+        }
+
+		/// <summary>
+		/// Updates history stored in a string array by a new latest string.
+		/// </summary>
+		/// <param name="lastStrValue">Last entered string</param>
+		/// <returns>true = history updated</returns>
+		public static bool UpdateHistory(string lastStrValue, ref string[] history)
+		{
+			const int MaxHistoryLen = 10;
+
+			if (string.IsNullOrEmpty(lastStrValue)) return false;
+
+			int currentHistoryLength = (history != null) ? history.Length : 0;
+
+			int match = -1;
+			for (int i = 0; i < currentHistoryLength; i++)
+			{
+				if (history[i] == lastStrValue)
+				{
+					match = i;
+					break;
+				}
+			}
+
+			if (match >= 0 || currentHistoryLength >= MaxHistoryLen)
+			{
+				/// History does not have to be extended (because of a match) or should not be extended (because of the lenght)
+				if (match < 0) match = currentHistoryLength - 1;
+
+				for (int j = match; j > 0; j--)
+				{
+					history[j] = history[j - 1];
+				}
+				history[0] = lastStrValue;
+			}
+			else
+			{
+				/// History wiil be extended, new item inserted at the beginning
+				string[] newHistory = new string[currentHistoryLength + 1];
+				newHistory[0] = lastStrValue;
+				for (int j = 1; j <= currentHistoryLength; j++)
+				{
+					newHistory[j] = history[j - 1];
+				}
+				history = newHistory;
+			}
+
+            return true;
+		}
+
+        /// <summary>
+        /// Load Purchase order combo box items from the LocalSettings PurchaseOrderHistory array
+        /// </summary>
+        /// <param name="comboBox">Puchase order ComboBox</param>
+        public static void PrepareCombo(string[] history, System.Windows.Forms.ComboBox comboBox)
+        {
+            if (history != null)
+            {
+                for (int i = 0; i < history.Length; i++)
+                {
+                    comboBox.Items.Add(history[i]);
+                }
+            }
+
+            if (comboBox.Items.Count > 0)
+            {
+                comboBox.Text = comboBox.Items[0].ToString();
+            }
+        }
+    }
+
+
+    public enum Mode
+    {
+        TbfLabelPrinter,
+        Standalone,
+        WithDatabase,
+    }
+}

LabelPrinting/MainWnd.Designer.cs

@@ -0,0 +1,197 @@
+namespace LabelPrinting
+{
+    partial class MainWnd
+    {
+        /// <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.snTrailTextBox = new System.Windows.Forms.TextBox();
+            this.countTextBox = new System.Windows.Forms.TextBox();
+            this.snTrailLabel = new System.Windows.Forms.Label();
+            this.countLabel = new System.Windows.Forms.Label();
+            this.sapNumberLabel = new System.Windows.Forms.Label();
+            this.separatorLabel = new System.Windows.Forms.Label();
+            this.startButton = new System.Windows.Forms.Button();
+            this.sapNumberComboBox = new System.Windows.Forms.ComboBox();
+            this.separatorComboBox = new System.Windows.Forms.ComboBox();
+            this.interruptButton = new System.Windows.Forms.Button();
+            this.mainMenuStrip = new System.Windows.Forms.MenuStrip();
+            this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.mainMenuStrip.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // snTrailTextBox
+            // 
+            this.snTrailTextBox.Location = new System.Drawing.Point(230, 97);
+            this.snTrailTextBox.Name = "snTrailTextBox";
+            this.snTrailTextBox.Size = new System.Drawing.Size(121, 20);
+            this.snTrailTextBox.TabIndex = 8;
+            // 
+            // countTextBox
+            // 
+            this.countTextBox.Location = new System.Drawing.Point(230, 123);
+            this.countTextBox.Name = "countTextBox";
+            this.countTextBox.Size = new System.Drawing.Size(72, 20);
+            this.countTextBox.TabIndex = 1;
+            // 
+            // snTrailLabel
+            // 
+            this.snTrailLabel.AutoSize = true;
+            this.snTrailLabel.Location = new System.Drawing.Point(35, 100);
+            this.snTrailLabel.Name = "snTrailLabel";
+            this.snTrailLabel.Size = new System.Drawing.Size(110, 13);
+            this.snTrailLabel.TabIndex = 7;
+            this.snTrailLabel.Text = "First S/N trail (9 digits)";
+            // 
+            // countLabel
+            // 
+            this.countLabel.AutoSize = true;
+            this.countLabel.Location = new System.Drawing.Point(35, 126);
+            this.countLabel.Name = "countLabel";
+            this.countLabel.Size = new System.Drawing.Size(65, 13);
+            this.countLabel.TabIndex = 0;
+            this.countLabel.Text = "S/N-s count";
+            // 
+            // sapNumberLabel
+            // 
+            this.sapNumberLabel.AutoSize = true;
+            this.sapNumberLabel.Location = new System.Drawing.Point(35, 48);
+            this.sapNumberLabel.Name = "sapNumberLabel";
+            this.sapNumberLabel.Size = new System.Drawing.Size(111, 13);
+            this.sapNumberLabel.TabIndex = 3;
+            this.sapNumberLabel.Text = "SAP number ( 8 digits)";
+            // 
+            // separatorLabel
+            // 
+            this.separatorLabel.AutoSize = true;
+            this.separatorLabel.Location = new System.Drawing.Point(35, 74);
+            this.separatorLabel.Name = "separatorLabel";
+            this.separatorLabel.Size = new System.Drawing.Size(124, 13);
+            this.separatorLabel.TabIndex = 5;
+            this.separatorLabel.Text = "Separator ( 3 characters)";
+            // 
+            // startButton
+            // 
+            this.startButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.startButton.Location = new System.Drawing.Point(439, 63);
+            this.startButton.Name = "startButton";
+            this.startButton.Size = new System.Drawing.Size(117, 54);
+            this.startButton.TabIndex = 2;
+            this.startButton.Text = "Start printing";
+            this.startButton.UseVisualStyleBackColor = true;
+            this.startButton.Click += new System.EventHandler(this.startButton_Click);
+            // 
+            // sapNumberComboBox
+            // 
+            this.sapNumberComboBox.FormattingEnabled = true;
+            this.sapNumberComboBox.Location = new System.Drawing.Point(230, 45);
+            this.sapNumberComboBox.Name = "sapNumberComboBox";
+            this.sapNumberComboBox.Size = new System.Drawing.Size(121, 21);
+            this.sapNumberComboBox.TabIndex = 9;
+            // 
+            // separatorComboBox
+            // 
+            this.separatorComboBox.FormattingEnabled = true;
+            this.separatorComboBox.Location = new System.Drawing.Point(230, 71);
+            this.separatorComboBox.Name = "separatorComboBox";
+            this.separatorComboBox.Size = new System.Drawing.Size(72, 21);
+            this.separatorComboBox.TabIndex = 10;
+            // 
+            // interruptButton
+            // 
+            this.interruptButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.interruptButton.Enabled = false;
+            this.interruptButton.Location = new System.Drawing.Point(590, 63);
+            this.interruptButton.Name = "interruptButton";
+            this.interruptButton.Size = new System.Drawing.Size(117, 54);
+            this.interruptButton.TabIndex = 11;
+            this.interruptButton.Text = "Interrupt";
+            this.interruptButton.UseVisualStyleBackColor = true;
+            this.interruptButton.Click += new System.EventHandler(this.interruptButton_Click);
+            // 
+            // mainMenuStrip
+            // 
+            this.mainMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.settingsToolStripMenuItem});
+            this.mainMenuStrip.Location = new System.Drawing.Point(0, 0);
+            this.mainMenuStrip.Name = "mainMenuStrip";
+            this.mainMenuStrip.Size = new System.Drawing.Size(742, 24);
+            this.mainMenuStrip.TabIndex = 12;
+            this.mainMenuStrip.Text = "mainMenuStrip";
+            // 
+            // settingsToolStripMenuItem
+            // 
+            this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
+            this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
+            this.settingsToolStripMenuItem.Text = "Settings";
+            this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click);
+            // 
+            // MainWnd
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(742, 168);
+            this.Controls.Add(this.interruptButton);
+            this.Controls.Add(this.separatorComboBox);
+            this.Controls.Add(this.sapNumberComboBox);
+            this.Controls.Add(this.startButton);
+            this.Controls.Add(this.separatorLabel);
+            this.Controls.Add(this.sapNumberLabel);
+            this.Controls.Add(this.countLabel);
+            this.Controls.Add(this.snTrailLabel);
+            this.Controls.Add(this.countTextBox);
+            this.Controls.Add(this.snTrailTextBox);
+            this.Controls.Add(this.mainMenuStrip);
+            this.MainMenuStrip = this.mainMenuStrip;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "MainWnd";
+            this.Text = "S/N Printing";
+            this.Load += new System.EventHandler(this.MainWnd_Load);
+            this.mainMenuStrip.ResumeLayout(false);
+            this.mainMenuStrip.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox snTrailTextBox;
+        private System.Windows.Forms.TextBox countTextBox;
+        private System.Windows.Forms.Label snTrailLabel;
+        private System.Windows.Forms.Label countLabel;
+        private System.Windows.Forms.Label sapNumberLabel;
+        private System.Windows.Forms.Label separatorLabel;
+        private System.Windows.Forms.Button startButton;
+        private System.Windows.Forms.ComboBox sapNumberComboBox;
+        private System.Windows.Forms.ComboBox separatorComboBox;
+        private System.Windows.Forms.Button interruptButton;
+        private System.Windows.Forms.MenuStrip mainMenuStrip;
+        private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem;
+    }
+}
+

LabelPrinting/MainWnd.cs

@@ -0,0 +1,480 @@
+///
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using log4net;
+using DataMatrix4Net;
+using SharedDatabase.Entities;
+using LabelPrinting.Resources;
+using TBF.Rig.Output.Printers.Label;
+using NHibernate;
+using Common;
+using Results.Entities;
+
+namespace LabelPrinting
+{
+    public partial class MainWnd : Form
+    {
+        private static readonly ILog log = LogManager.GetLogger(typeof(MainWnd));
+
+        private readonly Factory factory;
+        private readonly Printer printer;
+
+        string programNameAndVer;
+        string prefix;                  /// S/N prefix after parsing/verification by the UI
+        string separator;               /// Separator after parsing/verification by the UI
+        int currentSNTrail;             /// Current S/N trai (1st S/N trail after parsing/verification by the UI)
+        int totalCount;                 /// Total S/N count after parsing/verification by the UI
+        int remainingCount;             /// Remaining S/N-s count
+        IList<OrderInfo> orderInfos;    /// null in Standalone mode
+        Timer timer;
+        bool interrupt;
+
+        public MainWnd()
+        {
+            InitializeComponent();
+            Text = programNameAndVer = string.Format("{0} v.{1}", Program.ProgramName, Program.Version); ;
+            factory = new Factory();
+        }
+
+        public MainWnd(IList<OrderInfo> orderInfos)
+            : this()
+        {
+            this.orderInfos = orderInfos;
+
+            if (Program.LocalSettings.Mode == Mode.TbfLabelPrinter)
+            {
+                try
+                {
+                    var cmpntEntity = Config.Entities.Component.CreateFromCfg("Printer", factory.ClassName, string.Empty, 1,
+                                                                          DebugMode.Normal, LogLevel.Off,
+                                                                          Program.LocalSettings.LabelPrinterCfg);
+                    printer = factory.GetComponent(factory.CmpntCfgFromCmpntEntity(cmpntEntity), null) as Printer;
+                    printer.Initialize();
+                }
+                catch (Exception)
+                {
+                    MessageBox.Show("Cannot create or initialize a printer",
+                                    "Warning", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
+                }
+            }
+
+            try
+            {
+                string culture = Program.LocalSettings.Language.Replace('_', '-');
+                System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo(culture);
+            }
+            catch (Exception)
+            {
+                MessageBox.Show("Selected language is not supported.\nUsing English.",
+                                "Warning", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
+                System.Threading.Thread.CurrentThread.CurrentUICulture =
+                    new System.Globalization.CultureInfo("en");
+            }
+
+            timer = new Timer();
+            timer.Interval = Program.LocalSettings.DelayBetweenLabels;  /// [ms] default = 1000
+            timer.Tick += new EventHandler(timer_Tick);
+        }
+
+        void Localize()
+        {
+            startButton.Text = Strings.Start_printing;
+            interruptButton.Text = Strings.Interrupt;
+            settingsToolStripMenuItem.Text = Strings.Settings;
+
+            if (Program.LocalSettings.Mode == Mode.TbfLabelPrinter)
+            {
+                sapNumberLabel.Text = Strings.Order;
+                separatorLabel.Text = string.Empty;
+                separatorComboBox.Visible = false;
+                snTrailLabel.Text = Strings.Serial_number;
+            }
+            else
+            {
+                sapNumberLabel.Text = Strings.SAP_number_8_digits;
+                separatorLabel.Text = Strings.Separator_3_characters;
+                snTrailLabel.Text = Strings.First_SN_trail_9_digits;
+            }
+            
+            countLabel.Text = Strings.Labels_count;
+        }
+
+        private void MainWnd_Load(object sender, EventArgs e)
+        {
+            Localize();
+
+            LocalSettings.PrepareCombo(Program.LocalSettings.SapNumberHistory, sapNumberComboBox);
+            LocalSettings.PrepareCombo(Program.LocalSettings.SeparatorHistory, separatorComboBox);
+
+            if (Program.LocalSettings.Mode == Mode.TbfLabelPrinter)
+            {
+                snTrailTextBox.Text = string.Empty;
+                countTextBox.Text = Math.Max(Program.LocalSettings.RemainingSNsCount, 1).ToString();
+
+                snTrailLabel.Top -= 26;
+                snTrailTextBox.Top -= 26;
+                countLabel.Top -= 26;
+                countTextBox.Top -= 26;
+
+                this.ActiveControl = snTrailTextBox;
+            }
+            else if (Program.LocalSettings.Mode == Mode.Standalone)
+            {
+                snTrailTextBox.Text = Program.LocalSettings.CurrentSNTrail.ToString("D9");
+                countTextBox.Text = Math.Max(Program.LocalSettings.RemainingSNsCount, 1).ToString();
+            }
+            else
+            {
+                if (orderInfos == null) throw new Exception("Missing OrderInfo-s from production tracing database");
+
+                currentSNTrail = 0;
+                foreach (var oi in orderInfos)
+                {
+                    if (oi.BaseNr1 + oi.PiecesCount + Cnst.ExtraPieces > currentSNTrail)
+                    {
+                        currentSNTrail = oi.BaseNr1 + oi.PiecesCount + Cnst.ExtraPieces;
+                    }
+                }
+
+                snTrailTextBox.Text = currentSNTrail.ToString("D9");
+                snTrailTextBox.Enabled = false;
+            }
+        }
+
+        /// <summary>
+        /// Start printing labels
+        /// </summary>
+        private void startButton_Click(object sender, EventArgs e)
+        {
+            if (!int.TryParse(countTextBox.Text, out totalCount) || totalCount <= 0)
+            {
+                MessageBox.Show(Strings.Invalid_SNs_count);
+                return;
+            }
+            remainingCount = totalCount;
+
+            if (Program.LocalSettings.Mode == Mode.TbfLabelPrinter)
+            {
+                var wm = new Results.Entities.WaterMeter();
+                wm.PurchaseOrder = string.IsNullOrEmpty(sapNumberComboBox.Text) ? string.Empty : sapNumberComboBox.Text;
+                wm.SerialNr = string.IsNullOrEmpty(snTrailTextBox.Text) ? string.Empty : snTrailTextBox.Text;
+
+                LocalSettings.UpdateHistory(sapNumberComboBox.Text, ref Program.LocalSettings.SapNumberHistory);
+                //Program.LocalSettings.CurrentSNTrail = snTrailTextBox.Text;
+                Program.LocalSettings.RemainingSNsCount = remainingCount;
+                Program.LocalSettings.Save();
+
+                startButton.Enabled = false;
+                interruptButton.Enabled = true;
+                interrupt = false;
+
+                printer.PrintResults(wm, "document name");
+
+                remainingCount--;
+                IncrementSN(snTrailTextBox);
+            }
+            else
+            {
+                /// Program.LocalSettings.Mode == Mode.Standalone || Program.LocalSettings.Mode == Mode.WithDatabase
+
+                int sapNumber;
+                if (sapNumberComboBox.Text.Length != 8 || !int.TryParse(sapNumberComboBox.Text, out sapNumber) || sapNumber <= 0 || sapNumber > 99999999)
+                {
+                    MessageBox.Show(Strings.Invalid_SAP_number);
+                    return;
+                }
+
+                if (separatorComboBox.Text.Length != 3)
+                {
+                    MessageBox.Show(Strings.Invalid_separator);
+                    return;
+                }
+
+                if (snTrailTextBox.Text.Length != 9 || !int.TryParse(snTrailTextBox.Text, out currentSNTrail))
+                {
+                    MessageBox.Show(Strings.Invalid_first_SN_trail);
+                    return;
+                }
+                else if (Program.LocalSettings.Mode == Mode.Standalone && currentSNTrail < Program.LocalSettings.CurrentSNTrail)
+                {
+                    MessageBox.Show(string.Format("{0}, {1} {2:D9}", Strings.Invalid_first_SN_trail, Strings.min, Program.LocalSettings.CurrentSNTrail));
+                    return;
+                }
+
+                if (Program.LocalSettings.Mode == Mode.Standalone && currentSNTrail > Program.LocalSettings.CurrentSNTrail)
+                {
+                    if (MessageBox.Show(string.Format("{0} {1:D9}{2}{3}{4}",
+                                                      Strings.You_are_skipping,
+                                                      Program.LocalSettings.CurrentSNTrail,
+                                                      (currentSNTrail == Program.LocalSettings.CurrentSNTrail + 1) ? "" : string.Format(" ... {0:D9}", currentSNTrail - 1),
+                                                      Environment.NewLine,
+                                                      Strings.Are_you_sure),
+                                        string.Empty,
+                                        MessageBoxButtons.YesNo,
+                                        MessageBoxIcon.Question) == DialogResult.No)
+                    {
+                        return;
+                    }
+                }
+
+                if (Program.LocalSettings.Mode == Mode.WithDatabase)
+                {
+                    SaveNewOrderInfo(ref currentSNTrail, totalCount);
+                }
+
+                prefix = sapNumberComboBox.Text;
+                separator = separatorComboBox.Text;
+
+                sapNumberComboBox.Enabled = false;
+                separatorComboBox.Enabled = false;
+                snTrailTextBox.Enabled = false;
+                countTextBox.Enabled = false;
+
+                LocalSettings.UpdateHistory(sapNumberComboBox.Text, ref Program.LocalSettings.SapNumberHistory);
+                LocalSettings.UpdateHistory(separatorComboBox.Text, ref Program.LocalSettings.SeparatorHistory);
+
+                Program.LocalSettings.CurrentSNTrail = currentSNTrail;
+                Program.LocalSettings.RemainingSNsCount = remainingCount;
+                Program.LocalSettings.Save();
+
+                startButton.Enabled = false;
+                interruptButton.Enabled = true;
+                interrupt = false;
+
+                PrintOneLabel();
+            }
+
+            if (remainingCount > 0)
+            {
+                timer.Start();
+            }
+            else
+            {
+                Text = string.Format("{0} ... {1}", programNameAndVer, Strings.completed);
+                MessageBox.Show(string.Format(Strings.x_labels_printed, totalCount));
+                SaveSettingsUpdateAndEnableUI();
+            }
+        }
+
+        /// <summary>
+        /// Save a record tp OrderInfo table that coresponds to printed labels
+        /// </summary>
+        /// <param name="currentSNTrail">Start S/N trail number</param>
+        /// <param name="totalCount">Printed labels count</param>
+        /// <returns>true when successful</returns>
+        bool SaveNewOrderInfo(ref int currentSNTrail, int totalCount)
+        {
+            ISession session = SharedDatabase.TracingDB.CreateSession(Program.LocalSettings.TracingDBConnString);
+            ITransaction transaction = session.BeginTransaction();
+            OrderInfo oi = new OrderInfo();
+            bool successfullySaved = false;
+            try
+            {
+                var orders = session.QueryOver<OrderInfo>().List();
+
+                /// Determine current S/N trail once again
+                int snTrail = 0;
+                foreach (var o in orders)
+                {
+                    if (o.BaseNr1 + o.PiecesCount + Cnst.ExtraPieces > snTrail)
+                    {
+                        snTrail = o.BaseNr1 + o.PiecesCount + Cnst.ExtraPieces;
+                    }
+                }
+
+                /// Compare current S/N trail with the newly obtained one, update if necessary
+                if (snTrail > currentSNTrail) currentSNTrail = snTrail;
+
+                oi.POName = "0000000";
+                oi.PiecesCount = totalCount;
+                oi.TestProcedure = string.Empty;
+                oi.BaseNr1 = currentSNTrail;
+                oi.BaseNr2 = 0;
+                oi.BaseNr3 = 0;
+                oi.BaseNr4 = 0;
+                oi.BaseNr5 = 0;
+                oi.Remark = "Manual S/N printing";
+                oi.Workflow = null;
+                orders.Add(oi);
+                session.SaveOrUpdate(oi);
+                transaction.Commit();
+                successfullySaved = true;
+            }
+            catch (Exception exc)
+            {
+                log.ErrorFormat("MySQL database transaction rolled back, data not comitted: {0}", exc.Message);
+                transaction.Rollback();
+            }
+
+            return successfullySaved;
+        }
+
+
+        void timer_Tick(object sender, EventArgs args)
+        {
+            timer.Stop();
+
+            if (interrupt)
+            {
+                Text = string.Format("{0} ... {1}", programNameAndVer, Strings.interrupted);
+                MessageBox.Show(string.Format(Strings.x_labels_printed, totalCount - remainingCount));
+                SaveSettingsUpdateAndEnableUI();
+            }
+            else if (Program.LocalSettings.Mode == Mode.TbfLabelPrinter)
+            {
+                var wm = new Results.Entities.WaterMeter();
+                wm.PurchaseOrder = string.IsNullOrEmpty(sapNumberComboBox.Text) ? string.Empty : sapNumberComboBox.Text;
+                wm.SerialNr = string.IsNullOrEmpty(snTrailTextBox.Text) ? string.Empty : snTrailTextBox.Text;
+
+                printer.PrintResults(wm, "document name");
+
+                remainingCount--;
+                IncrementSN(snTrailTextBox);
+
+                if (remainingCount > 0)
+                {
+                    timer.Enabled = true;
+                }
+                else
+                {
+                    Text = string.Format("{0} ... {1}", programNameAndVer, Strings.completed);
+                    MessageBox.Show(string.Format(Strings.x_labels_printed, totalCount));
+                    SaveSettingsUpdateAndEnableUI();
+                }
+            }
+            else
+            {
+                /// Program.LocalSettings.Mode == Mode.Standalone || Program.LocalSettings.Mode == Mode.WithDatabase
+
+                PrintOneLabel();
+
+                if (remainingCount > 0)
+                {
+                    timer.Enabled = true;
+                }
+                else
+                {
+                    Text = string.Format("{0} ... {1}", programNameAndVer, Strings.completed);
+                    MessageBox.Show(string.Format(Strings.x_labels_printed, totalCount));
+                    SaveSettingsUpdateAndEnableUI();
+                }
+            }
+        }
+
+        char[] digits = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+        /// 
+        void IncrementSN(TextBox tb)
+        {
+            if (tb != null)
+            {
+                string currentSN = tb.Text;
+
+                int currentSnNr;
+                int startIx = currentSN.IndexOfAny(digits);
+                if (startIx >= 0)
+                {
+                    int lastDigitPosPlus1 = startIx + 1;
+                    var listOfDigits = new List<char>(digits);
+                    while (lastDigitPosPlus1 < currentSN.Length && listOfDigits.Contains(currentSN[lastDigitPosPlus1]))
+                    {
+                        lastDigitPosPlus1++;
+                    }
+                    int digitsCount = lastDigitPosPlus1 - startIx;
+
+                    if (int.TryParse(currentSN.Substring(startIx, digitsCount), out currentSnNr) && currentSnNr >= 0)
+                    {
+                        currentSnNr++;
+                        string newSN = currentSnNr.ToString();
+                        int len = newSN.Length;
+                        if (len <= digitsCount)
+                        {
+                            tb.Text = currentSN.Substring(0, startIx + digitsCount - len) + newSN + currentSN.Substring(startIx + digitsCount);
+                        }
+                        else
+                        {
+                            tb.Text = currentSN.Substring(0, startIx) + newSN + currentSN.Substring(startIx + digitsCount); ;
+                        }
+                    }
+                }
+
+            }
+        }
+
+        void PrintOneLabel()
+        {
+            if (remainingCount > 0)
+            {
+                string code = string.Format("{0}{1}{2:D9}", prefix, separator, currentSNTrail);
+                Text = string.Format("{0} ... {1} ... {2} / {3}", programNameAndVer, code, totalCount - remainingCount + 1, totalCount);
+                DataMatrix matrix = new DataMatrix(code, SymbolSize.SquareAuto);
+                new Printers.DataMatrixAndTextPrintDoc(matrix.Matrix, code.Replace(separator.Substring(0, 2), "\n")).Print();
+                currentSNTrail++;
+                remainingCount--;
+            }
+        }
+
+        void SaveSettingsUpdateAndEnableUI()
+        {
+            if (Program.LocalSettings.Mode != Mode.TbfLabelPrinter) snTrailTextBox.Text = currentSNTrail.ToString("D9");
+            countTextBox.Text = remainingCount.ToString();
+
+            Program.LocalSettings.CurrentSNTrail = currentSNTrail;
+            Program.LocalSettings.RemainingSNsCount = remainingCount;
+            Program.LocalSettings.Save();
+
+            sapNumberComboBox.Enabled = true;
+            separatorComboBox.Enabled = true;
+            snTrailTextBox.Enabled = (Program.LocalSettings.Mode == Mode.TbfLabelPrinter || Program.LocalSettings.Mode == Mode.Standalone);
+            countTextBox.Enabled = true;
+
+            startButton.Enabled = true;
+            interruptButton.Enabled = false;
+        }
+
+        private void interruptButton_Click(object sender, EventArgs e)
+        {
+            interrupt = true;
+        }
+
+        private void settingsToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            /// Connect to the database of users and log in a user
+            try
+            {
+                SharedDatabase.UsersDB.ConnectionString = Program.LocalSettings.UsersDBConnString;
+                SharedDatabase.UsersDB.DbType = Common.DBType.MySql;
+
+                DialogResult dr = new SharedDatabase.Forms.LoginDlg().ShowDialog();
+                if (dr != DialogResult.OK) return;
+            }
+            catch (Exception exc)
+            {
+                string msg = string.Format("Failed to connect to the database of users:{0}{1}", Environment.NewLine, exc.Message);
+                log.Error(msg);
+                MessageBox.Show(msg);
+                return;
+            }
+
+            /// Modify program settings
+            try
+            {
+                DialogResult dr = new SettingsDlg(Program.LocalSettings).ShowDialog();
+                if (dr == DialogResult.OK)
+                {
+                    Program.LocalSettings.Save();
+                    MessageBox.Show(Strings.Program_restart_is_required);
+                    Close();
+                }
+            }
+            catch (Exception exc)
+            {
+                string msg = string.Format("Error occurred, settings were not modified:{0}{1}", Environment.NewLine, exc.Message);
+                log.Error(msg);
+                MessageBox.Show(msg);
+            }
+        }
+    }
+}

LabelPrinting/MainWnd.resx

@@ -0,0 +1,123 @@
+<?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>
+  <metadata name="mainMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>

LabelPrinting/Printers/DataMatrixAndTextPrintDoc.cs

@@ -0,0 +1,120 @@
+///
+/// Copyright (c) 2021 Sensus Slovensko a.s.
+///
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Printing;
+using Gma.QrCodeNet.Encoding;
+using DataMatrix4Net;
+
+namespace LabelPrinting.Printers
+{
+	public class DataMatrixAndTextPrintDoc : PrintDocument
+	{
+        const float mm = 1 / 0.254F;     /// 1 mm expressed in 1/100 inch
+
+        int printWidth;
+        int printHeight;
+        int leftMargin;
+        int topMargin;
+
+
+        BitMatrix bitMatrix;
+        string text;
+
+
+        /// <summary>
+		/// Constructor
+		/// </summary>
+        /// <param name="bitmap">Bitmap to be printed</param>
+        /// <param name="paperWidth">Label width</param>
+        /// <param name="paperHeight">Label height</param>
+        /// <param name="landscape">true = landscape</param>
+        public DataMatrixAndTextPrintDoc(BitMatrix bitMatrix, string text, bool landscape = false)
+		{
+            this.bitMatrix = bitMatrix;
+            this.text = text;
+
+            DefaultPageSettings.Landscape = landscape;
+
+			/// Set print area size and margins (in dots using 80 dpi)
+            if (landscape)
+            {
+                printWidth = base.DefaultPageSettings.PaperSize.Height - base.DefaultPageSettings.Margins.Top - base.DefaultPageSettings.Margins.Bottom;
+                printHeight = base.DefaultPageSettings.PaperSize.Width - base.DefaultPageSettings.Margins.Left - base.DefaultPageSettings.Margins.Right;
+                leftMargin = base.DefaultPageSettings.Margins.Top;	    /// X
+                topMargin = base.DefaultPageSettings.Margins.Left;		/// Y
+            }
+            else
+            {
+                printHeight = base.DefaultPageSettings.PaperSize.Height - base.DefaultPageSettings.Margins.Top - base.DefaultPageSettings.Margins.Bottom;
+                printWidth = base.DefaultPageSettings.PaperSize.Width - base.DefaultPageSettings.Margins.Left - base.DefaultPageSettings.Margins.Right;
+                leftMargin = base.DefaultPageSettings.Margins.Left;	    /// X
+                topMargin = base.DefaultPageSettings.Margins.Top;		/// Y
+            }
+		}
+
+		protected override void OnBeginPrint(System.Drawing.Printing.PrintEventArgs e)
+		{
+            base.OnBeginPrint(e);   /// Run base code
+		}
+
+		protected override void OnPrintPage(System.Drawing.Printing.PrintPageEventArgs e)
+		{
+            base.OnPrintPage(e);    /// Run base code
+            DrawLabel(e.Graphics, bitMatrix, text);
+			e.HasMorePages = false;
+		}
+
+        public static void DrawLabel(Graphics g, BitMatrix bitMatrix, string text)
+        {
+            string[] lines = text.Split(new char[] { '\n' }); 
+
+            /// Assuming 100 dpi (printer), drawing size: 2 inch (width) x 1 inch (height)
+            const float W = 18 * mm;
+            const float H = 10 * mm;
+            
+            const float L1 = 7.0f * mm;
+            const float L2 = 7.0f * mm;
+            const float T1 = 3.5f * mm;
+            const float T2 = 5.5f * mm;
+
+            const float QRL = 1.0f * mm;
+            const float QRT = 2.5f * mm;
+            const float QrSize = 5.5f * mm;
+
+            string fontFamily = "Arial";
+            Font font = new Font(fontFamily, 4.5f, FontStyle.Bold);
+
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+            g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+            g.PixelOffsetMode = PixelOffsetMode.HighQuality;
+
+            g.Clear(Color.White);
+
+            if (lines.Length > 0)
+            {
+                g.DrawString(lines[0], font, Brushes.Black, new RectangleF(L1, T1, W - L1, H - T1));
+            }
+
+            if (lines.Length > 1)
+            {
+                g.DrawString(lines[1], font, Brushes.Black, new RectangleF(L2, T2, W - L2, H - T2));
+            }
+
+            g.Flush();
+
+            float QrPixSize = QrSize / bitMatrix.Width;
+            for (int i = 0; i < bitMatrix.Height; i++)
+            {
+                for (int j = 0; j < bitMatrix.Width; j++)
+                {
+                    if (bitMatrix[j, i])
+                    {
+                        g.FillRectangle(Brushes.Black, new RectangleF(QRL + QrPixSize * j, QRT + QrPixSize * i, QrPixSize, QrPixSize));
+                    }
+                }
+            }
+        }
+    }
+}

LabelPrinting/Program.cs

@@ -0,0 +1,251 @@
+///
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using System.Windows.Forms;
+using log4net;
+using NHibernate;
+using Common;
+using SharedDatabase;
+using SharedDatabase.Entities;
+using LabelPrinting.Resources;
+
+namespace LabelPrinting
+{
+	static class Program
+	{
+        /// Constants
+        public static GID[] SettingsAccessLevel = new GID[] { GID.TraceabilityManagement };    /// Group membership to access settings
+        public const string ProgramName = "LabelPrinting";
+        public const string ConfigFName = "config.xml";
+        public const string BackupConfigFName = "config.backup.xml";
+        public const string Log4NetConfigFName = "log4netConfig.xml";
+
+        /// Program information
+        public static readonly string Version;	        /// version string
+        public static readonly DateTime BuildDateTime;	/// date and time of program build
+        public static readonly string ExeDirectory;
+        public static readonly string ConfigDirectory;
+        public static readonly string LogDirectory;
+        public static readonly string LocalSettingsFileName;
+        public static readonly string LocalSettingsBackupName;
+
+        /// Local settings
+        public static LocalSettings LocalSettings;
+
+        /// log4net
+        static ILog log;
+
+
+        static Program()
+        {
+            /// Program version string
+            Assembly thisAssembly = Assembly.GetExecutingAssembly();
+            Version ver = thisAssembly.GetName().Version;
+            Version = string.Format("{0}.{1}.{2}", ver.Major, ver.Minor, ver.Build);
+            BuildDateTime = new FileInfo(thisAssembly.Location).LastWriteTime;
+
+            /// Local program configuration directory including the trailing backslash
+            ExeDirectory = Path.GetDirectoryName(thisAssembly.Location);
+            ConfigDirectory = Path.Combine(ExeDirectory, "..\\Cfg");
+            LogDirectory = Path.Combine(ExeDirectory, "..", "Logs");
+            LocalSettingsFileName = Path.Combine(ConfigDirectory, ConfigFName);
+            LocalSettingsBackupName = Path.Combine(ConfigDirectory, BackupConfigFName);
+        }
+
+
+        /// <summary>
+		/// The main entry point for the application.
+		/// </summary>
+		[STAThread]
+		static void Main()
+		{
+            ///
+            /// Check if another instance is running
+            ///
+            Assembly thisAssembly = Assembly.GetExecutingAssembly();
+            string processName = Path.GetFileNameWithoutExtension(thisAssembly.Location);
+            if (System.Diagnostics.Process.GetProcessesByName(processName).Length > 1)
+            {
+                MessageBox.Show(string.Format("{0}{1}{2}", string.Format(Strings.Program_0_is_running_already, ProgramName),
+                                                           Environment.NewLine,
+                                                           Strings.Close_it_please),
+                                Strings.Error,
+                                MessageBoxButtons.OK,
+                                MessageBoxIcon.Asterisk);
+                return;
+            }
+
+            AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(MyHandler);
+
+            bool configDirectoryCreated = false;
+            if (!Directory.Exists(ConfigDirectory) || new DirectoryInfo(ConfigDirectory).GetFileSystemInfos().Length == 0)
+            {
+                MessageBox.Show(string.Format("{0}{1}{2}", Strings.Program_is_running_for_the_1st_time_on_this_PC,
+                                                           Environment.NewLine,
+                                                           Strings.Default_settings_are_used),
+                                Strings.Warning,
+                                MessageBoxButtons.OK,
+                                MessageBoxIcon.Exclamation);
+                ///
+                /// Create a new config subdirectory
+                ///
+                Directory.CreateDirectory(ConfigDirectory);
+                configDirectoryCreated = true;
+
+                LocalSettings = new LocalSettings(true);
+                LocalSettings.Save();
+
+                if (File.Exists(Path.Combine(ExeDirectory, "SampleConfig", Log4NetConfigFName)))
+                {
+                    File.Copy(Path.Combine(ExeDirectory, "SampleConfig", Log4NetConfigFName),
+                              Path.Combine(ConfigDirectory, Log4NetConfigFName));
+                }
+
+                File.SetAttributes(Path.Combine(ConfigDirectory, Log4NetConfigFName), FileAttributes.Normal);
+            }
+
+            ///
+            /// Configue and start logging
+            ///
+            log4net.Config.XmlConfigurator.Configure(new FileInfo(Path.Combine(ConfigDirectory, Log4NetConfigFName)));
+            log = LogManager.GetLogger(typeof(Program));
+            log.Fatal("--------------------------------------------------------------------------------");
+            log.FatalFormat("{0} ver.{1}", ProgramName, Version);
+            log.FatalFormat("Executable directory is {0}", ExeDirectory);
+            if (configDirectoryCreated)
+            {
+                log.Fatal("A new config directory and configuration files created !");
+            }
+
+            ///
+            /// Load the local settings
+            ///
+            LocalSettings = LocalSettings.Load(LocalSettingsFileName);
+            if (LocalSettings == null)
+            {
+                /// Loading local seetings from regular config file failed. Use the backup
+                LocalSettings = LocalSettings.Load(LocalSettingsBackupName);
+                if (LocalSettings == null)
+                {
+                    log.FatalFormat("Local settings: Could not load file {0}, nor {1}.", ConfigFName, BackupConfigFName);
+                    log.Fatal("Application terminated.");
+                    MessageBox.Show(string.Format("Could not load file {0}, nor {1}.", ConfigFName, BackupConfigFName), "Fatal error");
+                    return;					/// Fatal error
+                }
+                else
+                {
+                    LocalSettings.Save();	/// Save the settings to overwrite the wrong file
+                    log.FatalFormat("Local settings: Could not load file {0}, successfully loaded {1}", ConfigFName, BackupConfigFName);
+                }
+            }
+            else
+            {
+                /// Loading local seetings from the regular config file was successful. Update the backup
+                File.Copy(LocalSettingsFileName, LocalSettingsBackupName, true);
+            }
+
+            Application.EnableVisualStyles();
+			Application.SetCompatibleTextRenderingDefault(false);
+
+            ///
+            /// User login
+            ///
+            if (LocalSettings.IsUserLoginRequired && !string.IsNullOrEmpty(LocalSettings.UsersDBConnString))
+            {
+                try
+                {
+                    UsersDB.ConnectionString = LocalSettings.UsersDBConnString;
+                    UsersDB.DbType = DBType.MySql;
+
+                    DialogResult dr = new SharedDatabase.Forms.LoginDlg().ShowDialog();
+                    if (dr != DialogResult.OK) return;
+                }
+                catch (Exception exc)
+                {
+                    log.ErrorFormat("Failed to connect to database of users: {0}", exc.Message);
+                }
+            }
+
+            IList<OrderInfo> orderInfos = null;
+            while (LocalSettings.Mode == Mode.WithDatabase)
+            {
+                try
+                {
+                    ISession session = TracingDB.CreateSession(LocalSettings.TracingDBConnString);
+                    orderInfos = session.QueryOver<OrderInfo>().List();
+                    break;
+                }
+                catch (Exception exc)
+                {
+                    log.FatalFormat("Failed to connect to production tracing database: {0}", exc.Message);
+                    if (exc.InnerException != null)
+                    {
+                        log.FatalFormat("InnerException: {0}", exc.InnerException.Message);
+                    }
+
+                    MessageBox.Show(string.Format("Failed to connect to production tracing database:{0}{1}", Environment.NewLine, exc.Message));
+
+                    if (new SettingsDlg(LocalSettings).ShowDialog() == DialogResult.OK)
+                    {
+                        LocalSettings.Save();
+                    }
+                    else
+                    {
+                        return;
+                    }
+                }
+            }
+
+            try
+            {
+                MainWnd dlg = new MainWnd(orderInfos);
+                Application.Run(dlg);
+            }
+            catch (Exception e)
+            {
+                LogException(log, "Exception in Application.Run(MainWnd)", e);
+
+                MessageBox.Show("Program crashed:" +
+                                Environment.NewLine + Environment.NewLine + e.Message +
+                                ((e.InnerException == null) ? string.Empty : (Environment.NewLine + e.InnerException.Message)) +
+                                Environment.NewLine + e.StackTrace,
+                                "Fatal error",
+                                MessageBoxButtons.OK,
+                                MessageBoxIcon.Exclamation);
+            }
+		}
+
+
+        static void MyHandler(object sender, UnhandledExceptionEventArgs args)
+        {
+            Exception e = args.ExceptionObject as Exception;
+            if (e == null) return;
+
+            LogException(log, "Unhandled exception", e);
+
+            MessageBox.Show("Program crashed:" +
+                            Environment.NewLine + Environment.NewLine + e.Message +
+                            ((e.InnerException == null) ? string.Empty : (Environment.NewLine + e.InnerException.Message)) +
+                            Environment.NewLine + e.StackTrace,
+                            "Fatal error",
+                            MessageBoxButtons.OK,
+                            MessageBoxIcon.Exclamation);
+        }
+
+        static void LogException(ILog log, string description, Exception e)
+        {
+            log.FatalFormat("---------------( {0} )---------------", description);
+            log.FatalFormat("Message      : {0}", e.Message);
+            if (e.InnerException != null)
+            {
+                log.FatalFormat("InnerMessage : {0}", e.InnerException.Message);
+            }
+            log.FatalFormat("StackTrace   : {0}{1}", Environment.NewLine, e.StackTrace);
+            log.Fatal("--------------------------------------");
+        }
+    }
+}

LabelPrinting/Properties/AssemblyInfo.cs

@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("LabelPrinting")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("LabelPrinting")]
+[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("270db60d-5938-40be-b15c-e2bc3c7ddb86")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// 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("1.0.6.0")]
+[assembly: AssemblyFileVersion("1.0.6.0")]

LabelPrinting/Properties/Resources.Designer.cs

@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace LabelPrinting.Properties
+{
+
+
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources
+    {
+
+        private static global::System.Resources.ResourceManager resourceMan;
+
+        private static global::System.Globalization.CultureInfo resourceCulture;
+
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources()
+        {
+        }
+
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager
+        {
+            get
+            {
+                if ((resourceMan == null))
+                {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SNPrinting.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture
+        {
+            get
+            {
+                return resourceCulture;
+            }
+            set
+            {
+                resourceCulture = value;
+            }
+        }
+    }
+}

LabelPrinting/Properties/Resources.resx

@@ -0,0 +1,117 @@
+<?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.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: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" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </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" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

LabelPrinting/Properties/Settings.Designer.cs

@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace LabelPrinting.Properties
+{
+
+
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+        public static Settings Default
+        {
+            get
+            {
+                return defaultInstance;
+            }
+        }
+    }
+}

LabelPrinting/Properties/Settings.settings

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>

LabelPrinting/Resources/Strings.Designer.cs

@@ -0,0 +1,414 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace LabelPrinting.Resources {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Strings {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Strings() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("LabelPrinting.Resources.Strings", typeof(Strings).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Are you sure?.
+        /// </summary>
+        internal static string Are_you_sure {
+            get {
+                return ResourceManager.GetString("Are_you_sure", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Cancel.
+        /// </summary>
+        internal static string Cancel {
+            get {
+                return ResourceManager.GetString("Cancel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Close it please using &apos;Task manager&apos;..
+        /// </summary>
+        internal static string Close_it_please {
+            get {
+                return ResourceManager.GetString("Close_it_please", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to completed.
+        /// </summary>
+        internal static string completed {
+            get {
+                return ResourceManager.GetString("completed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Connection string for production tracing database.
+        /// </summary>
+        internal static string Connection_string_tracing_DB {
+            get {
+                return ResourceManager.GetString("Connection_string_tracing_DB", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Connection string for database of users.
+        /// </summary>
+        internal static string Connection_string_users_DB {
+            get {
+                return ResourceManager.GetString("Connection_string_users_DB", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Database.
+        /// </summary>
+        internal static string Database {
+            get {
+                return ResourceManager.GetString("Database", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Default settings are used..
+        /// </summary>
+        internal static string Default_settings_are_used {
+            get {
+                return ResourceManager.GetString("Default_settings_are_used", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Delay between labels.
+        /// </summary>
+        internal static string Delay_between_labes {
+            get {
+                return ResourceManager.GetString("Delay_between_labes", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Error.
+        /// </summary>
+        internal static string Error {
+            get {
+                return ResourceManager.GetString("Error", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to First S/N trail (9 digits).
+        /// </summary>
+        internal static string First_SN_trail_9_digits {
+            get {
+                return ResourceManager.GetString("First_SN_trail_9_digits", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Interrupt.
+        /// </summary>
+        internal static string Interrupt {
+            get {
+                return ResourceManager.GetString("Interrupt", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to interrupted.
+        /// </summary>
+        internal static string interrupted {
+            get {
+                return ResourceManager.GetString("interrupted", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Invalid.
+        /// </summary>
+        internal static string Invalid {
+            get {
+                return ResourceManager.GetString("Invalid", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Invalid first S/N trail.
+        /// </summary>
+        internal static string Invalid_first_SN_trail {
+            get {
+                return ResourceManager.GetString("Invalid_first_SN_trail", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Invalid language.
+        /// </summary>
+        internal static string Invalid_language {
+            get {
+                return ResourceManager.GetString("Invalid_language", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Invalid SAP number.
+        /// </summary>
+        internal static string Invalid_SAP_number {
+            get {
+                return ResourceManager.GetString("Invalid_SAP_number", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Invalid separator.
+        /// </summary>
+        internal static string Invalid_separator {
+            get {
+                return ResourceManager.GetString("Invalid_separator", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Invalid labels count.
+        /// </summary>
+        internal static string Invalid_SNs_count {
+            get {
+                return ResourceManager.GetString("Invalid_SNs_count", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Labels count.
+        /// </summary>
+        internal static string Labels_count {
+            get {
+                return ResourceManager.GetString("Labels_count", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Language, Sprache, Jazyk.
+        /// </summary>
+        internal static string Language_etc {
+            get {
+                return ResourceManager.GetString("Language_etc", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to min..
+        /// </summary>
+        internal static string min {
+            get {
+                return ResourceManager.GetString("min", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Mode.
+        /// </summary>
+        internal static string Mode {
+            get {
+                return ResourceManager.GetString("Mode", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Order.
+        /// </summary>
+        internal static string Order {
+            get {
+                return ResourceManager.GetString("Order", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Program &apos;{0}&apos; is running already..
+        /// </summary>
+        internal static string Program_0_is_running_already {
+            get {
+                return ResourceManager.GetString("Program_0_is_running_already", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Program is running for the 1st time on this PC..
+        /// </summary>
+        internal static string Program_is_running_for_the_1st_time_on_this_PC {
+            get {
+                return ResourceManager.GetString("Program_is_running_for_the_1st_time_on_this_PC", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Program restart is required.
+        /// </summary>
+        internal static string Program_restart_is_required {
+            get {
+                return ResourceManager.GetString("Program_restart_is_required", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to SAP number (8 digits).
+        /// </summary>
+        internal static string SAP_number_8_digits {
+            get {
+                return ResourceManager.GetString("SAP_number_8_digits", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Save.
+        /// </summary>
+        internal static string Save {
+            get {
+                return ResourceManager.GetString("Save", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Separator (3 characters).
+        /// </summary>
+        internal static string Separator_3_characters {
+            get {
+                return ResourceManager.GetString("Separator_3_characters", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Serial number.
+        /// </summary>
+        internal static string Serial_number {
+            get {
+                return ResourceManager.GetString("Serial_number", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Settings.
+        /// </summary>
+        internal static string Settings {
+            get {
+                return ResourceManager.GetString("Settings", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Standalone.
+        /// </summary>
+        internal static string Standalone {
+            get {
+                return ResourceManager.GetString("Standalone", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Start printing.
+        /// </summary>
+        internal static string Start_printing {
+            get {
+                return ResourceManager.GetString("Start_printing", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to User login is required.
+        /// </summary>
+        internal static string User_login_is_required {
+            get {
+                return ResourceManager.GetString("User_login_is_required", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Warning.
+        /// </summary>
+        internal static string Warning {
+            get {
+                return ResourceManager.GetString("Warning", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to With a database.
+        /// </summary>
+        internal static string With_database {
+            get {
+                return ResourceManager.GetString("With_database", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to {0} labels printed.
+        /// </summary>
+        internal static string x_labels_printed {
+            get {
+                return ResourceManager.GetString("x_labels_printed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to You are skipping.
+        /// </summary>
+        internal static string You_are_skipping {
+            get {
+                return ResourceManager.GetString("You_are_skipping", resourceCulture);
+            }
+        }
+    }
+}

LabelPrinting/Resources/Strings.cs.resx

@@ -0,0 +1,234 @@
+<?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>
+  <data name="Cancel" xml:space="preserve">
+    <value>Zrušit</value>
+  </data>
+  <data name="Close_it_please" xml:space="preserve">
+    <value>Zavřete ho prosím 'Správcem úloh' (Task manager).</value>
+  </data>
+  <data name="completed" xml:space="preserve">
+    <value>dokončeno</value>
+  </data>
+  <data name="Connection_string_tracing_DB" xml:space="preserve">
+    <value>Konfigurace databáze sledování výroby</value>
+  </data>
+  <data name="Connection_string_users_DB" xml:space="preserve">
+    <value>Konfigurace databáze uživatelů</value>
+  </data>
+  <data name="Database" xml:space="preserve">
+    <value>Databáze</value>
+  </data>
+  <data name="Default_settings_are_used" xml:space="preserve">
+    <value>Použijí sa výchozí nastavení</value>
+  </data>
+  <data name="Delay_between_labes" xml:space="preserve">
+    <value>Zpoždění mezi tiskemm štítků</value>
+  </data>
+  <data name="Error" xml:space="preserve">
+    <value>Chyba</value>
+  </data>
+  <data name="Interrupt" xml:space="preserve">
+    <value>Prerušit</value>
+  </data>
+  <data name="interrupted" xml:space="preserve">
+    <value>prerušeno</value>
+  </data>
+  <data name="Invalid_first_SN_trail" xml:space="preserve">
+    <value>Neplatný konec sériového čísla</value>
+  </data>
+  <data name="Invalid_SAP_number" xml:space="preserve">
+    <value>Neplatné číslo součástky (SAP číslo)</value>
+  </data>
+  <data name="Invalid_separator" xml:space="preserve">
+    <value>Neplatný oddělovač</value>
+  </data>
+  <data name="Invalid_SNs_count" xml:space="preserve">
+    <value>Neplatný počet štítků</value>
+  </data>
+  <data name="Language_etc" xml:space="preserve">
+    <value>Language, Sprache, Jazyk</value>
+  </data>
+  <data name="min." xml:space="preserve">
+    <value>min.</value>
+  </data>
+  <data name="Mode" xml:space="preserve">
+    <value>Režim činnosti</value>
+  </data>
+  <data name="Program_0_is_running_already" xml:space="preserve">
+    <value>Program '{0}' už běží.</value>
+  </data>
+  <data name="Program_is_running_for_the_1st_time_on_this_PC" xml:space="preserve">
+    <value>Program byl spuštěn na tomto počítači poprvé.</value>
+  </data>
+  <data name="Save" xml:space="preserve">
+    <value>Uložit</value>
+  </data>
+  <data name="Settings" xml:space="preserve">
+    <value>Nastavení</value>
+  </data>
+  <data name="Standalone" xml:space="preserve">
+    <value>Samostatný</value>
+  </data>
+  <data name="Start_printing" xml:space="preserve">
+    <value>Spustit tisk</value>
+  </data>
+  <data name="User_login_is_required" xml:space="preserve">
+    <value>Vyžaduje se prihlášení užívatele</value>
+  </data>
+  <data name="Warning" xml:space="preserve">
+    <value>Upozornení</value>
+  </data>
+  <data name="With_database" xml:space="preserve">
+    <value>S databází</value>
+  </data>
+  <data name="You_are_skipping" xml:space="preserve">
+    <value>Vynechávate</value>
+  </data>
+  <data name="First_SN_trail_9_digits" xml:space="preserve">
+    <value>První konec sériového čísla (9 číslic)</value>
+  </data>
+  <data name="SAP_number_8_digits" xml:space="preserve">
+    <value>SAP číslo (8 číslic)</value>
+  </data>
+  <data name="Separator_3_characters" xml:space="preserve">
+    <value>Oddělovač (3 znaky)</value>
+  </data>
+  <data name="Labels_count" xml:space="preserve">
+    <value>Počet štítků</value>
+  </data>
+  <data name="Program_restart_is_required" xml:space="preserve">
+    <value>Je potřebný restart programu</value>
+  </data>
+  <data name="x_labels_printed" xml:space="preserve">
+    <value>Bylo vytištěných {0} štítků</value>
+  </data>
+  <data name="Invalid" xml:space="preserve">
+    <value>Neplatný</value>
+  </data>
+  <data name="Invalid_language" xml:space="preserve">
+    <value>Neplatný jazyk</value>
+  </data>
+  <data name="Order" xml:space="preserve">
+    <value>Objednávka</value>
+  </data>
+  <data name="Serial_number" xml:space="preserve">
+    <value>Sériové číslo</value>
+  </data>
+</root>

LabelPrinting/Resources/Strings.resx

@@ -0,0 +1,237 @@
+<?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>
+  <data name="Close_it_please" xml:space="preserve">
+    <value>Close it please using 'Task manager'.</value>
+  </data>
+  <data name="Default_settings_are_used" xml:space="preserve">
+    <value>Default settings are used.</value>
+  </data>
+  <data name="Error" xml:space="preserve">
+    <value>Error</value>
+  </data>
+  <data name="Interrupt" xml:space="preserve">
+    <value>Interrupt</value>
+  </data>
+  <data name="Invalid_first_SN_trail" xml:space="preserve">
+    <value>Invalid first S/N trail</value>
+  </data>
+  <data name="Invalid_SAP_number" xml:space="preserve">
+    <value>Invalid SAP number</value>
+  </data>
+  <data name="Invalid_separator" xml:space="preserve">
+    <value>Invalid separator</value>
+  </data>
+  <data name="Invalid_SNs_count" xml:space="preserve">
+    <value>Invalid labels count</value>
+  </data>
+  <data name="Program_0_is_running_already" xml:space="preserve">
+    <value>Program '{0}' is running already.</value>
+  </data>
+  <data name="Program_is_running_for_the_1st_time_on_this_PC" xml:space="preserve">
+    <value>Program is running for the 1st time on this PC.</value>
+  </data>
+  <data name="Start_printing" xml:space="preserve">
+    <value>Start printing</value>
+  </data>
+  <data name="Warning" xml:space="preserve">
+    <value>Warning</value>
+  </data>
+  <data name="completed" xml:space="preserve">
+    <value>completed</value>
+  </data>
+  <data name="interrupted" xml:space="preserve">
+    <value>interrupted</value>
+  </data>
+  <data name="Are_you_sure" xml:space="preserve">
+    <value>Are you sure?</value>
+  </data>
+  <data name="min" xml:space="preserve">
+    <value>min.</value>
+  </data>
+  <data name="You_are_skipping" xml:space="preserve">
+    <value>You are skipping</value>
+  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="Connection_string_tracing_DB" xml:space="preserve">
+    <value>Connection string for production tracing database</value>
+  </data>
+  <data name="Connection_string_users_DB" xml:space="preserve">
+    <value>Connection string for database of users</value>
+  </data>
+  <data name="Database" xml:space="preserve">
+    <value>Database</value>
+  </data>
+  <data name="Delay_between_labes" xml:space="preserve">
+    <value>Delay between labels</value>
+  </data>
+  <data name="Language_etc" xml:space="preserve">
+    <value>Language, Sprache, Jazyk</value>
+  </data>
+  <data name="Mode" xml:space="preserve">
+    <value>Mode</value>
+  </data>
+  <data name="Save" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="Settings" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="Standalone" xml:space="preserve">
+    <value>Standalone</value>
+  </data>
+  <data name="User_login_is_required" xml:space="preserve">
+    <value>User login is required</value>
+  </data>
+  <data name="With_database" xml:space="preserve">
+    <value>With a database</value>
+  </data>
+  <data name="First_SN_trail_9_digits" xml:space="preserve">
+    <value>First S/N trail (9 digits)</value>
+  </data>
+  <data name="SAP_number_8_digits" xml:space="preserve">
+    <value>SAP number (8 digits)</value>
+  </data>
+  <data name="Separator_3_characters" xml:space="preserve">
+    <value>Separator (3 characters)</value>
+  </data>
+  <data name="Labels_count" xml:space="preserve">
+    <value>Labels count</value>
+  </data>
+  <data name="Program_restart_is_required" xml:space="preserve">
+    <value>Program restart is required</value>
+  </data>
+  <data name="x_labels_printed" xml:space="preserve">
+    <value>{0} labels printed</value>
+  </data>
+  <data name="Invalid" xml:space="preserve">
+    <value>Invalid</value>
+  </data>
+  <data name="Invalid_language" xml:space="preserve">
+    <value>Invalid language</value>
+  </data>
+  <data name="Order" xml:space="preserve">
+    <value>Order</value>
+  </data>
+  <data name="Serial_number" xml:space="preserve">
+    <value>Serial number</value>
+  </data>
+</root>

LabelPrinting/Resources/Strings.sk.resx

@@ -0,0 +1,234 @@
+<?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>
+  <data name="Cancel" xml:space="preserve">
+    <value>Zrušiť</value>
+  </data>
+  <data name="Close_it_please" xml:space="preserve">
+    <value>Zavrite ho prosím 'Správcom úloh' (Task manager).</value>
+  </data>
+  <data name="completed" xml:space="preserve">
+    <value>dokončené</value>
+  </data>
+  <data name="Connection_string_tracing_DB" xml:space="preserve">
+    <value>Konfigurácia databáze sledovania výroby</value>
+  </data>
+  <data name="Connection_string_users_DB" xml:space="preserve">
+    <value>Konfigurácia databáze užívateľov</value>
+  </data>
+  <data name="Database" xml:space="preserve">
+    <value>Databáza</value>
+  </data>
+  <data name="Default_settings_are_used" xml:space="preserve">
+    <value>Použijú sa základné nastavenia</value>
+  </data>
+  <data name="Delay_between_labes" xml:space="preserve">
+    <value>Oneskorenie medzi tlačením štítkov</value>
+  </data>
+  <data name="Error" xml:space="preserve">
+    <value>Chyba</value>
+  </data>
+  <data name="Interrupt" xml:space="preserve">
+    <value>Prerušiť</value>
+  </data>
+  <data name="interrupted" xml:space="preserve">
+    <value>prerušené</value>
+  </data>
+  <data name="Invalid_first_SN_trail" xml:space="preserve">
+    <value>Neplatný chvost sériového čísla</value>
+  </data>
+  <data name="Invalid_SAP_number" xml:space="preserve">
+    <value>Neplatné číslo súčiastky (SAP číslo)</value>
+  </data>
+  <data name="Invalid_separator" xml:space="preserve">
+    <value>Neplatný oddelovač</value>
+  </data>
+  <data name="Invalid_SNs_count" xml:space="preserve">
+    <value>Neplatný počet štítkov</value>
+  </data>
+  <data name="Language_etc" xml:space="preserve">
+    <value>Language, Sprache, Jazyk</value>
+  </data>
+  <data name="min." xml:space="preserve">
+    <value>min.</value>
+  </data>
+  <data name="Mode" xml:space="preserve">
+    <value>Režim činnosti</value>
+  </data>
+  <data name="Program_0_is_running_already" xml:space="preserve">
+    <value>Program '{0}' už beží.</value>
+  </data>
+  <data name="Program_is_running_for_the_1st_time_on_this_PC" xml:space="preserve">
+    <value>Program bol spustený na tomto počítači prvý krát.</value>
+  </data>
+  <data name="Save" xml:space="preserve">
+    <value>Uložiť</value>
+  </data>
+  <data name="Settings" xml:space="preserve">
+    <value>Nastavenia</value>
+  </data>
+  <data name="Standalone" xml:space="preserve">
+    <value>Samostatný</value>
+  </data>
+  <data name="Start_printing" xml:space="preserve">
+    <value>Začať tlačiť</value>
+  </data>
+  <data name="User_login_is_required" xml:space="preserve">
+    <value>Vyžaduje sa prihlásenie používateľa</value>
+  </data>
+  <data name="Warning" xml:space="preserve">
+    <value>Upozornenie</value>
+  </data>
+  <data name="With_database" xml:space="preserve">
+    <value>S databázou</value>
+  </data>
+  <data name="You_are_skipping" xml:space="preserve">
+    <value>Vynechávate</value>
+  </data>
+  <data name="First_SN_trail_9_digits" xml:space="preserve">
+    <value>Prvý chvost sériového čísla (9 číslic)</value>
+  </data>
+  <data name="SAP_number_8_digits" xml:space="preserve">
+    <value>SAP číslo (8 číslic)</value>
+  </data>
+  <data name="Separator_3_characters" xml:space="preserve">
+    <value>Oddeľovač (3 znaky)</value>
+  </data>
+  <data name="Labels_count" xml:space="preserve">
+    <value>Počet štítkov</value>
+  </data>
+  <data name="Program_restart_is_required" xml:space="preserve">
+    <value>Je potrebný reštart programu</value>
+  </data>
+  <data name="x_labels_printed" xml:space="preserve">
+    <value>Bolo vytlačených {0} štítkov</value>
+  </data>
+  <data name="Invalid" xml:space="preserve">
+    <value>Neplatný</value>
+  </data>
+  <data name="Invalid_language" xml:space="preserve">
+    <value>Neplatný jazyk</value>
+  </data>
+  <data name="Order" xml:space="preserve">
+    <value>Objednávka</value>
+  </data>
+  <data name="Serial_number" xml:space="preserve">
+    <value>Sériové číslo</value>
+  </data>
+</root>

LabelPrinting/SampleConfig/log4netConfig.xml

@@ -0,0 +1,23 @@
+<log4net>
+    <!-- Program log appenders -->
+	<appender name="LabelPrintingLog" type="log4net.Appender.RollingFileAppender">
+		<file value="..\Logs\LabelPrintingLog.txt" />
+		<appendToFile value="true" />
+		<rollingMode value="Date" />
+		<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+		<layout type="log4net.Layout.PatternLayout">
+			<conversionPattern value="%date %-5level %logger - %message%newline" />
+		</layout>
+	</appender>
+
+    <!-- Set root logger -->
+    <root>
+        <level value="WARN" />
+    </root>
+	
+    <!-- Set program loggers -->
+	<logger name="LabelPrinting"> <appender-ref ref="LabelPrintingLog" /> <level value="WARN" /> </logger>
+
+    <!-- Set program logging levels -->
+	<logger name="LabelPrinting.MainWnd"> <level value="INFO" /> </logger>
+</log4net>

LabelPrinting/SettingsDlg.Designer.cs

@@ -0,0 +1,283 @@
+namespace LabelPrinting
+{
+    partial class SettingsDlg
+    {
+        /// <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.modeGroupBox = new System.Windows.Forms.GroupBox();
+            this.tbfLabelPrinterRadioButton = new System.Windows.Forms.RadioButton();
+            this.standaloneRadioButton = new System.Windows.Forms.RadioButton();
+            this.withDBRadioButton = new System.Windows.Forms.RadioButton();
+            this.commonGroupBox = new System.Windows.Forms.GroupBox();
+            this.labelPrinterConfigButton = new System.Windows.Forms.Button();
+            this.msLabel = new System.Windows.Forms.Label();
+            this.delayTextBox = new System.Windows.Forms.TextBox();
+            this.delayLabel = new System.Windows.Forms.Label();
+            this.loginRequiredCheckBox = new System.Windows.Forms.CheckBox();
+            this.languageComboBox = new System.Windows.Forms.ComboBox();
+            this.languageLabel = new System.Windows.Forms.Label();
+            this.connStrForTracingGroupBox = new System.Windows.Forms.GroupBox();
+            this.tracingDBConnStringTextBox = new System.Windows.Forms.TextBox();
+            this.connStrForUsersGroupBox = new System.Windows.Forms.GroupBox();
+            this.usersDBConnStringTextBox = new System.Windows.Forms.TextBox();
+            this.saveButton = new System.Windows.Forms.Button();
+            this.cancelButton = new System.Windows.Forms.Button();
+            this.modeGroupBox.SuspendLayout();
+            this.commonGroupBox.SuspendLayout();
+            this.connStrForTracingGroupBox.SuspendLayout();
+            this.connStrForUsersGroupBox.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // modeGroupBox
+            // 
+            this.modeGroupBox.Controls.Add(this.tbfLabelPrinterRadioButton);
+            this.modeGroupBox.Controls.Add(this.standaloneRadioButton);
+            this.modeGroupBox.Controls.Add(this.withDBRadioButton);
+            this.modeGroupBox.Location = new System.Drawing.Point(12, 12);
+            this.modeGroupBox.Name = "modeGroupBox";
+            this.modeGroupBox.Size = new System.Drawing.Size(197, 105);
+            this.modeGroupBox.TabIndex = 15;
+            this.modeGroupBox.TabStop = false;
+            this.modeGroupBox.Text = "Mode";
+            // 
+            // tbfLabelPrinterRadioButton
+            // 
+            this.tbfLabelPrinterRadioButton.AutoSize = true;
+            this.tbfLabelPrinterRadioButton.Location = new System.Drawing.Point(19, 23);
+            this.tbfLabelPrinterRadioButton.Name = "tbfLabelPrinterRadioButton";
+            this.tbfLabelPrinterRadioButton.Size = new System.Drawing.Size(156, 17);
+            this.tbfLabelPrinterRadioButton.TabIndex = 0;
+            this.tbfLabelPrinterRadioButton.TabStop = true;
+            this.tbfLabelPrinterRadioButton.Text = "TBF compatible label printer";
+            this.tbfLabelPrinterRadioButton.UseVisualStyleBackColor = true;
+            // 
+            // standaloneRadioButton
+            // 
+            this.standaloneRadioButton.AutoSize = true;
+            this.standaloneRadioButton.Location = new System.Drawing.Point(18, 46);
+            this.standaloneRadioButton.Name = "standaloneRadioButton";
+            this.standaloneRadioButton.Size = new System.Drawing.Size(143, 17);
+            this.standaloneRadioButton.TabIndex = 1;
+            this.standaloneRadioButton.TabStop = true;
+            this.standaloneRadioButton.Text = "20 char s/n - Standalone";
+            this.standaloneRadioButton.UseVisualStyleBackColor = true;
+            // 
+            // withDBRadioButton
+            // 
+            this.withDBRadioButton.AutoSize = true;
+            this.withDBRadioButton.Location = new System.Drawing.Point(18, 69);
+            this.withDBRadioButton.Name = "withDBRadioButton";
+            this.withDBRadioButton.Size = new System.Drawing.Size(158, 17);
+            this.withDBRadioButton.TabIndex = 2;
+            this.withDBRadioButton.TabStop = true;
+            this.withDBRadioButton.Text = "20 char s/n - With database";
+            this.withDBRadioButton.UseVisualStyleBackColor = true;
+            // 
+            // commonGroupBox
+            // 
+            this.commonGroupBox.Controls.Add(this.labelPrinterConfigButton);
+            this.commonGroupBox.Controls.Add(this.msLabel);
+            this.commonGroupBox.Controls.Add(this.delayTextBox);
+            this.commonGroupBox.Controls.Add(this.delayLabel);
+            this.commonGroupBox.Controls.Add(this.loginRequiredCheckBox);
+            this.commonGroupBox.Controls.Add(this.languageComboBox);
+            this.commonGroupBox.Controls.Add(this.languageLabel);
+            this.commonGroupBox.Location = new System.Drawing.Point(222, 12);
+            this.commonGroupBox.Name = "commonGroupBox";
+            this.commonGroupBox.Size = new System.Drawing.Size(316, 105);
+            this.commonGroupBox.TabIndex = 16;
+            this.commonGroupBox.TabStop = false;
+            // 
+            // labelPrinterConfigButton
+            // 
+            this.labelPrinterConfigButton.Location = new System.Drawing.Point(198, 73);
+            this.labelPrinterConfigButton.Name = "labelPrinterConfigButton";
+            this.labelPrinterConfigButton.Size = new System.Drawing.Size(93, 23);
+            this.labelPrinterConfigButton.TabIndex = 6;
+            this.labelPrinterConfigButton.Text = "TBF label config";
+            this.labelPrinterConfigButton.UseVisualStyleBackColor = true;
+            this.labelPrinterConfigButton.Click += new System.EventHandler(this.labelPrinterConfigButton_Click);
+            // 
+            // msLabel
+            // 
+            this.msLabel.AutoSize = true;
+            this.msLabel.Location = new System.Drawing.Point(262, 51);
+            this.msLabel.Name = "msLabel";
+            this.msLabel.Size = new System.Drawing.Size(20, 13);
+            this.msLabel.TabIndex = 5;
+            this.msLabel.Text = "ms";
+            // 
+            // delayTextBox
+            // 
+            this.delayTextBox.Location = new System.Drawing.Point(198, 46);
+            this.delayTextBox.Name = "delayTextBox";
+            this.delayTextBox.Size = new System.Drawing.Size(52, 20);
+            this.delayTextBox.TabIndex = 4;
+            // 
+            // delayLabel
+            // 
+            this.delayLabel.AutoSize = true;
+            this.delayLabel.Location = new System.Drawing.Point(19, 51);
+            this.delayLabel.Name = "delayLabel";
+            this.delayLabel.Size = new System.Drawing.Size(108, 13);
+            this.delayLabel.TabIndex = 3;
+            this.delayLabel.Text = "Delay between labels";
+            // 
+            // loginRequiredCheckBox
+            // 
+            this.loginRequiredCheckBox.AutoSize = true;
+            this.loginRequiredCheckBox.Location = new System.Drawing.Point(22, 79);
+            this.loginRequiredCheckBox.Name = "loginRequiredCheckBox";
+            this.loginRequiredCheckBox.Size = new System.Drawing.Size(114, 17);
+            this.loginRequiredCheckBox.TabIndex = 2;
+            this.loginRequiredCheckBox.Text = "User login required";
+            this.loginRequiredCheckBox.UseVisualStyleBackColor = true;
+            // 
+            // languageComboBox
+            // 
+            this.languageComboBox.FormattingEnabled = true;
+            this.languageComboBox.Location = new System.Drawing.Point(198, 17);
+            this.languageComboBox.Name = "languageComboBox";
+            this.languageComboBox.Size = new System.Drawing.Size(93, 21);
+            this.languageComboBox.TabIndex = 1;
+            // 
+            // languageLabel
+            // 
+            this.languageLabel.AutoSize = true;
+            this.languageLabel.Location = new System.Drawing.Point(19, 20);
+            this.languageLabel.Name = "languageLabel";
+            this.languageLabel.Size = new System.Drawing.Size(134, 13);
+            this.languageLabel.TabIndex = 0;
+            this.languageLabel.Text = "Language, Sprache, Jazyk";
+            // 
+            // connStrForTracingGroupBox
+            // 
+            this.connStrForTracingGroupBox.Controls.Add(this.tracingDBConnStringTextBox);
+            this.connStrForTracingGroupBox.Location = new System.Drawing.Point(12, 127);
+            this.connStrForTracingGroupBox.Name = "connStrForTracingGroupBox";
+            this.connStrForTracingGroupBox.Size = new System.Drawing.Size(709, 50);
+            this.connStrForTracingGroupBox.TabIndex = 17;
+            this.connStrForTracingGroupBox.TabStop = false;
+            this.connStrForTracingGroupBox.Text = "Connection string for production tracing records";
+            // 
+            // tracingDBConnStringTextBox
+            // 
+            this.tracingDBConnStringTextBox.Location = new System.Drawing.Point(19, 18);
+            this.tracingDBConnStringTextBox.Name = "tracingDBConnStringTextBox";
+            this.tracingDBConnStringTextBox.Size = new System.Drawing.Size(672, 20);
+            this.tracingDBConnStringTextBox.TabIndex = 0;
+            // 
+            // connStrForUsersGroupBox
+            // 
+            this.connStrForUsersGroupBox.Controls.Add(this.usersDBConnStringTextBox);
+            this.connStrForUsersGroupBox.Location = new System.Drawing.Point(12, 186);
+            this.connStrForUsersGroupBox.Name = "connStrForUsersGroupBox";
+            this.connStrForUsersGroupBox.Size = new System.Drawing.Size(709, 50);
+            this.connStrForUsersGroupBox.TabIndex = 18;
+            this.connStrForUsersGroupBox.TabStop = false;
+            this.connStrForUsersGroupBox.Text = "Connection string for central DB of users";
+            // 
+            // usersDBConnStringTextBox
+            // 
+            this.usersDBConnStringTextBox.Location = new System.Drawing.Point(19, 18);
+            this.usersDBConnStringTextBox.Name = "usersDBConnStringTextBox";
+            this.usersDBConnStringTextBox.Size = new System.Drawing.Size(672, 20);
+            this.usersDBConnStringTextBox.TabIndex = 0;
+            // 
+            // saveButton
+            // 
+            this.saveButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.saveButton.Location = new System.Drawing.Point(559, 18);
+            this.saveButton.Name = "saveButton";
+            this.saveButton.Size = new System.Drawing.Size(74, 47);
+            this.saveButton.TabIndex = 19;
+            this.saveButton.Text = "Save";
+            this.saveButton.UseVisualStyleBackColor = true;
+            this.saveButton.Click += new System.EventHandler(this.saveButton_Click);
+            // 
+            // cancelButton
+            // 
+            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.cancelButton.Location = new System.Drawing.Point(649, 18);
+            this.cancelButton.Name = "cancelButton";
+            this.cancelButton.Size = new System.Drawing.Size(71, 47);
+            this.cancelButton.TabIndex = 20;
+            this.cancelButton.Text = "Cancel";
+            this.cancelButton.UseVisualStyleBackColor = true;
+            this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
+            // 
+            // SettingsDlg
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(737, 250);
+            this.ControlBox = false;
+            this.Controls.Add(this.cancelButton);
+            this.Controls.Add(this.saveButton);
+            this.Controls.Add(this.connStrForUsersGroupBox);
+            this.Controls.Add(this.connStrForTracingGroupBox);
+            this.Controls.Add(this.commonGroupBox);
+            this.Controls.Add(this.modeGroupBox);
+            this.Name = "SettingsDlg";
+            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "`";
+            this.Load += new System.EventHandler(this.SettingsDlg_Load);
+            this.modeGroupBox.ResumeLayout(false);
+            this.modeGroupBox.PerformLayout();
+            this.commonGroupBox.ResumeLayout(false);
+            this.commonGroupBox.PerformLayout();
+            this.connStrForTracingGroupBox.ResumeLayout(false);
+            this.connStrForTracingGroupBox.PerformLayout();
+            this.connStrForUsersGroupBox.ResumeLayout(false);
+            this.connStrForUsersGroupBox.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox modeGroupBox;
+        private System.Windows.Forms.RadioButton standaloneRadioButton;
+        private System.Windows.Forms.RadioButton withDBRadioButton;
+        private System.Windows.Forms.GroupBox commonGroupBox;
+        private System.Windows.Forms.ComboBox languageComboBox;
+        private System.Windows.Forms.Label languageLabel;
+        private System.Windows.Forms.Label msLabel;
+        private System.Windows.Forms.TextBox delayTextBox;
+        private System.Windows.Forms.Label delayLabel;
+        private System.Windows.Forms.CheckBox loginRequiredCheckBox;
+        private System.Windows.Forms.GroupBox connStrForTracingGroupBox;
+        private System.Windows.Forms.TextBox tracingDBConnStringTextBox;
+        private System.Windows.Forms.GroupBox connStrForUsersGroupBox;
+        private System.Windows.Forms.TextBox usersDBConnStringTextBox;
+        private System.Windows.Forms.Button saveButton;
+        private System.Windows.Forms.Button cancelButton;
+        private System.Windows.Forms.RadioButton tbfLabelPrinterRadioButton;
+        private System.Windows.Forms.Button labelPrinterConfigButton;
+    }
+}

LabelPrinting/SettingsDlg.cs

@@ -0,0 +1,170 @@
+///
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
+///
+using System;
+using System.Windows.Forms;
+using Common;
+using TBF.Rig.Output.Printers.Label;
+using LabelPrinting.Resources;
+
+namespace LabelPrinting
+{
+    public partial class SettingsDlg : Form
+    {
+        private readonly LocalSettings ls;
+        private readonly Factory factory;
+
+        public SettingsDlg()
+        {
+            InitializeComponent();
+            factory = new Factory();
+        }
+
+        public SettingsDlg(LocalSettings localSettings)
+            : this()
+        {
+            this.ls = localSettings;
+        }
+
+        void Localize()
+        {
+            Text = Strings.Settings;
+            modeGroupBox.Text = Strings.Mode;
+            standaloneRadioButton.Text = "20 char s/n - " + Strings.Standalone;
+            withDBRadioButton.Text = "20 char s/n - " + Strings.With_database;
+            languageLabel.Text = Strings.Language_etc;
+            delayLabel.Text = Strings.Delay_between_labes;
+            loginRequiredCheckBox.Text = Strings.User_login_is_required;
+            saveButton.Text = Strings.Save;
+            cancelButton.Text = Strings.Cancel;
+            connStrForTracingGroupBox.Text = Strings.Connection_string_tracing_DB;
+            connStrForUsersGroupBox.Text = Strings.Connection_string_users_DB;
+        }
+
+        private void SettingsDlg_Load(object sender, EventArgs e)
+        {
+            Localize();
+
+            languageComboBox.Items.Add("CS");
+            languageComboBox.Items.Add("DE");
+            languageComboBox.Items.Add("EN");
+            languageComboBox.Items.Add("SK");
+            languageComboBox.Items.Add("ZH_CN");
+            languageComboBox.Text = ls.Language;
+
+            if (ls == null) return;
+
+            tbfLabelPrinterRadioButton.Checked = (ls.Mode == Mode.TbfLabelPrinter);
+            standaloneRadioButton.Checked = (ls.Mode == Mode.Standalone);
+            withDBRadioButton.Checked = (ls.Mode == Mode.WithDatabase);
+
+            loginRequiredCheckBox.Checked = ls.IsUserLoginRequired;
+
+            delayTextBox.Text = ls.DelayBetweenLabels.ToString();
+
+            tracingDBConnStringTextBox.Text = ls.TracingDBConnString;
+            usersDBConnStringTextBox.Text = ls.UsersDBConnString;
+        }
+
+        /// <summary>
+        /// Verifies UI content
+        /// </summary>
+        /// <returns>None-empty string (message) when invalid</returns>
+        string IsUIContentValid()
+        {
+            if (!languageComboBox.Items.Contains(languageComboBox.Text))
+            {
+                return Strings.Invalid_language;
+            }
+
+            int idummy;
+            if (!int.TryParse(delayTextBox.Text, out idummy) || idummy < 0 || idummy > 5000)
+            {
+                return string.Format("{0} {1}", Strings.Invalid, delayLabel.Text);
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Updates settings, checks for differences compared to previous setrtings
+        /// </summary>
+        /// <returns>true when settings are different</returns>
+        bool UpdateSettings()
+        {
+            if (ls == null) return false;
+
+            bool isDifferent = false;
+
+            Mode mode = tbfLabelPrinterRadioButton.Checked ? Mode.TbfLabelPrinter : standaloneRadioButton.Checked ? Mode.Standalone : Mode.WithDatabase;
+            if (ls.Mode != mode)
+            {
+                ls.Mode = mode;
+                isDifferent = true;
+            }
+
+            if (ls.Language != languageComboBox.Text)
+            {
+                ls.Language = languageComboBox.Text;
+                isDifferent = true;
+            }
+
+            if (ls.IsUserLoginRequired != loginRequiredCheckBox.Checked)
+            {
+                ls.IsUserLoginRequired = loginRequiredCheckBox.Checked;
+                isDifferent = true;
+            }
+
+            if (ls.TracingDBConnString != tracingDBConnStringTextBox.Text)
+            {
+                ls.TracingDBConnString = tracingDBConnStringTextBox.Text;
+                isDifferent = true;
+            }
+
+            if (ls.UsersDBConnString != usersDBConnStringTextBox.Text)
+            {
+                ls.UsersDBConnString = usersDBConnStringTextBox.Text;
+                isDifferent = true;
+            }
+
+            return isDifferent;
+        }
+
+        private void saveButton_Click(object sender, EventArgs e)
+        {
+            string message = IsUIContentValid();
+            if (string.IsNullOrEmpty(message))
+            {
+                UpdateSettings();
+                DialogResult = DialogResult.OK;
+                Close();
+            }
+            else
+            {
+                MessageBox.Show(message);
+            }
+        }
+
+        private void cancelButton_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+
+        private void labelPrinterConfigButton_Click(object sender, EventArgs e)
+        {
+            var cmpntEntity = Config.Entities.Component.CreateFromCfg("Printer", factory.ClassName, string.Empty, 1,
+                                                                      DebugMode.Normal, LogLevel.Off, ls.LabelPrinterCfg);
+
+            var cfgForm = new TBF.UI.Bench.Components.ComponentParametersDlg(this);
+            cfgForm.ComponentCfgCtrl = new PrinterCfgCtrl();
+            cfgForm.ComponentCfgCtrl.Config = factory.CmpntCfgFromCmpntEntity(cmpntEntity);
+            cfgForm.UnlockAfterStart = true;
+
+            if (cfgForm.ShowDialog() == DialogResult.OK)
+            {
+                ls.LabelPrinterCfg = cfgForm.ComponentCfgCtrl.Config.CreateDbEntity().Parameters;
+            }
+        }
+    }
+}

OrderManagement/LocalSettings.cs

@@ -26,6 +26,7 @@ namespace OrderManagement
         public string Language;             /// User interface language used as CultureInfo(..) constructor argument
         public bool IsUserLoginRequired;    /// true = require user login on program start-up
         public bool IsShowPredefinedOrders; /// true = show predefined orders with nr. <= 1000
+        public bool IsShowFinishedOrders;   /// true = show finished orders
         public string TracingDBConnString;  /// Connection string to MySQL database with production tracing records
         public string UsersDBConnString;    /// Connection string to MySQL database with authorized users
         public string[] SapNumberHistory;   /// SAP number history
@@ -45,6 +46,7 @@ namespace OrderManagement
                 Language = "EN";
                 IsUserLoginRequired = false;
                 IsShowPredefinedOrders = false;
+                IsShowFinishedOrders = false;
 #if DEBUG
                 TracingDBConnString = "SERVER=localhost; DATABASE=nanjingshared; UID=root; PASSWORD=kraken; CHARSET=utf8;";
 #else

OrderManagement/OrderManagementDlg.Designer.cs

@@ -32,12 +32,13 @@
             this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.listViewEx1 = new Common.Forms.ListViewEx();
+            this.copyButton = new System.Windows.Forms.Button();
             this.printButton = new System.Windows.Forms.Button();
             this.addButton = new System.Windows.Forms.Button();
             this.editButton = new System.Windows.Forms.Button();
             this.closeButton = new System.Windows.Forms.Button();
             this.deleteButton = new System.Windows.Forms.Button();
-            this.copyButton = new System.Windows.Forms.Button();
+            this.finishButton = new System.Windows.Forms.Button();
             this.menuStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
@@ -75,6 +76,7 @@
             // 
             // splitContainer1.Panel2
             // 
+            this.splitContainer1.Panel2.Controls.Add(this.finishButton);
             this.splitContainer1.Panel2.Controls.Add(this.copyButton);
             this.splitContainer1.Panel2.Controls.Add(this.printButton);
             this.splitContainer1.Panel2.Controls.Add(this.addButton);
@@ -92,6 +94,7 @@
             this.listViewEx1.DoubleClickActivation = false;
             this.listViewEx1.FullRowSelect = true;
             this.listViewEx1.GridLines = true;
+            this.listViewEx1.HideSelection = false;
             this.listViewEx1.Location = new System.Drawing.Point(0, 0);
             this.listViewEx1.Name = "listViewEx1";
             this.listViewEx1.Size = new System.Drawing.Size(1214, 481);
@@ -101,10 +104,21 @@
             this.listViewEx1.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.listViewEx1_ColumnClick);
             this.listViewEx1.DoubleClick += new System.EventHandler(this.listViewEx1_DoubleClick);
             // 
+            // copyButton
+            // 
+            this.copyButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.copyButton.Location = new System.Drawing.Point(23, 223);
+            this.copyButton.Name = "copyButton";
+            this.copyButton.Size = new System.Drawing.Size(85, 40);
+            this.copyButton.TabIndex = 7;
+            this.copyButton.Text = "Copy";
+            this.copyButton.UseVisualStyleBackColor = true;
+            this.copyButton.Click += new System.EventHandler(this.copyButton_Click);
+            // 
             // printButton
             // 
             this.printButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.printButton.Location = new System.Drawing.Point(23, 290);
+            this.printButton.Location = new System.Drawing.Point(23, 335);
             this.printButton.Name = "printButton";
             this.printButton.Size = new System.Drawing.Size(85, 40);
             this.printButton.TabIndex = 6;
@@ -148,7 +162,7 @@
             // deleteButton
             // 
             this.deleteButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.deleteButton.Location = new System.Drawing.Point(23, 223);
+            this.deleteButton.Location = new System.Drawing.Point(23, 268);
             this.deleteButton.Name = "deleteButton";
             this.deleteButton.Size = new System.Drawing.Size(85, 40);
             this.deleteButton.TabIndex = 5;
@@ -156,16 +170,16 @@
             this.deleteButton.UseVisualStyleBackColor = true;
             this.deleteButton.Click += new System.EventHandler(this.deleteButton_Click);
             // 
-            // copyButton
+            // finishButton
             // 
-            this.copyButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.copyButton.Location = new System.Drawing.Point(23, 178);
-            this.copyButton.Name = "copyButton";
-            this.copyButton.Size = new System.Drawing.Size(85, 40);
-            this.copyButton.TabIndex = 7;
-            this.copyButton.Text = "Copy";
-            this.copyButton.UseVisualStyleBackColor = true;
-            this.copyButton.Click += new System.EventHandler(this.copyButton_Click);
+            this.finishButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.finishButton.Location = new System.Drawing.Point(23, 178);
+            this.finishButton.Name = "finishButton";
+            this.finishButton.Size = new System.Drawing.Size(85, 40);
+            this.finishButton.TabIndex = 8;
+            this.finishButton.Text = "Finish";
+            this.finishButton.UseVisualStyleBackColor = true;
+            this.finishButton.Click += new System.EventHandler(this.finishButton_Click);
             // 
             // OrderManagementDlg
             // 
@@ -203,6 +217,7 @@
         private Common.Forms.ListViewEx listViewEx1;
         private System.Windows.Forms.Button printButton;
         private System.Windows.Forms.Button copyButton;
+        private System.Windows.Forms.Button finishButton;
     }
 }
 

OrderManagement/OrderManagementDlg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -10,6 +10,7 @@ using Common;
 using SharedDatabase.Entities;
 using OrderManagement.Resources;
 using Common.Forms;
+using SharedDatabase;
 
 namespace OrderManagement
 {
@@ -92,6 +93,8 @@ namespace OrderManagement
         {
             Order,
             State,
+            Pieces,
+            CurrentPcs,
             Workflow,
             Procedure,
             Variant,
@@ -101,7 +104,6 @@ namespace OrderManagement
             ModuleParam,
             LaserMarking,
             Packing,
-            Pieces,
             SNPrefix,
             SNFirst,
             SNDigitsCount,
@@ -115,8 +117,10 @@ namespace OrderManagement
 
         void InitializeColumns(ListView lv)
         {
-            lv.Columns.Add(new ColumnHeader { Text = Strings.Order,                           Width = 65 });
-            lv.Columns.Add(new ColumnHeader { Text = Strings.State,                           Width = 65 });
+            lv.Columns.Add(new ColumnHeader { Text = Strings.Order,                           Width = 70 });
+            lv.Columns.Add(new ColumnHeader { Text = Strings.State,                           Width = 60 });
+            lv.Columns.Add(new ColumnHeader { Text = "Target",                                Width = 50 });
+            lv.Columns.Add(new ColumnHeader { Text = "Produced",                              Width = 60 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.Workflow,                        Width = 100 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.Test_procedure,                  Width = 200 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.Variant_code,                    Width = 150 });
@@ -126,7 +130,6 @@ namespace OrderManagement
             lv.Columns.Add(new ColumnHeader { Text = Strings.Module_parameter,                Width = 100 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.Laser_marking,                   Width = 100 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.Packing,                         Width = 100 });
-            lv.Columns.Add(new ColumnHeader { Text = Strings.Pieces_count,                    Width = 80 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.SN + " " + Strings.prefix,       Width = 80 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.SN + " " + Strings.first,        Width = 80 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.SN + " " + Strings.digits_count, Width = 80 });
@@ -141,6 +144,8 @@ namespace OrderManagement
         {
             ListViewItem lvi = new ListViewItem(o.POName);
             lvi.SubItems.Add(((OrderState)o.POState).ToString());
+            lvi.SubItems.Add(o.PiecesCount.ToString());
+            lvi.SubItems.Add(o.CurrentPcsCount.ToString());
             lvi.SubItems.Add(o.Workflow);
             lvi.SubItems.Add(o.TestProcedure);
             lvi.SubItems.Add(o.VariantCode);
@@ -150,7 +155,6 @@ namespace OrderManagement
             lvi.SubItems.Add(o.ModuleParam);
             lvi.SubItems.Add(o.LaserMarking);
             lvi.SubItems.Add(o.Packing);
-            lvi.SubItems.Add(o.PiecesCount.ToString());
             lvi.SubItems.Add(o.SNPrefix);
             lvi.SubItems.Add(o.SNFirst.ToString(string.Format("D{0}", o.SNDigitsCount)));
             lvi.SubItems.Add(o.SNDigitsCount.ToString());
@@ -168,6 +172,8 @@ namespace OrderManagement
             int i = 0;
             lvi.SubItems[i++].Text = o.POName;
             lvi.SubItems[i++].Text = ((OrderState)o.POState).ToString();
+            lvi.SubItems[i++].Text = o.PiecesCount.ToString();
+            lvi.SubItems[i++].Text = o.CurrentPcsCount.ToString();
             lvi.SubItems[i++].Text = o.Workflow;
             lvi.SubItems[i++].Text = o.TestProcedure;
             lvi.SubItems[i++].Text = o.VariantCode;
@@ -177,7 +183,6 @@ namespace OrderManagement
             lvi.SubItems[i++].Text = o.ModuleParam;
             lvi.SubItems[i++].Text = o.LaserMarking;
             lvi.SubItems[i++].Text = o.Packing;
-            lvi.SubItems[i++].Text = o.PiecesCount.ToString();
             lvi.SubItems[i++].Text = o.SNPrefix;
             lvi.SubItems[i++].Text = o.SNFirst.ToString(string.Format("D{0}", o.SNDigitsCount));
             lvi.SubItems[i++].Text = o.SNDigitsCount.ToString();
@@ -288,6 +293,46 @@ namespace OrderManagement
             }
         }
 
+        private void finishButton_Click(object sender, EventArgs e)
+        {
+            if (listViewEx1.SelectedItems.Count != 1 || !(listViewEx1.SelectedItems[0].Tag is OrderInfo)) return;
+
+            OrderInfo order = listViewEx1.SelectedItems[0].Tag as OrderInfo;
+            if (order.POState == (sbyte)OrderState.Active && order.CurrentPcsCount >= order.PiecesCount)
+            {
+                ISession session = null;
+                try
+                {
+                    session = sessionFactory.OpenSession();
+
+                    var selectedOrders = session.QueryOver<OrderInfo>()
+                                                .Where(x => x.Id == order.Id)
+                                                .List();
+
+                    if (selectedOrders.Count == 1)
+                    {
+                        selectedOrders[0].POState = (sbyte)OrderState.Finished;
+                        session.SaveOrUpdate(selectedOrders[0]);
+                        session.Flush();
+                        order.POState = (sbyte)OrderState.Finished;
+                        UpdateRow(listViewEx1.SelectedItems[0], order);
+                    }                      
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show("Changing production order state failed: {0}", ex.Message);
+                }
+                finally
+                {
+                    if (session != null && session.IsOpen) session.Close();
+                }
+            }
+            else
+            {
+                MessageBox.Show(Strings.You_can_only_finish_completed_production_orders);
+            }
+        }
+
         private void copyButton_Click(object sender, EventArgs e)
         {
             if (listViewEx1.SelectedItems.Count != 1 || !(listViewEx1.SelectedItems[0].Tag is OrderInfo)) return;

OrderManagement/Program.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2021-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -14,6 +14,7 @@ using Common;
 using SharedDatabase;
 using SharedDatabase.Entities;
 using OrderManagement.Resources;
+using System.Linq;
 
 namespace OrderManagement
 {
@@ -186,7 +187,16 @@ namespace OrderManagement
 
                     ISession session = sessionFactory.OpenSession();
 
-                    listOfOrders = session.QueryOver<OrderInfo>().List();
+                    if (LocalSettings.IsShowFinishedOrders)
+                    {
+                        listOfOrders = session.QueryOver<OrderInfo>().List();
+                    }
+                    else
+                    {
+                        listOfOrders = session.QueryOver<OrderInfo>()
+                                              .Where(x => x.POState != (sbyte)OrderState.Finished)
+                                              .List();
+                    }
 
                     listOfWorkflows = session.QueryOver<Process>()
                                              .Where(x => x.ReleaseStatus != ReleaseStatus.Deactivated)

OrderManagement/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("OrderManagement")]
-[assembly: AssemblyCopyright("Copyright ©  2021-2022")]
+[assembly: AssemblyCopyright("Copyright ©  2021-2023")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.13.0")]
-[assembly: AssemblyFileVersion("3.0.13.0")]
+[assembly: AssemblyVersion("3.0.14.0")]
+[assembly: AssemblyFileVersion("3.0.14.0")]

OrderManagement/Resources/Strings.Designer.cs

@@ -19,7 +19,7 @@ namespace OrderManagement.Resources {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Strings {
@@ -637,7 +637,7 @@ namespace OrderManagement.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to You can only delete &apos;New&apos; porduction orders.
+        ///   Looks up a localized string similar to You can only delete &apos;New&apos; production orders.
         /// </summary>
         internal static string You_can_only_delete_New_porduction_orders {
             get {
@@ -646,12 +646,21 @@ namespace OrderManagement.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to You can only edit &apos;New&apos; porduction orders.
+        ///   Looks up a localized string similar to You can only edit &apos;New&apos; production orders.
         /// </summary>
         internal static string You_can_only_edit_New_porduction_orders {
             get {
                 return ResourceManager.GetString("You_can_only_edit_New_porduction_orders", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to You can only finish completed production orders.
+        /// </summary>
+        internal static string You_can_only_finish_completed_production_orders {
+            get {
+                return ResourceManager.GetString("You_can_only_finish_completed_production_orders", resourceCulture);
+            }
+        }
     }
 }

OrderManagement/Resources/Strings.resx

@@ -223,10 +223,10 @@
     <value>S/N</value>
   </data>
   <data name="You_can_only_edit_New_porduction_orders" xml:space="preserve">
-    <value>You can only edit 'New' porduction orders</value>
+    <value>You can only edit 'New' production orders</value>
   </data>
   <data name="You_can_only_delete_New_porduction_orders" xml:space="preserve">
-    <value>You can only delete 'New' porduction orders</value>
+    <value>You can only delete 'New' production orders</value>
   </data>
   <data name="Laser_marking" xml:space="preserve">
     <value>Laser marking</value>
@@ -315,4 +315,7 @@
   <data name="Print" xml:space="preserve">
     <value>Print</value>
   </data>
+  <data name="You_can_only_finish_completed_production_orders" xml:space="preserve">
+    <value>You can only finish completed production orders</value>
+  </data>
 </root>

OrderManagement/SettingsDlg.Designer.cs

@@ -29,6 +29,7 @@
         private void InitializeComponent()
         {
             this.commonGroupBox = new System.Windows.Forms.GroupBox();
+            this.showPredefinedOrdersCheckBox = new System.Windows.Forms.CheckBox();
             this.loginRequiredCheckBox = new System.Windows.Forms.CheckBox();
             this.languageComboBox = new System.Windows.Forms.ComboBox();
             this.languageLabel = new System.Windows.Forms.Label();
@@ -38,7 +39,7 @@
             this.usersDBConnStringTextBox = new System.Windows.Forms.TextBox();
             this.saveButton = new System.Windows.Forms.Button();
             this.cancelButton = new System.Windows.Forms.Button();
-            this.showPredefinedOrdersCheckBox = new System.Windows.Forms.CheckBox();
+            this.showFinishedOrdersCheckBox = new System.Windows.Forms.CheckBox();
             this.commonGroupBox.SuspendLayout();
             this.connStrForTracingGroupBox.SuspendLayout();
             this.connStrForUsersGroupBox.SuspendLayout();
@@ -46,6 +47,7 @@
             // 
             // commonGroupBox
             // 
+            this.commonGroupBox.Controls.Add(this.showFinishedOrdersCheckBox);
             this.commonGroupBox.Controls.Add(this.showPredefinedOrdersCheckBox);
             this.commonGroupBox.Controls.Add(this.loginRequiredCheckBox);
             this.commonGroupBox.Controls.Add(this.languageComboBox);
@@ -56,10 +58,20 @@
             this.commonGroupBox.TabIndex = 16;
             this.commonGroupBox.TabStop = false;
             // 
+            // showPredefinedOrdersCheckBox
+            // 
+            this.showPredefinedOrdersCheckBox.AutoSize = true;
+            this.showPredefinedOrdersCheckBox.Location = new System.Drawing.Point(22, 67);
+            this.showPredefinedOrdersCheckBox.Name = "showPredefinedOrdersCheckBox";
+            this.showPredefinedOrdersCheckBox.Size = new System.Drawing.Size(138, 17);
+            this.showPredefinedOrdersCheckBox.TabIndex = 3;
+            this.showPredefinedOrdersCheckBox.Text = "Show predefined orders";
+            this.showPredefinedOrdersCheckBox.UseVisualStyleBackColor = true;
+            // 
             // loginRequiredCheckBox
             // 
             this.loginRequiredCheckBox.AutoSize = true;
-            this.loginRequiredCheckBox.Location = new System.Drawing.Point(22, 55);
+            this.loginRequiredCheckBox.Location = new System.Drawing.Point(22, 45);
             this.loginRequiredCheckBox.Name = "loginRequiredCheckBox";
             this.loginRequiredCheckBox.Size = new System.Drawing.Size(114, 17);
             this.loginRequiredCheckBox.TabIndex = 2;
@@ -139,15 +151,15 @@
             this.cancelButton.UseVisualStyleBackColor = true;
             this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
             // 
-            // showPredefinedOrdersCheckBox
+            // showFinishedOrdersCheckBox
             // 
-            this.showPredefinedOrdersCheckBox.AutoSize = true;
-            this.showPredefinedOrdersCheckBox.Location = new System.Drawing.Point(22, 82);
-            this.showPredefinedOrdersCheckBox.Name = "showPredefinedOrdersCheckBox";
-            this.showPredefinedOrdersCheckBox.Size = new System.Drawing.Size(138, 17);
-            this.showPredefinedOrdersCheckBox.TabIndex = 3;
-            this.showPredefinedOrdersCheckBox.Text = "Show predefined orders";
-            this.showPredefinedOrdersCheckBox.UseVisualStyleBackColor = true;
+            this.showFinishedOrdersCheckBox.AutoSize = true;
+            this.showFinishedOrdersCheckBox.Location = new System.Drawing.Point(22, 89);
+            this.showFinishedOrdersCheckBox.Name = "showFinishedOrdersCheckBox";
+            this.showFinishedOrdersCheckBox.Size = new System.Drawing.Size(124, 17);
+            this.showFinishedOrdersCheckBox.TabIndex = 4;
+            this.showFinishedOrdersCheckBox.Text = "Show finished orders";
+            this.showFinishedOrdersCheckBox.UseVisualStyleBackColor = true;
             // 
             // SettingsDlg
             // 
@@ -188,5 +200,6 @@
         private System.Windows.Forms.Button saveButton;
         private System.Windows.Forms.Button cancelButton;
         private System.Windows.Forms.CheckBox showPredefinedOrdersCheckBox;
+        private System.Windows.Forms.CheckBox showFinishedOrdersCheckBox;
     }
 }

OrderManagement/SettingsDlg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Windows.Forms;
@@ -48,6 +48,7 @@ namespace OrderManagement
 
             loginRequiredCheckBox.Checked = ls.IsUserLoginRequired;
             showPredefinedOrdersCheckBox.Checked = ls.IsShowPredefinedOrders;
+            showFinishedOrdersCheckBox.Checked = ls.IsShowFinishedOrders;
 
             tracingDBConnStringTextBox.Text = ls.TracingDBConnString;
             usersDBConnStringTextBox.Text = ls.UsersDBConnString;
@@ -95,6 +96,12 @@ namespace OrderManagement
                 isDifferent = true;
             }
 
+            if (ls.IsShowFinishedOrders != showFinishedOrdersCheckBox.Checked)
+            {
+                ls.IsShowFinishedOrders = showFinishedOrdersCheckBox.Checked;
+                isDifferent = true;
+            }
+
             if (ls.TracingDBConnString != tracingDBConnStringTextBox.Text)
             {
                 ls.TracingDBConnString = tracingDBConnStringTextBox.Text;

ProductionTracing/ProductionTracingWnd.cs

@@ -23,6 +23,8 @@ namespace ProductionTracing
     {
         const string OpenFileDlg_SaveFileDlg_Filter = "{0} (*.que)|*.que|{1} (*.*)|*.*";
 
+        ModelessForm modelessForm;
+
         string[] args;
         FiltersConfig filtersConfig;        /// Serializable configuration of filters and displayed results
         QueryResults currentQR;
@@ -190,8 +192,9 @@ namespace ProductionTracing
         private void executeQueryBtn_Click(object sender, EventArgs e)
         {
             UpdateAndSaveHistory();
-            
-            Thread thread = new Thread(() => Application.Run(new Common.Forms.ModelessForm(Strings.searching)));
+
+            modelessForm = new ModelessForm(Strings.searching);
+            Thread thread = new Thread(() => Application.Run(modelessForm));
             thread.CurrentCulture = CultureInfo.CurrentCulture;
             thread.CurrentUICulture = CultureInfo.CurrentUICulture;
             thread.Start();
@@ -220,7 +223,7 @@ namespace ProductionTracing
             catch (Exception exc)
             {
                 if (session != null && session.IsOpen) session.Close();
-                Common.Forms.ModelessForm.CloseForm();
+                if (modelessForm != null) modelessForm.CloseForm();
                 MessageBox.Show(exc.Message,
                                 Strings.Error,
                                 MessageBoxButtons.OK,
@@ -233,7 +236,7 @@ namespace ProductionTracing
             tabControl.TabPages.Add(newTabPage);
             tabControl.SelectTab(newTabPage);
 
-            Common.Forms.ModelessForm.CloseForm();
+            if (modelessForm != null) modelessForm.CloseForm();
         }
 
         /// <summary>

Results/Entities/Batch.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -38,7 +38,8 @@ namespace Results.Entities
         public virtual int Counter9 { get; set; }
         public virtual int Counter10 { get; set; }
         public virtual DateTime StartTime { get; set; }
-		public virtual DateTime EndTime { get; set; }
+        public virtual DateTime EndTime { get; set; }
+        public virtual DateTime SaveTime { get; set; }
         public virtual bool Dirty { get; set; }
         public virtual bool RsltsSent { get; set; }
 		public virtual bool RsltsPrinted { get; set; }
@@ -156,6 +157,7 @@ namespace Results.Entities
             Counter10            = oriBatch.Counter10;
             StartTime            = oriBatch.StartTime;
             EndTime              = oriBatch.EndTime;
+            SaveTime             = oriBatch.SaveTime;
             Dirty                = oriBatch.Dirty;
             RsltsSent            = oriBatch.RsltsSent;
             RsltsPrinted         = oriBatch.RsltsPrinted;
@@ -322,7 +324,8 @@ namespace Results.Entities
 
 		public override string ToString()
 		{
-			return string.Format("Batch #{0}, Start:{1}, End:{2}, Procedure:{3}", BatchNr, StartTime, EndTime, ProcedureName);
+            return string.Format("Batch {0} ({1}s) Start {2}, End {3}, Proc={4}",
+                 BatchNr, (EndTime - StartTime).TotalSeconds, StartTime, EndTime, ProcedureName);
 		}
 
 		public virtual string ToString(int i)
@@ -363,6 +366,7 @@ namespace Results.Entities
             writer.Write(Counter10);
             writer.Write(StartTime.ToString());
             writer.Write(EndTime.ToString());
+            writer.Write(SaveTime.ToString());
             writer.Write(Dirty);
             writer.Write(RsltsSent);
             writer.Write(RsltsPrinted);
@@ -429,6 +433,7 @@ namespace Results.Entities
             Counter10 = reader.ReadInt32();
             StartTime = DateTime.Parse(reader.ReadString());
             EndTime = DateTime.Parse(reader.ReadString());
+            SaveTime = DateTime.Parse(reader.ReadString());
             Dirty = reader.ReadBoolean();
             RsltsSent = reader.ReadBoolean();
             RsltsPrinted = reader.ReadBoolean();

Results/Entities/MeterTestRslt.cs

@@ -82,7 +82,7 @@ namespace Results.Entities
 		public virtual double QRise()		  { return WaterMeter.QRise; }			/// [m3/h]
 		public virtual double QFall()		  { return WaterMeter.QFall; }			/// [m3/h]
 
-		public virtual bool    Evaluate()     { return TestData().Evaluate; }
+		public virtual bool   Evaluate()      { return TestData().Evaluate; }
 		public virtual Publish Publish()      { return (Publish)TestData().Publish; }
 
         public virtual WaterMeterData WaterMeterData()   { return WaterMeter.WaterMeterData; }

Results/Entities/TestData.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2016-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -18,8 +18,9 @@ namespace Results.Entities
         public virtual string Name					{ get; set; }
 		public virtual int    Repeats				{ get; set; }
         public virtual double Qtg                   { get; set; }	/// [m3/h] flow range low limit
-        public virtual double Qfrom                 { get; set; }	/// [m3/h] flow range low limit
-		public virtual double Qto					{ get; set; }	/// [m3/h] flow range high limit
+        public virtual double Qfrom                 { get; set; }	/// [m3/h] or [%] flow range low limit
+		public virtual double Qto					{ get; set; }	/// [m3/h] or [%] flow range high limit
+        public virtual bool   IsFromToInPct         { get; set; }   /// true: Qfrom and Qto are in % of Qtg, false: Qfrom and Qto are in [m3/h]
 		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; }
@@ -50,6 +51,7 @@ namespace Results.Entities
             Qtg            = test.Qtg;
             Qfrom          = test.Qfrom;
 			Qto            = test.Qto;
+            IsFromToInPct  = test.IsFromToInPct;
 			TargetVolume   = test.Volume;
 			TargetTime     = test.TestTime;
 			Method         = test.Method;
@@ -73,6 +75,7 @@ namespace Results.Entities
             Qtg             = oriTestData.Qtg;
             Qfrom           = oriTestData.Qfrom;
             Qto				= oriTestData.Qto;
+            IsFromToInPct   = oriTestData.IsFromToInPct;
             TargetVolume	= oriTestData.TargetVolume;
             TargetTime		= oriTestData.TargetTime;
             Method			= oriTestData.Method;
@@ -99,6 +102,7 @@ namespace Results.Entities
             if (Qtg != td.Qtg) return false;
             if (Qfrom != td.Qfrom) return false;
 			if (Qto != td.Qto) return false;
+            if (IsFromToInPct != td.IsFromToInPct) return false;
 			if (TargetVolume != td.TargetVolume) return false;
 			if (TargetTime != td.TargetTime) return false;
 			if (Method != td.Method) return false;
@@ -141,6 +145,7 @@ namespace Results.Entities
             writer.Write(Qtg);
             writer.Write(Qfrom);
             writer.Write(Qto);
+            writer.Write(IsFromToInPct);
             writer.Write(TargetVolume);
             writer.Write(TargetTime);
             writer.Write((Method != null) ? Method : string.Empty);
@@ -162,6 +167,7 @@ namespace Results.Entities
             Qtg = reader.ReadDouble();
             Qfrom = reader.ReadDouble();
             Qto = reader.ReadDouble();
+            IsFromToInPct = reader.ReadBoolean();
             TargetVolume = reader.ReadDouble();
             TargetTime = reader.ReadDouble();
             Method = reader.ReadString();

Results/Entities/TestRslt.cs

@@ -1,9 +1,8 @@
 ///
-/// Copyright (c) 2015-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.IO;
 using Common;
 
@@ -44,18 +43,18 @@ namespace Results.Entities
 		public virtual double   DensityLine         { get; set; }	/// [kg/m3]
 		public virtual double   DensityDiv          { get; set; }	/// [kg/m3]
 		public virtual double   MassOfEvapWater     { get; set; }   /// [kg]
-		public virtual double   SpareDbl            { get; set; }
+		public virtual double   Qdetected           { get; set; }
 		public virtual double   Flow                { get; set; }	/// [m3/h] calculated from conventional true value
 		public virtual double   VolumeCTV           { get; set; }   /// [l]    Volume conventional true value
 		public virtual double   VolumeMaster        { get; set; }   /// [l]    Volume from the master flow meter
 		public virtual double   ErrorMaster         { get; set; }	/// [%]    Error of the master flow meter
 
-        public virtual float    DiverterStart       { get; set; }   /// [s]    Diverter switch time when test starts
+        public virtual float    DiverterStart       { get; set; }   /// [s]    Diverter switch time or a start/stop valve open time when the test starts
         public virtual float    DivStart10          { get; set; }   /// [s]    Diverter switch time when test starts at level 10 (e.g. 10%) (not mapped to DB)
         public virtual float    DivStart50          { get; set; }   /// [s]    Diverter switch time when test starts at level 50 (e.g. 50%) (not mapped to DB)
         public virtual float    DivStart90          { get; set; }   /// [s]    Diverter switch time when test starts at level 90 (e.g. 90%) (not mapped to DB)
         
-        public virtual float    DiverterEnd         { get; set; }   /// [s]    Diverter switch time when test ends
+        public virtual float    DiverterEnd         { get; set; }   /// [s]    Diverter switch time or a start/stop valve close time when the test ends
         public virtual float    DivEnd90            { get; set; }   /// [s]    Diverter switch time when test starts at level 90 (e.g. 90%) (not mapped to DB)
         public virtual float    DivEnd50            { get; set; }   /// [s]    Diverter switch time when test starts at level 50 (e.g. 50%) (not mapped to DB)
         public virtual float    DivEnd10            { get; set; }   /// [s]    Diverter switch time when test starts at level 10 (e.g. 10%) (not mapped to DB)
@@ -147,22 +146,38 @@ namespace Results.Entities
         public virtual int      Counter5            { get; set; }
 
 		/// Wrappers
-		public virtual string Name()		 { return Utils.GetTestName(TestData.Name, TestData.Repeats, RepetitionNr); }
+		public virtual string Name()		 { return Common.Utils.GetTestName(TestData.Name, TestData.Repeats, RepetitionNr); }
+        public virtual string Key()          { return string.Format("{0}~{1}~{2}~{3}", TestData.Name, Part, TestData.Repeats, RepetitionNr); }      /// Unique key
         public virtual int Repeats()         { return TestData.Repeats; }
-		public virtual double Qfrom()		 { return TestData.Qfrom; }
-		public virtual double Qto()			 { return TestData.Qto; }
-		public virtual double TargetVolume() { return TestData.TargetVolume; }
+        public virtual double Qfrom()
+        {
+            return (TestData == null)     ? 0
+                : !TestData.IsFromToInPct ? TestData.Qfrom
+                : (TestData.Qtg >= 0)     ? TestData.Qfrom * TestData.Qtg / 100
+                                          : TestData.Qfrom * Qdetected / 100;
+        }
+        public virtual double Qto()
+        {
+            return (TestData == null)     ? 0
+                : !TestData.IsFromToInPct ? TestData.Qto
+                : (TestData.Qtg >= 0)     ? TestData.Qto * TestData.Qtg / 100
+                                          : TestData.Qto * Qdetected / 100;
+        }
+        public virtual double TargetVolume() { return TestData.TargetVolume; }
 		public virtual double TargetTime()	 { return TestData.TargetTime; }
 		public virtual string Method()		 { return TestData.Method; }
         public virtual string RefFlowmeter() { return (Components != null && Components.Flowmeter != null) ? Components.Flowmeter : string.Empty; }
         public virtual string Scale()        { return (Components != null && Components.Scale     != null) ? Components.Scale     : string.Empty; }
         public virtual string Diverter()     { return (Components != null && Components.Diverter  != null) ? Components.Diverter  : string.Empty; }
         public virtual string RegValve()     { return (Components != null && Components.RegValve  != null) ? Components.RegValve  : string.Empty; }
-        public virtual bool IsRelErrTest()   { return (MethodClass != null) ? (MethodClass.Contains("FixedStart") || MethodClass.Contains("FlyingStart") || MethodClass.Contains("CombinedWithDetection") || MethodClass.Contains("DiverterTest") || MethodClass.Contains("ManualEntry")) : true; }
+        public virtual bool IsRelErrTest()   { return (MethodClass != null) ? (MethodClass.Contains("StandingStart") || MethodClass.Contains("FlyingStart") || MethodClass.Contains("CombinedWithDetection") || MethodClass.Contains("DiverterTest") || MethodClass.Contains("ManualEntry")) : true; }
         public virtual bool IsPMaxTest()     { return (MethodClass != null) ? (MethodClass.Contains("PMaxTest") || MethodClass.Contains("LeakTest") || TestData.Method.ToLower().Contains("pmax")) : true; }
-        public virtual bool IsStartStop()    { return (MethodClass != null) ? MethodClass.Contains("FixedStart") : true; }
-        public virtual bool IsDiverter()     { return (MethodClass != null) ? ((MethodClass.Contains("FlyingStart") && MethodClass.Contains("MassColl")) || MethodClass.Contains("DiverterTest")) : true; }
-        public virtual bool IsVolumeMethod() { return (MethodClass != null) ? (MethodClass.Contains("TestMethods.FixedStart.") || MethodClass.Contains("TestMethods.FlyingStart.")) : false; }
+        public virtual bool IsStartStop()    { return (MethodClass != null) ? MethodClass.Contains("StandingStart") : true; }
+        public virtual bool IsDiverter()     { return (MethodClass != null) ? ((MethodClass.Contains("FlyingStart") && MethodClass.Contains("MassColl")) ||
+                                                                                MethodClass.Contains("CombinedWithDetection") ||
+                                                                                MethodClass.Contains("DiverterTest"))
+                                                                            : true; }
+        public virtual bool IsVolumeMethod() { return (MethodClass != null) ? (MethodClass.Contains("TestMethods.StandingStart.") || MethodClass.Contains("TestMethods.FlyingStart.")) : false; }
 
         public virtual string MethodElde()
         {
@@ -170,10 +185,11 @@ namespace Results.Entities
             else if (MethodClass.Contains("TestMethods.FlyingStartMassCollection.")) return "MS";
             else if (MethodClass.Contains("TestMethods.FlyingStartMassCollectionProlonged.")) return "MS";
             else if (MethodClass.Contains("TestMethods.FlyingStartMassCollectionComparative.")) return "MS";
+            else if (MethodClass.Contains("TestMethods.CombinedWithDetection.")) return "MS";
             else if (MethodClass.Contains("TestMethods.FlyingStart.")) return "VS";
-            else if (MethodClass.Contains("TestMethods.FixedStartMassCollection.")) return "MP";
-            else if (MethodClass.Contains("TestMethods.FixedStartTankCollection.")) return "VP";
-            else if (MethodClass.Contains("TestMethods.FixedStart.")) return "VP";
+            else if (MethodClass.Contains("TestMethods.StandingStartMassCollection.")) return "MP";
+            else if (MethodClass.Contains("TestMethods.StandingStartTankCollection.")) return "VP";
+            else if (MethodClass.Contains("TestMethods.StandingStart.")) return "VP";
             else return string.Empty;
         }
 
@@ -229,7 +245,7 @@ namespace Results.Entities
         public virtual float TempLimLo()        { return TestData.TempLimLo; }
         public virtual float TempLimHi()        { return TestData.TempLimHi; }
         public virtual bool Evaluate()          { return TestData.Evaluate; }
-		public virtual Common.Publish Publish() { return (Publish)TestData.Publish; }
+		public virtual Publish Publish()        { return (Publish)TestData.Publish; }
 
 
 		public TestRslt()
@@ -277,8 +293,8 @@ namespace Results.Entities
 		    DensityLine         = src.DensityLine;
 		    DensityDiv          = src.DensityDiv;
 		    MassOfEvapWater     = src.MassOfEvapWater;
-		    SpareDbl            = src.SpareDbl;
-		    Flow          = src.Flow;
+		    Qdetected            = src.Qdetected;
+		    Flow                = src.Flow;
 		    VolumeCTV           = src.VolumeCTV;
 		    VolumeMaster        = src.VolumeMaster;
 		    ErrorMaster         = src.ErrorMaster;
@@ -415,7 +431,7 @@ namespace Results.Entities
             return string.Format("TestRslt: Part={0} RepetitionNr={1} TestDone={2} Remark={3} StartTime={4} EndTime={5} FlowSetTime={6} TestTime={7} PulsesMaster={8} ConstMaster={9} MassStartRaw={10} MassStart={11} MassEndRaw={12} MassEnd={13} DensityIn={14} DensityOut={15} DensityDiv={16} MassOfEvapWaater={17} FlowMass={18} FlowVolume={19} VolumeCTV={20} VolumeMaster={21} ErrorMaster={22} DiverterStart={85} DiverterEnd={86} ErrorFlags={23} InfoFlags={24} AmbTempMean={25} AmbTempStart={26} AmbTempEnd={27} AmbTempMin={28} AmbTempMax={29} AmbPressMean={30} AmbPressStart={31} AmbPressEnd={32} AmbPressMin={33}  AmbPressMax={34} AmbHumiMean={35} AmbHumiStart={36} AmbHumiEnd={37} AmbHumiMin={38} AmbHumiMax={39} PressUpMean={40} PressUpStart={41} PressUpEnd={42} PressUpMin={43} PressUpMax={44} PressDownMean={45} PressDownStart={46} PressDownEnd={47} PressDownMin={48} PressDownMax={49} PressDeltaMean={50} PressDeltaStart={51} PressDeltaEnd={52} PressDeltaMin={53} PressDeltaMax={54} TempUpMean={55} TempUpStart={56} TempUpEnd={57} TempUpMin={58} TempUpMax={59} TempDownMean={60} TempDownStart={61} TempDownEnd={62} TempDownMin={63} TempDownMax={64} TempDivMean={65} TempDivStart={66} TempDivEnd={67} TempDivMin={68} TempDivMax={69} FlowMean={70} FlowStart={71} FlowEnd={72} FlowMin={73} FlowMax={74} Custom1={75} Custom2={76} Custom3={77} Custom4={78} Custom5={79} Custom6={80} Custom7={81} Custom8={82} Custom9={83} Custom10={84}", 
 								Part, RepetitionNr, TestDone, Remark, StartTime, EndTime, FlowSetTime, TestTime,
 								PulsesMaster, ConstMaster, MassStartRaw, MassStart, MassEndRaw, MassEnd,
-								DensityIn, DensityLine, DensityDiv, MassOfEvapWater, SpareDbl, Flow,
+								DensityIn, DensityLine, DensityDiv, MassOfEvapWater, Qdetected, Flow,
 								VolumeCTV, VolumeMaster, ErrorMaster, ErrorFlags, InfoFlags, 
 								AmbTempMean, AmbTempStart, AmbTempEnd, AmbTempMin, AmbTempMax,
 								AmbPressMean, AmbPressStart, AmbPressEnd, AmbPressMin, AmbPressMax,
@@ -484,7 +500,7 @@ namespace Results.Entities
             writer.Write(DensityLine);
             writer.Write(DensityDiv);
             writer.Write(MassOfEvapWater);
-            writer.Write(SpareDbl);
+            writer.Write(Qdetected);
             writer.Write(Flow);
             writer.Write(VolumeCTV);
             writer.Write(VolumeMaster);
@@ -625,7 +641,7 @@ namespace Results.Entities
             DensityLine = reader.ReadDouble();
             DensityDiv = reader.ReadDouble();
             MassOfEvapWater = reader.ReadDouble();
-            SpareDbl = reader.ReadDouble();
+            Qdetected = reader.ReadDouble();
             Flow = reader.ReadDouble();
             VolumeCTV = reader.ReadDouble();
             VolumeMaster = reader.ReadDouble();

Results/Entities/WaterMeter.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -109,6 +109,7 @@ namespace Results.Entities
         ///
         public virtual string Workflow          { get; set; }	/// Not mapped to DB !!!    Production tracing workflow name
         public virtual bool   LastRecordIsNok   { get; set; }	/// Not mapped to DB !!!    Previous record verification result
+        public virtual bool   PrintLabel        { get; set; }	/// Not mapped to DB !!!
 
         public virtual WaterMeterData WaterMeterData { get; set; }
 		public virtual Batch Batch { get; set; }
@@ -117,15 +118,23 @@ namespace Results.Entities
 		///
 		/// Wrappers
 		///
-		public virtual string ProductName()		  { return WaterMeterData.ProductName; }
+        public virtual string GetEndStateAux() { return Compound() ? EndStateAux : string.Empty; }
+        public virtual void   SetEndStateAux(string s) { if (Compound()) EndStateAux = s; }
+
+        public virtual string GetStartState() { return Compound() ? string.Empty : EndStateAux; }
+        public virtual void   SetStartState(string s) { if (!Compound()) EndStateAux = s; }
+
+        public virtual string ProductName()       { return WaterMeterData.ProductName; }
 		public virtual string Producer()		  { return WaterMeterData.Producer; }
 		public virtual string MetrologicalClass() { return WaterMeterData.MetrologicalClass; }
 		public virtual string ApprovalInfo()	  { return WaterMeterData.ApprovalInfo; }
-		public virtual bool   NewQnames()         { return WaterMeterData.NewQnames; }
+		public virtual FlowNames Qnames()         { return (FlowNames)WaterMeterData.Qnames; }
 		public virtual double Q4_Qmax()			  { return WaterMeterData.Q4_Qmax; }
 		public virtual double Q3_Qn()			  { return WaterMeterData.Q3_Qn; }
 		public virtual double Q2_Qt()			  { return WaterMeterData.Q2_Qt; }
 		public virtual double Q1_Qmin()			  { return WaterMeterData.Q1_Qmin; }
+        public virtual double ErrLimHiQ()         { return WaterMeterData.ErrLimHiQ; }
+        public virtual double ErrLimLoQ()         { return WaterMeterData.ErrLimLoQ; }
 
         public virtual bool   Compound()		  { return WaterMeterData.Compound; }
         public virtual bool   HeatMeter()		  { return WaterMeterData.HeatMeter; }
@@ -459,6 +468,7 @@ namespace Results.Entities
 #if IPERL
             FWVersion = string.Empty;
 #endif
+            PrintLabel = true;
         }
 
 
@@ -521,6 +531,7 @@ namespace Results.Entities
 
             Workflow           = src.Workflow;          /// Not mapped to DB
             LastRecordIsNok    = src.LastRecordIsNok;   /// Not mapped to DB
+            PrintLabel         = src.PrintLabel;        /// Not mapped to DB
 
             foreach (var mtr in MeterTestRslts)
             {
@@ -715,6 +726,7 @@ namespace Results.Entities
 
             writer.Write(Workflow);
             writer.Write(LastRecordIsNok);
+            writer.Write(PrintLabel);
 
             /// Save WaterMeterData or WaterMeterData.Id
             if (WaterMeterData != null && savedWMDatas != null && !savedWMDatas.Contains(WaterMeterData))
@@ -815,6 +827,7 @@ namespace Results.Entities
 
             Workflow = reader.ReadString();
             LastRecordIsNok = reader.ReadBoolean();
+            PrintLabel = reader.ReadBoolean();
 
             /// Retrieve TestData
             if (reader.ReadBoolean())

Results/Entities/WaterMeterData.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -17,11 +17,14 @@ namespace Results.Entities
         public virtual double                      DN                          { get; set; }	/// [mm]
         public virtual double                      L                           { get; set; }	/// [mm]
         public virtual Mounting                    Mounting                    { get; set; }	/// H / V / S / F
-		public virtual bool                        NewQnames                   { get; set; }	/// Yes = Q3...  No = Qn...
+		public virtual sbyte                       Qnames                      { get; set; }	/// see Common.Enums.FlowNames
         public virtual double                      Q4_Qmax                     { get; set; }	/// [m3/h]
 		public virtual double                      Q3_Qn                       { get; set; }	/// [m3/h]
 		public virtual double                      Q2_Qt                       { get; set; }	/// [m3/h]
 		public virtual double                      Q1_Qmin                     { get; set; }	/// [m3/h]
+        public virtual double                      ErrLimHiQ                   { get; set; }	/// [%]
+        public virtual double                      ErrLimLoQ                   { get; set; }	/// [%]
+        
         public virtual string                      MetrologicalClass           { get; set; }
         public virtual TemperatureClass            TemperatureClass            { get; set; }
         public virtual PressureLossClass           PressureLossClass           { get; set; }
@@ -36,6 +39,7 @@ namespace Results.Entities
         public virtual double                      Q3_Qn_Aux                   { get; set; }	/// [m3/h]
         public virtual string                      MetrologicalClassAux        { get; set; }
         public virtual string                      ApprovalInfoAux             { get; set; }
+        public virtual double                      PulsesPerLtrAux             { get; set; }
 
         public virtual Medium                      Medium                      { get; set; }
         public virtual string                      Text1                       { get; set; }
@@ -52,7 +56,9 @@ namespace Results.Entities
         /// </summary>
         public WaterMeterData()
 		{
-		}
+            PulsesPerLtr = 1;
+            PulsesPerLtrAux = 1;
+        }
 
         /// <summary>
         /// Copy constructor, copies all except of Id
@@ -64,11 +70,13 @@ namespace Results.Entities
             DN                          = oriWMData.DN;
             L                           = oriWMData.L;
             Mounting                    = oriWMData.Mounting;
-            NewQnames                   = oriWMData.NewQnames;
+            Qnames                      = oriWMData.Qnames;
             Q4_Qmax                     = oriWMData.Q4_Qmax;
             Q3_Qn                       = oriWMData.Q3_Qn;
             Q2_Qt                       = oriWMData.Q2_Qt;
             Q1_Qmin                     = oriWMData.Q1_Qmin;
+            ErrLimHiQ                   = oriWMData.ErrLimHiQ;
+            ErrLimLoQ                   = oriWMData.ErrLimLoQ;
             MetrologicalClass           = oriWMData.MetrologicalClass;
             TemperatureClass            = oriWMData.TemperatureClass;
             PressureLossClass           = oriWMData.PressureLossClass;
@@ -81,6 +89,7 @@ namespace Results.Entities
             Q3_Qn_Aux                   = oriWMData.Q3_Qn_Aux;
             MetrologicalClassAux        = oriWMData.MetrologicalClassAux;
             ApprovalInfoAux             = oriWMData.ApprovalInfoAux;
+            PulsesPerLtrAux             = oriWMData.PulsesPerLtrAux;
             Medium                      = oriWMData.Medium;
             Text1                       = oriWMData.Text1;
             Text2                       = oriWMData.Text2;
@@ -105,11 +114,13 @@ namespace Results.Entities
             if (DN != wmd.DN) return false;
             if (L != wmd.L) return false;
             if (Mounting != wmd.Mounting) return false;
-			if (NewQnames != wmd.NewQnames) return false;
+			if (Qnames != wmd.Qnames) return false;
             if (Q4_Qmax != wmd.Q4_Qmax) return false;
 			if (Q3_Qn   != wmd.Q3_Qn) return false;
 			if (Q2_Qt   != wmd.Q2_Qt) return false;
 			if (Q1_Qmin != wmd.Q1_Qmin) return false;
+            if (ErrLimHiQ != wmd.ErrLimHiQ) return false;
+            if (ErrLimLoQ != wmd.ErrLimLoQ) return false;
             if (MetrologicalClass != wmd.MetrologicalClass) return false;
             if (TemperatureClass != wmd.TemperatureClass) return false;
             if (PressureLossClass != wmd.PressureLossClass) return false;
@@ -122,6 +133,7 @@ namespace Results.Entities
             if (Q3_Qn_Aux != wmd.Q3_Qn_Aux) return false;
             if (MetrologicalClassAux != wmd.MetrologicalClassAux) return false;
             if (ApprovalInfoAux != wmd.ApprovalInfoAux) return false;
+            if (PulsesPerLtrAux != wmd.PulsesPerLtrAux) return false;
             if (Medium != wmd.Medium) return false;
             if (Text1 != wmd.Text1) return false;
             if (Text2 != wmd.Text2) return false;
@@ -161,11 +173,13 @@ namespace Results.Entities
             writer.Write(DN);
             writer.Write(L);
             writer.Write((int)Mounting);
-            writer.Write(NewQnames);
+            writer.Write((int)Qnames);
             writer.Write(Q4_Qmax);
             writer.Write(Q3_Qn);
             writer.Write(Q2_Qt);
             writer.Write(Q1_Qmin);
+            writer.Write(ErrLimHiQ);
+            writer.Write(ErrLimLoQ);
             writer.Write((MetrologicalClass != null) ? MetrologicalClass : string.Empty);
             writer.Write((int)TemperatureClass);
             writer.Write((int)PressureLossClass);
@@ -178,6 +192,7 @@ namespace Results.Entities
             writer.Write(Q3_Qn_Aux);
             writer.Write((MetrologicalClassAux != null) ? MetrologicalClassAux : string.Empty);
             writer.Write((ApprovalInfoAux != null) ? ApprovalInfoAux : string.Empty);
+            writer.Write(PulsesPerLtrAux);
             writer.Write((int)Medium);
             writer.Write((Text1 != null) ? Text1 : string.Empty);
             writer.Write((Text2 != null) ? Text2 : string.Empty);
@@ -197,11 +212,13 @@ namespace Results.Entities
             DN = reader.ReadDouble();
             L = reader.ReadDouble();
             Mounting = (Mounting)reader.ReadInt32();
-            NewQnames = reader.ReadBoolean();
+            Qnames = (sbyte)reader.ReadInt32();
             Q4_Qmax = reader.ReadDouble();
             Q3_Qn = reader.ReadDouble();
             Q2_Qt = reader.ReadDouble();
             Q1_Qmin = reader.ReadDouble();
+            ErrLimHiQ = reader.ReadDouble();
+            ErrLimLoQ = reader.ReadDouble();
             MetrologicalClass = reader.ReadString();
             TemperatureClass = (TemperatureClass)reader.ReadInt32();
             PressureLossClass = (PressureLossClass)reader.ReadInt32();
@@ -214,6 +231,7 @@ namespace Results.Entities
             Q3_Qn_Aux = reader.ReadDouble();
             MetrologicalClassAux = reader.ReadString();
             ApprovalInfoAux = reader.ReadString();
+            PulsesPerLtrAux = reader.ReadDouble();
             Medium = (Medium)reader.ReadInt32();
             Text1 = reader.ReadString();
             Text2 = reader.ReadString();

Results/Forms/MoreWMResultsDlg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
+/// Copyright (c) 2019-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -14,6 +14,13 @@ namespace Results.Forms
 {
     public partial class MoreWMResultsDlg : Form
     {
+        enum Tabs
+        {
+            Results = 0,
+            Graph,
+            Tracing,
+        }
+
         public MoreWMResultsDlg(Results.Entities.WaterMeter wm, IList<ReferenceRecord> refRecords)
         {
             InitializeComponent();
@@ -23,14 +30,15 @@ namespace Results.Forms
             ShowAllResults(wm);
             ShowChart(wm);
 
+            /// Select the initial tab page to be displayed
             if (refRecords == null)
             {
-                tabControl1.SelectTab(1);
-                tabControl1.TabPages.RemoveAt(2);
+                tabControl1.SelectTab((int)Tabs.Graph);
+                tabControl1.TabPages.RemoveAt((int)Tabs.Tracing);
             }
             else
             {
-                tabControl1.SelectTab(2);
+                tabControl1.SelectTab((int)Tabs.Tracing);
                 ShowTracingResults(wm, refRecords);
             }
         }
@@ -39,9 +47,9 @@ namespace Results.Forms
         void Localize()
         {
             Text = Strings.Water_meter_results;
-            tabControl1.TabPages[0].Text = Strings.All_results;
-            tabControl1.TabPages[1].Text = Strings.Graphs;
-            tabControl1.TabPages[2].Text = Strings.Production_tracing_results;
+            tabControl1.TabPages[(int)Tabs.Results].Text = Strings.All_results;
+            tabControl1.TabPages[(int)Tabs.Graph].Text = Strings.Graphs;
+            tabControl1.TabPages[(int)Tabs.Tracing].Text = Strings.Production_tracing_results;
         }
 
 
@@ -107,11 +115,7 @@ namespace Results.Forms
 
         void ShowChart(Results.Entities.WaterMeter wm)
         {
-            //chart.ChartAreas[0].AxisX.LabelStyle.Format = "dd.MM.yy";
-            //chart.ChartAreas[0].AxisX.Interval = 1;
-            //chart.ChartAreas[0].AxisX.IntervalType = ;
-
-            tabControl1.TabPages[1].Controls.Add(Results.Output.WMChart.GetChart(wm, false));
+            tabControl1.TabPages[(int)Tabs.Graph].Controls.Add(Results.Output.WMChart.GetChart(wm, false));
         }
 
 

Results/Forms/ResultsConfigCtrl.cs

@@ -22,6 +22,7 @@ namespace Results.Forms
             Precision,
             Width,
             Alignment,
+			Merge,
 			TestID,
 			Count,
         }
@@ -91,7 +92,8 @@ namespace Results.Forms
             selectedResultsListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Precision });
             selectedResultsListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Width });
             selectedResultsListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Alignment });
-			if (!SupressTestIDColumn)
+            selectedResultsListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Merge });
+            if (!SupressTestIDColumn)
 			{
 				selectedResultsListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Test_ID });
 			}
@@ -99,12 +101,16 @@ namespace Results.Forms
             /// Create controls used by ListViewEx to edit items
             unitsCB = new ComboBox();
 
-            ComboBox alignmentCB = new ComboBox();
+            var alignmentCB = new ComboBox();
             for (Alignment a = 0; a < Alignment.Count; a++)
             {
                 alignmentCB.Items.Add(a.ToDescription());
             }
 
+            var mergeCB = new ComboBox();
+            mergeCB.Items.Add(Strings.No);
+            mergeCB.Items.Add(Strings.Yes);
+
             editors = new Control[]
                 {
                     null,
@@ -114,6 +120,7 @@ namespace Results.Forms
                     new TextBox(),		/// precision
                     new TextBox(),		/// width
                     alignmentCB,
+                    mergeCB,
                     new TextBox(),		/// testID
                 };
             foreach (var edi in editors)
@@ -198,7 +205,20 @@ namespace Results.Forms
                     }
                     break;              /// Error
 
-				case Column.TestID: item.TestID = e.DisplayText; return;
+                case Column.Merge:
+                    if (editors[e.SubItem].Text == Strings.Yes)
+                    {
+                        item.Merge = true;
+                        return;
+                    }
+                    else if (editors[e.SubItem].Text == Strings.No)
+                    {
+                        item.Merge = false;
+                        return;
+                    }
+                    break;              /// Error
+
+                case Column.TestID: item.TestID = e.DisplayText; return;
 	
 				default:
                     return;             /// OK
@@ -324,17 +344,18 @@ namespace Results.Forms
 
 			foreach (var item in SelectedItems)
 			{
-                ListViewItem lvi = new ListViewItem(item.Name);     /// Item
+                ListViewItem lvi = new ListViewItem(item.Name);				/// Item
                 lvi.Tag = item;
-                lvi.SubItems.Add(item.Caption);                     /// Header
-                lvi.SubItems.Add(item.Units.ToDescription());		/// Units
-                lvi.SubItems.Add(item.Format);                      /// Format
-                lvi.SubItems.Add(item.Precision);                   /// Precision
-                lvi.SubItems.Add(item.Width.ToString());            /// Width
-                lvi.SubItems.Add(item.Alignment.ToDescription());   /// Alignment
+                lvi.SubItems.Add(item.Caption);								/// Header
+                lvi.SubItems.Add(item.Units.ToDescription());				/// Units
+                lvi.SubItems.Add(item.Format);								/// Format
+                lvi.SubItems.Add(item.Precision);							/// Precision
+                lvi.SubItems.Add(item.Width.ToString());					/// Width
+                lvi.SubItems.Add(item.Alignment.ToDescription());			/// Alignment
+                lvi.SubItems.Add(item.Merge ? Strings.Yes : Strings.No);	/// Merge
 				if (!SupressTestIDColumn)
 				{
-					lvi.SubItems.Add(item.TestID);                  /// TestID
+					lvi.SubItems.Add(item.TestID);							/// TestID
 				}
 
 				selectedResultsListViewEx.Items.Add(lvi);

Results/ItemID.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2016-2023 Sensus Slovensko a.s.
 ///
 using System;
 
@@ -345,6 +345,10 @@ namespace Results
         RadioAddress,                   /// 292
         OriRadioAddress,                /// 293
 
+        Pls_per_ltr_aux,                /// 294  Compound water meter constant (water meter data, not used in calculations)
+        Pulses_main,                    /// 295  Compound main meter pulses (recalculated so that the gated ref. pulses for this meter are equal to the total ref. pulses)
+        Pulses_aux,                     /// 296  Compound aux  meter pulses (recalculated so that the gated ref. pulses for this meter are equal to the total ref. pulses)
+
         Count,
     }
 }

Results/Mappings/BatchMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Results.Entities;
@@ -34,6 +34,7 @@ namespace Results.Mappings
 
 			Map(x => x.StartTime);
 			Map(x => x.EndTime);
+            Map(x => x.SaveTime);
             Map(x => x.Dirty);
             Map(x => x.RsltsSent);
 			Map(x => x.RsltsPrinted);

Results/Mappings/TestDataMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Results.Entities;
@@ -15,7 +15,8 @@ namespace Results.Mappings
             Map(x => x.Qtg);
             Map(x => x.Qfrom);
 			Map(x => x.Qto);
-			Map(x => x.TargetVolume);
+            Map(x => x.IsFromToInPct);
+            Map(x => x.TargetVolume);
 			Map(x => x.TargetTime);
 			Map(x => x.Repeats);
 			Map(x => x.Method);

Results/Mappings/TestRsltMap.cs

@@ -40,7 +40,7 @@ namespace Results.Mappings
             Map(x => x.DensityLine);
 			Map(x => x.DensityDiv);
 			Map(x => x.MassOfEvapWater).Column("Buoyancy");
-			Map(x => x.SpareDbl).Column("FlowMass");
+			Map(x => x.Qdetected).Column("FlowMass");
 			Map(x => x.Flow).Column("FlowVolume");
 			Map(x => x.VolumeCTV);
 			Map(x => x.VolumeMaster);

Results/Mappings/WaterMeterDataMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2017 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Results.Entities;
@@ -18,13 +18,13 @@ namespace Results.Mappings
             Map(x => x.L);
             Map(x => x.Mounting);
 
-#if MUNICH && LANG_DE
-			Map(x => x.NewQnames);
-#endif
+			Map(x => x.Qnames);
             Map(x => x.Q4_Qmax);
 			Map(x => x.Q3_Qn);
 			Map(x => x.Q2_Qt);
 			Map(x => x.Q1_Qmin);
+            Map(x => x.ErrLimHiQ);
+            Map(x => x.ErrLimLoQ);
 
             Map(x => x.MetrologicalClass);
             Map(x => x.TemperatureClass);
@@ -41,6 +41,7 @@ namespace Results.Mappings
             Map(x => x.Q3_Qn_Aux);
             Map(x => x.MetrologicalClassAux);
             Map(x => x.ApprovalInfoAux);
+            Map(x => x.PulsesPerLtrAux);
 
             Map(x => x.Medium);
 

Results/Output/Cell.cs

@@ -0,0 +1,47 @@
+///
+/// Copyright (c) 2023 Sensus Slovensko a.s.
+///
+using Common;
+using System.Drawing;
+using System.Drawing.Printing;
+
+namespace Results.Output
+{
+    public class Cell
+    {
+        public readonly string Text;
+        public readonly Font Font;
+        public readonly Alignment HorizAlignment;
+        public readonly VertAlignment VertAlignment;
+        public readonly bool TopBorder;
+        public readonly bool LeftBorder;
+        public readonly bool BottomMerge;
+        public readonly bool RightMerge;
+
+        public SizeF Size {  get { return size; } }
+        SizeF size;
+
+        public Cell() { }
+
+        public Cell(string text, Font font, Alignment horizAlignment = Alignment.Left,
+                    VertAlignment vertAlignment = VertAlignment.Top, bool topBorder = false,
+                    bool leftBorder = false, bool bottomMerge = false, bool rightMerge = false)
+        {
+            Text = text;
+            Font = font;
+            HorizAlignment = horizAlignment;
+            VertAlignment = vertAlignment;
+            TopBorder = topBorder;
+            LeftBorder = leftBorder;
+            BottomMerge = bottomMerge;
+            RightMerge = rightMerge;
+        }
+
+        public void Measure(PrintPageEventArgs e)
+        {
+            size = (Text != null && Font != null)
+                 ? Common.Printers.PrintersCommon.Measure(e, Text, Font)
+                 : new SizeF(0, 0);
+        }
+    }
+}

Results/Output/Printers/Enhanced/EnhancedPrintDocument.cs

@@ -34,6 +34,22 @@ namespace Results.Output.Printers.Enhanced
 		readonly int spacingOneAndHalf4Header;
         readonly int spacingOne4Footer;
 
+        /// <summary>
+        /// Property variable for the Font the user wishes to use
+        /// </summary>
+        readonly Font titleFont;
+        readonly Font headerFont;
+        readonly Font font;
+        readonly Font footerFont;
+
+        ///
+        /// Items to print
+        ///
+        readonly string header;
+        readonly IList<WMeterRsltItemSpec> commonItems;
+        readonly IList<WMeterRsltItemSpec> testItems;
+        readonly string footer;
+
         int spacingAboveTable;
         int spacingBelowTable;
 
@@ -43,14 +59,6 @@ namespace Results.Output.Printers.Enhanced
 		int titleHeight;
 		int commonHeight;
 
-		/// <summary>
-		/// Property variable for the Font the user wishes to use
-		/// </summary>
-        Font titleFont;
-        Font headerFont;
-        Font font;
-        Font footerFont;
-
         TableStyle style;
 
 		///
@@ -60,14 +68,6 @@ namespace Results.Output.Printers.Enhanced
 
 		EnhancedPrinterCfg cfg;
 
-		///
-		/// Items to print
-		///
-        string header;
-        IList<WMeterRsltItemSpec> commonItems;
-        IList<WMeterRsltItemSpec> testItems;
-        string footer;
-
 		///
 		/// Layout and status
 		///
@@ -93,15 +93,15 @@ namespace Results.Output.Printers.Enhanced
 			leftMargin = cfg.LeftMargin;
 
 			header = string.IsNullOrEmpty(cfg.Header) ? string.Empty : cfg.Header.Replace("~", Environment.NewLine);
-			commonItems = Results.WMeterRsltItemSpec.FromStrArray(cfg.CommonItems);
-			testItems = Results.WMeterRsltItemSpec.FromStrArray(cfg.TestItems);		/// TestID info will be overwritten later on
+			commonItems = WMeterRsltItemSpec.FromStrArray(cfg.CommonItems);
+			testItems = WMeterRsltItemSpec.FromStrArray(cfg.TestItems);		/// TestID info will be overwritten later on
 			footer = string.IsNullOrEmpty(cfg.Footer) ? string.Empty : cfg.Footer.Replace("~", Environment.NewLine);
 
 			/// Initialize fonts
-			titleFont = new Font((cfg.TitFntFml != null ? cfg.TitFntFml : "Arial"), (cfg.TitFntSz > 0 ? cfg.TitFntSz : 10), (FontStyle)cfg.TitFntSty);
-			headerFont = new Font((cfg.HdrFntFml != null ? cfg.HdrFntFml : "Arial"), (cfg.HdrFntSz > 0 ? cfg.HdrFntSz : 10), (FontStyle)cfg.HdrFntSty);
-			font = new Font((cfg.BodyFntFml != null ? cfg.BodyFntFml : "Arial"), (cfg.BodyFntSz > 0 ? cfg.BodyFntSz : 10), (FontStyle)cfg.BodyFntSty);
-            footerFont = new Font((cfg.FooterFntFml != null ? cfg.FooterFntFml : "Arial"), (cfg.FooterFntSz > 0 ? cfg.FooterFntSz : 10), (FontStyle)cfg.FooterFntSty);
+			titleFont = new Font(cfg.TitFntFml ?? "Arial", cfg.TitFntSz > 0 ? cfg.TitFntSz : 10, (FontStyle)cfg.TitFntSty);
+			headerFont = new Font(cfg.HdrFntFml ?? "Arial", cfg.HdrFntSz > 0 ? cfg.HdrFntSz : 10, (FontStyle)cfg.HdrFntSty);
+			font = new Font(cfg.BodyFntFml ?? "Arial", cfg.BodyFntSz > 0 ? cfg.BodyFntSz : 10, (FontStyle)cfg.BodyFntSty);
+            footerFont = new Font(cfg.FooterFntFml ?? "Arial", cfg.FooterFntSz > 0 ? cfg.FooterFntSz : 10, (FontStyle)cfg.FooterFntSty);
 
             /// Table style of one water meter table where tests are rows
             style = new TableStyle
@@ -149,7 +149,7 @@ namespace Results.Output.Printers.Enhanced
 		/// </summary>
 		/// <param name=e></param>
 		/// <remarks></remarks>
-		protected override void OnBeginPrint(System.Drawing.Printing.PrintEventArgs e)
+		protected override void OnBeginPrint(PrintEventArgs e)
 		{
 			base.OnBeginPrint(e);
 		}
@@ -159,7 +159,7 @@ namespace Results.Output.Printers.Enhanced
 		/// </summary>
 		/// <param name=e></param>
 		/// <remarks>This provides the print logic for our document</remarks>
-		protected override void OnPrintPage(System.Drawing.Printing.PrintPageEventArgs e)
+		protected override void OnPrintPage(PrintPageEventArgs e)
 		{
 			/// Run base code
 			base.OnPrintPage(e);
@@ -284,7 +284,7 @@ namespace Results.Output.Printers.Enhanced
 		/// <param name="printedWMNr">Number of the water meter printed</param>
 		/// <param name="top">Top coordinate of watermeter data</param>
 		/// <returns>The height of the printed section</returns>
-		float PrintWM(System.Drawing.Printing.PrintPageEventArgs e,
+		float PrintWM(PrintPageEventArgs e,
 					  Results.Entities.WaterMeter wm, int printedWMNr, int top)
 		{
             int tableTop = top + spacingAboveTable;
@@ -332,33 +332,33 @@ namespace Results.Output.Printers.Enhanced
 		}
 
 
-		void PrintAt(System.Drawing.Printing.PrintPageEventArgs e, Point p, string text)
+		void PrintAt(PrintPageEventArgs e, Point p, string text)
 		{
 			PrintAt(e, p.X, p.Y, text);
 		}
-		void PrintAt(System.Drawing.Printing.PrintPageEventArgs e, int x, int y, string text)
+		void PrintAt(PrintPageEventArgs e, int x, int y, string text)
 		{
 			RectangleF printArea = new RectangleF(x, y, 2000, spacingOne);
 			e.Graphics.DrawString(text, this.font, Brushes.Black, printArea);
 		}
 
 
-		void PrintHeaderAt(System.Drawing.Printing.PrintPageEventArgs e, Point p, string text)
+		void PrintHeaderAt(PrintPageEventArgs e, Point p, string text)
 		{
 			PrintHeaderAt(e, p.X, p.Y, text);
 		}
-		void PrintHeaderAt(System.Drawing.Printing.PrintPageEventArgs e, int x, int y, string text)
+		void PrintHeaderAt(PrintPageEventArgs e, int x, int y, string text)
 		{
 			RectangleF printArea = new RectangleF(x, y, 2000, spacingOne4Header);
 			e.Graphics.DrawString(text, this.headerFont, Brushes.Black, printArea);
 		}
 
 
-        void PrintFooterAt(System.Drawing.Printing.PrintPageEventArgs e, Point p, string text)
+        void PrintFooterAt(PrintPageEventArgs e, Point p, string text)
         {
             PrintFooterAt(e, p.X, p.Y, text);
         }
-        void PrintFooterAt(System.Drawing.Printing.PrintPageEventArgs e, int x, int y, string text)
+        void PrintFooterAt(PrintPageEventArgs e, int x, int y, string text)
         {
             RectangleF printArea = new RectangleF(x, y, 2000, spacingOne4Footer);
             e.Graphics.DrawString(text, this.footerFont, Brushes.Black, printArea);

Results/Output/Printers/Label/LabelPrintDocument.cs

@@ -9,7 +9,6 @@ using System.Drawing.Printing;
 using System.IO;
 using Gma.QrCodeNet.Encoding;
 using Common;
-using Results.Resources;
 using GenCode128;
 
 namespace Results.Output.Printers.Label
@@ -22,34 +21,30 @@ namespace Results.Output.Printers.Label
 		readonly int printHeight;
 		readonly int printWidth;
 
-		/// Selected font
-		readonly Font font;
+        /// Items to print
+        readonly IList<WMeterRsltItemSpec> itemsToPrint;
+
+        /// Selected font
+        readonly Font font;
 
 		/// Data to print
-		Results.Entities.Batch batch;
 		LabelPrinterCfg cfg;
         Results.Entities.WaterMeter wm;
 
-		/// Items to print
-        IList<WMeterRsltItemSpec> itemsToPrint;
-
 		/// <summary>
 		/// Constructor
 		/// </summary>
 		/// <param name="textToPrint">Text to be printed</param>
-        public LabelPrintDocument(Results.Entities.Batch batch, LabelPrinterCfg cfg, Results.Entities.WaterMeter wm, string documentName)
+        public LabelPrintDocument(LabelPrinterCfg cfg, Results.Entities.WaterMeter wm, string documentName)
 		{
 			DocumentName = documentName;
 
-			this.batch = batch;
 			this.cfg = cfg;
             this.wm = wm;
-			this.itemsToPrint = Results.WMeterRsltItemSpec.FromStrArray(cfg.ItemsToPrint);
+			this.itemsToPrint = WMeterRsltItemSpec.FromStrArray(cfg.ItemsToPrint);
 
 			/// Initialize fonts
-			font = new Font((cfg.FontFamily != null ? cfg.FontFamily : "Arial"),
-							(cfg.FontSize > 0 ? cfg.FontSize : 10),
-							(FontStyle)cfg.FontStyle);
+			font = new Font(cfg.FontFamily ?? "Arial", cfg.FontSize > 0 ? cfg.FontSize : 10, (FontStyle)cfg.FontStyle);
 
 			/// Set print area size and margins (in dots using 100 dpi)
 			DefaultPageSettings.Landscape = (cfg.PageOrientation == PageOrientation.Landscape);
@@ -63,7 +58,7 @@ namespace Results.Output.Printers.Label
 		/// </summary>
 		/// <param name=e></param>
 		/// <remarks></remarks>
-		protected override void OnBeginPrint(System.Drawing.Printing.PrintEventArgs e)
+		protected override void OnBeginPrint(PrintEventArgs e)
 		{
 			base.OnBeginPrint(e);
 		}
@@ -73,7 +68,7 @@ namespace Results.Output.Printers.Label
 		/// </summary>
 		/// <param name=e></param>
 		/// <remarks>This provides the print logic for our document</remarks>
-		protected override void OnPrintPage(System.Drawing.Printing.PrintPageEventArgs e)
+		protected override void OnPrintPage(PrintPageEventArgs e)
 		{
             /// Run base code
             base.OnPrintPage(e);

Results/Output/Printers/MultiLabel/MultiLabelPrintDocument.cs

@@ -9,7 +9,6 @@ using System.Drawing.Printing;
 using System.IO;
 using Gma.QrCodeNet.Encoding;
 using Common;
-using Results.Resources;
 using GenCode128;
 
 namespace Results.Output.Printers.MultiLabel
@@ -22,17 +21,17 @@ namespace Results.Output.Printers.MultiLabel
 		readonly int labelHeight;
 		readonly int labelWidth;
 
-		/// Selected font
-		readonly Font font;
+        /// Items to print
+        readonly IList<WMeterRsltItemSpec> itemsToPrint;
+
+        /// Selected font
+        readonly Font font;
 
 		/// Data to print
 		Results.Entities.Batch batch;
 		MultiLabelPrinterCfg cfg;
         IList<Results.Entities.WaterMeter> waterMeters;
 
-		/// Items to print
-        IList<WMeterRsltItemSpec> itemsToPrint;
-
 		/// <summary>
 		/// Constructor
 		/// </summary>
@@ -44,15 +43,13 @@ namespace Results.Output.Printers.MultiLabel
 			this.batch = batch;
             this.waterMeters = batch.WaterMeters;
             this.cfg = cfg;
-			this.itemsToPrint = Results.WMeterRsltItemSpec.FromStrArray(cfg.ItemsToPrint);
+			this.itemsToPrint = WMeterRsltItemSpec.FromStrArray(cfg.ItemsToPrint);
 
-			/// Initialize fonts
-			font = new Font((cfg.FontFamily != null ? cfg.FontFamily : "Arial"),
-							(cfg.FontSize > 0 ? cfg.FontSize : 10),
-							(FontStyle)cfg.FontStyle);
+            /// Initialize fonts
+            font = new Font(cfg.FontFamily ?? "Arial", cfg.FontSize > 0 ? cfg.FontSize : 10, (FontStyle)cfg.FontStyle);
 
-			/// Set print area size and margins (in dots using 100 dpi)
-			DefaultPageSettings.Landscape = (cfg.PageOrientation == PageOrientation.Landscape);
+            /// Set print area size and margins (in dots using 100 dpi)
+            DefaultPageSettings.Landscape = (cfg.PageOrientation == PageOrientation.Landscape);
 			///
 			labelHeight = cfg.LabelHeight;
 			labelWidth = cfg.LabelWidth;
@@ -63,7 +60,7 @@ namespace Results.Output.Printers.MultiLabel
 		/// </summary>
 		/// <param name=e></param>
 		/// <remarks></remarks>
-		protected override void OnBeginPrint(System.Drawing.Printing.PrintEventArgs e)
+		protected override void OnBeginPrint(PrintEventArgs e)
 		{
 			base.OnBeginPrint(e);
 		}
@@ -73,7 +70,7 @@ namespace Results.Output.Printers.MultiLabel
 		/// </summary>
 		/// <param name=e></param>
 		/// <remarks>This provides the print logic for our document</remarks>
-		protected override void OnPrintPage(System.Drawing.Printing.PrintPageEventArgs e)
+		protected override void OnPrintPage(PrintPageEventArgs e)
 		{
             /// Run base code
             base.OnPrintPage(e);

Results/Output/Printers/OnePerBatch/OnePerBatchPrintDocument.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2020 Sensus Slovensko a.s.
+/// Copyright (c) 2020-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -13,9 +13,6 @@ namespace Results.Output.Printers.OnePerBatch
 {
     public class OnePerBatchPrintDocument : Common.Printers.PrintersCommon
 	{
-        const float GapBetweenTableColumns = 10;
-        const float GapBetweenCommonColumns = 10;
-
 		/// Size of the printed area without margins, after taking into account 'pageOrientation'
 		readonly int printHeight;
 		readonly int printWidth;
@@ -28,39 +25,39 @@ namespace Results.Output.Printers.OnePerBatch
 
 		readonly int spacingOne;
 		readonly int spacingOne4Header;
-		
-        float titleHeight;
 
 		/// <summary>
 		/// Property variable for the Font the user wishes to use
 		/// </summary>
-        Font titleFont;
-        Font headerFont;
-        Font font;
-        Font footerFont;
-
-		///
-		/// Data to print
-		///
-		Results.Entities.Batch batch;
-		OnePerBatchPrinterCfg cfg;
-        Results.Entities.WaterMeter wm;
+        readonly Font titleFont;
+        readonly Font headerFont;
+        readonly Font font;
+        readonly Font footerFont;
 
 		///
 		/// Items to print
 		///
-        string header;
-        IList<WMeterRsltItemSpec> commonItems1;
-        IList<WMeterRsltItemSpec> commonItems2;
-        IList<WMeterRsltItemSpec> commonItems3;
-        IList<WMeterRsltItemSpec> testItems;
-        IList<WMeterRsltItemSpec> testItems2;
-        IList<WMeterRsltItemSpec> belowItems1;
-        IList<WMeterRsltItemSpec> belowItems2;
-        IList<WMeterRsltItemSpec> belowItems3;
-        string footer;
+        readonly string header;
+        readonly IList<WMeterRsltItemSpec> commonItems1;
+        readonly IList<WMeterRsltItemSpec> commonItems2;
+        readonly IList<WMeterRsltItemSpec> commonItems3;
+        readonly IList<WMeterRsltItemSpec> testItems;
+        readonly IList<WMeterRsltItemSpec> testItems2;
+        readonly IList<WMeterRsltItemSpec> belowItems1;
+        readonly IList<WMeterRsltItemSpec> belowItems2;
+        readonly IList<WMeterRsltItemSpec> belowItems3;
+        readonly string footer;
 
-		int nrPages;
+        ///
+        /// Data to print
+        ///
+        Results.Entities.Batch batch;
+        OnePerBatchPrinterCfg cfg;
+        Results.Entities.WaterMeter wm;
+
+        float titleHeight;
+
+        int nrPages;
 		int pageNr;					/// Page number to be printed at the bottom of the page
 
 		/// <summary>
@@ -79,21 +76,21 @@ namespace Results.Output.Printers.OnePerBatch
 			leftMargin = cfg.LeftMargin;
 
 			header = string.IsNullOrEmpty(cfg.Header) ? string.Empty : cfg.Header.Replace("~", Environment.NewLine);
-			commonItems1 = Results.WMeterRsltItemSpec.FromStrArray(cfg.CommonItems1);
-            commonItems2 = Results.WMeterRsltItemSpec.FromStrArray(cfg.CommonItems2);
-            commonItems3 = Results.WMeterRsltItemSpec.FromStrArray(cfg.CommonItems3);
-            testItems = Results.WMeterRsltItemSpec.FromStrArray(cfg.TestItems);		    /// TestID info will be overwritten later on
-            testItems2 = Results.WMeterRsltItemSpec.FromStrArray(cfg.TestItems2);	    /// TestID info will be overwritten later on
-            belowItems1 = Results.WMeterRsltItemSpec.FromStrArray(cfg.BelowItems1);
-            belowItems2 = Results.WMeterRsltItemSpec.FromStrArray(cfg.BelowItems2);
-            belowItems3 = Results.WMeterRsltItemSpec.FromStrArray(cfg.BelowItems3);
+			commonItems1 = WMeterRsltItemSpec.FromStrArray(cfg.CommonItems1);
+            commonItems2 = WMeterRsltItemSpec.FromStrArray(cfg.CommonItems2);
+            commonItems3 = WMeterRsltItemSpec.FromStrArray(cfg.CommonItems3);
+            testItems = WMeterRsltItemSpec.FromStrArray(cfg.TestItems);		    /// TestID info will be overwritten later on
+            testItems2 = WMeterRsltItemSpec.FromStrArray(cfg.TestItems2);	    /// TestID info will be overwritten later on
+            belowItems1 = WMeterRsltItemSpec.FromStrArray(cfg.BelowItems1);
+            belowItems2 = WMeterRsltItemSpec.FromStrArray(cfg.BelowItems2);
+            belowItems3 = WMeterRsltItemSpec.FromStrArray(cfg.BelowItems3);
             footer = string.IsNullOrEmpty(cfg.Footer) ? string.Empty : cfg.Footer.Replace("~", Environment.NewLine);
 
 			/// Initialize fonts
-			titleFont = new Font((cfg.TitFntFml != null ? cfg.TitFntFml : "Arial"), (cfg.TitFntSz > 0 ? cfg.TitFntSz : 10), (FontStyle)cfg.TitFntSty);
-			headerFont = new Font((cfg.HdrFntFml != null ? cfg.HdrFntFml : "Arial"), (cfg.HdrFntSz > 0 ? cfg.HdrFntSz : 10), (FontStyle)cfg.HdrFntSty);
-			font = new Font((cfg.BodyFntFml != null ? cfg.BodyFntFml : "Arial"), (cfg.BodyFntSz > 0 ? cfg.BodyFntSz : 10), (FontStyle)cfg.BodyFntSty);
-            footerFont = new Font((cfg.FooterFntFml != null ? cfg.FooterFntFml : "Arial"), (cfg.FooterFntSz > 0 ? cfg.FooterFntSz : 10), (FontStyle)cfg.FooterFntSty);
+			titleFont = new Font(cfg.TitFntFml ?? "Arial", cfg.TitFntSz > 0 ? cfg.TitFntSz : 10, (FontStyle)cfg.TitFntSty);
+			headerFont = new Font(cfg.HdrFntFml ?? "Arial", cfg.HdrFntSz > 0 ? cfg.HdrFntSz : 10, (FontStyle)cfg.HdrFntSty);
+			font = new Font(cfg.BodyFntFml ?? "Arial", cfg.BodyFntSz > 0 ? cfg.BodyFntSz : 10, (FontStyle)cfg.BodyFntSty);
+            footerFont = new Font(cfg.FooterFntFml ?? "Arial", cfg.FooterFntSz > 0 ? cfg.FooterFntSz : 10, (FontStyle)cfg.FooterFntSty);
 
 			/// Set print area size and margins (in dots using 100 dpi)
 			DefaultPageSettings.Landscape = (cfg.PageOrientation == PageOrientation.Landscape);
@@ -125,7 +122,7 @@ namespace Results.Output.Printers.OnePerBatch
 		/// </summary>
 		/// <param name=e></param>
 		/// <remarks></remarks>
-		protected override void OnBeginPrint(System.Drawing.Printing.PrintEventArgs e)
+		protected override void OnBeginPrint(PrintEventArgs e)
 		{
 			base.OnBeginPrint(e);
 		}
@@ -135,7 +132,7 @@ namespace Results.Output.Printers.OnePerBatch
 		/// </summary>
 		/// <param name=e></param>
 		/// <remarks>This provides the print logic for our document</remarks>
-		protected override void OnPrintPage(System.Drawing.Printing.PrintPageEventArgs e)
+		protected override void OnPrintPage(PrintPageEventArgs e)
 		{
             /// Run base code
             base.OnPrintPage(e);
@@ -194,35 +191,33 @@ namespace Results.Output.Printers.OnePerBatch
                 float leftMarginCommon2 = leftMargin + printWidth * 0.01f * (cfg.ColW0Pct + cfg.ColW1Pct);
                 float leftMarginCommon3 = leftMargin + printWidth * 0.01f * (cfg.ColW0Pct + cfg.ColW1Pct + cfg.ColW2Pct);
 
-                Alignment[] horizAlgn = new Alignment[] { Alignment.Left, Alignment.Left };
-                VertAlignment[] vertAlgn = new VertAlignment[] { VertAlignment.Top, VertAlignment.Top };
                 TableStyle commonTableStyle = new TableStyle { Font = font, MarginX = 5, MarginY = 3 };
 
-                Table table1 = new Table(2, cfg.AutoTestParam) { Style = commonTableStyle };
+                var table1 = new Table(2, commonTableStyle, cfg.AutoTestParam);
                 foreach (var item in commonItems1)
                 {
-                    string[] row = new string[] { item.Caption, item.Print(wm).Split(new char[] { '|' })[0] };
-                    table1.AddRow(row, horizAlgn, vertAlgn);
+                    table1.AddRow(new Cell[] { new Cell(item.Caption, font),
+                                               new Cell(item.Print(wm).Split(new char[] { '|' })[0], font) });
                 }
                 float bodyTop1 = table1.Draw(e, leftMarginCommon1, commonTop);
 
 
-                table1 = new Table(2, cfg.AutoTestParam) { Style = commonTableStyle };
+                var table2 = new Table(2, commonTableStyle, cfg.AutoTestParam);
                 foreach (var item in commonItems2)
                 {
-                    string[] row = new string[] { item.Caption, item.Print(wm).Split(new char[] { '|' })[0] };
-                    table1.AddRow(row, horizAlgn, vertAlgn);
+                    table2.AddRow(new Cell[] { new Cell(item.Caption, font),
+                                               new Cell(item.Print(wm).Split(new char[] { '|' })[0], font) });
                 }
-                float bodyTop2 = table1.Draw(e, leftMarginCommon2, commonTop);
+                float bodyTop2 = table2.Draw(e, leftMarginCommon2, commonTop);
 
 
-                table1 = new Table(2, cfg.AutoTestParam) { Style = commonTableStyle };
+                var table3 = new Table(2, commonTableStyle, cfg.AutoTestParam);
                 foreach (var item in commonItems3)
                 {
-                    string[] row = new string[] { item.Caption, item.Print(wm).Split(new char[] { '|' })[0] };
-                    table1.AddRow(row, horizAlgn, vertAlgn);
+                    table3.AddRow(new Cell[] { new Cell(item.Caption, font),
+                                               new Cell(item.Print(wm).Split(new char[] { '|' })[0], font) });
                 }
-                float bodyTop3 = table1.Draw(e, leftMarginCommon3, commonTop);
+                float bodyTop3 = table3.Draw(e, leftMarginCommon3, commonTop);
 
                 float bodyTop12 = (bodyTop1 > bodyTop2) ? bodyTop1 : bodyTop2;
                 tableTop = (bodyTop12 > bodyTop3) ? bodyTop12 : bodyTop3;            /// Max. of all three bodyTop-s
@@ -302,35 +297,33 @@ namespace Results.Output.Printers.OnePerBatch
                 float leftMarginBelow2 = leftMargin + printWidth * 0.01f * (cfg.BelowW0Pct + cfg.BelowW1Pct);
                 float leftMarginBelow3 = leftMargin + printWidth * 0.01f * (cfg.BelowW0Pct + cfg.BelowW1Pct + cfg.BelowW2Pct);
 
-                Alignment[] horizAlgn = new Alignment[] { Alignment.Left, Alignment.Left };
-                VertAlignment[] vertAlgn = new VertAlignment[] { VertAlignment.Top, VertAlignment.Top };
                 TableStyle commonTableStyle = new TableStyle { Font = font, MarginX = 5, MarginY = 3 };
 
-                Table table2 = new Table(2, cfg.AutoTestParam) { Style = commonTableStyle };
+                var table4 = new Table(2, commonTableStyle, cfg.AutoTestParam);
                 foreach (var item in belowItems1)
                 {
-                    string[] row = new string[] { item.Caption, item.Print(wm).Split(new char[] { '|' })[0] };
-                    table2.AddRow(row, horizAlgn, vertAlgn);
+                    table4.AddRow(new Cell[] { new Cell(item.Caption, font),
+                                               new Cell(item.Print(wm).Split(new char[] { '|' })[0], font) });
                 }
-                table2.Draw(e, leftMarginBelow1, belowTop);
+                table4.Draw(e, leftMarginBelow1, belowTop);
 
 
-                table2 = new Table(2, cfg.AutoTestParam) { Style = commonTableStyle };
+                var table5 = new Table(2, commonTableStyle, cfg.AutoTestParam);
                 foreach (var item in belowItems2)
                 {
-                    string[] row = new string[] { item.Caption, item.Print(wm).Split(new char[] { '|' })[0] };
-                    table2.AddRow(row, horizAlgn, vertAlgn);
+                    table5.AddRow(new Cell[] { new Cell(item.Caption, font),
+                                               new Cell(item.Print(wm).Split(new char[] { '|' })[0], font) });
                 }
-                table2.Draw(e, leftMarginBelow2, belowTop);
+                table5.Draw(e, leftMarginBelow2, belowTop);
 
 
-                table2 = new Table(2, cfg.AutoTestParam) { Style = commonTableStyle };
+                var table6 = new Table(2, commonTableStyle, cfg.AutoTestParam);
                 foreach (var item in belowItems3)
                 {
-                    string[] row = new string[] { item.Caption, item.Print(wm).Split(new char[] { '|' })[0] };
-                    table2.AddRow(row, horizAlgn, vertAlgn);
+                    table6.AddRow(new Cell[] { new Cell(item.Caption, font),
+                                               new Cell(item.Print(wm).Split(new char[] { '|' })[0], font) });
                 }
-                table2.Draw(e, leftMarginBelow3, belowTop);
+                table6.Draw(e, leftMarginBelow3, belowTop);
                 
 
                 ///
@@ -343,9 +336,12 @@ namespace Results.Output.Printers.OnePerBatch
             ///
             /// Page number on each page
             ///
-            string pageNrText = string.Format("{0} {1}/{2}", Strings.Page, pageNr, nrPages);
-            float pageNrWidth = e.Graphics.MeasureString(pageNrText, font).Width;
-            PrintAt(e, pageNrText, font, leftMargin + (printWidth - pageNrWidth) / 2, topMargin + printHeight - spacingOne, 0, 0, Alignment.Left, VertAlignment.Top);
+            if (nrPages != 1)
+            {
+                string pageNrText = string.Format("{0} {1}/{2}", Strings.Page, pageNr, nrPages);
+                float pageNrWidth = e.Graphics.MeasureString(pageNrText, font).Width;
+                PrintAt(e, pageNrText, font, leftMargin + (printWidth - pageNrWidth) / 2, topMargin + printHeight - spacingOne, 0, 0, Alignment.Left, VertAlignment.Top);
+            }
 
             e.HasMorePages = !(pageNr == nrPages);
 

Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2017-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2017-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -16,9 +16,6 @@ namespace Results.Output.Printers.OnePerMeter
 {
     public class OnePerMeterPrintDocument : Common.Printers.PrintersCommon
 	{
-        const float GapBetweenTableColumns = 10;
-        const float GapBetweenCommonColumns = 10;
-
         static QrEncoder encoder = new QrEncoder();
 
         /// Size of the printed area without margins, after taking into account 'pageOrientation'
@@ -33,39 +30,39 @@ namespace Results.Output.Printers.OnePerMeter
 
 		readonly int spacingOne;
 		readonly int spacingOne4Header;
-		
-        float titleHeight;
 
 		/// <summary>
 		/// Property variable for the Font the user wishes to use
 		/// </summary>
-        Font titleFont;
-        Font headerFont;
-        Font font;
-        Font footerFont;
-
-		///
-		/// Data to print
-		///
-		Results.Entities.Batch batch;
-		OnePerMeterPrinterCfg cfg;
-        Results.Entities.WaterMeter wm;
+        readonly Font titleFont;
+        readonly Font headerFont;
+        readonly Font font;
+        readonly Font footerFont;
 
 		///
 		/// Items to print
 		///
-        string header;
-        IList<WMeterRsltItemSpec> commonItems1;
-        IList<WMeterRsltItemSpec> commonItems2;
-        IList<WMeterRsltItemSpec> commonItems3;
-        IList<WMeterRsltItemSpec> testItems;
-        IList<WMeterRsltItemSpec> testItems2;
-        IList<WMeterRsltItemSpec> belowItems1;
-        IList<WMeterRsltItemSpec> belowItems2;
-        IList<WMeterRsltItemSpec> belowItems3;
-        string footer;
+        readonly string header;
+        readonly IList<WMeterRsltItemSpec> commonItems1;
+        readonly IList<WMeterRsltItemSpec> commonItems2;
+        readonly IList<WMeterRsltItemSpec> commonItems3;
+        readonly IList<WMeterRsltItemSpec> testItems;
+        readonly IList<WMeterRsltItemSpec> testItems2;
+        readonly IList<WMeterRsltItemSpec> belowItems1;
+        readonly IList<WMeterRsltItemSpec> belowItems2;
+        readonly IList<WMeterRsltItemSpec> belowItems3;
+        readonly string footer;
 
-		int nrPages;
+        ///
+        /// Data to print
+        ///
+        Results.Entities.Batch batch;
+        OnePerMeterPrinterCfg cfg;
+        Results.Entities.WaterMeter wm;
+
+        float titleHeight;
+
+        int nrPages;
 		int pageNr;					/// Page number to be printed at the bottom of the page
 
 		/// <summary>
@@ -84,21 +81,21 @@ namespace Results.Output.Printers.OnePerMeter
 			leftMargin = cfg.LeftMargin;
 
 			header = string.IsNullOrEmpty(cfg.Header) ? string.Empty : cfg.Header.Replace("~", Environment.NewLine);
-			commonItems1 = Results.WMeterRsltItemSpec.FromStrArray(cfg.CommonItems1);
-            commonItems2 = Results.WMeterRsltItemSpec.FromStrArray(cfg.CommonItems2);
-            commonItems3 = Results.WMeterRsltItemSpec.FromStrArray(cfg.CommonItems3);
-            testItems = Results.WMeterRsltItemSpec.FromStrArray(cfg.TestItems);		    /// TestID info will be overwritten later on
-            testItems2 = Results.WMeterRsltItemSpec.FromStrArray(cfg.TestItems2);	    /// TestID info will be overwritten later on
-            belowItems1 = Results.WMeterRsltItemSpec.FromStrArray(cfg.BelowItems1);
-            belowItems2 = Results.WMeterRsltItemSpec.FromStrArray(cfg.BelowItems2);
-            belowItems3 = Results.WMeterRsltItemSpec.FromStrArray(cfg.BelowItems3);
+			commonItems1 = WMeterRsltItemSpec.FromStrArray(cfg.CommonItems1);
+            commonItems2 = WMeterRsltItemSpec.FromStrArray(cfg.CommonItems2);
+            commonItems3 = WMeterRsltItemSpec.FromStrArray(cfg.CommonItems3);
+            testItems = WMeterRsltItemSpec.FromStrArray(cfg.TestItems);		    /// TestID info will be overwritten later on
+            testItems2 = WMeterRsltItemSpec.FromStrArray(cfg.TestItems2);	    /// TestID info will be overwritten later on
+            belowItems1 = WMeterRsltItemSpec.FromStrArray(cfg.BelowItems1);
+            belowItems2 = WMeterRsltItemSpec.FromStrArray(cfg.BelowItems2);
+            belowItems3 = WMeterRsltItemSpec.FromStrArray(cfg.BelowItems3);
             footer = string.IsNullOrEmpty(cfg.Footer) ? string.Empty : cfg.Footer.Replace("~", Environment.NewLine);
 
 			/// Initialize fonts
-			titleFont = new Font((cfg.TitFntFml != null ? cfg.TitFntFml : "Arial"), (cfg.TitFntSz > 0 ? cfg.TitFntSz : 10), (FontStyle)cfg.TitFntSty);
-			headerFont = new Font((cfg.HdrFntFml != null ? cfg.HdrFntFml : "Arial"), (cfg.HdrFntSz > 0 ? cfg.HdrFntSz : 10), (FontStyle)cfg.HdrFntSty);
-			font = new Font((cfg.BodyFntFml != null ? cfg.BodyFntFml : "Arial"), (cfg.BodyFntSz > 0 ? cfg.BodyFntSz : 10), (FontStyle)cfg.BodyFntSty);
-            footerFont = new Font((cfg.FooterFntFml != null ? cfg.FooterFntFml : "Arial"), (cfg.FooterFntSz > 0 ? cfg.FooterFntSz : 10), (FontStyle)cfg.FooterFntSty);
+			titleFont = new Font(cfg.TitFntFml ?? "Arial", cfg.TitFntSz > 0 ? cfg.TitFntSz : 10, (FontStyle)cfg.TitFntSty);
+			headerFont = new Font(cfg.HdrFntFml ?? "Arial", cfg.HdrFntSz > 0 ? cfg.HdrFntSz : 10, (FontStyle)cfg.HdrFntSty);
+			font = new Font(cfg.BodyFntFml ?? "Arial", cfg.BodyFntSz > 0 ? cfg.BodyFntSz : 10, (FontStyle)cfg.BodyFntSty);
+            footerFont = new Font(cfg.FooterFntFml ?? "Arial", cfg.FooterFntSz > 0 ? cfg.FooterFntSz : 10, (FontStyle)cfg.FooterFntSty);
 
 			/// Set print area size and margins (in dots using 100 dpi)
 			DefaultPageSettings.Landscape = (cfg.PageOrientation == PageOrientation.Landscape);
@@ -130,7 +127,7 @@ namespace Results.Output.Printers.OnePerMeter
 		/// </summary>
 		/// <param name=e></param>
 		/// <remarks></remarks>
-		protected override void OnBeginPrint(System.Drawing.Printing.PrintEventArgs e)
+		protected override void OnBeginPrint(PrintEventArgs e)
 		{
 			base.OnBeginPrint(e);
 		}
@@ -140,7 +137,7 @@ namespace Results.Output.Printers.OnePerMeter
 		/// </summary>
 		/// <param name=e></param>
 		/// <remarks>This provides the print logic for our document</remarks>
-		protected override void OnPrintPage(System.Drawing.Printing.PrintPageEventArgs e)
+		protected override void OnPrintPage(PrintPageEventArgs e)
 		{
             /// Run base code
             base.OnPrintPage(e);
@@ -223,35 +220,33 @@ namespace Results.Output.Printers.OnePerMeter
                 float leftMarginCommon2 = leftMargin + printWidth * 0.01f * (cfg.ColW0Pct + cfg.ColW1Pct);
                 float leftMarginCommon3 = leftMargin + printWidth * 0.01f * (cfg.ColW0Pct + cfg.ColW1Pct + cfg.ColW2Pct);
 
-                Alignment[] horizAlgn = new Alignment[] { Alignment.Left, Alignment.Left };
-                VertAlignment[] vertAlgn = new VertAlignment[] { VertAlignment.Top, VertAlignment.Top };
                 TableStyle commonTableStyle = new TableStyle { Font = font, MarginX = 5, MarginY = 3 };
 
-                Table table1 = new Table(2) { Style = commonTableStyle };
+                var table1 = new Table(2, commonTableStyle);
                 foreach (var item in commonItems1)
                 {
-                    string[] row = new string[] { item.Caption, item.Print(wm).Split(new char[] { '|' })[0] };
-                    table1.AddRow(row, horizAlgn, vertAlgn);
+                    table1.AddRow(new Cell[] { new Cell(item.Caption, font),
+                                               new Cell(item.Print(wm).Split(new char[] { '|' })[0], font) });
                 }
                 float bodyTop1 = table1.Draw(e, leftMarginCommon1, commonTop);
 
 
-                table1 = new Table(2) { Style = commonTableStyle };
+                var table2 = new Table(2, commonTableStyle);
                 foreach (var item in commonItems2)
                 {
-                    string[] row = new string[] { item.Caption, item.Print(wm).Split(new char[] { '|' })[0] };
-                    table1.AddRow(row, horizAlgn, vertAlgn);
+                    table2.AddRow(new Cell[] { new Cell(item.Caption, font),
+                                               new Cell(item.Print(wm).Split(new char[] { '|' })[0], font) });
                 }
-                float bodyTop2 = table1.Draw(e, leftMarginCommon2, commonTop);
+                float bodyTop2 = table2.Draw(e, leftMarginCommon2, commonTop);
 
 
-                table1 = new Table(2) { Style = commonTableStyle };
+                var table3 = new Table(2, commonTableStyle);
                 foreach (var item in commonItems3)
                 {
-                    string[] row = new string[] { item.Caption, item.Print(wm).Split(new char[] { '|' })[0] };
-                    table1.AddRow(row, horizAlgn, vertAlgn);
+                    table3.AddRow(new Cell[] { new Cell(item.Caption, font),
+                                               new Cell(item.Print(wm).Split(new char[] { '|' })[0], font) });
                 }
-                float bodyTop3 = table1.Draw(e, leftMarginCommon3, commonTop);
+                float bodyTop3 = table3.Draw(e, leftMarginCommon3, commonTop);
 
                 float bodyTop12 = (bodyTop1 > bodyTop2) ? bodyTop1 : bodyTop2;
                 tableTop = (bodyTop12 > bodyTop3) ? bodyTop12 : bodyTop3;            /// Max. of all three bodyTop-s
@@ -318,7 +313,15 @@ namespace Results.Output.Printers.OnePerMeter
             }
 
             SizeF size = table.Measure(e);
-            float tableLeft = (float)leftMargin + ((float)printWidth - size.Width) / 2;
+            float sideMargin = (printWidth - size.Width) / 2;
+            float tableLeft;
+            switch (cfg.Alignment)
+            {
+                case Alignment.Left:    tableLeft = leftMargin; break;
+                default:
+                case Alignment.Center:  tableLeft = leftMargin + sideMargin; break;
+                case Alignment.Right:   tableLeft = leftMargin + 2 * sideMargin; break;
+            }
             belowTop = table.Draw(e, tableLeft, tableTop);
 
             if (pageNr == nrPages)
@@ -331,35 +334,33 @@ namespace Results.Output.Printers.OnePerMeter
                 float leftMarginBelow2 = leftMargin + printWidth * 0.01f * (cfg.BelowW0Pct + cfg.BelowW1Pct);
                 float leftMarginBelow3 = leftMargin + printWidth * 0.01f * (cfg.BelowW0Pct + cfg.BelowW1Pct + cfg.BelowW2Pct);
 
-                Alignment[] horizAlgn = new Alignment[] { Alignment.Left, Alignment.Left };
-                VertAlignment[] vertAlgn = new VertAlignment[] { VertAlignment.Top, VertAlignment.Top };
                 TableStyle commonTableStyle = new TableStyle { Font = font, MarginX = 5, MarginY = 3 };
 
-                Table table2 = new Table(2) { Style = commonTableStyle };
+                var table4 = new Table(2, commonTableStyle);
                 foreach (var item in belowItems1)
                 {
-                    string[] row = new string[] { item.Caption, item.Print(wm).Split(new char[] { '|' })[0] };
-                    table2.AddRow(row, horizAlgn, vertAlgn);
+                    table4.AddRow(new Cell[] { new Cell(item.Caption, font),
+                                               new Cell(item.Print(wm).Split(new char[] { '|' })[0], font) });
                 }
-                table2.Draw(e, leftMarginBelow1, belowTop);
+                table4.Draw(e, leftMarginBelow1, belowTop);
 
 
-                table2 = new Table(2) { Style = commonTableStyle };
+                var table5 = new Table(2, commonTableStyle);
                 foreach (var item in belowItems2)
                 {
-                    string[] row = new string[] { item.Caption, item.Print(wm).Split(new char[] { '|' })[0] };
-                    table2.AddRow(row, horizAlgn, vertAlgn);
+                    table5.AddRow(new Cell[] { new Cell(item.Caption, font),
+                                               new Cell(item.Print(wm).Split(new char[] { '|' })[0], font) });
                 }
-                table2.Draw(e, leftMarginBelow2, belowTop);
+                table5.Draw(e, leftMarginBelow2, belowTop);
 
 
-                table2 = new Table(2) { Style = commonTableStyle };
+                var table6 = new Table(2, commonTableStyle);
                 foreach (var item in belowItems3)
                 {
-                    string[] row = new string[] { item.Caption, item.Print(wm).Split(new char[] { '|' })[0] };
-                    table2.AddRow(row, horizAlgn, vertAlgn);
+                    table6.AddRow(new Cell[] { new Cell(item.Caption, font),
+                                               new Cell(item.Print(wm).Split(new char[] { '|' })[0], font) });
                 }
-                table2.Draw(e, leftMarginBelow3, belowTop);
+                table6.Draw(e, leftMarginBelow3, belowTop);
                 
 
                 ///
@@ -372,9 +373,12 @@ namespace Results.Output.Printers.OnePerMeter
             ///
             /// Page number on each page
             ///
-            string pageNrText = string.Format("{0} {1}/{2}", Strings.Page, pageNr, nrPages);
-            float pageNrWidth = e.Graphics.MeasureString(pageNrText, font).Width;
-            PrintAt(e, pageNrText, font, leftMargin + (printWidth - pageNrWidth) / 2, topMargin + printHeight - spacingOne, 0, 0, Alignment.Left, VertAlignment.Top);
+            if (nrPages != 1)
+            {
+                string pageNrText = string.Format("{0} {1}/{2}", Strings.Page, pageNr, nrPages);
+                float pageNrWidth = e.Graphics.MeasureString(pageNrText, font).Width;
+                PrintAt(e, pageNrText, font, leftMargin + (printWidth - pageNrWidth) / 2, topMargin + printHeight - spacingOne, 0, 0, Alignment.Left, VertAlignment.Top);
+            }
 
             e.HasMorePages = !(pageNr == nrPages);
 

Results/Output/Printers/OnePerMeter/OnePerMeterPrinterCfg.cs

@@ -34,8 +34,8 @@ namespace Results.Output.Printers.OnePerMeter
         public string[] CommonItems2;
         public string[] CommonItems3;
         public Common.TableForm Form;
+        public Common.Alignment Alignment;
         public string[] TestItems;
-        public Common.TableForm Form2;
         public string[] TestItems2;
         public int BelowW0Pct;
         public int BelowW1Pct;

Results/Output/Printers/Zapiska/ZapiskaPrintDocument.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2017 Sensus Metering Systems
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -7,8 +7,6 @@ using System.Drawing;
 using System.Drawing.Printing;
 using System.IO;
 using Common;
-using Config.Entities;
-using Results;
 using Results.Resources;
 
 namespace Results.Output.Printers.Zapiska
@@ -60,15 +58,15 @@ namespace Results.Output.Printers.Zapiska
 		///
 		/// Items to print
 		///
-        string header;
-        IList<WMeterRsltItemSpec> commonItems1;
-		IList<WMeterRsltItemSpec> commonItems2;
-		IList<WMeterRsltItemSpec> commonItems3;
-		IList<WMeterRsltItemSpec> selectedItems;
-        IList<WMeterRsltItemSpec> belowItems1;
-        IList<WMeterRsltItemSpec> belowItems2;
-        IList<WMeterRsltItemSpec> belowItems3;
-        string footer;
+        readonly string header;
+        readonly IList<WMeterRsltItemSpec> commonItems1;
+		readonly IList<WMeterRsltItemSpec> commonItems2;
+		readonly IList<WMeterRsltItemSpec> commonItems3;
+		readonly IList<WMeterRsltItemSpec> selectedItems;
+        readonly IList<WMeterRsltItemSpec> belowItems1;
+        readonly IList<WMeterRsltItemSpec> belowItems2;
+        readonly IList<WMeterRsltItemSpec> belowItems3;
+        readonly string footer;
 
 		///
 		/// Layout and status
@@ -94,20 +92,20 @@ namespace Results.Output.Printers.Zapiska
 			leftMargin = cfg.LeftMargin;
 
 			header = string.IsNullOrEmpty(cfg.Header) ? string.Empty : cfg.Header.Replace("~", Environment.NewLine);
-			commonItems1 = Results.WMeterRsltItemSpec.FromStrArray(cfg.CommonItems1);
-			commonItems2 = Results.WMeterRsltItemSpec.FromStrArray(cfg.CommonItems2);
-			commonItems3 = Results.WMeterRsltItemSpec.FromStrArray(cfg.CommonItems3);
-			selectedItems = Results.WMeterRsltItemSpec.FromStrArray(cfg.SelectedItems);
-            belowItems1 = Results.WMeterRsltItemSpec.FromStrArray(cfg.BelowItems1);
-            belowItems2 = Results.WMeterRsltItemSpec.FromStrArray(cfg.BelowItems2);
-            belowItems3 = Results.WMeterRsltItemSpec.FromStrArray(cfg.BelowItems3);
+			commonItems1 = WMeterRsltItemSpec.FromStrArray(cfg.CommonItems1);
+			commonItems2 = WMeterRsltItemSpec.FromStrArray(cfg.CommonItems2);
+			commonItems3 = WMeterRsltItemSpec.FromStrArray(cfg.CommonItems3);
+			selectedItems = WMeterRsltItemSpec.FromStrArray(cfg.SelectedItems);
+            belowItems1 = WMeterRsltItemSpec.FromStrArray(cfg.BelowItems1);
+            belowItems2 = WMeterRsltItemSpec.FromStrArray(cfg.BelowItems2);
+            belowItems3 = WMeterRsltItemSpec.FromStrArray(cfg.BelowItems3);
             footer = string.IsNullOrEmpty(cfg.Footer) ? string.Empty : cfg.Footer.Replace("~", Environment.NewLine);
 
 			/// Initialize fonts
-			titleFont = new Font((cfg.TitFntFml != null ? cfg.TitFntFml : "Arial"), (cfg.TitFntSz > 0 ? cfg.TitFntSz : 10), (FontStyle)cfg.TitFntSty);
-			headerFont = new Font((cfg.HdrFntFml != null ? cfg.HdrFntFml : "Arial"), (cfg.HdrFntSz > 0 ? cfg.HdrFntSz : 10), (FontStyle)cfg.HdrFntSty);
-			font = new Font((cfg.BodyFntFml != null ? cfg.BodyFntFml : "Arial"), (cfg.BodyFntSz > 0 ? cfg.BodyFntSz : 10), (FontStyle)cfg.BodyFntSty);
-            footerFont = new Font((cfg.FooterFntFml != null ? cfg.FooterFntFml : "Arial"), (cfg.FooterFntSz > 0 ? cfg.FooterFntSz : 10), (FontStyle)cfg.FooterFntSty);
+			titleFont = new Font(cfg.TitFntFml ?? "Arial", cfg.TitFntSz > 0 ? cfg.TitFntSz : 10, (FontStyle)cfg.TitFntSty);
+			headerFont = new Font(cfg.HdrFntFml ?? "Arial", cfg.HdrFntSz > 0 ? cfg.HdrFntSz : 10, (FontStyle)cfg.HdrFntSty);
+			font = new Font(cfg.BodyFntFml ?? "Arial", cfg.BodyFntSz > 0 ? cfg.BodyFntSz : 10, (FontStyle)cfg.BodyFntSty);
+            footerFont = new Font(cfg.FooterFntFml ?? "Arial", cfg.FooterFntSz > 0 ? cfg.FooterFntSz : 10, (FontStyle)cfg.FooterFntSty);
 
 			/// Set print area size and margins (in dots using 100 dpi)
 			DefaultPageSettings.Landscape = (cfg.PageOrientation == PageOrientation.Landscape);
@@ -142,7 +140,7 @@ namespace Results.Output.Printers.Zapiska
 		/// </summary>
 		/// <param name=e></param>
 		/// <remarks></remarks>
-		protected override void OnBeginPrint(System.Drawing.Printing.PrintEventArgs e)
+		protected override void OnBeginPrint(PrintEventArgs e)
 		{
 			base.OnBeginPrint(e);
 		}
@@ -152,7 +150,7 @@ namespace Results.Output.Printers.Zapiska
 		/// </summary>
 		/// <param name=e></param>
 		/// <remarks>This provides the print logic for our document</remarks>
-		protected override void OnPrintPage(System.Drawing.Printing.PrintPageEventArgs e)
+		protected override void OnPrintPage(PrintPageEventArgs e)
 		{
             /// Run base code
             base.OnPrintPage(e);
@@ -330,22 +328,26 @@ namespace Results.Output.Printers.Zapiska
 			///----------
             float footerWidth = Measure(e, footer, footerFont).Width;
             PrintAt(e, leftMargin + (printWidth - footerWidth) / 2, topMargin + printHeight - 2 * spacingOne, 0, footer, footerFont, Alignment.Left);
-            
-            string pageNrText = string.Format("{0} {1}/{2}", Strings.Page, pageNr++, nrPages);
-			float pageNrWidth = e.Graphics.MeasureString(pageNrText, font).Width;
-            PrintAt(e, leftMargin + (printWidth - pageNrWidth) / 2, topMargin + printHeight - spacingOne, 0, pageNrText, font, Alignment.Left);
-		}
+
+            if (nrPages != 1)
+            {
+                string pageNrText = string.Format("{0} {1}/{2}", Strings.Page, pageNr, nrPages);
+                float pageNrWidth = e.Graphics.MeasureString(pageNrText, font).Width;
+                PrintAt(e, leftMargin + (printWidth - pageNrWidth) / 2, topMargin + printHeight - spacingOne, 0, pageNrText, font, Alignment.Left);
+            }
+
+            pageNr++;
+        }
 
 
-		/// <summary>
-		/// Print one water meter results
-		/// </summary>
-		/// <param name="wm">Water meter</param>
-		/// <param name="printedWMNr">Number of the water meter printed</param>
-		/// <param name="top">Top coordinate of watermeter data</param>
-		/// <returns>The height of the printed section</returns>
-		float PrintWMs(System.Drawing.Printing.PrintPageEventArgs e,
-					IList<Results.Entities.WaterMeter> wms, float top)
+        /// <summary>
+        /// Print one water meter results
+        /// </summary>
+        /// <param name="wm">Water meter</param>
+        /// <param name="printedWMNr">Number of the water meter printed</param>
+        /// <param name="top">Top coordinate of watermeter data</param>
+        /// <returns>The height of the printed section</returns>
+        float PrintWMs(PrintPageEventArgs e, IList<Results.Entities.WaterMeter> wms, float top)
 		{
             ///
             /// Prepare table content
@@ -384,7 +386,7 @@ namespace Results.Output.Printers.Zapiska
 		}
 
 
-        float DrawTable(System.Drawing.Printing.PrintPageEventArgs e, float left, float top, string[] header, IList<string[]> rows, Alignment[] alignment)
+        float DrawTable(PrintPageEventArgs e, float left, float top, string[] header, IList<string[]> rows, Alignment[] alignment)
         {
             int tblColumnsCount = header.Length;
 
@@ -462,7 +464,7 @@ namespace Results.Output.Printers.Zapiska
         static Font lastFont = null;
         static float lastSpacing = 0;
 
-        SizeF Measure(System.Drawing.Printing.PrintPageEventArgs e, string paragraph, Font font)
+        SizeF Measure(PrintPageEventArgs e, string paragraph, Font font)
         {
             if (font != lastFont)
             {
@@ -482,7 +484,7 @@ namespace Results.Output.Printers.Zapiska
         }
 
 
-        void PrintAt(System.Drawing.Printing.PrintPageEventArgs e, float x, float y, float width, string paragraph, Font font, Alignment alignment)
+        void PrintAt(PrintPageEventArgs e, float x, float y, float width, string paragraph, Font font, Alignment alignment)
 		{
             SizeF size = Measure(e, paragraph, font);
 

Results/Output/SensusTestInfo.cs

@@ -571,7 +571,7 @@ namespace Results.Output
                 PruefungsNrLog = luID,                                      /// Identification of a flow
                 QBezeichnungLog = fullTestNameWoPart,                       /// Flow name in Oracle database
                 Range = range,
-                Flow = (range == Range.R100_110) ? test.Qfrom : (range == Range.R90_100) ? test.Qto : (test.Qfrom + test.Qto) / 2,
+                Flow = (range == Range.R100_110) ? test.QfromM3ph() : (range == Range.R90_100) ? test.QtoM3ph() : (test.QfromM3ph() + test.QtoM3ph()) / 2,
                 TestTime = (int)Math.Round(test.TestTime),
                 ErrLimLoFromDB = test.ErrLimLo,
                 ErrLimHiFromDB = test.ErrLimHi,

Results/Output/Table.cs

@@ -1,12 +1,11 @@
 ///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
+/// Copyright (c) 2018-2023 Sensus Slovensko a.s.
 ///
-using System;
+using Common;
+using Results.Resources;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Printing;
-using Common;
-using Config.Entities;
 
 namespace Results.Output
 {
@@ -34,35 +33,56 @@ namespace Results.Output
 
     public class Table
     {
-        public readonly int ColumnsCount;
-        public readonly string AutoTestParam;
-        public int RowsCount { get { return Rows.Count; } }
+        public readonly int ColumnsCount;       /// Number of columns including the headers
+        public readonly string AutoTestParam;   /// Reserved for future use
+        public readonly IList<Cell[]> Cells;    /// Table content: List of rows, each row is an array of cells
+        public readonly TableStyle Style;
 
-        public readonly IList<string[]> Rows;
-        public readonly IList<Alignment[]> HorizAlignments;
-        public readonly IList<VertAlignment[]> VertAlignments;
-        public TableStyle Style;
+        /// <summary>
+        /// Calculated by Measure(e)
+        /// </summary>
+        float width;
+        float height;
+        float[] columnWidth;                    /// Widths of columns of cells
+        float[] columnPos;                      /// X-coordinate of positions of texts in columns (MarginX is left empty)
+        float[] vertLinePos;                    /// X-coordinate of positions of vertical lines
+        float[] rowHeight;                      /// Heights of rows of cells
+        float[] rowPos;                         /// Y-coordinate of positions of texts in columns (MarginY is left empty)
+        float[] horizLinePos;                   /// Y-coordinate of positions of horizontal lines
 
+        public int RowsCount                    /// Number of rows including the headers
+        {
+            get { return Cells.Count; }
+        }
 
-        public Table(int columnsCount, string autoTestParam = null)
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="columnsCount">Number of columns</param>
+        /// <param name="autoTestParam">Reserved for future use</param>
+        public Table(int columnsCount, TableStyle style, string autoTestParam = null)
         {
             this.ColumnsCount = columnsCount;
+            this.Style = style;
             this.AutoTestParam = autoTestParam;
 
-            Rows = new List<string[]>();
-            HorizAlignments = new List<Alignment[]>();
-            VertAlignments = new List<VertAlignment[]>();
-            Style = new TableStyle();
+            Cells = new List<Cell[]>();
+            columnWidth = null;
         }
 
-
-        public void AddRow(string[] texts, Alignment[] horizAlignment, VertAlignment[] vertAlignemnt)
+        public void Clear()
         {
-            Rows.Add(texts);
-            HorizAlignments.Add(horizAlignment);
-            VertAlignments.Add(vertAlignemnt);
+            Cells.Clear();
+            columnWidth = null;
         }
 
+        public void AddRow(Cell[] rowOfCells)
+        {
+            if (rowOfCells != null && rowOfCells.Length == ColumnsCount)
+            {
+                Cells.Add(rowOfCells);
+            }
+        }
 
         /// <summary>
         /// Returns true when table has either rows or columns count == 0
@@ -70,235 +90,217 @@ namespace Results.Output
         /// <returns>true when empty</returns>
         public bool IsEmpty()
         {
-            return (Rows == null || RowsCount == 0 || Rows[0] == null || Rows[0].Length == 0);
+            return RowsCount == 0 || ColumnsCount == 0;
         }
 
-
-        public SizeF Measure(System.Drawing.Printing.PrintPageEventArgs e)
+        /// <summary>
+        ///  Calculates table dimensions. Inputs: ColumnsCount, Cells, Style
+        /// </summary>
+        /// <param name="e">PrintPageEventArgs passed to Measure(...)</param>
+        /// <returns>Table width and height (SizeF)</returns>
+        public SizeF Measure(PrintPageEventArgs e)
         {
-            SizeF retVal = new SizeF(0, 0);
+            if (IsEmpty()) return new SizeF(0, 0);      /// Empty table => zero Size
 
-            if (IsEmpty()) return retVal;       /// Empty table => zero Size
+            columnWidth = new float[ColumnsCount];
+            columnPos = new float[ColumnsCount];
+            vertLinePos = new float[ColumnsCount + 1];
 
-            float[] columnWidth = new float[ColumnsCount];
-            float[] rowHeight = new float[RowsCount];
+            rowHeight = new float[RowsCount];
+            rowPos = new float[RowsCount];
+            horizLinePos = new float[RowsCount + 1];
+
+            width = 0;
+            height = 0;
+            vertLinePos[0] = 0;
+            horizLinePos[0] = 0;
 
             ///
-            /// Measure table column widths and header height
+            /// Measure table column widths, vertical line and text positions, etc.
             /// 
             for (int colIx = 0; colIx < ColumnsCount; colIx++)
             {
+                bool hasLineToLeft = false;
+
                 for (int rowIx = 0; rowIx < RowsCount; rowIx++)
                 {
-                    if (Rows[rowIx] == null)
-                    {
-                        /// Separator row -> do nothing
-                    }
-                    else
-                    {
-                        bool isHeader = (colIx < Style.LeftHeadersCount) || (rowIx < Style.TopHeadersCount);
-                        SizeF size = Common.Printers.PrintersCommon.Measure(e, Rows[rowIx][colIx], isHeader ? Style.HeaderFont : Style.Font);
-                        if (size.Width > columnWidth[colIx]) columnWidth[colIx] = size.Width;
-                        if (size.Height > rowHeight[rowIx]) rowHeight[rowIx] = size.Height;
-                    }
+                    Cells[rowIx][colIx].Measure(e);
+
+                    float cellWidth = (Style.ColumnWidths != null && Style.ColumnWidths.Length > colIx)
+                                    ? Style.ColumnWidths[colIx]
+                                    : Cells[rowIx][colIx].Size.Width;
+                    if (cellWidth > columnWidth[colIx]) columnWidth[colIx] = cellWidth;
+
+                    if (Cells[rowIx][colIx].LeftBorder) hasLineToLeft = true;
                 }
 
-                bool hasLineToTheLeft = (Style.VertLines == TableLines.All)
-                                     || ((Style.VertLines == TableLines.FirstAndLast) && (colIx == 0))
-                                     || ((Style.VertLines == TableLines.FirstSecondAndLast) && (colIx <= 1));
-
-                retVal.Width += columnWidth[colIx] + (hasLineToTheLeft ? (Style.LineWidth + Style.MarginX) : 0) + Style.MarginX;
-            }
-            for (int rowIx = 0; rowIx < RowsCount; rowIx++)
-            {
-                if (Rows[rowIx] == null)
-                {
-                    /// Separator row -> do nothing
-                }
-                else
-                {
-                    bool hasLineAbove = (Style.HorizLines == TableLines.All)
-                                     || ((Style.HorizLines == TableLines.FirstAndLast) && (rowIx == 0))
-                                     || ((Style.HorizLines == TableLines.FirstSecondAndLast) && (rowIx <= 1))
-                                     || ((rowIx >= 1) && (Rows[rowIx - 1] == null));
-
-                    retVal.Height += rowHeight[rowIx] + (hasLineAbove ? (Style.LineWidth + Style.MarginY) : 0) + Style.MarginY;
-                }
-            }
-
-            if (Style.VertLines == TableLines.None) retVal.Width -= Style.MarginX;
-            if (Style.HorizLines == TableLines.None) retVal.Height -= Style.MarginY;
-
-            return retVal;
-        }
-
-
-        public float Draw(System.Drawing.Printing.PrintPageEventArgs e, float left, float top)
-        {
-            if (IsEmpty()) return top;          /// Empty table
-
-            int tblColumnsCount = Rows[0].Length;
-
-            float[] columnWidth = new float[tblColumnsCount];
-            float[] columnPos = new float[tblColumnsCount];
-            float[] vertLinePos = new float[tblColumnsCount + 1];
-
-            float[] rowHeight = new float[RowsCount];
-            float[] rowPos = new float[RowsCount];
-            float[] horizLinePos = new float[RowsCount + 1];
-
-            ///
-            /// Measure table column widths and header height
-            /// 
-            vertLinePos[0] = left;
-            horizLinePos[0] = top;
-            for (int colIx = 0; colIx < tblColumnsCount; colIx++)
-            {
-                for (int rowIx = 0; rowIx < RowsCount; rowIx++)
-                {
-                    if (Rows[rowIx] != null)
-                    {
-                        /// In not a separator line
-                        bool isHeader = (colIx < Style.LeftHeadersCount) || (rowIx < Style.TopHeadersCount);
-                        SizeF size = Common.Printers.PrintersCommon.Measure(e, Rows[rowIx][colIx], isHeader ? Style.HeaderFont : Style.Font);
-                        if ((Style.ColumnWidths != null) && (Style.ColumnWidths.Length > colIx))
-                        {
-                            size.Width = Style.ColumnWidths[colIx]; /// Override measurement if column width is defined
-                        }
-                        if (size.Width > columnWidth[colIx]) columnWidth[colIx] = size.Width;
-                        if (size.Height > rowHeight[rowIx]) rowHeight[rowIx] = size.Height;
-                    }
-                    else
-                    {
-                        /// Separator line -> do nothing                        
-                        rowHeight[rowIx] = 0;
-                    }
-                }
-
-                bool hasLineToTheLeft = (Style.VertLines == TableLines.All)
-                                     || ((Style.VertLines == TableLines.FirstAndLast) && (colIx == 0))
-                                     || ((Style.VertLines == TableLines.FirstSecondAndLast) && (colIx <= 1));
-
-                columnPos[colIx] = vertLinePos[colIx] + (hasLineToTheLeft ? (Style.LineWidth + Style.MarginX) : 0);
+                width += columnWidth[colIx] + (hasLineToLeft ? (Style.LineWidth + Style.MarginX) : 0) + Style.MarginX;
+                columnPos[colIx] = vertLinePos[colIx] + (hasLineToLeft ? (Style.LineWidth + Style.MarginX) : 0);
                 vertLinePos[colIx + 1] = columnPos[colIx] + columnWidth[colIx] + Style.MarginX;
             }
+
+            ///
+            /// Measure table row heights, horixontal line and text positions, etc.
+            /// 
             for (int rowIx = 0; rowIx < RowsCount; rowIx++)
             {
-                if (Rows[rowIx] != null)
-                {
-                    /// In not a separator line
-                    bool hasLineAbove = (Style.HorizLines == TableLines.All)
-                                     || ((Style.HorizLines == TableLines.FirstAndLast) && (rowIx == 0))
-                                     || ((Style.HorizLines == TableLines.FirstSecondAndLast) && (rowIx <= 1))
-                                     || ((rowIx >= 1) && (Rows[rowIx - 1] == null));
+                bool hasLineAbove = false;
 
-                    rowPos[rowIx] = horizLinePos[rowIx] + (hasLineAbove ? Style.MarginY : 0);
-                    horizLinePos[rowIx + 1] = rowPos[rowIx] + rowHeight[rowIx] + Style.LineWidth + Style.MarginY;
-                }
-                else if (rowIx > 0)
+                for (int colIx = 0; colIx < ColumnsCount; colIx++)
                 {
-                    /// Separator line
-                    rowPos[rowIx] = rowPos[rowIx - 1];
-                    horizLinePos[rowIx + 1] = horizLinePos[rowIx];
+                    if (Cells[rowIx][colIx].Size.Height > rowHeight[rowIx]) rowHeight[rowIx] = Cells[rowIx][colIx].Size.Height;
+                    if (Cells[rowIx][colIx].TopBorder) hasLineAbove = true;
                 }
+
+                height += rowHeight[rowIx] + (hasLineAbove ? (Style.LineWidth + Style.MarginY) : 0) + Style.MarginY;
+                rowPos[rowIx] = horizLinePos[rowIx] + (hasLineAbove ? Style.MarginY : 0);
+                horizLinePos[rowIx + 1] = rowPos[rowIx] + rowHeight[rowIx] + Style.LineWidth + Style.MarginY;
             }
 
-            /// Horizontal lines
-            float tableLeftX = left;
-            float tableRightX = vertLinePos[tblColumnsCount] + Style.LineWidth;
-            if (Style.HorizLines != TableLines.None)
+            if (Style.VertLines == TableLines.None) width -= Style.MarginX;
+            if (Style.HorizLines == TableLines.None) height -= Style.MarginY;
+
+            return new SizeF(width, height);
+        }
+
+        /// <summary>
+        /// Prints a table defined by ColumnsCount, Rows, HorizAlignments, VertAlignments and Style
+        /// </summary>
+        /// <param name="e">PrintPageEventArgs passed to Measure(.), DrawLine(.) and PrintAt(.)</param>
+        /// <param name="left">X-coordinate of the top-left corner of the table</param>
+        /// <param name="top">Y-coordinate of the top-left corner of the table</param>
+        /// <returns>Y-coordinate for a next item following this table on a page</returns>
+        public float Draw(PrintPageEventArgs e, float left, float top)
+        {
+            if (IsEmpty()) return top;   /// Empty table or Mesure(e) have not been called yet
+
+            if (columnWidth == null) Measure(e);
+
+            for (int rowIx = 0; rowIx <= RowsCount; rowIx++)
             {
-                for (int rowIx = 0; rowIx <= RowsCount; rowIx++)
+                for (int colIx = 0; colIx <= ColumnsCount; colIx++)
                 {
-                    if (Style.HorizLines == TableLines.All || rowIx == 0
-                                                           || rowIx == RowsCount
-                                                           || (Style.HorizLines == TableLines.FirstSecondAndLast && rowIx == 1)
-                                                           || ((rowIx >= 1) && (Rows[rowIx - 1] == null)))
+                    ///
+                    /// Draw horizontal line
+                    ///
+                    if (colIx < ColumnsCount && Style.HorizLines != TableLines.None &&
+                            (rowIx == 0 || rowIx == RowsCount || Cells[rowIx][colIx].TopBorder))
                     {
-                        e.Graphics.DrawLine(new Pen(Color.Black, Style.LineWidth), new PointF(tableLeftX, horizLinePos[rowIx] + Style.LineWidth / 2), new PointF(tableRightX, horizLinePos[rowIx] + Style.LineWidth / 2));
+                        e.Graphics.DrawLine(new Pen(Color.Black, Style.LineWidth),
+                            new PointF(left + vertLinePos[colIx],                       top + horizLinePos[rowIx] + Style.LineWidth / 2),
+                            new PointF(left + vertLinePos[colIx + 1] + Style.LineWidth, top + horizLinePos[rowIx] + Style.LineWidth / 2));
+                    }
+
+                    ///
+                    /// Draw vertical line
+                    ///
+                    if (rowIx < RowsCount && Style.VertLines != TableLines.None &&
+                            (colIx == 0 || colIx == ColumnsCount || Cells[rowIx][colIx].LeftBorder))
+                    {
+                        e.Graphics.DrawLine(new Pen(Color.Black, Style.LineWidth),
+                            new PointF(left + vertLinePos[colIx] + Style.LineWidth / 2, top + horizLinePos[rowIx]),
+                            new PointF(left + vertLinePos[colIx] + Style.LineWidth / 2, top + horizLinePos[rowIx + 1] + Style.LineWidth));
+                    }
+
+                    ///
+                    /// Draw table item (a text)
+                    ///
+                    if (rowIx < RowsCount && colIx < ColumnsCount)      /// Make sure Cells[][] indices are within range
+                    {
+                        if (!Cells[rowIx][colIx].BottomMerge && !Cells[rowIx][colIx].RightMerge)
+                        {
+                            /// This is not a cell that is merged with a subsequent cell => print content
+
+                            /// Calculate X-coordinate taking into account cell merging
+                            float mergedColPos = columnPos[colIx];
+                            int mergedCellsCount = 1;
+                            for (int colIx2 = colIx - 1; colIx2 >= 0 && Cells[rowIx][colIx2].RightMerge; colIx2--)
+                            {
+                                mergedColPos += columnPos[colIx2];
+                                mergedCellsCount++;
+                            }
+                            mergedColPos /= mergedCellsCount;
+
+                            /// Calculate Y-coordinate taking into account cell merging
+                            float mergedRowPos = rowPos[rowIx];
+                            mergedCellsCount = 1;
+                            for (int rowIx2 = rowIx - 1; rowIx2 >= 0 && Cells[rowIx2][colIx].BottomMerge; rowIx2--)
+                            {
+                                mergedRowPos += rowPos[rowIx2];
+                                mergedCellsCount++;
+                            }
+                            mergedRowPos /= mergedCellsCount;
+
+                            /// Print the text at the calculated position
+                            Common.Printers.PrintersCommon.PrintAt(e, Cells[rowIx][colIx].Text,
+                                                                      Cells[rowIx][colIx].Font,
+                                                                      left + mergedColPos,
+                                                                      top + mergedRowPos,
+                                                                      columnWidth[colIx],
+                                                                      rowHeight[rowIx],
+                                                                      Cells[rowIx][colIx].HorizAlignment,
+                                                                      Cells[rowIx][colIx].VertAlignment);
+                        }
                     }
                 }
             }
 
-            /// Vertical lines
-            float tableTopY = top;
-            float tableBottomY = horizLinePos[RowsCount] + Style.LineWidth;
-            if (Style.VertLines != TableLines.None)
-            {
-                for (int colIx = 0; colIx <= tblColumnsCount; colIx++)
-                {
-                    if (Style.VertLines == TableLines.All || colIx == 0 || colIx == ColumnsCount || (Style.VertLines == TableLines.FirstSecondAndLast && colIx == 1))
-                    {
-                        e.Graphics.DrawLine(new Pen(Color.Black, Style.LineWidth), new PointF(vertLinePos[colIx] + Style.LineWidth / 2, tableTopY), new PointF(vertLinePos[colIx] + Style.LineWidth / 2, tableBottomY));
-                    }
-                }
-            }
-
-            ///
-            /// Draw table body
-            ///
-            for (int rowIndex = 0; rowIndex < RowsCount; rowIndex++)
-            {
-                string[] oneTableRow = Rows[rowIndex];
-                if (oneTableRow != null)
-                {
-                    Alignment[] horizAlignment = HorizAlignments[(RowsCount > rowIndex) ? rowIndex : 0];
-                    VertAlignment[] vertAlignment = VertAlignments[(RowsCount > rowIndex) ? rowIndex : 0];
-                    for (int colIndex = 0; colIndex < tblColumnsCount; colIndex++)
-                    {
-                        bool isHeader = (colIndex < Style.LeftHeadersCount) || (rowIndex < Style.TopHeadersCount);
-                        Common.Printers.PrintersCommon.PrintAt(e, oneTableRow[colIndex],
-                                                           isHeader ? Style.HeaderFont : Style.Font,
-                                                           columnPos[colIndex],
-                                                           rowPos[rowIndex],
-                                                           columnWidth[colIndex],
-                                                           rowHeight[rowIndex],
-                                                           horizAlignment[colIndex],
-                                                           vertAlignment[colIndex]);
-                    }
-                }
-            }
-
-            return tableBottomY;
+            return top + horizLinePos[RowsCount] + Style.LineWidth;
         }
 
 
-        public static Table Create_TestsAreRows(Results.Entities.WaterMeter wm, IList<WMeterRsltItemSpec> items, TableStyle style, string autoTestParam = null)
+        public static Table Create_TestsAreRows(Entities.WaterMeter wm, IList<WMeterRsltItemSpec> items, TableStyle style, string autoTestParam = null)
         {
-            /// Top row contains column captions
+            /// Select results to be printed
+            var mtrTestRslts = string.IsNullOrEmpty(autoTestParam) ? wm.RegularMeterTestRslts() : wm.AutoMeterTestRslts(autoTestParam);
 
-            Table table = new Table(items.Count);
-            table.Style = style;
-
-            string[] tableHeader = new string[table.ColumnsCount];
-            Alignment[] horizAlignment = new Alignment[table.ColumnsCount];
-            VertAlignment[] vertAlignment = new VertAlignment[table.ColumnsCount];
-            for (int i = 0; i < table.ColumnsCount; i++)
-            {
-                tableHeader[i] = items[i].Caption;
-                horizAlignment[i] = Alignment.Center;
-                vertAlignment[i] = VertAlignment.Middle;
-            }
-            table.AddRow(tableHeader, horizAlignment, vertAlignment);
-
-            WMeterRsltItemSpec.TableRowNr = 1;
-            foreach (var mtr in string.IsNullOrEmpty(autoTestParam) ? wm.RegularMeterTestRslts() : wm.AutoMeterTestRslts(autoTestParam))
+            ///
+            /// Calculate rows count
+            ///
+            int rowsCount = 1;          /// Top row contains item captions
+            foreach (var mtr in mtrTestRslts)
             {
                 if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always)
                 {
-                    string[] oneTableRow = new string[table.ColumnsCount];
-                    horizAlignment = new Alignment[table.ColumnsCount];
-                    vertAlignment = new VertAlignment[table.ColumnsCount];
+                    rowsCount++;        /// One additional row for each test to be published
+                }
+            }
 
-                    for (int i = 0; i < table.ColumnsCount; i++)
+            Table table = new Table(items.Count, style);
+
+            ///
+            /// Top row contains column captions
+            ///
+            var header = new Cell[items.Count];
+            for (int i = 0; i < items.Count; i++)
+            {
+                header[i] = new Cell(items[i].Caption, style.HeaderFont, Alignment.Center, VertAlignment.Middle, true, true);
+            }
+            table.AddRow(header);
+
+            ///
+            /// Create and add a row for each test
+            ///
+            WMeterRsltItemSpec.TableRowNr = 1;
+            foreach (var mtr in mtrTestRslts)
+            {
+                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always)
+                {
+                    var aTableRow = new Cell[items.Count];
+                    for (int i = 0; i < items.Count; i++)
                     {
                         WMeterRsltItemSpec.TableColumnNr = i + 1;
-                        oneTableRow[i] = items[i].Print(wm, mtr.Name()).Split(new char[] { '|' })[0];
-                        horizAlignment[i] = items[i].Alignment;
-                        vertAlignment[i] = VertAlignment.Middle;
+                        string text = items[i].Print(wm, mtr.Name()).Split(new char[] { '|' })[0];
+                        aTableRow[i] = new Cell(text,
+                                                style.Font,
+                                                items[i].Alignment,
+                                                VertAlignment.Middle,
+                                                (WMeterRsltItemSpec.TableRowNr == 1) || !items[i].Merge,
+                                                true,
+                                                (WMeterRsltItemSpec.TableRowNr != rowsCount - 1) && items[i].Merge,
+                                                false);
                     }
-
-                    table.AddRow(oneTableRow, horizAlignment, vertAlignment);
+                    table.AddRow(aTableRow);
 
                     WMeterRsltItemSpec.TableRowNr++;
                 }
@@ -307,16 +309,25 @@ namespace Results.Output
             return table;
         }
 
-
-        public static Table Create_TestsAreColumns(Results.Entities.WaterMeter wm, IList<WMeterRsltItemSpec> items, TableStyle style, string autoTestParam = null)
+        /// <summary>
+        /// Create a table where tests are in columns.
+        /// Left column contains item (or row) captions.
+        /// </summary>
+        /// <param name="wm">Water meter</param>
+        /// <param name="items">Result items</param>
+        /// <param name="style">Table style</param>
+        /// <param name="autoTestParam">Auto test parameter</param>
+        /// <returns>Table to be printed</returns>
+        public static Table Create_TestsAreColumns(Entities.WaterMeter wm, IList<WMeterRsltItemSpec> items, TableStyle style, string autoTestParam = null)
         {
-            /// Left column contains row captions
+            /// Select results to be printed
+            var mtrTestRslts = string.IsNullOrEmpty(autoTestParam) ? wm.RegularMeterTestRslts() : wm.AutoMeterTestRslts(autoTestParam);
 
             ///
             /// Calculate columns count
             ///
-            int columnsCount = 1;          /// Left column contains item caption                         
-            foreach (var mtr in string.IsNullOrEmpty(autoTestParam) ? wm.RegularMeterTestRslts() : wm.AutoMeterTestRslts(autoTestParam))
+            int columnsCount = 1;          /// Left column contains item captions
+            foreach (var mtr in mtrTestRslts)
             {
                 if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always)
                 {
@@ -324,39 +335,65 @@ namespace Results.Output
                 }
             }
 
-            Table table = new Table(columnsCount);
-            table.Style = style;
+            Table table = new Table(columnsCount, style);
 
             ///
             /// Table content
             ///
+            bool separatorLineSignalled = false;
             WMeterRsltItemSpec.TableRowNr = 1;
             for (int i = 0; i < items.Count; i++)
             {
-                string[] oneTableRow = new string[columnsCount];
-                Alignment[] horizAlignment = new Alignment[columnsCount];
-                VertAlignment[] vertAlignment = new VertAlignment[columnsCount];
+                if (items[i].Uid == (int)ItemID.Separator)
+                {
+                    /// Insert a separator line (topBorder = true for all row cells)
+                    separatorLineSignalled = true;
+                    continue;
+                }
 
-                oneTableRow[0] = items[i].Caption;
-                horizAlignment[0] = Alignment.Center;
-                vertAlignment[0] = VertAlignment.Middle;
+                bool topBorder = (style.HorizLines == TableLines.All)
+                              || (style.HorizLines == TableLines.FirstAndLast && i == 0)
+                              || (style.HorizLines == TableLines.FirstSecondAndLast && i <= 1)
+                              || separatorLineSignalled;
+
+                separatorLineSignalled = false;
+
+                Cell[] aTableRow = new Cell[columnsCount];
+
+                aTableRow[0] = new Cell(items[i].Caption,
+                                        style.HeaderFont,
+                                        Alignment.Center,
+                                        VertAlignment.Middle,
+                                        topBorder,
+                                        style.VertLines != TableLines.None);
 
                 WMeterRsltItemSpec.TableColumnNr = 1;
-                foreach (var mtr in string.IsNullOrEmpty(autoTestParam) ? wm.RegularMeterTestRslts() : wm.AutoMeterTestRslts(autoTestParam))
+                for (int j = 0; j < mtrTestRslts.Count; j++)
                 {
+                    var mtr = mtrTestRslts[j];
+
+                    bool leftBorder = (style.VertLines == TableLines.All && (!items[i].Merge || j == 0))
+                                   || (style.VertLines == TableLines.FirstSecondAndLast && j == 0);
+
                     if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always)
                     {
-                        /// Strip color information
-                        oneTableRow[WMeterRsltItemSpec.TableColumnNr] =
-                            items[i].Print(wm, mtr.Name()).Split(new char[] { '|' })[0];
-                        horizAlignment[WMeterRsltItemSpec.TableColumnNr] = items[i].Alignment;
-                        vertAlignment[WMeterRsltItemSpec.TableColumnNr] = VertAlignment.Middle;
+                        /// Get a text, strip color information
+                        string text = items[i].Print(wm, mtr.Name()).Split(new char[] { '|' })[0];
+
+                        aTableRow[WMeterRsltItemSpec.TableColumnNr] = new Cell(text,
+                                                                               style.Font,
+                                                                               items[i].Alignment,
+                                                                               VertAlignment.Middle,
+                                                                               topBorder,
+                                                                               leftBorder,
+                                                                               false,
+                                                                               (WMeterRsltItemSpec.TableColumnNr + 1 != columnsCount) && items[i].Merge);
 
                         WMeterRsltItemSpec.TableColumnNr++;
                     }
                 }
 
-                table.AddRow(oneTableRow, horizAlignment, vertAlignment);
+                table.AddRow(aTableRow);
 
                 WMeterRsltItemSpec.TableRowNr++;
             }
@@ -365,15 +402,26 @@ namespace Results.Output
         }
 
 
-        public static Table Create_TestsAreColumnsPL(Results.Entities.WaterMeter wm, IList<WMeterRsltItemSpec> items, TableStyle style, string autoTestParam = null)
+        /// <summary>
+        /// Create a table where tests are in columns.
+        /// Two leftmost columns contains item (or row) captions and units.
+        /// Separator lines can be inserted between rows.
+        /// </summary>
+        /// <param name="wm">Water meter</param>
+        /// <param name="items">Result items</param>
+        /// <param name="style">Table style</param>
+        /// <param name="autoTestParam">Auto test parameter</param>
+        /// <returns>Table to be printed</returns>
+        public static Table Create_TestsAreColumnsPL(Entities.WaterMeter wm, IList<WMeterRsltItemSpec> items, TableStyle style, string autoTestParam = null)
         {
-            /// Left column contains row captions
+            /// Select results to be printed
+            var mtrTestRslts = string.IsNullOrEmpty(autoTestParam) ? wm.RegularMeterTestRslts() : wm.AutoMeterTestRslts(autoTestParam);
 
             ///
             /// Calculate columns count
             ///
-            int columnsCount = 2;          /// Left two columns contain item caption and units
-            foreach (var mtr in string.IsNullOrEmpty(autoTestParam) ? wm.RegularMeterTestRslts() : wm.AutoMeterTestRslts(autoTestParam))
+            int columnsCount = 2;          /// Two left columns contain item caption and unit
+            foreach (var mtr in mtrTestRslts)
             {
                 if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always)
                 {
@@ -381,51 +429,73 @@ namespace Results.Output
                 }
             }
 
-            Table table = new Table(columnsCount);
-            table.Style = style;
+            Table table = new Table(columnsCount, style);
 
             ///
             /// Table content
             ///
+            bool separatorLineSignalled = false;
             WMeterRsltItemSpec.TableRowNr = 1;
             for (int i = 0; i < items.Count; i++)
             {
                 if (items[i].Uid == (int)ItemID.Separator)
                 {
-                    table.AddRow(null, null, null);     /// 'separator' row
+                    /// Insert a separator line (topBorder = true for all row cells)
+                    separatorLineSignalled = true;
+                    continue;
                 }
-                else
+
+                bool topBorder = (style.HorizLines == TableLines.All)
+                              || (style.HorizLines == TableLines.FirstAndLast && i == 0)
+                              || (style.HorizLines == TableLines.FirstSecondAndLast && i <= 1)
+                              || separatorLineSignalled;
+
+                separatorLineSignalled = false;
+
+                Cell[] aTableRow = new Cell[columnsCount];
+
+                aTableRow[0] = new Cell(items[i].Caption,
+                                        style.HeaderFont,
+                                        Alignment.Center,
+                                        VertAlignment.Middle,
+                                        topBorder,
+                                        style.VertLines != TableLines.None);
+
+                aTableRow[1] = new Cell((i == 0) ? Strings.Unit : items[i].Units.ToDescription(),
+                                        style.HeaderFont,
+                                        Alignment.Center,
+                                        VertAlignment.Middle,
+                                        topBorder,
+                                        style.VertLines == TableLines.All || style.VertLines == TableLines.FirstSecondAndLast);
+
+                WMeterRsltItemSpec.TableColumnNr = 1;
+                for (int j = 0; j < mtrTestRslts.Count; j++)
                 {
-                    string[] oneTableRow = new string[columnsCount];
-                    Alignment[] horizAlignment = new Alignment[columnsCount];
-                    VertAlignment[] vertAlignment = new VertAlignment[columnsCount];
+                    var mtr = mtrTestRslts[j];
 
-                    oneTableRow[0] = items[i].Caption;
-                    horizAlignment[0] = Alignment.Center;
-                    vertAlignment[0] = VertAlignment.Middle;
+                    bool leftBorder = (style.VertLines == TableLines.All && (!items[i].Merge || j == 0))
+                                   || (style.VertLines == TableLines.FirstSecondAndLast && WMeterRsltItemSpec.TableColumnNr == 1);
 
-                    oneTableRow[1] = (i == 0) ? "Jednostka" : items[i].Units.ToDescription();
-                    horizAlignment[1] = Alignment.Center;
-                    vertAlignment[1] = VertAlignment.Middle;
-
-                    WMeterRsltItemSpec.TableColumnNr = 1;
-                    foreach (var mtr in string.IsNullOrEmpty(autoTestParam) ? wm.RegularMeterTestRslts() : wm.AutoMeterTestRslts(autoTestParam))
+                    if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always)
                     {
-                        if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always)
-                        {
-                            int colIx = WMeterRsltItemSpec.TableColumnNr + 1;
+                        /// Get a text, strip color information
+                        string text = items[i].Print(wm, mtr.Name()).Split(new char[] { '|' })[0];
 
-                            /// Strip color information
-                            oneTableRow[colIx] = items[i].Print(wm, mtr.Name()).Split(new char[] { '|' })[0];
-                            horizAlignment[colIx] = items[i].Alignment;
-                            vertAlignment[colIx] = VertAlignment.Middle;
+                        aTableRow[WMeterRsltItemSpec.TableColumnNr + 1] = new Cell(text,
+                                                                                   style.Font,
+                                                                                   items[i].Alignment,
+                                                                                   VertAlignment.Middle,
+                                                                                   topBorder,
+                                                                                   leftBorder,
+                                                                                   false,
+                                                                                   (WMeterRsltItemSpec.TableColumnNr + 2 != columnsCount) && items[i].Merge);
 
-                            WMeterRsltItemSpec.TableColumnNr++;
-                        }
+                        WMeterRsltItemSpec.TableColumnNr++;
                     }
-
-                    table.AddRow(oneTableRow, horizAlignment, vertAlignment);
                 }
+
+                table.AddRow(aTableRow);
+
                 WMeterRsltItemSpec.TableRowNr++;
             }
 

Results/Output/WMChart.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2019-2022 Sensus Metering Systems
+/// Copyright (c) 2019-2023 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -55,6 +55,9 @@ namespace Results.Output
             chArea.AxisX.LogarithmBase = 10;
             chArea.AxisX.IsLabelAutoFit = true;
 
+            Series upperLimit = new Series { Name = Strings.Upper_limit, ChartArea = "ChartArea1", ChartType = SeriesChartType.Line, Color = Color.Red };
+            Series lowerLimit = new Series { Name = Strings.Lower_limit, ChartArea = "ChartArea1", ChartType = SeriesChartType.Line, Color = Color.Red };
+
             List<double> xs = new List<double>() { 0.0001, 0.0002, 0.0005,
                                                    0.001, 0.002, 0.005,
                                                    0.01, 0.02, 0.05,
@@ -71,6 +74,8 @@ namespace Results.Output
             double from = Common.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q1_Qmin);
             double to = Common.Units.ConvertTo(flowUnit, isQ4 ? wm.WaterMeterData.Q4_Qmax : wm.WaterMeterData.Q3_Qn);
             bool inRange = false;
+            double qSharp = (wm.WaterMeterData.Qnames == (sbyte)FlowNames.QpQi) ? GetQsharp(wm, flowUnit) : 0;
+            double lastXs = 0;
             for (int i = 0; i < xs.Count - 3; i += 3)
             {
                 if (xs[i] <= from && from < xs[i + 3])
@@ -88,6 +93,37 @@ namespace Results.Output
                         cl.FromPosition = Math.Log10(xs[j] * spacer);
                         cl.ToPosition = Math.Log10(xs[j] / spacer);
                         chArea.AxisX.CustomLabels.Add(cl);
+
+                        if (wm.WaterMeterData.Qnames == (sbyte)FlowNames.QpQi)
+                        {
+                            if (lastXs != 0)
+                            {
+                                double insertedXs = Math.Sqrt(lastXs * xs[j]);
+
+                                if (lastXs < qSharp && qSharp < insertedXs)
+                                {
+                                    double errLim3 = GetErrorLimit(wm, flowUnit, qSharp);
+                                    lowerLimit.Points.AddXY(qSharp, -errLim3);
+                                    upperLimit.Points.AddXY(qSharp, +errLim3);
+                                }
+
+                                double errLim2 = GetErrorLimit(wm, flowUnit, insertedXs);
+                                lowerLimit.Points.AddXY(insertedXs, -errLim2);
+                                upperLimit.Points.AddXY(insertedXs, +errLim2);
+
+                                if (insertedXs < qSharp && qSharp < xs[j])
+                                {
+                                    double errLim3 = GetErrorLimit(wm, flowUnit, qSharp);
+                                    lowerLimit.Points.AddXY(qSharp, -errLim3);
+                                    upperLimit.Points.AddXY(qSharp, +errLim3);
+                                }
+                            }
+                            lastXs = xs[j];
+
+                            double errLim = GetErrorLimit(wm, flowUnit, xs[j]);
+                            lowerLimit.Points.AddXY(xs[j], -errLim);
+                            upperLimit.Points.AddXY(xs[j], +errLim);
+                        }
                     }
                 }
 
@@ -101,6 +137,36 @@ namespace Results.Output
                     cl.ToPosition = Math.Log10(xs[i + 3] / spacer);
                     chArea.AxisX.CustomLabels.Add(cl);
 
+                    if (wm.WaterMeterData.Qnames == (sbyte)FlowNames.QpQi)
+                    {
+                        if (lastXs != 0)
+                        {
+                            double insertedXs = Math.Sqrt(lastXs * xs[i + 3]);
+
+                            if (lastXs < qSharp && qSharp < insertedXs)
+                            {
+                                double errLim3 = GetErrorLimit(wm, flowUnit, qSharp);
+                                lowerLimit.Points.AddXY(qSharp, -errLim3);
+                                upperLimit.Points.AddXY(qSharp, +errLim3);
+                            }
+
+                            double errLim2 = GetErrorLimit(wm, flowUnit, insertedXs);
+                            lowerLimit.Points.AddXY(insertedXs, -errLim2);
+                            upperLimit.Points.AddXY(insertedXs, +errLim2);
+
+                            if (insertedXs < qSharp && qSharp < xs[i + 3])
+                            {
+                                double errLim3 = GetErrorLimit(wm, flowUnit, qSharp);
+                                lowerLimit.Points.AddXY(qSharp, -errLim3);
+                                upperLimit.Points.AddXY(qSharp, +errLim3);
+                            }
+                        }
+
+                        double errLim = GetErrorLimit(wm, flowUnit, xs[i + 3]);
+                        lowerLimit.Points.AddXY(xs[i + 3], -errLim);
+                        upperLimit.Points.AddXY(xs[i + 3], +errLim);
+                    }
+
                     break;
                 }
             }
@@ -111,19 +177,20 @@ namespace Results.Output
 
             Legend legend1 = new Legend { Name = "Legend1" };
 
-            Series upperLimit = new Series { Name = Strings.Upper_limit, ChartArea = "ChartArea1", ChartType = SeriesChartType.Line, Color = Color.Red };
-            upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q1_Qmin), 5);
-            upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), 5);
-            upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), 2);
-            upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q3_Qn), 2);
-            if (isQ4) upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q4_Qmax), 2);
+            if (wm.WaterMeterData.Qnames == (sbyte)FlowNames.Q3Q2Q1 || wm.WaterMeterData.Qnames == (sbyte)FlowNames.QnQtQmin)
+            {
+                upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q1_Qmin), wm.WaterMeterData.ErrLimLoQ);
+                upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), wm.WaterMeterData.ErrLimLoQ);
+                upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), wm.WaterMeterData.ErrLimHiQ);
+                upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q3_Qn), wm.WaterMeterData.ErrLimHiQ);
+                if (isQ4) upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q4_Qmax), wm.WaterMeterData.ErrLimHiQ);
 
-            Series lowerLimit = new Series { Name = Strings.Lower_limit, ChartArea = "ChartArea1", ChartType = SeriesChartType.Line, Color = Color.Red };
-            lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q1_Qmin), -5);
-            lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), -5);
-            lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), -2);
-            lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q3_Qn), -2);
-            if (isQ4) lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q4_Qmax), -2);
+                lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q1_Qmin), -wm.WaterMeterData.ErrLimLoQ);
+                lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), -wm.WaterMeterData.ErrLimLoQ);
+                lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), -wm.WaterMeterData.ErrLimHiQ);
+                lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q3_Qn), -wm.WaterMeterData.ErrLimHiQ);
+                if (isQ4) lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q4_Qmax), -wm.WaterMeterData.ErrLimHiQ);
+            }
 
             Series line = new Series { Name = Strings.Relative_error, ChartArea = "ChartArea1", ChartType = SeriesChartType.Line, Color = Color.DeepSkyBlue };
             Series dots = new Series { Name = Strings.Relative_error + " ", ChartArea = "ChartArea1", ChartType = SeriesChartType.Point, Color = Color.RoyalBlue };
@@ -137,12 +204,38 @@ namespace Results.Output
 
             chart.ChartAreas.Add(chArea);
             chart.Legends.Add(legend1);
-            chart.Series.Add(upperLimit);
-            chart.Series.Add(lowerLimit);
+            if (upperLimit.Points.Count > 1) chart.Series.Add(upperLimit);
+            if (lowerLimit.Points.Count > 1) chart.Series.Add(lowerLimit);
             chart.Series.Add(dots);
             chart.Series.Add(line);
             
             return chart;
         }
+
+        static double GetErrorLimit(WaterMeter wm, Unit flowUnit, double x)
+        {
+            double flow_m3 = Units.ConvertFrom(flowUnit, x);
+            switch (Convert.ToInt32(wm.WaterMeterData.Q2_Qt))
+            {
+                default:
+                case 1: return Math.Min(3.5, 1.0 + 0.01 * wm.WaterMeterData.Q3_Qn / flow_m3);
+                case 2: return Math.Min(5.0, 2.0 + 0.02 * wm.WaterMeterData.Q3_Qn / flow_m3);
+                case 3: return Math.Min(5.0, 3.0 + 0.05 * wm.WaterMeterData.Q3_Qn / flow_m3);
+            }
+        }
+
+        static double GetQsharp(WaterMeter wm, Unit flowUnit)
+        {
+            double qSharp;
+            switch (Convert.ToInt32(wm.WaterMeterData.Q2_Qt))
+            {
+                default:
+                case 1: qSharp = (0.01 / 2.5) * wm.WaterMeterData.Q3_Qn; break;
+                case 2: qSharp = (0.02 / 3.0) * wm.WaterMeterData.Q3_Qn; break;
+                case 3: qSharp = (0.05 / 2.0) * wm.WaterMeterData.Q3_Qn; break;
+            }
+            return Units.ConvertTo(flowUnit, qSharp);
+
+        }
     }
 }

Results/Resources/Strings.Designer.cs

@@ -19,7 +19,7 @@ namespace Results.Resources {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Strings {
@@ -573,6 +573,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Merge.
+        /// </summary>
+        internal static string Merge {
+            get {
+                return ResourceManager.GetString("Merge", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Meter type.
         /// </summary>

Results/Resources/Strings.cs.resx

@@ -348,4 +348,7 @@
   <data name="Workstep" xml:space="preserve">
     <value>Krok</value>
   </data>
+  <data name="Merge" xml:space="preserve">
+    <value>Spojit</value>
+  </data>
 </root>

Results/Resources/Strings.pl.resx

@@ -163,22 +163,22 @@
     <value>Stan końcowy</value>
   </data>
   <data name="ErrLimHi" xml:space="preserve">
-    <value>Max. Dopuszczalny błąd</value>
+    <value>Max. dopuszczalny błąd</value>
   </data>
   <data name="ErrLimLo" xml:space="preserve">
-    <value>Min. Dopuszczalny błąd</value>
+    <value>Min. dopuszczalny błąd</value>
   </data>
   <data name="Error" xml:space="preserve">
     <value>Błąd</value>
   </data>
   <data name="ErrRef" xml:space="preserve">
-    <value>Zakres błędów</value>
+    <value>Błąd wzorcowy</value>
   </data>
   <data name="Err_aux" xml:space="preserve">
-    <value>Błąd dopuszczalny</value>
+    <value>Błąd dodatkowy</value>
   </data>
   <data name="Err_main" xml:space="preserve">
-    <value>Błąd podstawowy</value>
+    <value>Błąd główny</value>
   </data>
   <data name="Flow" xml:space="preserve">
     <value>Przepływ</value>

Results/Resources/Strings.resx

@@ -849,4 +849,7 @@
   <data name="Workstep" xml:space="preserve">
     <value>Workstep</value>
   </data>
+  <data name="Merge" xml:space="preserve">
+    <value>Merge</value>
+  </data>
 </root>

Results/Results.csproj

@@ -75,12 +75,6 @@
     <Compile Include="Entities\WaterMeterData.cs" />
     <Compile Include="Entities\WaterMeter.cs" />
     <Compile Include="DB.cs" />
-    <Compile Include="Forms\BatchResultsDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\BatchResultsDlg.Designer.cs">
-      <DependentUpon>BatchResultsDlg.cs</DependentUpon>
-    </Compile>
     <Compile Include="Forms\IOneWMResultsCtrl.cs" />
     <Compile Include="Forms\ManualEntryConfigCtrl.cs">
       <SubType>UserControl</SubType>
@@ -124,6 +118,10 @@
     <Compile Include="Forms\ResultsConfigDlg.designer.cs">
       <DependentUpon>ResultsConfigDlg.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\TracingResultsDlg.cs" />
+    <Compile Include="Forms\TracingResultsDlg.Designer.cs">
+      <DependentUpon>TracingResultsDlg.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\WaterMeterEventArgs.cs" />
     <Compile Include="ItemID.cs" />
     <Compile Include="ManualEntryItemSpec.cs" />
@@ -151,6 +149,7 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Output\Printers\OnePerBatch\OnePerBatchPrinterCfg.cs" />
+    <Compile Include="Output\Printers\Munich\MunichPrintDocument.cs" />
     <Compile Include="Output\Printers\OnePerMeter\OnePerMeterPrintDocument.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -189,9 +188,13 @@
       <Project>{32817bf9-e380-4467-9c7f-936f4b122bc7}</Project>
       <Name>GenCode128</Name>
     </ProjectReference>
-    <ProjectReference Include="..\SharedDatabase\SharedDatabase.csproj">
-      <Project>{211b5e3f-9996-48a7-abde-c878dd2d71c2}</Project>
-      <Name>SharedDatabase</Name>
+    <ProjectReference Include="..\TracingDB\TracingDB.csproj">
+      <Project>{EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF}</Project>
+      <Name>TracingDB</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Users\Users.csproj">
+      <Project>{6E5CB0E9-E1B6-4E5D-AC6E-B1049E180F2B}</Project>
+      <Name>Users</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -200,9 +203,6 @@
     <Folder Include="Output\FileWriters\OneFilePerMeter\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Forms\BatchResultsDlg.resx">
-      <DependentUpon>BatchResultsDlg.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Forms\ManualEntryConfigCtrl.resx">
       <DependentUpon>ManualEntryConfigCtrl.cs</DependentUpon>
     </EmbeddedResource>
@@ -224,6 +224,9 @@
     <EmbeddedResource Include="Forms\ResultsConfigDlg.resx">
       <DependentUpon>ResultsConfigDlg.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\TracingResultsDlg.resx">
+      <DependentUpon>TracingResultsDlg.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

Results/WMeterRsltItemSpec.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -7,6 +7,7 @@ using Common;
 using Results.Entities;
 using Results.Resources;
 using System.Globalization;
+using System.Linq;
 
 namespace Results
 {
@@ -28,6 +29,7 @@ namespace Results
         public string Precision;	                    /// Specifies precision for the output
         public int Width;                               /// Specifies the number of characters of the output, 0 = automatic
         public Alignment Alignment;                     /// Specifies alignment for the output
+        public bool Merge;                              /// true = items are merged into one cell for a meter, for all tests
 
         public WMeterRsltItemSpec Clone()
         {
@@ -39,6 +41,7 @@ namespace Results
             item2.Precision = Precision;
             item2.Width = Width;
             item2.Alignment = Alignment;
+            item2.Merge = Merge;
             return item2;
         }
 
@@ -102,24 +105,15 @@ namespace Results
             Format = string.Empty;
             Precision = string.Empty;
             TestID = string.Empty;
+            Merge = false;
 		}
 
 		///
-		/// Constructor without ToolTip text
+		/// Constructor without a ToolTip text
 		///
 		public WMeterRsltItemSpec(ItemID itemId, string name, Quantity quantity, ItemCategory category, PrintDlgt printDlgt)
+            : this(itemId, name, null, quantity, category, printDlgt)
 		{
-			Uid = (int)itemId;
-			OldUid = itemId.ToString().Replace("__", "/").Replace('_', ' ');
-			Name = name;
-			ToolTipText = null;
-			Quantity = quantity;
-			Category = category;
-			this.printDlgt = printDlgt;
-
-            Format = string.Empty;
-            Precision = string.Empty;
-            TestID = string.Empty;
         }
 
 
@@ -145,6 +139,17 @@ namespace Results
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_method,      Strings.Test_method + "()",       Quantity.String, ItemCategory.TestData, (w,t,u,f,p) => FormatStr(f, (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Method())));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_Method_Elde, Strings.Test_method + " Elde ()", Quantity.String, ItemCategory.TestData, (w,t,u,f,p) => FormatStr(f, (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).MethodElde())));
 
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.RefFlowmeter, "Ref. flowmeter", Quantity.String, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).RefFlowmeter()) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Scale,        "Scale",          Quantity.String, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).Scale()) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Diverter,     "Diverter",       Quantity.String, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).Diverter()) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.RegValve,     "Reg. valve",     Quantity.String, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).RegValve()) : string.Empty));
+
+            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.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))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.ThreeState,        "Three state result",Quantity.Enumerated, ItemCategory.MeterResult, (w,t,u,f,p) => FormatThreeState(f, w.ThreeStateFromTests())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.ResultOrErrorFlags,"Winiki lub E",      Quantity.String,     ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) != null) ? FormatStr(f, w.GetMeterTestRslt(t).PassedOrErrorFlagsStr())
+                                                                                                                                                                                             : FormatStr(f, w.PassedOrErrorFlagsStr())));    /// PL specific result
             ///
             /// Volume
             ///
@@ -319,17 +324,6 @@ 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) ? 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))));
-
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.ThreeState, "Three state result", Quantity.Enumerated, ItemCategory.MeterResult, (w,t,u,f,p) => FormatThreeState(f, w.ThreeStateFromTests())));
-
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.RefFlowmeter,       "Ref. flowmeter", Quantity.String, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).RefFlowmeter()) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Scale,              "Scale",          Quantity.String, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).Scale())        : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Diverter,           "Diverter",       Quantity.String, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).Diverter())     : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.RegValve,           "Reg. valve",     Quantity.String, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).RegValve())     : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.ResultOrErrorFlags, "Winiki lub E",   Quantity.String, ItemCategory.MeterResult,(w, t, u, f, p) => (w.GetMeterTestRslt(t) != null) ? FormatStr(f, w.GetMeterTestRslt(t).PassedOrErrorFlagsStr())
-                                                                                                                                                                                          : FormatStr(f, w.PassedOrErrorFlagsStr())));    /// PL specific result
 
             ///
             /// Water meter info
@@ -373,19 +367,22 @@ namespace Results
 
             /// Water meters results (single)
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state,           Strings.End_state,           Quantity.String,       ItemCategory.MeterResult, (w,t,u,f,p) => FormatStr(f, w.EndState)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses,              Strings.Pulses + "()",       Quantity.Pulses,       ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F0", w.GetMeterTestRslt(t).IsPulses() ? w.GetMeterTestRslt(t).PulsesMeter : 0)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_pulses_ni, Strings.RefPulses + "_ni()", Quantity.Pulses,       ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F0", w.GetMeterTestRslt(t).PulsesMaster)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_pulses,    Strings.RefPulses + "()",    Quantity.Pulses,       ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F0", w.GetTestRslt(t).PulsesMaster)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Camera_angle,        "Angle ()",       "Angle measured by a camera",       Quantity.Pulses, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "F0", w.GetMeterTestRslt(t).IsCamera() ? w.GetMeterTestRslt(t).PulsesMeter : 0)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Camera_angle_start, "Start angle ()", "Start angle measured by a camera", Quantity.Pulses, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "F0", w.GetMeterTestRslt(t).IsCamera() ? w.GetMeterTestRslt(t).VolumeStart * w.GetMeterTestRslt(t).PulsesPerLiter : 0)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Camera_angle_end, "End angle ()", "End angle measured by a camera", Quantity.Pulses, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "F0", w.GetMeterTestRslt(t).IsCamera() ? w.GetMeterTestRslt(t).VolumeEnd * w.GetMeterTestRslt(t).PulsesPerLiter : 0)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses,              Strings.Pulses + "()",       Quantity.Pulses,       ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? string.Empty : FormatDbl(u, f, p, "F0", w.GetMeterTestRslt(t).IsPulses() ? w.GetMeterTestRslt(t).PulsesMeter : 0)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_pulses_ni, Strings.RefPulses + "_ni()", Quantity.Pulses,       ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? string.Empty : FormatDbl(u, f, p, "F0", w.GetMeterTestRslt(t).PulsesMaster)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_pulses,    Strings.RefPulses + "()",    Quantity.Pulses,       ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? string.Empty : FormatDbl(u, f, p, "F0", w.GetTestRslt(t).PulsesMaster)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Camera_angle,        "Angle ()",       "Angle measured by a camera",     Quantity.Pulses, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? string.Empty : FormatDbl(u,f,p, "F0", w.GetMeterTestRslt(t).IsCamera() ? w.GetMeterTestRslt(t).PulsesMeter : 0)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Camera_angle_start, "Start angle ()", "Start angle measured by a camera",Quantity.Pulses, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? string.Empty : FormatDbl(u,f,p, "F0", w.GetMeterTestRslt(t).IsCamera() ? w.GetMeterTestRslt(t).VolumeStart * w.GetMeterTestRslt(t).PulsesPerLiter : 0)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Camera_angle_end, "End angle ()", "End angle measured by a camera",      Quantity.Pulses, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? string.Empty : FormatDbl(u,f,p, "F0", w.GetMeterTestRslt(t).IsCamera() ? w.GetMeterTestRslt(t).VolumeEnd * w.GetMeterTestRslt(t).PulsesPerLiter : 0)));
 
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses_per_liter, Strings.PulsesLiter,        Quantity.PulsePerLtr, ItemCategory.MeterData,  (w,t,u,f,p) => FormatDbl(u, f, p, "V4", w.WaterMeterData.PulsesPerLtr)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulse__liter,     Strings.PulsesLiter + "()", Quantity.PulsePerLtr, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).IsCamera() ? 0 : w.GetMeterTestRslt(t).PulsesPerLiter)));
-            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)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses_per_liter, Strings.PulsesLiter,           Quantity.PulsePerLtr, ItemCategory.MeterData,  (w,t,u,f,p) => FormatDbl(u, f, p, "V4", w.WaterMeterData.PulsesPerLtr)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Pls_per_ltr_aux,  Strings.PulsesLiter + " aux",  Quantity.PulsePerLtr, ItemCategory.MeterData, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", w.WaterMeterData.PulsesPerLtrAux)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulse__liter,     Strings.PulsesLiter + "()",    Quantity.PulsePerLtr, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? string.Empty : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).IsCamera() ? 0 : w.GetMeterTestRslt(t).PulsesPerLiter)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Degree__liter,    "Degree per liter ()",         Quantity.PulsePerLtr, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? string.Empty : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).IsCamera() ? w.GetMeterTestRslt(t).PulsesPerLiter : 0)));
 
-			/// Water meters results (combined)
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_main,     Strings.Err_main + "()", Quantity.Error, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) != null) ? FormatDbl(u, f, p, "V2",  w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).Error) : string.Empty));
+            /// Water meters results (combined)
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses_main,    Strings.Pulses + " " + Strings.main + "()", Quantity.Pulses, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) == null) ? string.Empty : FormatDbl(u, f, p, "F0", w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).IsPulses() ? w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).PulsesMeter : 0)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses_aux,     Strings.Pulses + " " + Strings.aux + "()",  Quantity.Pulses, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) == null) ? string.Empty : FormatDbl(u, f, p, "F0", w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).IsPulses() ? w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).PulsesMeter : 0)));
+            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)));
@@ -460,8 +457,6 @@ namespace Results
             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())));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.ErrorFlagsEx, Strings.Error_flags + "Ex", Quantity.String,  ItemCategory.MeterResult, (w,t,u,f,p) => FormatStr(f, w.ErrorFlagsStrEx())));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.InfoFlags,    Strings.Info_flags + "()",  Quantity.String,  ItemCategory.TestResult,  (w,t,u,f,p) => FormatStr(f, (w.GetTestRslt(t) != null) ? w.GetTestRslt(t).InfoFlagsStr() : w.InfoFlagsStr())));
@@ -734,7 +729,7 @@ namespace Results
 				if (items[i].Format == null) items[i].Format = string.Empty;
 				if (items[i].Precision == null) items[i].Precision = string.Empty;
 
-                result[i] = string.Format("{0}~{1}~{2}~{3}~{4}~{5}~{6}~{7}",
+                result[i] = string.Format("{0}~{1}~{2}~{3}~{4}~{5}~{6}~{7}~{8}",
                                           items[i].Uid,
                                           items[i].Caption.Replace("~", "\n"),
                                           items[i].TestID,
@@ -742,7 +737,8 @@ namespace Results
                                           items[i].Format.Replace("~", "\n"),
                                           items[i].Precision,
                                           items[i].Width,
-										  items[i].Alignment);
+										  items[i].Alignment,
+                                          items[i].Merge);
             }
 			return result;
 		}
@@ -754,101 +750,102 @@ namespace Results
         /// <returns></returns>
         public static IList<WMeterRsltItemSpec> FromStrArray(string[] strArray)
 		{
-            IList<WMeterRsltItemSpec> result = new List<WMeterRsltItemSpec>();
+            var result = new List<WMeterRsltItemSpec>();
+            
+            if (strArray == null) return result;
 
-			if (strArray != null)
+			for (int i = 0; i < strArray.Length; i++)
 			{
-				for (int i = 0; i < strArray.Length; i++)
-				{
-					try
+                WMeterRsltItemSpec item = null;
+
+                try
+                {
+                    if (!strArray[i].Contains("~"))
 					{
-                        WMeterRsltItemSpec item;
+						///
+						/// Old style results item specification -> convert it
+						/// 
+						bool isItemCreated = false;
+						foreach (var it in AllItems)
+						{
+							if (strArray[i].Equals(it.OldUid))
+							{
+								item = it.Clone();
+								item.Caption = item.Name.Replace("()", "").Replace(" *", "");
+								item.Units = 0;			/// use default units
+								item.Format = null;		/// the same like format string "{0}"
+								item.Precision = null;
+								item.Width = 0;			/// do not ad any extra spaces
+								item.Alignment = Alignment.Left;
+								isItemCreated = true;
+								break;
+							}
+						}
+						if (!isItemCreated)
+						{
+							item = GetItem(0);
+							item.Caption = "Prs.Err.";
+							item.Format = string.Format("Parse error: {0}", strArray[i]);
+						}
+					}
+                    else
+                    {
                         string[] field = strArray[i].Split(new char[] { '~' });
 
-                        if (!strArray[i].Contains("~"))
-						{
-							///
-							/// Old style results item specification -> convert it
-							/// 
-							bool added = false;
-							foreach (var it in AllItems)
-							{
-								if (strArray[i].Equals(it.OldUid))
-								{
-									item = it.Clone();
-									item.Caption = item.Name.Replace("()", "").Replace(" *", "");
-									item.Units = 0;			/// use default units
-									item.Format = null;		/// the same like format string "{0}"
-									item.Precision = null;
-									item.Width = 0;			/// do not ad any extra spaces
-									item.Alignment = Alignment.Left;
-									result.Add(item);
-									added = true;
-									break;
-								}
-							}
-							if (!added)
-							{
-								item = GetItem(0);
-								item.Caption = "Prs.Err.";
-								item.Format = string.Format("Parse error: {0}", strArray[i]);
-								result.Add(item);
-							}
-						}
-                        else if ((item = GetItem(int.Parse(field[0]))) != null)
+                        if (field.Length >= 8 && (item = GetItem(int.Parse(field[0]))) != null)
                         {
-							///
-							/// Load the new style results item specification
-							/// 
+                            ///
+                            /// Load the new style results item specification
+                            /// 
                             item.Caption = field[1].Replace("\n", "~");
-							item.TestID = field[2];
-							item.Units = 0;
-							for (Unit u = 0; u < Unit.Count; u++)
-							{
-								if (u.ToString().Equals(field[3])) { item.Units = u; break; }
-							}
-							item.Format = field[4].Replace("\n", "~");
-							item.Precision = field[5];
-							item.Width = int.Parse(field[6]);
-							item.Alignment = 0;
-							for (Alignment a = 0; a < Alignment.Count; a++)
-							{
-								if (a.ToString().Equals(field[7])) { item.Alignment = a; break; }
-							}
+                            item.TestID = field[2];
+                            item.Units = 0;
+                            for (Unit u = 0; u < Unit.Count; u++)
+                            {
+                                if (u.ToString().Equals(field[3])) { item.Units = u; break; }
+                            }
+                            item.Format = field[4].Replace("\n", "~");
+                            item.Precision = field[5];
+                            item.Width = int.Parse(field[6]);
+                            item.Alignment = 0;
+                            for (Alignment a = 0; a < Alignment.Count; a++)
+                            {
+                                if (a.ToString().Equals(field[7])) { item.Alignment = a; break; }
+                            }
 
-							result.Add(item);
-						}
+                            bool merge;
+                            if (field.Length >= 9 && bool.TryParse(field[8], out merge)) item.Merge = merge;
+
+                        }
                         else
                         {
                             ///
                             /// Create an item with parse error information
                             /// 
-                            WMeterRsltItemSpec item2 = GetItem(0);
-                            item2.Caption = "Prs.Err.";
-                            item2.Format = string.Format("Parse error: {0}", strArray[i]);
-                            result.Add(item2);
+                            item = GetItem(0);
+                            item.Caption = "Prs.Err.";
+                            item.Format = string.Format("Parse error: {0}", strArray[i]);
                         }
-					}
-					catch
-					{
-						WMeterRsltItemSpec item = GetItem(0);
-						item.Caption = "Prs.Err.";
-						item.Format = string.Format("Parse error: {0}", strArray[i]);
-						result.Add(item);
-					}
+                    }
+                }
+				catch
+				{
+					item = GetItem(0);
+					item.Caption = "Prs.Err.";
+					item.Format = string.Format("Parse error: {0}", strArray[i]);
 				}
-			}
-			return result;
+
+                result.Add(item);
+            }
+
+            return result;
 		}
 
 
         public static WMeterRsltItemSpec GetItem(int uid)
         {
-            foreach (var item in AllItems)
-            {
-                if (item.Uid == uid) return item.Clone();
-            }
-            return null;
+            var foundItem = AllItems.FirstOrDefault(x => x.Uid == uid);
+            return (foundItem != null) ? foundItem.Clone() : null;
         }