Reconfigured for Izrael-50

.gitignore

@@ -1,13 +1,9 @@
 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
 GraphLib/bin
@@ -29,6 +25,5 @@ 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;ZAMBIA</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;IZRAEL_50</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;ZAMBIA</DefineConstants>
+    <DefineConstants>TRACE;IZRAEL_50</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -125,7 +125,6 @@
   <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 = 3;
-		public const int CompoundWMsCount = 3;
+		public const int LineSize = 1;
+		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = 3;
 #elif DN100 || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || CEVAK_200
@@ -20,18 +20,12 @@ 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 || GENESIS || SLM_150 || PETERSBURG_200
+#elif FUZHOU_300 || FUZHOU_150 || IZRAEL_200 || PUCHONG_200 || GENESIS || SLM_150 || PETERSBURG_200
 		public const int WMsCount = 6;
 		public const int LineSize = 6;
 		public const int CompoundWMsCount = 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;
@@ -62,7 +56,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 || ALZIR_25
+#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
         public const int WMsCount = 20;
 		public const int LineSize = 10;
 		public const int CompoundWMsCount = 1;
@@ -74,7 +68,7 @@ namespace Config
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = WMsCount / LineSize;
-#elif TURA_IPERL || TURA_IPERL_NEW
+#elif TURA_IPERL
 		public const int WMsCount = 40;
 		public const int LineSize = 20;
 		public const int CompoundWMsCount = 1;

Config/Entities/Enums.cs

@@ -90,10 +90,6 @@ 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,
@@ -129,9 +125,6 @@ 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,
@@ -247,11 +240,6 @@ 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,
@@ -293,10 +281,6 @@ 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,
@@ -307,7 +291,7 @@ namespace Config.Entities
 		[Description("Spread")]			Spread,
 		[Description("Std.dev.")]		StdDev,
 #endif
-        Count
+		Count
 	}
 
     public enum TestRedType
@@ -361,14 +345,6 @@ 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,
@@ -378,7 +354,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>
@@ -395,17 +371,6 @@ 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,
@@ -418,7 +383,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
@@ -465,11 +430,6 @@ 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,
@@ -519,10 +479,6 @@ 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,
@@ -540,7 +496,7 @@ namespace Config.Entities
 		[Description("info")]		Info,
 		[Description("on")]			On,
 #endif
-        Count
+		Count
 	}
 
 

Config/Entities/Procedure.cs

@@ -234,42 +234,6 @@ 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 DoDrainingAfter { get; set; }
+        public virtual bool DoZeroing { 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,9 +56,6 @@ 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; }
@@ -76,7 +73,7 @@ namespace Config.Entities
 			DoEvaluate = true;
 			Repeats = 1;
 			DoDraining = false;
-			DoDrainingAfter = false;
+			DoZeroing = false;
 			DoControlWaterTemp = false;
 			TempLimLo = 15.0f;
 			TempLimHi = 25.0f;
@@ -124,7 +121,7 @@ namespace Config.Entities
 			result.Uncertainty = Uncertainty;
 			result.Repeats = Repeats;
             result.DoDraining = DoDraining;
-            result.DoDrainingAfter = DoDrainingAfter;
+            result.DoZeroing = DoZeroing;
 			result.DoControlWaterTemp = DoControlWaterTemp;
 			result.TempLimLo = TempLimLo;
 			result.TempLimHi = TempLimHi;
@@ -172,7 +169,7 @@ namespace Config.Entities
             output.WriteLine(Uncertainty.ToString(ci));
             output.WriteLine(Repeats.ToString(ci));
             output.WriteLine(DoDraining.ToString());
-            output.WriteLine(DoDrainingAfter.ToString());
+            output.WriteLine(DoZeroing.ToString());
 			output.WriteLine(DoControlWaterTemp.ToString());
 			output.WriteLine(TempLimLo.ToString(ci));
 			output.WriteLine(TempLimHi.ToString(ci));
@@ -222,7 +219,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.DoDrainingAfter = bool.Parse(input.ReadLine());
+			tst.DoZeroing = bool.Parse(input.ReadLine());
 			tst.DoControlWaterTemp = bool.Parse(input.ReadLine());
 			tst.TempLimLo = float.Parse(input.ReadLine(), ci);
 			tst.TempLimHi = float.Parse(input.ReadLine(), ci);
@@ -280,7 +277,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 != DoDrainingAfter.ToString(ci))          { diff.AppendFormat(fmt, "Zeroing", DoDrainingAfter.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != DoZeroing.ToString(ci))          { diff.AppendFormat(fmt, "Zeroing", DoZeroing.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); };
@@ -313,33 +310,6 @@ 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-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -11,11 +11,8 @@ 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 string Tag { get; set; }
-        public virtual int Number { 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.DoDrainingAfter)
+            Map(x => x.DoZeroing)
 				.Column("Zeroing");
             Map(x => x.DoControlWaterTemp);
             Map(x => x.TempLimLo);

Config/Mappings/UserMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
 using FluentNHibernate.Mapping;
 
@@ -12,9 +12,6 @@ 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.1273.0")]
-[assembly: AssemblyFileVersion("2.18.1273.0")]
+[assembly: AssemblyVersion("2.18.1227.0")]
+[assembly: AssemblyFileVersion("2.18.1227.0")]

Config/Utils.cs

@@ -82,61 +82,5 @@ 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

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

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

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

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

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

DeviceTest/DeviceTestDlg.cs

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

Encrypt/Encrypt.csproj

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

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

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

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

Results/BatchResults.cs

@@ -130,19 +130,13 @@ namespace Results
 
         public static BatchResults FromBatch(Batch batch)
         {
-            if (batch.WaterMeters == null || batch.WaterMeters.Count == 0) return null;
+            int wmCount = batch.WaterMeters.Count;
+            if (wmCount == 0) return null;
 
-            int wmPosMax = 0;
-            foreach (var wm in batch.WaterMeters) if (wm.WMPosition > wmPosMax) wmPosMax = wm.WMPosition;
-
-            BatchResults batchResults = new BatchResults(wmPosMax);
+            BatchResults batchResults = new BatchResults(wmCount);
             batchResults.Batch = batch;
-            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;
-            }
+            batchResults.WaterMeters = new WaterMeter[wmCount];
+            for (int i = 0; i < wmCount; i++) batchResults.WaterMeters[i] = batch.WaterMeters[i];
 
             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") || MethodClass.Contains("DiverterTest")) : true; }
+        public virtual bool IsRelErrTest()   { return (MethodClass != null) ? (MethodClass.Contains("FixedStart") || MethodClass.Contains("FlyingStart") || MethodClass.Contains("CombinedWithDetection")) : 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")) || MethodClass.Contains("DiverterTest")) : true; }
+        public virtual bool IsDiverter()     { return (MethodClass != null) ? (MethodClass.Contains("FlyingStart") && MethodClass.Contains("MassColl")) : 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

@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using Config.Entities;
-using Results.Resources;
 
 namespace Results.Entities
 {
@@ -97,8 +96,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 bool   IsLastRecordOk    { get; set; }	/// Not mapped to DB !!!    Previous record verification result
 
         public virtual WaterMeterData WaterMeterData { get; set; }
 		public virtual Batch Batch { get; set; }
@@ -360,9 +358,8 @@ namespace Results.Entities
             CompleteTestInfos = null;
 #endif
             ProcessId = 0;
-            SessionId = 0;
             ErrorFlags = 0;
-            LastRecordIsNok = false;
+            IsLastRecordOk = false;
 		}
 
 
@@ -421,8 +418,7 @@ namespace Results.Entities
             CompleteTestInfos = src.CompleteTestInfos;
 #endif
             ProcessId = src.ProcessId;
-            SessionId = src.SessionId;
-            LastRecordIsNok = src.LastRecordIsNok;
+            IsLastRecordOk = src.IsLastRecordOk;
 
             foreach (var mtr in MeterTestRslts)
             {
@@ -448,101 +444,5 @@ namespace Results.Entities
 			sb.AppendFormat(" test start: {0} {1} batch={2}", StartTime().ToShortDateString(), StartTime().ToShortTimeString(), BatchNr());
 			return sb.ToString();
 		}
-
-
-        /// <summary>
-        /// Get decorated test names for a specified watermeter
-        /// </summary>
-        /// <param name="wMtr">Watermeter results entity</param>
-        /// <returns>A list of strings</returns>
-        public virtual IList<string> GetAllDecoratedTestNames()
-        {
-            IList<string> testNames = new List<string>();
-
-            if (MeterTestRslts != null)
-            {
-                foreach (var mtr in MeterTestRslts)
-                {
-                    if ((mtr.CompoundMeterId == (byte)CompoundMeterId.Single || mtr.CompoundMeterId == (byte)CompoundMeterId.Compound || mtr.CompoundMeterId == (byte)CompoundMeterId.HeatMeterEnergy)
-                          && mtr.TestDone
-                          && (mtr.Publish() != Config.Entities.Publish.Never)
-                          && (mtr.Publish() != Config.Entities.Publish.Internal))
-                    {
-                        testNames.Add(mtr.Name());
-                    }
-                }
-            }
-
-            return testNames;
-        }
-
-
-        static readonly System.Drawing.Color NotCompletedColor = System.Drawing.Color.White;
-        static readonly System.Drawing.Color OkColor = System.Drawing.Color.LightGreen;
-        static readonly System.Drawing.Color NokColor = System.Drawing.Color.LightPink;
-        static readonly System.Drawing.Color RejectColor = System.Drawing.Color.Magenta;
-        static readonly System.Drawing.Color ProductionErrorColor = System.Drawing.Color.RoyalBlue;
-        static readonly System.Drawing.Color WrongDirectionColor = System.Drawing.Color.Gold;
-        static readonly System.Drawing.Color WrongQ2FactorsColor = System.Drawing.Color.Red;
-
-        /// <summary>
-        /// Get color for highlighting results and an apporpriate text message.
-        /// </summary>
-        /// <param name="wMtr">Water meter results entity</param>
-        /// <param name="message">Appropriate message</param>
-        /// <returns>Color for results</returns>
-        public virtual System.Drawing.Color GetColorOfResults(bool maxRepeatsExceeded, out string message)
-        {
-            bool wmtrCompleted = CompletedFromTests();
-            bool wmtrPassed = PassedFromTests();
-
-            if ((ErrorFlags & (int)ErrorFlagMask.E28) != 0)
-            {
-                message = Strings.Previous_step_is_missing_or_NOK;
-                return ProductionErrorColor;
-            }
-            else if ((ErrorFlags & (int)ErrorFlagMask.E27) != 0)
-            {
-                message = Strings.Wrong_iPerl_counting_direction;
-                return WrongDirectionColor;
-            }
-            else if ((ErrorFlags & (int)ErrorFlagMask.E26) != 0)
-            {
-                message = Strings.Invalid_Q2_correction_factors;
-                return WrongQ2FactorsColor;
-            }
-            else if (wmtrPassed)
-            {
-                /// Water meter passed (therefore is was also completed)
-                message = Strings.Passed;
-                return OkColor;
-            }
-            else if (wmtrCompleted)
-            {
-                /// Water meter was completed but did not pass => Failed
-                if (maxRepeatsExceeded)
-                {
-                    message = Strings.Test_repetition_count_exceeded_upper_limit;
-                    return RejectColor;
-                }
-                else
-                {
-                    message = Strings.Failed;
-                    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
-                message = Strings.Test_in_progress;
-                return NotCompletedColor;
-            }
-        }
 	}
 }

Results/Forms/BatchResultsDlg.cs

@@ -1,5 +1,10 @@
 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;
@@ -13,33 +18,52 @@ namespace Results.Forms
     {
         static readonly ILog log = LogManager.GetLogger(typeof(BatchResultsDlg));
 
+
+        static readonly Color NotCompletedColor = Color.White;
+        static readonly Color OkColor = Color.LightGreen;
+        static readonly Color NokColor = Color.LightPink;
+        static readonly Color RejectColor = Color.Magenta;
+        static readonly Color ProductionTracing = Color.RoyalBlue;
+        static readonly Color WrongDirection = Color.Gold;
+        static readonly Color WrongQ2FactorsColor = Color.Red;
+
+
+        DateTime lastRedraw;
+        DateTime lastSizeChange;
+        bool loaded;
+
         ///
         /// Public members
         ///
-        public Results.BatchResults Results;
-        public IList<Results.WMeterRsltItemSpec> Items;
         public MetersArrangement MetersArrangement;
         public TestsArrangement TestsArrangement;
         public int NrMetersInOneGroup;
-        public bool ShowDisabledPositions;
-        public int MinWidth;
-        public int MinHeight;
+
+        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 int PopupResultsLeft;
         public int PopupResultsTop;
         public int PopupResultsWidth;
         public int PopupResultsHeight;
-        public int[] RsltsClmnWidths;
 
+        public Results.BatchResults Results { set { Display(value); } }
 
         ///
         /// Private members
         ///
-        IOneWMResultsCtrl[] wmRsltsCtrl;        /// An array of controls with water meter results.
-        IOneWMResultsCtrl firstEnabledControl;
-        DateTime lastRedraw;
-        DateTime lastSizeChange;
-        int metersInOneGroup;
-        int nrGroups;
+        Results.BatchResults results;
+        MetersKind metersKind;
+
+        OneWMResultsCtrl firstListView;
+        public int[] rsltsClmnWidths;
+        int rsltsClmnCount { get { return (rsltsClmnWidths != null) ? rsltsClmnWidths.Length : 0; } }
+
+        int lvWidth;
+        int lvHeight;
+
 
         Timer timer;
 
@@ -47,189 +71,377 @@ namespace Results.Forms
         public BatchResultsDlg()
         {
             InitializeComponent();
+            Text = Strings.Results;
 
-            firstEnabledControl = null;
             lastSizeChange = DateTime.Now;
-            nrGroups = 1;
-            metersInOneGroup = 1;
 
-            /// Create a timer with one second interval.
+            // Create a timer with a ten second interval.
             timer = new Timer();
-            timer.Interval = 1000;   /// ms
+            timer.Interval = 500;   /// 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;
 
-            CreateControlsAndFillPanel(Results);
-            UpdateColumnWidths(RsltsClmnWidths);
-            UpdateResults(Results);
+            loaded = true;
+            if (results != null) Redraw();
+        }
+
+        public void Display(Results.BatchResults results)
+        {
+            this.results = results;
+            if (loaded) Redraw();
         }
 
 
-        ///
-        /// Handle double-click inside a water meter results control
-        ///
-        void OnDoubleClick(object sender, Results.Forms.WaterMeterEventArgs args)
+        IList<Results.WMeterRsltItemSpec> GetRsltItems(MetersKind metersKind)
         {
-            if (Results.WaterMeters != null && args.WMPosition > 0)
+            IList<Results.WMeterRsltItemSpec> srcItems;
+            switch (metersKind)
             {
-                foreach (var wm in Results.WaterMeters)
-                {
-                    if ((wm != null) && (wm.WMPosition == args.WMPosition))
-                    {
-                        ShowMoreWMResults(wm);
-                        return;
-                    }
-                }
+                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;
             }
 
-            MessageBox.Show(Strings.No_water_meter);
-            return;
-        }
-
-
-        void UpdateColumnWidths(int[] columnWidths)
-        {
-            foreach (var ctrl in wmRsltsCtrl) ctrl.Update(columnWidths);
-        }
-
-        void UpdateScrollpositions(int scrollStart)
-        {
-            /// TODO
+            IList<Results.WMeterRsltItemSpec> copiedItems = new List<Results.WMeterRsltItemSpec>();
+            foreach (var it in srcItems) copiedItems.Add(it.Clone());
+            return copiedItems;
         }
 
 
         /// <summary>
         /// Re-draw the results. Apply new settings if they changed.
         /// </summary>
-        void CreateControlsAndFillPanel(Results.BatchResults results)
+        public void Redraw()
         {
-            if ((results == null) || (results.WMPositionsCount == 0))
+            lastRedraw = DateTime.Now;
+            
+            this.SuspendLayout();
+
+            try
             {
-                /// There are no water meters at all
+                /// 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;
+                }
                 flowLayoutPanel.Controls.Clear();
-                wmRsltsCtrl = new OneWMResultsRowsCtrl[0];
-                firstEnabledControl = null;
-                return;
+                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;
+                            }
+
+#if TURA_IPERL || TURA_SPECIAL
+                            lview.WMResultsClickedHandler += delegate(object sender, Results.Forms.WaterMeterEventArgs args)
+                            {
+                                if (InvokeRequired)
+                                {
+                                    Invoke(new EventHandler<Results.Forms.WaterMeterEventArgs>(OnDoubleClick), sender, args);
+                                }
+                                else
+                                {
+                                    OnDoubleClick(sender, args);
+                                }
+                            };
+#endif
+                        }
+                    }
+                }
+            }
+            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);
             }
 
-            ///
-            /// Determine water meter positions count
-            ///
-            int displayedControlsCount = 0;
-            for (int i = 0; i < results.WaterMeters.Length; i++)
+            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 decorated test names for a specified watermeter
+        /// </summary>
+        /// <param name="wMtr">Watermeter results entity</param>
+        /// <returns>A list of strings</returns>
+        IList<string> GetAllDecoratedTestNames(Results.Entities.WaterMeter wMtr)
+        {
+            IList<string> testNames = new List<string>();
+
+            foreach (var mtr in wMtr.MeterTestRslts)
             {
-                if (((results.WaterMeters[i] != null) && !results.WaterMeters[i].Disabled) || ShowDisabledPositions)
+                if ((mtr.CompoundMeterId == (byte)CompoundMeterId.Single || mtr.CompoundMeterId == (byte)CompoundMeterId.Compound || mtr.CompoundMeterId == (byte)CompoundMeterId.HeatMeterEnergy)
+                      && mtr.TestDone
+                      && (mtr.Publish() != Config.Entities.Publish.Never)
+                      && (mtr.Publish() != Config.Entities.Publish.Internal))
                 {
-                    displayedControlsCount++;
+                    testNames.Add(mtr.Name());
                 }
             }
 
-            ///
-            /// Calculate geometry
-            ///
-            metersInOneGroup = Math.Max(1, Math.Min(displayedControlsCount, NrMetersInOneGroup));
-            nrGroups = Math.Max(1, (displayedControlsCount + metersInOneGroup - 1) / metersInOneGroup);
+            return testNames;
+        }
 
-            int oneWidth;
-            int oneHeight;
-            ///
-            if (MetersArrangement == MetersArrangement.Horizontally)
+        /// <summary>
+        /// Get color for highlighting results and an apporpriate text message.
+        /// </summary>
+        /// <param name="wMtr">Water meter results entity</param>
+        /// <param name="message">Appropriate message</param>
+        /// <returns>Color for results</returns>
+        Color GetColorOfResults(Results.Entities.WaterMeter wMtr, out string message)
+        {
+            bool wmtrCompleted = wMtr.CompletedFromTests();
+            bool wmtrPassed = wMtr.PassedFromTests();
+
+            if ((wMtr.ErrorFlags & (int)ErrorFlagMask.E28) != 0)
             {
-                flowLayoutPanel.FlowDirection = FlowDirection.LeftToRight;
-                oneWidth = Math.Max(MinWidth, flowLayoutPanel.Width / metersInOneGroup - 6);
-                oneHeight = Math.Max(MinHeight, flowLayoutPanel.Height / nrGroups - 6);
+                message = Strings.Previous_step_is_missing_or_NOK;
+                return ProductionTracing;
+            }
+            else if ((wMtr.ErrorFlags & (int)ErrorFlagMask.E27) != 0)
+            {
+                message = Strings.Wrong_iPerl_counting_direction;
+                return WrongDirection;
+            }
+            else if ((wMtr.ErrorFlags & (int)ErrorFlagMask.E26) != 0)
+            {
+                message = Strings.Invalid_Q2_correction_factors;
+                return WrongQ2FactorsColor;
+            }
+            else if ((wMtr.ErrorFlags & (int)ErrorFlagMask.E25) != 0)
+            {
+                message = Strings.Test_repetition_count_exceeded_upper_limit;
+                return RejectColor;
+            }
+            else if (wmtrPassed)
+            {
+                /// Water meter passed (therefore is was also completed)
+                message = Strings.Passed;
+                return OkColor;
+            }
+            else if (wmtrCompleted)
+            {
+                /// Water meter was completed but did not pass => Failed
+                message = Strings.Failed;
+                return NokColor;
             }
             else
             {
-                flowLayoutPanel.FlowDirection = FlowDirection.TopDown;
-                oneWidth = Math.Max(MinWidth, flowLayoutPanel.Width / nrGroups - 6);
-                oneHeight = Math.Max(MinHeight, flowLayoutPanel.Height / metersInOneGroup - 6);
+                /// Water meter was not completed yet => did not pass, did not fail
+                message = Strings.Test_in_progress;
+                return NotCompletedColor;
+            }
+        }
+
+
+        /// <summary>
+        /// Get a ListView control filled with results of the meter 'mtr'
+        /// </summary>
+        /// <param name="mtr">Water meter number (1-based): 1 .. Config.Data.WMsCount</param>
+        /// <returns>ListView object</returns>
+        OneWMResultsCtrl GetResultsTestsAreRows(Results.Entities.WaterMeter wMtr, int printedWMNr)
+        {
+            metersKind = wMtr.Compound() ? MetersKind.Combined : (wMtr.HeatMeter() ? MetersKind.HeatMeter : MetersKind.Single);
+
+            string message = string.Empty;
+            Color commonBackColor = GetColorOfResults(wMtr, out message);
+            OneWMResultsCtrl lview = GetListView(commonBackColor, 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++;
             }
 
-            ///
-            /// Create controls and fill the FlowLayoutPanel
-            ///
-            flowLayoutPanel.SuspendLayout();
-            flowLayoutPanel.Controls.Clear();
-            flowLayoutPanel.WrapContents = true;
-            flowLayoutPanel.AutoScroll = true;
 
-            wmRsltsCtrl = new IOneWMResultsCtrl[displayedControlsCount];
+            IList<string> testNames = GetAllDecoratedTestNames(wMtr);
             int ix = 0;
-            firstEnabledControl = null;
-            for (int i = 0; i < results.WaterMeters.Length; i++)
+            foreach (var mtr in wMtr.MeterTestRslts)
             {
-                if (((results.WaterMeters[i] != null) && !results.WaterMeters[i].Disabled) || ShowDisabledPositions)
+                if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Config.Entities.Publish.Never
+																	 && mtr.Publish() != Config.Entities.Publish.Internal)
                 {
-                    /// 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;
+                    ListViewItem lvi = new ListViewItem(testNames[ix++]);
 
-                    if ((results.WaterMeters[i] != null) && !results.WaterMeters[i].Disabled)
+                    for (int i = 0; i < items.Count; i++)
                     {
-                        if ((firstEnabledControl == null) && (results.WaterMeters[i] != null) && !results.WaterMeters[i].Disabled)
+                        string str = items[i].Print(wMtr, mtr.Name());
+
+                        /// Extract and use color information
+                        string[] texts = str.Split(new char[] { '|' });
+                        if (texts.Length == 1)
                         {
-                            firstEnabledControl = wmRsltsCtrl[ix];
+                            lvi.SubItems.Add(str);
                         }
-
-                        //wmRsltsCtrl[ix].Update(results.WaterMeters[i].WMPosition);
-                        wmRsltsCtrl[ix].Update(Items);
-                        wmRsltsCtrl[ix].WMResultsClickedHandler += delegate(object s, Results.Forms.WaterMeterEventArgs args)
+                        else if (texts.Length == 2)
                         {
-                            if (InvokeRequired)
-                            {
-                                Invoke(new EventHandler<Results.Forms.WaterMeterEventArgs>(OnDoubleClick), s, args);
-                            }
-                            else
-                            {
-                                OnDoubleClick(s, args);
-                            }
-                        };
+                            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);
+                        }
                     }
 
-                    flowLayoutPanel.Controls.Add(wmRsltsCtrl[ix] as UserControl);
-                    ix++;
+                    lview.Items.Add(lvi);
                 }
             }
 
-            flowLayoutPanel.ResumeLayout();
-
-            lastRedraw = DateTime.Now;
+            return lview;
         }
 
 
-        void UpdateResults(Results.BatchResults results)
+        /// <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)
         {
-            if ((results != null) && (results.WaterMeters != null))
+            metersKind = wMtr.Compound() ? MetersKind.Combined : (wMtr.HeatMeter() ? MetersKind.HeatMeter : MetersKind.Single);
+
+            string message;
+            Color commonBackColor = GetColorOfResults(wMtr, 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 GetAllDecoratedTestNames(wMtr))
             {
-                int ctrlIx = 0;
-                for (int i = 0; i < results.WaterMeters.Length; i++)
+                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 (((results.WaterMeters[i] != null) && !results.WaterMeters[i].Disabled) || ShowDisabledPositions)
+                    if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Config.Entities.Publish.Never &&
+																			mtr.Publish() != Config.Entities.Publish.Internal)
                     {
-                        if (ctrlIx < wmRsltsCtrl.Length) wmRsltsCtrl[ctrlIx++].Update(results.WaterMeters[i]);
+                        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 ShowMoreWMResults(Results.Entities.WaterMeter wm)
+        void OnDoubleClick(object sender, Results.Forms.WaterMeterEventArgs args)
         {
-            if ((TracingDB.DB.SessionFactory == null) || string.IsNullOrEmpty(wm.SerialNr))
+            Results.Entities.WaterMeter wm = args.WM;
+
+            if (wm == null || wm.Disabled || string.IsNullOrEmpty(wm.SerialNr))
             {
-                new Results.Forms.MoreWMResultsDlg(wm, null).ShowDialog();
+                MessageBox.Show("No water meter or missing S/N");
+            }
+            else if (TracingDB.DB.SessionFactory == null)
+            {
+                MessageBox.Show("No access to tracing database");
             }
             else
             {
@@ -262,7 +474,7 @@ namespace Results.Forms
                         }
                     }
 
-                    new Results.Forms.MoreWMResultsDlg(wm, refRecords).ShowDialog();
+                    new Results.Forms.TracingResultsDlg(refRecords).ShowDialog();
                 }
             }
         }
@@ -276,7 +488,6 @@ namespace Results.Forms
             PopupResultsHeight = Height;
         }
 
-
         private void flowLayoutPanel_SizeChanged(object sender, EventArgs e)
         {
             lastSizeChange = DateTime.Now;
@@ -286,40 +497,13 @@ namespace Results.Forms
         {
             if (DateTime.Compare(lastSizeChange, lastRedraw) > 0)
             {
-                /// The last size change was more recent then the last redraw
+                /// The last size change was later then the last redraw
 
                 DateTime now = DateTime.Now;
                 if (DateTime.Compare(lastSizeChange + new TimeSpan(0, 0, 1), now) < 0)
                 {
-                    /// 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();
+                    /// More then 1s since the last size change
+                    Redraw();
                 }
             }
         }

Results/Forms/IOneWMResultsCtrl.cs

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

@@ -1,164 +0,0 @@
-namespace Results.Forms
-{
-    partial class MoreWMResultsDlg
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.tabControl1 = new System.Windows.Forms.TabControl();
-            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.allResultsTabPage = new System.Windows.Forms.TabPage();
-            this.tabControl1.SuspendLayout();
-            this.productionTracingTabPage.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.productionTracingSplitContainer)).BeginInit();
-            this.productionTracingSplitContainer.Panel1.SuspendLayout();
-            this.productionTracingSplitContainer.Panel2.SuspendLayout();
-            this.productionTracingSplitContainer.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // tabControl1
-            // 
-            this.tabControl1.Controls.Add(this.allResultsTabPage);
-            this.tabControl1.Controls.Add(this.graphsTabPage);
-            this.tabControl1.Controls.Add(this.productionTracingTabPage);
-            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabControl1.Location = new System.Drawing.Point(0, 0);
-            this.tabControl1.Name = "tabControl1";
-            this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(1195, 448);
-            this.tabControl1.TabIndex = 0;
-            // 
-            // graphsTabPage
-            // 
-            this.graphsTabPage.Location = new System.Drawing.Point(4, 22);
-            this.graphsTabPage.Name = "graphsTabPage";
-            this.graphsTabPage.Padding = new System.Windows.Forms.Padding(3);
-            this.graphsTabPage.Size = new System.Drawing.Size(1187, 422);
-            this.graphsTabPage.TabIndex = 1;
-            this.graphsTabPage.Text = "Graphs";
-            this.graphsTabPage.UseVisualStyleBackColor = true;
-            // 
-            // productionTracingTabPage
-            // 
-            this.productionTracingTabPage.Controls.Add(this.productionTracingSplitContainer);
-            this.productionTracingTabPage.Location = new System.Drawing.Point(4, 22);
-            this.productionTracingTabPage.Name = "productionTracingTabPage";
-            this.productionTracingTabPage.Size = new System.Drawing.Size(1187, 422);
-            this.productionTracingTabPage.TabIndex = 2;
-            this.productionTracingTabPage.Text = "Production tracing";
-            this.productionTracingTabPage.UseVisualStyleBackColor = true;
-            // 
-            // productionTracingSplitContainer
-            // 
-            this.productionTracingSplitContainer.BackColor = System.Drawing.SystemColors.Control;
-            this.productionTracingSplitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.productionTracingSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
-            this.productionTracingSplitContainer.IsSplitterFixed = true;
-            this.productionTracingSplitContainer.Location = new System.Drawing.Point(0, 0);
-            this.productionTracingSplitContainer.Name = "productionTracingSplitContainer";
-            this.productionTracingSplitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal;
-            // 
-            // productionTracingSplitContainer.Panel1
-            // 
-            this.productionTracingSplitContainer.Panel1.Controls.Add(this.messageLabel);
-            this.productionTracingSplitContainer.Panel1MinSize = 55;
-            // 
-            // productionTracingSplitContainer.Panel2
-            // 
-            this.productionTracingSplitContainer.Panel2.Controls.Add(this.tracingResultsListView);
-            this.productionTracingSplitContainer.Panel2MinSize = 60;
-            this.productionTracingSplitContainer.Size = new System.Drawing.Size(1187, 422);
-            this.productionTracingSplitContainer.SplitterDistance = 55;
-            this.productionTracingSplitContainer.SplitterWidth = 1;
-            this.productionTracingSplitContainer.TabIndex = 0;
-            // 
-            // messageLabel
-            // 
-            this.messageLabel.AutoSize = true;
-            this.messageLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.messageLabel.Location = new System.Drawing.Point(12, 9);
-            this.messageLabel.Name = "messageLabel";
-            this.messageLabel.Size = new System.Drawing.Size(152, 37);
-            this.messageLabel.TabIndex = 1;
-            this.messageLabel.Text = "Message";
-            // 
-            // tracingResultsListView
-            // 
-            this.tracingResultsListView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tracingResultsListView.GridLines = true;
-            this.tracingResultsListView.Location = new System.Drawing.Point(0, 0);
-            this.tracingResultsListView.Name = "tracingResultsListView";
-            this.tracingResultsListView.Size = new System.Drawing.Size(1187, 366);
-            this.tracingResultsListView.TabIndex = 0;
-            this.tracingResultsListView.UseCompatibleStateImageBehavior = false;
-            this.tracingResultsListView.View = System.Windows.Forms.View.Details;
-            // 
-            // allResultsTabPage
-            // 
-            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
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1195, 448);
-            this.Controls.Add(this.tabControl1);
-            this.Name = "MoreWMResultsDlg";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "Water meter results";
-            this.tabControl1.ResumeLayout(false);
-            this.productionTracingTabPage.ResumeLayout(false);
-            this.productionTracingSplitContainer.Panel1.ResumeLayout(false);
-            this.productionTracingSplitContainer.Panel1.PerformLayout();
-            this.productionTracingSplitContainer.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.productionTracingSplitContainer)).EndInit();
-            this.productionTracingSplitContainer.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TabControl tabControl1;
-        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

@@ -1,188 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-using TracingDB.Entities;
-using Results.Resources;
-using Config.Entities;
-using System.Drawing;
-using System.Windows.Forms.DataVisualization.Charting;
-
-namespace Results.Forms
-{
-    public partial class MoreWMResultsDlg : Form
-    {
-        public MoreWMResultsDlg(Results.Entities.WaterMeter wm, IList<ReferenceRecord> refRecords)
-        {
-            InitializeComponent();
-
-            Localize();
-
-            ShowAllResults(wm);
-            ShowChart(wm);
-
-            if (refRecords == null)
-            {
-                tabControl1.SelectTab(1);
-                tabControl1.TabPages.RemoveAt(2);
-            }
-            else
-            {
-                tabControl1.SelectTab(2);
-                ShowTracingResults(wm, refRecords);
-            }
-        }
-
-
-        void Localize()
-        {
-            Text = Strings.Water_meter_results;
-            tabControl1.TabPages[0].Text = Strings.All_results;
-            tabControl1.TabPages[1].Text = Strings.Graphs;
-            tabControl1.TabPages[2].Text = Strings.Production_tracing_results;
-        }
-
-
-        /// <summary>
-        /// Display all results for this water meter in the 1st tab page
-        /// </summary>
-        /// <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
-
-//            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++;
-//            }
-
-//            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());
-
-//                        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);
-//            }
-        }
-
-
-        void ShowChart(Results.Entities.WaterMeter wm)
-        {
-            //chart.ChartAreas[0].AxisX.LabelStyle.Format = "dd.MM.yy";
-            //chart.ChartAreas[0].AxisX.Interval = 1;
-            //chart.ChartAreas[0].AxisX.IntervalType = ;
-
-            tabControl1.TabPages[1].Controls.Add(Results.Output.WMChart.GetChart(wm, false));
-        }
-
-
-        /// <summary>
-        /// Display tracing results in the 3rd tab page
-        /// </summary>
-        /// <param name="wm">Water meter entity</param>
-        /// <param name="refRecords">ReferenceRecord-s from tracing DB</param>
-        void ShowTracingResults(Results.Entities.WaterMeter wm, IList<ReferenceRecord> refRecords)
-        {
-            tracingResultsListView.Columns.Add(Strings.Date_and_time, 110);
-            tracingResultsListView.Columns.Add(Strings.Step, 100);
-            tracingResultsListView.Columns.Add(Strings.Workplace, 100);
-            tracingResultsListView.Columns.Add(Strings.Name, 100);
-            tracingResultsListView.Columns.Add(Strings.Result, 70);
-            tracingResultsListView.Columns.Add(Strings.Part, 90);
-            tracingResultsListView.Columns.Add(Strings.Code, 150);
-            tracingResultsListView.Columns.Add(Strings.Workflow, 450);
-
-            if (refRecords == null || refRecords.Count == 0)
-            {
-                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,
-                        rr.Workplace,
-                        rr.UserName,
-                        rr.Result == 0 ? "OK" : "NOK",
-                        rr.Workstep.ReferencePart.Name,
-                        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

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

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

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

Results/Forms/OneWMResultsCtrl.cs

@@ -0,0 +1,41 @@
+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.cs

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

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

Results/Forms/WaterMeterEventArgs.cs

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

Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs

@@ -152,12 +152,6 @@ namespace Results.Output.Printers.OnePerMeter
                 }
             }
 
-            if ((cfg.GraphHgh != 0) && (cfg.GraphWid != 0))
-            {
-                Rectangle pos = new Rectangle(cfg.GraphLeft, cfg.GraphTop, cfg.GraphWid, cfg.GraphHgh);
-                WMChart.GetChart(wm, true).Printing.PrintPaint(e.Graphics, pos);
-            }
-
             float tableTop = cfg.TopMargin;
 
             if (pageNr == 1)

Results/Output/Printers/OnePerMeter/OnePerMeterPrinterCfg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2017-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2017 Sensus Slovensko a.s.
 ///
 
 namespace Results.Output.Printers.OnePerMeter
@@ -45,14 +45,10 @@ namespace Results.Output.Printers.OnePerMeter
         public string[] BelowItems3;
         public string Footer;
         public bool TestsAreRows;
-        public int GraphLeft;
-        public int GraphTop;
-        public int GraphWid;
-        public int GraphHgh;
+        public string ImgFullPathName;
         public int ImgLeft;
         public int ImgTop;
         public int ImgWid;
         public int ImgHgh;
-        public string ImgFullPathName;
     }
 }

Results/Output/Printers/Table.cs

@@ -7,7 +7,7 @@ using System.Drawing;
 using System.Drawing.Printing;
 using Config.Entities;
 
-namespace Results.Output
+namespace Results.Output.Printers
 {
     public enum TableLines
     {
@@ -94,7 +94,7 @@ namespace Results.Output
                     else
                     {
                         bool isHeader = (colIx < Style.LeftHeadersCount) || (rowIx < Style.TopHeadersCount);
-                        SizeF size = Printers.PrintersCommon.Measure(e, Rows[rowIx][colIx], isHeader ? Style.HeaderFont : Style.Font);
+                        SizeF size = PrintersCommon.Measure(e, Rows[rowIx][colIx], isHeader ? Style.HeaderFont : Style.Font);
                         if (size.Width > columnWidth[colIx]) columnWidth[colIx] = size.Width;
                         if (size.Height > rowHeight[rowIx]) rowHeight[rowIx] = size.Height;
                     }
@@ -157,7 +157,7 @@ namespace Results.Output
                     {
                         /// In not a separator line
                         bool isHeader = (colIx < Style.LeftHeadersCount) || (rowIx < Style.TopHeadersCount);
-                        SizeF size = Printers.PrintersCommon.Measure(e, Rows[rowIx][colIx], isHeader ? Style.HeaderFont : Style.Font);
+                        SizeF size = PrintersCommon.Measure(e, Rows[rowIx][colIx], isHeader ? Style.HeaderFont : Style.Font);
                         if ((Style.ColumnWidths != null) && (Style.ColumnWidths.Length > colIx))
                         {
                             size.Width = Style.ColumnWidths[colIx]; /// Override measurement if column width is defined
@@ -244,14 +244,14 @@ namespace Results.Output
                     for (int colIndex = 0; colIndex < tblColumnsCount; colIndex++)
                     {
                         bool isHeader = (colIndex < Style.LeftHeadersCount) || (rowIndex < Style.TopHeadersCount);
-                        Printers.PrintersCommon.PrintAt(e, oneTableRow[colIndex],
-                                                           isHeader ? Style.HeaderFont : Style.Font,
-                                                           columnPos[colIndex],
-                                                           rowPos[rowIndex],
-                                                           columnWidth[colIndex],
-                                                           rowHeight[rowIndex],
-                                                           horizAlignment[colIndex],
-                                                           vertAlignment[colIndex]);
+                        PrintersCommon.PrintAt(e, oneTableRow[colIndex],
+                                                  isHeader ? Style.HeaderFont : Style.Font,
+                                                  columnPos[colIndex],
+                                                  rowPos[rowIndex],
+                                                  columnWidth[colIndex],
+                                                  rowHeight[rowIndex],
+                                                  horizAlignment[colIndex],
+                                                  vertAlignment[colIndex]);
                     }
                 }
             }

Results/Output/WMChart.cs

@@ -1,151 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Windows.Forms.DataVisualization.Charting;
-using Config.Entities;
-using Results.Entities;
-using Results.Resources;
-
-namespace Results.Output
-{
-    public class WMChart
-    {
-        public static Chart GetChart(WaterMeter wm, bool isPrinter)
-        {
-			return GetChart(wm, isPrinter, Config.Unit.lph);
-        }
-
-		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.TestRslt.TestTime > 0) && (mtr.TestRslt.PulsesMaster > 0))
-                {
-                    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));
-                    }
-                }
-            }
-            IEnumerable<PointF> sortedPoints = unsortedPoints.OrderBy(x => x.X);
-
-            bool isQ4 = (maxFlow_m3h > 1.1 * wm.WaterMeterData.Q3_Qn);
-
-            Chart chart = new Chart
-            {
-                Name = "chart",
-                Text = "chart",
-                Dock = System.Windows.Forms.DockStyle.Fill,
-                TabIndex = 0,
-                Size = new System.Drawing.Size(5, 5),
-                Location = new System.Drawing.Point(3, 3),
-            };
-
-            ChartArea chArea = new ChartArea { Name = "ChartArea1" };
-            chArea.AxisX.Title = Strings.Flow;
-            chArea.AxisX.IsLogarithmic = true;
-            chArea.AxisX.LogarithmBase = 10;
-            chArea.AxisX.IsLabelAutoFit = true;
-
-            List<double> xs = new List<double>() { 0.0001, 0.0002, 0.0005,
-                                                   0.001, 0.002, 0.005,
-                                                   0.01, 0.02, 0.05,
-                                                   0.1, 0.2, 0.5,
-                                                   1, 2, 5,
-                                                   10, 20, 50,
-                                                   100, 200, 500,
-                                                   1000, 2000, 5000,
-                                                   10000, 20000, 50000,
-                                                   100000, 200000, 500000,
-                                                   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);
-            bool inRange = false;
-            for (int i = 0; i < xs.Count - 3; i += 3)
-            {
-                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 + 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;
-                }
-            }
-
-            chArea.AxisY.Title = Strings.Relative_error;
-            chArea.AxisY.Interval = 3;
-            chArea.AxisY.LabelStyle.Format = "{#} %";
-
-            Legend legend1 = new Legend { Name = "Legend1" };
-
-            Series upperLimit = new Series { Name = Strings.Upper_limit, ChartArea = "ChartArea1", ChartType = SeriesChartType.Line, Color = Color.Red };
-            upperLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q1_Qmin), 5);
-            upperLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), 5);
-            upperLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), 2);
-            upperLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q3_Qn), 2);
-            if (isQ4) upperLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q4_Qmax), 2);
-
-            Series lowerLimit = new Series { Name = Strings.Lower_limit, ChartArea = "ChartArea1", ChartType = SeriesChartType.Line, Color = Color.Red };
-            lowerLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q1_Qmin), -5);
-            lowerLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), -5);
-            lowerLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), -2);
-            lowerLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q3_Qn), -2);
-            if (isQ4) lowerLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q4_Qmax), -2);
-
-            Series line = new Series { Name = Strings.Relative_error, ChartArea = "ChartArea1", ChartType = SeriesChartType.Line, Color = Color.DeepSkyBlue };
-            Series dots = new Series { Name = Strings.Relative_error + " ", ChartArea = "ChartArea1", ChartType = SeriesChartType.Point, Color = Color.RoyalBlue };
-			dots.MarkerStyle = MarkerStyle.Circle;
-			if (isPrinter) dots.MarkerSize = 1;
-			foreach (var point in sortedPoints)
-            {
-                line.Points.AddXY(point.X, point.Y);
-                dots.Points.AddXY(point.X, point.Y);
-            }
-
-            chart.ChartAreas.Add(chArea);
-            chart.Legends.Add(legend1);
-            chart.Series.Add(upperLimit);
-            chart.Series.Add(lowerLimit);
-            chart.Series.Add(dots);
-            chart.Series.Add(line);
-            
-            return chart;
-        }
-    }
-}

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.1340.0")]
-[assembly: AssemblyFileVersion("2.18.1340.0")]
+[assembly: AssemblyVersion("2.18.1241.0")]
+[assembly: AssemblyFileVersion("2.18.1241.0")]

Results/Resources/Strings.Designer.cs

@@ -87,15 +87,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to All results.
-        /// </summary>
-        internal static string All_results {
-            get {
-                return ResourceManager.GetString("All_results", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Approval.
         /// </summary>
@@ -474,15 +465,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Graphs.
-        /// </summary>
-        internal static string Graphs {
-            get {
-                return ResourceManager.GetString("Graphs", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to H amb.
         /// </summary>
@@ -528,15 +510,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Lower limit.
-        /// </summary>
-        internal static string Lower_limit {
-            get {
-                return ResourceManager.GetString("Lower_limit", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to main.
         /// </summary>
@@ -591,15 +564,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to No water meter.
-        /// </summary>
-        internal static string No_water_meter {
-            get {
-                return ResourceManager.GetString("No_water_meter", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to OK.
         /// </summary>
@@ -897,15 +861,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Relative error.
-        /// </summary>
-        internal static string Relative_error {
-            get {
-                return ResourceManager.GetString("Relative_error", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Remark.
         /// </summary>
@@ -996,15 +951,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Serial number is missing.
-        /// </summary>
-        internal static string Serial_number_is_missing {
-            get {
-                return ResourceManager.GetString("Serial_number_is_missing", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Single.
         /// </summary>
@@ -1230,15 +1176,6 @@ 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>
@@ -1914,15 +1851,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Upper limit.
-        /// </summary>
-        internal static string Upper_limit {
-            get {
-                return ResourceManager.GetString("Upper_limit", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to User.
         /// </summary>
@@ -2085,15 +2013,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Water meter results.
-        /// </summary>
-        internal static string Water_meter_results {
-            get {
-                return ResourceManager.GetString("Water_meter_results", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Width.
         /// </summary>

Results/Resources/Strings.cs.resx

@@ -303,37 +303,4 @@
   <data name="Part" xml:space="preserve">
     <value>Součástka</value>
   </data>
-  <data name="All_results" xml:space="preserve">
-    <value>Všechny výsledky</value>
-  </data>
-  <data name="Graphs" xml:space="preserve">
-    <value>Grafy</value>
-  </data>
-  <data name="No_water_meter" xml:space="preserve">
-    <value>Žádný vodoměr</value>
-  </data>
-  <data name="Serial_number_is_missing" xml:space="preserve">
-    <value>Chybí sériové číslo</value>
-  </data>
-  <data name="Error" xml:space="preserve">
-    <value>Chyba</value>
-  </data>
-  <data name="Lower_limit" xml:space="preserve">
-    <value>Dolní hranice</value>
-  </data>
-  <data name="Upper_limit" xml:space="preserve">
-    <value>Horní hranice</value>
-  </data>
-  <data name="Water_meter_results" xml:space="preserve">
-    <value>Výsledky vodoměru</value>
-  </data>
-  <data name="Relative_error" xml:space="preserve">
-    <value>Relativní chyba</value>
-  </data>
-  <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

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

@@ -792,31 +792,4 @@
   <data name="Part" xml:space="preserve">
     <value>Part</value>
   </data>
-  <data name="All_results" xml:space="preserve">
-    <value>All results</value>
-  </data>
-  <data name="Graphs" xml:space="preserve">
-    <value>Graphs</value>
-  </data>
-  <data name="No_water_meter" xml:space="preserve">
-    <value>No water meter</value>
-  </data>
-  <data name="Serial_number_is_missing" xml:space="preserve">
-    <value>Serial number is missing</value>
-  </data>
-  <data name="Lower_limit" xml:space="preserve">
-    <value>Lower limit</value>
-  </data>
-  <data name="Upper_limit" xml:space="preserve">
-    <value>Upper limit</value>
-  </data>
-  <data name="Water_meter_results" xml:space="preserve">
-    <value>Water meter results</value>
-  </data>
-  <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;ZAMBIA</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;IZRAEL_50</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;ZAMBIA</DefineConstants>
+    <DefineConstants>TRACE;IZRAEL_50</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -51,7 +51,6 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Windows.Forms.DataVisualization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -75,30 +74,17 @@
     <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>
     <Compile Include="Forms\ListViewExtensions.cs" />
     <Compile Include="Forms\LviIntColumnComparer.cs" />
     <Compile Include="Forms\LviTextColumnComparer.cs" />
-    <Compile Include="Forms\MoreWMResultsDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\MoreWMResultsDlg.Designer.cs">
-      <DependentUpon>MoreWMResultsDlg.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\OneWMResultsColumnsCtrl.cs">
+    <Compile Include="Forms\OneWMResultsCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <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 Include="Forms\OneWMResultsCtrl.Designer.cs">
+      <DependentUpon>OneWMResultsCtrl.cs</DependentUpon>
     </Compile>
     <Compile Include="Forms\ResultsConfigCtrl.cs">
       <SubType>UserControl</SubType>
@@ -145,12 +131,11 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Output\Printers\OnePerMeter\OnePerMeterPrinterCfg.cs" />
+    <Compile Include="Output\Printers\Table.cs" />
     <Compile Include="Output\Printers\Zapiska\ZapiskaPrintDocument.cs">
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Output\Printers\Zapiska\ZapiskaPrinterCfg.cs" />
-    <Compile Include="Output\Table.cs" />
-    <Compile Include="Output\WMChart.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -191,14 +176,8 @@
     <EmbeddedResource Include="Forms\ListViewEx.resx">
       <DependentUpon>ListViewEx.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\MoreWMResultsDlg.resx">
-      <DependentUpon>MoreWMResultsDlg.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\OneWMResultsColumnsCtrl.resx">
-      <DependentUpon>OneWMResultsColumnsCtrl.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\OneWMResultsRowsCtrl.resx">
-      <DependentUpon>OneWMResultsRowsCtrl.cs</DependentUpon>
+    <EmbeddedResource Include="Forms\OneWMResultsCtrl.resx">
+      <DependentUpon>OneWMResultsCtrl.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\ResultsConfigCtrl.resx">
       <DependentUpon>ResultsConfigCtrl.cs</DependentUpon>
@@ -217,7 +196,6 @@
     <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-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2016-2018 Sensus Slovensko a.s.
 ///
 using System;
 using System.Text;
@@ -27,11 +27,7 @@ namespace Results
                 case 7:  return 29;  /// PT7, special
                 case 8:  return 36;  /// WR13
                 case 9:  return 37;  /// WR15
-                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
+                case 10: return 38;  /// WR16
                 default: return 0;
             }
         }
@@ -47,10 +43,6 @@ 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;
             }
         }

Results/WMeterRsltItemSpec.cs

@@ -211,13 +211,13 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_from,      string.Format("{0} {1}", Strings.VName_Flow, Strings.from),                   Quantity.Flow, ItemCategory.TestData,    (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).Qfrom())));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_to,        string.Format("{0} {1}", Strings.VName_Flow, Strings.to),                     Quantity.Flow, ItemCategory.TestData,    (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).Qto())));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow,        string.Format("{0} v r", Strings.VName_Flow),      Strings.Tooltip_Q_v_r,     Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowVolume)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Qc,          string.Format("Qc"), "Calculated water meter flow",                           Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).VolumeCTV / w.GetMeterTestRslt(t).TestTime * 3.6 * w.GetMeterTestRslt(t).PulsesMaster / w.GetTestRslt(t).PulsesMaster)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_mean,  string.Format("{0} rim ()", Strings.VName_Flow),   Strings.Tooltip_Q_rim,     Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMean)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_min,   string.Format("{0} ref min ()", Strings.VName_Flow), Strings.Tooltip_Q_min,   Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMin)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_max,   string.Format("{0} ref max ()", Strings.VName_Flow), Strings.Tooltip_Q_max,   Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMax)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_start, string.Format("{0} ref start ()",Strings.VName_Flow),Strings.Tooltip_Q_start, Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowStart)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_end,   string.Format("{0} ref end ()", Strings.VName_Flow), Strings.Tooltip_Q_end,   Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowEnd)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Qc, string.Format("Qc"), "Calculated water meter flow",                                    Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V5", (w.GetMeterTestRslt(t).TestTime == 0 || w.GetTestRslt(t).PulsesMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV / w.GetMeterTestRslt(t).TestTime * 3.6 * w.GetMeterTestRslt(t).PulsesMaster / w.GetTestRslt(t).PulsesMaster)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv, string.Format("{0} ctv ()", Strings.VName_Flow), "CTV of the flow (mean val.)",  Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V5", (w.GetMeterTestRslt(t).TestTime == 0 || w.GetTestRslt(t).PulsesMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV / w.GetMeterTestRslt(t).TestTime * 3.6 * w.GetMeterTestRslt(t).PulsesMaster / w.GetTestRslt(t).PulsesMaster)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv,    string.Format("{0} ctv ()", Strings.VName_Flow), "CTV of the flow (mean val.)",Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TestTime == 0) ? 0 : 3.6 * w.GetTestRslt(t).VolumeCTV / w.GetTestRslt(t).TestTime)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv_min, string.Format("{0} ctv min ()", Strings.VName_Flow), "Min. CTV of the flow", Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).VolumeMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV * w.GetTestRslt(t).FlowMin / w.GetTestRslt(t).VolumeMaster)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv_max, string.Format("{0} ctv max ()", Strings.VName_Flow), "Max. CTV of the flow", Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).VolumeMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV * w.GetTestRslt(t).FlowMax / w.GetTestRslt(t).VolumeMaster)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv_start, string.Format("{0} ctv start ()", Strings.VName_Flow), "Start flow CTV",   Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).VolumeMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV * w.GetTestRslt(t).FlowStart / w.GetTestRslt(t).VolumeMaster)));

ResultsBrowser/Forms/DatabaseSettingsDlg.cs

@@ -1,6 +1,8 @@
 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.BenchControl.ComponentParametersDlg cfgForm = new TBF.BenchControl.ComponentParametersDlg();
+			TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg();
 			cfgForm.TbfComponents = new List<Component>();
 
 			cfgForm.ComponentCfgCtrl = cfgControl;

ResultsBrowser/LocalSettings.cs

@@ -109,7 +109,7 @@ namespace ResultsBrowser
             
         public LocalSettings()
         {
-#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
+#if TURA_IPERL || 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.1273.0")]
-[assembly: AssemblyFileVersion("2.18.1273.0")]
+[assembly: AssemblyVersion("2.18.1243.0")]
+[assembly: AssemblyFileVersion("2.18.1243.0")]

ResultsBrowser/Resources/Strings.fr.resx

@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <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;ZAMBIA</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;IZRAEL_50</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;ZAMBIA</DefineConstants>
+    <DefineConstants>TRACE;IZRAEL_50</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -254,7 +254,6 @@
     </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,12 +1,14 @@
 
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
 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}"
@@ -46,10 +48,6 @@ 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
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -72,6 +70,12 @@ 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
@@ -182,26 +186,6 @@ 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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

TBF/AttachedTextBoxes.cs

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

@@ -0,0 +1,75 @@
+///
+/// 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,10 +71,6 @@ 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,7 +25,6 @@ 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()
@@ -38,7 +37,6 @@ 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,192 +31,179 @@ 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.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();
+			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();
 
 		}
 
@@ -237,7 +224,6 @@ 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,7 +110,6 @@ 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()
@@ -122,7 +121,6 @@ namespace TBF.BenchControl.Ambient.Comet
 			dataBitsTextBox.Enabled = true;
 			stopBitsComboBox.Enabled = true;
 			handshakeComboBox.Enabled = true;
-            setDtrCheckBox.Enabled = true;
 		}
 
 		public CfgUpdateFlags UpdateCfg()
@@ -138,7 +136,6 @@ 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

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

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

@@ -1,26 +0,0 @@
-///
-/// 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,11 +20,7 @@ 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; }
-            set { cfg.Corrections = value; }
-        }
+		public IList<MeasurementCorrection> Corrections { get { return cfg.Corrections; } }
 
 
 		/// Constructor, components created in this way is used by

TBF/BenchControl/DataEntry/Standard6/CycleEndForm.cs

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

TBF/BenchControl/DataEntry/StandardCamera/TestStartEndForm.cs

@@ -471,20 +471,17 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
 		/// 
 		void UpdateExclamation(int uiCtrlPos)	/// uiCtrlPos = 0 .. TextBoxesCount-1
 		{
-            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;
-                }
-            }
+			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;
+			}
 		}
 
 

TBF/BenchControl/Dummy/Balance/Component.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016-2017 Sensus Slovensko a.s.
+/// Copyright (c) 2016-2017 Sensus Metering Systems
 ///
 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 Boxes.DoubleBox tara)
+        public IOperation TaringOp(ref TBF.Boxes.DoubleBox tara)
         {
             tara.Val = 0;
             return this;
         }
 
-        public IOperation ReadMassOp(ref Boxes.DoubleBox mass)
+        public IOperation ReadMassOp(ref TBF.Boxes.DoubleBox mass)
         {
             mass.Val = 0;
             return this;
         }
 
-		public IOperation ReadStableMassOp(ref Boxes.DoubleBox mass, int readingsCount, double maxSpread, Config.Entities.MassMethod method)
+		public IOperation ReadStableMassOp(ref TBF.Boxes.DoubleBox mass, int readingsCount, double maxSpread, Config.Entities.MassMethod method)
         {
             mass.Val = 0;
             return this;

TBF/BenchControl/Dummy/Diverter/Component.cs

@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using log4net;
 using Config.Entities;
 using TBF.BenchControl.GenericDevices;
-using TBF.Boxes;
 
 namespace TBF.BenchControl.Dummy.Diverter
 {
@@ -18,11 +17,6 @@ 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()
         {
         }
@@ -30,8 +24,6 @@ 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_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
+#if FUZHOU_300 || IZRAEL_200 || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TURA_IPERL || TURA_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_200 || SLM_50 || GENESIS || MALTA_WSD25 || SLM_END || WARSAW_END || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || DEWA_300 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50
     public enum StatusP : ulong
     {
         RefFlowMeterMask  = 0x7,                /// bits 0,1,2

TBF/BenchControl/Elde/ControlBoardDev.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System;
 using System.Text;
@@ -18,8 +18,6 @@ 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;
 
 		///
@@ -45,9 +43,7 @@ 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 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 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); }
@@ -81,22 +77,48 @@ namespace TBF.BenchControl.Elde
         bool previousEmergencyStop;
 
 
-        public void DiverterToTank(int flowMtrNr)
+
+		private int flowmeterNr4DiverterTest;
+		private bool scheduleDiverterToTank;
+		private bool scheduleDiverterToSink;
+		private bool scheduleReadDiverterTransition;
+		private bool pumpPowerChanged;
+		/// 
+		public void DiverterToTank(int flowmeterNr)
 		{
-            cbCommandQueue.Enqueue(new SendCommandArgs(Command.Start, flowMtrNr, int.MaxValue, int.MaxValue, TestMethods.Diverter | TestMethods.Synchro, StopDevs.None));
+			if (!scheduleDiverterToSink && !scheduleReadDiverterTransition && !emergencyStop)
+			{
+				flowmeterNr4DiverterTest = flowmeterNr;
+				scheduleDiverterToTank = true;
+			}
 		}
 		///
-		public void DiverterToSink(int flowMtrNr)
+		public void DiverterToSink(int flowmeterNr)
 		{
-            cbCommandQueue.Enqueue(new SendCommandArgs(Command.Stop, 0, 0, 0, TestMethods.Diverter,
-                                                       StopDevs.Diverter | StopDevs.GatePulse | StopDevs.Reference | StopDevs.RegValveRegulation));
+			if (!scheduleDiverterToTank && !scheduleReadDiverterTransition && !emergencyStop)
+			{
+				flowmeterNr4DiverterTest = flowmeterNr;
+				scheduleDiverterToSink = true;
+			}
 		}
 		///
-		public void ReadDiverterTransition(int flowMtrNr)
+		public void ReadDiverterTransition(int flowmeterNr)
 		{
-            cbCommandQueue.Enqueue(new SendCommandArgs(Command.ReadDivTransition, flowMtrNr, 0, 0, TestMethods.Diverter, 0));
+			if (!scheduleDiverterToTank && !scheduleDiverterToSink && !emergencyStop)
+			{
+				flowmeterNr4DiverterTest = flowmeterNr;
+				scheduleReadDiverterTransition = true;
+			}
 		}
 
+
+
+        /// <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.
@@ -110,11 +132,11 @@ namespace TBF.BenchControl.Elde
         public byte MeretProtocol = 0;
 
         // Array length is the reference flowmeters count plus one
-#if DN100 || FUZHOU_150 || FUZHOU_300 || IZRAEL_200 || SLM_150 || SENTEC || CEVAK_200
+#if DN100 || FUZHOU_150 || FUZHOU_300 || IZRAEL_200 || PUCHONG_200 || SLM_150 || SENTEC || CEVAK_200
         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[6] { 1, 1, 1, 1, 1, 1 };
-#elif PUCHONG_200 || GENESIS || BERLIN || PETERSBURG_200 || RUM_MOB
+#elif GENESIS || BERLIN || PETERSBURG_200 || RUM_MOB
         public uint[,] RegValveCalib = new uint[16, 2] { {100,500}, {100,500}, {100,500}, {100,500},
 														 {100,500}, {100,500}, {100,500}, {100,500}, 
 														 {100,500}, {100,500}, {100,500}, {100,500}, 
@@ -128,7 +150,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_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
+#elif MUNICH || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TORUN_50 || CEVAK_40 || TURA_IPERL || TURA_SPECIAL || MURES_40 || FUZHOU_50 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FUZHOU_100
         public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}};
 		public byte[] MeretRS485Address = new byte[4];
 		public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 };
@@ -153,22 +175,21 @@ namespace TBF.BenchControl.Elde
 		public uint[] BalanceRange = new uint[2];
 
 
-
-        Queue<SendCommandArgs> cbCommandQueue;
-
-        /// <summary>
-        /// Route: 128-bit word representing the current state of all valves and pumps
-        /// </summary>
-        public UInt128 Route { get { return benchModelRoute; } }
+        ///
+        /// Private values sent by the last SendCommand()
+        ///
+        bool sendCommandFlag;
+        Command cmd;
+        int refNr;
         UInt128 benchModelRoute;
-        UInt128 valvesToInvert;			/// Route = valesToInvert ^ RequiredRouteWithoutInvertedVlaves
-        readonly UInt128 routeMask;		/// This mask masks out virtual valves, routeMask is set in the constructor 
-
+        int totalRefPulses;
+		int massRefPulses;
+		TestMethods testMethods;
         int[] filters;
         float[] FMFreq;
         int regConst;
         int shortImp;
-
+        StopDevs stopDevs;
 
 
         /// <summary>
@@ -191,8 +212,6 @@ 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))
 			{
@@ -213,27 +232,20 @@ namespace TBF.BenchControl.Elde
 			}
 #endif
 
-            if (index >= 0 && index < FMFreq.Length)
-            {
-                if (FMFreq[index] != power)
-                {
-                    FMFreq[index] = power;
+			if (index >= 0 && index < FMFreq.Length && FMFreq[index] != power)
+			{
+				FMFreq[index] = power;
 
-                    pumpPowerChanged = true;	/// Forces sending a command using Command.None
+				pumpPowerChanged = true;	/// Forces sending a command using Command.None
 
-                    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);
-            }
+				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()) : "");
+			}
         }
 
 
@@ -278,9 +290,6 @@ 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
@@ -319,7 +328,7 @@ namespace TBF.BenchControl.Elde
 #else /// all newer benches
 			ControlComponent_Torino2015.UserControl1 ctrlBrdComponent,
 #endif
-            UInt128 valvesToInvert,
+ UInt128 valvesToInvert,
             double[] tankCapacities)
         {
             this.valvesToInvert = valvesToInvert;
@@ -368,9 +377,7 @@ 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;
@@ -391,99 +398,95 @@ 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, };
 		}
 
-        ///
-        /// Used in RunDeviceAfter() when sending commands
-        ///
-        UInt128 lastSentRoute;
-        uint[] lastSentFilters;
-        float[] lastSentFMFreq;
-        int lastsentRegConst;
-        int lastSentShortImp;
-
-		/// <summary>
-        /// Run this device
-        /// </summary>
+		/// <summary>Run this device</summary>
         public void RunDeviceAfter()
         {
             if (DebugLevel == DebugMode.Simulate) return;
 
             UpdateWeights();
 
-            /// Modify queue in case of emergency stop
-            if (emergencyStop && !previousEmergencyStop)
+            uint[] uintFilters = new uint[8];
+            for (int i = 0; i < 8; i++)
             {
-                /// SendCommand() arguments to clear the emergency stop state
-                cbCommandQueue.Clear();
-                cbCommandQueue.Enqueue(new SendCommandArgs(Command.Stop, 0, 0, 0, 0, StopDevs.All));
+                uintFilters[i] = (filters.Length > i) ? (uint)filters[i] : uintFilters[i - 1];
             }
 
-            /// 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++)
+            ///
+            if (sendCommandFlag)
             {
-                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.SendCommand(cmd, refNr, (benchModelRoute & routeMask),
+									   totalRefPulses, massRefPulses, testMethods,
+                                       uintFilters, FMFreq, regConst, shortImp, stopDevs);
             }
 
             controlCom.RunDeviceAfter();
@@ -498,7 +501,7 @@ namespace TBF.BenchControl.Elde
         /// 
         void ShowEmergencyStopForm()
         {
-            (new TBF.UI.Shared.EmergencyStopForm()).Show();
+            (new TBF.Forms.EmergencyStopForm()).Show();
         }
 
 
@@ -507,17 +510,25 @@ 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">State of valves, 128-bit word</param>
+        /// <param name="route">Route: 64-bit installation specific number</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, int totalRefPulses, int massRefPulses,
-                                TestMethods testMethods, StopDevs stopDevs)
+		public void SendCommand(Command cmd, int refFlowmtrNr, UInt128 route,
+								int totalRefPulses, int massRefPulses, TestMethods testMethods, StopDevs stopDevs)
         {
-            cbCommandQueue.Enqueue(new SendCommandArgs(cmd, refFlowmtrNr, totalRefPulses, massRefPulses, testMethods, stopDevs));
+            this.cmd = cmd;
+            this.refNr = refFlowmtrNr;
+            this.benchModelRoute = route;
+            this.totalRefPulses = totalRefPulses;
+			this.massRefPulses = massRefPulses;
+			this.testMethods = testMethods;
+            this.stopDevs = stopDevs;
+
+            sendCommandFlag = true;
         }
 
         /// <summary>
@@ -532,6 +543,7 @@ 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;
         }
 
@@ -640,7 +652,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, bool toTank,
+        public IOperation ReadDiverterTransitionOp(IDiverter div, int runsCountWhenSendingCmd, int runsCountWhenReadingDiv, TBF.Boxes.FloatBox transitionTimeSec,
                                                    Sequences.Statistics plotter, int batchNr, string testName, int repetition)
         {
             if (controlBoardCfg.DebugLevel == DebugMode.Simulate)
@@ -649,7 +661,7 @@ namespace TBF.BenchControl.Elde
             }
             else
             {
-                return new ReadDiverterTransitionOp(this, div, runsCountWhenSendingCmd, runsCountWhenReadingDiv, toTank, plotter, batchNr, testName, repetition);
+                return new ReadDiverterTransitionOp(this, div, runsCountWhenSendingCmd, runsCountWhenReadingDiv, transitionTimeSec, plotter, batchNr, testName, repetition);
             }
         }
 

TBF/BenchControl/Elde/ControlComSim.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -28,8 +28,6 @@ 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
@@ -169,7 +167,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">State of valves, 128-bit word</param>
+		/// <param name="route">Route: 64-bit installation specific number</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>
@@ -177,15 +175,17 @@ 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(SendCommandArgs sendCommandArgs, UInt128 route, uint[] filterConstants, float[] fmFreq, int regConst, int shortImp)
+		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)
 		{
 			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})",
-                            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
+							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
 							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 = sendCommandArgs.Cmd;
-            this.refFlowmtrNr = sendCommandArgs.RefFlowmtrNr;
+			this.cmd = cmd;
+			this.refFlowmtrNr = 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 = sendCommandArgs.TotalRefPulses;
-            this.massRefPulses = sendCommandArgs.MassRefPulses;
-            this.testMethods = sendCommandArgs.TestMethods;
-            this.stopDevs = sendCommandArgs.StopDevs;
-            this.filterConstants = filterConstants;
+			this.totalRefPulses = totalRefPulses;
+			this.massRefPulses = massRefPulses;
+			this.testMethods = testMethods;
+			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,42 +20,36 @@ 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; } }     /// Returns in [Hz] 0..2500, nom.=2000
+        public double ReferenceFreq { get { return 1000.0f * ctrlBrdComponent.referenceFreq; } }     /// In [Hz] 0..2500, nom.=2000
         public double ReferenceFreqs(int i) { return 0; }
-#else
-        /// All newer benches
-        public double ReferenceFreq { get { return 1000.0 * ctrlBrdComponent.referenceFreq[0]; } }  /// Returns in [Hz] 0..2500, nom.=2000
-                                                                                                    /// 
+#else /// all newer benches
         /// <summary>
         /// In case of I11, I12
-        ///     cBrd.referenceFreq[0] = I11 + I12
-        ///     cBrd.referenceFreq[1] = I11
-        ///     cBrd.referenceFreq[2] = I12
+        ///     referenceFreq[0] = I11 + I12
+        ///     referenceFreq[1] = I11
+        ///     referenceFreq[2] = I12
         /// otherwise
-        ///     cBrd.referenceFreq[0] = I2 or I3 or I4
+        ///     referenceFreq[0] = I2 or I3 or I4
         /// </summary>
-        /// <returns>Reference frequency in Hz</returns>
+        public double ReferenceFreq { get { return 1000.0 * ctrlBrdComponent.referenceFreq[0]; } }  /// In [Hz] 0..2500, nom.=2000                                                                                                    /// 
         public double ReferenceFreqs(int i)
         {
-            return ((i >= 0) && (i < ctrlBrdComponent.referenceFreq.Length)) ? (1000.0 * ctrlBrdComponent.referenceFreq[i]) : 0;
+            if ((i >= 0) && (i < ctrlBrdComponent.referenceFreq.Length))
+            {
+                return 1000.0 * ctrlBrdComponent.referenceFreq[0];  /// In [Hz] 0..2500, nom.=2000
+            }
+            else return 0;
         }
 #endif
 
 		public int EtPulses(int wmNr1) { return (int)ctrlBrdComponent.etPulses[wmNr1]; }
 
-#if DN100 || MUNICH || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || TORINO_50 || TORUN_50 || CEVAK_40 || MURES_40 || IZRAEL_200 || MALTA_WSD25
+#if DN100 || MUNICH || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || TORINO_50 || TORUN_50 || CEVAK_40 || MURES_40 || IZRAEL_200 || PUCHONG_200 || MALTA_WSD25
         public int EtPulsesK { get { return 1; }  }
 #else /// all new benches
         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]; }
 
@@ -69,7 +63,7 @@ namespace TBF.BenchControl.Elde
         }
 
 		public float Pressure(int prsNr0) { return ctrlBrdComponent.pressure[prsNr0]; }
-        public float Temperature(int tmpNr0) { return (tmpNr0 >= 0 && tmpNr0 < ctrlBrdComponent.temperature.Length) ? ctrlBrdComponent.temperature[tmpNr0] : 0; }
+		public float Temperature(int tmpNr0) { return ctrlBrdComponent.temperature[tmpNr0]; }
 		public RegulValveState RegulValveState(int rvNr1) { return (RegulValveState)ctrlBrdComponent.rValveStatus[rvNr1 - 1]; }
 #if GENESIS || BERLIN || PETERSBURG_200 || DEWA_300
 		public UInt128 RRoute { get { return ((UInt128)ctrlBrdComponent.rRouteH << 64) | (UInt128)ctrlBrdComponent.rRoute; } }
@@ -77,7 +71,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 || TURA_IPERL_NEW || ALZIR_25
+#if GENESIS || KEMPNO_50 || KRAKOW_50 || BAHRAIN_50 || BADGER_STREDNA_TRAT || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50 || DEWA_300
         public uint DivTime(int id) { return ctrlBrdComponent.divTime[id]; }
         public void SetDivLimit(int divNo, uint limLoPct, uint limHiPct)
         {
@@ -121,7 +115,7 @@ namespace TBF.BenchControl.Elde
 		public float AnalogInput(int adcNr0) { return ctrlBrdComponent.Analogy[adcNr0]; }
 		public uint AnalogInputRaw(int adcNr0, int bank) { return ctrlBrdComponent.AnalogyRaw[adcNr0, bank]; }	/// bank0=RV, bank1=Temp
 
-#if  DN100 || MUNICH || BADGER_MALA_TRAT || BADGER_VELKA_TRAT || FUZHOU_50 || FUZHOU_150 || FUZHOU_300 || IZRAEL_200 || TORINO_50 || TORUN_50 || CEVAK_40 || MURES_40
+#if  DN100 || MUNICH || BADGER_MALA_TRAT || BADGER_VELKA_TRAT || FUZHOU_50 || FUZHOU_150 || FUZHOU_300 || IZRAEL_200 || PUCHONG_200 || TORINO_50 || TORUN_50 || CEVAK_40 || MURES_40
         public float TotalRefVolume { get { return ctrlBrdComponent.ReferenceVolume; } }
         public float MassRefVolume { get { return ctrlBrdComponent.ReferenceVolume; } }
 #else   /// all new test benches
@@ -137,7 +131,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 || ALZIR_25
+#if KEMPNO_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FUZHOU_100 || CEVAK_200 || IZRAEL_50
 		public float ValveOpenCloseTime { get { return ctrlBrdComponent.ValveMoveTime[0]; } }
 #else
         public float ValveOpenCloseTime { get { return 0.001f; } }
@@ -260,7 +254,7 @@ namespace TBF.BenchControl.Elde
 
             ctrlBrdComponent.ExternalCom = true;
 
-#if SENTEC || CEVAK_200 || FUZHOU_100 || IZRAEL_25 || ALZIR_25
+#if SENTEC || CEVAK_200 || FUZHOU_100 || IZRAEL_25
             ctrlBrdComponent.SendCalibData(rvCalib, meretA, (byte)usedCom, tempCalib, etCalib, divEdge, balanceRange, meretProtocol);
 #else
             ctrlBrdComponent.SendCalibData(rvCalib, meretA, (byte)usedCom, tempCalib, etCalib, divEdge, balanceRange);
@@ -307,35 +301,63 @@ namespace TBF.BenchControl.Elde
 		/// <summary>
 		/// Sends a command to the control board.
 		/// </summary>
-        /// <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="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="shortImp">0 = default value, 1 = spec. processing of very short pulses</param>
-        public void SendCommand(SendCommandArgs sendCommandArgs, UInt128 route, uint[] filterConstants, float[] fmFreq, int regConst, int shortImp)
+		/// <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)
 		{
             if (Program.MainWnd.InvokeRequired)
             {
-                /// From another thread ... use Invoke()
-                Program.MainWnd.Invoke((SendCommandDlgt)DoSendCommand, new object[] { sendCommandArgs, route, filterConstants, fmFreq, regConst, shortImp });
+                /// 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()
             }
             else
             {
-                /// Call DoSendCommand() directly
-                DoSendCommand(sendCommandArgs, route, filterConstants, fmFreq, regConst, shortImp);
+                /// When SendCommand(...) called from the UI thread
+				DoSendCommand(cmd, refFlowMeterNr, route, totalRefPulses, massRefPulses, testMethods,
+                              filterConstants, fmFreq, regConst, shortImp, stopDevs);
             }
         }
         ///
-        delegate void SendCommandDlgt(SendCommandArgs sendCommandArgs, UInt128 route, uint[] filterConstants, float[] fmFreq, int regConst, int 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);
         ///
-        private void DoSendCommand(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)
         {
+            //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 to value FMIndex+50).
+			/// (in FUZHOU_300 the FM pump bit should be set set to value FMIndex+50).
 			/// 
 			bool bit39 = (route & 0x00FC000000000000) != 0;		/// true if any of bits 50 through 55 is set
 			route = route & 0xFF03FFFFFFFFFFFF;
@@ -352,100 +374,49 @@ 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})",
-                            sendCommandArgs.Cmd,                                            /// 0
-                            sendCommandArgs.RefFlowmtrNr,									/// 1
-                            Utils.RouteToStr(route),						                /// 2
-                            sendCommandArgs.TotalRefPulses,
-                            sendCommandArgs.MassRefPulses,
-                            sendCommandArgs.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})",
+                            cmd,                                                            /// 0
+                            refFlowMeterNr,											        /// 1
+							Utils.RouteToStr(route),										/// 2
+                            totalRefPulses, massRefPulses, 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,                                                       /// 13
-                            shortImp,                                                       /// 14
-                            sendCommandArgs.StopDevs);									    /// 15
+                            regConst, shortImp, stopDevs);									/// 13, 14, 15
 
 #if DN100 || MUNICH
-            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)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);
+            ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, (uint)totalRefPulses, (uint)testMethods,
+                                         Convert.ToSingle(filterConstants[0]), fmFreq[0], (uint)regConst, (uint)shortImp, (uint)stopDevs);
+#elif BADGER_MALA_TRAT || BADGER_VELKA_TRAT || FUZHOU_50 || FUZHOU_150 || FUZHOU_300 || IZRAEL_200 || PUCHONG_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);
 #elif BERLIN || SLM_150 || PETERSBURG_200
-            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);
+            uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses };
+            ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)(route & (UInt128)0xFFFFFFFFFFFFFFFF), (ulong)(route >> 64), pulsesArr, (uint)testMethods,
+                                         Convert.ToSingle(filterConstants[0]), fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs);
 #elif GENESIS || DEWA_300
-            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);
+            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 || 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
+            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);
 #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,7 +6,6 @@ using System.Collections.Generic;
 using log4net;
 using Dirichlet.Numerics;
 using TBF.BenchControl.Generic;
-using TBF.Boxes;
 using TBF.Resources;
 
 namespace TBF.BenchControl.Elde.Diverter
@@ -46,10 +45,6 @@ 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]
@@ -75,8 +70,7 @@ 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++;
 			///
@@ -123,12 +117,10 @@ namespace TBF.BenchControl.Elde.Diverter
             flowMtrNr4Cmd = divNrFromName;
 #elif CEVAK_200
 			flowMtrNr4Cmd = (divNrFromName == 4) ? 5 : divNrFromName;
-#elif DEWA_300 || PUCHONG_200
+#elif DEWA_300
 			flowMtrNr4Cmd = divNrFromName + 2;              /// Div1: 1,2,3, Div2: 4, Div3: 5, Div4: 6, Div5: 7
-#elif TURA_IPERL || TURA_IPERL_NEW
+#elif TURA_IPERL
             flowMtrNr4Cmd = divNrFromName + 16 * divNrFromName;
-#elif FILIPINY_50
-            flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : 7;
 #else
             flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : 3;
 #endif

TBF/BenchControl/Elde/Diverter/DiverterCfg.cs

@@ -1,7 +1,6 @@
 ///
 /// Copyright (c) 2013-2016 Sensus Metering Systems
 ///
-using System;
 using System.IO;
 using System.Collections.Generic;
 using System.Xml.Serialization;
@@ -9,7 +8,7 @@ using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Elde.Diverter
 {
-    public class DiverterCfg : ComponentCfgBase, IChildComponentCfg, GenericDevices.ICalibInfoCfg
+    public class DiverterCfg : ComponentCfgBase, IChildComponentCfg
 	{
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(DiverterCfg) })[0];
 		public override XmlSerializer GetSerializer() { return Serializer; }
@@ -19,36 +18,13 @@ 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 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; }
-        }
-
+		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
 
 		/// Private parameterless constructor invoked by all other (public) constructors
 		DiverterCfg()
@@ -62,7 +38,6 @@ 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,12 +73,6 @@ 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();
@@ -87,7 +81,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // nameTextBox
             // 
             this.nameTextBox.Enabled = false;
-            this.nameTextBox.Location = new System.Drawing.Point(144, 41);
+            this.nameTextBox.Location = new System.Drawing.Point(137, 41);
             this.nameTextBox.Name = "nameTextBox";
             this.nameTextBox.Size = new System.Drawing.Size(130, 20);
             this.nameTextBox.TabIndex = 2;
@@ -95,7 +89,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // nameLabel
             // 
             this.nameLabel.AutoSize = true;
-            this.nameLabel.Location = new System.Drawing.Point(21, 44);
+            this.nameLabel.Location = new System.Drawing.Point(27, 44);
             this.nameLabel.Name = "nameLabel";
             this.nameLabel.Size = new System.Drawing.Size(35, 13);
             this.nameLabel.TabIndex = 1;
@@ -104,7 +98,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // classNameLabel
             // 
             this.classNameLabel.AutoSize = true;
-            this.classNameLabel.Location = new System.Drawing.Point(141, 17);
+            this.classNameLabel.Location = new System.Drawing.Point(134, 17);
             this.classNameLabel.Name = "classNameLabel";
             this.classNameLabel.Size = new System.Drawing.Size(83, 13);
             this.classNameLabel.TabIndex = 0;
@@ -113,7 +107,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // parentNameLabel
             // 
             this.parentNameLabel.AutoSize = true;
-            this.parentNameLabel.Location = new System.Drawing.Point(21, 67);
+            this.parentNameLabel.Location = new System.Drawing.Point(27, 67);
             this.parentNameLabel.Name = "parentNameLabel";
             this.parentNameLabel.Size = new System.Drawing.Size(69, 13);
             this.parentNameLabel.TabIndex = 3;
@@ -122,7 +116,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // bitPositionLabel
             // 
             this.bitPositionLabel.AutoSize = true;
-            this.bitPositionLabel.Location = new System.Drawing.Point(21, 91);
+            this.bitPositionLabel.Location = new System.Drawing.Point(27, 91);
             this.bitPositionLabel.Name = "bitPositionLabel";
             this.bitPositionLabel.Size = new System.Drawing.Size(59, 13);
             this.bitPositionLabel.TabIndex = 5;
@@ -131,7 +125,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // bitPositionTextBox
             // 
             this.bitPositionTextBox.Enabled = false;
-            this.bitPositionTextBox.Location = new System.Drawing.Point(144, 88);
+            this.bitPositionTextBox.Location = new System.Drawing.Point(137, 88);
             this.bitPositionTextBox.Name = "bitPositionTextBox";
             this.bitPositionTextBox.Size = new System.Drawing.Size(46, 20);
             this.bitPositionTextBox.TabIndex = 6;
@@ -140,7 +134,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // 
             this.parentNameComboBox.Enabled = false;
             this.parentNameComboBox.FormattingEnabled = true;
-            this.parentNameComboBox.Location = new System.Drawing.Point(144, 64);
+            this.parentNameComboBox.Location = new System.Drawing.Point(137, 64);
             this.parentNameComboBox.Name = "parentNameComboBox";
             this.parentNameComboBox.Size = new System.Drawing.Size(130, 21);
             this.parentNameComboBox.TabIndex = 4;
@@ -148,7 +142,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // startingEdgeTextBox
             // 
             this.startingEdgeTextBox.Enabled = false;
-            this.startingEdgeTextBox.Location = new System.Drawing.Point(144, 180);
+            this.startingEdgeTextBox.Location = new System.Drawing.Point(137, 180);
             this.startingEdgeTextBox.Name = "startingEdgeTextBox";
             this.startingEdgeTextBox.Size = new System.Drawing.Size(46, 20);
             this.startingEdgeTextBox.TabIndex = 14;
@@ -156,7 +150,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // startingEdgeLabel
             // 
             this.startingEdgeLabel.AutoSize = true;
-            this.startingEdgeLabel.Location = new System.Drawing.Point(21, 183);
+            this.startingEdgeLabel.Location = new System.Drawing.Point(27, 183);
             this.startingEdgeLabel.Name = "startingEdgeLabel";
             this.startingEdgeLabel.Size = new System.Drawing.Size(68, 13);
             this.startingEdgeLabel.TabIndex = 13;
@@ -165,7 +159,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // thresholdLoTextBox
             // 
             this.thresholdLoTextBox.Enabled = false;
-            this.thresholdLoTextBox.Location = new System.Drawing.Point(144, 203);
+            this.thresholdLoTextBox.Location = new System.Drawing.Point(137, 203);
             this.thresholdLoTextBox.Name = "thresholdLoTextBox";
             this.thresholdLoTextBox.Size = new System.Drawing.Size(46, 20);
             this.thresholdLoTextBox.TabIndex = 17;
@@ -173,7 +167,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // thresholdLoLabel
             // 
             this.thresholdLoLabel.AutoSize = true;
-            this.thresholdLoLabel.Location = new System.Drawing.Point(21, 206);
+            this.thresholdLoLabel.Location = new System.Drawing.Point(27, 206);
             this.thresholdLoLabel.Name = "thresholdLoLabel";
             this.thresholdLoLabel.Size = new System.Drawing.Size(69, 13);
             this.thresholdLoLabel.TabIndex = 16;
@@ -182,7 +176,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(197, 205);
+            this.label2.Location = new System.Drawing.Point(190, 205);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(15, 13);
             this.label2.TabIndex = 18;
@@ -191,7 +185,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(197, 183);
+            this.label1.Location = new System.Drawing.Point(190, 183);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(15, 13);
             this.label1.TabIndex = 15;
@@ -231,7 +225,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // adcToTankTextBox
             // 
             this.adcToTankTextBox.Enabled = false;
-            this.adcToTankTextBox.Location = new System.Drawing.Point(144, 157);
+            this.adcToTankTextBox.Location = new System.Drawing.Point(137, 157);
             this.adcToTankTextBox.Name = "adcToTankTextBox";
             this.adcToTankTextBox.Size = new System.Drawing.Size(46, 20);
             this.adcToTankTextBox.TabIndex = 12;
@@ -239,7 +233,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // adcTankLabel
             // 
             this.adcTankLabel.AutoSize = true;
-            this.adcTankLabel.Location = new System.Drawing.Point(21, 160);
+            this.adcTankLabel.Location = new System.Drawing.Point(27, 160);
             this.adcTankLabel.Name = "adcTankLabel";
             this.adcTankLabel.Size = new System.Drawing.Size(94, 13);
             this.adcTankLabel.TabIndex = 11;
@@ -248,7 +242,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // adcToSinkTextBox
             // 
             this.adcToSinkTextBox.Enabled = false;
-            this.adcToSinkTextBox.Location = new System.Drawing.Point(144, 134);
+            this.adcToSinkTextBox.Location = new System.Drawing.Point(137, 134);
             this.adcToSinkTextBox.Name = "adcToSinkTextBox";
             this.adcToSinkTextBox.Size = new System.Drawing.Size(46, 20);
             this.adcToSinkTextBox.TabIndex = 10;
@@ -256,7 +250,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // adcSinkLabel
             // 
             this.adcSinkLabel.AutoSize = true;
-            this.adcSinkLabel.Location = new System.Drawing.Point(21, 137);
+            this.adcSinkLabel.Location = new System.Drawing.Point(27, 137);
             this.adcSinkLabel.Name = "adcSinkLabel";
             this.adcSinkLabel.Size = new System.Drawing.Size(92, 13);
             this.adcSinkLabel.TabIndex = 9;
@@ -425,7 +419,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // adcNrTextBox
             // 
             this.adcNrTextBox.Enabled = false;
-            this.adcNrTextBox.Location = new System.Drawing.Point(144, 111);
+            this.adcNrTextBox.Location = new System.Drawing.Point(137, 111);
             this.adcNrTextBox.Name = "adcNrTextBox";
             this.adcNrTextBox.Size = new System.Drawing.Size(46, 20);
             this.adcNrTextBox.TabIndex = 8;
@@ -433,7 +427,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // label7
             // 
             this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(21, 114);
+            this.label7.Location = new System.Drawing.Point(27, 114);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(76, 13);
             this.label7.TabIndex = 7;
@@ -442,7 +436,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // label8
             // 
             this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(197, 228);
+            this.label8.Location = new System.Drawing.Point(190, 228);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(15, 13);
             this.label8.TabIndex = 29;
@@ -451,7 +445,7 @@ namespace TBF.BenchControl.Elde.Diverter
             // thresholdHiTextBox
             // 
             this.thresholdHiTextBox.Enabled = false;
-            this.thresholdHiTextBox.Location = new System.Drawing.Point(144, 226);
+            this.thresholdHiTextBox.Location = new System.Drawing.Point(137, 226);
             this.thresholdHiTextBox.Name = "thresholdHiTextBox";
             this.thresholdHiTextBox.Size = new System.Drawing.Size(46, 20);
             this.thresholdHiTextBox.TabIndex = 28;
@@ -459,74 +453,16 @@ namespace TBF.BenchControl.Elde.Diverter
             // thresholdHiLabel
             // 
             this.thresholdHiLabel.AutoSize = true;
-            this.thresholdHiLabel.Location = new System.Drawing.Point(21, 229);
+            this.thresholdHiLabel.Location = new System.Drawing.Point(27, 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);
@@ -613,11 +549,5 @@ 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,8 +80,6 @@ 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();
@@ -100,8 +98,6 @@ 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)
@@ -164,16 +160,6 @@ 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;
 		}
 
@@ -246,20 +232,6 @@ 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 toTank;
+        bool start;
         int flowMtrNr;
 
-        public SwitchDiverterOp(ControlBoardDev controlBoard, bool toTank, int flowMtrNr)
+        public SwitchDiverterOp(ControlBoardDev controlBoard, bool start, int flowMtrNr)
         {
             this.controlBoard = controlBoard;
-            this.toTank = toTank;
+            this.start = start;
             this.flowMtrNr = flowMtrNr;
         }
 
         public void Start()
         {
-            if (toTank)
+            if (start)
             {
                 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, 0, 0, testMethod, StopDevs.None);
+            controlBoard.SendCommand(commandOnStartOp, 0, controlBoard.Route, 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, 0, 0, testMethod, StopDevs.None);
+                controlBoard.SendCommand(commandOnStopOp, 0, controlBoard.Route, 0, 0, testMethod, StopDevs.None);
 			}
 		}
 	}

TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReader.cs

@@ -17,15 +17,6 @@ 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,6 +22,8 @@ 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,6 +2,8 @@
 /// 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,67 +28,22 @@ namespace TBF.BenchControl.Elde.FlowMeterDewa
         public double NominalFlow { get { return nominalFlow; } }
         public double LtrPerPulse { get { return ltrPerPulse; } }
 
-        double[] refFreq;   /// 0..sum, 1..I11, 2..I12, 3..I13
-        int[] refPulses;
+        double[] refFreq;
 
         public double LtrPerPulseCorrected(double flow, int rangeIx)
         {
-            log.DebugFormat("LtrPerPulseCorrected({0}, {1}) started", flow, rangeIx);
+            if (flow < 0.1 * NominalFlow) return LtrPerPulse;     /// No correction for small flow
 
             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];
 
-            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;
-            }
+            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];
         }
 
 
@@ -101,9 +56,7 @@ 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)
@@ -127,7 +80,6 @@ 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,6 +2,8 @@
 /// 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

@@ -18,10 +18,12 @@ namespace TBF.BenchControl.Elde.FlowMeterTriplet
 
         public int Idx1 { get { return flowMeterCfg.Idx1; } }
         public double NominalFlow { get { return flowMeterCfg.NominalFlow; } }
-        public double LtrPerPulse { get { return flowMeterCfg.NominalFlow / 21600.0; } }    /// Nominal frequency is 6000 Hz
+        public double LtrPerPulse { get { return flowMeterCfg.NominalFlow / 21600.0f; } } /// Nominal frequency is 6000 Hz
 
         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,6 +2,7 @@
 /// Copyright (c) 2017 Sensus Slovensko a.s.
 ///
 using System;
+using System.Globalization;
 using System.Windows.Forms;
 using Config.Entities;
 using TBF.BenchControl.Generic;

TBF/BenchControl/Elde/FlowMeterTwins/FlowMeter.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using log4net;
-using TBF.BenchControl;
 using TBF.Boxes;
 
 namespace TBF.BenchControl.Elde.FlowMeterTwins
@@ -16,14 +15,14 @@ namespace TBF.BenchControl.Elde.FlowMeterTwins
 
 		readonly FlowMeterCfg flowMeterCfg;
         readonly ControlBoardDev controlBoard;
-        public readonly Elde.FlowMeter.FlowMeter FlowMeter1;
-        public readonly Elde.FlowMeter.FlowMeter FlowMeter2;
+        public readonly TBF.BenchControl.Elde.FlowMeter.FlowMeter FlowMeter1;
+        public readonly TBF.BenchControl.Elde.FlowMeter.FlowMeter FlowMeter2;
 
         public int Idx1 { get { return 0; } }
         public double NominalFlow { get { return flowMeterCfg.NominalFlow; } }
 
         /// The nominal flowed of a pair of flow meters is reached at 4000Hz
-        public double LtrPerPulse { get { return flowMeterCfg.NominalFlow / 14400.0; } }
+        public double LtrPerPulse { get { return flowMeterCfg.NominalFlow / 14400.0f; } }
 
         /// Calculates the average of values of two flowmeters. Assumes the flow is divided evenly. 
         public double LtrPerPulseCorrected(double flow, int rangeIx)
@@ -45,10 +44,10 @@ namespace TBF.BenchControl.Elde.FlowMeterTwins
 			controlBoard = (ControlBoardDev)TbfComponents.FindComponent(cfg.ParentName, components);
 			if (controlBoard == null) throw new Exception("Cannot find " + Name + " parent");
 
-            FlowMeter1 = TbfComponents.FindComponent(flowMeterCfg.FlowMeter1, components) as Elde.FlowMeter.FlowMeter;
+            FlowMeter1 = (TBF.BenchControl.Elde.FlowMeter.FlowMeter)TbfComponents.FindComponent(flowMeterCfg.FlowMeter1, components);
             if (FlowMeter1 == null) throw new Exception("Cannot find FlowMeter1 component");
 
-            FlowMeter2 = TbfComponents.FindComponent(flowMeterCfg.FlowMeter2, components) as Elde.FlowMeter.FlowMeter;
+            FlowMeter2 = (TBF.BenchControl.Elde.FlowMeter.FlowMeter)TbfComponents.FindComponent(flowMeterCfg.FlowMeter2, components);
             if (FlowMeter2 == null) throw new Exception("Cannot find FlowMeter2 component");
 
             controlBoard.EtCalib[Idx1] = (float)flowMeterCfg.NominalFlow;		/// Idx1==0 for FlowMeterTwins

TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.cs

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

TBF/BenchControl/Elde/IControlCom.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
 using System;
 using Dirichlet.Numerics;
@@ -11,9 +11,7 @@ namespace TBF.BenchControl.Elde
         StatusP StatusP { get; }
 		int EtPulses(int wmNr1);
         int EtPulsesK { get; }
-        int EtPulses2 { get; }
-        int EtPulses3 { get; }
-        UInt16 WMeterPulses(int wmNr1);
+		UInt16 WMeterPulses(int wmNr1);
 		int WMeterReference(int wmNr0);
         uint RegulValveDAC(int rvNr0);
 		float Pressure(int prsNr0);
@@ -61,13 +59,19 @@ namespace TBF.BenchControl.Elde
 		/// <summary>
 		/// Updates a command that is regularly sent to the control board by SendCommand.
 		/// </summary>
-        /// <param name="sendCommandArgs">Arguments, see SendCommandArgs class</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>
-        void SendCommand(SendCommandArgs sendCommandArgs, UInt128 route, uint[] filterConstants, float[] fmFreq, int regConst, int shortImp);
+		/// <param name="cmd">See ControlBoard.Command enum</param>
+		/// <param name="refNr">Number of the etalon/reference (1..5)</param>
+		/// <param name="route">Route: 64-bit installation specific number</param>
+		/// <param name="totalRefPulses">Kolko impulzov ma trvat skuska</param>
+		/// <param name="massRefPulses">Pri 'MassAndContinue' metode kolko impulzov ma trvat mass measurement</param>
+		/// <param name="testMethods">See ControlBoard.TestMethods enum</param>
+		/// <param name="filterConstant">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 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>
+		void SendCommand(Command cmd, int refNr, UInt128 route, int totalRefPulses, int massRefPulses, TestMethods testMethods,
+						 uint[] filterConstants, float[] fmFreq, int regConst, int shortImp, StopDevs stopDevs);
 
 		/// <summary>
 		/// Control of regulating valves.

TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.cs

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

TBF/BenchControl/Elde/ReadDiverterTransitionOp.cs

@@ -21,9 +21,9 @@ namespace TBF.BenchControl.Elde
 		/// Set by the constructor
 		readonly ControlBoardDev controlBoard;
         readonly GenericDevices.IDiverter div;
-        readonly bool toTank;
         readonly int runsCountWhenSendingCmd;
         readonly int runsCountWhenReadingDiv;
+        readonly FloatBox transitionTimeSec;
         readonly Sequences.Statistics plotter;
         readonly int batchNr;
         readonly string testName;
@@ -43,19 +43,19 @@ namespace TBF.BenchControl.Elde
 		/// <param name="method">Test method</param>
 		/// <param name="refPulses">Test duration in number of reference flowmeter pulses</param>
 		/// <param name="filterConstant">Specifies filter for watermeter pulses</param>
-        public ReadDiverterTransitionOp(ControlBoardDev controlBoard, GenericDevices.IDiverter div, int runsCountWhenSendingCmd, int runsCountWhenReadingDiv, bool toTank,
-                                        Sequences.Statistics plotter, int batchNr, string testName, int repetition)
+        public ReadDiverterTransitionOp(ControlBoardDev controlBoard, GenericDevices.IDiverter div, int runsCountWhenSendingCmd, int runsCountWhenReadingDiv,
+                                        FloatBox transitionTimeSec, Sequences.Statistics plotter, int batchNr, string testName, int repetition)
         {
 			if (controlBoard == null) throw new ArgumentNullException("controlBoardDev");
-            if (div == null) throw new ArgumentNullException("div");
             if (runsCountWhenSendingCmd < 0) throw new ArgumentNullException("runsCountWhenSendingCmd");
             if (runsCountWhenReadingDiv <= runsCountWhenSendingCmd) throw new ArgumentNullException("runsCountWhenReadingDiv");
+            if (transitionTimeSec == null) throw new ArgumentNullException("transitionTimeSec");
 
 			this.controlBoard = controlBoard;
             this.div = div;
             this.runsCountWhenSendingCmd = runsCountWhenSendingCmd;
             this.runsCountWhenReadingDiv = runsCountWhenReadingDiv;
-            this.toTank = toTank;
+            this.transitionTimeSec = transitionTimeSec;
             this.plotter = plotter;
             this.batchNr = batchNr;
             this.testName = testName;
@@ -102,7 +102,7 @@ namespace TBF.BenchControl.Elde
                 if (plotter == null)
                 {
                     ReadDiverterTransitionTimes();
-                    log.DebugFormat("Run() ... Reading diverter {0} transition times: {1}s", div.Name, (toTank ? div.SwitchTimeStart : div.SwitchTimeEnd).Val);
+                    log.DebugFormat("Run() ... Reading diverter {0} transition times: {1}s", div.Name, transitionTimeSec.Val);
                 }
                 else
                 {
@@ -115,7 +115,7 @@ namespace TBF.BenchControl.Elde
                     }
                     plotter.Stop();
 
-                    log.DebugFormat("Run() ... Calculating diverter {0} transition times: {1}s", div.Name, (toTank ? div.SwitchTimeStart : div.SwitchTimeEnd).Val);
+                    log.DebugFormat("Run() ... Calculating diverter {0} transition times: {1}s", div.Name, transitionTimeSec.Val);
                     CalculateDiverterTransitionTimes();
                 }
             }
@@ -132,7 +132,7 @@ namespace TBF.BenchControl.Elde
         void SendCommand()
         {
             controlBoard.SyncRoute();
-            controlBoard.SendCommand(Command.ReadDivTransition, 0, 0, 0, 0, StopDevs.None);
+            controlBoard.SendCommand(Command.ReadDivTransition, 0, controlBoard.Route, 0, 0, 0, StopDevs.None);
             cmdSent = true;
         }
 
@@ -142,7 +142,7 @@ namespace TBF.BenchControl.Elde
         /// <returns>true (always)</returns>
         bool ReadDiverterTransitionTimes()
         {
-            (toTank ? div.SwitchTimeStart : div.SwitchTimeEnd).Val = (float)controlBoard.DivTime(2) - (float)controlBoard.DivTime(1);
+            transitionTimeSec.Val = (float)controlBoard.DivTime(2) - (float)controlBoard.DivTime(1);
             return true;
         }
 
@@ -191,7 +191,7 @@ namespace TBF.BenchControl.Elde
 
             if ((startedRising || startedFalling) && stopped)
             {
-                (toTank ? div.SwitchTimeStart : div.SwitchTimeEnd).Val = 0.002f * (float)(transitionEndIdx - transitionStartIdx);    /// 2 ms per sample
+                transitionTimeSec.Val = 0.002f * (float)(transitionEndIdx - transitionStartIdx);    /// 2 ms per sample
                 return true;
             }
             else

TBF/BenchControl/Elde/RegisterReader/RegisterReader.cs

@@ -110,12 +110,13 @@ namespace TBF.BenchControl.Elde.RegisterReader
 			wmPulses = lastPulses;
 			wmRefPulses = (int)controlBoard.EtPulses(Position);
 
-			log.DebugFormat("{0}:ReadPulses() completed, wmPulses={1}  wmRefPulses={2}", Name, wmPulses, wmRefPulses);
+			log.DebugFormat("{0}:ReadPulses() completed, wmPulses={1}  wmRefPulses={2}  cb.EtPulses(0)={3}", Name, wmPulses, wmRefPulses, (int)controlBoard.EtPulses(0));
 		}
 
 		/// <summary>Start this operation</summary>
 		public void Start()
 		{
+			log.DebugFormat("{0}:Start()", Name);
 			lastPulsesValid = false;
 			ReadPulses();
 		}
@@ -124,6 +125,7 @@ namespace TBF.BenchControl.Elde.RegisterReader
 		/// <returns>eventDone</returns>
 		public Event Run()
 		{
+			log.DebugFormat("{0}:Run()", Name);
 			ReadPulses();
 			return Event.ReadRegisterDone;
 		}
@@ -131,6 +133,7 @@ namespace TBF.BenchControl.Elde.RegisterReader
 		/// <summary>Stop this operation</summary>
 		public void Stop()
 		{
+			log.DebugFormat("{0}:Stop()", Name);
             ReadPulses();
         }
 	}

TBF/BenchControl/Elde/RegulValve/RegulValve.cs

@@ -108,9 +108,14 @@ namespace TBF.BenchControl.Elde.RegulValve
 #endif
 
 			if (Idx1 < ControlBoard.RegValveCalib.GetLength(0))
-            {
+			{
+#if IZRAEL_25
 				this.ControlBoard.RegValveCalib[adcChannel, 0] = (uint)DacValueClosed;
 				this.ControlBoard.RegValveCalib[adcChannel, 1] = (uint)DacValueOpen;
+#else
+                this.ControlBoard.RegValveCalib[Idx1 - 1, 0] = (uint)DacValueClosed;
+                this.ControlBoard.RegValveCalib[Idx1 - 1, 1] = (uint)DacValueOpen;
+#endif
 			}
 			else
 			{

TBF/BenchControl/Elde/RegulValve/SetFlowOp.cs

@@ -198,17 +198,16 @@ namespace TBF.BenchControl.Elde.RegulValve
 				opState = OpState.ValveMoveToFlow1;
 			}
 
-            /// Start flow measurement
-            controlBoard.SendCommand(Command.Start, flowMeter.Idx1, int.MaxValue, int.MaxValue, 0, 0);  /// TestMethods=0, StopDevs=0
+            TestMethods tm = 0;
+            StopDevs sd = 0;
+			// '_regulValve.RegulValveCfg.PidCoef' replaced by a casted operation parameter 'pidCoef'
+            controlBoard.SendCommand(Command.Start, flowMeter.Idx1, controlBoard.Route,
+									 int.MaxValue, int.MaxValue, tm, sd); 
 		}
 
 		/// <summary>Run this operation</summary>
 		/// <returns>
-        ///     Event.OpArgumentError
-		///		Event.Starting
-        ///		Event.Busy
-        ///		Event.FlowReached
-        ///		Event.RegulValveTimeOut
+		///		Event.None, Event.FlowReached, Event.RegulValveTimeOut, Event.OpArgumentError
 		/// </returns>
 		public Event Run()
 		{
@@ -247,14 +246,17 @@ namespace TBF.BenchControl.Elde.RegulValve
 					opState = OpState.ValveMoveToFlow1;
 				}
 
-                /// Start flow measurement
-                controlBoard.SendCommand(Command.Start, flowMeter.Idx1, int.MaxValue, int.MaxValue, 0, 0);  /// TestMethods=0, StopDevs=0
-				return Event.Starting;
+				TestMethods tm = 0;
+				StopDevs sd = 0;
+				// '_regulValve.RegulValveCfg.PidCoef' replaced by a casted operation parameter 'pidCoef'
+                controlBoard.SendCommand(Command.Start, flowMeter.Idx1, controlBoard.Route,
+										 int.MaxValue, int.MaxValue, tm, sd);
+				return Event.None;
 			}
 			else if (opState == OpState.ValveMoveToPosition1)
 			{
 				opState = OpState.ValveMoveToPosition2;
-				return Event.Starting;
+				return Event.None;
 			}
 			else if (opState == OpState.ValveMoveToPosition2)	/// Move to position
 			{
@@ -264,7 +266,7 @@ namespace TBF.BenchControl.Elde.RegulValve
 									   regulValve.StableTime);
 
 				opState = OpState.SettingPosition;
-				return Event.Starting;
+				return Event.None;
 			}
 			else if (opState == OpState.ValveMoveToPosition3)
 			{
@@ -276,14 +278,14 @@ namespace TBF.BenchControl.Elde.RegulValve
                 {
                     opState = OpState.SettingPosition;
                 }
-				return Event.Starting;
+				return Event.None;
 			}
 			else if (opState == OpState.CheckStatePosition)	/// Verify
 			{
 				if (((ulong)controlBoard.StatusP & (ulong)StatusP.RefPulsesMsrmnt) == 0)
 				{
 					opState = OpState.SendCommandAgain;
-					return Event.Starting;
+					return Event.None;
 				}
 				else if (controlBoard.RegulValveState(regulValveNr) != RegulValveState.DacValueRegul)
 				{
@@ -296,12 +298,12 @@ namespace TBF.BenchControl.Elde.RegulValve
                                     regulValveNr, targetPositionLo, targetPositionHi, regulValve.StableTime);
 
 					opState = OpState.ValveMoveToPosition3;
-					return Event.Starting;
+					return Event.None;
 				}
 				else
 				{
 					opState = OpState.SettingPosition;
-					return Event.Starting;
+					return Event.None;
 				}
 			}
 			else if (opState == OpState.SettingPosition)
@@ -311,12 +313,12 @@ namespace TBF.BenchControl.Elde.RegulValve
 				{
 					opState = OpState.ValveMoveToFlow1;
 				}
-				return Event.Starting;
+				return Event.None;
 			}
 			else if (opState == OpState.ValveMoveToFlow1)
 			{
 				opState = OpState.ValveMoveToFlow2;
-				return Event.Starting;
+				return Event.None;
 			}
 			else if (opState == OpState.ValveMoveToFlow2)	/// Move to flow
 			{
@@ -338,7 +340,7 @@ namespace TBF.BenchControl.Elde.RegulValve
 									   regulValve.StableTime);
 
 				opState = OpState.ValveMoveToFlow3;
-				return Event.Starting;
+				return Event.None;
 			}
 			else if (opState == OpState.ValveMoveToFlow3)
 			{
@@ -350,7 +352,7 @@ namespace TBF.BenchControl.Elde.RegulValve
                 {
                     opState = OpState.SettingFlow;
                 }
-				return Event.Starting;
+				return Event.None;
 			}
 			else if (opState == OpState.CheckStateFlow)       /// Verify the flow setting
 			{
@@ -358,7 +360,7 @@ namespace TBF.BenchControl.Elde.RegulValve
                      (controlBoard.RegulValveState(regulValveNr) & RegulValveState.PwOrFreqRegul) != RegulValveState.PwOrFreqRegul)
 				{
 					opState = OpState.SendCommandAgain;
-					return Event.Starting;
+					return Event.None;
 				}
 				else if (controlBoard.RegulValveState(regulValveNr) != RegulValveState.PwOrFreqRegul)
 				{
@@ -373,34 +375,30 @@ namespace TBF.BenchControl.Elde.RegulValve
                                     regulValveNr, freqLo, freqHi, regulValve.StableTime);
 
                     opState = OpState.ValveMoveToFlow3;
-					return Event.Starting;
+					return Event.None;
 				}
 				else
 				{
 					opState = OpState.SettingFlow;
-					return Event.Busy;
+					return Event.None;
 				}
 			}
 			else if (opState == OpState.SettingFlow)
 			{
-				/// Regulation valve is setting flow to the required value
-
-                if ((currentReqFlowLo <= flow) && (flow <= currentReqFlowHi))
+				///
+				/// Repeated untill the required flow is reached
+				/// 
+				if ((currentReqFlowLo <= flow) && (flow <= currentReqFlowHi))
 				{
-                    /// Flow is within range
-
-                    if (flowWithinBoundsTime++ >= regulValve.FlowStableSec)
+					if (flowWithinBoundsTime++ >= regulValve.FlowStableSec)
 					{
-                        /// Flow is within range for sufficiently long time
-
-                        if (regulValve.RegulValveCfg.StoredPositionReuse)
+						if (regulValve.RegulValveCfg.StoredPositionReuse)
 						{
 							float storedPosition;
 							if (regulValve.Dict.TryGetValue(reqFlowAve, out storedPosition))
 							{
 								/// update the stored valve position
-								
-                                StoreTargetPosition(reqFlowAve, (rvPosition + storedPosition) / 2.0f);
+								StoreTargetPosition(reqFlowAve, (rvPosition + storedPosition) / 2.0f);
 								log.InfoFormat("Run(): rv#={0} reqFlow={1} pos={2}% stored={3} <--- Updating a stored position",
 												regulValveNr, reqFlowAve, rvPosition.ToString("F1"), storedPosition);
 							}
@@ -421,7 +419,7 @@ namespace TBF.BenchControl.Elde.RegulValve
 					else
 					{
 						log.InfoFormat("flow = {0} m3/h (lo={1}, hi={2}, FLOW_OK_TIMER={3}s)", flow, currentReqFlowLo, currentReqFlowHi, flowWithinBoundsTime);
-						return Event.Busy;
+						return Event.None;
 					}
 				}
 				else if (StateMachine.Time > expireTime)
@@ -432,7 +430,7 @@ namespace TBF.BenchControl.Elde.RegulValve
 				{
 					log.InfoFormat("flow = {0} m3/h (lo={1}, hi={2})", flow, currentReqFlowLo, currentReqFlowHi);
 					flowWithinBoundsTime = 0;
-					return Event.Busy;
+					return Event.None;
 				}
 			}
 			else /// opState == OpState.FlowReached
@@ -445,13 +443,14 @@ namespace TBF.BenchControl.Elde.RegulValve
         /// <summary>Start this operation</summary>
         public void Stop()
 		{
-            if (!leaveMeasurementRunning)
-            {
-			    /// Stop measurement
-                controlBoard.SendCommand(Command.Stop, flowMeter.Idx1, 50000, 50000, 0, StopDevs.RegValveRegulation);   /// TestMethods=0
-            }
+			opState = OpState.Idle;
 
-            opState = OpState.Idle;
+            if (leaveMeasurementRunning) return;
+            
+			/// Stop measurement
+            TestMethods tm = 0;
+            StopDevs sd = StopDevs.RegValveRegulation;
+            controlBoard.SendCommand(Command.Stop, flowMeter.Idx1, controlBoard.Route, 50000, 50000, tm, sd);
         }
 	}
 }

TBF/BenchControl/Elde/RegulValveCoax/SetFlowOp.cs

@@ -212,7 +212,8 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
             TestMethods tm = 0;
             StopDevs sd = 0;
 			// '_regulValve.RegulValveCfg.PidCoef' replaced by a casted operation parameter 'pidCoef'
-			controlBoard.SendCommand(Command.Start, flowMeterNr, int.MaxValue, int.MaxValue, tm, sd); 
+			controlBoard.SendCommand(Command.Start, flowMeterNr, controlBoard.Route,
+									 int.MaxValue, int.MaxValue, tm, sd); 
 		}
 
 		/// <summary>Run this operation</summary>
@@ -261,7 +262,8 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
 				TestMethods tm = 0;
 				StopDevs sd = 0;
 				// '_regulValve.RegulValveCfg.PidCoef' replaced by a casted operation parameter 'pidCoef'
-				controlBoard.SendCommand(Command.Start, flowMeterNr, int.MaxValue, int.MaxValue, tm, sd);
+				controlBoard.SendCommand(Command.Start, flowMeterNr, controlBoard.Route,
+										 int.MaxValue, int.MaxValue, tm, sd);
 				log.DebugFormat("  return Event.None");
 				return Event.None;
 			}
@@ -477,7 +479,7 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
 			/// Stop measurement
             TestMethods tm = 0;
             StopDevs sd = StopDevs.RegValveRegulation;
-            controlBoard.SendCommand(Command.Stop, flowMeterNr, 50000, 50000, tm, sd);
+            controlBoard.SendCommand(Command.Stop, flowMeterNr, controlBoard.Route, 50000, 50000, tm, sd);
 
 			log.WarnFormat("Stop() SendCommand(Stop, {0}, ...)", flowMeterNr);
         }

TBF/BenchControl/Elde/RegulValveTandem/SetFlowOp.cs

@@ -217,7 +217,8 @@ namespace TBF.BenchControl.Elde.RegulValveTandem
             TestMethods tm = 0;
             StopDevs sd = 0;
 			// '_regulValve.RegulValveTandemCfg.PidCoef' replaced by a casted operation parameter 'pidCoef'
-			controlBoard.SendCommand(Command.Start, flowMeterNr, int.MaxValue, int.MaxValue, tm, sd); 
+			controlBoard.SendCommand(Command.Start, flowMeterNr, controlBoard.Route,
+									 int.MaxValue, int.MaxValue, tm, sd); 
 		}
 
 		/// <summary>Run this operation</summary>
@@ -370,7 +371,7 @@ namespace TBF.BenchControl.Elde.RegulValveTandem
 			/// Stop measurement
             TestMethods tm = 0;
             StopDevs sd = StopDevs.RegValveRegulation;
-            controlBoard.SendCommand(Command.Stop, flowMeterNr, 50000, 50000, tm, sd);
+            controlBoard.SendCommand(Command.Stop, flowMeterNr, controlBoard.Route, 50000, 50000, tm, sd);
         }
 	}
 }

TBF/BenchControl/Elde/SendCommandArgs.cs

@@ -1,33 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using Dirichlet.Numerics;
-
-namespace TBF.BenchControl.Elde
-{
-    public class SendCommandArgs
-    {
-        public Command Cmd;
-        public int RefFlowmtrNr;
-        public int TotalRefPulses;
-        public int MassRefPulses;
-        public TestMethods TestMethods;
-        public StopDevs StopDevs;
-
-        public SendCommandArgs()
-        {
-        }
-
-        public SendCommandArgs(Command cmd, int refFlowmtrNr, int totalRefPulses, int massRefPulses,
-                               TestMethods testMethods, StopDevs stopDevs)
-        {
-            Cmd = cmd;
-            RefFlowmtrNr = refFlowmtrNr;
-            TotalRefPulses = totalRefPulses;
-            MassRefPulses = massRefPulses;
-            TestMethods = testMethods;
-            StopDevs = stopDevs;
-        }
-    }
-}

TBF/BenchControl/Elde/StartMeasurementOp.cs

@@ -113,19 +113,18 @@ namespace TBF.BenchControl.Elde
         void SendStartCommand()
         {
             controlBoard.SyncRoute();
-#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || BADGER_VELKA_TRAT || SLM_50
+#if TURA_IPERL || TURA_SPECIAL || BADGER_VELKA_TRAT || SLM_50
 			int flowMeterIdxAndDiv = flowMeterNr + 16 * diverterNr;
 #elif BADGER_STREDNA_TRAT
 			int flowMeterIdxAndDiv = flowMeterNr + 8 * (diverterNr - 1);
-#elif FILIPINY_50
-            int flowMeterIdxAndDiv = flowMeterNr + ((flowMeterNr == 3) ? (4 * (diverterNr - 1)) : 0);
 #else
             int flowMeterIdxAndDiv = flowMeterNr;
 #endif
             log.InfoFormat("Start() : SendCommand(Cmd.Start, {0}, route, {1}, {1}, {2}, Stop.None)",
                             flowMeterIdxAndDiv, totalRefPulses, testMethod);
 
-            controlBoard.SendCommand(Command.Start, flowMeterIdxAndDiv, totalRefPulses, massRefPulses, testMethod, StopDevs.None);
+            controlBoard.SendCommand(Command.Start, flowMeterIdxAndDiv, controlBoard.Route,
+                                     totalRefPulses, massRefPulses, testMethod, StopDevs.None);
         }
 
 		/// <summary>Start this operation</summary>

TBF/BenchControl/Elde/StopFlowRegulationOp.cs

@@ -35,7 +35,12 @@ namespace TBF.BenchControl.Elde
         void SendStopFlowRegulationCommand()
         {
             controlBoard.SyncRoute();
-            controlBoard.SendCommand(Command.Stop, flowMeterNr, 0, 0, 0, StopDevs.RegValveRegulation);
+            controlBoard.SendCommand(Command.Stop,
+                                     flowMeterNr,               /// ref. flowmeter number
+                                     controlBoard.Route,        /// route
+                                     0, 0,						/// ref. pulses
+                                     0,
+                                     StopDevs.RegValveRegulation);
         }