Barcode printing for CEVAK - OnePerMeter component, ver. 2.18.1506

.gitignore

@@ -1,11 +1,17 @@
 Config/bin/
 Config/obj/
+Decrypt/bin/
+Decrypt/obj/
 DeviceTest/bin/
 DeviceTest/obj/
 Dirichlet.Numerics/bin
 Dirichlet.Numerics/obj
+Encrypt/bin/
+Encrypt/obj/
 GemCard/bin
 GemCard/obj
+GenCode128/bin
+GenCode128/obj
 GraphLib/bin
 GraphLib/obj
 TracingDB/bin
@@ -25,5 +31,6 @@ Users/obj/
 UserManagement/bin/
 UserManagement/obj/
 Doc/
+.vs/
 *.suo
 *.bak

Config/Config.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;FEWA_50</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;CEVAK_200;LANG_CS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -28,7 +28,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;FEWA_50</DefineConstants>
+    <DefineConstants>TRACE;CEVAK_200;LANG_CS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -125,6 +125,7 @@
   <ItemGroup>
     <EmbeddedResource Include="Resources\Strings.cs.resx" />
     <EmbeddedResource Include="Resources\Strings.de.resx" />
+    <EmbeddedResource Include="Resources\Strings.fr.resx" />
     <EmbeddedResource Include="Resources\Strings.it.resx" />
     <EmbeddedResource Include="Resources\Strings.pl.resx" />
     <EmbeddedResource Include="Resources\Strings.resx">

Config/Data.cs

@@ -10,8 +10,8 @@ namespace Config
 
 #if MUNICH
 		public const int WMsCount = 3;
-		public const int LineSize = 1;
-		public const int CompoundWMsCount = 1;
+		public const int LineSize = 3;
+		public const int CompoundWMsCount = 3;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = 3;
 #elif DN100 || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || CEVAK_200
@@ -20,12 +20,18 @@ namespace Config
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = WMsCount / LineSize;
-#elif FUZHOU_300 || FUZHOU_150 || IZRAEL_200 || PUCHONG_200 || GENESIS || SLM_150 || PETERSBURG_200
+#elif FUZHOU_300 || FUZHOU_150 || IZRAEL_200 || GENESIS || SLM_150 || PETERSBURG_200
 		public const int WMsCount = 6;
 		public const int LineSize = 6;
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = 3;
+#elif PUCHONG_200
+		public const int WMsCount = 6;
+		public const int LineSize = 6;
+		public const int CompoundWMsCount = 3;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = 3;
 #elif DEWA_300
         public const int WMsCount = 10;
         public const int LineSize = 10;
@@ -56,7 +62,7 @@ namespace Config
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = 1;
-#elif TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50
+#elif TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || ALZIR_25
         public const int WMsCount = 20;
 		public const int LineSize = 10;
 		public const int CompoundWMsCount = 1;
@@ -68,7 +74,7 @@ namespace Config
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = WMsCount / LineSize;
-#elif TURA_IPERL
+#elif TURA_IPERL || TURA_IPERL_NEW
 		public const int WMsCount = 40;
 		public const int LineSize = 20;
 		public const int CompoundWMsCount = 1;

Config/Entities/Enums.cs

@@ -90,6 +90,10 @@ namespace Config.Entities
 		[Description("Wasserzähler")]			Single,
 		[Description("Verbundwasserzähler")]	Combined,
 		[Description("Wärmezähler")]			HeatMeter,
+#elif LANG_FR
+        [Description("Compteurs eau")]          Single,
+        [Description("Mètres composés")]        Combined,
+        [Description("Thermomètres")]           HeatMeter,
 #elif LANG_CS
 		[Description("Vodoměry")]				Single,
 		[Description("Kombinované vodoměry")]	Combined,
@@ -125,6 +129,9 @@ namespace Config.Entities
 #elif LANG_IT
         [Description("freddo")] ColdWater,
         [Description("caldo")]  HotWater,
+#elif LANG_FR
+        [Description("eau froide")] ColdWater,
+        [Description("eau chaude")] HotWater,
 #else
 		[Description("cold")]   ColdWater,
 		[Description("hot")]    HotWater,
@@ -240,6 +247,11 @@ namespace Config.Entities
         [Description("immer")]        Always = 1,
         [Description("Bildschirm")]   OnScreen = 2,
         [Description("intern")]       Internal = 3,
+#elif LANG_FR
+        [Description("jamais")]       Never = 0,
+        [Description("toujours")]     Always = 1,
+        [Description("À l'écran")]    OnScreen = 2,
+        [Description("interne")]      Internal = 3,
 #elif LANG_CS
         /// czech
         [Description("nikdy")]        Never = 0,
@@ -281,6 +293,10 @@ namespace Config.Entities
 		[Description("Waage")]			Scale,
 		[Description("Spanne")]			Spread,
 		[Description("Standardabw.")]	StdDev,
+#elif LANG_FR
+        [Description("Balance")]        Scale,
+        [Description("Envergure")]      Spread,
+        [Description("Déviation std.")] StdDev,
 #elif LANG_CS
         /// cesky
 		[Description("váhou")]			Scale,
@@ -291,7 +307,7 @@ namespace Config.Entities
 		[Description("Spread")]			Spread,
 		[Description("Std.dev.")]		StdDev,
 #endif
-		Count
+        Count
 	}
 
     public enum TestRedType
@@ -345,6 +361,14 @@ namespace Config.Entities
 		[Description("Prüfpunktergebnisse")]	TestResult,
 		[Description("Wasserzelledaten")]		MeterData,
 		[Description("Wasserzelleergebnisse")]	MeterResult,
+#elif LANG_FR
+        [Description("Autres")]                         Other,
+        [Description("Données de banc")]                BenchData,
+        [Description("Résultats du banc")]              BenchResult,
+        [Description("Données de test")]                TestData,
+        [Description("Résultats de test")]              TestResult,
+        [Description("Données du compteur d'eau")]      MeterData,
+        [Description("Résultats du compteur d'eau")]    MeterResult,
 #else
 		[Description("Other")]			Other,
 		[Description("Bench data")]		BenchData,
@@ -354,7 +378,7 @@ namespace Config.Entities
 		[Description("Meter data")]		MeterData,
 		[Description("Meter result")]	MeterResult,
 #endif
-		Count,
+        Count,
 	}
 
 	/// <summary> Possible modes of operation of components and devices. </summary>
@@ -371,6 +395,17 @@ namespace Config.Entities
         [Description("Reply")]          Reply,
         [Description("Simuliert")]      Simulate,				/// Test bench simulation, this mode does not require any hardware
         [Description("Geerbt")]         Inherit,
+#elif LANG_FR
+        [Description("Détection automatique: Éteindre")]    DetectedOff = -2,
+        [Description("Détection automatique: Allumé")]      DetectedOn = -1,
+        [Description("Ordinaire")]                          Normal = 0,
+        [Description("Détection automatique")]              AutoDetect,
+        [Description("Erreur d'exécution")]                 FailureDuringOperation,
+        [Description("Éteindre")]                           Off,
+        [Description("Record")]                             Record,
+        [Description("Répondre")]                           Reply,
+        [Description("Simuler")]                            Simulate,
+        [Description("Hériter")]                            Inherit,
 #else
         [Description("Detected off")]   DetectedOff = -2,
         [Description("Detected on")]    DetectedOn = -1,
@@ -383,7 +418,7 @@ namespace Config.Entities
         [Description("Simulate")]       Simulate,				/// Test bench simulation, this mode does not require any hardware
         [Description("Inherit")]        Inherit,
 #endif
-		Count,
+        Count,
     }
 
     public enum LogLevel
@@ -430,6 +465,11 @@ namespace Config.Entities
         [Description("zentriert")]  Center,
         [Description("rechts")]     Right,
         [Description("angepasst")]  Justified,
+#elif LANG_FR
+        [Description("gauche")]     Left,
+        [Description("centré")]     Center,
+        [Description("droit")]      Right,
+        [Description("justifié")]   Justified,
 #else
         [Description("Left")]       Left,
         [Description("Center")]     Center,
@@ -479,6 +519,10 @@ namespace Config.Entities
 		[Description("aus")]		Off,
 		[Description("info")]		Info,
 		[Description("ein")]		On,
+#elif LANG_FR
+        [Description("éteindre")]   Off,
+        [Description("info")]       Info,
+        [Description("allumé")]     On,
 #elif LANG_CS
 		[Description("vypnuto")]	Off,
 		[Description("info")]		Info,
@@ -496,7 +540,7 @@ namespace Config.Entities
 		[Description("info")]		Info,
 		[Description("on")]			On,
 #endif
-		Count
+        Count
 	}
 
 

Config/Entities/Procedure.cs

@@ -234,6 +234,42 @@ namespace Config.Entities
             return null;
         }
 
+
+        /// <summary>
+        /// Processes the selection done by the bench control panel in the main sequence.
+        /// </summary>
+        /// <param name="selection">Selection.Q1, .Q2, .Q3 or .Test</param>
+        /// <returns>The selected test or null</returns>
+        public virtual Test GetTest(string expandedTestName, out int testIx, out int repetNr)
+        {
+            for (int ix = 0; ix < Tests.Count; ix++)
+            {
+                Test test = Tests[ix];
+                if (test.Name.Equals(expandedTestName))
+                {
+                    /// Name is not expanded => Repeats==1
+                    testIx = ix;
+                    repetNr = 1;
+                    return test;
+                }
+
+                for (int r = 1; r <= test.Repeats; r++)
+                {
+                    if (test.GetExpandedTestName(r).Equals(expandedTestName))
+                    {
+                        testIx = ix;
+                        repetNr = r;
+                        return test;
+                    }
+                }
+            }
+
+            testIx = 0;
+            repetNr = 1;
+            return null;
+        }
+
+
 		public override string ToString()
 		{
 			return string.Format("{0}, rev.{1}", Name, Revision);

Config/Entities/Test.cs

@@ -30,7 +30,7 @@ namespace Config.Entities
         public virtual float Uncertainty { get; set; }		///	int [%] makes error limits tighter: 0 <= Uncertainty <= abs(ErrLimXx)
         public virtual int Repeats { get; set; }
         public virtual bool DoDraining { get; set; }
-        public virtual bool DoZeroing { get; set; }
+        public virtual bool DoDrainingAfter { get; set; }
 		public virtual bool DoControlWaterTemp { get; set; }
 		public virtual float TempLimLo { get; set; }		/// Lower limit for the controlled temperature
 		public virtual float TempLimHi { get; set; }		/// Upper limit for the controlled temperature
@@ -56,6 +56,9 @@ namespace Config.Entities
 		public virtual string RelTransAfter { get; set; }
 		public virtual string TransitionAfter { get; set; }
 
+        public virtual bool IsOuterLoopStart { get; set; }  /// Not mapped to database
+        public virtual bool IsOuterLoopEnd { get; set; }    /// Not mapped to database
+
 		public virtual IList<ComponentTest> MoreParams { get; set; }
 
 		public virtual Procedure Procedure { get; set; }
@@ -73,7 +76,7 @@ namespace Config.Entities
 			DoEvaluate = true;
 			Repeats = 1;
 			DoDraining = false;
-			DoZeroing = false;
+			DoDrainingAfter = false;
 			DoControlWaterTemp = false;
 			TempLimLo = 15.0f;
 			TempLimHi = 25.0f;
@@ -121,7 +124,7 @@ namespace Config.Entities
 			result.Uncertainty = Uncertainty;
 			result.Repeats = Repeats;
             result.DoDraining = DoDraining;
-            result.DoZeroing = DoZeroing;
+            result.DoDrainingAfter = DoDrainingAfter;
 			result.DoControlWaterTemp = DoControlWaterTemp;
 			result.TempLimLo = TempLimLo;
 			result.TempLimHi = TempLimHi;
@@ -169,7 +172,7 @@ namespace Config.Entities
             output.WriteLine(Uncertainty.ToString(ci));
             output.WriteLine(Repeats.ToString(ci));
             output.WriteLine(DoDraining.ToString());
-            output.WriteLine(DoZeroing.ToString());
+            output.WriteLine(DoDrainingAfter.ToString());
 			output.WriteLine(DoControlWaterTemp.ToString());
 			output.WriteLine(TempLimLo.ToString(ci));
 			output.WriteLine(TempLimHi.ToString(ci));
@@ -219,7 +222,7 @@ namespace Config.Entities
 			tst.Uncertainty = float.Parse(input.ReadLine(), ci);
 			tst.Repeats = int.Parse(input.ReadLine(), ci);
             tst.DoDraining = bool.Parse(input.ReadLine());
-			tst.DoZeroing = bool.Parse(input.ReadLine());
+			tst.DoDrainingAfter = bool.Parse(input.ReadLine());
 			tst.DoControlWaterTemp = bool.Parse(input.ReadLine());
 			tst.TempLimLo = float.Parse(input.ReadLine(), ci);
 			tst.TempLimHi = float.Parse(input.ReadLine(), ci);
@@ -277,7 +280,7 @@ namespace Config.Entities
             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, "Draining", DoDraining.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != DoZeroing.ToString(ci))          { diff.AppendFormat(fmt, "Zeroing", DoZeroing.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != DoDrainingAfter.ToString(ci))          { diff.AppendFormat(fmt, "Zeroing", DoDrainingAfter.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != DoControlWaterTemp.ToString())   { diff.AppendFormat(fmt, "DoControlWaterTemp", DoControlWaterTemp.ToString(ci), 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); };
@@ -310,6 +313,33 @@ namespace Config.Entities
             return null;
         }
 
+        /// <summary>
+        /// Return test title for a this test and a given repetition number
+        /// </summary>
+        /// <param name="repetitonNr">1 .. Nr. repetitions</param>
+        /// <returns>Test title (string)</returns>
+        public virtual string GetExpandedTestName(int repetitionNr)
+        {
+            if (Repeats == 1)
+            {
+                if (Part == 0)
+                {
+                    /// Single test
+                    return Name;
+                }
+                else
+                {
+                    /// A part of a single test
+                    return string.Format("{0} ({1})", Name, Part);
+                }
+            }
+            else
+            {
+                /// More test repetitions
+                return string.Format("{0} ({1}/{2})", Name, repetitionNr, Repeats);
+            }
+        }
+
         public virtual double GetErrLimLo(double volumeCTV, double testTime)
         {
             if (ErrLimLo <= ErrLimHi)

Config/Entities/User.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2017 Sensus Metering Systems
+/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -11,8 +11,11 @@ namespace Config.Entities
 		public virtual int Id { get; protected set; }
         public virtual string UserName { get; set; }	/// = name, alias, abbreviation
 		public virtual string FullName { get; set; }	/// = description
-		public virtual int Number { get; set; }
+        public virtual string Tag { get; set; }
+        public virtual int Number { get; set; }
 		public virtual string Password { get; set; }
+        public virtual string Password2 { get; set; }
+        public virtual string Password3 { get; set; }
         public virtual DateTime LastPwChange { get; set; }
         public virtual IList<Group> Groups { get; set; }   //User can be a member of a list of groups
 

Config/Mappings/TestMap.cs

@@ -24,7 +24,7 @@ namespace Config.Mappings
 			Map(x => x.Repeats);
             Map(x => x.DoDraining)
 				.Column("Emptying");
-            Map(x => x.DoZeroing)
+            Map(x => x.DoDrainingAfter)
 				.Column("Zeroing");
             Map(x => x.DoControlWaterTemp);
             Map(x => x.TempLimLo);

Config/Mappings/UserMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2016-2019 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 
@@ -12,6 +12,9 @@ namespace Config.Mappings
             Id(x => x.Id);
             Map(x => x.UserName).Column("Name");
 			Map(x => x.Number);
+#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
+            Map(x => x.Tag);
+#endif
 			Map(x => x.Password);
             Map(x => x.FullName).Column("Description");
             Map(x => x.LastPwChange);

Config/Properties/AssemblyInfo.cs

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

Config/Resources/Strings.fr.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -117,70 +117,37 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="startTestBtn.Text" xml:space="preserve">
-    <value>Начать тест</value>
+  <data name="Administrator" xml:space="preserve">
+    <value>Administrateur</value>
   </data>
-  <data name="groupBox1.Text" xml:space="preserve">
-    <value>Результаты</value>
+  <data name="Calibration_Specialist" xml:space="preserve">
+    <value>Spécialiste en calibration</value>
   </data>
-  <data name="otherGroupBox.Text" xml:space="preserve">
-    <value>Вспомогательный</value>
+  <data name="Head_of_Lab" xml:space="preserve">
+    <value>Chef de laboratoire</value>
   </data>
-  <data name="cameraTestBtn.Text" xml:space="preserve">
-    <value>Тест камеры</value>
+  <data name="Maintenance_Specialist" xml:space="preserve">
+    <value>Spécialiste en maintenance</value>
   </data>
-  <data name="resetResultsBtn.Text" xml:space="preserve">
-    <value>Сброс</value>
+  <data name="Metrologist" xml:space="preserve">
+    <value>Métrologue</value>
   </data>
-  <data name="purgeEndBtn.Text" xml:space="preserve">
-    <value>Конец</value>
+  <data name="Tester" xml:space="preserve">
+    <value>Testeur</value>
   </data>
-  <data name="emptyTank1Btn.Text" xml:space="preserve">
-    <value>W1</value>
+  <data name="Testing_Specialist" xml:space="preserve">
+    <value>Spécialiste d'essais</value>
   </data>
-  <data name="purgeBeginBtn.Text" xml:space="preserve">
-    <value>Начать</value>
+  <data name="Failed" xml:space="preserve">
+    <value>Échoué</value>
   </data>
-  <data name="startQ3Btn.Text" xml:space="preserve">
-    <value>Q3</value>
+  <data name="Passed" xml:space="preserve">
+    <value>Passé</value>
   </data>
-  <data name="emptyTank2Btn.Text" xml:space="preserve">
-    <value>W2</value>
+  <data name="Cannot_open_DB_Cause_0" xml:space="preserve">
+    <value>Impossible d'ouvrir la base de données Cause\\r\\n{0}</value>
   </data>
-  <data name="startQ1Btn.Text" xml:space="preserve">
-    <value>Q1</value>
-  </data>
-  <data name="startCycleBtn.Text" xml:space="preserve">
-    <value>Запустить цикл</value>
-  </data>
-  <data name="purgeGroupBox.Text" xml:space="preserve">
-    <value>Очистка</value>
-  </data>
-  <data name="emptyGroupBox.Text" xml:space="preserve">
-    <value>Пустой</value>
-  </data>
-  <data name="nextButton.Text" xml:space="preserve">
-    <value>Следующий</value>
-  </data>
-  <data name="testGroupBox.Text" xml:space="preserve">
-    <value>Тест</value>
-  </data>
-  <data name="startQ2Btn.Text" xml:space="preserve">
-    <value>Q2</value>
-  </data>
-  <data name="acceptResultsBtn.Text" xml:space="preserve">
-    <value>Принять</value>
-  </data>
-  <data name="emptyTank3Btn.Text" xml:space="preserve">
-    <value>W3</value>
-  </data>
-  <data name="stopBtn.Text" xml:space="preserve">
-    <value>Стоп</value>
-  </data>
-  <data name="breakBtn.Text" xml:space="preserve">
-    <value>Прервать</value>
-  </data>
-  <data name="sensitivityTestBtn.Text" xml:space="preserve">
-    <value>Чувствительность</value>
+  <data name="Error" xml:space="preserve">
+    <value>Erreur</value>
   </data>
 </root>

Config/Utils.cs

@@ -82,5 +82,61 @@ namespace Config
                 else return "F5";
             }
         }
+
+
+        /// <summary>
+        /// Extract and return a DB server from a MySQL connection string.
+        /// </summary>
+        public static string GetDBServer(string connectionString)
+        {
+            return GetFromConnectionString(connectionString, new string[] { "SERVER=" });
+        }
+
+        /// <summary>
+        /// Extract and return a DB name from a MySQL connection string.
+        /// </summary>
+        public static string GetDBName(string connectionString)
+        {
+            return GetFromConnectionString(connectionString, new string[] { "DATABASE=" });
+        }
+
+        /// <summary>
+        /// Extract and return a username from a MySQL connection string
+        /// </summary>
+        public static string GetDBUser(string connectionString)
+        {
+            return GetFromConnectionString(connectionString, new string[] { "USER=", "UID=" });
+        }
+
+        /// <summary>
+        /// Extract and return a password from a MySQL connection string
+        /// </summary>
+        public static string GetDBPassword(string connectionString)
+        {
+            return GetFromConnectionString(connectionString, new string[] { "PASSWORD=", "PWD=" });
+        }
+
+        /// <summary>
+        /// Extract and return an element of a MySQL connection string
+        /// (a host, a database, a user name or a password).
+        /// Return an empty string on any error.
+        /// </summary>
+        public static string GetFromConnectionString(string connectionString, string[] patterns)
+        {
+            foreach (var pattern in patterns)
+            {
+                int startIx = connectionString.IndexOf(pattern);
+                if (startIx >= 0)
+                {
+                    /// pattern found, extract the subsequent element
+                    startIx += pattern.Length;
+                    int endIx = connectionString.IndexOf(';', startIx);
+                    return (endIx > 0) ? connectionString.Substring(startIx, endIx - startIx) : string.Empty;
+                }
+            }
+
+            /// pattern NOT found
+            return string.Empty;
+        }
     }
 }

Decrypt/Decrypt.csproj

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{D476ABBE-A455-4476-8A8D-3F6151217B51}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Decrypt</RootNamespace>
+    <AssemblyName>Decrypt</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformTarget>x86</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|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>Decrypt.Program</StartupObject>
+  </PropertyGroup>
+  <ItemGroup>
+    <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.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </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>

Decrypt/Decrypt.csproj.user

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <StartArguments>config.xml</StartArguments>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <StartArguments>config.xml</StartArguments>
+  </PropertyGroup>
+</Project>

Decrypt/Program.cs

@@ -0,0 +1,96 @@
+using System;
+using System.IO;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace Decrypt
+{
+    /// <summary>
+    /// See also:
+    /// https://www.fluxbytes.com/csharp/encrypt-and-decrypt-files-in-c/
+    /// </summary>
+    class Program
+    {
+        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 };
+
+        static void Main(string[] args)
+        {
+            if ((args.Length < 1) || !File.Exists(args[0]))
+            {
+                Console.WriteLine("Usage:  Decode <file>");
+                Console.ReadKey();
+                return;
+            }
+
+            string fileName = args[0];
+            string intermediateFile = fileName + ".plain";  /// Intermediate file, output of cryptography decoding
+            string backupFile = fileName + ".bak";
+
+            try
+            {
+                using (StreamReader reader = new StreamReader(fileName))
+                {
+                    if (reader.ReadLine().StartsWith("<?xml version="))
+                    {
+                        Console.WriteLine(string.Format("File {0} is not encrypted.", fileName));
+                        Console.ReadKey();
+                        return;
+                    }
+                }
+
+                bool successful = false;
+                using (RijndaelManaged aes = new RijndaelManaged { Padding = PaddingMode.Zeros })
+                {
+                    using (FileStream fsCrypt = new FileStream(fileName, FileMode.Open))
+                    {
+                        using (FileStream fsOut = new FileStream(intermediateFile, FileMode.Create))
+                        {
+                            using (ICryptoTransform decryptor = aes.CreateDecryptor(key, IV))
+                            {
+                                using (CryptoStream cs = new CryptoStream(fsCrypt, decryptor, CryptoStreamMode.Read))
+                                {
+                                    int data;
+                                    while ((data = cs.ReadByte()) != -1)
+                                    {
+                                        if (data != 0) fsOut.WriteByte((byte)data);
+                                    }
+                                    successful = true;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if (successful)
+                {
+                    /// File decryption successfuly completed => rotate files
+                    if (File.Exists(backupFile)) File.Delete(backupFile);
+                    File.Move(fileName, backupFile);
+                    File.Move(intermediateFile, fileName);
+                    return;
+                }
+                else
+                {
+                    Failed(fileName, intermediateFile, "");
+                    return;
+                }
+            }
+            catch (Exception e)
+            {
+                Failed(fileName, intermediateFile, e.Message);
+                return;
+            }
+        }
+
+        static void Failed(string fileName, string toBeDeleted, string message)
+        {
+            if (File.Exists(toBeDeleted))
+            {
+                File.Delete(toBeDeleted);
+            }
+            Console.WriteLine(string.Format("Decryption of file {0} failed: {1}", fileName, message));
+            Console.ReadKey();
+        }
+    }
+}

Decrypt/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+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("Decrypt")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Decrypt")]
+[assembly: AssemblyCopyright("Copyright © 2019")]
+[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("c17ec788-0e12-4f9c-aadf-ea4e83a9f373")]
+
+// 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.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]

Decrypt/app.config

@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

DeviceTest/DeviceTestDlg.cs

@@ -7,7 +7,6 @@ using System.Threading;
 using System.Windows.Forms;
 using TBF.BenchControl;
 using TBF.BenchControl.Generic;
-using TBF.BenchControl.GenericDevices;
 using System.Xml.Serialization;
 
 
@@ -27,11 +26,11 @@ namespace DeviceTest
 		IComponentCfg component2Cfg;
 		IComponentCfg component3Cfg;
 
-		static IList<TBF.BenchControl.Generic.IDevice> tbfDevices;
-		static IList<TBF.BenchControl.Generic.IComponent> tbfComponents;
-		static TBF.BenchControl.Generic.IComponent tbfComponent1forOp;
-		static TBF.BenchControl.Generic.IComponent tbfComponent2forOp;
-		static TBF.BenchControl.Generic.IComponent tbfComponent3forOp;
+		static IList<IDevice> tbfDevices;
+		static IList<IComponent> tbfComponents;
+		static IComponent tbfComponent1forOp;
+		static IComponent tbfComponent2forOp;
+		static IComponent tbfComponent3forOp;
 
 		static Thread workerThread;
 		static bool workerThreadRunning;
@@ -426,7 +425,7 @@ namespace DeviceTest
 			cfgControl.Config = parentCfg;
 			cfgControl.Config.ItemNr = 0;
 
-			TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg();
+			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
 			cfgForm.TbfComponents = new List<Config.Entities.Component>();
 
 			cfgForm.ComponentCfgCtrl = cfgControl;
@@ -455,7 +454,7 @@ namespace DeviceTest
 			cfgControl.Config = component1Cfg;
 			cfgControl.Config.ItemNr = 1;
 
-			TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg();
+			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
 			///
 			IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
@@ -489,7 +488,7 @@ namespace DeviceTest
 			cfgControl.Config = component2Cfg;
 			cfgControl.Config.ItemNr = 1;
 
-			TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg();
+			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
 			///
 			IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
@@ -524,7 +523,7 @@ namespace DeviceTest
 			cfgControl.Config = component3Cfg;
 			cfgControl.Config.ItemNr = 1;
 
-			TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg();
+			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
 			///
 			IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());

Encrypt/Encrypt.csproj

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{DA9B09F3-A99D-4883-A954-537560453674}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Encrypt</RootNamespace>
+    <AssemblyName>Encrypt</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformTarget>x86</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|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>Encrypt.Program</StartupObject>
+  </PropertyGroup>
+  <ItemGroup>
+    <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.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </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>

Encrypt/Program.cs

@@ -0,0 +1,93 @@
+using System;
+using System.IO;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace Encrypt
+{
+    /// <summary>
+    /// See also:
+    /// https://www.fluxbytes.com/csharp/encrypt-and-decrypt-files-in-c/
+    /// </summary>
+    class Program
+    {
+        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 };
+
+        static void Main(string[] args)
+        {
+            if ((args.Length < 1) || !File.Exists(args[0]))
+            {
+                Console.WriteLine("Usage:  Encode <file>");
+                Console.ReadKey();
+                return;
+            }
+
+            string fileName = args[0];
+            string intermediateFile = fileName + ".encrypted";   /// Intermediate file, output of cryptography encoding
+            string backupFile = fileName + ".bak";
+
+            try
+            {
+                using (StreamReader reader = new StreamReader(fileName))
+                {
+                    if (!reader.ReadLine().StartsWith("<?xml version="))
+                    {
+                        Console.WriteLine(string.Format("File {0} is already encrypted.", fileName));
+                        Console.ReadKey();
+                        return;
+                    }
+                }
+
+                bool successful = false;
+                using (RijndaelManaged aes = new RijndaelManaged { Padding = PaddingMode.Zeros })
+                {
+                    using (FileStream fsCrypt = new FileStream(intermediateFile, FileMode.Create))
+                    {
+                        using (ICryptoTransform encryptor = aes.CreateEncryptor(key, IV))
+                        {
+                            using (CryptoStream cs = new CryptoStream(fsCrypt, encryptor, CryptoStreamMode.Write))
+                            {
+                                using (FileStream fsIn = new FileStream(fileName, FileMode.Open))
+                                {
+                                    int data;
+                                    while ((data = fsIn.ReadByte()) != -1) cs.WriteByte((byte)data);
+                                    successful = true;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if (successful)
+                {
+                    /// File encryption successfuly completed => rotate files
+                    if (File.Exists(backupFile)) File.Delete(backupFile);
+                    File.Move(fileName, backupFile);
+                    File.Move(intermediateFile, fileName);
+                    return;
+                }
+                else
+                {
+                    Failed(fileName, intermediateFile);
+                    return;
+                }
+            }
+            catch (Exception)
+            {
+                Failed(fileName, intermediateFile);
+                return;
+            }
+        }
+
+        static void Failed(string fileName, string toBeDeleted)
+        {
+            if (File.Exists(toBeDeleted))
+            {
+                File.Delete(toBeDeleted);
+            }
+            Console.WriteLine(string.Format("Encryption of file {0} failed.", fileName));
+            Console.ReadKey();
+        }
+    }
+}

Encrypt/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+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("Encrypt")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Encrypt")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
+[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("0f602531-6f1f-416e-af4d-9242855715a8")]
+
+// 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.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

Encrypt/app.config

@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

GenCode128/AssemblyInfo.cs

@@ -0,0 +1,51 @@
+using System.Reflection;
+
+// 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("GenCode128")]
+[assembly: AssemblyDescription("GenCode128")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Chris Wuestefeld")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("2006 Chris Wuestefeld")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 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 Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+
+// In order to sign your assembly you must specify a key to use. Refer to the 
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing. 
+//
+// Notes: 
+//   (*) If no key is specified, the assembly is not signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. KeyFile refers to a file which contains
+//       a key.
+//   (*) If the KeyFile and the KeyName values are both specified, the 
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP, that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
+//           in the KeyFile is installed into the CSP and used.
+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
+//       When specifying the KeyFile, the location of the KeyFile should be
+//       relative to the project output directory which is
+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
+//       located in the project directory, you would specify the AssemblyKeyFile 
+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+[assembly: AssemblyKeyName("")]

GenCode128/Code128Code.cs

@@ -0,0 +1,139 @@
+namespace GenCode128
+{
+    /// <summary>
+    /// Static tools for determining codes for individual characters in the content
+    /// </summary>
+    public static class Code128Code
+    {
+        private const int CShift = 98;
+        private const int CCodeA = 101;
+        private const int CCodeB = 100;
+        private const int CStartA = 103;
+        private const int CStartB = 104;
+        private const int CStop = 106;
+        
+        /// <summary>
+        /// Indicates which code sets can represent a character -- CodeA, CodeB, or either
+        /// </summary>
+        public enum CodeSetAllowed
+        {
+            CodeA,
+            CodeB,
+            CodeAorB
+        }
+
+        /// <summary>
+        /// Get the Code128 code value(s) to represent an ASCII character, with 
+        /// optional look-ahead for length optimization
+        /// </summary>
+        /// <param name="charAscii">The ASCII value of the character to translate</param>
+        /// <param name="lookAheadAscii">The next character in sequence (or -1 if none)</param>
+        /// <param name="currentCodeSet">The current codeset, that the returned codes need to follow;
+        /// if the returned codes change that, then this value will be changed to reflect it</param>
+        /// <returns>An array of integers representing the codes that need to be output to produce the 
+        /// given character</returns>
+        public static int[] CodesForChar(int charAscii, int lookAheadAscii, ref CodeSet currentCodeSet)
+        {
+            int[] result;
+            var shifter = -1;
+
+            if (!CharCompatibleWithCodeset(charAscii, currentCodeSet))
+            {
+                // if we have a lookahead character AND if the next character is ALSO not compatible
+                if ((lookAheadAscii != -1) && !CharCompatibleWithCodeset(lookAheadAscii, currentCodeSet))
+                {
+                    // we need to switch code sets
+                    switch (currentCodeSet)
+                    {
+                        case CodeSet.CodeA:
+                            shifter = CCodeB;
+                            currentCodeSet = CodeSet.CodeB;
+                            break;
+                        case CodeSet.CodeB:
+                            shifter = CCodeA;
+                            currentCodeSet = CodeSet.CodeA;
+                            break;
+                    }
+                }
+                else
+                {
+                    // no need to switch code sets, a temporary SHIFT will suffice
+                    shifter = CShift;
+                }
+            }
+
+            if (shifter != -1)
+            {
+                result = new int[2];
+                result[0] = shifter;
+                result[1] = CodeValueForChar(charAscii);
+            }
+            else
+            {
+                result = new int[1];
+                result[0] = CodeValueForChar(charAscii);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Tells us which codesets a given character value is allowed in
+        /// </summary>
+        /// <param name="charAscii">ASCII value of character to look at</param>
+        /// <returns>Which codeset(s) can be used to represent this character</returns>
+        public static CodeSetAllowed CodesetAllowedForChar(int charAscii)
+        {
+            if (charAscii >= 32 && charAscii <= 95)
+            {
+                return CodeSetAllowed.CodeAorB;
+            }
+            else
+            {
+                return charAscii < 32 ? CodeSetAllowed.CodeA : CodeSetAllowed.CodeB;
+            }
+        }
+
+        /// <summary>
+        /// Determine if a character can be represented in a given codeset
+        /// </summary>
+        /// <param name="charAscii">character to check for</param>
+        /// <param name="currentCodeSet">codeset context to test</param>
+        /// <returns>true if the codeset contains a representation for the ASCII character</returns>
+        public static bool CharCompatibleWithCodeset(int charAscii, CodeSet currentCodeSet)
+        {
+            var csa = CodesetAllowedForChar(charAscii);
+            return csa == CodeSetAllowed.CodeAorB || (csa == CodeSetAllowed.CodeA && currentCodeSet == CodeSet.CodeA)
+                   || (csa == CodeSetAllowed.CodeB && currentCodeSet == CodeSet.CodeB);
+        }
+
+        /// <summary>
+        /// Gets the integer code128 code value for a character (assuming the appropriate code set)
+        /// </summary>
+        /// <param name="charAscii">character to convert</param>
+        /// <returns>code128 symbol value for the character</returns>
+        public static int CodeValueForChar(int charAscii)
+        {
+            return charAscii >= 32 ? charAscii - 32 : charAscii + 64;
+        }
+
+        /// <summary>
+        /// Return the appropriate START code depending on the codeset we want to be in
+        /// </summary>
+        /// <param name="cs">The codeset you want to start in</param>
+        /// <returns>The code128 code to start a barcode in that codeset</returns>
+        public static int StartCodeForCodeSet(CodeSet cs)
+        {
+            return cs == CodeSet.CodeA ? CStartA : CStartB;
+        }
+
+        /// <summary>
+        /// Return the Code128 stop code
+        /// </summary>
+        /// <returns>the stop code</returns>
+        public static int StopCode()
+        {
+            return CStop;
+        }
+    }
+}

GenCode128/Code128Content.cs

@@ -0,0 +1,97 @@
+namespace GenCode128
+{
+    using System.Collections;
+    using System.Text;
+
+    /// <summary>
+    /// Represent the set of code values to be output into barcode form
+    /// </summary>
+    public class Code128Content
+    {
+        /// <summary>
+        /// Create content based on a string of ASCII data
+        /// </summary>
+        /// <param name="asciiData">the string that should be represented</param>
+        public Code128Content(string asciiData)
+        {
+            this.Codes = this.StringToCode128(asciiData);
+        }
+
+        /// <summary>
+        /// Provides the Code128 code values representing the object's string
+        /// </summary>
+        public int[] Codes
+        {
+            get { return codes; }
+            set { codes = value; }
+        }
+        int[] codes;
+
+        /// <summary>
+        /// Transform the string into integers representing the Code128 codes
+        /// necessary to represent it
+        /// </summary>
+        /// <param name="asciiData">String to be encoded</param>
+        /// <returns>Code128 representation</returns>
+        private int[] StringToCode128(string asciiData)
+        {
+            // turn the string into ascii byte data
+            var asciiBytes = Encoding.ASCII.GetBytes(asciiData);
+
+            // decide which codeset to start with
+            var csa1 = asciiBytes.Length > 0
+                           ? Code128Code.CodesetAllowedForChar(asciiBytes[0])
+                           : Code128Code.CodeSetAllowed.CodeAorB;
+            var csa2 = asciiBytes.Length > 1
+                           ? Code128Code.CodesetAllowedForChar(asciiBytes[1])
+                           : Code128Code.CodeSetAllowed.CodeAorB;
+            var currentCodeSet = this.GetBestStartSet(csa1, csa2);
+
+            // set up the beginning of the barcode
+            // assume no codeset changes, account for start, checksum, and stop
+            var codes = new ArrayList(asciiBytes.Length + 3) { Code128Code.StartCodeForCodeSet(currentCodeSet) };
+            
+            // add the codes for each character in the string
+            for (var i = 0; i < asciiBytes.Length; i++)
+            {
+                int thischar = asciiBytes[i];
+                var nextchar = asciiBytes.Length > i + 1 ? asciiBytes[i + 1] : -1;
+
+                codes.AddRange(Code128Code.CodesForChar(thischar, nextchar, ref currentCodeSet));
+            }
+
+            // calculate the check digit
+            var checksum = (int)codes[0];
+            for (var i = 1; i < codes.Count; i++)
+            {
+                checksum += i * (int)codes[i];
+            }
+
+            codes.Add(checksum % 103);
+
+            codes.Add(Code128Code.StopCode());
+
+            var result = codes.ToArray(typeof(int)) as int[];
+            return result;
+        }
+
+        /// <summary>
+        /// Determines the best starting code set based on the the first two 
+        /// characters of the string to be encoded
+        /// </summary>
+        /// <param name="csa1">First character of input string</param>
+        /// <param name="csa2">Second character of input string</param>
+        /// <returns>The codeset determined to be best to start with</returns>
+        private CodeSet GetBestStartSet(Code128Code.CodeSetAllowed csa1, Code128Code.CodeSetAllowed csa2)
+        {
+            var vote = 0;
+
+            vote += csa1 == Code128Code.CodeSetAllowed.CodeA ? 1 : 0;
+            vote += csa1 == Code128Code.CodeSetAllowed.CodeB ? -1 : 0;
+            vote += csa2 == Code128Code.CodeSetAllowed.CodeA ? 1 : 0;
+            vote += csa2 == Code128Code.CodeSetAllowed.CodeB ? -1 : 0;
+
+            return vote > 0 ? CodeSet.CodeA : CodeSet.CodeB; // ties go to codeB due to my own prejudices
+        }
+    }
+}

GenCode128/Code128Rendering.cs

@@ -0,0 +1,188 @@
+namespace GenCode128
+{
+    using System;
+    using System.Drawing;
+
+    /// <summary>
+    /// Summary description for Code128Rendering.
+    /// </summary>
+    public static class Code128Rendering
+    {
+        private const int CQuietWidth = 10;
+
+        // Code patterns:
+        // in principle these rows should each have 6 elements
+        // however, the last one -- STOP -- has 7. The cost of the
+        // extra integers is trivial, and this lets the code flow
+        // much more elegantly
+        private static readonly int[,] CPatterns =
+                                                    {
+                                                     { 2, 1, 2, 2, 2, 2, 0, 0 }, // 0
+                                                     { 2, 2, 2, 1, 2, 2, 0, 0 }, // 1
+                                                     { 2, 2, 2, 2, 2, 1, 0, 0 }, // 2
+                                                     { 1, 2, 1, 2, 2, 3, 0, 0 }, // 3
+                                                     { 1, 2, 1, 3, 2, 2, 0, 0 }, // 4
+                                                     { 1, 3, 1, 2, 2, 2, 0, 0 }, // 5
+                                                     { 1, 2, 2, 2, 1, 3, 0, 0 }, // 6
+                                                     { 1, 2, 2, 3, 1, 2, 0, 0 }, // 7
+                                                     { 1, 3, 2, 2, 1, 2, 0, 0 }, // 8
+                                                     { 2, 2, 1, 2, 1, 3, 0, 0 }, // 9
+                                                     { 2, 2, 1, 3, 1, 2, 0, 0 }, // 10
+                                                     { 2, 3, 1, 2, 1, 2, 0, 0 }, // 11
+                                                     { 1, 1, 2, 2, 3, 2, 0, 0 }, // 12
+                                                     { 1, 2, 2, 1, 3, 2, 0, 0 }, // 13
+                                                     { 1, 2, 2, 2, 3, 1, 0, 0 }, // 14
+                                                     { 1, 1, 3, 2, 2, 2, 0, 0 }, // 15
+                                                     { 1, 2, 3, 1, 2, 2, 0, 0 }, // 16
+                                                     { 1, 2, 3, 2, 2, 1, 0, 0 }, // 17
+                                                     { 2, 2, 3, 2, 1, 1, 0, 0 }, // 18
+                                                     { 2, 2, 1, 1, 3, 2, 0, 0 }, // 19
+                                                     { 2, 2, 1, 2, 3, 1, 0, 0 }, // 20
+                                                     { 2, 1, 3, 2, 1, 2, 0, 0 }, // 21
+                                                     { 2, 2, 3, 1, 1, 2, 0, 0 }, // 22
+                                                     { 3, 1, 2, 1, 3, 1, 0, 0 }, // 23
+                                                     { 3, 1, 1, 2, 2, 2, 0, 0 }, // 24
+                                                     { 3, 2, 1, 1, 2, 2, 0, 0 }, // 25
+                                                     { 3, 2, 1, 2, 2, 1, 0, 0 }, // 26
+                                                     { 3, 1, 2, 2, 1, 2, 0, 0 }, // 27
+                                                     { 3, 2, 2, 1, 1, 2, 0, 0 }, // 28
+                                                     { 3, 2, 2, 2, 1, 1, 0, 0 }, // 29
+                                                     { 2, 1, 2, 1, 2, 3, 0, 0 }, // 30
+                                                     { 2, 1, 2, 3, 2, 1, 0, 0 }, // 31
+                                                     { 2, 3, 2, 1, 2, 1, 0, 0 }, // 32
+                                                     { 1, 1, 1, 3, 2, 3, 0, 0 }, // 33
+                                                     { 1, 3, 1, 1, 2, 3, 0, 0 }, // 34
+                                                     { 1, 3, 1, 3, 2, 1, 0, 0 }, // 35
+                                                     { 1, 1, 2, 3, 1, 3, 0, 0 }, // 36
+                                                     { 1, 3, 2, 1, 1, 3, 0, 0 }, // 37
+                                                     { 1, 3, 2, 3, 1, 1, 0, 0 }, // 38
+                                                     { 2, 1, 1, 3, 1, 3, 0, 0 }, // 39
+                                                     { 2, 3, 1, 1, 1, 3, 0, 0 }, // 40
+                                                     { 2, 3, 1, 3, 1, 1, 0, 0 }, // 41
+                                                     { 1, 1, 2, 1, 3, 3, 0, 0 }, // 42
+                                                     { 1, 1, 2, 3, 3, 1, 0, 0 }, // 43
+                                                     { 1, 3, 2, 1, 3, 1, 0, 0 }, // 44
+                                                     { 1, 1, 3, 1, 2, 3, 0, 0 }, // 45
+                                                     { 1, 1, 3, 3, 2, 1, 0, 0 }, // 46
+                                                     { 1, 3, 3, 1, 2, 1, 0, 0 }, // 47
+                                                     { 3, 1, 3, 1, 2, 1, 0, 0 }, // 48
+                                                     { 2, 1, 1, 3, 3, 1, 0, 0 }, // 49
+                                                     { 2, 3, 1, 1, 3, 1, 0, 0 }, // 50
+                                                     { 2, 1, 3, 1, 1, 3, 0, 0 }, // 51
+                                                     { 2, 1, 3, 3, 1, 1, 0, 0 }, // 52
+                                                     { 2, 1, 3, 1, 3, 1, 0, 0 }, // 53
+                                                     { 3, 1, 1, 1, 2, 3, 0, 0 }, // 54
+                                                     { 3, 1, 1, 3, 2, 1, 0, 0 }, // 55
+                                                     { 3, 3, 1, 1, 2, 1, 0, 0 }, // 56
+                                                     { 3, 1, 2, 1, 1, 3, 0, 0 }, // 57
+                                                     { 3, 1, 2, 3, 1, 1, 0, 0 }, // 58
+                                                     { 3, 3, 2, 1, 1, 1, 0, 0 }, // 59
+                                                     { 3, 1, 4, 1, 1, 1, 0, 0 }, // 60
+                                                     { 2, 2, 1, 4, 1, 1, 0, 0 }, // 61
+                                                     { 4, 3, 1, 1, 1, 1, 0, 0 }, // 62
+                                                     { 1, 1, 1, 2, 2, 4, 0, 0 }, // 63
+                                                     { 1, 1, 1, 4, 2, 2, 0, 0 }, // 64
+                                                     { 1, 2, 1, 1, 2, 4, 0, 0 }, // 65
+                                                     { 1, 2, 1, 4, 2, 1, 0, 0 }, // 66
+                                                     { 1, 4, 1, 1, 2, 2, 0, 0 }, // 67
+                                                     { 1, 4, 1, 2, 2, 1, 0, 0 }, // 68
+                                                     { 1, 1, 2, 2, 1, 4, 0, 0 }, // 69
+                                                     { 1, 1, 2, 4, 1, 2, 0, 0 }, // 70
+                                                     { 1, 2, 2, 1, 1, 4, 0, 0 }, // 71
+                                                     { 1, 2, 2, 4, 1, 1, 0, 0 }, // 72
+                                                     { 1, 4, 2, 1, 1, 2, 0, 0 }, // 73
+                                                     { 1, 4, 2, 2, 1, 1, 0, 0 }, // 74
+                                                     { 2, 4, 1, 2, 1, 1, 0, 0 }, // 75
+                                                     { 2, 2, 1, 1, 1, 4, 0, 0 }, // 76
+                                                     { 4, 1, 3, 1, 1, 1, 0, 0 }, // 77
+                                                     { 2, 4, 1, 1, 1, 2, 0, 0 }, // 78
+                                                     { 1, 3, 4, 1, 1, 1, 0, 0 }, // 79
+                                                     { 1, 1, 1, 2, 4, 2, 0, 0 }, // 80
+                                                     { 1, 2, 1, 1, 4, 2, 0, 0 }, // 81
+                                                     { 1, 2, 1, 2, 4, 1, 0, 0 }, // 82
+                                                     { 1, 1, 4, 2, 1, 2, 0, 0 }, // 83
+                                                     { 1, 2, 4, 1, 1, 2, 0, 0 }, // 84
+                                                     { 1, 2, 4, 2, 1, 1, 0, 0 }, // 85
+                                                     { 4, 1, 1, 2, 1, 2, 0, 0 }, // 86
+                                                     { 4, 2, 1, 1, 1, 2, 0, 0 }, // 87
+                                                     { 4, 2, 1, 2, 1, 1, 0, 0 }, // 88
+                                                     { 2, 1, 2, 1, 4, 1, 0, 0 }, // 89
+                                                     { 2, 1, 4, 1, 2, 1, 0, 0 }, // 90
+                                                     { 4, 1, 2, 1, 2, 1, 0, 0 }, // 91
+                                                     { 1, 1, 1, 1, 4, 3, 0, 0 }, // 92
+                                                     { 1, 1, 1, 3, 4, 1, 0, 0 }, // 93
+                                                     { 1, 3, 1, 1, 4, 1, 0, 0 }, // 94
+                                                     { 1, 1, 4, 1, 1, 3, 0, 0 }, // 95
+                                                     { 1, 1, 4, 3, 1, 1, 0, 0 }, // 96
+                                                     { 4, 1, 1, 1, 1, 3, 0, 0 }, // 97
+                                                     { 4, 1, 1, 3, 1, 1, 0, 0 }, // 98
+                                                     { 1, 1, 3, 1, 4, 1, 0, 0 }, // 99
+                                                     { 1, 1, 4, 1, 3, 1, 0, 0 }, // 100
+                                                     { 3, 1, 1, 1, 4, 1, 0, 0 }, // 101
+                                                     { 4, 1, 1, 1, 3, 1, 0, 0 }, // 102
+                                                     { 2, 1, 1, 4, 1, 2, 0, 0 }, // 103
+                                                     { 2, 1, 1, 2, 1, 4, 0, 0 }, // 104
+                                                     { 2, 1, 1, 2, 3, 2, 0, 0 }, // 105
+                                                     { 2, 3, 3, 1, 1, 1, 2, 0 } // 106
+                                                   };
+
+        /// <summary>
+        /// Make an image of a Code128 barcode for a given string
+        /// </summary>
+        /// <param name="inputData">Message to be encoded</param>
+        /// <param name="barWeight">Base thickness for bar width (1 or 2 works well)</param>
+        /// <param name="addQuietZone">Add required horizontal margins (use if output is tight)</param>
+        /// <returns>An Image of the Code128 barcode representing the message</returns>
+        public static Image MakeBarcodeImage(string inputData, int barWeight, bool addQuietZone)
+        {
+            // get the Code128 codes to represent the message
+            var content = new Code128Content(inputData);
+            var codes = content.Codes;
+
+            var width = (((codes.Length - 3) * 11) + 35) * barWeight;
+            var height = Convert.ToInt32(Math.Ceiling(Convert.ToSingle(width) * .15F));
+
+            if (addQuietZone)
+            {
+                width += 2 * CQuietWidth * barWeight; // on both sides
+            }
+
+            // get surface to draw on
+            Image myImage = new Bitmap(width, height);
+            using (var gr = Graphics.FromImage(myImage))
+            {
+                // set to white so we don't have to fill the spaces with white
+                gr.FillRectangle(Brushes.White, 0, 0, width, height);
+
+                // skip quiet zone
+                var cursor = addQuietZone ? CQuietWidth * barWeight : 0;
+
+                for (var codeIdx = 0; codeIdx < codes.Length; codeIdx++)
+                {
+                    var code = codes[codeIdx];
+
+                    // take the bars two at a time: a black and a white
+                    for (var bar = 0; bar < 8; bar += 2)
+                    {
+                        var barWidth = CPatterns[code, bar] * barWeight;
+                        var spcWidth = CPatterns[code, bar + 1] * barWeight;
+
+                        // if width is zero, don't try to draw it
+                        if (barWidth > 0)
+                        {
+                            gr.FillRectangle(Brushes.Black, cursor, 0, barWidth, height);
+                        }
+
+                        // note that we never need to draw the space, since we 
+                        // initialized the graphics to all white
+
+                        // advance cursor beyond this pair
+                        cursor += barWidth + spcWidth;
+                    }
+                }
+            }
+
+            return myImage;
+        }
+    }
+}

GenCode128/CodeSet.cs

@@ -0,0 +1,9 @@
+namespace GenCode128
+{
+    public enum CodeSet
+    {
+        CodeA,
+        CodeB
+        //// CodeC   // not supported
+    }
+}

GenCode128/GenCode128.csproj

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{32817BF9-E380-4467-9C7F-936F4B122BC7}</ProjectGuid>
+    <SccProjectName>
+    </SccProjectName>
+    <SccLocalPath>
+    </SccLocalPath>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccProvider>
+    </SccProvider>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>GenCode128</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>GenCode128</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Drawing">
+      <Name>System.Drawing</Name>
+    </Reference>
+    <Reference Include="System.Windows.Forms">
+      <Name>System.Windows.Forms</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Code128Code.cs" />
+    <Compile Include="CodeSet.cs" />
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Code128Content.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Code128Rendering.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>

Results/BatchResults.cs

@@ -130,13 +130,19 @@ namespace Results
 
         public static BatchResults FromBatch(Batch batch)
         {
-            int wmCount = batch.WaterMeters.Count;
-            if (wmCount == 0) return null;
+            if (batch.WaterMeters == null || batch.WaterMeters.Count == 0) return null;
 
-            BatchResults batchResults = new BatchResults(wmCount);
+            int wmPosMax = 0;
+            foreach (var wm in batch.WaterMeters) if (wm.WMPosition > wmPosMax) wmPosMax = wm.WMPosition;
+
+            BatchResults batchResults = new BatchResults(wmPosMax);
             batchResults.Batch = batch;
-            batchResults.WaterMeters = new WaterMeter[wmCount];
-            for (int i = 0; i < wmCount; i++) batchResults.WaterMeters[i] = batch.WaterMeters[i];
+            batchResults.WaterMeters = new WaterMeter[wmPosMax];
+            for (int i = 0; i < batch.WaterMeters.Count; i++)
+            {
+                WaterMeter wm = batch.WaterMeters[i];
+                batchResults.WaterMeters[wm.WMPosition - 1] = wm;
+            }
 
             return batchResults;
         }

Results/Entities/TestRslt.cs

@@ -135,10 +135,10 @@ namespace Results.Entities
 		public virtual double TargetTime()	 { return TestData.TargetTime; }
 		public virtual string Method()		 { return TestData.Method; }
         public virtual string RefFlowmeter() { return (Components != null) ? Components.Flowmeter : string.Empty; }
-        public virtual bool IsRelErrTest()   { return (MethodClass != null) ? (MethodClass.Contains("FixedStart") || MethodClass.Contains("FlyingStart") || MethodClass.Contains("CombinedWithDetection")) : true; }
+        public virtual bool IsRelErrTest()   { return (MethodClass != null) ? (MethodClass.Contains("FixedStart") || MethodClass.Contains("FlyingStart") || MethodClass.Contains("CombinedWithDetection") || MethodClass.Contains("DiverterTest")) : true; }
         public virtual bool IsPMaxTest()     { return (MethodClass != null) ? (MethodClass.Contains("PMaxTest") || MethodClass.Contains("LeakTest")) : 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")) : 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 string MethodElde()

Results/Entities/WaterMeter.cs

@@ -97,6 +97,7 @@ namespace Results.Entities
         public virtual object CompleteTestInfos { get; set; }	/// SensusTestInfo[] obtained as a best match at the beginning of the cycle, not mapped to DB !!!
 #endif
 		public virtual int	  ProcessId	        { get; set; }	/// Not mapped to DB !!!    Tracing DB Process ID
+        public virtual int    SessionId         { get; set; }   /// Not mapped to DB !!!    1 (regular tracing DB session) or 2 (alternative tracing DB session)                                                 
         public virtual bool   LastRecordIsNok   { get; set; }	/// Not mapped to DB !!!    Previous record verification result
 
         public virtual WaterMeterData WaterMeterData { get; set; }
@@ -359,6 +360,7 @@ namespace Results.Entities
             CompleteTestInfos = null;
 #endif
             ProcessId = 0;
+            SessionId = 0;
             ErrorFlags = 0;
             LastRecordIsNok = false;
 		}
@@ -419,6 +421,7 @@ namespace Results.Entities
             CompleteTestInfos = src.CompleteTestInfos;
 #endif
             ProcessId = src.ProcessId;
+            SessionId = src.SessionId;
             LastRecordIsNok = src.LastRecordIsNok;
 
             foreach (var mtr in MeterTestRslts)
@@ -528,6 +531,12 @@ namespace Results.Entities
                     return NokColor;
                 }
             }
+            else if (Disabled)
+            {
+                /// Water meter was not completed yet => did not pass, did not fail
+                message = Strings.This_position_is_disabled;
+                return NotCompletedColor;
+            }
             else
             {
                 /// Water meter was not completed yet => did not pass, did not fail

Results/Forms/BatchResultsDlg.cs

@@ -1,10 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 using log4net;
 using Config.Entities;
@@ -18,43 +13,33 @@ namespace Results.Forms
     {
         static readonly ILog log = LogManager.GetLogger(typeof(BatchResultsDlg));
 
-
-        DateTime lastRedraw;
-        DateTime lastSizeChange;
-        bool loaded;
-
         ///
         /// Public members
         ///
+        public Results.BatchResults Results;
+        public IList<Results.WMeterRsltItemSpec> Items;
         public MetersArrangement MetersArrangement;
         public TestsArrangement TestsArrangement;
         public int NrMetersInOneGroup;
-
-        public IList<Results.WMeterRsltItemSpec> RsltItems_Screen_SingleWM;
-        public IList<Results.WMeterRsltItemSpec> RsltItems_Screen_CombinedWM;
-        public IList<Results.WMeterRsltItemSpec> RsltItems_Screen_HeatM;
-        public int[] RsltsClmnWidths { set { rsltsClmnWidths = value; } }
-
+        public bool ShowDisabledPositions;
+        public int MinWidth;
+        public int MinHeight;
         public int PopupResultsLeft;
         public int PopupResultsTop;
         public int PopupResultsWidth;
         public int PopupResultsHeight;
+        public int[] RsltsClmnWidths;
 
-        public Results.BatchResults Results { set { Display(value); } }
 
         ///
         /// Private members
         ///
-        Results.BatchResults results;
-        MetersKind metersKind;
-
-        OneWMResultsCtrl firstListView;
-        public int[] rsltsClmnWidths;
-        int rsltsClmnCount { get { return (rsltsClmnWidths != null) ? rsltsClmnWidths.Length : 0; } }
-
-        int lvWidth;
-        int lvHeight;
-
+        IOneWMResultsCtrl[] wmRsltsCtrl;        /// An array of controls with water meter results.
+        IOneWMResultsCtrl firstEnabledControl;
+        DateTime lastRedraw;
+        DateTime lastSizeChange;
+        int metersInOneGroup;
+        int nrGroups;
 
         Timer timer;
 
@@ -62,310 +47,196 @@ namespace Results.Forms
         public BatchResultsDlg()
         {
             InitializeComponent();
-            Text = Strings.Results;
 
+            firstEnabledControl = null;
             lastSizeChange = DateTime.Now;
+            nrGroups = 1;
+            metersInOneGroup = 1;
 
-            // Create a timer with a ten second interval.
+            /// Create a timer with one second interval.
             timer = new Timer();
-            timer.Interval = 500;   /// ms
+            timer.Interval = 1000;   /// ms
             timer.Tick += new EventHandler(OnTimer);
             timer.Start();
         }
 
         private void BatchResultsDlg_Load(object sender, EventArgs e)
         {
-            if (PopupResultsLeft != 0)   Left   = PopupResultsLeft;
-            if (PopupResultsTop != 0)    Top    = PopupResultsTop;
-            if (PopupResultsWidth != 0)  Width  = PopupResultsWidth;
+            if (PopupResultsLeft != 0) Left = PopupResultsLeft;
+            if (PopupResultsTop != 0) Top = PopupResultsTop;
+            if (PopupResultsWidth != 0)  Width = PopupResultsWidth;
             if (PopupResultsHeight != 0) Height = PopupResultsHeight;
 
-            loaded = true;
-            if (results != null) Redraw();
-        }
-
-        public void Display(Results.BatchResults results)
-        {
-            this.results = results;
-            if (loaded) Redraw();
+            CreateControlsAndFillPanel(Results);
+            UpdateColumnWidths(RsltsClmnWidths);
+            UpdateResults(Results);
         }
 
 
-        IList<Results.WMeterRsltItemSpec> GetRsltItems(MetersKind metersKind)
+        ///
+        /// Handle double-click inside a water meter results control
+        ///
+        void OnDoubleClick(object sender, Results.Forms.WaterMeterEventArgs args)
         {
-            IList<Results.WMeterRsltItemSpec> srcItems;
-            switch (metersKind)
+            if (Results.WaterMeters != null && args.WMPosition > 0)
             {
-                default:
-                case MetersKind.Single: srcItems = RsltItems_Screen_SingleWM; break;
-                case MetersKind.Combined: srcItems = RsltItems_Screen_CombinedWM; break;
-                case MetersKind.HeatMeter: srcItems = RsltItems_Screen_HeatM; break;
+                foreach (var wm in Results.WaterMeters)
+                {
+                    if ((wm != null) && (wm.WMPosition == args.WMPosition))
+                    {
+                        ShowMoreWMResults(wm);
+                        return;
+                    }
+                }
             }
 
-            IList<Results.WMeterRsltItemSpec> copiedItems = new List<Results.WMeterRsltItemSpec>();
-            foreach (var it in srcItems) copiedItems.Add(it.Clone());
-            return copiedItems;
+            MessageBox.Show(Strings.No_water_meter);
+            return;
+        }
+
+
+        void UpdateColumnWidths(int[] columnWidths)
+        {
+            foreach (var ctrl in wmRsltsCtrl) ctrl.Update(columnWidths);
+        }
+
+        void UpdateScrollpositions(int scrollStart)
+        {
+            /// TODO
         }
 
 
         /// <summary>
         /// Re-draw the results. Apply new settings if they changed.
         /// </summary>
-        public void Redraw()
+        void CreateControlsAndFillPanel(Results.BatchResults results)
         {
-            lastRedraw = DateTime.Now;
-            
-            this.SuspendLayout();
-
-            try
+            if ((results == null) || (results.WMPositionsCount == 0))
             {
-                /// Determine how many water meters were enabled for result evaluation and printing
-                int enabledWMsCount = 0;
-                for (int i = 0; i < results.WMPositionsCount; i++)
-                {
-                    if (results.WaterMeters[i] != null && !results.WaterMeters[i].Disabled)
-                    {
-                        enabledWMsCount++;
-                    }
-                }
-
-                int metersInOneGroup = Math.Max(1, Math.Min(enabledWMsCount, NrMetersInOneGroup));
-                int nrGroups = Math.Max(1, (enabledWMsCount + metersInOneGroup - 1) / metersInOneGroup);
-
-                if (MetersArrangement == MetersArrangement.Horizontally)
-                {
-                    flowLayoutPanel.FlowDirection = FlowDirection.LeftToRight;
-                    lvWidth = flowLayoutPanel.Width / metersInOneGroup - 6;
-                    lvHeight = flowLayoutPanel.Height / nrGroups - 6;
-                }
-                else
-                {
-                    flowLayoutPanel.FlowDirection = FlowDirection.TopDown;
-                    lvWidth = flowLayoutPanel.Width / nrGroups - 6;
-                    lvHeight = flowLayoutPanel.Height / metersInOneGroup - 6;
-                }
+                /// There are no water meters at all
                 flowLayoutPanel.Controls.Clear();
-                flowLayoutPanel.WrapContents = true;
-                flowLayoutPanel.AutoScroll = true;
-
-                bool first = true;
-                for (int i = 0; i < results.WMPositionsCount; i++)
-                {
-                    if (results.WaterMeters[i] != null && !results.WaterMeters[i].Disabled)
-                    {
-                        OneWMResultsCtrl lview = (TestsArrangement == TestsArrangement.Rows)
-                                               ? GetResultsTestsAreRows(results.WaterMeters[i], i + 1)
-                                               : GetResultsTestsAreColumns(results.WaterMeters[i], i + 1);
-                        if (lview != null)
-                        {
-                            flowLayoutPanel.Controls.Add(lview);
-                            if (first)
-                            {
-                                firstListView = lview;
-                                first = false;
-                            }
-
-                            lview.WMResultsClickedHandler += delegate(object sender, Results.Forms.WaterMeterEventArgs args)
-                                {
-                                    if (InvokeRequired)
-                                    {
-                                        Invoke(new EventHandler<Results.Forms.WaterMeterEventArgs>(OnDoubleClick), sender, args);
-                                    }
-                                    else
-                                    {
-                                        OnDoubleClick(sender, args);
-                                    }
-                                };
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                log.FatalFormat("Redrawing results failed : {0}", e.Message);
-                if (e.InnerException != null)
-                {
-                    log.FatalFormat("InnerMessage : {0}", e.InnerException.Message);
-                }
-                log.FatalFormat("StackTrace   : {0}{1}", Environment.NewLine, e.StackTrace);
-            }
-
-            this.ResumeLayout(false);
-        }
-
-
-        /// <summary>
-        /// Get an empty ListView control with appropriate parameters.
-        /// </summary>
-        /// <returns>ListView control</returns>
-        OneWMResultsCtrl GetListView(Color backColor, Results.Entities.WaterMeter wm)
-        {
-            return new OneWMResultsCtrl(backColor, lvWidth, lvHeight, wm);
-        }
-        /// 
-        OneWMResultsCtrl GetListView(Results.Entities.WaterMeter wm)
-        {
-            return GetListView(Color.White, wm);
-        }
-
-
-        /// <summary>
-        /// Get a ListView control filled with results of the meter 'mtr'
-        /// </summary>
-        /// <param name="mtr">Water meter number (1-based): 1 .. Config.Data.WMsCount</param>
-        /// <returns>ListView object</returns>
-        OneWMResultsCtrl GetResultsTestsAreRows(Results.Entities.WaterMeter wMtr, int printedWMNr)
-        {
-            metersKind = wMtr.Compound() ? MetersKind.Combined : (wMtr.HeatMeter() ? MetersKind.HeatMeter : MetersKind.Single);
-
-            string message = string.Empty;
-            Color commonBackColor = wMtr.GetColorOfResults(false, out message);
-            OneWMResultsCtrl lview = GetListView(commonBackColor, wMtr);
-#if ORACLE_DB
-            lview.Caption = string.Format("{0} ({1}) {2}", (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr), (wMtr.Pruefindex % 100), message);
-#else
-            lview.Caption = string.Format("s/n = {0}", string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr);
-#endif
-
-            IList<Results.WMeterRsltItemSpec> items = GetRsltItems(metersKind);
-
-            if (items == null || items.Count == 0) return lview;
-
-            // Header
-            lview.Columns.Add(printedWMNr.ToString(), (rsltsClmnCount > 0) ? rsltsClmnWidths[0] : 40);
-            int col = 1;
-            foreach (var item in items)
-            {
-                lview.Columns.Add(item.Caption, (rsltsClmnCount > col) ? rsltsClmnWidths[col] : 70);
-                col++;
-            }
-
-
-            IList<string> testNames = wMtr.GetAllDecoratedTestNames();
-            int ix = 0;
-            foreach (var mtr in wMtr.MeterTestRslts)
-            {
-                if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Config.Entities.Publish.Never
-																	 && mtr.Publish() != Config.Entities.Publish.Internal)
-                {
-                    ListViewItem lvi = new ListViewItem(testNames[ix++]);
-
-                    for (int i = 0; i < items.Count; i++)
-                    {
-                        string str = items[i].Print(wMtr, mtr.Name());
-
-                        /// Extract and use color information
-                        string[] texts = str.Split(new char[] { '|' });
-                        if (texts.Length == 1)
-                        {
-                            lvi.SubItems.Add(str);
-                        }
-                        else if (texts.Length == 2)
-                        {
-                            Color color = texts[1].Equals("Green") ? Color.Green : (texts[1].Equals("Red") ? Color.Red : Color.White);
-                            lvi.UseItemStyleForSubItems = false;
-                            lvi.SubItems.Add(texts[0]);
-                            lvi.SubItems[lvi.SubItems.Count - 1].BackColor = color;
-                        }
-                        else
-                        {
-                            lvi.SubItems.Add(string.Empty);
-                        }
-                    }
-
-                    lview.Items.Add(lvi);
-                }
-            }
-
-            return lview;
-        }
-
-
-        /// <summary>
-        /// Get a ListView control filled with results of the meter 'mtr'
-        /// </summary>
-        /// <param name="mtr">Water meter number (1-based): 1 .. Config.Data.WMsCount</param>
-        /// <returns>ListView object</returns>
-        OneWMResultsCtrl GetResultsTestsAreColumns(Results.Entities.WaterMeter wMtr, int printedWMNr)
-        {
-            metersKind = wMtr.Compound() ? MetersKind.Combined : (wMtr.HeatMeter() ? MetersKind.HeatMeter : MetersKind.Single);
-
-            string message;
-            Color commonBackColor = wMtr.GetColorOfResults(false, out message);
-            OneWMResultsCtrl lview = GetListView(commonBackColor, wMtr);
-#if ORACLE_DB
-            lview.Caption = string.Format("{0} ({1}) {2}", (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr), (wMtr.Pruefindex % 100), message);
-#else
-            lview.Caption = string.Format("s/n = {0}", string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr);
-#endif
-
-            IList<Results.WMeterRsltItemSpec> items = GetRsltItems(metersKind);
-
-            if (items == null || items.Count == 0) return lview;
-
-            // Header
-            lview.Columns.Add(printedWMNr.ToString(), (rsltsClmnCount > 0) ? rsltsClmnWidths[0] : 40);
-            int i = 1;
-            foreach (var str in wMtr.GetAllDecoratedTestNames())
-            {
-                lview.Columns.Add(str, (rsltsClmnCount > i) ? rsltsClmnWidths[i] : 70);
-                i++;
-            }
-
-            foreach (var item in items)
-            {
-                ListViewItem lvi = new ListViewItem(item.Caption);
-
-                foreach (var mtr in wMtr.MeterTestRslts)
-                {
-                    if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Config.Entities.Publish.Never &&
-																			mtr.Publish() != Config.Entities.Publish.Internal)
-                    {
-                        string str = item.Print(wMtr, mtr.Name());
-
-                        string[] texts = str.Split(new char[] { '|' });
-                        if (texts.Length == 1)
-                        {
-                            lvi.SubItems.Add(str);
-                        }
-                        else if (texts.Length == 2)
-                        {
-                            Color color = texts[1].Equals("Green") ? Color.Green : (texts[1].Equals("Red") ? Color.Red : Color.White);
-                            lvi.UseItemStyleForSubItems = false;
-                            lvi.SubItems.Add(texts[0]);
-                            lvi.SubItems[lvi.SubItems.Count - 1].BackColor = color;
-                        }
-                        else
-                        {
-                            lvi.SubItems.Add(string.Empty);
-                        }
-                    }
-                }
-
-                lview.Items.Add(lvi);
-            }
-
-            return lview;
-        }
-
-
-        void OnDoubleClick(object sender, Results.Forms.WaterMeterEventArgs args)
-        {
-            if ( args.WM == null || args.WM.Disabled)
-            {
-                MessageBox.Show(Strings.No_water_meter);
+                wmRsltsCtrl = new OneWMResultsRowsCtrl[0];
+                firstEnabledControl = null;
                 return;
             }
-            else if ((TracingDB.DB.SessionFactory == null) || string.IsNullOrEmpty(args.WM.SerialNr))
+
+            ///
+            /// Determine water meter positions count
+            ///
+            int displayedControlsCount = 0;
+            for (int i = 0; i < results.WaterMeters.Length; i++)
             {
-                new Results.Forms.MoreWMResultsDlg( args.WM, null).ShowDialog();
+                if (((results.WaterMeters[i] != null) && !results.WaterMeters[i].Disabled) || ShowDisabledPositions)
+                {
+                    displayedControlsCount++;
+                }
+            }
+
+            ///
+            /// Calculate geometry
+            ///
+            metersInOneGroup = Math.Max(1, Math.Min(displayedControlsCount, NrMetersInOneGroup));
+            nrGroups = Math.Max(1, (displayedControlsCount + metersInOneGroup - 1) / metersInOneGroup);
+
+            int oneWidth;
+            int oneHeight;
+            ///
+            if (MetersArrangement == MetersArrangement.Horizontally)
+            {
+                flowLayoutPanel.FlowDirection = FlowDirection.LeftToRight;
+                oneWidth = Math.Max(MinWidth, flowLayoutPanel.Width / metersInOneGroup - 6);
+                oneHeight = Math.Max(MinHeight, flowLayoutPanel.Height / nrGroups - 6);
+            }
+            else
+            {
+                flowLayoutPanel.FlowDirection = FlowDirection.TopDown;
+                oneWidth = Math.Max(MinWidth, flowLayoutPanel.Width / nrGroups - 6);
+                oneHeight = Math.Max(MinHeight, flowLayoutPanel.Height / metersInOneGroup - 6);
+            }
+
+            ///
+            /// Create controls and fill the FlowLayoutPanel
+            ///
+            flowLayoutPanel.SuspendLayout();
+            flowLayoutPanel.Controls.Clear();
+            flowLayoutPanel.WrapContents = true;
+            flowLayoutPanel.AutoScroll = true;
+
+            wmRsltsCtrl = new IOneWMResultsCtrl[displayedControlsCount];
+            int ix = 0;
+            firstEnabledControl = null;
+            for (int i = 0; i < results.WaterMeters.Length; i++)
+            {
+                if (((results.WaterMeters[i] != null) && !results.WaterMeters[i].Disabled) || ShowDisabledPositions)
+                {
+                    /// Create one water meter position / control
+                    wmRsltsCtrl[ix] = (TestsArrangement == TestsArrangement.Rows)
+                                    ? new OneWMResultsRowsCtrl() as IOneWMResultsCtrl
+                                    : new OneWMResultsColumnsCtrl() as IOneWMResultsCtrl;
+                    wmRsltsCtrl[ix].Width = oneWidth;
+                    wmRsltsCtrl[ix].Height = oneHeight;
+
+                    if ((results.WaterMeters[i] != null) && !results.WaterMeters[i].Disabled)
+                    {
+                        if ((firstEnabledControl == null) && (results.WaterMeters[i] != null) && !results.WaterMeters[i].Disabled)
+                        {
+                            firstEnabledControl = wmRsltsCtrl[ix];
+                        }
+
+                        //wmRsltsCtrl[ix].Update(results.WaterMeters[i].WMPosition);
+                        wmRsltsCtrl[ix].Update(Items);
+                        wmRsltsCtrl[ix].WMResultsClickedHandler += delegate(object s, Results.Forms.WaterMeterEventArgs args)
+                        {
+                            if (InvokeRequired)
+                            {
+                                Invoke(new EventHandler<Results.Forms.WaterMeterEventArgs>(OnDoubleClick), s, args);
+                            }
+                            else
+                            {
+                                OnDoubleClick(s, args);
+                            }
+                        };
+                    }
+
+                    flowLayoutPanel.Controls.Add(wmRsltsCtrl[ix] as UserControl);
+                    ix++;
+                }
+            }
+
+            flowLayoutPanel.ResumeLayout();
+
+            lastRedraw = DateTime.Now;
+        }
+
+
+        void UpdateResults(Results.BatchResults results)
+        {
+            if ((results != null) && (results.WaterMeters != null))
+            {
+                int ctrlIx = 0;
+                for (int i = 0; i < results.WaterMeters.Length; i++)
+                {
+                    if (((results.WaterMeters[i] != null) && !results.WaterMeters[i].Disabled) || ShowDisabledPositions)
+                    {
+                        if (ctrlIx < wmRsltsCtrl.Length) wmRsltsCtrl[ctrlIx++].Update(results.WaterMeters[i]);
+                    }
+                }
+            }
+        }
+
+
+        void ShowMoreWMResults(Results.Entities.WaterMeter wm)
+        {
+            if ((TracingDB.DB.SessionFactory == null) || string.IsNullOrEmpty(wm.SerialNr))
+            {
+                new Results.Forms.MoreWMResultsDlg(wm, null).ShowDialog();
             }
             else
             {
                 using (ISession session = TracingDB.DB.SessionFactory.OpenSession())
                 {
                     IList<ReferenceRecord> refRecords = session.QueryOver<ReferenceRecord>()
-                                                               .Where(x => (x.Code == args.WM.SerialNr))
+                                                               .Where(x => (x.Code == wm.SerialNr))
                                                                .OrderBy(x => x.TimeStamp).Desc
                                                                .List();
                     for (int i = 0; i < refRecords.Count; i++)
@@ -391,7 +262,7 @@ namespace Results.Forms
                         }
                     }
 
-                    new Results.Forms.MoreWMResultsDlg(args.WM, refRecords).ShowDialog();
+                    new Results.Forms.MoreWMResultsDlg(wm, refRecords).ShowDialog();
                 }
             }
         }
@@ -405,6 +276,7 @@ namespace Results.Forms
             PopupResultsHeight = Height;
         }
 
+
         private void flowLayoutPanel_SizeChanged(object sender, EventArgs e)
         {
             lastSizeChange = DateTime.Now;
@@ -414,13 +286,40 @@ namespace Results.Forms
         {
             if (DateTime.Compare(lastSizeChange, lastRedraw) > 0)
             {
-                /// The last size change was later then the last redraw
+                /// The last size change was more recent then the last redraw
 
                 DateTime now = DateTime.Now;
                 if (DateTime.Compare(lastSizeChange + new TimeSpan(0, 0, 1), now) < 0)
                 {
-                    /// More then 1s since the last size change
-                    Redraw();
+                    /// More then 1 second since the last panel size change
+
+                    /// Calculate geometry
+                    int oneWidth;
+                    int oneHeight;
+                    ///
+                    if (MetersArrangement == MetersArrangement.Horizontally)
+                    {
+                        flowLayoutPanel.FlowDirection = FlowDirection.LeftToRight;
+                        oneWidth = Math.Max(MinWidth, flowLayoutPanel.Width / metersInOneGroup - 6);
+                        oneHeight = Math.Max(MinHeight, flowLayoutPanel.Height / nrGroups - 6);
+                    }
+                    else
+                    {
+                        flowLayoutPanel.FlowDirection = FlowDirection.TopDown;
+                        oneWidth = Math.Max(MinWidth, flowLayoutPanel.Width / nrGroups - 6);
+                        oneHeight = Math.Max(MinHeight, flowLayoutPanel.Height / metersInOneGroup - 6);
+                    }
+
+                    /// Update size of controls
+                    flowLayoutPanel.SuspendLayout();
+                    ///
+                    foreach (var oneCtrl in wmRsltsCtrl)
+                    {
+                        oneCtrl.Width = oneWidth;
+                        oneCtrl.Height = oneHeight;
+                    }
+                    ///
+                    flowLayoutPanel.ResumeLayout();
                 }
             }
         }

Results/Forms/IOneWMResultsCtrl.cs

@@ -0,0 +1,25 @@
+///
+/// Copyright (c) 2019 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace Results.Forms
+{
+    public interface IOneWMResultsCtrl
+    {
+        event EventHandler<WaterMeterEventArgs> WMResultsClickedHandler;
+
+        bool Disabled { get; }                              /// true when water meter position is disabled
+        int WMPosition { get; }                             /// 1-based WM position
+        int Width { get; set; }                             /// Control width
+        int Height { get; set; }                            /// Control height
+        ListView.ColumnHeaderCollection Columns { get; }    /// Embedded ListView control columns
+
+        void Update(int[] columnWidths);
+        void Update(IList<Results.WMeterRsltItemSpec> items);
+        void Update(Results.Entities.WaterMeter wMtr);
+    }
+}

Results/Forms/MoreWMResultsDlg.Designer.cs

@@ -29,15 +29,13 @@
         private void InitializeComponent()
         {
             this.tabControl1 = new System.Windows.Forms.TabControl();
-            this.allResultsTabPage = new System.Windows.Forms.TabPage();
             this.graphsTabPage = new System.Windows.Forms.TabPage();
             this.productionTracingTabPage = new System.Windows.Forms.TabPage();
             this.productionTracingSplitContainer = new System.Windows.Forms.SplitContainer();
             this.messageLabel = new System.Windows.Forms.Label();
             this.tracingResultsListView = new System.Windows.Forms.ListView();
-            this.oneWMResultsCtrl = new Results.Forms.OneWMResultsCtrl();
+            this.allResultsTabPage = new System.Windows.Forms.TabPage();
             this.tabControl1.SuspendLayout();
-            this.allResultsTabPage.SuspendLayout();
             this.productionTracingTabPage.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.productionTracingSplitContainer)).BeginInit();
             this.productionTracingSplitContainer.Panel1.SuspendLayout();
@@ -57,17 +55,6 @@
             this.tabControl1.Size = new System.Drawing.Size(1195, 448);
             this.tabControl1.TabIndex = 0;
             // 
-            // allResultsTabPage
-            // 
-            this.allResultsTabPage.Controls.Add(this.oneWMResultsCtrl);
-            this.allResultsTabPage.Location = new System.Drawing.Point(4, 22);
-            this.allResultsTabPage.Name = "allResultsTabPage";
-            this.allResultsTabPage.Padding = new System.Windows.Forms.Padding(3);
-            this.allResultsTabPage.Size = new System.Drawing.Size(1187, 422);
-            this.allResultsTabPage.TabIndex = 0;
-            this.allResultsTabPage.Text = "All results";
-            this.allResultsTabPage.UseVisualStyleBackColor = true;
-            // 
             // graphsTabPage
             // 
             this.graphsTabPage.Location = new System.Drawing.Point(4, 22);
@@ -133,14 +120,15 @@
             this.tracingResultsListView.UseCompatibleStateImageBehavior = false;
             this.tracingResultsListView.View = System.Windows.Forms.View.Details;
             // 
-            // oneWMResultsCtrl
+            // allResultsTabPage
             // 
-            this.oneWMResultsCtrl.Caption = "";
-            this.oneWMResultsCtrl.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.oneWMResultsCtrl.Location = new System.Drawing.Point(3, 3);
-            this.oneWMResultsCtrl.Name = "oneWMResultsCtrl";
-            this.oneWMResultsCtrl.Size = new System.Drawing.Size(1181, 416);
-            this.oneWMResultsCtrl.TabIndex = 0;
+            this.allResultsTabPage.Location = new System.Drawing.Point(4, 22);
+            this.allResultsTabPage.Name = "allResultsTabPage";
+            this.allResultsTabPage.Padding = new System.Windows.Forms.Padding(3);
+            this.allResultsTabPage.Size = new System.Drawing.Size(1187, 422);
+            this.allResultsTabPage.TabIndex = 0;
+            this.allResultsTabPage.Text = "All results";
+            this.allResultsTabPage.UseVisualStyleBackColor = true;
             // 
             // MoreWMResultsDlg
             // 
@@ -152,7 +140,6 @@
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "Water meter results";
             this.tabControl1.ResumeLayout(false);
-            this.allResultsTabPage.ResumeLayout(false);
             this.productionTracingTabPage.ResumeLayout(false);
             this.productionTracingSplitContainer.Panel1.ResumeLayout(false);
             this.productionTracingSplitContainer.Panel1.PerformLayout();
@@ -166,12 +153,12 @@
         #endregion
 
         private System.Windows.Forms.TabControl tabControl1;
-        private System.Windows.Forms.TabPage allResultsTabPage;
-        private OneWMResultsCtrl oneWMResultsCtrl;
+        private OneWMResultsRowsCtrl oneWMResultsCtrl;
         private System.Windows.Forms.TabPage graphsTabPage;
         private System.Windows.Forms.TabPage productionTracingTabPage;
         private System.Windows.Forms.SplitContainer productionTracingSplitContainer;
         private System.Windows.Forms.Label messageLabel;
         private System.Windows.Forms.ListView tracingResultsListView;
+        private System.Windows.Forms.TabPage allResultsTabPage;
     }
 }

Results/Forms/MoreWMResultsDlg.cs

@@ -26,7 +26,7 @@ namespace Results.Forms
             if (refRecords == null)
             {
                 tabControl1.SelectTab(1);
-                tabControl1.TabPages[2].Hide();
+                tabControl1.TabPages.RemoveAt(2);
             }
             else
             {
@@ -51,57 +51,57 @@ namespace Results.Forms
         /// <param name="wMtr">Water meter entity</param>
         void ShowAllResults(Results.Entities.WaterMeter wMtr)
         {
-            string message;
-            Color commonBackColor = wMtr.GetColorOfResults(false, out message);     /// Ony message is used later on
-#if ORACLE_DB
-            oneWMResultsCtrl.Caption = string.Format("{0} ({1}) {2}", (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr), (wMtr.Pruefindex % 100), message);
-#else
-            oneWMResultsCtrl.Caption = string.Format("s/n = {0}", string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr);
-#endif
+//            string message;
+//            Color commonBackColor = wMtr.GetColorOfResults(false, out message);     /// Ony message is used later on
+//#if ORACLE_DB
+//            oneWMResultsCtrl.Caption = string.Format("{0} ({1}) {2}", (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr), (wMtr.Pruefindex % 100), message);
+//#else
+//            oneWMResultsCtrl.Caption = string.Format("s/n = {0}", string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr);
+//#endif
 
-            IList<Results.WMeterRsltItemSpec> items = Results.WMeterRsltItemSpec.AllItems;
+//            IList<Results.WMeterRsltItemSpec> items = Results.WMeterRsltItemSpec.AllItems;
 
-            // Header
-            oneWMResultsCtrl.Columns.Add(wMtr.WMPosition.ToString(), 100);
-            int i = 1;
-            foreach (var str in wMtr.GetAllDecoratedTestNames())
-            {
-                oneWMResultsCtrl.Columns.Add(str, 100);
-                i++;
-            }
+//            // Header
+//            oneWMResultsCtrl.Columns.Add(wMtr.WMPosition.ToString(), 100);
+//            int i = 1;
+//            foreach (var str in wMtr.GetAllDecoratedTestNames())
+//            {
+//                oneWMResultsCtrl.Columns.Add(str, 100);
+//                i++;
+//            }
 
-            foreach (var item in items)
-            {
-                ListViewItem lvi = new ListViewItem(item.Name);
+//            foreach (var item in items)
+//            {
+//                ListViewItem lvi = new ListViewItem(item.Name);
 
-                foreach (var mtr in wMtr.MeterTestRslts)
-                {
-                    if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Config.Entities.Publish.Never &&
-                                                                            mtr.Publish() != Config.Entities.Publish.Internal)
-                    {
-                        string str = item.Print(wMtr, mtr.Name());
+//                foreach (var mtr in wMtr.MeterTestRslts)
+//                {
+//                    if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Config.Entities.Publish.Never &&
+//                                                                            mtr.Publish() != Config.Entities.Publish.Internal)
+//                    {
+//                        string str = item.Print(wMtr, mtr.Name());
 
-                        string[] texts = str.Split(new char[] { '|' });
-                        if (texts.Length == 1)
-                        {
-                            lvi.SubItems.Add(str);
-                        }
-                        else if (texts.Length == 2)
-                        {
-                            Color color = texts[1].Equals("Green") ? Color.Green : (texts[1].Equals("Red") ? Color.Red : Color.White);
-                            lvi.UseItemStyleForSubItems = false;
-                            lvi.SubItems.Add(texts[0]);
-                            lvi.SubItems[lvi.SubItems.Count - 1].BackColor = color;
-                        }
-                        else
-                        {
-                            lvi.SubItems.Add(string.Empty);
-                        }
-                    }
-                }
+//                        string[] texts = str.Split(new char[] { '|' });
+//                        if (texts.Length == 1)
+//                        {
+//                            lvi.SubItems.Add(str);
+//                        }
+//                        else if (texts.Length == 2)
+//                        {
+//                            Color color = texts[1].Equals("Green") ? Color.Green : (texts[1].Equals("Red") ? Color.Red : Color.White);
+//                            lvi.UseItemStyleForSubItems = false;
+//                            lvi.SubItems.Add(texts[0]);
+//                            lvi.SubItems[lvi.SubItems.Count - 1].BackColor = color;
+//                        }
+//                        else
+//                        {
+//                            lvi.SubItems.Add(string.Empty);
+//                        }
+//                    }
+//                }
 
-                oneWMResultsCtrl.Items.Add(lvi);
-            }
+//                oneWMResultsCtrl.Items.Add(lvi);
+//            }
         }
 
 
@@ -131,9 +131,19 @@ namespace Results.Forms
             tracingResultsListView.Columns.Add(Strings.Code, 150);
             tracingResultsListView.Columns.Add(Strings.Workflow, 450);
 
-            foreach (var rr in refRecords)
+            if (refRecords == null || refRecords.Count == 0)
             {
-                tracingResultsListView.Items.Add(new ListViewItem(new string[]
+                messageLabel.Text = "V sledovaní výroby nie sú žiadne záznamy";
+            }
+            else
+            {
+                Process proc = refRecords[0].Process;
+                bool[] isMissing = new bool[proc.Worksteps.Count];
+                for (int i = 0; i < isMissing.Length; i++) isMissing[i] = true;
+
+                foreach (var rr in refRecords)
+                {
+                    tracingResultsListView.Items.Add(new ListViewItem(new string[]
                     {
                         rr.TimeStamp.ToString("dd.MM.yyyy  HH:mm"),
                         rr.Workstep.Name,
@@ -144,6 +154,34 @@ namespace Results.Forms
                         rr.Code,
                         rr.Process.Name,
                     }));
+
+                    for (int i = 0; i < isMissing.Length; i++)
+                    {
+                        if (proc.Worksteps[i] == rr.Workstep) isMissing[i] = false;
+                    }
+                }
+
+                string missingWorkplace = null;
+                for (int i = 0; i < isMissing.Length; i++)
+                {
+                    if (isMissing[i])
+                    {
+                        if (missingWorkplace == null)
+                        {
+                            missingWorkplace = proc.Worksteps[i].Name;
+                            messageLabel.Text = string.Format("Chýba záznam z pracoviska {0}", missingWorkplace);
+                        }
+                        else
+                        {
+                            messageLabel.Text = string.Format("Chýba záznam z pracoviska {0} aj z nasledujúcich pracovísk", missingWorkplace);
+                        }
+                    }
+                }
+
+                if (missingWorkplace == null)
+                {
+                    messageLabel.Text = "Všetko je OK";
+                }
             }
         }
     }

Results/Forms/OneWMResultsColumnsCtrl.Designer.cs

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

Results/Forms/OneWMResultsColumnsCtrl.cs

@@ -0,0 +1,159 @@
+///
+/// Copyright (c) 2019 Sensus Slovensko a.s.
+///
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Collections.Generic;
+
+namespace Results.Forms
+{
+    public partial class OneWMResultsColumnsCtrl : UserControl, IOneWMResultsCtrl
+    {
+        public event EventHandler<WaterMeterEventArgs> WMResultsClickedHandler;
+        /// 
+        private void tBox_MouseDoubleClick(object sender, MouseEventArgs e)
+        {
+            try
+            {
+                if (WMResultsClickedHandler != null) WMResultsClickedHandler(sender, new WaterMeterEventArgs(wmPosition));
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+
+        bool disabled;
+        int wmPosition;         /// 1-based water meter position
+        string caption;
+        Color bkColor;
+        int[] columnWidths;
+        IList<Results.WMeterRsltItemSpec> items;
+
+
+        public bool Disabled { get { return disabled; } }                                   /// Read only
+        public int WMPosition { get { return wmPosition; } }                                /// Read only
+        public ListView.ColumnHeaderCollection Columns { get { return lView.Columns; } }    /// Read only
+
+
+        public OneWMResultsColumnsCtrl()
+        {
+            InitializeComponent();
+            disabled = false;
+            wmPosition = 0;
+            tBox.Text = caption = "---";
+            tBox.BackColor = lView.BackColor = bkColor = Color.White;
+            items = new List<Results.WMeterRsltItemSpec>();
+            columnWidths = new int[0];
+        }
+
+        public void Update(int[] columnWidths)
+        {
+            this.columnWidths = columnWidths;
+
+            /// Always update ListView column widths
+            int col = 0;
+            foreach (ColumnHeader column in lView.Columns)
+            {
+                column.Width = (columnWidths != null && columnWidths.Length > col) ? columnWidths[col] : ((col == 0) ? 40 : 70);
+                col++;
+            }
+        }
+
+        public void Update(IList<Results.WMeterRsltItemSpec> items)
+        {
+            this.items = items;
+        }
+
+        public void Update(Results.Entities.WaterMeter wMtr)
+        {
+            if (wMtr == null || wMtr.Disabled)
+            {
+                /// Water meter position is disabled
+                this.disabled = true;
+                lView.Items.Clear();
+                tBox.Text = caption = "---";
+                tBox.BackColor = lView.BackColor = bkColor = Color.White;
+                return;
+            }
+
+            /// Update background color
+            string message = string.Empty;
+            Update(wMtr.GetColorOfResults(false, out message));
+
+            /// Update caption
+#if ORACLE_DB
+            tBox.Text = caption = string.Format("{0} ({1}) {2}", (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr), (wMtr.Pruefindex % 100), message);
+#else
+            tBox.Text = caption = string.Format("s/n = {0}", string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr);
+#endif
+
+            /// Header
+            lView.Columns.Add(wmPosition.ToString(), (columnWidths != null && columnWidths.Length > 0) ? columnWidths[0] : 40);
+            int col = 1;
+            foreach (var str in wMtr.GetAllDecoratedTestNames())
+            {
+                lView.Columns.Add(str, (columnWidths != null && columnWidths.Length > col) ? columnWidths[col] : 70);
+                col++;
+            }
+
+            lView.Items.Clear();
+            if (items == null || items.Count == 0) return;
+
+            foreach (var item in items)
+            {
+                ListViewItem lvi = new ListViewItem(item.Caption);
+
+                foreach (var mtr in wMtr.MeterTestRslts)
+                {
+                    if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Config.Entities.Publish.Never &&
+                                                                            mtr.Publish() != Config.Entities.Publish.Internal)
+                    {
+                        string str = item.Print(wMtr, mtr.Name());
+
+                        string[] texts = str.Split(new char[] { '|' });
+                        if (texts.Length == 1)
+                        {
+                            lvi.SubItems.Add(str);
+                        }
+                        else if (texts.Length == 2)
+                        {
+                            Color color = texts[1].Equals("Green") ? Color.Green : (texts[1].Equals("Red") ? Color.Red : Color.White);
+                            lvi.UseItemStyleForSubItems = false;
+                            lvi.SubItems.Add(texts[0]);
+                            lvi.SubItems[lvi.SubItems.Count - 1].BackColor = color;
+                        }
+                        else
+                        {
+                            lvi.SubItems.Add(string.Empty);
+                        }
+                    }
+                }
+
+                lView.Items.Add(lvi);
+            }
+        }
+
+        ///
+        /// Private
+        ///
+
+        void Update(int wmPosition)
+        {
+            this.wmPosition = wmPosition;
+            if (lView.Columns.Count > 0)
+            {
+                lView.Columns[0].Text = wmPosition.ToString();
+            }
+        }
+
+        void Update(Color backColor)
+        {
+            if (this.bkColor != backColor)
+            {
+                tBox.BackColor = lView.BackColor = this.bkColor = backColor;
+            }
+        }
+    }
+}

Results/Forms/OneWMResultsCtrl.cs

@@ -1,41 +0,0 @@
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-using log4net;
-
-namespace Results.Forms
-{
-    public partial class OneWMResultsCtrl : UserControl
-    {
-        static readonly ILog log = LogManager.GetLogger(typeof(OneWMResultsCtrl));
-
-        public event EventHandler<WaterMeterEventArgs> WMResultsClickedHandler;
-
-        public OneWMResultsCtrl()
-        {
-            InitializeComponent();
-        }
-
-        public OneWMResultsCtrl(Color backColor, int lvWidth, int lvHeight, Results.Entities.WaterMeter wm)
-            : this()
-        {
-            lView.BackColor = backColor;
-            tBox.BackColor = backColor;
-            Size = new System.Drawing.Size(lvWidth, lvHeight);
-            WM = wm;
-        }
-
-        public Results.Entities.WaterMeter WM;
-        public string Caption { get { return tBox.Text; } set { tBox.Text = value; } }
-        public ListView.ColumnHeaderCollection Columns { get { return lView.Columns; } }
-        public ListView.ListViewItemCollection Items { get { return lView.Items; } }
-        public Color BColor { set { lView.BackColor = value; tBox.BackColor = value; } }
-
-        private void tBox_MouseDoubleClick(object sender, MouseEventArgs e)
-        {
-            if (WMResultsClickedHandler == null) return;
-            try { WMResultsClickedHandler(sender, new WaterMeterEventArgs(WM)); }
-            catch (Exception exc) { log.Error("WMResultsClickedHandler(...) failed", exc); }
-        }
-    }
-}

Results/Forms/OneWMResultsRowsCtrl.Designer.cs

@@ -1,6 +1,6 @@
 namespace Results.Forms
 {
-    partial class OneWMResultsCtrl
+    partial class OneWMResultsRowsCtrl
     {
         /// <summary> 
         /// Required designer variable.

Results/Forms/OneWMResultsRowsCtrl.cs

@@ -0,0 +1,169 @@
+///
+/// Copyright (c) 2019 Sensus Slovensko a.s.
+///
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Collections.Generic;
+
+namespace Results.Forms
+{
+    public partial class OneWMResultsRowsCtrl : UserControl, IOneWMResultsCtrl
+    {
+        public event EventHandler<WaterMeterEventArgs> WMResultsClickedHandler;
+        /// 
+        private void tBox_MouseDoubleClick(object sender, MouseEventArgs e)
+        {
+            try
+            {
+                if (WMResultsClickedHandler != null) WMResultsClickedHandler(sender, new WaterMeterEventArgs(wmPosition));
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+
+        bool disabled;
+        int wmPosition;         /// 1-based water meter position
+        string caption;
+        Color bkColor;
+        int[] columnWidths;
+        IList<Results.WMeterRsltItemSpec> items;
+
+
+        public bool Disabled { get { return disabled; } }                                   /// Read only
+        public int WMPosition { get { return wmPosition; } }                                /// Read only
+        public ListView.ColumnHeaderCollection Columns { get { return lView.Columns; } }    /// Read only
+
+
+        public OneWMResultsRowsCtrl()
+        {
+            InitializeComponent();
+            disabled = false;
+            wmPosition = 0;
+            tBox.Text = caption = "---";
+            tBox.BackColor = lView.BackColor = bkColor = Color.White;
+            items = new List<Results.WMeterRsltItemSpec>();
+            columnWidths = new int[0];
+        }
+
+        public void Update(int[] columnWidths)
+        {
+            this.columnWidths = columnWidths;
+
+            /// Always update ListView column widths
+            int col = 0;
+            foreach (ColumnHeader column in lView.Columns)
+            {
+                column.Width = (columnWidths != null && columnWidths.Length > col) ? columnWidths[col] : ((col == 0) ? 40 : 70);
+                col++;
+            }
+        }
+
+        public void Update(IList<Results.WMeterRsltItemSpec> items)
+        {
+            this.items = items;
+
+            /// Always draw ListView header
+            lView.Columns.Clear();
+            lView.Columns.Add(wmPosition.ToString(), (columnWidths != null && columnWidths.Length > 0) ? columnWidths[0] : 40);
+
+            if (items == null || items.Count == 0) return;
+            int col = 1;
+            foreach (var item in items)
+            {
+                lView.Columns.Add(item.Caption, (columnWidths != null && columnWidths.Length > col) ? columnWidths[col] : 70);
+                col++;
+            }
+        }
+
+        public void Update(Results.Entities.WaterMeter wMtr)
+        {
+            if (wMtr == null || wMtr.Disabled)
+            {
+                /// Water meter position is disabled
+                this.disabled = true;
+                lView.Items.Clear();
+                tBox.Text = caption = "---";
+                tBox.BackColor = lView.BackColor = bkColor = Color.White;
+                return;
+            }
+
+            /// Update background color
+            string message = string.Empty;
+            Update(wMtr.GetColorOfResults(false, out message));
+
+            /// Update caption
+#if ORACLE_DB
+            tBox.Text = caption = string.Format("{0} ({1}) {2}", (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr), (wMtr.Pruefindex % 100), message);
+#else
+            tBox.Text = caption = string.Format("s/n = {0}", string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr);
+#endif
+            
+            Update(wMtr.WMPosition);
+
+            /// Update test results
+            IList<string> testNames = wMtr.GetAllDecoratedTestNames();
+            int ix = 0;
+            lView.Items.Clear();
+            foreach (var mtr in wMtr.MeterTestRslts)
+            {
+                if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Config.Entities.Publish.Never
+                                                                     && mtr.Publish() != Config.Entities.Publish.Internal)
+                {
+                    ListViewItem lvi = new ListViewItem(testNames[ix++]);
+
+                    if (items != null)
+                    {
+                        for (int i = 0; i < items.Count; i++)
+                        {
+                            string str = items[i].Print(wMtr, mtr.Name());
+
+                            /// Extract and use color information
+                            string[] texts = str.Split(new char[] { '|' });
+                            if (texts.Length == 1)
+                            {
+                                lvi.SubItems.Add(str);
+                            }
+                            else if (texts.Length == 2)
+                            {
+                                Color color = texts[1].Equals("Green") ? Color.Green : (texts[1].Equals("Red") ? Color.Red : Color.White);
+                                lvi.UseItemStyleForSubItems = false;
+                                lvi.SubItems.Add(texts[0]);
+                                lvi.SubItems[lvi.SubItems.Count - 1].BackColor = color;
+                            }
+                            else
+                            {
+                                lvi.SubItems.Add(string.Empty);
+                            }
+                        }
+                    }
+
+                    lView.Items.Add(lvi);
+                }
+            }
+        }
+
+        ///
+        /// Private
+        ///
+
+        void Update(int wmPosition)
+        {
+            this.wmPosition = wmPosition;
+            if (lView.Columns.Count > 0)
+            {
+                lView.Columns[0].Text = wmPosition.ToString();
+            }
+        }
+
+        void Update(Color backColor)
+        {
+            if (this.bkColor != backColor)
+            {
+                tBox.BackColor = lView.BackColor = this.bkColor = backColor;
+            }
+        }
+    }
+}

Results/Forms/WaterMeterEventArgs.cs

@@ -7,8 +7,8 @@ namespace Results.Forms
 {
     public class WaterMeterEventArgs : EventArgs
     {
-        public Results.Entities.WaterMeter WM;
+        public int WMPosition;
 
-        public WaterMeterEventArgs(Results.Entities.WaterMeter wm) { WM = wm; }
+        public WaterMeterEventArgs(int wmPosition) { WMPosition = wmPosition; }
     }
 }

Results/Output/Printers/Enhanced/EnhancedPrintDocument.cs

@@ -1,19 +1,24 @@
 ///
-/// Copyright (c) 2017 Sensus Metering Systems
+/// Copyright (c) 2017-2020 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Drawing.Drawing2D;
 using System.Drawing.Printing;
 using System.IO;
 using Config.Entities;
+using GenCode128;
+using Gma.QrCodeNet.Encoding;
 using Results.Resources;
 
 namespace Results.Output.Printers.Enhanced
 {
 	public class EnhancedPrintDocument : PrintDocument
 	{
-		/// Size of the printed area without margins, after taking into account 'pageOrientation'
+        static QrEncoder encoder = new QrEncoder();
+
+        /// Size of the printed area without margins, after taking into account 'pageOrientation'
 		readonly int printHeight;
 		readonly int printWidth;
 
@@ -23,12 +28,14 @@ namespace Results.Output.Printers.Enhanced
 		readonly int TitleX;
 		readonly int TitleY;			/// Depends on the size of the header
 
-		readonly int SpacingOne;
-		readonly int SpacingOneAndHalf;
-		readonly int SpacingOne4Header;
-		readonly int SpacingOneAndHalf4Header;
+		readonly int spacingOne;
+		readonly int spacingOneAndHalf;
+		readonly int spacingOne4Header;
+		readonly int spacingOneAndHalf4Header;
+        readonly int spacingOne4Footer;
 
-        readonly int SpacingOne4Footer;
+        int spacingAboveTable;
+        int spacingBelowTable;
 
 		int CommonTop;			/// = TitleY + 60
 		int BodyTop;			/// = HdrTop + 160
@@ -124,11 +131,11 @@ namespace Results.Output.Printers.Enhanced
 			}
 
             /// Document outline preliminary calculations
-            SpacingOne = System.Windows.Forms.TextRenderer.MeasureText("Abcgq", font).Height;
-            SpacingOneAndHalf = (3 * SpacingOne) / 2;
-            SpacingOne4Header = System.Windows.Forms.TextRenderer.MeasureText("Abcgq", headerFont).Height;
-            SpacingOneAndHalf4Header = (3 * SpacingOne4Header) / 2;
-            SpacingOne4Footer = System.Windows.Forms.TextRenderer.MeasureText("Abcgq", footerFont).Height;
+            spacingOne = System.Windows.Forms.TextRenderer.MeasureText("Abcgq", font).Height;
+            spacingOneAndHalf = (3 * spacingOne) / 2;
+            spacingOne4Header = System.Windows.Forms.TextRenderer.MeasureText("Abcgq", headerFont).Height;
+            spacingOneAndHalf4Header = (3 * spacingOne4Header) / 2;
+            spacingOne4Footer = System.Windows.Forms.TextRenderer.MeasureText("Abcgq", footerFont).Height;
 
             TitleX = cfg.LeftMargin;
             TitleY = cfg.TopMargin;
@@ -178,17 +185,27 @@ namespace Results.Output.Printers.Enhanced
                 /// Prepare document outline
                 ///----------
                 titleHeight = System.Windows.Forms.TextRenderer.MeasureText(header, titleFont).Height;
-                CommonTop = TitleY + titleHeight + SpacingOne4Header;
+                CommonTop = TitleY + titleHeight + spacingOne4Header;
 
-                commonHeight = commonItems.Count * SpacingOne;
-                BodyTop = CommonTop + commonHeight + SpacingOne4Header;
+                commonHeight = commonItems.Count * spacingOne;
+                BodyTop = CommonTop + commonHeight + spacingOne4Header;
 
                 Table table0 = Table.Create_TestsAreRows(batch.WaterMeters[0], testItems, style);
                 SizeF tableSize = table0.Measure(e);
-                int wmSectionHeight = (int)tableSize.Height + SpacingOne4Header * ((tableSize.Height > 0) ? 3 : 2);
 
-                nrWMsOnFirstPage = (printHeight - BodyTop + TitleY - 2 * SpacingOne) / wmSectionHeight;
-                nrWMsOnNextPage = (printHeight - 2 * SpacingOne) / wmSectionHeight;
+                if (cfg.BarcodeType == BarcodeType.None)
+                {
+                    spacingAboveTable = spacingOneAndHalf4Header;
+                }
+                else
+                {
+                    spacingAboveTable = Math.Max(spacingOneAndHalf4Header, cfg.BarcodeHeight + spacingOne4Header / 2);
+                }
+                spacingBelowTable = (tableSize.Height > 0) ? spacingOneAndHalf4Header : (spacingOne4Header / 2);
+
+                int wmSectionHeight = (int)tableSize.Height + spacingAboveTable + spacingBelowTable;
+                nrWMsOnFirstPage = (printHeight - BodyTop + TitleY - 2 * spacingOne) / wmSectionHeight;
+                nrWMsOnNextPage = (printHeight - 2 * spacingOne) / wmSectionHeight;
                 nrWMsOnNextPage = Math.Max(nrWMsOnNextPage, 1); /// Prevent division by zero if there are too many WM tests
 
                 nrPages = 1 + (batch.WaterMeters.Count - nrWMsOnFirstPage + nrWMsOnNextPage - 1) / nrWMsOnNextPage;
@@ -221,8 +238,8 @@ namespace Results.Output.Printers.Enhanced
 				/// Write aligned columns
 				for (int i = 0; i < Math.Min(leftColumn.Length, rightColumn.Length); i++)
 				{
-					PrintAt(e, leftMargin, CommonTop + SpacingOne * i, leftColumn[i]);
-					PrintAt(e, 300, CommonTop + SpacingOne * i, rightColumn[i]);
+					PrintAt(e, leftMargin, CommonTop + spacingOne * i, leftColumn[i]);
+					PrintAt(e, 300, CommonTop + spacingOne * i, rightColumn[i]);
 				}
 			}
 
@@ -241,7 +258,7 @@ namespace Results.Output.Printers.Enhanced
 				int wmPosition = true ? batch.WaterMeters[wmNr].WMPosition : (wmNr + 1);
                 if (!cfg.GoodOnly || batch.WaterMeters[wmNr].Passed)
                 {
-                    nextWmTop = (int)PrintWM(e, batch.WaterMeters[wmNr], wmPosition, nextWmTop) + SpacingOneAndHalf4Header;
+                    nextWmTop = (int)PrintWM(e, batch.WaterMeters[wmNr], wmPosition, nextWmTop) + spacingBelowTable;
                 }
 			}
 
@@ -252,11 +269,11 @@ namespace Results.Output.Printers.Enhanced
 			///  Footer
 			///----------
             int footerWidth = (int)e.Graphics.MeasureString(footer, footerFont).Width;
-            PrintFooterAt(e, leftMargin + (printWidth - footerWidth) / 2, topMargin + printHeight - 2 * SpacingOne, footer);
+            PrintFooterAt(e, leftMargin + (printWidth - footerWidth) / 2, topMargin + printHeight - 2 * spacingOne, footer);
             
             string pageNrText = string.Format("{0} {1}/{2}", Strings.Page, pageNr++, nrPages);
 			int pageNrWidth = (int)e.Graphics.MeasureString(pageNrText, font).Width;
-            PrintAt(e, leftMargin + (printWidth - pageNrWidth) / 2, topMargin + printHeight - SpacingOne, pageNrText);
+            PrintAt(e, leftMargin + (printWidth - pageNrWidth) / 2, topMargin + printHeight - spacingOne, pageNrText);
 		}
 
 
@@ -270,25 +287,48 @@ namespace Results.Output.Printers.Enhanced
 		float PrintWM(System.Drawing.Printing.PrintPageEventArgs e,
 					  Results.Entities.WaterMeter wm, int printedWMNr, int top)
 		{
+            int tableTop = top + spacingAboveTable;
+
             /// Print the water meter number and the serial number
-            string wmText = string.Format("{0} {1}", Strings.Water_Meter, printedWMNr);
-            PrintHeaderAt(e, leftMargin, top, wmText);
-            if (!string.IsNullOrEmpty(wm.SerialNr))
+            if (string.IsNullOrEmpty(wm.SerialNr))
             {
-                PrintHeaderAt(e, leftMargin + (int)e.Graphics.MeasureString(wmText, headerFont).Width, top,
-                        string.Format("  {0} = {1}", Strings.sn, wm.SerialNr));
+                string wmText = string.Format("{0} {1}", Strings.Water_Meter, printedWMNr);
+                int wmTextWidth = (int)e.Graphics.MeasureString(wmText, headerFont).Width;
+                PrintHeaderAt(e, leftMargin, tableTop - spacingOneAndHalf4Header, wmText);
+            }
+            else
+            {
+                string wmText = string.Format("{0} {1}   {2} = {3}", Strings.Water_Meter, printedWMNr, Strings.sn, wm.SerialNr);
+                int wmTextWidth = (int)e.Graphics.MeasureString(wmText, headerFont).Width;
+                PrintHeaderAt(e, leftMargin, tableTop - spacingOneAndHalf4Header, wmText);
+
+                switch (cfg.BarcodeType)
+                {
+                    case BarcodeType.Code_128_Horizontally:
+                        {
+                            Image img = Code128Rendering.MakeBarcodeImage(wm.SerialNr, 1, true);
+                            e.Graphics.DrawImage(img, leftMargin + wmTextWidth + spacingOne4Header, top, cfg.BarcodeWidth, cfg.BarcodeHeight);
+                            break;
+                        }
+                    case BarcodeType.Code_128_Vertically:
+                        {
+                            Image img = Code128Rendering.MakeBarcodeImage(wm.SerialNr, 1, true);
+                            img.RotateFlip(RotateFlipType.Rotate90FlipNone);
+                            e.Graphics.DrawImage(img, leftMargin + wmTextWidth + spacingOne4Header, top, cfg.BarcodeWidth, cfg.BarcodeHeight);
+                            break;
+                        }
+                    case BarcodeType.QR_Code:
+                        {
+                            QrCode qrCode = encoder.Encode(wm.SerialNr);
+                            DrawQR(e.Graphics, qrCode, leftMargin + wmTextWidth + spacingOne4Header, top, cfg.BarcodeWidth, cfg.BarcodeHeight);
+                            break;
+                        }
+                }
             }
 
             Table table = Table.Create_TestsAreRows(wm, testItems, style);
 
-            if (table.IsEmpty())
-            {
-                return top;
-            }
-            else
-            {
-                return table.Draw(e, leftMargin, top + SpacingOneAndHalf4Header);
-            }
+            return table.IsEmpty() ? tableTop : table.Draw(e, leftMargin, tableTop);
 		}
 
 
@@ -298,7 +338,7 @@ namespace Results.Output.Printers.Enhanced
 		}
 		void PrintAt(System.Drawing.Printing.PrintPageEventArgs e, int x, int y, string text)
 		{
-			RectangleF printArea = new RectangleF(x, y, 2000, SpacingOne);
+			RectangleF printArea = new RectangleF(x, y, 2000, spacingOne);
 			e.Graphics.DrawString(text, this.font, Brushes.Black, printArea);
 		}
 
@@ -309,7 +349,7 @@ namespace Results.Output.Printers.Enhanced
 		}
 		void PrintHeaderAt(System.Drawing.Printing.PrintPageEventArgs e, int x, int y, string text)
 		{
-			RectangleF printArea = new RectangleF(x, y, 2000, SpacingOne4Header);
+			RectangleF printArea = new RectangleF(x, y, 2000, spacingOne4Header);
 			e.Graphics.DrawString(text, this.headerFont, Brushes.Black, printArea);
 		}
 
@@ -320,8 +360,33 @@ namespace Results.Output.Printers.Enhanced
         }
         void PrintFooterAt(System.Drawing.Printing.PrintPageEventArgs e, int x, int y, string text)
         {
-            RectangleF printArea = new RectangleF(x, y, 2000, SpacingOne4Footer);
+            RectangleF printArea = new RectangleF(x, y, 2000, spacingOne4Footer);
             e.Graphics.DrawString(text, this.footerFont, Brushes.Black, printArea);
         }
+
+
+        public static void DrawQR(Graphics g, QrCode qrCode, float left, float top, float width, float height)
+        {
+            /// Assuming 100 dpi (printer)
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+            g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+            g.PixelOffsetMode = PixelOffsetMode.HighQuality;
+
+            float qrPixWidth = width / qrCode.Matrix.Width;
+            float qrPixHeight = height / qrCode.Matrix.Height;
+            for (int i = 0; i < qrCode.Matrix.Height; i++)
+            {
+                for (int j = 0; j < qrCode.Matrix.Width; j++)
+                {
+                    if (qrCode.Matrix[j, i])
+                    {
+                        g.FillRectangle(Brushes.Black, new RectangleF(left + j * qrPixWidth,
+                                                                      top + i * qrPixHeight,
+                                                                      qrPixWidth,
+                                                                      qrPixHeight));
+                    }
+                }
+            }
+        }
     }
 }

Results/Output/Printers/Enhanced/EnhancedPrinterCfg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2017 Sensus Slovensko a.s.
+/// Copyright (c) 2017-2020 Sensus Slovensko a.s.
 ///
 
 namespace Results.Output.Printers.Enhanced
@@ -30,5 +30,8 @@ namespace Results.Output.Printers.Enhanced
         public string[] CommonItems;
 		public string[] TestItems;
 		public string Footer;
-	}
+        public BarcodeType BarcodeType;     /// s/n is printed as barcode when valid (BarcodeType.None < BarcodeType < BarcodeType.Count)
+        public int BarcodeWidth;
+        public int BarcodeHeight;
+    }
 }

Results/Output/Printers/Enums.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace Results.Output.Printers
+{
+    public enum BarcodeType
+    {
+        None,
+        Code_128_Horizontally,
+        Code_128_Vertically,
+        QR_Code,
+        Count
+    }
+}

Results/Output/Printers/Label/LabelPrintDocument.cs

@@ -1,19 +1,24 @@
 ///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
+/// Copyright (c) 2020 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Drawing.Drawing2D;
 using System.Drawing.Printing;
 using System.IO;
+using Gma.QrCodeNet.Encoding;
 using Config.Entities;
 using Results.Resources;
+using GenCode128;
 
 namespace Results.Output.Printers.Label
 {
 	public class LabelPrintDocument : PrintersCommon
 	{
-		/// Size of the printed area without margins, after taking into account 'pageOrientation'
+        static QrEncoder encoder = new QrEncoder();
+
+        /// Size of the printed area without margins, after taking into account 'pageOrientation'
 		readonly int printHeight;
 		readonly int printWidth;
 
@@ -93,6 +98,55 @@ namespace Results.Output.Printers.Label
 					e.Graphics.DrawString(item.Print(wm), this.font, Brushes.Black, printArea);
 				}
 			}
+
+            if (cfg.BarcodeType != BarcodeType.None && cfg.BarcodeType < BarcodeType.Count)
+            {
+                try
+                {
+                    if (cfg.BarcodeType == BarcodeType.QR_Code)
+                    {
+                        QrCode qrCode = encoder.Encode(wm.SerialNr);
+                        DrawQR(e.Graphics, qrCode, cfg.BarcodeLeft, cfg.BarcodeTop, cfg.BarcodeWidth, cfg.BarcodeHeight);
+                    }
+                    else if (cfg.BarcodeType == BarcodeType.Code_128_Horizontally || cfg.BarcodeType == BarcodeType.Code_128_Vertically)
+                    {
+                        Image img = Code128Rendering.MakeBarcodeImage(wm.SerialNr, 1, true);
+                        if (cfg.BarcodeType == BarcodeType.Code_128_Vertically)
+                        {
+                            img.RotateFlip(RotateFlipType.Rotate90FlipNone);
+                        }
+                        e.Graphics.DrawImage(img, cfg.BarcodeLeft, cfg.BarcodeTop, cfg.BarcodeWidth, cfg.BarcodeHeight);
+                    }
+                }
+                catch (Exception)
+                {
+                }
+            }
 		}
+
+
+        public static void DrawQR(Graphics g, QrCode qrCode, float left, float top, float width, float height)
+        {
+            /// Assuming 100 dpi (printer)
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+            g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+            g.PixelOffsetMode = PixelOffsetMode.HighQuality;
+
+            float qrPixWidth = width / qrCode.Matrix.Width;
+            float qrPixHeight = height / qrCode.Matrix.Height;
+            for (int i = 0; i < qrCode.Matrix.Height; i++)
+            {
+                for (int j = 0; j < qrCode.Matrix.Width; j++)
+                {
+                    if (qrCode.Matrix[j, i])
+                    {
+                        g.FillRectangle(Brushes.Black, new RectangleF(left + j * qrPixWidth,
+                                                                      top + i * qrPixHeight,
+                                                                      qrPixWidth,
+                                                                      qrPixHeight));
+                    }
+                }
+            }
+        }
     }
 }

Results/Output/Printers/Label/LabelPrinterCfg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
+/// Copyright (c) 2018-2020 Sensus Slovensko a.s.
 ///
 
 namespace Results.Output.Printers.Label
@@ -16,6 +16,10 @@ namespace Results.Output.Printers.Label
 		public int FontStyle;
 		public System.Globalization.CultureInfo CultureInfo;
 		public bool GoodOnly;
-		public bool SupressPrinting;						/// true = Bypass printing
-	}
+        public BarcodeType BarcodeType;                     /// s/n is printed as barcode when valid (BarcodeType.None < BarcodeType < BarcodeType.Count)
+        public int BarcodeLeft;
+        public int BarcodeTop;
+        public int BarcodeWidth;
+        public int BarcodeHeight;
+    }
 }

Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs

@@ -1,12 +1,15 @@
 ///
-/// Copyright (c) 2017-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2017-2020 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Drawing.Drawing2D;
 using System.Drawing.Printing;
 using System.IO;
 using Config.Entities;
+using GenCode128;
+using Gma.QrCodeNet.Encoding;
 using Results.Resources;
 
 namespace Results.Output.Printers.OnePerMeter
@@ -16,7 +19,9 @@ namespace Results.Output.Printers.OnePerMeter
         const float GapBetweenTableColumns = 10;
         const float GapBetweenCommonColumns = 10;
 
-		/// Size of the printed area without margins, after taking into account 'pageOrientation'
+        static QrEncoder encoder = new QrEncoder();
+
+        /// Size of the printed area without margins, after taking into account 'pageOrientation'
 		readonly int printHeight;
 		readonly int printWidth;
 
@@ -158,6 +163,30 @@ namespace Results.Output.Printers.OnePerMeter
                 WMChart.GetChart(wm, true).Printing.PrintPaint(e.Graphics, pos);
             }
 
+            if (cfg.BarcodeType != BarcodeType.None && cfg.BarcodeType < BarcodeType.Count && !string.IsNullOrEmpty(wm.SerialNr))
+            {
+                try
+                {
+                    if (cfg.BarcodeType == BarcodeType.QR_Code)
+                    {
+                        QrCode qrCode = encoder.Encode(wm.SerialNr);
+                        DrawQR(e.Graphics, qrCode, cfg.BarcodeLeft, cfg.BarcodeTop, cfg.BarcodeWidth, cfg.BarcodeHeight);
+                    }
+                    else if (cfg.BarcodeType == BarcodeType.Code_128_Horizontally || cfg.BarcodeType == BarcodeType.Code_128_Vertically)
+                    {
+                        Image img = Code128Rendering.MakeBarcodeImage(wm.SerialNr, 1, true);
+                        if (cfg.BarcodeType == BarcodeType.Code_128_Vertically)
+                        {
+                            img.RotateFlip(RotateFlipType.Rotate90FlipNone);
+                        }
+                        e.Graphics.DrawImage(img, cfg.BarcodeLeft, cfg.BarcodeTop, cfg.BarcodeWidth, cfg.BarcodeHeight);
+                    }
+                }
+                catch (Exception)
+                {
+                }
+            }
+
             float tableTop = cfg.TopMargin;
 
             if (pageNr == 1)
@@ -351,5 +380,30 @@ namespace Results.Output.Printers.OnePerMeter
 
             pageNr++;
 		}
+
+
+        public static void DrawQR(Graphics g, QrCode qrCode, float left, float top, float width, float height)
+        {
+            /// Assuming 100 dpi (printer)
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+            g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+            g.PixelOffsetMode = PixelOffsetMode.HighQuality;
+
+            float qrPixWidth = width / qrCode.Matrix.Width;
+            float qrPixHeight = height / qrCode.Matrix.Height;
+            for (int i = 0; i < qrCode.Matrix.Height; i++)
+            {
+                for (int j = 0; j < qrCode.Matrix.Width; j++)
+                {
+                    if (qrCode.Matrix[j, i])
+                    {
+                        g.FillRectangle(Brushes.Black, new RectangleF(left + j * qrPixWidth,
+                                                                      top + i * qrPixHeight,
+                                                                      qrPixWidth,
+                                                                      qrPixHeight));
+                    }
+                }
+            }
+        }
     }
 }

Results/Output/Printers/OnePerMeter/OnePerMeterPrinterCfg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2017-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2017-2020 Sensus Slovensko a.s.
 ///
 
 namespace Results.Output.Printers.OnePerMeter
@@ -54,5 +54,10 @@ namespace Results.Output.Printers.OnePerMeter
         public int ImgWid;
         public int ImgHgh;
         public string ImgFullPathName;
+        public BarcodeType BarcodeType;     /// s/n is printed as barcode when valid (BarcodeType.None < BarcodeType < BarcodeType.Count)
+        public int BarcodeLeft;
+        public int BarcodeTop;
+        public int BarcodeWidth;
+        public int BarcodeHeight;
     }
 }

Results/Output/WMChart.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using System.Text;
 using System.Windows.Forms.DataVisualization.Charting;
 using Config.Entities;
 using Results.Entities;
@@ -14,17 +13,25 @@ namespace Results.Output
     {
         public static Chart GetChart(WaterMeter wm, bool isPrinter)
         {
-			return GetChart(wm, isPrinter, Config.Unit.lph, false);
+			return GetChart(wm, isPrinter, Config.Unit.lph);
         }
 
-		public static Chart GetChart(WaterMeter wm, bool isPrinter, Config.Unit flowUnit, bool isQ4)
+		public static Chart GetChart(WaterMeter wm, bool isPrinter, Config.Unit flowUnit)
         {
+            double maxFlow_m3h = 0;
             IList<PointF> unsortedPoints = new List<PointF>();
             foreach (var mtr in wm.MeterTestRslts)
             {
-                if (mtr.IsPilotRslt() && mtr.TestRslt.TestData.Evaluate && (mtr.TestTime > 0) && (mtr.TestRslt.PulsesMaster > 0))
+                if (mtr.IsPilotRslt() && mtr.TestRslt.TestData.Evaluate && (mtr.TestRslt.TestTime > 0) && (mtr.TestRslt.PulsesMaster > 0))
                 {
-                    double flow = Config.Units.ConvertTo(flowUnit, mtr.TestRslt.VolumeCTV / mtr.TestTime * 3.6 * mtr.PulsesMaster / mtr.TestRslt.PulsesMaster);
+                    double flow_m3h = (mtr.TestTime != 0)
+                                ? (3.6 * mtr.TestRslt.VolumeCTV / mtr.TestTime * mtr.PulsesMaster / mtr.TestRslt.PulsesMaster)
+                                : (3.6 * mtr.TestRslt.VolumeCTV / mtr.TestRslt.TestTime);
+
+                    if (flow_m3h > maxFlow_m3h) maxFlow_m3h = flow_m3h;
+
+                    double flow = Config.Units.ConvertTo(flowUnit, flow_m3h);      /// Convert to specified units
+
                     if (flow > 0)
                     {
                         unsortedPoints.Add(new PointF((float)flow, (float)mtr.Error));
@@ -33,6 +40,8 @@ namespace Results.Output
             }
             IEnumerable<PointF> sortedPoints = unsortedPoints.OrderBy(x => x.X);
 
+            bool isQ4 = (maxFlow_m3h > 1.1 * wm.WaterMeterData.Q3_Qn);
+
             Chart chart = new Chart
             {
                 Name = "chart",
@@ -47,7 +56,7 @@ namespace Results.Output
             chArea.AxisX.Title = Strings.Flow;
             chArea.AxisX.IsLogarithmic = true;
             chArea.AxisX.LogarithmBase = 10;
-            chArea.AxisX.IsLabelAutoFit = false;
+            chArea.AxisX.IsLabelAutoFit = true;
 
             List<double> xs = new List<double>() { 0.0001, 0.0002, 0.0005,
                                                    0.001, 0.002, 0.005,
@@ -59,19 +68,43 @@ namespace Results.Output
                                                    1000, 2000, 5000,
                                                    10000, 20000, 50000,
                                                    100000, 200000, 500000,
-                                                   1000000, 2000000, 5000000 };
+                                                   1000000, 2000000, 5000000,
+                                                   10000000 };
             double spacer = 0.8;
             double from = Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q1_Qmin);
             double to = Config.Units.ConvertTo(flowUnit, isQ4 ? wm.WaterMeterData.Q4_Qmax : wm.WaterMeterData.Q3_Qn);
-            for (int i = 1; i < xs.Count - 1; i++)
+            bool inRange = false;
+            for (int i = 0; i < xs.Count - 3; i += 3)
             {
-                if ((xs[i + 1] > from) && (xs[i - 1] < to))
+                if (xs[i] <= from && from < xs[i + 3])
                 {
+                    chArea.AxisX.Minimum = xs[i];
+                    inRange = true;
+                }
+
+                if (inRange)
+                {
+                    for (int j = i; j < i + 3; j++)
+                    {
+                        CustomLabel cl = new CustomLabel();
+                        cl.Text = string.Format("{0} {1}", xs[j], flowUnit.ToDescription());
+                        cl.FromPosition = Math.Log10(xs[j] * spacer);
+                        cl.ToPosition = Math.Log10(xs[j] / spacer);
+                        chArea.AxisX.CustomLabels.Add(cl);
+                    }
+                }
+
+                if (xs[i] < to && to <= xs[i + 3])
+                {
+                    chArea.AxisX.Maximum = xs[i + 3];
+
                     CustomLabel cl = new CustomLabel();
-                    cl.Text = string.Format("{0} {1}", xs[i], flowUnit.ToDescription());
-                    cl.FromPosition = Math.Log10(xs[i] * spacer);
-                    cl.ToPosition = Math.Log10(xs[i] / spacer);
+                    cl.Text = string.Format("{0} {1}", xs[i + 3], flowUnit.ToDescription());
+                    cl.FromPosition = Math.Log10(xs[i + 3] * spacer);
+                    cl.ToPosition = Math.Log10(xs[i + 3] / spacer);
                     chArea.AxisX.CustomLabels.Add(cl);
+
+                    break;
                 }
             }
 

Results/Properties/AssemblyInfo.cs

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

Results/Resources/Strings.Designer.cs

@@ -1230,6 +1230,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to This position is disabled.
+        /// </summary>
+        internal static string This_position_is_disabled {
+            get {
+                return ResourceManager.GetString("This_position_is_disabled", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to to.
         /// </summary>

Results/Resources/Strings.cs.resx

@@ -333,4 +333,7 @@
   <data name="Flow" xml:space="preserve">
     <value>Průtok</value>
   </data>
+  <data name="This_position_is_disabled" xml:space="preserve">
+    <value>Taro pozice je vypnuta</value>
+  </data>
 </root>

Results/Resources/Strings.fr.resx

@@ -0,0 +1,807 @@
+<?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="Add" xml:space="preserve">
+    <value>Ajouter &gt;</value>
+  </data>
+  <data name="Alignment" xml:space="preserve">
+    <value>Alignement</value>
+  </data>
+  <data name="Approval" xml:space="preserve">
+    <value>Approbation</value>
+  </data>
+  <data name="Available_results" xml:space="preserve">
+    <value>Résultats disponibles</value>
+  </data>
+  <data name="Batch_nr" xml:space="preserve">
+    <value>Numéro de lot</value>
+  </data>
+  <data name="Bench" xml:space="preserve">
+    <value>Banc</value>
+  </data>
+  <data name="CancelBtnText" xml:space="preserve">
+    <value>Annuler</value>
+  </data>
+  <data name="Caption" xml:space="preserve">
+    <value>Légende</value>
+  </data>
+  <data name="Configuration" xml:space="preserve">
+    <value>Configuration</value>
+  </data>
+  <data name="Density" xml:space="preserve">
+    <value>Densité</value>
+  </data>
+  <data name="DownBtnText" xml:space="preserve">
+    <value>Vers le bas</value>
+  </data>
+  <data name="End" xml:space="preserve">
+    <value>Fin</value>
+  </data>
+  <data name="EndState_aux" xml:space="preserve">
+    <value>État final aux</value>
+  </data>
+  <data name="EndState_main" xml:space="preserve">
+    <value>État final principal</value>
+  </data>
+  <data name="End_state" xml:space="preserve">
+    <value>État final</value>
+  </data>
+  <data name="ErrLimHi" xml:space="preserve">
+    <value>Err LimHi</value>
+  </data>
+  <data name="ErrLimLo" xml:space="preserve">
+    <value>Err LimLo</value>
+  </data>
+  <data name="Error" xml:space="preserve">
+    <value>Erreur</value>
+  </data>
+  <data name="ErrRef" xml:space="preserve">
+    <value>Err Ref</value>
+  </data>
+  <data name="Err_aux" xml:space="preserve">
+    <value>Err aux</value>
+  </data>
+  <data name="Err_main" xml:space="preserve">
+    <value>Err principale</value>
+  </data>
+  <data name="Flow" xml:space="preserve">
+    <value>Couler</value>
+  </data>
+  <data name="Format" xml:space="preserve">
+    <value>Format</value>
+  </data>
+  <data name="H_amb" xml:space="preserve">
+    <value>Hamb</value>
+  </data>
+  <data name="Item" xml:space="preserve">
+    <value>Article</value>
+  </data>
+  <data name="MClass" xml:space="preserve">
+    <value>MClass</value>
+  </data>
+  <data name="OkBtnText" xml:space="preserve">
+    <value>Oui</value>
+  </data>
+  <data name="PO" xml:space="preserve">
+    <value>Commande</value>
+  </data>
+  <data name="Pos" xml:space="preserve">
+    <value>Pos.</value>
+  </data>
+  <data name="Precision" xml:space="preserve">
+    <value>Précision</value>
+  </data>
+  <data name="Procedure" xml:space="preserve">
+    <value>Procédure</value>
+  </data>
+  <data name="Producer" xml:space="preserve">
+    <value>Producteur</value>
+  </data>
+  <data name="Protocol" xml:space="preserve">
+    <value>Protocole</value>
+  </data>
+  <data name="Pulses" xml:space="preserve">
+    <value>Impulsion</value>
+  </data>
+  <data name="PulsesLiter" xml:space="preserve">
+    <value>Impulsion/litre</value>
+  </data>
+  <data name="P_amb" xml:space="preserve">
+    <value>P amb</value>
+  </data>
+  <data name="P_dn_end" xml:space="preserve">
+    <value>P dn fin</value>
+  </data>
+  <data name="P_dn" xml:space="preserve">
+    <value>P dn</value>
+  </data>
+  <data name="P_dn_start" xml:space="preserve">
+    <value>P dn début</value>
+  </data>
+  <data name="P_up_end" xml:space="preserve">
+    <value>P up fin</value>
+  </data>
+  <data name="P_up" xml:space="preserve">
+    <value>P up</value>
+  </data>
+  <data name="P_up_start" xml:space="preserve">
+    <value>P up début</value>
+  </data>
+  <data name="Q_fall" xml:space="preserve">
+    <value>Q tomber</value>
+  </data>
+  <data name="Q_from" xml:space="preserve">
+    <value>Q de</value>
+  </data>
+  <data name="Q_rise" xml:space="preserve">
+    <value>Q monter</value>
+  </data>
+  <data name="Q_to" xml:space="preserve">
+    <value>Q à</value>
+  </data>
+  <data name="RefPulses" xml:space="preserve">
+    <value>Ref Puls</value>
+  </data>
+  <data name="Remove" xml:space="preserve">
+    <value>&lt; Retirer</value>
+  </data>
+  <data name="Remove_all" xml:space="preserve">
+    <value>Enlever tout</value>
+  </data>
+  <data name="Result" xml:space="preserve">
+    <value>Résultat</value>
+  </data>
+  <data name="Selected_results" xml:space="preserve">
+    <value>Résultats sélectionnés</value>
+  </data>
+  <data name="sn" xml:space="preserve">
+    <value>s/n</value>
+  </data>
+  <data name="sn_aux" xml:space="preserve">
+    <value>s/n aux</value>
+  </data>
+  <data name="sn_main" xml:space="preserve">
+    <value>s/n principale</value>
+  </data>
+  <data name="Start" xml:space="preserve">
+    <value>Début</value>
+  </data>
+  <data name="Test" xml:space="preserve">
+    <value>Test</value>
+  </data>
+  <data name="Test_ID" xml:space="preserve">
+    <value>Test ID</value>
+  </data>
+  <data name="Test_method" xml:space="preserve">
+    <value>Méthode d'essai</value>
+  </data>
+  <data name="Test_vol" xml:space="preserve">
+    <value>Test vol</value>
+  </data>
+  <data name="T_amb" xml:space="preserve">
+    <value>T amb</value>
+  </data>
+  <data name="T_div" xml:space="preserve">
+    <value>T div</value>
+  </data>
+  <data name="T_end" xml:space="preserve">
+    <value>T fin</value>
+  </data>
+  <data name="T_in" xml:space="preserve">
+    <value>T dans</value>
+  </data>
+  <data name="T_out" xml:space="preserve">
+    <value>T en dehors</value>
+  </data>
+  <data name="T_s" xml:space="preserve">
+    <value>T [s]</value>
+  </data>
+  <data name="T_start" xml:space="preserve">
+    <value>T début</value>
+  </data>
+  <data name="Uncertainty" xml:space="preserve">
+    <value>Incertitude</value>
+  </data>
+  <data name="Units" xml:space="preserve">
+    <value>Unités</value>
+  </data>
+  <data name="UpBtnText" xml:space="preserve">
+    <value>En haut</value>
+  </data>
+  <data name="User" xml:space="preserve">
+    <value>Utilisateur</value>
+  </data>
+  <data name="User_nr" xml:space="preserve">
+    <value>N° Utilisateur</value>
+  </data>
+  <data name="Ver" xml:space="preserve">
+    <value>Ver.</value>
+  </data>
+  <data name="VolRef" xml:space="preserve">
+    <value>Vol ref.</value>
+  </data>
+  <data name="Volume" xml:space="preserve">
+    <value>Le volume</value>
+  </data>
+  <data name="Width" xml:space="preserve">
+    <value>Largeur</value>
+  </data>
+  <data name="WMs" xml:space="preserve">
+    <value>CEs</value>
+  </data>
+  <data name="WM_Type" xml:space="preserve">
+    <value>CE Type</value>
+  </data>
+  <data name="Year" xml:space="preserve">
+    <value>Année</value>
+  </data>
+  <data name="Results" xml:space="preserve">
+    <value>Résultats</value>
+  </data>
+  <data name="Remark" xml:space="preserve">
+    <value>Remarque</value>
+  </data>
+  <data name="Result_code" xml:space="preserve">
+    <value>Code de résultat</value>
+  </data>
+  <data name="Mounting" xml:space="preserve">
+    <value>Montage</value>
+  </data>
+  <data name="Energy" xml:space="preserve">
+    <value>Énergie</value>
+  </data>
+  <data name="Energy_ref" xml:space="preserve">
+    <value>Énergie ref</value>
+  </data>
+  <data name="P_delta" xml:space="preserve">
+    <value>P delta</value>
+  </data>
+  <data name="P_delta_end" xml:space="preserve">
+    <value>P delta fin</value>
+  </data>
+  <data name="P_delta_mean" xml:space="preserve">
+    <value>P delta moyenne</value>
+  </data>
+  <data name="P_delta_start" xml:space="preserve">
+    <value>P delta début</value>
+  </data>
+  <data name="Meter_type" xml:space="preserve">
+    <value>Type de compteur</value>
+  </data>
+  <data name="Compound" xml:space="preserve">
+    <value>Composé</value>
+  </data>
+  <data name="Heat_meter" xml:space="preserve">
+    <value>Thermomètre</value>
+  </data>
+  <data name="Single" xml:space="preserve">
+    <value>Unique</value>
+  </data>
+  <data name="Page" xml:space="preserve">
+    <value>Page</value>
+  </data>
+  <data name="End_volume" xml:space="preserve">
+    <value>Volume fin</value>
+  </data>
+  <data name="Start_volume" xml:space="preserve">
+    <value>Volume début</value>
+  </data>
+  <data name="End_volume_aux" xml:space="preserve">
+    <value>Fin volume aux</value>
+  </data>
+  <data name="End_volume_main" xml:space="preserve">
+    <value>Fin volume principale</value>
+  </data>
+  <data name="Start_volume_aux" xml:space="preserve">
+    <value>Début volume aux</value>
+  </data>
+  <data name="Start_volume_main" xml:space="preserve">
+    <value>Début volume principale</value>
+  </data>
+  <data name="Volume_aux" xml:space="preserve">
+    <value>Volume aux</value>
+  </data>
+  <data name="Volume_main" xml:space="preserve">
+    <value>Volume principale</value>
+  </data>
+  <data name="End_mass" xml:space="preserve">
+    <value>Fin masse</value>
+  </data>
+  <data name="Start_mass" xml:space="preserve">
+    <value>Début masse</value>
+  </data>
+  <data name="Category" xml:space="preserve">
+    <value>Catégorie</value>
+  </data>
+  <data name="Quantity" xml:space="preserve">
+    <value>Quantité</value>
+  </data>
+  <data name="Water_Meter" xml:space="preserve">
+    <value>Compteur d'eau</value>
+  </data>
+  <data name="VName_Flow" xml:space="preserve">
+    <value>Q</value>
+  </data>
+  <data name="VName_Press" xml:space="preserve">
+    <value>Press.</value>
+  </data>
+  <data name="VName_Temp" xml:space="preserve">
+    <value>Temp.</value>
+  </data>
+  <data name="VName_Dens" xml:space="preserve">
+    <value>Ro</value>
+  </data>
+  <data name="VName_Humi" xml:space="preserve">
+    <value>Hu.</value>
+  </data>
+  <data name="VName_Mass" xml:space="preserve">
+    <value>Masse</value>
+  </data>
+  <data name="VName_TstTime" xml:space="preserve">
+    <value>Tau</value>
+  </data>
+  <data name="VName_Vol" xml:space="preserve">
+    <value>Vol.</value>
+  </data>
+  <data name="Tooltip_P_de_ac" xml:space="preserve">
+    <value>Différence de pression mesurée par delta P mètre - réelle</value>
+  </data>
+  <data name="Tooltip_P_de_avg" xml:space="preserve">
+    <value>Différence de pression mesurée par delta P mètre - moyenne</value>
+  </data>
+  <data name="Tooltip_P_de_en" xml:space="preserve">
+    <value>Différence de pression mesurée par delta P mètre - à la fin de l'essai</value>
+  </data>
+  <data name="Tooltip_P_de_me" xml:space="preserve">
+    <value>Différence de pression mesurée par delta P mètre - moyenne</value>
+  </data>
+  <data name="Tooltip_P_de_st" xml:space="preserve">
+    <value>Différence de pression mesurée par delta P mètre - au début de l'essai</value>
+  </data>
+  <data name="Tooltip_P_dw_ac" xml:space="preserve">
+    <value>Pression à la sortie réelle</value>
+  </data>
+  <data name="Tooltip_P_dw_avg" xml:space="preserve">
+    <value>Pression moyenne à la sortie</value>
+  </data>
+  <data name="Tooltip_P_dw_en" xml:space="preserve">
+    <value>Pression à la sortie à la fin du test</value>
+  </data>
+  <data name="Tooltip_P_dw_me" xml:space="preserve">
+    <value>Pression moyenne à la sortie</value>
+  </data>
+  <data name="Tooltip_P_dw_st" xml:space="preserve">
+    <value>Pression à la sortie au début du test</value>
+  </data>
+  <data name="Tooltip_P_up_ac" xml:space="preserve">
+    <value>Pression à l'entrée réelle</value>
+  </data>
+  <data name="Tooltip_P_up_avg" xml:space="preserve">
+    <value>Pression moyenne à l'entrée</value>
+  </data>
+  <data name="Tooltip_P_up_en" xml:space="preserve">
+    <value>Pression à l'entrée à la fin de l'essai</value>
+  </data>
+  <data name="Tooltip_P_up_me" xml:space="preserve">
+    <value>Pression moyenne à l'entrée</value>
+  </data>
+  <data name="Tooltip_P_up_st" xml:space="preserve">
+    <value>Pression à l'entrée au début de l'essai</value>
+  </data>
+  <data name="Tooltip_Q_m_r" xml:space="preserve">
+    <value>Débit calculé à partir de la masse vraie et du temps conventionnels</value>
+  </data>
+  <data name="Tooltip_Q_riac" xml:space="preserve">
+    <value>Débit obtenu à partir du compteur principal - réel</value>
+  </data>
+  <data name="Tooltip_Q_rim" xml:space="preserve">
+    <value>Débit obtenu à partir du compteur principal - moyenne</value>
+  </data>
+  <data name="Tooltip_Q_v_r" xml:space="preserve">
+    <value>Débit mesuré par le débitmètre de référence</value>
+  </data>
+  <data name="Tooltip_T_di_ac" xml:space="preserve">
+    <value>Température réelle au déviateur</value>
+  </data>
+  <data name="Tooltip_T_di_avg" xml:space="preserve">
+    <value>Température moyenne au déviateur</value>
+  </data>
+  <data name="Tooltip_T_di_en" xml:space="preserve">
+    <value>Température au déviateur à la fin du test - 4 dernières mesures avant la fin</value>
+  </data>
+  <data name="Tooltip_T_di_me" xml:space="preserve">
+    <value>Température moyenne au déviateur</value>
+  </data>
+  <data name="Tooltip_T_di_st" xml:space="preserve">
+    <value>Température au déviateur au début du test - 4 premières mesures après le début</value>
+  </data>
+  <data name="Tooltip_T_dw_ac" xml:space="preserve">
+    <value>Température réelle à la sortie</value>
+  </data>
+  <data name="Tooltip_T_dw_avg" xml:space="preserve">
+    <value>Température moyenne à la sortie</value>
+  </data>
+  <data name="Tooltip_T_dw_en" xml:space="preserve">
+    <value>Température à la sortie à la fin du test - 4 dernières mesures avant la fin</value>
+  </data>
+  <data name="Tooltip_T_dw_me" xml:space="preserve">
+    <value>Température moyenne à la sortie</value>
+  </data>
+  <data name="Tooltip_T_dw_st" xml:space="preserve">
+    <value>Température à la sortie au début du test - 4 premières mesures après le début</value>
+  </data>
+  <data name="Tooltip_T_up_ac" xml:space="preserve">
+    <value>Température réelle à l'entrée</value>
+  </data>
+  <data name="Tooltip_T_up_avg" xml:space="preserve">
+    <value>Température moyenne à l'entrée lors d'un test</value>
+  </data>
+  <data name="Tooltip_T_up_en" xml:space="preserve">
+    <value>Température à l'entrée à la fin de l'essai - 4 dernières mesures avant la fin</value>
+  </data>
+  <data name="Tooltip_T_up_me" xml:space="preserve">
+    <value>Température moyenne à l'entrée lors d'un test</value>
+  </data>
+  <data name="Tooltip_T_up_st" xml:space="preserve">
+    <value>Température d'entrée au début du test - 4 premières mesures après le début</value>
+  </data>
+  <data name="aux" xml:space="preserve">
+    <value>aux.</value>
+  </data>
+  <data name="main" xml:space="preserve">
+    <value>principale</value>
+  </data>
+  <data name="Tooltip_E_rel" xml:space="preserve">
+    <value>Erreur relative d'un compteur</value>
+  </data>
+  <data name="Tooltip_E_rel_ref" xml:space="preserve">
+    <value>Erreur relative du compteur maître</value>
+  </data>
+  <data name="Tooltip_sn" xml:space="preserve">
+    <value>Numéro de série du compteur</value>
+  </data>
+  <data name="Tooltip_sn_aux" xml:space="preserve">
+    <value>Numéro de série du compteur auxiliaire d'un compteur d'eau composé</value>
+  </data>
+  <data name="Tooltip_sn_main" xml:space="preserve">
+    <value>Numéro de série du compteur principal d'un compteur d'eau composé</value>
+  </data>
+  <data name="Tooltip_Vol_Mt" xml:space="preserve">
+    <value>Volume mesuré par le compteur testé</value>
+  </data>
+  <data name="Tooltip_Vol_rm" xml:space="preserve">
+    <value>Volume de référence pour compteur testé</value>
+  </data>
+  <data name="VName_Error" xml:space="preserve">
+    <value>E</value>
+  </data>
+  <data name="fall" xml:space="preserve">
+    <value>tomber</value>
+  </data>
+  <data name="from" xml:space="preserve">
+    <value>de</value>
+  </data>
+  <data name="rise" xml:space="preserve">
+    <value>monter</value>
+  </data>
+  <data name="to" xml:space="preserve">
+    <value>à</value>
+  </data>
+  <data name="Tooltip_Hu_Amb_M" xml:space="preserve">
+    <value>Humidité ambiante pendant le test</value>
+  </data>
+  <data name="Tooltip_P_Amb_M" xml:space="preserve">
+    <value>Pression ambiante pendant le test</value>
+  </data>
+  <data name="Tooltip_T_Amb_M" xml:space="preserve">
+    <value>Température ambiante pendant le test</value>
+  </data>
+  <data name="Test_done" xml:space="preserve">
+    <value>Test fait</value>
+  </data>
+  <data name="Test_passed" xml:space="preserve">
+    <value>Test réussi</value>
+  </data>
+  <data name="No" xml:space="preserve">
+    <value>Non</value>
+  </data>
+  <data name="Yes" xml:space="preserve">
+    <value>Oui</value>
+  </data>
+  <data name="Density_correction" xml:space="preserve">
+    <value>Correction densité</value>
+  </data>
+  <data name="Error_flags" xml:space="preserve">
+    <value>Drapeaux erreur</value>
+  </data>
+  <data name="Legalizator" xml:space="preserve">
+    <value>Légalisateur</value>
+  </data>
+  <data name="User_description" xml:space="preserve">
+    <value>Description utilisateur</value>
+  </data>
+  <data name="Failed_meters_count" xml:space="preserve">
+    <value>Compteur échoué</value>
+  </data>
+  <data name="Passed_meters_count" xml:space="preserve">
+    <value>Mètres passés</value>
+  </data>
+  <data name="sensitivity" xml:space="preserve">
+    <value>sensibilité</value>
+  </data>
+  <data name="Tooltip_Q_end" xml:space="preserve">
+    <value>Débit obtenu à partir du compteur principal - fin</value>
+  </data>
+  <data name="Tooltip_Q_max" xml:space="preserve">
+    <value>Débit obtenu à partir du compteur principal - max.</value>
+  </data>
+  <data name="Tooltip_Q_min" xml:space="preserve">
+    <value>Débit obtenu à partir du compteur principal - min</value>
+  </data>
+  <data name="Tooltip_Q_start" xml:space="preserve">
+    <value>Débit obtenu à partir du compteur principal - départ</value>
+  </data>
+  <data name="Tooltip_P_dw_max" xml:space="preserve">
+    <value>Pression maximale à la sortie pendant le test</value>
+  </data>
+  <data name="Tooltip_P_dw_min" xml:space="preserve">
+    <value>Pression minimale à la sortie pendant le test</value>
+  </data>
+  <data name="Tooltip_P_up_max" xml:space="preserve">
+    <value>Pression maximale à l'entrée pendant l'essai</value>
+  </data>
+  <data name="Tooltip_P_up_min" xml:space="preserve">
+    <value>Pression minimale à l'entrée lors de l'essai</value>
+  </data>
+  <data name="Tooltip_T_di_max" xml:space="preserve">
+    <value>Température maximale au déviateur pendant le test</value>
+  </data>
+  <data name="Tooltip_T_di_min" xml:space="preserve">
+    <value>Température minimale au déviateur pendant le test</value>
+  </data>
+  <data name="Tooltip_T_dw_max" xml:space="preserve">
+    <value>Température maximale à la sortie pendant le test</value>
+  </data>
+  <data name="Tooltip_T_dw_min" xml:space="preserve">
+    <value>Température minimale à la sortie pendant le test</value>
+  </data>
+  <data name="Tooltip_T_up_max" xml:space="preserve">
+    <value>Température maximale à l'entrée pendant le test</value>
+  </data>
+  <data name="Tooltip_T_up_min" xml:space="preserve">
+    <value>Température minimale à l'entrée pendant l'essai</value>
+  </data>
+  <data name="Tooltip_P_de_max" xml:space="preserve">
+    <value>Différence de pression mesurée par delta P mètre - maximum pendant le test</value>
+  </data>
+  <data name="Tooltip_P_de_min" xml:space="preserve">
+    <value>Différence de pression mesurée par delta P mètre - minimum pendant l'essai</value>
+  </data>
+  <data name="Tooltip_Rho_Wa_calc" xml:space="preserve">
+    <value>Densité calculée de l'eau à partir d'une table ou d'une formule à la température d'étalonnage de la densité de l'eau (r)</value>
+  </data>
+  <data name="Tooltip_T_rho_0" xml:space="preserve">
+    <value>Température de l'échantillon d'eau lors de l'étalonnage de la densité de l'eau</value>
+  </data>
+  <data name="Tooltip_T_ln_ac" xml:space="preserve">
+    <value>Température réelle dans la ligne</value>
+  </data>
+  <data name="Tooltip_T_ln_avg" xml:space="preserve">
+    <value>Température moyenne dans la ligne pendant un test</value>
+  </data>
+  <data name="Tooltip_T_ln_en" xml:space="preserve">
+    <value>Température dans la ligne à la fin du test - 4 dernières mesures avant la fin</value>
+  </data>
+  <data name="Tooltip_T_ln_max" xml:space="preserve">
+    <value>Température maximale dans la ligne pendant le test</value>
+  </data>
+  <data name="Tooltip_T_ln_me" xml:space="preserve">
+    <value>Température moyenne dans la ligne pendant un test</value>
+  </data>
+  <data name="Tooltip_T_ln_min" xml:space="preserve">
+    <value>Température minimale dans la ligne pendant le test</value>
+  </data>
+  <data name="Tooltip_T_ln_st" xml:space="preserve">
+    <value>Température dans la ligne au début du test - 4 premières mesures après le début</value>
+  </data>
+  <data name="Unit" xml:space="preserve">
+    <value>Unité</value>
+  </data>
+  <data name="Procedure_description" xml:space="preserve">
+    <value>Description procédure</value>
+  </data>
+  <data name="Bench_ID" xml:space="preserve">
+    <value>ID banc</value>
+  </data>
+  <data name="Bench_name" xml:space="preserve">
+    <value>Nom banc</value>
+  </data>
+  <data name="Address" xml:space="preserve">
+    <value>Adresse</value>
+  </data>
+  <data name="Tooltip_E_rel_last" xml:space="preserve">
+    <value>Erreur relative d'un compteur dans un test précédent / en production</value>
+  </data>
+  <data name="Batch" xml:space="preserve">
+    <value>Lot</value>
+  </data>
+  <data name="repetition" xml:space="preserve">
+    <value>répétition</value>
+  </data>
+  <data name="Invalid_Q2_correction_factors" xml:space="preserve">
+    <value>Facteurs correction Q2 non valides</value>
+  </data>
+  <data name="Previous_step_is_missing_or_NOK" xml:space="preserve">
+    <value>L'étape  précédente est manquante ou NOK</value>
+  </data>
+  <data name="Test_repetition_count_exceeded_upper_limit" xml:space="preserve">
+    <value>nombre répétitions test dépasse  limite supérieure</value>
+  </data>
+  <data name="Wrong_iPerl_counting_direction" xml:space="preserve">
+    <value>Mauvais sens comptage iPerl</value>
+  </data>
+  <data name="Failed" xml:space="preserve">
+    <value>Échoué</value>
+  </data>
+  <data name="Passed" xml:space="preserve">
+    <value>Passé</value>
+  </data>
+  <data name="Test_in_progress" xml:space="preserve">
+    <value>Test en cours</value>
+  </data>
+  <data name="Counter_0" xml:space="preserve">
+    <value>Compteur {0}</value>
+  </data>
+  <data name="Date_and_time" xml:space="preserve">
+    <value>Date et heure</value>
+  </data>
+  <data name="Name" xml:space="preserve">
+    <value>Prénom</value>
+  </data>
+  <data name="Step" xml:space="preserve">
+    <value>Étape</value>
+  </data>
+  <data name="Workplace" xml:space="preserve">
+    <value>Lieu travail</value>
+  </data>
+  <data name="Workflow" xml:space="preserve">
+    <value>Flux travail</value>
+  </data>
+  <data name="Production_tracing_results" xml:space="preserve">
+    <value>Résultats production</value>
+  </data>
+  <data name="Code" xml:space="preserve">
+    <value>Code</value>
+  </data>
+  <data name="Part" xml:space="preserve">
+    <value>Partie</value>
+  </data>
+  <data name="All_results" xml:space="preserve">
+    <value>Tous résultats</value>
+  </data>
+  <data name="Graphs" xml:space="preserve">
+    <value>Graphiques</value>
+  </data>
+  <data name="No_water_meter" xml:space="preserve">
+    <value>Pas de compteur</value>
+  </data>
+  <data name="Serial_number_is_missing" xml:space="preserve">
+    <value>Numérotation en série</value>
+  </data>
+</root>

Results/Resources/Strings.resx

@@ -816,4 +816,7 @@
   <data name="Relative_error" xml:space="preserve">
     <value>Relative error</value>
   </data>
+  <data name="This_position_is_disabled" xml:space="preserve">
+    <value>This position is disabled</value>
+  </data>
 </root>

Results/Results.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;FEWA_50</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;CEVAK_200;LANG_CS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -27,7 +27,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;FEWA_50</DefineConstants>
+    <DefineConstants>TRACE;CEVAK_200;LANG_CS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -35,6 +35,9 @@
     <Reference Include="FluentNHibernate">
       <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">
       <HintPath>..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
     </Reference>
@@ -75,6 +78,7 @@
     <Compile Include="Forms\BatchResultsDlg.Designer.cs">
       <DependentUpon>BatchResultsDlg.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\IOneWMResultsCtrl.cs" />
     <Compile Include="Forms\ListViewEx.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -87,11 +91,17 @@
     <Compile Include="Forms\MoreWMResultsDlg.Designer.cs">
       <DependentUpon>MoreWMResultsDlg.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\OneWMResultsCtrl.cs">
+    <Compile Include="Forms\OneWMResultsColumnsCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Forms\OneWMResultsCtrl.Designer.cs">
-      <DependentUpon>OneWMResultsCtrl.cs</DependentUpon>
+    <Compile Include="Forms\OneWMResultsColumnsCtrl.designer.cs">
+      <DependentUpon>OneWMResultsColumnsCtrl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Forms\OneWMResultsRowsCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Forms\OneWMResultsRowsCtrl.Designer.cs">
+      <DependentUpon>OneWMResultsRowsCtrl.cs</DependentUpon>
     </Compile>
     <Compile Include="Forms\ResultsConfigCtrl.cs">
       <SubType>UserControl</SubType>
@@ -124,6 +134,7 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Output\Printers\Enhanced\EnhancedPrinterCfg.cs" />
+    <Compile Include="Output\Printers\Enums.cs" />
     <Compile Include="Output\Printers\Label\LabelPrintDocument.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -163,6 +174,10 @@
       <Project>{743DF7DB-C7B6-42EB-986D-0F485E5588E4}</Project>
       <Name>Config</Name>
     </ProjectReference>
+    <ProjectReference Include="..\GenCode128\GenCode128.csproj">
+      <Project>{32817bf9-e380-4467-9c7f-936f4b122bc7}</Project>
+      <Name>GenCode128</Name>
+    </ProjectReference>
     <ProjectReference Include="..\TracingDB\TracingDB.csproj">
       <Project>{EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF}</Project>
       <Name>TracingDB</Name>
@@ -187,8 +202,11 @@
     <EmbeddedResource Include="Forms\MoreWMResultsDlg.resx">
       <DependentUpon>MoreWMResultsDlg.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\OneWMResultsCtrl.resx">
-      <DependentUpon>OneWMResultsCtrl.cs</DependentUpon>
+    <EmbeddedResource Include="Forms\OneWMResultsColumnsCtrl.resx">
+      <DependentUpon>OneWMResultsColumnsCtrl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\OneWMResultsRowsCtrl.resx">
+      <DependentUpon>OneWMResultsRowsCtrl.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\ResultsConfigCtrl.resx">
       <DependentUpon>ResultsConfigCtrl.cs</DependentUpon>
@@ -207,6 +225,7 @@
     <EmbeddedResource Include="Resources\Strings.de.resx">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Strings.fr.resx" />
     <EmbeddedResource Include="Resources\Strings.it.resx" />
     <EmbeddedResource Include="Resources\Strings.pl.resx" />
     <EmbeddedResource Include="Resources\Strings.resx">

Results/Utils.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2016-2019 Sensus Slovensko a.s.
 ///
 using System;
 using System.Text;
@@ -27,7 +27,11 @@ namespace Results
                 case 7:  return 29;  /// PT7, special
                 case 8:  return 36;  /// WR13
                 case 9:  return 37;  /// WR15
-                case 10: return 38;  /// WR16
+                case 10: return 38;  /// WR14
+                case 11: return 39;  /// WR18
+                case 12: return 40;  /// WR19
+                case 13: return 41;  /// WR20
+                case 14: return 42;  /// WR21
                 default: return 0;
             }
         }
@@ -43,6 +47,10 @@ namespace Results
                 case 8: return "WR13";
                 case 9: return "WR15";
                 case 10: return "WR14";
+                case 11: return "WR18";
+                case 12: return "WR19";
+                case 13: return "WR20";
+                case 14: return "WR21";
                 default: return string.Empty;
             }
         }

ResultsBrowser/Forms/DatabaseSettingsDlg.cs

@@ -1,8 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Windows.Forms;
 using ResultsBrowser.Resources;
-using TBF.BenchControl;
 
 namespace ResultsBrowser.Forms
 {

ResultsBrowser/Forms/PrinterConfigDlg.cs

@@ -91,7 +91,7 @@ namespace ResultsBrowser.Forms
 			cfgControl.Config = printerCfg;
 			cfgControl.Config.ItemNr = 0;
 
-			TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg();
+            TBF.BenchControl.ComponentParametersDlg cfgForm = new TBF.BenchControl.ComponentParametersDlg();
 			cfgForm.TbfComponents = new List<Component>();
 
 			cfgForm.ComponentCfgCtrl = cfgControl;

ResultsBrowser/LocalSettings.cs

@@ -109,7 +109,7 @@ namespace ResultsBrowser
             
         public LocalSettings()
         {
-#if TURA_IPERL || TURA_SPECIAL
+#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
             Bench1 = "WR10";
             Bench2 = "WR11";
             Bench3 = "WR13";

ResultsBrowser/Properties/AssemblyInfo.cs

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

ResultsBrowser/Resources/Strings.fr.resx

@@ -0,0 +1,306 @@
+<?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="Error" xml:space="preserve">
+    <value>Erreur</value>
+  </data>
+  <data name="Test_bench" xml:space="preserve">
+    <value>Banc essai</value>
+  </data>
+  <data name="Name" xml:space="preserve">
+    <value>Prénom</value>
+  </data>
+  <data name="CancelBtnText" xml:space="preserve">
+    <value>Annuler</value>
+  </data>
+  <data name="OkBtnText" xml:space="preserve">
+    <value>Ok</value>
+  </data>
+  <data name="ConfigureDatabaseText" xml:space="preserve">
+    <value>Configurer les bancs d'essai (mot de passe requis)</value>
+  </data>
+  <data name="ExitBtnText" xml:space="preserve">
+    <value>Quitter </value>
+  </data>
+  <data name="Procedure" xml:space="preserve">
+    <value>Procédure</value>
+  </data>
+  <data name="Test" xml:space="preserve">
+    <value>Tester</value>
+  </data>
+  <data name="Component" xml:space="preserve">
+    <value>Composant</value>
+  </data>
+  <data name="Configure" xml:space="preserve">
+    <value>Configurer</value>
+  </data>
+  <data name="Printer" xml:space="preserve">
+    <value>Imprimante</value>
+  </data>
+  <data name="Question" xml:space="preserve">
+    <value>Question</value>
+  </data>
+  <data name="Connection_string" xml:space="preserve">
+    <value>Chaîne connexion</value>
+  </data>
+  <data name="Add" xml:space="preserve">
+    <value>&amp;Ajouter &gt;</value>
+  </data>
+  <data name="Message" xml:space="preserve">
+    <value>Message</value>
+  </data>
+  <data name="Data" xml:space="preserve">
+    <value>Données</value>
+  </data>
+  <data name="Protocol" xml:space="preserve">
+    <value>Protocole</value>
+  </data>
+  <data name="Serial_Number" xml:space="preserve">
+    <value>Numéro série</value>
+  </data>
+  <data name="Language" xml:space="preserve">
+    <value>Langue</value>
+  </data>
+  <data name="Add_filter" xml:space="preserve">
+    <value>Ajouter filtre</value>
+  </data>
+  <data name="Clear_filters" xml:space="preserve">
+    <value>Effacer  filtres</value>
+  </data>
+  <data name="Execute_query" xml:space="preserve">
+    <value>Exécuter ordre</value>
+  </data>
+  <data name="Export_query_results" xml:space="preserve">
+    <value>Résultats exportation</value>
+  </data>
+  <data name="Filters" xml:space="preserve">
+    <value>Filtres</value>
+  </data>
+  <data name="Format_of_results" xml:space="preserve">
+    <value>Configurer la sortie</value>
+  </data>
+  <data name="Load_filters" xml:space="preserve">
+    <value>charge filters</value>
+  </data>
+  <data name="Print_query_results" xml:space="preserve">
+    <value>Résultats impression</value>
+  </data>
+  <data name="Query_results" xml:space="preserve">
+    <value>Résultats requête</value>
+  </data>
+  <data name="Results_Browser" xml:space="preserve">
+    <value>Résultats Browser</value>
+  </data>
+  <data name="Save_filters" xml:space="preserve">
+    <value>Enregistrer filtres</value>
+  </data>
+  <data name="Settings" xml:space="preserve">
+    <value>Réglages</value>
+  </data>
+  <data name="Test_benches" xml:space="preserve">
+    <value>Bancs essai</value>
+  </data>
+  <data name="RetryDatabaseText" xml:space="preserve">
+    <value>Recommencez</value>
+  </data>
+  <data name="Date" xml:space="preserve">
+    <value>Date</value>
+  </data>
+  <data name="From" xml:space="preserve">
+    <value>De</value>
+  </data>
+  <data name="To" xml:space="preserve">
+    <value>À</value>
+  </data>
+  <data name="Statistics" xml:space="preserve">
+    <value>Statistiques</value>
+  </data>
+  <data name="Columns" xml:space="preserve">
+    <value>colonnes</value>
+  </data>
+  <data name="Rows" xml:space="preserve">
+    <value>Lignes</value>
+  </data>
+  <data name="Select_a_filter" xml:space="preserve">
+    <value>Sélectionnez filtre</value>
+  </data>
+  <data name="Error_displaying_results" xml:space="preserve">
+    <value>Erreur affichage résultats</value>
+  </data>
+  <data name="All_files" xml:space="preserve">
+    <value>Tous fichiers</value>
+  </data>
+  <data name="Error_saving_file" xml:space="preserve">
+    <value>Fichier sauvegarde erreurs</value>
+  </data>
+  <data name="Error_serializing_filters" xml:space="preserve">
+    <value>Erreurs sérialisation filtres</value>
+  </data>
+  <data name="Query_files" xml:space="preserve">
+    <value>Fichiers requête</value>
+  </data>
+  <data name="No_program_settings_found" xml:space="preserve">
+    <value>Aucun paramètre programme trouvé</value>
+  </data>
+  <data name="Using_default_settings" xml:space="preserve">
+    <value>Utilisation  valeurs par  défaut</value>
+  </data>
+  <data name="Selected_language_not_supported" xml:space="preserve">
+    <value>Langue sélectionnée non prise en charge</value>
+  </data>
+  <data name="Using_English" xml:space="preserve">
+    <value>Utilisation anglais</value>
+  </data>
+  <data name="Warning" xml:space="preserve">
+    <value>Attention</value>
+  </data>
+  <data name="Count" xml:space="preserve">
+    <value>Compter</value>
+  </data>
+  <data name="Format" xml:space="preserve">
+    <value>Format</value>
+  </data>
+  <data name="Page_orientation" xml:space="preserve">
+    <value>Page orientation</value>
+  </data>
+  <data name="Yes_Portrait_No_Landscape" xml:space="preserve">
+    <value>Oui portrait non paysage</value>
+  </data>
+  <data name="Print" xml:space="preserve">
+    <value>Impression</value>
+  </data>
+  <data name="Configure_printer" xml:space="preserve">
+    <value>Configurer impréssion</value>
+  </data>
+  <data name="No_printer_defined" xml:space="preserve">
+    <value>Aucune imprimante définie</value>
+  </data>
+  <data name="Printing_failed" xml:space="preserve">
+    <value>Impression échouée</value>
+  </data>
+  <data name="Printing_completed" xml:space="preserve">
+    <value>Impression terminée</value>
+  </data>
+  <data name="Error_exporting_results" xml:space="preserve">
+    <value>Erreur exportation résultats</value>
+  </data>
+  <data name="Histograms" xml:space="preserve">
+    <value>histogrammes</value>
+  </data>
+</root>

ResultsBrowser/ResultsBrowser.csproj

@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;FEWA_50</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;CEVAK_200;LANG_CS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -31,7 +31,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;FEWA_50</DefineConstants>
+    <DefineConstants>TRACE;CEVAK_200;LANG_CS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -254,6 +254,7 @@
     </Compile>
     <EmbeddedResource Include="Resources\Strings.cs.resx" />
     <EmbeddedResource Include="Resources\Strings.de.resx" />
+    <EmbeddedResource Include="Resources\Strings.fr.resx" />
     <EmbeddedResource Include="Resources\Strings.it.resx" />
     <EmbeddedResource Include="Resources\Strings.pl.resx">
       <SubType>Designer</SubType>

TBF.sln

@@ -1,14 +1,12 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TBF", "TBF\TBF.csproj", "{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}"
 	ProjectSection(ProjectDependencies) = postProject
 		{EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF} = {EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF}
 		{0C0A1F4D-1363-4544-A7C5-196C76D26CCA} = {0C0A1F4D-1363-4544-A7C5-196C76D26CCA}
 	EndProjectSection
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "TBFSetup", "TBFSetup\TBFSetup.vdproj", "{4890DE5C-9F68-40D7-B075-92C8EAB79833}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Results", "Results\Results.csproj", "{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Config", "Config\Config.csproj", "{743DF7DB-C7B6-42EB-986D-0F485E5588E4}"
@@ -48,6 +46,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GemCard", "GemCard\GemCard.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Statistics", "Statistics\Statistics.csproj", "{36755E1D-6FC3-4D9C-8DD3-0250D51532E0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Decrypt", "Decrypt\Decrypt.csproj", "{D476ABBE-A455-4476-8A8D-3F6151217B51}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Encrypt", "Encrypt\Encrypt.csproj", "{DA9B09F3-A99D-4883-A954-537560453674}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenCode128", "GenCode128\GenCode128.csproj", "{32817BF9-E380-4467-9C7F-936F4B122BC7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -70,12 +74,6 @@ Global
 		{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}.Release|Mixed Platforms.Build.0 = Release|x86
 		{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}.Release|x86.ActiveCfg = Release|x86
 		{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}.Release|x86.Build.0 = Release|x86
-		{4890DE5C-9F68-40D7-B075-92C8EAB79833}.Debug|Any CPU.ActiveCfg = Debug
-		{4890DE5C-9F68-40D7-B075-92C8EAB79833}.Debug|Mixed Platforms.ActiveCfg = Debug
-		{4890DE5C-9F68-40D7-B075-92C8EAB79833}.Debug|x86.ActiveCfg = Debug
-		{4890DE5C-9F68-40D7-B075-92C8EAB79833}.Release|Any CPU.ActiveCfg = Release
-		{4890DE5C-9F68-40D7-B075-92C8EAB79833}.Release|Mixed Platforms.ActiveCfg = Release
-		{4890DE5C-9F68-40D7-B075-92C8EAB79833}.Release|x86.ActiveCfg = Release
 		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
@@ -186,6 +184,36 @@ Global
 		{36755E1D-6FC3-4D9C-8DD3-0250D51532E0}.Release|Mixed Platforms.Build.0 = Release|x86
 		{36755E1D-6FC3-4D9C-8DD3-0250D51532E0}.Release|x86.ActiveCfg = Release|x86
 		{36755E1D-6FC3-4D9C-8DD3-0250D51532E0}.Release|x86.Build.0 = Release|x86
+		{D476ABBE-A455-4476-8A8D-3F6151217B51}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{D476ABBE-A455-4476-8A8D-3F6151217B51}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{D476ABBE-A455-4476-8A8D-3F6151217B51}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{D476ABBE-A455-4476-8A8D-3F6151217B51}.Debug|x86.ActiveCfg = Debug|x86
+		{D476ABBE-A455-4476-8A8D-3F6151217B51}.Debug|x86.Build.0 = Debug|x86
+		{D476ABBE-A455-4476-8A8D-3F6151217B51}.Release|Any CPU.ActiveCfg = Release|x86
+		{D476ABBE-A455-4476-8A8D-3F6151217B51}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{D476ABBE-A455-4476-8A8D-3F6151217B51}.Release|Mixed Platforms.Build.0 = Release|x86
+		{D476ABBE-A455-4476-8A8D-3F6151217B51}.Release|x86.ActiveCfg = Release|x86
+		{D476ABBE-A455-4476-8A8D-3F6151217B51}.Release|x86.Build.0 = Release|x86
+		{DA9B09F3-A99D-4883-A954-537560453674}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{DA9B09F3-A99D-4883-A954-537560453674}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{DA9B09F3-A99D-4883-A954-537560453674}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{DA9B09F3-A99D-4883-A954-537560453674}.Debug|x86.ActiveCfg = Debug|x86
+		{DA9B09F3-A99D-4883-A954-537560453674}.Debug|x86.Build.0 = Debug|x86
+		{DA9B09F3-A99D-4883-A954-537560453674}.Release|Any CPU.ActiveCfg = Release|x86
+		{DA9B09F3-A99D-4883-A954-537560453674}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{DA9B09F3-A99D-4883-A954-537560453674}.Release|Mixed Platforms.Build.0 = Release|x86
+		{DA9B09F3-A99D-4883-A954-537560453674}.Release|x86.ActiveCfg = Release|x86
+		{DA9B09F3-A99D-4883-A954-537560453674}.Release|x86.Build.0 = Release|x86
+		{32817BF9-E380-4467-9C7F-936F4B122BC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32817BF9-E380-4467-9C7F-936F4B122BC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32817BF9-E380-4467-9C7F-936F4B122BC7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{32817BF9-E380-4467-9C7F-936F4B122BC7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{32817BF9-E380-4467-9C7F-936F4B122BC7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{32817BF9-E380-4467-9C7F-936F4B122BC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{32817BF9-E380-4467-9C7F-936F4B122BC7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32817BF9-E380-4467-9C7F-936F4B122BC7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{32817BF9-E380-4467-9C7F-936F4B122BC7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{32817BF9-E380-4467-9C7F-936F4B122BC7}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

TBF/AttachedTextBoxes.cs

@@ -1,176 +0,0 @@
-///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
-///
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows.Forms;
-
-namespace TBF
-{
-    /// <summary>
-    /// Data types and orientation of the table layout panel attached data.
-    /// </summary>
-    public enum Arrangement
-    {
-        RowOfIntegers,
-        RowOfDoubles,
-        RowOfStrings,
-        ColumnOfIntegers,
-        ColumnOfDoubles,
-        ColumnOfStrings,
-    }
-
-    /// <summary>
-    /// This class represents TextBox controls and data modified by them
-    /// that are attached to (=displayed inside) a TableLayoutPanel control.
-    /// </summary>
-    public class AttachedTextBoxes
-    {
-        ///
-        /// Private fields
-        ///
-        int count;              /// Number of attached TextBoxes / cells
-        Arrangement arngmnt;    /// Type of attachemnt (see above)
-        bool isRow;             /// true if it is a row
-        TextBox[] textBoxes;    /// TextBox controls to be aded to TableLayoutPanel
-        int[] intData;          /// integer data |
-        double[] doubleData;    /// double data  |-> one of these three arrays is used
-        string[] stringData;    /// string data  |
-
-        /// <summary>
-        /// Constructor, which creates TextBox controls and adds them to the table layout panel.
-        /// </summary>
-        public AttachedTextBoxes(TableLayoutPanel tblLtPnl, Arrangement arngmnt, int firstColumn, int firstRow, int size)
-        {
-            this.count = size;
-            this.arngmnt = arngmnt;
-            isRow = (arngmnt == Arrangement.RowOfIntegers || arngmnt == Arrangement.RowOfDoubles || arngmnt == Arrangement.RowOfStrings);
-
-            textBoxes = new TextBox[count];
-            intData = new int[count];
-            doubleData = new double[count];
-            stringData = new string[count];
-
-            for (int i = 0; i < count; i++)
-            {
-                textBoxes[i] = new TextBox();       /// Crete a new TextBox control
-
-                if (isRow)
-                {
-                    tblLtPnl.Controls.Add(textBoxes[i], firstColumn + i, firstRow);
-                }
-                else
-                {
-                    tblLtPnl.Controls.Add(textBoxes[i], firstColumn, firstRow + i);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Attached data array size
-        /// </summary>
-        public int Count { get { return count; } }
-
-        /// <summary>
-        /// Indexer returning a TextBox
-        /// </summary>
-        /// <param name="index">Index</param>
-        /// <returns>TextBox object reference</returns>
-        public TextBox this[int index]
-        {
-            get
-            {
-                if (index < 0 || index >= count)
-                {
-                    return null;
-                }
-                else
-                {
-                    return textBoxes[index];
-                }
-            }
-        }
-
-        /// <summary>
-        /// Retrieves data from the controls or detects a format error.
-        /// Wrong format in a cell interrupts data retrieving, so when the first control
-        /// contains data with wrong format, no data are retrieved at all.
-        /// </summary>
-        /// <returns>true if all data have correct format</returns>
-        public bool ValidateData()
-        {
-            switch (arngmnt)
-            {
-                case Arrangement.RowOfIntegers:
-                case Arrangement.ColumnOfIntegers:
-                    for (int i = 0; i < count; i++)
-                    {
-                        if (!Int32.TryParse(textBoxes[i].Text, out intData[i]))  return false;
-                    }
-                    return true;
-
-                case Arrangement.RowOfDoubles:
-                case Arrangement.ColumnOfDoubles:
-                    for (int i = 0; i < count; i++)
-                    {
-                        if (!Double.TryParse(textBoxes[i].Text, out doubleData[i]))  return false;
-                    }
-                    return true;
-
-                case Arrangement.RowOfStrings:
-                case Arrangement.ColumnOfStrings:
-                default:
-                    return true;
-            }
-        }
-
-        /// <summary>
-        /// The following three methods provide initialization of controls with original data.
-        /// </summary>
-        
-        public void SetData(int index, int value)
-        {
-            if (index < 0 || index >= count) return;
-            intData[index] = value;
-            textBoxes[index].Text = value.ToString();
-        }
-
-        public void SetData(int index, double value)
-        {
-            if (index < 0 || index >= count) return;
-            doubleData[index] = value;
-            textBoxes[index].Text = value.ToString();
-        }
-
-        public void SetData(int index, string value)
-        {
-            if (index < 0 || index >= count) return;
-            stringData[index] = value;
-            textBoxes[index].Text = value;
-        }
-
-        /// <summary>
-        /// The following three methods provide retrieving data from controls.
-        /// ValidateData() must be called first. The return value must be true.
-        /// </summary>
-
-        public int GetIntData(int index)
-        {
-            if (index < 0 || index >= count) return 0;
-            return intData[index];
-        }
-
-        public double GetDoubleData(int index)
-        {
-            if (index < 0 || index >= count) return 0;
-            return doubleData[index];
-        }
-
-        public string GetStringData(int index)
-        {
-            if (index < 0 || index >= count) return null;
-            return textBoxes[index].Text;
-        }
-    }
-}

TBF/BarGraph.cs

@@ -1,75 +0,0 @@
-///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
-///
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace TBF
-{
-    public class BarGraph
-    {
-        int originX;            /// Left coordinate of the bar
-        int originY;            /// Top coordinate of the bar
-        int barWidth;           /// Bar width, the bar is actualy 1 pixel wider
-        int barHeight;          /// Bar height the bat is actualy 1 pixel higher
-        Color barColor;         /// Bar color
-        Color backColor;        /// Background color (above the bar)
-                                /// Bar border is always black, 1 pixel wide
-        int barValue;           /// The actual bar size (the bar is drawn from bottom)
-
-        System.Windows.Forms.Control control;
-        Rectangle rect;
-
-
-        /// Use this setter to update the bar size
-        public float FValue
-        {
-            get { return (float)barValue/(float)barHeight; }
-            set
-            {
-                Value = (int)(value * (float)barHeight);
-                control.Invalidate();
-            }
-        }
-                        
-        /// Use this setter to update the bar size
-        public int Value
-        {
-            get { return barValue; }
-            set
-            {
-                if (value < 0)               barValue = 0;
-                else if (value >= barHeight) barValue = barHeight;
-                else                         barValue = value;
-                control.Invalidate();
-            }
-        }
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        public BarGraph(System.Windows.Forms.Control control, int originX, int originY, int barWidth, int barHeight, Color barColor, Color backColor)
-        {
-            this.control = control;
-            this.originX = originX;
-            this.originY = originY;
-            this.barWidth = barWidth;
-            this.barHeight = barHeight;
-            this.barColor = barColor;
-            this.backColor = backColor;
-            rect = new Rectangle(originX, originY, barWidth + 1, barHeight + 1);
-            barValue = 0;
-        }
-
-        /// <summary>
-        /// Call this function in Form1_Paint(..), pass the arguments without any modifications
-        /// </summary>
-        public void Paint(Graphics g)
-        {
-            g.FillRectangle(new SolidBrush(backColor), originX + 1, originY + 1, barWidth, barHeight - barValue);
-            g.FillRectangle(new SolidBrush(barColor), originX + 1, originY + barHeight + 1 - barValue, barWidth, barValue);
-            g.DrawRectangle(new Pen(Color.Black, 2.0F), originX, originY, barWidth + 1, barHeight + 1);
-        }
-    }
-}

TBF/BenchControl/Ambient/Comet/Ambient.cs

@@ -71,6 +71,10 @@ namespace TBF.BenchControl.Ambient.Comet
 			serialPort = new SerialPort(comPortName, ambientCfg.BaudRate, ambientCfg.Parity, ambientCfg.DataBits, ambientCfg.StopBits);
 			serialPort.Handshake = ambientCfg.Handshake;
 			serialPort.Open();
+            if (ambientCfg.SetDtrToOne)
+            {
+                serialPort.DtrEnable = true;
+            }
 
             msrmntTimeStamp = 0;
             msrmntState = MsrmntState.Busy;

TBF/BenchControl/Ambient/Comet/AmbientCfg.cs

@@ -25,6 +25,7 @@ namespace TBF.BenchControl.Ambient.Comet
         public int DataBits;
         public StopBits StopBits;
         public Handshake Handshake;
+        public bool SetDtrToOne;
 
 		/// Private parameterless constructor invoked by all other (public) constructors
 		AmbientCfg()
@@ -37,6 +38,7 @@ namespace TBF.BenchControl.Ambient.Comet
             DataBits = 8;
             StopBits = System.IO.Ports.StopBits.Two;
             Handshake = System.IO.Ports.Handshake.None;
+            SetDtrToOne = false;
         }
 
         public AmbientCfg(IComponentFactory factory)

TBF/BenchControl/Ambient/Comet/AmbientCfgCtrl.Designer.cs

@@ -31,179 +31,192 @@ namespace TBF.BenchControl.Ambient.Comet
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.comPortNrTextBox = new System.Windows.Forms.TextBox();
-			this.label1 = new System.Windows.Forms.Label();
-			this.baudRateLabel = new System.Windows.Forms.Label();
-			this.baudRateTextBox = new System.Windows.Forms.TextBox();
-			this.partityLabel = new System.Windows.Forms.Label();
-			this.dataBitsLabel = new System.Windows.Forms.Label();
-			this.dataBitsTextBox = new System.Windows.Forms.TextBox();
-			this.stopBitsLabel = new System.Windows.Forms.Label();
-			this.handshakeLabel = new System.Windows.Forms.Label();
-			this.nameTextBox = new System.Windows.Forms.TextBox();
-			this.nameLabel = new System.Windows.Forms.Label();
-			this.classNameLabel = new System.Windows.Forms.Label();
-			this.parityComboBox = new System.Windows.Forms.ComboBox();
-			this.stopBitsComboBox = new System.Windows.Forms.ComboBox();
-			this.handshakeComboBox = new System.Windows.Forms.ComboBox();
-			this.SuspendLayout();
-			// 
-			// comPortNrTextBox
-			// 
-			this.comPortNrTextBox.Enabled = false;
-			this.comPortNrTextBox.Location = new System.Drawing.Point(140, 52);
-			this.comPortNrTextBox.Name = "comPortNrTextBox";
-			this.comPortNrTextBox.Size = new System.Drawing.Size(34, 20);
-			this.comPortNrTextBox.TabIndex = 4;
-			// 
-			// label1
-			// 
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(29, 55);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(98, 13);
-			this.label1.TabIndex = 3;
-			this.label1.Text = "Serial Port Number:";
-			// 
-			// baudRateLabel
-			// 
-			this.baudRateLabel.AutoSize = true;
-			this.baudRateLabel.Location = new System.Drawing.Point(29, 79);
-			this.baudRateLabel.Name = "baudRateLabel";
-			this.baudRateLabel.Size = new System.Drawing.Size(58, 13);
-			this.baudRateLabel.TabIndex = 5;
-			this.baudRateLabel.Text = "Baud Rate";
-			// 
-			// baudRateTextBox
-			// 
-			this.baudRateTextBox.Enabled = false;
-			this.baudRateTextBox.Location = new System.Drawing.Point(140, 76);
-			this.baudRateTextBox.Name = "baudRateTextBox";
-			this.baudRateTextBox.Size = new System.Drawing.Size(130, 20);
-			this.baudRateTextBox.TabIndex = 6;
-			// 
-			// partityLabel
-			// 
-			this.partityLabel.AutoSize = true;
-			this.partityLabel.Location = new System.Drawing.Point(29, 103);
-			this.partityLabel.Name = "partityLabel";
-			this.partityLabel.Size = new System.Drawing.Size(33, 13);
-			this.partityLabel.TabIndex = 7;
-			this.partityLabel.Text = "Parity";
-			// 
-			// dataBitsLabel
-			// 
-			this.dataBitsLabel.AutoSize = true;
-			this.dataBitsLabel.Location = new System.Drawing.Point(29, 127);
-			this.dataBitsLabel.Name = "dataBitsLabel";
-			this.dataBitsLabel.Size = new System.Drawing.Size(50, 13);
-			this.dataBitsLabel.TabIndex = 9;
-			this.dataBitsLabel.Text = "Data Bits";
-			// 
-			// dataBitsTextBox
-			// 
-			this.dataBitsTextBox.Enabled = false;
-			this.dataBitsTextBox.Location = new System.Drawing.Point(140, 124);
-			this.dataBitsTextBox.Name = "dataBitsTextBox";
-			this.dataBitsTextBox.Size = new System.Drawing.Size(34, 20);
-			this.dataBitsTextBox.TabIndex = 10;
-			// 
-			// stopBitsLabel
-			// 
-			this.stopBitsLabel.AutoSize = true;
-			this.stopBitsLabel.Location = new System.Drawing.Point(29, 151);
-			this.stopBitsLabel.Name = "stopBitsLabel";
-			this.stopBitsLabel.Size = new System.Drawing.Size(49, 13);
-			this.stopBitsLabel.TabIndex = 11;
-			this.stopBitsLabel.Text = "Stop Bits";
-			// 
-			// handshakeLabel
-			// 
-			this.handshakeLabel.AutoSize = true;
-			this.handshakeLabel.Location = new System.Drawing.Point(29, 175);
-			this.handshakeLabel.Name = "handshakeLabel";
-			this.handshakeLabel.Size = new System.Drawing.Size(62, 13);
-			this.handshakeLabel.TabIndex = 13;
-			this.handshakeLabel.Text = "Handshake";
-			// 
-			// nameTextBox
-			// 
-			this.nameTextBox.Enabled = false;
-			this.nameTextBox.Location = new System.Drawing.Point(140, 28);
-			this.nameTextBox.Name = "nameTextBox";
-			this.nameTextBox.Size = new System.Drawing.Size(130, 20);
-			this.nameTextBox.TabIndex = 2;
-			// 
-			// nameLabel
-			// 
-			this.nameLabel.AutoSize = true;
-			this.nameLabel.Location = new System.Drawing.Point(30, 31);
-			this.nameLabel.Name = "nameLabel";
-			this.nameLabel.Size = new System.Drawing.Size(35, 13);
-			this.nameLabel.TabIndex = 1;
-			this.nameLabel.Text = "Name";
-			// 
-			// classNameLabel
-			// 
-			this.classNameLabel.AutoSize = true;
-			this.classNameLabel.Location = new System.Drawing.Point(137, 7);
-			this.classNameLabel.Name = "classNameLabel";
-			this.classNameLabel.Size = new System.Drawing.Size(83, 13);
-			this.classNameLabel.TabIndex = 0;
-			this.classNameLabel.Text = "ComonentName";
-			// 
-			// parityComboBox
-			// 
-			this.parityComboBox.Enabled = false;
-			this.parityComboBox.FormattingEnabled = true;
-			this.parityComboBox.Location = new System.Drawing.Point(140, 100);
-			this.parityComboBox.Name = "parityComboBox";
-			this.parityComboBox.Size = new System.Drawing.Size(130, 21);
-			this.parityComboBox.TabIndex = 8;
-			// 
-			// stopBitsComboBox
-			// 
-			this.stopBitsComboBox.Enabled = false;
-			this.stopBitsComboBox.FormattingEnabled = true;
-			this.stopBitsComboBox.Location = new System.Drawing.Point(140, 148);
-			this.stopBitsComboBox.Name = "stopBitsComboBox";
-			this.stopBitsComboBox.Size = new System.Drawing.Size(130, 21);
-			this.stopBitsComboBox.TabIndex = 12;
-			// 
-			// handshakeComboBox
-			// 
-			this.handshakeComboBox.Enabled = false;
-			this.handshakeComboBox.FormattingEnabled = true;
-			this.handshakeComboBox.Location = new System.Drawing.Point(140, 172);
-			this.handshakeComboBox.Name = "handshakeComboBox";
-			this.handshakeComboBox.Size = new System.Drawing.Size(130, 21);
-			this.handshakeComboBox.TabIndex = 14;
-			// 
-			// AmbientCfgCtrl
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.BackColor = System.Drawing.SystemColors.Control;
-			this.Controls.Add(this.handshakeComboBox);
-			this.Controls.Add(this.stopBitsComboBox);
-			this.Controls.Add(this.parityComboBox);
-			this.Controls.Add(this.nameTextBox);
-			this.Controls.Add(this.nameLabel);
-			this.Controls.Add(this.classNameLabel);
-			this.Controls.Add(this.handshakeLabel);
-			this.Controls.Add(this.stopBitsLabel);
-			this.Controls.Add(this.dataBitsTextBox);
-			this.Controls.Add(this.dataBitsLabel);
-			this.Controls.Add(this.partityLabel);
-			this.Controls.Add(this.baudRateTextBox);
-			this.Controls.Add(this.baudRateLabel);
-			this.Controls.Add(this.comPortNrTextBox);
-			this.Controls.Add(this.label1);
-			this.Name = "AmbientCfgCtrl";
-			this.Size = new System.Drawing.Size(300, 240);
-			this.Load += new System.EventHandler(this.AbbientCfgCtrl_Load);
-			this.ResumeLayout(false);
-			this.PerformLayout();
+            this.comPortNrTextBox = new System.Windows.Forms.TextBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.baudRateLabel = new System.Windows.Forms.Label();
+            this.baudRateTextBox = new System.Windows.Forms.TextBox();
+            this.partityLabel = new System.Windows.Forms.Label();
+            this.dataBitsLabel = new System.Windows.Forms.Label();
+            this.dataBitsTextBox = new System.Windows.Forms.TextBox();
+            this.stopBitsLabel = new System.Windows.Forms.Label();
+            this.handshakeLabel = new System.Windows.Forms.Label();
+            this.nameTextBox = new System.Windows.Forms.TextBox();
+            this.nameLabel = new System.Windows.Forms.Label();
+            this.classNameLabel = new System.Windows.Forms.Label();
+            this.parityComboBox = new System.Windows.Forms.ComboBox();
+            this.stopBitsComboBox = new System.Windows.Forms.ComboBox();
+            this.handshakeComboBox = new System.Windows.Forms.ComboBox();
+            this.setDtrCheckBox = new System.Windows.Forms.CheckBox();
+            this.SuspendLayout();
+            // 
+            // comPortNrTextBox
+            // 
+            this.comPortNrTextBox.Enabled = false;
+            this.comPortNrTextBox.Location = new System.Drawing.Point(140, 52);
+            this.comPortNrTextBox.Name = "comPortNrTextBox";
+            this.comPortNrTextBox.Size = new System.Drawing.Size(34, 20);
+            this.comPortNrTextBox.TabIndex = 4;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(29, 55);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(98, 13);
+            this.label1.TabIndex = 3;
+            this.label1.Text = "Serial Port Number:";
+            // 
+            // baudRateLabel
+            // 
+            this.baudRateLabel.AutoSize = true;
+            this.baudRateLabel.Location = new System.Drawing.Point(29, 79);
+            this.baudRateLabel.Name = "baudRateLabel";
+            this.baudRateLabel.Size = new System.Drawing.Size(58, 13);
+            this.baudRateLabel.TabIndex = 5;
+            this.baudRateLabel.Text = "Baud Rate";
+            // 
+            // baudRateTextBox
+            // 
+            this.baudRateTextBox.Enabled = false;
+            this.baudRateTextBox.Location = new System.Drawing.Point(140, 76);
+            this.baudRateTextBox.Name = "baudRateTextBox";
+            this.baudRateTextBox.Size = new System.Drawing.Size(130, 20);
+            this.baudRateTextBox.TabIndex = 6;
+            // 
+            // partityLabel
+            // 
+            this.partityLabel.AutoSize = true;
+            this.partityLabel.Location = new System.Drawing.Point(29, 103);
+            this.partityLabel.Name = "partityLabel";
+            this.partityLabel.Size = new System.Drawing.Size(33, 13);
+            this.partityLabel.TabIndex = 7;
+            this.partityLabel.Text = "Parity";
+            // 
+            // dataBitsLabel
+            // 
+            this.dataBitsLabel.AutoSize = true;
+            this.dataBitsLabel.Location = new System.Drawing.Point(29, 127);
+            this.dataBitsLabel.Name = "dataBitsLabel";
+            this.dataBitsLabel.Size = new System.Drawing.Size(50, 13);
+            this.dataBitsLabel.TabIndex = 9;
+            this.dataBitsLabel.Text = "Data Bits";
+            // 
+            // dataBitsTextBox
+            // 
+            this.dataBitsTextBox.Enabled = false;
+            this.dataBitsTextBox.Location = new System.Drawing.Point(140, 124);
+            this.dataBitsTextBox.Name = "dataBitsTextBox";
+            this.dataBitsTextBox.Size = new System.Drawing.Size(34, 20);
+            this.dataBitsTextBox.TabIndex = 10;
+            // 
+            // stopBitsLabel
+            // 
+            this.stopBitsLabel.AutoSize = true;
+            this.stopBitsLabel.Location = new System.Drawing.Point(29, 151);
+            this.stopBitsLabel.Name = "stopBitsLabel";
+            this.stopBitsLabel.Size = new System.Drawing.Size(49, 13);
+            this.stopBitsLabel.TabIndex = 11;
+            this.stopBitsLabel.Text = "Stop Bits";
+            // 
+            // handshakeLabel
+            // 
+            this.handshakeLabel.AutoSize = true;
+            this.handshakeLabel.Location = new System.Drawing.Point(29, 175);
+            this.handshakeLabel.Name = "handshakeLabel";
+            this.handshakeLabel.Size = new System.Drawing.Size(62, 13);
+            this.handshakeLabel.TabIndex = 13;
+            this.handshakeLabel.Text = "Handshake";
+            // 
+            // nameTextBox
+            // 
+            this.nameTextBox.Enabled = false;
+            this.nameTextBox.Location = new System.Drawing.Point(140, 28);
+            this.nameTextBox.Name = "nameTextBox";
+            this.nameTextBox.Size = new System.Drawing.Size(130, 20);
+            this.nameTextBox.TabIndex = 2;
+            // 
+            // nameLabel
+            // 
+            this.nameLabel.AutoSize = true;
+            this.nameLabel.Location = new System.Drawing.Point(30, 31);
+            this.nameLabel.Name = "nameLabel";
+            this.nameLabel.Size = new System.Drawing.Size(35, 13);
+            this.nameLabel.TabIndex = 1;
+            this.nameLabel.Text = "Name";
+            // 
+            // classNameLabel
+            // 
+            this.classNameLabel.AutoSize = true;
+            this.classNameLabel.Location = new System.Drawing.Point(137, 7);
+            this.classNameLabel.Name = "classNameLabel";
+            this.classNameLabel.Size = new System.Drawing.Size(83, 13);
+            this.classNameLabel.TabIndex = 0;
+            this.classNameLabel.Text = "ComonentName";
+            // 
+            // parityComboBox
+            // 
+            this.parityComboBox.Enabled = false;
+            this.parityComboBox.FormattingEnabled = true;
+            this.parityComboBox.Location = new System.Drawing.Point(140, 100);
+            this.parityComboBox.Name = "parityComboBox";
+            this.parityComboBox.Size = new System.Drawing.Size(130, 21);
+            this.parityComboBox.TabIndex = 8;
+            // 
+            // stopBitsComboBox
+            // 
+            this.stopBitsComboBox.Enabled = false;
+            this.stopBitsComboBox.FormattingEnabled = true;
+            this.stopBitsComboBox.Location = new System.Drawing.Point(140, 148);
+            this.stopBitsComboBox.Name = "stopBitsComboBox";
+            this.stopBitsComboBox.Size = new System.Drawing.Size(130, 21);
+            this.stopBitsComboBox.TabIndex = 12;
+            // 
+            // handshakeComboBox
+            // 
+            this.handshakeComboBox.Enabled = false;
+            this.handshakeComboBox.FormattingEnabled = true;
+            this.handshakeComboBox.Location = new System.Drawing.Point(140, 172);
+            this.handshakeComboBox.Name = "handshakeComboBox";
+            this.handshakeComboBox.Size = new System.Drawing.Size(130, 21);
+            this.handshakeComboBox.TabIndex = 14;
+            // 
+            // setDtrCheckBox
+            // 
+            this.setDtrCheckBox.AutoSize = true;
+            this.setDtrCheckBox.Enabled = false;
+            this.setDtrCheckBox.Location = new System.Drawing.Point(140, 201);
+            this.setDtrCheckBox.Name = "setDtrCheckBox";
+            this.setDtrCheckBox.Size = new System.Drawing.Size(89, 17);
+            this.setDtrCheckBox.TabIndex = 15;
+            this.setDtrCheckBox.Text = "Set DTR to 1";
+            this.setDtrCheckBox.UseVisualStyleBackColor = true;
+            // 
+            // AmbientCfgCtrl
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.SystemColors.Control;
+            this.Controls.Add(this.setDtrCheckBox);
+            this.Controls.Add(this.handshakeComboBox);
+            this.Controls.Add(this.stopBitsComboBox);
+            this.Controls.Add(this.parityComboBox);
+            this.Controls.Add(this.nameTextBox);
+            this.Controls.Add(this.nameLabel);
+            this.Controls.Add(this.classNameLabel);
+            this.Controls.Add(this.handshakeLabel);
+            this.Controls.Add(this.stopBitsLabel);
+            this.Controls.Add(this.dataBitsTextBox);
+            this.Controls.Add(this.dataBitsLabel);
+            this.Controls.Add(this.partityLabel);
+            this.Controls.Add(this.baudRateTextBox);
+            this.Controls.Add(this.baudRateLabel);
+            this.Controls.Add(this.comPortNrTextBox);
+            this.Controls.Add(this.label1);
+            this.Name = "AmbientCfgCtrl";
+            this.Size = new System.Drawing.Size(300, 240);
+            this.Load += new System.EventHandler(this.AbbientCfgCtrl_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
 		}
 
@@ -224,6 +237,7 @@ namespace TBF.BenchControl.Ambient.Comet
 		private System.Windows.Forms.ComboBox parityComboBox;
 		private System.Windows.Forms.ComboBox stopBitsComboBox;
 		private System.Windows.Forms.ComboBox handshakeComboBox;
+        private System.Windows.Forms.CheckBox setDtrCheckBox;
 
 	}
 }

TBF/BenchControl/Ambient/Comet/AmbientCfgCtrl.cs

@@ -110,6 +110,7 @@ namespace TBF.BenchControl.Ambient.Comet
 			dataBitsTextBox.Text = config.DataBits.ToString();
 			stopBitsComboBox.Text = config.StopBits.ToString();
 			handshakeComboBox.Text = config.Handshake.ToString();
+            setDtrCheckBox.Checked = config.SetDtrToOne;
 		}
 
 		public void Unlock()
@@ -121,6 +122,7 @@ namespace TBF.BenchControl.Ambient.Comet
 			dataBitsTextBox.Enabled = true;
 			stopBitsComboBox.Enabled = true;
 			handshakeComboBox.Enabled = true;
+            setDtrCheckBox.Enabled = true;
 		}
 
 		public CfgUpdateFlags UpdateCfg()
@@ -136,6 +138,7 @@ namespace TBF.BenchControl.Ambient.Comet
 			config.DataBits = int.Parse(dataBitsTextBox.Text);
 			config.StopBits = GetStopBits(stopBitsComboBox.SelectedItem.ToString());
 			config.Handshake = GetHandshake(handshakeComboBox.SelectedItem.ToString());
+            config.SetDtrToOne = setDtrCheckBox.Checked;
 
 			return flags;
 		}

TBF/BenchControl/BackupAndSecurity/Default/Component.cs

@@ -0,0 +1,38 @@
+///
+/// Copyright (c) 2019 Sensus Slovensko a.s.
+///
+using System;
+using Users;
+using log4net;
+
+namespace TBF.BenchControl.BackupAndSecurity.Default
+{
+	/// <summary>
+    /// Holds backup and security options.
+	/// </summary>
+	public class Component : ComponentBase, GenericDevices.IBackupAndSecurity
+	{
+        private static readonly ILog log = LogManager.GetLogger(typeof(Component));
+        public override string ToString() { return string.Format("BackupAndSecurity.Default({0})", Cfg.ToString(1)); }
+
+        readonly ComponentCfg myCfg;
+
+        public int MinPasswdLength { get { return myCfg.MinPasswdLength; } }
+        public int PasswdExpirationPeriodDays { get { return myCfg.PasswdExpirationPeriodDays; } }
+
+		public Component()
+		{
+		}
+
+		public Component(Generic.IComponentCfg cfg)
+			: base(cfg)
+		{
+			myCfg = cfg as ComponentCfg;
+
+            GlobalData.MinPasswdLength = myCfg.MinPasswdLength;
+            GlobalData.PasswdExpirationPeriodDays = myCfg.PasswdExpirationPeriodDays;
+
+            log.Debug(this.ToString());
+        }
+	}
+}

TBF/BenchControl/BackupAndSecurity/Default/ComponentCfg.cs

@@ -0,0 +1,125 @@
+///
+/// Copyright (c) 2019 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.Xml.Serialization;
+using Config.Entities;
+using TBF.BenchControl.Generic;
+
+namespace TBF.BenchControl.BackupAndSecurity.Default
+{
+	/// <summary>
+    /// Holds backup and security options - serializable configuration.
+	/// </summary>
+	public class ComponentCfg : ComponentCfgBase, Generic.IComponentCfg, Config.Entities.IParamsProvider
+	{
+		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ComponentCfg) })[0];
+        public override XmlSerializer GetSerializer() { return Serializer; }
+
+		public IComponentCfgCtrl GetControl() { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
+
+		///
+		/// Serialized parameters 
+		///
+		public int MinPasswdLength;
+		public int PasswdExpirationPeriodDays;	/// 0 = validity is not limited
+
+		/// Private parameterless constructor invoked by all other (public) constructors
+		ComponentCfg() {}
+
+        public ComponentCfg(IComponentFactory factory)
+            : this()
+        {
+            Factory = factory;
+            Name = "BackupAndSecurity";
+            ParentName = string.Empty;
+            InitializeAll();
+        }
+
+        public string ComponentName { get { return Name; } }
+
+ 		public void InitializeAll()
+		{
+			MinPasswdLength = 6;
+            PasswdExpirationPeriodDays = 0;
+        }
+
+        string[] paramNames = new string[]
+		{
+            "Minimum password length (characters)",
+            "Password expiration period (days)",
+        };
+        public string ParamName(int i) { return paramNames[i]; }
+        public int ParamsCount() { return paramNames.Length; }
+
+        public IList<string> ParamValues(int i)
+        {
+            return null;
+        }
+
+        public string ToString(int i)
+        {
+            if (i == -1)
+            {
+                return string.Format("{0}: Min. password length = {1} characters, Password expiration period = {2} days", Name, MinPasswdLength, PasswdExpirationPeriodDays);
+            }
+
+            switch (i)
+            {
+                case 0: return MinPasswdLength.ToString();
+                case 1: return PasswdExpirationPeriodDays.ToString();;
+                default: return string.Empty;
+            }
+        }
+
+        public CfgUpdateFlags UpdateParam(int i, string strValue)
+        {
+            switch (i)
+            {
+                case 0: MinPasswdLength = int.Parse(strValue); 			return CfgUpdateFlags.RestartRqrd;
+                case 1: PasswdExpirationPeriodDays = int.Parse(strValue); return CfgUpdateFlags.RestartRqrd;
+                default: return CfgUpdateFlags.None;
+            }
+        }
+
+        public bool ValidateParam(int i, string strValue, out string message)
+        {
+            message = string.Empty;
+            int idummy;
+
+            switch (i)
+            {
+                case 0:
+                case 1:
+				    /// Positive integers and zero are allowed
+                    if (int.TryParse(strValue, out idummy) && (idummy >= 0)) return true;
+                    break;
+                default:
+                    message = "Invalid index";
+                    return false;
+            }
+
+            message = ParamName(i) + " is invalid";
+            return false;
+        }
+
+        void CopyContentTo(ComponentCfg prms)
+        {
+            prms.MinPasswdLength = this.MinPasswdLength;
+            prms.PasswdExpirationPeriodDays = this.PasswdExpirationPeriodDays;
+        }
+
+        public Config.Entities.IParamsProvider Clone()
+        {
+            ComponentCfg pars = new ComponentCfg();
+            CopyContentTo(pars);
+            return pars;
+        }
+
+        public bool UpdateEmbeddedDbEntity()
+        {
+            return true;    /// =OK, do nothing
+        }
+    }
+}

TBF/BenchControl/BackupAndSecurity/Default/ComponentFactory.cs

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

TBF/BenchControl/ComponentBase.cs

@@ -20,7 +20,11 @@ namespace TBF.BenchControl
 		public int ItemNr { get { return cfg.ItemNr; } }
 		public DebugMode DebugLevel { get { return cfg.DebugLevel; } set { cfg.DebugLevel = value; } }
 		public LogLevel LogLevel { get { return cfg.LogLevel; } }
-		public IList<MeasurementCorrection> Corrections { get { return cfg.Corrections; } }
+		public IList<MeasurementCorrection> Corrections
+        {
+            get { return cfg.Corrections; }
+            set { cfg.Corrections = value; }
+        }
 
 
 		/// Constructor, components created in this way is used by

TBF/BenchControl/ComponentParametersDlg.Designer.cs

@@ -1,7 +1,7 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2015 Sensus Slovensko a.s.
 ///
-namespace TBF
+namespace TBF.BenchControl
 {
 	partial class ComponentParametersDlg
 	{
@@ -32,7 +32,7 @@ namespace TBF
 		private void InitializeComponent()
 		{
             this.splitContainer = new System.Windows.Forms.SplitContainer();
-            this.sharedButtons = new TBF.UiControls.SharedButtons();
+            this.sharedButtons = new TBF.UI.Shared.SharedButtons();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
             this.splitContainer.Panel2.SuspendLayout();
             this.splitContainer.SuspendLayout();
@@ -84,6 +84,6 @@ namespace TBF
 		#endregion
 
 		private System.Windows.Forms.SplitContainer splitContainer;
-		private UiControls.SharedButtons sharedButtons;
+		private TBF.UI.Shared.SharedButtons sharedButtons;
 	}
 }

TBF/BenchControl/ComponentParametersDlg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2015 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -7,10 +7,10 @@ using System.Windows.Forms;
 using Config.Entities;
 using TBF.BenchControl;
 using TBF.BenchControl.Generic;
-using TBF.UiControls;
 using TBF.Resources;
+using TBF.UI.Shared;
 
-namespace TBF
+namespace TBF.BenchControl
 {
 	public partial class ComponentParametersDlg : Form
 	{

TBF/BenchControl/DataEntry/Standard6/CycleEndForm.cs

@@ -134,7 +134,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
 
         private void batchRemarkButton_Click(object sender, EventArgs e)
         {
-            TBF.Forms.RemarkDlg dlg = new TBF.Forms.RemarkDlg() { Remark = ((BatchRemark == null) ? string.Empty : BatchRemark) };
+            TBF.UI.Shared.RemarkDlg dlg = new TBF.UI.Shared.RemarkDlg() { Remark = ((BatchRemark == null) ? string.Empty : BatchRemark) };
             if (dlg.ShowDialog() == DialogResult.OK)
             {
                 BatchRemark = dlg.Remark;

TBF/BenchControl/DataEntry/StandardCamera/TestStartEndForm.cs

@@ -471,17 +471,20 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
 		/// 
 		void UpdateExclamation(int uiCtrlPos)	/// uiCtrlPos = 0 .. TextBoxesCount-1
 		{
-			try
-			{
-				double startVolumeLtr = Utils.ParseUDouble(startTextBoxes[uiCtrlPos].Text) * regReaders[phys2wm[uiCtrlPos] - 1].LtrsPerPulse;
-				double endVolumeLtr = Utils.ParseUDouble(endTextBoxes[uiCtrlPos].Text) * regReaders[phys2wm[uiCtrlPos] - 1].LtrsPerPulse;
-				double err = 100.0 * (endVolumeLtr - startVolumeLtr - refVolume) / refVolume;
-				exclamations[uiCtrlPos].Visible = (err < warningLimLo) || (err > warningLimHi);
-			}
-			catch
-			{
-				exclamations[uiCtrlPos].Visible = false;
-			}
+            if ((mode == Tst.End) || (mode == Tst.Both))
+            {
+                try
+                {
+                    double startVolumeLtr = Utils.ParseUDouble(startTextBoxes[uiCtrlPos].Text) * regReaders[phys2wm[uiCtrlPos] - 1].LtrsPerPulse;
+                    double endVolumeLtr = Utils.ParseUDouble(endTextBoxes[uiCtrlPos].Text) * regReaders[phys2wm[uiCtrlPos] - 1].LtrsPerPulse;
+                    double err = 100.0 * (endVolumeLtr - startVolumeLtr - refVolume) / refVolume;
+                    exclamations[uiCtrlPos].Visible = (err < warningLimLo) || (warningLimHi < err);
+                }
+                catch
+                {
+                    exclamations[uiCtrlPos].Visible = false;
+                }
+            }
 		}
 
 

TBF/BenchControl/Dummy/Balance/Component.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016-2017 Sensus Metering Systems
+/// Copyright (c) 2016-2017 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -40,19 +40,19 @@ namespace TBF.BenchControl.Dummy.Balance
         public float BuoyancyPress { get { return 1.013f; } }
         public float BuoyancyHumi { get { return 50.0f; } }
 
-        public IOperation TaringOp(ref TBF.Boxes.DoubleBox tara)
+        public IOperation TaringOp(ref Boxes.DoubleBox tara)
         {
             tara.Val = 0;
             return this;
         }
 
-        public IOperation ReadMassOp(ref TBF.Boxes.DoubleBox mass)
+        public IOperation ReadMassOp(ref Boxes.DoubleBox mass)
         {
             mass.Val = 0;
             return this;
         }
 
-		public IOperation ReadStableMassOp(ref TBF.Boxes.DoubleBox mass, int readingsCount, double maxSpread, Config.Entities.MassMethod method)
+		public IOperation ReadStableMassOp(ref Boxes.DoubleBox mass, int readingsCount, double maxSpread, Config.Entities.MassMethod method)
         {
             mass.Val = 0;
             return this;

TBF/BenchControl/Dummy/Diverter/Component.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using log4net;
 using Config.Entities;
 using TBF.BenchControl.GenericDevices;
+using TBF.Boxes;
 
 namespace TBF.BenchControl.Dummy.Diverter
 {
@@ -17,6 +18,11 @@ namespace TBF.BenchControl.Dummy.Diverter
             return string.Format("{0}({1})", this.GetType().Namespace.Substring(17), Cfg.ToString(1));
         }
 
+        FloatBox switchTimeStart;
+        FloatBox switchTimeEnd;
+        public FloatBox SwitchTimeStart { get { return switchTimeStart; } }
+        public FloatBox SwitchTimeEnd { get { return switchTimeEnd; } }
+
         public Component()
         {
         }
@@ -24,6 +30,8 @@ namespace TBF.BenchControl.Dummy.Diverter
         public Component(Generic.IComponentCfg cfg)
             : base(cfg)
         {
+            switchTimeStart = new FloatBox();
+            switchTimeEnd = new FloatBox();
             log.Debug(this.ToString());
         }
 

TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.cs

@@ -2,11 +2,11 @@
 /// Copyright (c) 2017 Sensus Metering Systems
 ///
 using System;
-using System.Globalization;
 using System.Windows.Forms;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
+
 namespace TBF.BenchControl.Dummy.FlowMeter
 {
 	public partial class FlowMeterCfgCtrl : UserControl, IComponentCfgCtrl

TBF/BenchControl/Elde/Common.cs

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

TBF/BenchControl/Elde/ControlBoardDev.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2017 Sensus Metering Systems
+/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
 ///
 using System;
 using System.Text;
@@ -18,6 +18,8 @@ namespace TBF.BenchControl.Elde
         private static readonly ILog log = LogManager.GetLogger(typeof(ControlBoardDev));
 		public override string ToString() { return string.Format("ControlBoard({0})", Cfg.ToString(1)); }
 
+        const int FiltersCount = 8;
+
 		readonly ControlBoardCfg controlBoardCfg;
 
 		///
@@ -43,7 +45,9 @@ namespace TBF.BenchControl.Elde
 		public StatusP StatusP                      { get { return controlCom.StatusP; } }
 		public int EtPulses(int wmNr1)                    { return controlCom.EtPulses(wmNr1); }
         public int EtPulsesK                        { get { return controlCom.EtPulsesK; } }
-		public UInt16 WMeterPulses(int wmNr1)             { return controlCom.WMeterPulses(wmNr1); }
+        public int EtPulses2                        { get { return controlCom.EtPulses2; } }            /// DEWA_300: pulses from I12
+        public int EtPulses3                        { get { return controlCom.EtPulses3; } }            /// DEWA_300: pulses from I13
+        public UInt16 WMeterPulses(int wmNr1)             { return controlCom.WMeterPulses(wmNr1); }
 		public int WMeterReference(int wmNr0)             { return controlCom.WMeterReference(wmNr0); }
 		public uint RegulValveDAC(int rvNr0)              { return controlCom.RegulValveDAC(rvNr0); }
 		public float Pressure(int prsNr0)                 { return controlCom.Pressure(prsNr0); }
@@ -77,48 +81,22 @@ namespace TBF.BenchControl.Elde
         bool previousEmergencyStop;
 
 
-
-		private int flowmeterNr4DiverterTest;
-		private bool scheduleDiverterToTank;
-		private bool scheduleDiverterToSink;
-		private bool scheduleReadDiverterTransition;
-		private bool pumpPowerChanged;
-		/// 
-		public void DiverterToTank(int flowmeterNr)
+        public void DiverterToTank(int flowMtrNr)
 		{
-			if (!scheduleDiverterToSink && !scheduleReadDiverterTransition && !emergencyStop)
-			{
-				flowmeterNr4DiverterTest = flowmeterNr;
-				scheduleDiverterToTank = true;
-			}
+            cbCommandQueue.Enqueue(new SendCommandArgs(Command.Start, flowMtrNr, int.MaxValue, int.MaxValue, TestMethods.Diverter | TestMethods.Synchro, StopDevs.None));
 		}
 		///
-		public void DiverterToSink(int flowmeterNr)
+		public void DiverterToSink(int flowMtrNr)
 		{
-			if (!scheduleDiverterToTank && !scheduleReadDiverterTransition && !emergencyStop)
-			{
-				flowmeterNr4DiverterTest = flowmeterNr;
-				scheduleDiverterToSink = true;
-			}
+            cbCommandQueue.Enqueue(new SendCommandArgs(Command.Stop, 0, 0, 0, TestMethods.Diverter,
+                                                       StopDevs.Diverter | StopDevs.GatePulse | StopDevs.Reference | StopDevs.RegValveRegulation));
 		}
 		///
-		public void ReadDiverterTransition(int flowmeterNr)
+		public void ReadDiverterTransition(int flowMtrNr)
 		{
-			if (!scheduleDiverterToTank && !scheduleDiverterToSink && !emergencyStop)
-			{
-				flowmeterNr4DiverterTest = flowmeterNr;
-				scheduleReadDiverterTransition = true;
-			}
+            cbCommandQueue.Enqueue(new SendCommandArgs(Command.ReadDivTransition, flowMtrNr, 0, 0, TestMethods.Diverter, 0));
 		}
 
-
-
-        /// <summary> State of valves sent out - buffered by the last SendCommand() </summary>
-        public UInt128 Route { get { return benchModelRoute; } }
-
-        UInt128 valvesToInvert;			/// Route = valesToInvert ^ RequiredRouteWithoutInvertedVlaves
-        readonly UInt128 routeMask;		/// This mask masks out virtual valves, routeMask is set in the constructor 
-
         ///
         /// Initialization data updated by constructors of children components
         /// and sent to 'controlCom2panel' by SendCalibData() method.
@@ -150,7 +128,7 @@ namespace TBF.BenchControl.Elde
 														 {100,500}, {100,500}, {100,500}, {100,500} };
         public byte[] MeretRS485Address = new byte[4];
         public float[] EtCalib = new float[8] { 1, 1, 1, 1, 1, 1, 1, 1 };
-#elif MUNICH || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TORUN_50 || CEVAK_40 || TURA_IPERL || TURA_SPECIAL || MURES_40 || FUZHOU_50 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || FUZHOU_100
+#elif MUNICH || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TORUN_50 || CEVAK_40 || TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || MURES_40 || FUZHOU_50 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || FUZHOU_100 || ALZIR_25
         public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}};
 		public byte[] MeretRS485Address = new byte[4];
 		public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 };
@@ -175,21 +153,22 @@ namespace TBF.BenchControl.Elde
 		public uint[] BalanceRange = new uint[2];
 
 
-        ///
-        /// Private values sent by the last SendCommand()
-        ///
-        bool sendCommandFlag;
-        Command cmd;
-        int refNr;
+
+        Queue<SendCommandArgs> cbCommandQueue;
+
+        /// <summary>
+        /// Route: 128-bit word representing the current state of all valves and pumps
+        /// </summary>
+        public UInt128 Route { get { return benchModelRoute; } }
         UInt128 benchModelRoute;
-        int totalRefPulses;
-		int massRefPulses;
-		TestMethods testMethods;
+        UInt128 valvesToInvert;			/// Route = valesToInvert ^ RequiredRouteWithoutInvertedVlaves
+        readonly UInt128 routeMask;		/// This mask masks out virtual valves, routeMask is set in the constructor 
+
         int[] filters;
         float[] FMFreq;
         int regConst;
         int shortImp;
-        StopDevs stopDevs;
+
 
 
         /// <summary>
@@ -212,6 +191,8 @@ namespace TBF.BenchControl.Elde
         /// <param name="power">Power (0.0f .. 100.0f)</param>
         public void SetFMFreq(int index, float power)
         {
+            bool pumpPowerChanged = false;
+
 #if DN100 || MUNICH || FUZHOU_150
             if ((FMFreq == null) || (FMFreq.Length != 2))
 			{
@@ -232,20 +213,27 @@ namespace TBF.BenchControl.Elde
 			}
 #endif
 
-			if (index >= 0 && index < FMFreq.Length && FMFreq[index] != power)
-			{
-				FMFreq[index] = power;
+            if (index >= 0 && index < FMFreq.Length)
+            {
+                if (FMFreq[index] != power)
+                {
+                    FMFreq[index] = power;
 
-				pumpPowerChanged = true;	/// Forces sending a command using Command.None
+                    pumpPowerChanged = true;	/// Forces sending a command using Command.None
 
-				log.DebugFormat("FMFreq=[{0}{1}{2}{3}{4}{5}]",
-								FMFreq[0].ToString(),
-								(FMFreq.Length > 1) ? ("," + FMFreq[1].ToString()) : "",
-								(FMFreq.Length > 2) ? ("," + FMFreq[2].ToString()) : "",
-								(FMFreq.Length > 3) ? ("," + FMFreq[3].ToString()) : "",
-								(FMFreq.Length > 4) ? ("," + FMFreq[4].ToString()) : "",
-								(FMFreq.Length > 5) ? ("," + FMFreq[5].ToString()) : "");
-			}
+                    string s = string.Format("FMFreq=[{0}{1}{2}{3}{4}{5}]", FMFreq[0].ToString(),
+                                                                            (FMFreq.Length > 1) ? ("," + FMFreq[1].ToString()) : "",
+                                                                            (FMFreq.Length > 2) ? ("," + FMFreq[2].ToString()) : "",
+                                                                            (FMFreq.Length > 3) ? ("," + FMFreq[3].ToString()) : "",
+                                                                            (FMFreq.Length > 4) ? ("," + FMFreq[4].ToString()) : "",
+                                                                            (FMFreq.Length > 5) ? ("," + FMFreq[5].ToString()) : "");
+                    log.Warn(s);
+                }
+            }
+            else
+            {
+                log.ErrorFormat("Wrong FM pump: index = {0}, power = {1}", index, power);
+            }
         }
 
 
@@ -290,6 +278,9 @@ namespace TBF.BenchControl.Elde
         {
 			controlBoardCfg = cfg as ControlBoardCfg;
 
+            cbCommandQueue = new Queue<SendCommandArgs>();
+            lastSentFilters = new uint[FiltersCount];
+
 #if DN100 || MUNICH || FUZHOU_150
             FMFreq = new float[2] { 0, 0 };                 /// Nr. of pumps: Fuzhou150=2, Fuzhou300=6, newer=6
 #elif SLM_END || WARSAW_END
@@ -328,7 +319,7 @@ namespace TBF.BenchControl.Elde
 #else /// all newer benches
 			ControlComponent_Torino2015.UserControl1 ctrlBrdComponent,
 #endif
- UInt128 valvesToInvert,
+            UInt128 valvesToInvert,
             double[] tankCapacities)
         {
             this.valvesToInvert = valvesToInvert;
@@ -377,7 +368,9 @@ namespace TBF.BenchControl.Elde
             log.FatalFormat("Successfully initialized device {0}", ToString());
         }
 
-		/// <summary>Run this device</summary>
+		/// <summary>
+        /// Run this device
+        /// </summary>
 		public void RunDeviceBefore()
 		{
             if (DebugLevel == DebugMode.Simulate) return;
@@ -398,95 +391,99 @@ namespace TBF.BenchControl.Elde
             {
                 UiBridge.Bridge.OnEmergencyStopChanged(this,UiBridge.EmergencyStopEventArgs.State.CloseForm);
             }
-
-            if (emergencyStop)
-            {
-                /// SendCommand() arguments to clear the emergency stop state
-                sendCommandFlag = true;
-                this.refNr = 0;
-                this.totalRefPulses = 0;
-				this.massRefPulses = 0;
-				this.cmd = Command.Stop;
-                this.testMethods = 0;
-                this.stopDevs = StopDevs.All;
-            }
-            else if (scheduleDiverterToTank)
-            {
-                /// Reset all SendCommand() arguments
-                sendCommandFlag = true;
-                this.cmd = Command.Start;
-                this.refNr = flowmeterNr4DiverterTest;
-                this.totalRefPulses = int.MaxValue;
-				this.massRefPulses = int.MaxValue;
-				this.testMethods = TestMethods.Diverter;
-                this.stopDevs = 0;
-				scheduleDiverterToTank = false;
-			}
-			else if (scheduleDiverterToSink)
-			{
-				/// Reset all SendCommand() arguments
-				sendCommandFlag = true;
-				this.cmd = Command.Stop;
-                this.refNr = flowmeterNr4DiverterTest;
-                this.totalRefPulses = 0;
-				this.massRefPulses = 0;
-				this.testMethods = TestMethods.Diverter;
-                this.stopDevs = StopDevs.Diverter;
-				scheduleDiverterToSink = false;
-			}
-			else if (scheduleReadDiverterTransition)
-			{
-				/// Reset all SendCommand() arguments
-				sendCommandFlag = true;
-				this.cmd = Command.ReadDivTransition;
-                this.refNr = flowmeterNr4DiverterTest;
-                this.totalRefPulses = 0;
-				this.massRefPulses = 0;
-				this.testMethods = TestMethods.Diverter;
-                this.stopDevs = 0;
-				scheduleReadDiverterTransition = false;
-			}
-			else if (pumpPowerChanged)
-			{
-				/// Reset all SendCommand() arguments
-				sendCommandFlag = true;
-				this.cmd = Command.None;
-				pumpPowerChanged = false;
-			}
-			else
-            {
-                /// Reset all SendCommand() arguments
-                sendCommandFlag = false;
-                this.cmd = Command.None;
-                this.refNr = 0;
-                this.totalRefPulses = 0;
-				this.massRefPulses = 0;
-				this.testMethods = 0;
-                this.stopDevs = 0;
-            }
-
-            if (this.filters == null) this.filters = new int[] { 0, 0, 0, 0, 0, 0, 0, 0, };
 		}
 
-		/// <summary>Run this device</summary>
+        ///
+        /// Used in RunDeviceAfter() when sending commands
+        ///
+        UInt128 lastSentRoute;
+        uint[] lastSentFilters;
+        float[] lastSentFMFreq;
+        int lastsentRegConst;
+        int lastSentShortImp;
+
+		/// <summary>
+        /// Run this device
+        /// </summary>
         public void RunDeviceAfter()
         {
             if (DebugLevel == DebugMode.Simulate) return;
 
             UpdateWeights();
 
-            uint[] uintFilters = new uint[8];
-            for (int i = 0; i < 8; i++)
+            /// Modify queue in case of emergency stop
+            if (emergencyStop && !previousEmergencyStop)
             {
-                uintFilters[i] = (filters.Length > i) ? (uint)filters[i] : uintFilters[i - 1];
+                /// SendCommand() arguments to clear the emergency stop state
+                cbCommandQueue.Clear();
+                cbCommandQueue.Enqueue(new SendCommandArgs(Command.Stop, 0, 0, 0, 0, StopDevs.All));
             }
 
-            ///
-            if (sendCommandFlag)
+            /// Prepare uintFilters array and evaluate changes
+            uint[] uintFilters = new uint[FiltersCount];
+            uintFilters[0] = (filters != null && filters.Length > 0) ? (uint)filters[0] : 0;
+            bool filtersAreDifferent = (uintFilters[0] != lastSentFilters[0]);
+            for (int i = 1; i < FiltersCount; i++)
             {
-                controlCom.SendCommand(cmd, refNr, (benchModelRoute & routeMask),
-									   totalRefPulses, massRefPulses, testMethods,
-                                       uintFilters, FMFreq, regConst, shortImp, stopDevs);
+                uintFilters[i] = (filters != null && filters.Length > i) ? (uint)filters[i] : uintFilters[i - 1];
+                filtersAreDifferent |= (uintFilters[i] != lastSentFilters[i]);
+            }
+
+            /// Evaluate FMFreq changes
+            bool fmFreqsAreDifferent = false;
+            if ((FMFreq == null) || (lastSentFMFreq == null) || (FMFreq.Length != lastSentFMFreq.Length))
+            {
+                fmFreqsAreDifferent = true;
+            }
+            else
+            {
+                for (int i = 0; i < FMFreq.Length; i++)
+                {
+                    if (FMFreq[i] != lastSentFMFreq[i])
+                    {
+                        fmFreqsAreDifferent = true;
+                        break;
+                    }
+                }
+            }
+
+            if (cbCommandQueue.Count > 0)
+            {
+                /// 
+                /// There is a command in the queue
+                /// 
+                controlCom.SendCommand(cbCommandQueue.Dequeue(), (benchModelRoute & routeMask), uintFilters, FMFreq, regConst, shortImp);
+                
+                lastSentRoute = (benchModelRoute & routeMask);
+                lastsentRegConst = regConst;
+                lastSentShortImp = shortImp;
+
+                /// Deep copy of arrays lastSentFilters and lastSentFMFreq
+                if ((lastSentFilters == null) || (lastSentFilters.Length != uintFilters.Length)) lastSentFilters = new uint[(uintFilters == null) ? 0 : uintFilters.Length];
+                for (int i = 0; i < lastSentFilters.Length; i++) lastSentFilters[i] = uintFilters[i];                
+                if ((lastSentFMFreq == null) || (lastSentFMFreq.Length != FMFreq.Length)) lastSentFMFreq = new float[(FMFreq == null) ? 0 : FMFreq.Length];
+                for (int i = 0; i < lastSentFMFreq.Length; i++) lastSentFMFreq[i] = FMFreq[i];                
+            }
+            else if (((benchModelRoute & routeMask) != lastSentRoute) ||
+                     filtersAreDifferent ||
+                     fmFreqsAreDifferent ||
+                     (lastsentRegConst != regConst) ||
+                     (lastSentShortImp != shortImp))
+            {
+                /// 
+                /// Command queue is mepty, but 'route', pump frequency, PID coef., filters or shortImp have changed
+                /// 
+                controlCom.SendCommand(new SendCommandArgs(Command.None, 0, 0, 0, 0, 0), (benchModelRoute & routeMask), uintFilters, FMFreq, regConst, shortImp);
+
+                lastSentRoute = (benchModelRoute & routeMask);
+                lastsentRegConst = regConst;
+                lastSentShortImp = shortImp;
+
+                /// Deep copy of arrays lastSentFilters and lastSentFMFreq
+                if ((lastSentFilters == null) || (lastSentFilters.Length != uintFilters.Length)) lastSentFilters = new uint[(uintFilters == null) ? 0 : uintFilters.Length];
+                for (int i = 0; i < lastSentFilters.Length; i++) lastSentFilters[i] = uintFilters[i];
+                if ((lastSentFMFreq == null) || (lastSentFMFreq.Length != FMFreq.Length)) lastSentFMFreq = new float[(FMFreq == null) ? 0 : FMFreq.Length];
+                for (int i = 0; i < lastSentFMFreq.Length; i++) lastSentFMFreq[i] = FMFreq[i];
             }
 
             controlCom.RunDeviceAfter();
@@ -501,7 +498,7 @@ namespace TBF.BenchControl.Elde
         /// 
         void ShowEmergencyStopForm()
         {
-            (new TBF.Forms.EmergencyStopForm()).Show();
+            (new TBF.UI.Shared.EmergencyStopForm()).Show();
         }
 
 
@@ -510,25 +507,17 @@ namespace TBF.BenchControl.Elde
         /// </summary>
         /// <param name="cmd">See ControlBoard.Command enum</param>
         /// <param name="refFlowmtrNr">Number of the etalon/reference (1..5)</param>
-        /// <param name="route">Route: 64-bit installation specific number</param>
+        /// <param name="route">State of valves, 128-bit word</param>
         /// <param name="totalRefPulses">kolko impulzov ma trvat skuska</param>
         /// <param name="testMethods">See ControlBoard.TestMethods enum</param>
         /// <param name="filterConstant">0 = No filtering (0..255)</param>
         /// <param name="regConst">Coefficient used to control reg. valves (1..100)</param>
         /// <param name="shortImp">0 = default value, 1 = spec. processing of very short pulses</param>
 		/// <param name="stopDevs">What to stop</param>
-		public void SendCommand(Command cmd, int refFlowmtrNr, UInt128 route,
-								int totalRefPulses, int massRefPulses, TestMethods testMethods, StopDevs stopDevs)
+		public void SendCommand(Command cmd, int refFlowmtrNr, int totalRefPulses, int massRefPulses,
+                                TestMethods testMethods, StopDevs stopDevs)
         {
-            this.cmd = cmd;
-            this.refNr = refFlowmtrNr;
-            this.benchModelRoute = route;
-            this.totalRefPulses = totalRefPulses;
-			this.massRefPulses = massRefPulses;
-			this.testMethods = testMethods;
-            this.stopDevs = stopDevs;
-
-            sendCommandFlag = true;
+            cbCommandQueue.Enqueue(new SendCommandArgs(cmd, refFlowmtrNr, totalRefPulses, massRefPulses, testMethods, stopDevs));
         }
 
         /// <summary>
@@ -543,7 +532,6 @@ namespace TBF.BenchControl.Elde
             benchModelRoute = (((benchModelRoute ^ valvesToInvert) | valvesToOpen) & (~valvesToClose)) ^ valvesToInvert;
 			foreach (var extV in extendedValves) extV.UpdateRoute(ref benchModelRoute);
 			log.DebugFormat("SetValves(x,x), new route = {0}", Utils.RouteToStr(benchModelRoute));
-			sendCommandFlag = true;
             return oldRoute ^ benchModelRoute;
         }
 
@@ -652,7 +640,7 @@ namespace TBF.BenchControl.Elde
         /// <param name="testName">Test name (without repetitions)</param>
         /// <param name="repetition">Repetition number</param>
         /// <returns>Created operation</returns>
-        public IOperation ReadDiverterTransitionOp(IDiverter div, int runsCountWhenSendingCmd, int runsCountWhenReadingDiv, TBF.Boxes.FloatBox transitionTimeSec,
+        public IOperation ReadDiverterTransitionOp(IDiverter div, int runsCountWhenSendingCmd, int runsCountWhenReadingDiv, bool toTank,
                                                    Sequences.Statistics plotter, int batchNr, string testName, int repetition)
         {
             if (controlBoardCfg.DebugLevel == DebugMode.Simulate)
@@ -661,7 +649,7 @@ namespace TBF.BenchControl.Elde
             }
             else
             {
-                return new ReadDiverterTransitionOp(this, div, runsCountWhenSendingCmd, runsCountWhenReadingDiv, transitionTimeSec, plotter, batchNr, testName, repetition);
+                return new ReadDiverterTransitionOp(this, div, runsCountWhenSendingCmd, runsCountWhenReadingDiv, toTank, plotter, batchNr, testName, repetition);
             }
         }
 

TBF/BenchControl/Elde/ControlComSim.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -28,6 +28,8 @@ namespace TBF.BenchControl.Elde
 		}
 
         public int EtPulsesK { get { return 1; } }
+        public int EtPulses2 { get { return 0; } }
+        public int EtPulses3 { get { return 0; } }
 
 		double[] errFactor = new double[Config.Data.WMsCount + 1];		/// Internal
 		double[] wMeterPulsesF = new double[Config.Data.WMsCount + 1];	/// Internal
@@ -167,7 +169,7 @@ namespace TBF.BenchControl.Elde
 		/// </summary>
 		/// <param name="cmd">See ControlBoard.Command enum</param>
 		/// <param name="refFlowmtrNr">Number of the etalon/reference (1..5)</param>
-		/// <param name="route">Route: 64-bit installation specific number</param>
+		/// <param name="route">State of valves, 128-bit word</param>
 		/// <param name="refPulses">kolko impulzov ma trvat skuska</param>
 		/// <param name="testMethods">See ControlBoard.TestMethods enum</param>
 		/// <param name="filterConstant">0 = No filtering (0..255)</param>
@@ -175,17 +177,15 @@ namespace TBF.BenchControl.Elde
 		/// <param name="regConst">Coefficient used to control reg. valves (1..100)</param>
 		/// <param name="shortImp">0 = default value, 1 = spec. processing of very short pulses</param>
 		/// <param name="stopDevs">What to stop</param>
-		public void SendCommand(Command cmd, int refFlowmtrNr, UInt128 route,
-								int totalRefPulses, int massRefPulses, TestMethods testMethods,
-								uint[] filterConstants, float[] fmFreq, int regConst, int shortImp, StopDevs stopDevs)
+        public void SendCommand(SendCommandArgs sendCommandArgs, UInt128 route, uint[] filterConstants, float[] fmFreq, int regConst, int shortImp)
 		{
 			log.InfoFormat("SendCommand(Cmd={0},Ref#={1},Route={2} {3} {4} {5},TotalPls={6},MassPls={7},TstM={8},filt={9},FM=[{10}{11}{12}{13}{14}{15}],Reg={16},ShrtImp={17},Stop={18})",
-							cmd, refFlowmtrNr,												/// 0, 1
-							((route >> 48) & 0xFFFF).ToString("X4"),						/// 2
-							((route >> 32) & 0xFFFF).ToString("X4"),						/// 3
-							((route >> 16) & 0xFFFF).ToString("X4"),						/// 4
-							(route & 0xFFFF).ToString("X4"),								/// 5
-							totalRefPulses, massRefPulses, testMethods, filterConstants,		/// 6, 7, 8, 9
+                            sendCommandArgs.Cmd, sendCommandArgs.RefFlowmtrNr,				/// 0, 1
+                            ((route >> 48) & 0xFFFF).ToString("X4"),		                /// 2
+                            ((route >> 32) & 0xFFFF).ToString("X4"),		                /// 3
+                            ((route >> 16) & 0xFFFF).ToString("X4"),		                /// 4
+                            (route & 0xFFFF).ToString("X4"),				                /// 5
+							totalRefPulses, massRefPulses, testMethods, filterConstants,	/// 6, 7, 8, 9
 							fmFreq[0].ToString(),											/// 10
 							(fmFreq.Length > 1) ? ("," + fmFreq[1].ToString()) : "",		/// 11
 							(fmFreq.Length > 2) ? ("," + fmFreq[2].ToString()) : "",		/// 12
@@ -197,8 +197,8 @@ namespace TBF.BenchControl.Elde
 			/// Simulation
 			///
 			Command lastCmd = this.cmd;
-			this.cmd = cmd;
-			this.refFlowmtrNr = refFlowmtrNr;
+            this.cmd = sendCommandArgs.Cmd;
+            this.refFlowmtrNr = sendCommandArgs.RefFlowmtrNr;
 
 #if FUZHOU_300
 			///
@@ -212,14 +212,14 @@ namespace TBF.BenchControl.Elde
 			log.DebugFormat("SendCommand route = {0}", Utils.RouteToStr(route));
 #endif
             TestBenchSim.SimRoute = this.simRoute = route;
-			this.totalRefPulses = totalRefPulses;
-			this.massRefPulses = massRefPulses;
-			this.testMethods = testMethods;
-			this.filterConstants = filterConstants;
+            this.totalRefPulses = sendCommandArgs.TotalRefPulses;
+            this.massRefPulses = sendCommandArgs.MassRefPulses;
+            this.testMethods = sendCommandArgs.TestMethods;
+            this.stopDevs = sendCommandArgs.StopDevs;
+            this.filterConstants = filterConstants;
 			this.FMFreq = fmFreq;
 			this.regConst = regConst;
 			this.shortImp = shortImp;
-			this.stopDevs = stopDevs;
 
 #pragma warning disable
             statusP = (StatusP)(((ulong)statusP & (ulong)0xFFFFFFFFFFFFFFF8L) | (ulong)refFlowmtrNr);

TBF/BenchControl/Elde/ControlComWrap.cs

@@ -20,25 +20,24 @@ namespace TBF.BenchControl.Elde
 		public StatusP StatusP { get { return (StatusP)ctrlBrdComponent.StatusP; } }
 
 #if DN100 || MUNICH || FUZHOU_150
-        public double ReferenceFreq { get { return 1000.0f * ctrlBrdComponent.referenceFreq; } }     /// In [Hz] 0..2500, nom.=2000
+        public double ReferenceFreq { get { return 1000.0f * ctrlBrdComponent.referenceFreq; } }     /// Returns in [Hz] 0..2500, nom.=2000
         public double ReferenceFreqs(int i) { return 0; }
-#else /// all newer benches
+#else
+        /// All newer benches
+        public double ReferenceFreq { get { return 1000.0 * ctrlBrdComponent.referenceFreq[0]; } }  /// Returns in [Hz] 0..2500, nom.=2000
+                                                                                                    /// 
         /// <summary>
         /// In case of I11, I12
-        ///     referenceFreq[0] = I11 + I12
-        ///     referenceFreq[1] = I11
-        ///     referenceFreq[2] = I12
+        ///     cBrd.referenceFreq[0] = I11 + I12
+        ///     cBrd.referenceFreq[1] = I11
+        ///     cBrd.referenceFreq[2] = I12
         /// otherwise
-        ///     referenceFreq[0] = I2 or I3 or I4
+        ///     cBrd.referenceFreq[0] = I2 or I3 or I4
         /// </summary>
-        public double ReferenceFreq { get { return 1000.0 * ctrlBrdComponent.referenceFreq[0]; } }  /// In [Hz] 0..2500, nom.=2000                                                                                                    /// 
+        /// <returns>Reference frequency in Hz</returns>
         public double ReferenceFreqs(int i)
         {
-            if ((i >= 0) && (i < ctrlBrdComponent.referenceFreq.Length))
-            {
-                return 1000.0 * ctrlBrdComponent.referenceFreq[0];  /// In [Hz] 0..2500, nom.=2000
-            }
-            else return 0;
+            return ((i >= 0) && (i < ctrlBrdComponent.referenceFreq.Length)) ? (1000.0 * ctrlBrdComponent.referenceFreq[i]) : 0;
         }
 #endif
 
@@ -50,6 +49,13 @@ namespace TBF.BenchControl.Elde
         public int EtPulsesK { get { return (int)ctrlBrdComponent.etPulsesK; }  }
 #endif
 
+#if DEWA_300
+        public int EtPulses2 { get { return (int)ctrlBrdComponent.EtPulses2; } }
+        public int EtPulses3 { get { return (int)ctrlBrdComponent.EtPulses3; } }
+#else
+        public int EtPulses2 { get { return 0; } }
+        public int EtPulses3 { get { return 0; } }
+#endif
         public UInt16 WMeterPulses(int wmNr1) { return (UInt16)ctrlBrdComponent.wMeterPuls[wmNr1]; }
 		public int WMeterReference(int wmNr0) { return (int)ctrlBrdComponent.wMeterReference[wmNr0]; }
 
@@ -63,7 +69,7 @@ namespace TBF.BenchControl.Elde
         }
 
 		public float Pressure(int prsNr0) { return ctrlBrdComponent.pressure[prsNr0]; }
-		public float Temperature(int tmpNr0) { return ctrlBrdComponent.temperature[tmpNr0]; }
+        public float Temperature(int tmpNr0) { return (tmpNr0 >= 0 && tmpNr0 < ctrlBrdComponent.temperature.Length) ? ctrlBrdComponent.temperature[tmpNr0] : 0; }
 		public RegulValveState RegulValveState(int rvNr1) { return (RegulValveState)ctrlBrdComponent.rValveStatus[rvNr1 - 1]; }
 #if GENESIS || BERLIN || PETERSBURG_200 || DEWA_300
 		public UInt128 RRoute { get { return ((UInt128)ctrlBrdComponent.rRouteH << 64) | (UInt128)ctrlBrdComponent.rRoute; } }
@@ -71,7 +77,7 @@ namespace TBF.BenchControl.Elde
         public UInt128 RRoute { get { return ctrlBrdComponent.rRoute; } }
 #endif
 
-#if GENESIS || KEMPNO_50 || KRAKOW_50 || BAHRAIN_50 || BADGER_STREDNA_TRAT || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50 || DEWA_300 || PUCHONG_200
+#if GENESIS || KEMPNO_50 || KRAKOW_50 || BAHRAIN_50 || BADGER_STREDNA_TRAT || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50 || DEWA_300 || PUCHONG_200 || TURA_IPERL_NEW || ALZIR_25
         public uint DivTime(int id) { return ctrlBrdComponent.divTime[id]; }
         public void SetDivLimit(int divNo, uint limLoPct, uint limHiPct)
         {
@@ -131,7 +137,7 @@ namespace TBF.BenchControl.Elde
 		public uint[] WMeterCont { get { return new uint[3]; } }				/// Dummy
 #endif
 
-#if KEMPNO_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || FUZHOU_100 || CEVAK_200 || IZRAEL_50
+#if KEMPNO_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || FUZHOU_100 || CEVAK_200 || IZRAEL_50 || ALZIR_25
 		public float ValveOpenCloseTime { get { return ctrlBrdComponent.ValveMoveTime[0]; } }
 #else
         public float ValveOpenCloseTime { get { return 0.001f; } }
@@ -254,7 +260,7 @@ namespace TBF.BenchControl.Elde
 
             ctrlBrdComponent.ExternalCom = true;
 
-#if SENTEC || CEVAK_200 || FUZHOU_100 || IZRAEL_25
+#if SENTEC || CEVAK_200 || FUZHOU_100 || IZRAEL_25 || ALZIR_25
             ctrlBrdComponent.SendCalibData(rvCalib, meretA, (byte)usedCom, tempCalib, etCalib, divEdge, balanceRange, meretProtocol);
 #else
             ctrlBrdComponent.SendCalibData(rvCalib, meretA, (byte)usedCom, tempCalib, etCalib, divEdge, balanceRange);
@@ -301,63 +307,35 @@ namespace TBF.BenchControl.Elde
 		/// <summary>
 		/// Sends a command to the control board.
 		/// </summary>
-		/// <param name="cmd">See ControlBoard.Command enum</param>
-		/// <param name="refFlowMeterNr">Reference flow meter number (1..5)</param>
-		/// <param name="route">Route: 64-bit installation specific number</param>
-		/// <param name="refPulses">Test duration as a number of reference flow meter pulses</param>
-		/// <param name="testMethods">See ControlBoard.TestMethods enum</param>
-		/// <param name="filterConstants">0 = No filtering (0..255)</param>
-		/// <param name="FMFreq">Freq.inverter control (not applicable in DT100, Munich)</param>
-		/// <param name="regConst">Coefficient used to control the regulation valve (1..100)</param>
+        /// <param name="sendCommandArgs">Arguments</param>
+        /// <param name="route">State of valves, 128-bit word</param>
+        /// <param name="filterConstants">Array with length=8 of filter costants (0..255, 0 = no filtering)</param>
+		/// <param name="fmFreq">Freq.inverter control (not applicable in DT100, Munich)</param>
+		/// <param name="regConst">PID coefficient for flow control</param>
 		/// <param name="shortImp">0 = default value, 1 = spec. processing of very short pulses</param>
-		/// <param name="stopDevs">What to stop</param>
-		public void SendCommand(Command cmd, int refFlowMeterNr, UInt128 route,
-								int totalRefPulses, int massRefPulses, TestMethods testMethods,
-								uint[] filterConstants, float[] fmFreq, int regConst, int shortImp, StopDevs stopDevs)
+        public void SendCommand(SendCommandArgs sendCommandArgs, UInt128 route, uint[] filterConstants, float[] fmFreq, int regConst, int shortImp)
 		{
             if (Program.MainWnd.InvokeRequired)
             {
-                /// When SendCommand(...) called from the worker thread
-                object[] args = new object[] { cmd, refFlowMeterNr, route, totalRefPulses, massRefPulses,
-											   testMethods, filterConstants, fmFreq, regConst, shortImp, stopDevs };
-                Program.MainWnd.Invoke((SendCommandDlgt)DoSendCommand, args);     /// Component was created in UI thread - use Invoke()
+                /// From another thread ... use Invoke()
+                Program.MainWnd.Invoke((SendCommandDlgt)DoSendCommand, new object[] { sendCommandArgs, route, filterConstants, fmFreq, regConst, shortImp });
             }
             else
             {
-                /// When SendCommand(...) called from the UI thread
-				DoSendCommand(cmd, refFlowMeterNr, route, totalRefPulses, massRefPulses, testMethods,
-                              filterConstants, fmFreq, regConst, shortImp, stopDevs);
+                /// Call DoSendCommand() directly
+                DoSendCommand(sendCommandArgs, route, filterConstants, fmFreq, regConst, shortImp);
             }
         }
         ///
-		delegate void SendCommandDlgt(Command cmd, int refFlowmtrNr, UInt128 route,
-									  int totalRefPulses, int massRefPulses, TestMethods testMethods,
-                                      uint[] filterConstants, float[] fmFreq, int regConst, int shortImp, StopDevs stopDevs);
+        delegate void SendCommandDlgt(SendCommandArgs sendCommandArgs, UInt128 route, uint[] filterConstants, float[] fmFreq, int regConst, int shortImp);
         ///
-        private void DoSendCommand(Command cmd, int refFlowMeterNr, UInt128 route,
-								   int totalRefPulses, int massRefPulses, TestMethods testMethods,
-                                   uint[] filterConstants, float[] fmFreq, int regConst, int shortImp, StopDevs stopDevs)
+        private void DoSendCommand(SendCommandArgs sendCommandArgs, UInt128 route, uint[] filterConstants, float[] fmFreq, int regConst, int shortImp)
         {
-            //TBF.UiBridge.Bridge.OnLog(this, string.Format("{0} SendCommand({1}, {2}, {3}, {4}, {5}, {6}, [{7},{8}], {9}, {10}, {11})\r\n",
-            //                                              DateTime.Now.ToLongTimeString(),
-            //                                              cmd,
-            //                                              refFlowMeterNr,
-            //                                              route.ToString("X"),
-            //                                              totalRefPulses,
-            //                                              testMethods,
-            //                                              filterConstant,
-            //                                              fmFreq[0],
-            //                                              fmFreq[1],
-            //                                              regConst,
-            //                                              shortImp,
-            //                                              stopDevs));
-
-
 #if FUZHOU_300
 			///
 			/// The following code deals with the situation that all FM controlled pumps share bit #39.
 			/// In settings the bits of pumps should be sent as follows: P1=50, P2=51, P3=52, P4=53, P5=54 and P7=55
-			/// (in FUZHOU_300 the FM pump bit should be set set to value FMIndex+50).
+			/// (in FUZHOU_300 the FM pump bit should be set to value FMIndex+50).
 			/// 
 			bool bit39 = (route & 0x00FC000000000000) != 0;		/// true if any of bits 50 through 55 is set
 			route = route & 0xFF03FFFFFFFFFFFF;
@@ -374,49 +352,100 @@ namespace TBF.BenchControl.Elde
 				route = route & (~(((UInt128)1) << 80));
 #endif
 
-			log.InfoFormat("DoSendCommand(Cmd={0},Ref#={1},Route={2},TotalPls={3},MassPls={4},TM={5},filt={6},FM=[{7}{8}{9}{10}{11}{12}],Reg={13},ShrtImp={14},Stop={15})",
-                            cmd,                                                            /// 0
-                            refFlowMeterNr,											        /// 1
-							Utils.RouteToStr(route),										/// 2
-                            totalRefPulses, massRefPulses, testMethods, filterConstants,	/// 3, 4, 5, 6
+            log.InfoFormat("DoSendCommand(Cmd={0},Ref#={1},Route={2},TotalPls={3},MassPls={4},TM={5},filt={6},FM=[{7}{8}{9}{10}{11}{12}],Reg={13},ShrtImp={14},Stop={15})",
+                            sendCommandArgs.Cmd,                                            /// 0
+                            sendCommandArgs.RefFlowmtrNr,									/// 1
+                            Utils.RouteToStr(route),						                /// 2
+                            sendCommandArgs.TotalRefPulses,
+                            sendCommandArgs.MassRefPulses,
+                            sendCommandArgs.TestMethods,
+                            filterConstants,	                                            /// 3, 4, 5, 6
                             fmFreq[0].ToString(),											/// 7
                             (fmFreq.Length > 1) ? ("," + fmFreq[1].ToString()) : "",		/// 8
 							(fmFreq.Length > 2) ? ("," + fmFreq[2].ToString()) : "",		/// 9
 							(fmFreq.Length > 3) ? ("," + fmFreq[3].ToString()) : "",		/// 10
 							(fmFreq.Length > 4) ? ("," + fmFreq[4].ToString()) : "",		/// 11
 							(fmFreq.Length > 5) ? ("," + fmFreq[5].ToString()) : "",		/// 12
-                            regConst, shortImp, stopDevs);									/// 13, 14, 15
+                            regConst,                                                       /// 13
+                            shortImp,                                                       /// 14
+                            sendCommandArgs.StopDevs);									    /// 15
 
 #if DN100 || MUNICH
-            ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, (uint)totalRefPulses, (uint)testMethods,
-                                         Convert.ToSingle(filterConstants[0]), fmFreq[0], (uint)regConst, (uint)shortImp, (uint)stopDevs);
+            ctrlBrdComponent.SendCommand((uint)sendCommandArgs.Cmd,
+                                         (byte)sendCommandArgs.RefFlowmtrNr,
+                                         (ulong)route,
+                                         (uint)sendCommandArgs.TotalRefPulses,
+                                         (uint)sendCommandArgs.TestMethods,
+                                         Convert.ToSingle(filterConstants[0]),
+                                         fmFreq[0],
+                                         (uint)regConst,
+                                         (uint)shortImp,
+                                         (uint)sendCommandArgs.StopDevs);
 #elif BADGER_MALA_TRAT || BADGER_VELKA_TRAT || FUZHOU_50 || FUZHOU_150 || FUZHOU_300 || IZRAEL_200 || TORINO_50 || TORUN_50 || CEVAK_40 || MURES_40
-            ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, (uint)totalRefPulses, (uint)testMethods,
-                                         Convert.ToSingle(filterConstants[0]), fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs);
+            ctrlBrdComponent.SendCommand((uint)sendCommandArgs.Cmd,
+                                         (byte)sendCommandArgs.RefFlowmtrNr,
+                                         (ulong)route,
+                                         (uint)sendCommandArgs.TotalRefPulses,
+                                         (uint)sendCommandArgs.TestMethods,
+                                         Convert.ToSingle(filterConstants[0]),
+                                         fmFreq,
+                                         (uint)regConst,
+                                         (uint)shortImp,
+                                         (uint)sendCommandArgs.StopDevs);
 #elif BERLIN || SLM_150 || PETERSBURG_200
-            uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses };
-            ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)(route & (UInt128)0xFFFFFFFFFFFFFFFF), (ulong)(route >> 64), pulsesArr, (uint)testMethods,
-                                         Convert.ToSingle(filterConstants[0]), fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs);
+            ctrlBrdComponent.SendCommand((uint)sendCommandArgs.Cmd,
+                                         (byte)sendCommandArgs.RefFlowmtrNr,
+                                         (ulong)(route & (UInt128)0xFFFFFFFFFFFFFFFF),
+                                         (ulong)(route >> 64),
+                                         new uint[] { (uint)sendCommandArgs.TotalRefPulses, (uint)sendCommandArgs.MassRefPulses },
+                                         (uint)sendCommandArgs.TestMethods,
+                                         Convert.ToSingle(filterConstants[0]),
+                                         fmFreq,
+                                         (uint)regConst,
+                                         (uint)shortImp,
+                                         (uint)sendCommandArgs.StopDevs);
 #elif GENESIS || DEWA_300
-            uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses };
-            ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)(route & (UInt128)0xFFFFFFFFFFFFFFFF), (ulong)(route >> 64), pulsesArr, (uint)testMethods,
-                                         filterConstants, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs);
-#elif JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50
-            uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses };
-            ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, pulsesArr, (uint)testMethods,
-                                         filterConstants, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs);
-#else /// if TURA_IPERL || TURA_SPECIAL || MALTA_WSD25 || SLM_50 || SLM_END || WARSAW_END || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || BADGER_STREDNA_TRAT || PUCHONG_200
-            uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses };
-            ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, pulsesArr, (uint)testMethods,
-                                         Convert.ToSingle(filterConstants[0]), fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs);
+            ctrlBrdComponent.SendCommand((uint)sendCommandArgs.Cmd,
+                                         (byte)sendCommandArgs.RefFlowmtrNr,
+                                         (ulong)(route & (UInt128)0xFFFFFFFFFFFFFFFF),
+                                         (ulong)(route >> 64),
+                                         new uint[] { (uint)sendCommandArgs.TotalRefPulses, (uint)sendCommandArgs.MassRefPulses },
+                                         (uint)sendCommandArgs.TestMethods,
+                                         filterConstants,
+                                         fmFreq,
+                                         (uint)regConst,
+                                         (uint)shortImp,
+                                         (uint)sendCommandArgs.StopDevs);
+#elif JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50 || ALZIR_25
+            ctrlBrdComponent.SendCommand((uint)sendCommandArgs.Cmd,
+                                         (byte)sendCommandArgs.RefFlowmtrNr,
+                                         (ulong)route,
+                                         new uint[] { (uint)sendCommandArgs.TotalRefPulses, (uint)sendCommandArgs.MassRefPulses },
+                                         (uint)sendCommandArgs.TestMethods,
+                                         filterConstants,
+                                         fmFreq,
+                                         (uint)regConst,
+                                         (uint)shortImp,
+                                         (uint)sendCommandArgs.StopDevs);
+#else /// if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || MALTA_WSD25 || SLM_50 || SLM_END || WARSAW_END || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || BADGER_STREDNA_TRAT || PUCHONG_200
+            ctrlBrdComponent.SendCommand((uint)sendCommandArgs.Cmd,
+                                         (byte)sendCommandArgs.RefFlowmtrNr,
+                                         (ulong)route,
+                                         new uint[] { (uint)sendCommandArgs.TotalRefPulses, (uint)sendCommandArgs.MassRefPulses },
+                                         (uint)sendCommandArgs.TestMethods,
+                                         Convert.ToSingle(filterConstants[0]),
+                                         fmFreq,
+                                         (uint)regConst,
+                                         (uint)shortImp,
+                                         (uint)sendCommandArgs.StopDevs);
 #endif
             log.DebugFormat("DoSendCommand() Route = {0}", Utils.RouteToStr(route));
 
-			if (lastRoute != route)		/// This is to update the MainWnd status bar on changes only
+            if (lastRoute != route)		/// This is to update the MainWnd status bar on changes only
             {
 				UInt128 rRoute = RRoute;
                 Program.MainWnd.UpdateRoute(string.Format("{0} ({1})", Utils.RouteToStr(route), Utils.RouteToStr(rRoute)));
-				lastRoute = route;
+                lastRoute = route;
             }
         }
 

TBF/BenchControl/Elde/Diverter/Diverter.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using log4net;
 using Dirichlet.Numerics;
 using TBF.BenchControl.Generic;
+using TBF.Boxes;
 using TBF.Resources;
 
 namespace TBF.BenchControl.Elde.Diverter
@@ -45,6 +46,10 @@ namespace TBF.BenchControl.Elde.Diverter
         public int ThresholdLo { get { return diverterCfg.ThresholdLo; } }
         public int ThresholdHi { get { return diverterCfg.ThresholdHi; } }
 
+        FloatBox switchTimeStart;
+        FloatBox switchTimeEnd;
+        public FloatBox SwitchTimeStart { get { return switchTimeStart; } }
+        public FloatBox SwitchTimeEnd { get { return switchTimeEnd; } }
 
         /// <summary>
         /// For a given flow in [m3/h] returns a test time correction in [s]
@@ -70,7 +75,8 @@ namespace TBF.BenchControl.Elde.Diverter
 			if (diverterCfg.BitPosition < 0 || diverterCfg.BitPosition >= 64) throw new ArgumentOutOfRangeException("position");
             this.mask = (((UInt128)1) << diverterCfg.BitPosition);
 
-
+            switchTimeStart = new FloatBox(diverterCfg.DfltSwithTimeStartMs / 1000.0f);
+            switchTimeEnd = new FloatBox(diverterCfg.DfltSwithTimeEndMs / 1000.0f);
 
 			diverterNr0 = nextIdx++;
 			///
@@ -119,7 +125,7 @@ namespace TBF.BenchControl.Elde.Diverter
 			flowMtrNr4Cmd = (divNrFromName == 4) ? 5 : divNrFromName;
 #elif DEWA_300 || PUCHONG_200
 			flowMtrNr4Cmd = divNrFromName + 2;              /// Div1: 1,2,3, Div2: 4, Div3: 5, Div4: 6, Div5: 7
-#elif TURA_IPERL
+#elif TURA_IPERL || TURA_IPERL_NEW
             flowMtrNr4Cmd = divNrFromName + 16 * divNrFromName;
 #elif FILIPINY_50
             flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : 7;

TBF/BenchControl/Elde/Diverter/DiverterCfg.cs

@@ -1,6 +1,7 @@
 ///
 /// Copyright (c) 2013-2016 Sensus Metering Systems
 ///
+using System;
 using System.IO;
 using System.Collections.Generic;
 using System.Xml.Serialization;
@@ -8,7 +9,7 @@ using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Elde.Diverter
 {
-    public class DiverterCfg : ComponentCfgBase, IChildComponentCfg
+    public class DiverterCfg : ComponentCfgBase, IChildComponentCfg, GenericDevices.ICalibInfoCfg
 	{
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(DiverterCfg) })[0];
 		public override XmlSerializer GetSerializer() { return Serializer; }
@@ -18,13 +19,36 @@ namespace TBF.BenchControl.Elde.Diverter
 		///
 		/// Serialized parameters 
 		///
-		public int BitPosition;		/// 0..63
-		public int AdcNr;			/// 0..15(?), number of the analog input
-		public int AdcValueToSink;  /// 0..1023
-		public int AdcValueToTank;  /// 0..1023
-		public int StartingLevel;	/// 0..100 in %, threshold for the ADC value to start the test
-		public int ThresholdLo;	    /// 0..100 in %, threshold for low level when diverter transition time is measured
-        public int ThresholdHi;	    /// 0..100 in %, threshold for high level when diverter transition time is measured
+		public int BitPosition;		        /// 0..63
+		public int AdcNr;			        /// 0..15(?), number of the analog input
+		public int AdcValueToSink;          /// 0..1023
+		public int AdcValueToTank;          /// 0..1023
+		public int StartingLevel;	        /// 0..100 in %, threshold for the ADC value to start the test
+		public int ThresholdLo;	            /// 0..100 in %, threshold for low level when diverter transition time is measured
+        public int ThresholdHi;	            /// 0..100 in %, threshold for high level when diverter transition time is measured
+        public int DfltSwithTimeStartMs;    /// Default diverter transition time 'start' or 'to tank' in ms
+        public int DfltSwithTimeEndMs;      /// Default diverter transition time 'end' or 'to sink' in ms
+
+        /// Calibration info serialized parameters displayed in Metrology tab page
+        string calibCertificateNr;
+        DateTime calibDate;
+        DateTime calibValidDate;
+        public string CalibCertificateNr
+        {
+            get { return calibCertificateNr; }
+            set { calibCertificateNr = value; }
+        }
+        public DateTime CalibDate
+        {
+            get { return calibDate; }
+            set { calibDate = value; }
+        }
+        public DateTime CalibValidDate
+        {
+            get { return calibValidDate; }
+            set { calibValidDate = value; }
+        }
+
 
 		/// Private parameterless constructor invoked by all other (public) constructors
 		DiverterCfg()
@@ -38,6 +62,7 @@ namespace TBF.BenchControl.Elde.Diverter
 			StartingLevel = 50;
             ThresholdLo = 10;
             ThresholdHi = 90;
+            calibCertificateNr = string.Empty;
         }
 
         public DiverterCfg(IComponentFactory factory)

TBF/BenchControl/Elde/Diverter/DiverterCfgCtrl.Designer.cs

@@ -73,6 +73,12 @@ namespace TBF.BenchControl.Elde.Diverter
             this.label8 = new System.Windows.Forms.Label();
             this.thresholdHiTextBox = new System.Windows.Forms.TextBox();
             this.thresholdHiLabel = new System.Windows.Forms.Label();
+            this.dfltSwitchTimeEndTextBox = new System.Windows.Forms.TextBox();
+            this.dfltSwitchTimeEndLabel = new System.Windows.Forms.Label();
+            this.dfltSwitchTimeStartTextBox = new System.Windows.Forms.TextBox();
+            this.dfltSwitchTimeStartLabel = new System.Windows.Forms.Label();
+            this.label9 = new System.Windows.Forms.Label();
+            this.label10 = new System.Windows.Forms.Label();
             this.groupBox4.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.groupBox1.SuspendLayout();
@@ -81,7 +87,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // nameTextBox
             // 
             this.nameTextBox.Enabled = false;
-            this.nameTextBox.Location = new System.Drawing.Point(137, 41);
+            this.nameTextBox.Location = new System.Drawing.Point(144, 41);
             this.nameTextBox.Name = "nameTextBox";
             this.nameTextBox.Size = new System.Drawing.Size(130, 20);
             this.nameTextBox.TabIndex = 2;
@@ -89,7 +95,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // nameLabel
             // 
             this.nameLabel.AutoSize = true;
-            this.nameLabel.Location = new System.Drawing.Point(27, 44);
+            this.nameLabel.Location = new System.Drawing.Point(21, 44);
             this.nameLabel.Name = "nameLabel";
             this.nameLabel.Size = new System.Drawing.Size(35, 13);
             this.nameLabel.TabIndex = 1;
@@ -98,7 +104,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // classNameLabel
             // 
             this.classNameLabel.AutoSize = true;
-            this.classNameLabel.Location = new System.Drawing.Point(134, 17);
+            this.classNameLabel.Location = new System.Drawing.Point(141, 17);
             this.classNameLabel.Name = "classNameLabel";
             this.classNameLabel.Size = new System.Drawing.Size(83, 13);
             this.classNameLabel.TabIndex = 0;
@@ -107,7 +113,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // parentNameLabel
             // 
             this.parentNameLabel.AutoSize = true;
-            this.parentNameLabel.Location = new System.Drawing.Point(27, 67);
+            this.parentNameLabel.Location = new System.Drawing.Point(21, 67);
             this.parentNameLabel.Name = "parentNameLabel";
             this.parentNameLabel.Size = new System.Drawing.Size(69, 13);
             this.parentNameLabel.TabIndex = 3;
@@ -116,7 +122,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // bitPositionLabel
             // 
             this.bitPositionLabel.AutoSize = true;
-            this.bitPositionLabel.Location = new System.Drawing.Point(27, 91);
+            this.bitPositionLabel.Location = new System.Drawing.Point(21, 91);
             this.bitPositionLabel.Name = "bitPositionLabel";
             this.bitPositionLabel.Size = new System.Drawing.Size(59, 13);
             this.bitPositionLabel.TabIndex = 5;
@@ -125,7 +131,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // bitPositionTextBox
             // 
             this.bitPositionTextBox.Enabled = false;
-            this.bitPositionTextBox.Location = new System.Drawing.Point(137, 88);
+            this.bitPositionTextBox.Location = new System.Drawing.Point(144, 88);
             this.bitPositionTextBox.Name = "bitPositionTextBox";
             this.bitPositionTextBox.Size = new System.Drawing.Size(46, 20);
             this.bitPositionTextBox.TabIndex = 6;
@@ -134,7 +140,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // 
             this.parentNameComboBox.Enabled = false;
             this.parentNameComboBox.FormattingEnabled = true;
-            this.parentNameComboBox.Location = new System.Drawing.Point(137, 64);
+            this.parentNameComboBox.Location = new System.Drawing.Point(144, 64);
             this.parentNameComboBox.Name = "parentNameComboBox";
             this.parentNameComboBox.Size = new System.Drawing.Size(130, 21);
             this.parentNameComboBox.TabIndex = 4;
@@ -142,7 +148,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // startingEdgeTextBox
             // 
             this.startingEdgeTextBox.Enabled = false;
-            this.startingEdgeTextBox.Location = new System.Drawing.Point(137, 180);
+            this.startingEdgeTextBox.Location = new System.Drawing.Point(144, 180);
             this.startingEdgeTextBox.Name = "startingEdgeTextBox";
             this.startingEdgeTextBox.Size = new System.Drawing.Size(46, 20);
             this.startingEdgeTextBox.TabIndex = 14;
@@ -150,7 +156,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // startingEdgeLabel
             // 
             this.startingEdgeLabel.AutoSize = true;
-            this.startingEdgeLabel.Location = new System.Drawing.Point(27, 183);
+            this.startingEdgeLabel.Location = new System.Drawing.Point(21, 183);
             this.startingEdgeLabel.Name = "startingEdgeLabel";
             this.startingEdgeLabel.Size = new System.Drawing.Size(68, 13);
             this.startingEdgeLabel.TabIndex = 13;
@@ -159,7 +165,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // thresholdLoTextBox
             // 
             this.thresholdLoTextBox.Enabled = false;
-            this.thresholdLoTextBox.Location = new System.Drawing.Point(137, 203);
+            this.thresholdLoTextBox.Location = new System.Drawing.Point(144, 203);
             this.thresholdLoTextBox.Name = "thresholdLoTextBox";
             this.thresholdLoTextBox.Size = new System.Drawing.Size(46, 20);
             this.thresholdLoTextBox.TabIndex = 17;
@@ -167,7 +173,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // thresholdLoLabel
             // 
             this.thresholdLoLabel.AutoSize = true;
-            this.thresholdLoLabel.Location = new System.Drawing.Point(27, 206);
+            this.thresholdLoLabel.Location = new System.Drawing.Point(21, 206);
             this.thresholdLoLabel.Name = "thresholdLoLabel";
             this.thresholdLoLabel.Size = new System.Drawing.Size(69, 13);
             this.thresholdLoLabel.TabIndex = 16;
@@ -176,7 +182,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(190, 205);
+            this.label2.Location = new System.Drawing.Point(197, 205);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(15, 13);
             this.label2.TabIndex = 18;
@@ -185,7 +191,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(190, 183);
+            this.label1.Location = new System.Drawing.Point(197, 183);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(15, 13);
             this.label1.TabIndex = 15;
@@ -225,7 +231,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // adcToTankTextBox
             // 
             this.adcToTankTextBox.Enabled = false;
-            this.adcToTankTextBox.Location = new System.Drawing.Point(137, 157);
+            this.adcToTankTextBox.Location = new System.Drawing.Point(144, 157);
             this.adcToTankTextBox.Name = "adcToTankTextBox";
             this.adcToTankTextBox.Size = new System.Drawing.Size(46, 20);
             this.adcToTankTextBox.TabIndex = 12;
@@ -233,7 +239,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // adcTankLabel
             // 
             this.adcTankLabel.AutoSize = true;
-            this.adcTankLabel.Location = new System.Drawing.Point(27, 160);
+            this.adcTankLabel.Location = new System.Drawing.Point(21, 160);
             this.adcTankLabel.Name = "adcTankLabel";
             this.adcTankLabel.Size = new System.Drawing.Size(94, 13);
             this.adcTankLabel.TabIndex = 11;
@@ -242,7 +248,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // adcToSinkTextBox
             // 
             this.adcToSinkTextBox.Enabled = false;
-            this.adcToSinkTextBox.Location = new System.Drawing.Point(137, 134);
+            this.adcToSinkTextBox.Location = new System.Drawing.Point(144, 134);
             this.adcToSinkTextBox.Name = "adcToSinkTextBox";
             this.adcToSinkTextBox.Size = new System.Drawing.Size(46, 20);
             this.adcToSinkTextBox.TabIndex = 10;
@@ -250,7 +256,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // adcSinkLabel
             // 
             this.adcSinkLabel.AutoSize = true;
-            this.adcSinkLabel.Location = new System.Drawing.Point(27, 137);
+            this.adcSinkLabel.Location = new System.Drawing.Point(21, 137);
             this.adcSinkLabel.Name = "adcSinkLabel";
             this.adcSinkLabel.Size = new System.Drawing.Size(92, 13);
             this.adcSinkLabel.TabIndex = 9;
@@ -419,7 +425,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // adcNrTextBox
             // 
             this.adcNrTextBox.Enabled = false;
-            this.adcNrTextBox.Location = new System.Drawing.Point(137, 111);
+            this.adcNrTextBox.Location = new System.Drawing.Point(144, 111);
             this.adcNrTextBox.Name = "adcNrTextBox";
             this.adcNrTextBox.Size = new System.Drawing.Size(46, 20);
             this.adcNrTextBox.TabIndex = 8;
@@ -427,7 +433,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // label7
             // 
             this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(27, 114);
+            this.label7.Location = new System.Drawing.Point(21, 114);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(76, 13);
             this.label7.TabIndex = 7;
@@ -436,7 +442,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // label8
             // 
             this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(190, 228);
+            this.label8.Location = new System.Drawing.Point(197, 228);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(15, 13);
             this.label8.TabIndex = 29;
@@ -445,7 +451,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // thresholdHiTextBox
             // 
             this.thresholdHiTextBox.Enabled = false;
-            this.thresholdHiTextBox.Location = new System.Drawing.Point(137, 226);
+            this.thresholdHiTextBox.Location = new System.Drawing.Point(144, 226);
             this.thresholdHiTextBox.Name = "thresholdHiTextBox";
             this.thresholdHiTextBox.Size = new System.Drawing.Size(46, 20);
             this.thresholdHiTextBox.TabIndex = 28;
@@ -453,16 +459,74 @@ namespace TBF.BenchControl.Elde.Diverter
             // thresholdHiLabel
             // 
             this.thresholdHiLabel.AutoSize = true;
-            this.thresholdHiLabel.Location = new System.Drawing.Point(27, 229);
+            this.thresholdHiLabel.Location = new System.Drawing.Point(21, 229);
             this.thresholdHiLabel.Name = "thresholdHiLabel";
             this.thresholdHiLabel.Size = new System.Drawing.Size(67, 13);
             this.thresholdHiLabel.TabIndex = 27;
             this.thresholdHiLabel.Text = "Threshold Hi";
             // 
+            // dfltSwitchTimeEndTextBox
+            // 
+            this.dfltSwitchTimeEndTextBox.Enabled = false;
+            this.dfltSwitchTimeEndTextBox.Location = new System.Drawing.Point(144, 272);
+            this.dfltSwitchTimeEndTextBox.Name = "dfltSwitchTimeEndTextBox";
+            this.dfltSwitchTimeEndTextBox.Size = new System.Drawing.Size(46, 20);
+            this.dfltSwitchTimeEndTextBox.TabIndex = 33;
+            // 
+            // dfltSwitchTimeEndLabel
+            // 
+            this.dfltSwitchTimeEndLabel.AutoSize = true;
+            this.dfltSwitchTimeEndLabel.Location = new System.Drawing.Point(21, 275);
+            this.dfltSwitchTimeEndLabel.Name = "dfltSwitchTimeEndLabel";
+            this.dfltSwitchTimeEndLabel.Size = new System.Drawing.Size(117, 13);
+            this.dfltSwitchTimeEndLabel.TabIndex = 32;
+            this.dfltSwitchTimeEndLabel.Text = "Default switch time end";
+            // 
+            // dfltSwitchTimeStartTextBox
+            // 
+            this.dfltSwitchTimeStartTextBox.Enabled = false;
+            this.dfltSwitchTimeStartTextBox.Location = new System.Drawing.Point(144, 249);
+            this.dfltSwitchTimeStartTextBox.Name = "dfltSwitchTimeStartTextBox";
+            this.dfltSwitchTimeStartTextBox.Size = new System.Drawing.Size(46, 20);
+            this.dfltSwitchTimeStartTextBox.TabIndex = 31;
+            // 
+            // dfltSwitchTimeStartLabel
+            // 
+            this.dfltSwitchTimeStartLabel.AutoSize = true;
+            this.dfltSwitchTimeStartLabel.Location = new System.Drawing.Point(21, 252);
+            this.dfltSwitchTimeStartLabel.Name = "dfltSwitchTimeStartLabel";
+            this.dfltSwitchTimeStartLabel.Size = new System.Drawing.Size(119, 13);
+            this.dfltSwitchTimeStartLabel.TabIndex = 30;
+            this.dfltSwitchTimeStartLabel.Text = "Default switch time start";
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.Location = new System.Drawing.Point(197, 252);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(20, 13);
+            this.label9.TabIndex = 34;
+            this.label9.Text = "ms";
+            // 
+            // label10
+            // 
+            this.label10.AutoSize = true;
+            this.label10.Location = new System.Drawing.Point(197, 275);
+            this.label10.Name = "label10";
+            this.label10.Size = new System.Drawing.Size(20, 13);
+            this.label10.TabIndex = 35;
+            this.label10.Text = "ms";
+            // 
             // DiverterCfgCtrl
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.label10);
+            this.Controls.Add(this.label9);
+            this.Controls.Add(this.dfltSwitchTimeEndTextBox);
+            this.Controls.Add(this.dfltSwitchTimeEndLabel);
+            this.Controls.Add(this.dfltSwitchTimeStartTextBox);
+            this.Controls.Add(this.dfltSwitchTimeStartLabel);
             this.Controls.Add(this.label8);
             this.Controls.Add(this.thresholdHiTextBox);
             this.Controls.Add(this.thresholdHiLabel);
@@ -549,5 +613,11 @@ namespace TBF.BenchControl.Elde.Diverter
         private System.Windows.Forms.Label label8;
         private System.Windows.Forms.TextBox thresholdHiTextBox;
         private System.Windows.Forms.Label thresholdHiLabel;
+        private System.Windows.Forms.TextBox dfltSwitchTimeEndTextBox;
+        private System.Windows.Forms.Label dfltSwitchTimeEndLabel;
+        private System.Windows.Forms.TextBox dfltSwitchTimeStartTextBox;
+        private System.Windows.Forms.Label dfltSwitchTimeStartLabel;
+        private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.Label label10;
 	}
 }

TBF/BenchControl/Elde/Diverter/DiverterCfgCtrl.cs

@@ -80,6 +80,8 @@ namespace TBF.BenchControl.Elde.Diverter
 			startingEdgeTextBox.Text = config.StartingLevel.ToString();
 			thresholdLoTextBox.Text = config.ThresholdLo.ToString();
             thresholdHiTextBox.Text = config.ThresholdHi.ToString();
+            dfltSwitchTimeStartTextBox.Text = config.DfltSwithTimeStartMs.ToString();
+            dfltSwitchTimeEndTextBox.Text = config.DfltSwithTimeEndMs.ToString();
 
             adcTextBox1.Text = adc1.ToString();
             adcTextBox2.Text = adc2.ToString();
@@ -98,6 +100,8 @@ namespace TBF.BenchControl.Elde.Diverter
 			startingEdgeTextBox.Enabled = true;
 			thresholdLoTextBox.Enabled = true;
             thresholdHiTextBox.Enabled = true;
+            dfltSwitchTimeStartTextBox.Enabled = true;
+            dfltSwitchTimeEndTextBox.Enabled = true;
         }
 
 		public CfgUpdateFlags VerifyCfg(ref string message)
@@ -160,6 +164,16 @@ namespace TBF.BenchControl.Elde.Diverter
                     message += Environment.NewLine + "'Threshold HI' should be between 0 and 100%";
                 }
             }
+            if (!int.TryParse(dfltSwitchTimeStartTextBox.Text, out dummy) || dummy <= 0)
+            {
+                flags |= CfgUpdateFlags.Error;
+                message += Environment.NewLine + "'Default switch time start' should be positive integer";
+            }
+            if (!int.TryParse(dfltSwitchTimeEndTextBox.Text, out dummy) || dummy <= 0)
+            {
+                flags |= CfgUpdateFlags.Error;
+                message += Environment.NewLine + "'Default switch time end' should be positive integer";
+            }
             return flags;
 		}
 
@@ -232,6 +246,20 @@ namespace TBF.BenchControl.Elde.Diverter
                 flags |= CfgUpdateFlags.RestartRqrd;
             }
 
+            tmp = int.Parse(dfltSwitchTimeStartTextBox.Text);
+            if (config.DfltSwithTimeStartMs != tmp)
+            {
+                config.DfltSwithTimeStartMs = tmp;
+                flags |= CfgUpdateFlags.RestartRqrd;
+            }
+
+            tmp = int.Parse(dfltSwitchTimeEndTextBox.Text);
+            if (config.DfltSwithTimeEndMs != tmp)
+            {
+                config.DfltSwithTimeEndMs = tmp;
+                flags |= CfgUpdateFlags.RestartRqrd;
+            }
+
 			return flags;
 		}
 

TBF/BenchControl/Elde/Diverter/SwitchDiverterOp.cs

@@ -8,19 +8,19 @@ namespace TBF.BenchControl.Elde.Diverter
     public class SwitchDiverterOp : IOperation
     {
         ControlBoardDev controlBoard;
-        bool start;
+        bool toTank;
         int flowMtrNr;
 
-        public SwitchDiverterOp(ControlBoardDev controlBoard, bool start, int flowMtrNr)
+        public SwitchDiverterOp(ControlBoardDev controlBoard, bool toTank, int flowMtrNr)
         {
             this.controlBoard = controlBoard;
-            this.start = start;
+            this.toTank = toTank;
             this.flowMtrNr = flowMtrNr;
         }
 
         public void Start()
         {
-            if (start)
+            if (toTank)
             {
                 controlBoard.DiverterToTank(flowMtrNr);
             }

TBF/BenchControl/Elde/ExecuteCommandOp.cs

@@ -56,7 +56,7 @@ namespace TBF.BenchControl.Elde
 		public void Start()
         {
 			controlBoard.SyncRoute();
-            controlBoard.SendCommand(commandOnStartOp, 0, controlBoard.Route, 0, 0, testMethod, StopDevs.None);
+            controlBoard.SendCommand(commandOnStartOp, 0, 0, 0, testMethod, StopDevs.None);
 			opState = OpState.StartingCommand;
         }
 
@@ -99,7 +99,7 @@ namespace TBF.BenchControl.Elde
 			if (commandOnStopOp != Command.None)
 			{
 				controlBoard.SyncRoute();
-                controlBoard.SendCommand(commandOnStopOp, 0, controlBoard.Route, 0, 0, testMethod, StopDevs.None);
+                controlBoard.SendCommand(commandOnStopOp, 0, 0, 0, testMethod, StopDevs.None);
 			}
 		}
 	}

TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReader.cs

@@ -17,6 +17,15 @@ namespace TBF.BenchControl.Elde.FixedStartRegisterReader
 		readonly ControlBoardDev controlBoard;
 
 
+        public int Position
+        {
+            get
+            {
+                int firstDigitPos = Name.IndexOfAny(new char[] { '1', '2', '3', '4', '5', '6', '7', '8', '9', '0' }); 
+                int position;
+                return (firstDigitPos < 0) ? 0 : (int.TryParse(Name.Substring(firstDigitPos), out position) ? position : 0);
+            }
+        }
         public Config.Entities.RegisterReaderType RegisterReaderType { get { return Config.Entities.RegisterReaderType.Manual; } }
         public double PulsesPerLtr { get { return registerReaderCfg.ProcParams.PulsesPerLtr; } }
 		public double LtrsPerPulse { get { return (PulsesPerLtr <= float.Epsilon) ? 1.0 : (1 / PulsesPerLtr); } }

TBF/BenchControl/Elde/FlowMeter/FlowMeter.cs

@@ -22,8 +22,6 @@ namespace TBF.BenchControl.Elde.FlowMeter
 
         public double LtrPerPulseCorrected(double flow, int rangeIx)
         {
-            if (flow < 0.1 * NominalFlow) return LtrPerPulse;     /// No correction for small flow
-
             /// Apply correction
             var rangeCorrections = new List<Config.Entities.MeasurementCorrection>();
             foreach (var corr in Corrections)

TBF/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs

@@ -2,8 +2,6 @@
 /// Copyright (c) 2013-2018 Sensus Slovensko a.s.
 ///
 using System;
-using System.Globalization;
-using System.Windows.Forms;
 using Config.Entities;
 using TBF.BenchControl.Configs;
 using TBF.BenchControl.Generic;

TBF/BenchControl/Elde/FlowMeterDewa/FlowMeter.cs

@@ -28,22 +28,67 @@ namespace TBF.BenchControl.Elde.FlowMeterDewa
         public double NominalFlow { get { return nominalFlow; } }
         public double LtrPerPulse { get { return ltrPerPulse; } }
 
-        double[] refFreq;
+        double[] refFreq;   /// 0..sum, 1..I11, 2..I12, 3..I13
+        int[] refPulses;
 
         public double LtrPerPulseCorrected(double flow, int rangeIx)
         {
-            if (flow < 0.1 * NominalFlow) return LtrPerPulse;     /// No correction for small flow
+            log.DebugFormat("LtrPerPulseCorrected({0}, {1}) started", flow, rangeIx);
 
             refFreq[0] = controlBoard.ReferenceFreqs(0);
+            refFreq[1] = controlBoard.ReferenceFreqs(1);
             refFreq[2] = controlBoard.ReferenceFreqs(2);
             refFreq[3] = controlBoard.ReferenceFreqs(3);
+            log.DebugFormat("refFreq[] = ({0}, {1}, {2}, {3})", refFreq[0], refFreq[1], refFreq[2], refFreq[3]);
+
             refFreq[1] = refFreq[0] - refFreq[2] - refFreq[3];
 
-            double ltrPerPulseCorrected = 0;
-            if (flowMeter1 != null) ltrPerPulseCorrected += refFreq[1] * flowMeter1.LtrPerPulseCorrected(flow * refFreq[1] / refFreq[0], rangeIx);
-            if (flowMeter2 != null) ltrPerPulseCorrected += refFreq[2] * flowMeter2.LtrPerPulseCorrected(flow * refFreq[2] / refFreq[0], rangeIx);
-            if (flowMeter3 != null) ltrPerPulseCorrected += refFreq[3] * flowMeter3.LtrPerPulseCorrected(flow * refFreq[3] / refFreq[0], rangeIx);
-            return ltrPerPulseCorrected / refFreq[0];
+            refPulses[0] = controlBoard.EtPulses(0);
+            refPulses[2] = controlBoard.EtPulses2;
+            refPulses[3] = controlBoard.EtPulses3;
+            refPulses[1] = refPulses[0] - refPulses[2] - refPulses[3];
+
+            log.DebugFormat("refPulses[] = ({0}, {1}, {2}, {3})", refPulses[0], refPulses[1], refPulses[2], refPulses[3]);
+
+            double flow1, flow2, flow3;
+            double contribution1, contribution2, contribution3;
+            if (refPulses[0] != 0)
+            {
+                /// Division by zero prevented inside this 'if'
+                double ltrPerPulseCorrected = 0;
+                if (flowMeter1 != null)
+                {
+                    double ratio = (double)refPulses[flowMeter1.Idx1] / (double)refPulses[0];
+                    flow1 = flow * ratio;
+                    contribution1 = flowMeter1.LtrPerPulseCorrected(flow1, rangeIx) * ratio;
+                    ltrPerPulseCorrected += contribution1;
+                    log.DebugFormat("flowmeter1 = {0}, flow1 = {1}, contribution1 = {2}", flowMeter1.Name, flow1, contribution1);
+                }
+                if (flowMeter2 != null)
+                {
+                    double ratio = (double)refPulses[flowMeter2.Idx1] / (double)refPulses[0];
+                    flow2 = flow * ratio;
+                    contribution2 = flowMeter2.LtrPerPulseCorrected(flow2, rangeIx) * ratio;
+                    ltrPerPulseCorrected += contribution2;
+                    log.DebugFormat("flowmeter2 = {0}, flow2 = {1}, contribution2 = {2}", flowMeter2.Name, flow2, contribution2);
+                }
+                if (flowMeter3 != null)
+                {
+                    double ratio = (double)refPulses[flowMeter3.Idx1] / (double)refPulses[0];
+                    flow3 = flow * ratio;
+                    contribution3 = flowMeter3.LtrPerPulseCorrected(flow3, rangeIx) * ratio;
+                    ltrPerPulseCorrected += contribution3;
+                    log.DebugFormat("flowmeter3 = {0}, flow3 = {1}, contribution3 = {2}", flowMeter3.Name, flow3, contribution3);
+                }
+
+                log.DebugFormat("LtrPerPulseCorrected() returns {0}", ltrPerPulseCorrected);
+                return ltrPerPulseCorrected;
+            }
+            else
+            {
+                log.DebugFormat("LtrPerPulseCorrected() returns 1");
+                return 1;
+            }
         }
 
 
@@ -56,7 +101,9 @@ namespace TBF.BenchControl.Elde.FlowMeterDewa
 
 		public FlowMeter()
 		{
-		}
+            refFreq = new double[4];
+            refPulses = new int[4];
+        }
 
 		public FlowMeter(Generic.IComponentCfg cfg, IList<Generic.IComponent> components)
 			: base(cfg)
@@ -80,6 +127,7 @@ namespace TBF.BenchControl.Elde.FlowMeterDewa
             ltrPerPulse = nominalFlow / (flowMetersCount * 7200.0);     /// Nominal freq. is flowMetersCount * 2000 Hz (2000, 4000 or 6000 Hz)
 
             refFreq = new double[4];
+            refPulses = new int[4];
 
 			log.Debug(this.ToString());
 		}

TBF/BenchControl/Elde/FlowMeterDewa/FlowMeterCfgCtrl.cs

@@ -2,8 +2,6 @@
 /// Copyright (c) 2019 Sensus Slovensko a.s.
 ///
 using System;
-using System.Globalization;
-using System.Windows.Forms;
 using Config.Entities;
 using TBF.BenchControl.Configs;
 using TBF.BenchControl.Generic;

TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeter.cs

@@ -22,8 +22,6 @@ namespace TBF.BenchControl.Elde.FlowMeterTriplet
 
         public double LtrPerPulseCorrected(double flow, int rangeIx)
         {
-            if (flow < 0.1 * NominalFlow) return LtrPerPulse;     /// No correction for small flow   
-            
             /// Apply correction
             double correctedFlow = Config.Formulas.CorrectedValue(flow, Corrections);
             return (LtrPerPulse * correctedFlow / flow);

TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.cs

@@ -2,7 +2,6 @@
 /// Copyright (c) 2017 Sensus Slovensko a.s.
 ///
 using System;
-using System.Globalization;
 using System.Windows.Forms;
 using Config.Entities;
 using TBF.BenchControl.Generic;