Reconfigured for GENESIS

.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;PETERSBURG_200;LANG_RU</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;GENESIS;IPERL;LANG_DE</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;PETERSBURG_200;LANG_RU</DefineConstants>
+    <DefineConstants>TRACE;GENESIS;IPERL;LANG_DE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

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,24 +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
-		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
+#elif FUZHOU_300 || FUZHOU_150 || IZRAEL_200 || PUCHONG_200 || GENESIS || SLM_150 || PETERSBURG_200 || DEWA_300
 		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;
-        public const int CompoundWMsCount = 3;
-        public const int HeatMetersCount = 0;
-        public const int MaxPartNr = WMsCount / LineSize;
 #elif DUBAJ_50
 		public const int WMsCount = 10;
 		public const int LineSize = 5;
@@ -62,7 +50,7 @@ namespace Config
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = 1;
-#elif TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50
+#elif TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50
         public const int WMsCount = 20;
 		public const int LineSize = 10;
 		public const int CompoundWMsCount = 1;
@@ -74,7 +62,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

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

Config/Entities/Test.cs

@@ -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; }

Config/Formulas.cs

@@ -221,60 +221,45 @@ namespace Config
 			return error;
 		}
 
+		/// <summary>
+		/// Calculates corrected value form a list of corrections by interpolation.
+		/// It is assumed that values in the list 'corrections' are sorted.
+		/// </summary>
+		/// <param name="rawMeasurement">Raw uncorrected value</param>
+		/// <param name="corrections">Sorted (value, correction) pairs</param>
+		/// <returns>Corrected value</returns>
+		public static double CorrectedValue(double rawValue, IList<Config.Entities.MeasurementCorrection> corrections)
+		{
+			if (corrections == null || corrections.Count == 0) return rawValue;
 
-        /// <summary>
-        /// Calculates corrected value from a list of corrections by interpolation.
-        /// It is assumed that values in the list 'corrections' are sorted.
-        /// </summary>
-        /// <param name="rawMeasurement">Raw uncorrected value</param>
-        /// <param name="corrections">Sorted (value, correction) pairs</param>
-        /// <returns>Corrected value</returns>
-        public static double CorrectedValue(double rawValue, IList<Config.Entities.MeasurementCorrection> corrections)
-        {
-            return rawValue + GetCorrection(rawValue, corrections);
-        }
+			if (rawValue < corrections[0].Measurement)
+			{
+				return rawValue + corrections[0].Correction;
+			}
 
-        /// <summary>
-        /// Get a correction from a list of corrections by interpolation.
-        /// It is assumed that values in the list 'corrections' are sorted.
-        /// </summary>
-        /// <param name="rawMeasurement">Raw uncorrected value</param>
-        /// <param name="corrections">Sorted (value, correction) pairs</param>
-        /// <returns>Corrected value</returns>
-        public static double GetCorrection(double rawValue, IList<Config.Entities.MeasurementCorrection> corrections)
-        {
-            if ((corrections == null) || (corrections.Count == 0)) return 0;    /// No correction
+			int count = corrections.Count;
+			for (int i = 1; i < count; i++)
+			{
+				if (rawValue < corrections[i].Measurement)
+				{
+					double d1 = rawValue - corrections[i-1].Measurement;
+					double d2 = corrections[i].Measurement - rawValue;
 
-            if (rawValue < corrections[0].Measurement)
-            {
-                /// rawValue is below the lowest value in the correction table
-                return corrections[0].Correction;
-            }
+					double corr;
+					if (d1 + d2 <= float.Epsilon)
+					{
+						corr = (corrections[i - 1].Correction + corrections[i].Correction) / 2.0;
+					}
+					else
+					{
+						corr = (corrections[i - 1].Correction * d2 + corrections[i].Correction * d1) / (d1 + d2);
+					}
+					return rawValue + corr;
+				}
+			}
 
-            int count = corrections.Count;
-            for (int i = 1; i < count; i++)
-            {
-                if (rawValue < corrections[i].Measurement)
-                {
-                    double d1 = rawValue - corrections[i - 1].Measurement;
-                    double d2 = corrections[i].Measurement - rawValue;
-
-                    if (d1 + d2 <= float.Epsilon)
-                    {
-                        /// Neigboring values in the corection table are close to each other -> calculate the average
-                        return (corrections[i - 1].Correction + corrections[i].Correction) / 2.0;
-                    }
-                    else
-                    {
-                        /// Interpolate the correction from neigboring values in the corection table
-                        return (corrections[i - 1].Correction * d2 + corrections[i].Correction * d1) / (d1 + d2);
-                    }
-                }
-            }
-
-            /// rawValue is above the highest value in the correction table
-            return corrections[count - 1].Correction;
-        }
+			return rawValue + corrections[count - 1].Correction;
+		}
 
 
         /// <summary>

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.1151.0")]
+[assembly: AssemblyFileVersion("2.18.1151.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>

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

@@ -164,11 +164,11 @@ namespace Results
 		{
 			for (int i = 0; i < WMPositionsCount; i++)
 			{
-                if ((WaterMeters[i] != null) && !WaterMeters[i].Disabled)
+				if (WaterMeters[i] != null)
 				{
 					foreach (var mtr in WaterMeters[i].MeterTestRslts)
 					{
-                        if (!mtr.TestDone) return false;
+						if (!mtr.TestDone) return false;
 					}
 				}
 			}

Results/Entities/Batch.cs

@@ -29,17 +29,7 @@ namespace Results.Entities
         public virtual float DensityCorr { get; set; }				/// Density correction in [kg/m3]
 		public virtual float Custom2 { get; set; }
 		public virtual float Custom3 { get; set; }
-        public virtual int Counter1 { get; set; }
-        public virtual int Counter2 { get; set; }
-        public virtual int Counter3 { get; set; }
-        public virtual int Counter4 { get; set; }
-        public virtual int Counter5 { get; set; }
-        public virtual int Counter6 { get; set; }
-        public virtual int Counter7 { get; set; }
-        public virtual int Counter8 { get; set; }
-        public virtual int Counter9 { get; set; }
-        public virtual int Counter10 { get; set; }
-        public virtual DateTime StartTime { get; set; }
+		public virtual DateTime StartTime { get; set; }
 		public virtual DateTime EndTime { get; set; }
         public virtual bool Dirty { get; set; }
         public virtual bool RsltsSent { get; set; }
@@ -48,7 +38,7 @@ namespace Results.Entities
 		public virtual IList<WaterMeter> WaterMeters { get; set; }
 		public virtual IList<TestRslt> TestRslts { get; set; }
 		public virtual bool Compound { get; set; }					/// Not mapped to DB now
-        public virtual bool HeatMeter { get; set; }					/// Not mapped to DB now                                                                   /// 
+        public virtual bool HeatMeter { get; set; }					/// Not mapped to DB now
 
         public Batch()
 		{

Results/Entities/MeterTestRslt.cs

@@ -10,7 +10,7 @@ namespace Results.Entities
         public virtual int Id { get; protected set; }
 
 		public virtual byte   CompoundMeterId { get; set; }		/// 0=single, 1=compound/main, 2=compound/aux., 3=compound/overal, 4=heat meter volume, 5=heat meter energy
-        public virtual int    RegReaderType   { get; set; }     /// Not mapped to the DB, does not depend on localization and customer
+        public virtual int    RegReaderType   { get; set; }     /// Not mapped to the DB, does not depent on localisation and customer
                                                                 
 		public virtual double PulsesMeter     { get; set; }		/// # of water meter or heat meter pulses
 		public virtual double PulsesMaster	  { get; set; }		/// # of reference flowmeter pulses (gated by this water meter pulses)
@@ -25,7 +25,6 @@ namespace Results.Entities
  
 		/// Main result
 		public virtual double Error			  { get; set; }		/// [%]
-        public virtual int    ErrorIndicators { get; set; }		/// Not mapped to DB !!!, bit24=E25, bit25=E26, bit26=E27, bit27=E28
         public virtual double KorrErrQ        { get; set; }     /// [%] not mapped to results DB, saved to Oracle DB
 		public virtual bool   TestDone		  { get; set; }		/// true = test was completed
 		public virtual bool   Passed		  { get; set; }		/// true = test passed, water meter is OK
@@ -128,13 +127,9 @@ namespace Results.Entities
 		    TimestampEnd = src.TimestampEnd;
 		    TestTime = src.TestTime;
 		    Error = src.Error;
-            ErrorIndicators = src.ErrorIndicators;
             KorrErrQ = src.KorrErrQ;
 		    TestDone = src.TestDone;
             Passed = src.Passed;
-#if ORACLE_DB
-            LastError = src.LastError;
-#endif
         }
 
         public override string ToString()

Results/Entities/TestRslt.cs

@@ -15,24 +15,22 @@ namespace Results.Entities
 		public virtual TestData TestData { get; set; }
 		public virtual Components Components { get; set; }
         public virtual int Part { get; set; }
-		public virtual int RepetitionNr { get; set; }           /// Repetition number from the set of repeated tests (1...)
-        public virtual string MethodClass { get; set; }         /// Not mapped to DB, does not depend on localization and customer
+		public virtual int RepetitionNr { get; set; }       /// Repetition number from the set of repeated tests (1...)
+        public virtual string MethodClass { get; set; }     /// Not mapped to the DB, does not depent on localisation and customer
 
 		/// Main results
 		public virtual bool TestDone { get; set; }
         public virtual string Remark { get; set; }
-		public virtual DateTime StartTime { get; set; }         /// Date and time of the test start
-		public virtual DateTime EndTime { get; set; }           /// Date and time of the test end
-		public virtual int FlowSetTime { get; set; }            /// [s]     Flow set time in seconds
-        public virtual int TimeBtwnMassMsrmnts { get; set; }    /// [s]     Time between two mass measurements in seconds (if applicable)
-        public virtual double TestTime { get; set; }            /// [s]     Test time in seconds
-        public virtual double TestTimeCorrection { get; set; }  /// [s]     Correction of the test time due to diverter (0 for methods w/o diverter or when there is no correction table)
-		public virtual double PulsesMaster { get; set; }        /// [pls]   FlyingStartMassCollectionProlonged: MID pulses of the water to the tank 
-        public virtual double TotalPulsesMstr { get; set; }     /// [pls]   FlyingStartMassCollectionProlonged: MID pulses of the complete test (not mapped to DB)
-        public virtual double ConstMasterRaw { get; set; }      /// [l/pls] Liters per pulse of the master flow meter uncorrected.
-        public virtual double ConstMasterCorr { get; set; }     /// [l/pls] Liters per pulse of the master flow meter corrected by a correction table.
-        public virtual double ConstMaster { get; set; }         /// [l/pls] Liters per pulse of the master flow meter calculated from a mass measurement.
-                                                                ///         When mass measurement is not available, corrected by a correction table.
+		public virtual DateTime StartTime { get; set; }     /// Date and time of the test start
+		public virtual DateTime EndTime { get; set; }       /// Date and time of the test end
+		public virtual int FlowSetTime { get; set; }        /// [s]     Measurement time in seconds
+		public virtual double TestTime { get; set; }        /// [s]     Measurement time in seconds
+		public virtual double PulsesMaster { get; set; }    /// [pls]   FlyingStartMassCollectionProlonged: MID pulses of the water to the tank 
+        public virtual double TotalPulsesMstr { get; set; } /// [pls]   FlyingStartMassCollectionProlonged: MID pulses of the complete test (not mapped to DB)
+        public virtual double ConstMasterRaw { get; set; }  /// [l/pls] Liters per pulse of the master flow meter uncorrected.
+        public virtual double ConstMasterCorr { get; set; } /// [l/pls] Liters per pulse of the master flow meter corrected by a correction table.
+        public virtual double ConstMaster { get; set; }     /// [l/pls] Liters per pulse of the master flow meter calculated from a mass measurement.
+                                                            ///         When mass measurement is not available, corrected by a correction table.
         public virtual double MassStartRaw { get; set; }	/// [kg]
 		public virtual double MassStart { get; set; }		/// [kg]
 		public virtual double MassEndRaw { get; set; }		/// [kg]
@@ -134,25 +132,10 @@ namespace Results.Entities
 		public virtual double TargetVolume() { return TestData.TargetVolume; }
 		public virtual double TargetTime()	 { return TestData.TargetTime; }
 		public virtual string Method()		 { return TestData.Method; }
-        public virtual string RefFlowmeter() { return (Components != null) ? Components.Flowmeter : 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 IsVolumeMethod() { return (MethodClass != null) ? (MethodClass.Contains("TestMethods.FixedStart.") || MethodClass.Contains("TestMethods.FlyingStart.")) : false; }
-
-        public virtual string MethodElde()
-        {
-            if (MethodClass == null) return string.Empty;
-            else if (MethodClass.Contains("TestMethods.FlyingStartMassCollection.")) return "MS";
-            else if (MethodClass.Contains("TestMethods.FlyingStartMassCollectionProlonged.")) return "MS";
-            else if (MethodClass.Contains("TestMethods.FlyingStartMassCollectionComparative.")) return "MS";
-            else if (MethodClass.Contains("TestMethods.FlyingStart.")) return "VS";
-            else if (MethodClass.Contains("TestMethods.FixedStartMassCollection.")) return "MP";
-            else if (MethodClass.Contains("TestMethods.FixedStartTankCollection.")) return "VP";
-            else if (MethodClass.Contains("TestMethods.FixedStart.")) return "VP";
-            else return string.Empty;
-        }
+        public virtual bool IsDiverter()     { return (MethodClass != null) ? (MethodClass.Contains("FlyingStart") && MethodClass.Contains("MassColl")) : true; }
 
 		public virtual double ErrLimLo()
         {
@@ -235,13 +218,10 @@ namespace Results.Entities
 		    StartTime = src.StartTime;
 		    EndTime = src.EndTime;
 		    FlowSetTime = src.FlowSetTime;
-            TimeBtwnMassMsrmnts = src.TimeBtwnMassMsrmnts;
 		    TestTime = src.TestTime;
 		    PulsesMaster = src.PulsesMaster;
-            TotalPulsesMstr = src.TotalPulsesMstr;
             ConstMasterRaw = src.ConstMasterRaw;
-            ConstMasterCorr = src.ConstMasterCorr;
-            ConstMaster = src.ConstMaster;
+		    ConstMaster = src.ConstMaster;
 		    MassStartRaw = src.MassStartRaw;
 		    MassStart = src.MassStart;
 		    MassEndRaw = src.MassEndRaw;
@@ -256,13 +236,7 @@ namespace Results.Entities
 		    VolumeMaster = src.VolumeMaster;
 		    ErrorMaster = src.ErrorMaster;
             DiverterStart = src.DiverterStart;
-            DivStart10 = src.DivStart10;
-            DivStart50 = src.DivStart50;
-            DivStart90 = src.DivStart90;
             DiverterEnd = src.DiverterEnd;
-            DivEnd10 = src.DivEnd10;
-            DivEnd50 = src.DivEnd50;
-            DivEnd90 = src.DivEnd90;
 			ErrorFlags = src.ErrorFlags;
 			ErrorFlagsMd = src.ErrorFlagsMd;
 		    RefEnergy = src.RefEnergy;

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
 {
@@ -63,6 +62,8 @@ namespace Results.Entities
         public virtual double OrigCalibFactorLNA{ get; set; }	/// Original iPerl LNA calibration factor used during the test
         public virtual double CalibFactorLNA    { get; set; }	/// iPerl LNA calibration factor used during the test
         public virtual double Q2ErrWOCorrection { get; set; }
+		public virtual bool   Q2CorrectionDone  { get; set; }   /// true = iPerl Q2 correction was done
+        public virtual double Q2Correction      { get; set; }	/// !!! obsolete
         public virtual int    Q2CorrRL          { get; set; }	/// iPerl Q2 correction for the R-flow written to iPerl
         public virtual int    Q2CorrLR          { get; set; }	/// iPerl Q2 correction for the L-flow written to iPerl
         public virtual int    Q2CorrFlowRight   { get; set; }	/// 1 = right to left
@@ -90,16 +91,12 @@ namespace Results.Entities
         public virtual int    ProdQ2CorrLR      { get; set; }	/// iPerl Q2 correction for the L-flow written to iPerl
 #endif
 #if ORACLE_DB
-		public virtual int	  Pruefindex	    { get; set; }	/// >= 1 ... pruefindex
-		public virtual int	  HydrPruefung		{ get; set; }
+		public virtual int	  Pruefindex	    { get; set; }	/// Not mapped to DB !!! 0=unknown (saving to Oracle failed), >=1 ... pruefindex
+		public virtual int	  HydrPruefung		{ get; set; }	/// Not mapped to DB !!!
         public virtual int    WMTypeRevision    { get; set; }	/// Not mapped to DB !!!
-        public virtual object RawTestInfos      { get; set; }	/// IList<SensusTestInfo> fetched from Oracle at the beginning of the cycle, not mapped to DB !!!
-        public virtual object CompleteTestInfos { get; set; }	/// SensusTestInfo[] obtained as a best match at the beginning of the cycle, not mapped to DB !!!
+        public virtual object TestInfos         { get; set; }	/// SensusTestInfo[] array fetched 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 bool   LastRecordIsNok   { get; set; }	/// Not mapped to DB !!!    Previous record verification result
-
-        public virtual WaterMeterData WaterMeterData { get; set; }
+		public virtual WaterMeterData WaterMeterData { get; set; }
 		public virtual Batch Batch { get; set; }
 		public virtual IList<MeterTestRslt> MeterTestRslts { get; set; }
 
@@ -355,12 +352,8 @@ namespace Results.Entities
             Pruefindex = 1;
             HydrPruefung = 0;
             WMTypeRevision = 0;
-            RawTestInfos = null;
-            CompleteTestInfos = null;
+            TestInfos = null;
 #endif
-            ProcessId = 0;
-            ErrorFlags = 0;
-            LastRecordIsNok = false;
 		}
 
 
@@ -385,9 +378,9 @@ namespace Results.Entities
 #if IPERL
 		    OrigCalibFactor = src.OrigCalibFactor;
 		    CalibFactor = src.CalibFactor;
-		    OrigCalibFactorLNA = src.OrigCalibFactorLNA;
-		    CalibFactorLNA = src.CalibFactorLNA;
 		    Q2ErrWOCorrection = src.Q2ErrWOCorrection;
+		    Q2CorrectionDone = src.Q2CorrectionDone;
+            Q2Correction = src.Q2Correction;
             Q2CorrRL = src.Q2CorrRL;
             Q2CorrLR = src.Q2CorrLR;
             Q2CorrFlowRight = src.Q2CorrFlowRight;
@@ -415,12 +408,8 @@ namespace Results.Entities
             Pruefindex = src.Pruefindex;
 		    HydrPruefung = src.HydrPruefung;
             WMTypeRevision = src.WMTypeRevision;
-            RawTestInfos = src.RawTestInfos;
-            CompleteTestInfos = src.CompleteTestInfos;
+            TestInfos = src.TestInfos;
 #endif
-            ProcessId = src.ProcessId;
-            LastRecordIsNok = src.LastRecordIsNok;
-
             foreach (var mtr in MeterTestRslts)
             {
                 MeterTestRslt srcMtr = src.GetMeterTestRslt(mtr.Name(), (Config.Entities.CompoundMeterId)mtr.CompoundMeterId);
@@ -445,101 +434,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,11 +1,14 @@
 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;
 using Results.Resources;
-using NHibernate;
-using TracingDB.Entities;
 
 namespace Results.Forms
 {
@@ -13,33 +16,42 @@ namespace Results.Forms
     {
         static readonly ILog log = LogManager.GetLogger(typeof(BatchResultsDlg));
 
+        DateTime lastRedraw;
+        DateTime lastSizeChange;
+        bool loaded;
+
         ///
         /// Public members
         ///
-        public Results.BatchResults Results;
-        public IList<Results.WMeterRsltItemSpec> Items;
         public MetersArrangement MetersArrangement;
         public TestsArrangement TestsArrangement;
         public int NrMetersInOneGroup;
-        public 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,223 +59,291 @@ 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))
-            {
-                /// There are no water meters at all
-                flowLayoutPanel.Controls.Clear();
-                wmRsltsCtrl = new OneWMResultsRowsCtrl[0];
-                firstEnabledControl = null;
-                return;
-            }
-
-            ///
-            /// Determine water meter positions count
-            ///
-            int displayedControlsCount = 0;
-            for (int i = 0; i < results.WaterMeters.Length; i++)
-            {
-                if (results.WaterMeters[i] != null)
-                {
-                    if (ShowDisabledPositions || !results.WaterMeters[i].Disabled)
-                    {
-                        displayedControlsCount++;
-                    }
-                }
-            }
-
-            ///
-            /// Calculate geometry
-            ///
-            metersInOneGroup = Math.Max(1, Math.Min(displayedControlsCount, NrMetersInOneGroup));
-            nrGroups = Math.Max(1, (displayedControlsCount + metersInOneGroup - 1) / metersInOneGroup);
-
-            int oneWidth;
-            int oneHeight;
-            ///
-            if (MetersArrangement == MetersArrangement.Horizontally)
-            {
-                flowLayoutPanel.FlowDirection = FlowDirection.LeftToRight;
-                oneWidth = Math.Max(MinWidth, flowLayoutPanel.Width / metersInOneGroup - 6);
-                oneHeight = Math.Max(MinHeight, flowLayoutPanel.Height / nrGroups - 6);
-            }
-            else
-            {
-                flowLayoutPanel.FlowDirection = FlowDirection.TopDown;
-                oneWidth = Math.Max(MinWidth, flowLayoutPanel.Width / nrGroups - 6);
-                oneHeight = Math.Max(MinHeight, flowLayoutPanel.Height / metersInOneGroup - 6);
-            }
-
-            ///
-            /// Create controls and fill the FlowLayoutPanel
-            ///
-            flowLayoutPanel.SuspendLayout();
-            flowLayoutPanel.Controls.Clear();
-            flowLayoutPanel.WrapContents = true;
-            flowLayoutPanel.AutoScroll = true;
-
-            wmRsltsCtrl = new IOneWMResultsCtrl[displayedControlsCount];
-            int ix = 0;
-            firstEnabledControl = null;
-            for (int i = 0; i < results.WaterMeters.Length; i++)
-            {
-                if (results.WaterMeters[i] != null)
-                {
-                    if (!results.WaterMeters[i].Disabled || ShowDisabledPositions)
-                    {
-                        /// Create one water meter position / control
-                        wmRsltsCtrl[ix] = (TestsArrangement == TestsArrangement.Rows)
-                                        ? new OneWMResultsRowsCtrl() as IOneWMResultsCtrl
-                                        : new OneWMResultsColumnsCtrl() as IOneWMResultsCtrl;
-                        wmRsltsCtrl[ix].Width = oneWidth;
-                        wmRsltsCtrl[ix].Height = oneHeight;
-                        wmRsltsCtrl[ix].Update(Items);
-                        wmRsltsCtrl[ix].WMResultsClickedHandler += delegate(object s, Results.Forms.WaterMeterEventArgs args)
-                        {
-                            if (InvokeRequired)
-                            {
-                                Invoke(new EventHandler<Results.Forms.WaterMeterEventArgs>(OnDoubleClick), s, args);
-                            }
-                            else
-                            {
-                                OnDoubleClick(s, args);
-                            }
-                        };
-
-                        flowLayoutPanel.Controls.Add(wmRsltsCtrl[ix] as UserControl);
-                        if ((firstEnabledControl == null) && !results.WaterMeters[i].Disabled) firstEnabledControl = wmRsltsCtrl[ix];
-                        ix++;
-                    }
-                }
-            }
-
-            flowLayoutPanel.ResumeLayout();
-
             lastRedraw = DateTime.Now;
-        }
+            
+            this.SuspendLayout();
 
-
-        void UpdateResults(Results.BatchResults batchResults)
-        {
-            if ((batchResults != null) && (batchResults.WaterMeters != null))
+            try
             {
-                int ctrlIx = 0;
-                for (int i = 0; i < batchResults.WaterMeters.Length; i++)
+                /// Determine how many water meters were enabled for result evaluation and printing
+                int enabledWMsCount = 0;
+                for (int i = 0; i < results.WMPositionsCount; i++)
                 {
-                    if (!batchResults.WaterMeters[i].Disabled || ShowDisabledPositions)
+                    if (results.WaterMeters[i] != null && !results.WaterMeters[i].Disabled)
                     {
-                        if (ctrlIx < wmRsltsCtrl.Length) wmRsltsCtrl[ctrlIx++].Update(batchResults.WaterMeters[i]);
+                        enabledWMsCount++;
                     }
                 }
-            }
-        }
 
+                int metersInOneGroup = Math.Max(1, Math.Min(enabledWMsCount, NrMetersInOneGroup));
+                int nrGroups = Math.Max(1, (enabledWMsCount + metersInOneGroup - 1) / metersInOneGroup);
 
-        void ShowMoreWMResults(Results.Entities.WaterMeter wm)
-        {
-            if ((TracingDB.DB.SessionFactory == null) || string.IsNullOrEmpty(wm.SerialNr))
-            {
-                new Results.Forms.MoreWMResultsDlg(wm, null).ShowDialog();
-            }
-            else
-            {
-                using (ISession session = TracingDB.DB.SessionFactory.OpenSession())
+                if (MetersArrangement == MetersArrangement.Horizontally)
                 {
-                    IList<ReferenceRecord> refRecords = session.QueryOver<ReferenceRecord>()
-                                                               .Where(x => (x.Code == wm.SerialNr))
-                                                               .OrderBy(x => x.TimeStamp).Desc
-                                                               .List();
-                    for (int i = 0; i < refRecords.Count; i++)
+                    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();
+                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)
                     {
-                        ReferenceRecord refR = refRecords[i];
-                        if ((refR.Records != null) && (refR.Records.Count > 0))
+                        OneWMResultsCtrl lview = (TestsArrangement == TestsArrangement.Rows)
+                                               ? GetResultsTestsAreRows(results.WaterMeters[i], i + 1)
+                                               : GetResultsTestsAreColumns(results.WaterMeters[i], i + 1);
+                        if (lview != null)
                         {
-                            /// Reference record has additional records/parts (i.e. it is PCB assembly workflow step)
-                            /// 
-                            foreach (var rec in refR.Records)
+                            flowLayoutPanel.Controls.Add(lview);
+                            if (first)
                             {
-                                if (rec.Part.OraDBType.ToLower().Contains("flowtube"))
-                                {
-                                    /// rec.Part is a flowtube
-                                    /// 
-                                    IList<ReferenceRecord> flowtubeRRs = session.QueryOver<ReferenceRecord>()
-                                                                                .Where(x => (x.Code == rec.Code))
-                                                                                .OrderBy(x => x.TimeStamp).Desc
-                                                                                .List();
-                                    foreach (var rr in flowtubeRRs) refRecords.Add(rr);
-                                }
+                                firstListView = lview;
+                                first = false;
                             }
                         }
                     }
-
-                    new Results.Forms.MoreWMResultsDlg(wm, refRecords).ShowDialog();
                 }
             }
+            catch (Exception e)
+            {
+                log.FatalFormat("Redrawing results failed : {0}", e.Message);
+                if (e.InnerException != null)
+                {
+                    log.FatalFormat("InnerMessage : {0}", e.InnerException.Message);
+                }
+                log.FatalFormat("StackTrace   : {0}{1}", Environment.NewLine, e.StackTrace);
+            }
+
+            this.ResumeLayout(false);
         }
 
+        /// <summary>
+        /// Get an empty ListView control with appropriate parameters.
+        /// </summary>
+        /// <returns>ListView control</returns>
+        OneWMResultsCtrl GetListView()
+        {
+            return new OneWMResultsCtrl(Color.White, lvWidth, lvHeight);
+        }
+
+
+        /// <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 (mtr.IsPilotRslt() && mtr.TestDone && (mtr.Publish() != Config.Entities.Publish.Never)
+													  && (mtr.Publish() != Config.Entities.Publish.Internal))
+                {
+                    testNames.Add(mtr.Name());
+                }
+            }
+
+            return testNames;
+        }
+
+
+        /// <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);
+
+            OneWMResultsCtrl lview = GetListView();
+#if ORACLE_DB
+            lview.Caption = string.Format("PCB {0}  {1} {2}", (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr), Strings.repetition, (wMtr.Pruefindex % 100));
+#else
+            lview.Caption = string.Format("s/n = {0}", string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr);
+#endif
+
+            IList<Results.WMeterRsltItemSpec> items = GetRsltItems(metersKind);
+
+            if (items == null || items.Count == 0) return lview;
+
+            // Header
+            lview.Columns.Add(printedWMNr.ToString(), (rsltsClmnCount > 0) ? rsltsClmnWidths[0] : 40);
+            int col = 1;
+            foreach (var item in items)
+            {
+                lview.Columns.Add(item.Caption, (rsltsClmnCount > col) ? rsltsClmnWidths[col] : 70);
+                col++;
+            }
+
+
+            IList<string> testNames = GetAllDecoratedTestNames(wMtr);
+            int ix = 0;
+            foreach (var mtr in wMtr.MeterTestRslts)
+            {
+                if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Config.Entities.Publish.Never
+																	 && mtr.Publish() != Config.Entities.Publish.Internal)
+                {
+                    ListViewItem lvi = new ListViewItem(testNames[ix++]);
+
+                    for (int i = 0; i < items.Count; i++)
+                    {
+                        string str = items[i].Print(wMtr, mtr.Name());
+
+                        /// Extract and use color information
+                        string[] texts = str.Split(new char[] { '|' });
+                        if (texts.Length == 1)
+                        {
+                            lvi.SubItems.Add(str);
+                        }
+                        else if (texts.Length == 2)
+                        {
+                            Color color = texts[1].Equals("Green") ? Color.Green : (texts[1].Equals("Red") ? Color.Red : Color.White);
+                            lvi.UseItemStyleForSubItems = false;
+                            lvi.SubItems.Add(texts[0]);
+                            lvi.SubItems[lvi.SubItems.Count - 1].BackColor = color;
+                        }
+                        else
+                        {
+                            lvi.SubItems.Add(string.Empty);
+                        }
+                    }
+
+                    lview.Items.Add(lvi);
+                }
+            }
+
+            return lview;
+        }
+
+
+        /// <summary>
+        /// Get a ListView control filled with results of the meter 'mtr'
+        /// </summary>
+        /// <param name="mtr">Water meter number (1-based): 1 .. Config.Data.WMsCount</param>
+        /// <returns>ListView object</returns>
+        OneWMResultsCtrl GetResultsTestsAreColumns(Results.Entities.WaterMeter wMtr, int printedWMNr)
+        {
+            metersKind = wMtr.Compound() ? MetersKind.Combined : (wMtr.HeatMeter() ? MetersKind.HeatMeter : MetersKind.Single);
+
+            OneWMResultsCtrl lview = GetListView();
+#if ORACLE_DB
+            lview.Caption = string.Format("PCB {0}  {1} {2}", (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr), Strings.repetition, (wMtr.Pruefindex % 100));
+#else
+            lview.Caption = string.Format("s/n = {0}", string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr);
+#endif
+
+            IList<Results.WMeterRsltItemSpec> items = GetRsltItems(metersKind);
+
+            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))
+            {
+                lview.Columns.Add(str, (rsltsClmnCount > i) ? rsltsClmnWidths[i] : 70);
+                i++;
+            }
+
+            foreach (var item in items)
+            {
+                ListViewItem lvi = new ListViewItem(item.Caption);
+
+                foreach (var mtr in wMtr.MeterTestRslts)
+                {
+                    if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Config.Entities.Publish.Never &&
+																			mtr.Publish() != Config.Entities.Publish.Internal)
+                    {
+                        string str = item.Print(wMtr, mtr.Name());
+
+                        string[] texts = str.Split(new char[] { '|' });
+                        if (texts.Length == 1)
+                        {
+                            lvi.SubItems.Add(str);
+                        }
+                        else if (texts.Length == 2)
+                        {
+                            Color color = texts[1].Equals("Green") ? Color.Green : (texts[1].Equals("Red") ? Color.Red : Color.White);
+                            lvi.UseItemStyleForSubItems = false;
+                            lvi.SubItems.Add(texts[0]);
+                            lvi.SubItems[lvi.SubItems.Count - 1].BackColor = color;
+                        }
+                        else
+                        {
+                            lvi.SubItems.Add(string.Empty);
+                        }
+                    }
+                }
+
+                lview.Items.Add(lvi);
+            }
+
+            return lview;
+        }
 
         private void BatchResultsDlg_FormClosing(object sender, FormClosingEventArgs e)
         {
@@ -273,7 +353,6 @@ namespace Results.Forms
             PopupResultsHeight = Height;
         }
 
-
         private void flowLayoutPanel_SizeChanged(object sender, EventArgs e)
         {
             lastSizeChange = DateTime.Now;
@@ -283,40 +362,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[2].Hide();
-            }
-            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.Length > 0) ? columnWidths[0] : 40);
-            int col = 1;
-            foreach (var str in wMtr.GetAllDecoratedTestNames())
-            {
-                lView.Columns.Add(str, (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.
@@ -64,7 +64,6 @@
             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
             // 

Results/Forms/OneWMResultsCtrl.cs

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

Results/Forms/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.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.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/TracingResultsDlg.Designer.cs

@@ -1,65 +0,0 @@
-namespace Results.Forms
-{
-    partial class TracingResultsDlg
-    {
-        /// <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.tracingResultsListView = new System.Windows.Forms.ListView();
-            this.SuspendLayout();
-            // 
-            // 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(1228, 178);
-            this.tracingResultsListView.TabIndex = 0;
-            this.tracingResultsListView.UseCompatibleStateImageBehavior = false;
-            this.tracingResultsListView.View = System.Windows.Forms.View.Details;
-            // 
-            // TracingResultsDlg
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1228, 178);
-            this.Controls.Add(this.tracingResultsListView);
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "TracingResultsDlg";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "TracingResultsDlg";
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.ListView tracingResultsListView;
-
-    }
-}

Results/Forms/TracingResultsDlg.cs

@@ -1,44 +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;
-
-namespace Results.Forms
-{
-    public partial class TracingResultsDlg : Form
-    {
-        public TracingResultsDlg(IList<ReferenceRecord> rRecords)
-        {
-            InitializeComponent();
-
-            Text = Strings.Production_tracing_results;
-
-            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);
-
-            foreach (var rr in rRecords)
-            {
-                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,
-                    }));
-            }
-        }
-    }
-}

Results/Forms/TracingResultsDlg.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

@@ -1,14 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-
-namespace Results.Forms
-{
-    public class WaterMeterEventArgs : EventArgs
-    {
-        public int WMPosition;
-
-        public WaterMeterEventArgs(int wmPosition) { WMPosition = wmPosition; }
-    }
-}

Results/ItemID.cs

@@ -287,36 +287,10 @@ namespace Results
         Prod_Q2CorrLR,                  /// 246
 
         TestPartStr,                    /// 247
-
-        Error_heat_mtr_vol,             /// 248
-        Energy_start,                   /// 249
-        Energy_end,                     /// 250
-
-        OraWMTypeID,                    /// 251
-        OraWMTypeRev,                   /// 252
-
-        E25,							/// 253
-        E26,							/// 254
-        E27,							/// 255
-        E28,							/// 256
-
-        RefFlowmeter,                   /// 257
-        Test_Method_Elde,               /// 258
-
-        Counter1,                       /// 259  counterIdx0 = 0
-        Counter2,                       /// 260  counterIdx0 = 1
-        Counter3,                       /// 261  counterIdx0 = 2
-        Counter4,                       /// 262  counterIdx0 = 3
-        Counter5,                       /// 263  counterIdx0 = 4
-        Counter6,                       /// 264  counterIdx0 = 5
-        Counter7,                       /// 265  counterIdx0 = 6
-        Counter8,                       /// 266  counterIdx0 = 7
-        Counter9,                       /// 267  counterIdx0 = 8
-        Counter10,                      /// 268  counterIdx0 = 9
-
-        ConstMasterCorr,                /// 269
-        TimeBtwnMassMsrmnts,            /// 270
-        TestTimeCorrection,             /// 271
+        
+        Error_heat_mtr_vol,              /// 248
+        Energy_start,
+        Energy_end,
 
         Count,
     }

Results/Mappings/MeterTestRsltMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2015 Sensus Metering Systems
 ///
 using FluentNHibernate.Mapping;
 using Results.Entities;
@@ -12,8 +12,7 @@ namespace Results.Mappings
 		{
 			Id(x => x.Id);
 			Map(x => x.CompoundMeterId);
-            Map(x => x.RegReaderType);
-            Map(x => x.PulsesMeter);
+			Map(x => x.PulsesMeter);
 			Map(x => x.PulsesMaster);
 			Map(x => x.PulsesPerLiter);
 			Map(x => x.VolumeStart);

Results/Mappings/TestRsltMap.cs

@@ -16,7 +16,6 @@ namespace Results.Mappings
 			References<Components>(x => x.Components);
 			Map(x => x.Part);
 			Map(x => x.RepetitionNr);
-            Map(x => x.MethodClass);
 
 			Map(x => x.TestDone);
 			Map(x => x.Remark)
@@ -27,8 +26,6 @@ namespace Results.Mappings
 			Map(x => x.FlowSetTime);
 			Map(x => x.TestTime);
 			Map(x => x.PulsesMaster);
-			Map(x => x.ConstMasterRaw);
-            Map(x => x.ConstMasterCorr);
 			Map(x => x.ConstMaster);
 			Map(x => x.MassStartRaw);
 			Map(x => x.MassStart);

Results/Mappings/WaterMeterDataMap.cs

@@ -42,8 +42,6 @@ namespace Results.Mappings
             Map(x => x.MetrologicalClassAux);
             Map(x => x.ApprovalInfoAux);
 
-            Map(x => x.Medium);
-
             Map(x => x.Text1);
             Map(x => x.Text2);
             Map(x => x.Text3);

Results/Mappings/WaterMeterMap.cs

@@ -33,6 +33,8 @@ namespace Results.Mappings
             Map(x => x.OrigCalibFactorLNA);
             Map(x => x.CalibFactorLNA);
             Map(x => x.Q2ErrWOCorrection);
+			Map(x => x.Q2CorrectionDone);
+			Map(x => x.Q2Correction);
             Map(x => x.Q2CorrRL);
             Map(x => x.Q2CorrLR);
             Map(x => x.Q2CorrFlowRight);

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,118 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms.DataVisualization.Charting;
-using Config.Entities;
-using Results.Entities;
-using Results.Resources;
-
-namespace Results.Output
-{
-    public class WMChart
-    {
-        public static Chart GetChart(WaterMeter wm, bool isPrinter)
-        {
-			return GetChart(wm, isPrinter, Config.Unit.lph, false);
-        }
-
-		public static Chart GetChart(WaterMeter wm, bool isPrinter, Config.Unit flowUnit, bool isQ4)
-        {
-            IList<PointF> unsortedPoints = new List<PointF>();
-            foreach (var mtr in wm.MeterTestRslts)
-            {
-                if (mtr.IsPilotRslt() && mtr.TestRslt.TestData.Evaluate && (mtr.TestTime > 0) && (mtr.TestRslt.PulsesMaster > 0))
-                {
-                    double flow = Config.Units.ConvertTo(flowUnit, mtr.TestRslt.VolumeCTV / mtr.TestTime * 3.6 * mtr.PulsesMaster / mtr.TestRslt.PulsesMaster);
-                    if (flow > 0)
-                    {
-                        unsortedPoints.Add(new PointF((float)flow, (float)mtr.Error));
-                    }
-                }
-            }
-            IEnumerable<PointF> sortedPoints = unsortedPoints.OrderBy(x => x.X);
-
-            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 = false;
-
-            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 };
-            double spacer = 0.8;
-            double from = Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q1_Qmin);
-            double to = Config.Units.ConvertTo(flowUnit, isQ4 ? wm.WaterMeterData.Q4_Qmax : wm.WaterMeterData.Q3_Qn);
-            for (int i = 1; i < xs.Count - 1; i++)
-            {
-                if ((xs[i + 1] > from) && (xs[i - 1] < to))
-                {
-                    CustomLabel cl = new CustomLabel();
-                    cl.Text = string.Format("{0} {1}", xs[i], flowUnit.ToDescription());
-                    cl.FromPosition = Math.Log10(xs[i] * spacer);
-                    cl.ToPosition = Math.Log10(xs[i] / spacer);
-                    chArea.AxisX.CustomLabels.Add(cl);
-                }
-            }
-
-            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

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Sensus")]
 [assembly: AssemblyProduct("Results")]
-[assembly: AssemblyCopyright("Copyright © 2013 - 2019 Sensus Slovensko, a.s.")]
+[assembly: AssemblyCopyright("Copyright © 2013 - 2018 Sensus Slovensko, a.s.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.20.1306.0")]
-[assembly: AssemblyFileVersion("2.20.1306.0")]
+[assembly: AssemblyVersion("2.18.1142.0")]
+[assembly: AssemblyFileVersion("2.18.1142.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>
@@ -195,15 +186,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Code.
-        /// </summary>
-        internal static string Code {
-            get {
-                return ResourceManager.GetString("Code", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Compound.
         /// </summary>
@@ -222,24 +204,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Counter {0}.
-        /// </summary>
-        internal static string Counter_0 {
-            get {
-                return ResourceManager.GetString("Counter_0", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Date and time.
-        /// </summary>
-        internal static string Date_and_time {
-            get {
-                return ResourceManager.GetString("Date_and_time", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Density.
         /// </summary>
@@ -420,15 +384,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to NOK.
-        /// </summary>
-        internal static string Failed {
-            get {
-                return ResourceManager.GetString("Failed", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Failed meters count.
         /// </summary>
@@ -474,15 +429,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>
@@ -501,15 +447,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid Q2 correction factors.
-        /// </summary>
-        internal static string Invalid_Q2_correction_factors {
-            get {
-                return ResourceManager.GetString("Invalid_Q2_correction_factors", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Item.
         /// </summary>
@@ -528,15 +465,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>
@@ -573,15 +501,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Name.
-        /// </summary>
-        internal static string Name {
-            get {
-                return ResourceManager.GetString("Name", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to No.
         /// </summary>
@@ -591,15 +510,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>
@@ -717,24 +627,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Part.
-        /// </summary>
-        internal static string Part {
-            get {
-                return ResourceManager.GetString("Part", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to OK.
-        /// </summary>
-        internal static string Passed {
-            get {
-                return ResourceManager.GetString("Passed", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Passed meters count.
         /// </summary>
@@ -771,15 +663,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Previous step is missing or NOK.
-        /// </summary>
-        internal static string Previous_step_is_missing_or_NOK {
-            get {
-                return ResourceManager.GetString("Previous_step_is_missing_or_NOK", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Procedure.
         /// </summary>
@@ -807,15 +690,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Production tracing results.
-        /// </summary>
-        internal static string Production_tracing_results {
-            get {
-                return ResourceManager.GetString("Production_tracing_results", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Protocol.
         /// </summary>
@@ -897,15 +771,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 +861,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>
@@ -1086,15 +942,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Step.
-        /// </summary>
-        internal static string Step {
-            get {
-                return ResourceManager.GetString("Step", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to T amb.
         /// </summary>
@@ -1185,15 +1032,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Test in progress.
-        /// </summary>
-        internal static string Test_in_progress {
-            get {
-                return ResourceManager.GetString("Test_in_progress", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Test method.
         /// </summary>
@@ -1212,15 +1050,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Test repetition count exceeded upper limit.
-        /// </summary>
-        internal static string Test_repetition_count_exceeded_upper_limit {
-            get {
-                return ResourceManager.GetString("Test_repetition_count_exceeded_upper_limit", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Test vol..
         /// </summary>
@@ -1230,15 +1059,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 +1734,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 +1896,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>
@@ -2121,33 +1923,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Workflow.
-        /// </summary>
-        internal static string Workflow {
-            get {
-                return ResourceManager.GetString("Workflow", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Workplace.
-        /// </summary>
-        internal static string Workplace {
-            get {
-                return ResourceManager.GetString("Workplace", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Wrong iPerl counting direction.
-        /// </summary>
-        internal static string Wrong_iPerl_counting_direction {
-            get {
-                return ResourceManager.GetString("Wrong_iPerl_counting_direction", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Year.
         /// </summary>

Results/Resources/Strings.cs.resx

@@ -258,82 +258,4 @@
   <data name="repetition" xml:space="preserve">
     <value>opakování</value>
   </data>
-  <data name="Invalid_Q2_correction_factors" xml:space="preserve">
-    <value>Nesprávne Q2 korekčné faktory</value>
-  </data>
-  <data name="Previous_step_is_missing_or_NOK" xml:space="preserve">
-    <value>Predchádzajúci krok chýba alebo neprešiel</value>
-  </data>
-  <data name="Test_repetition_count_exceeded_upper_limit" xml:space="preserve">
-    <value>Počet opakovaní testu prekročil dovolené maximum</value>
-  </data>
-  <data name="Wrong_iPerl_counting_direction" xml:space="preserve">
-    <value>Nesprávny smer počítania iPerlu</value>
-  </data>
-  <data name="Failed" xml:space="preserve">
-    <value>NOK</value>
-  </data>
-  <data name="Passed" xml:space="preserve">
-    <value>OK</value>
-  </data>
-  <data name="Test_in_progress" xml:space="preserve">
-    <value>Probíhá test</value>
-  </data>
-  <data name="Date_and_time" xml:space="preserve">
-    <value>Datum a čas</value>
-  </data>
-  <data name="Name" xml:space="preserve">
-    <value>Jméno</value>
-  </data>
-  <data name="Step" xml:space="preserve">
-    <value>Krok</value>
-  </data>
-  <data name="Workplace" xml:space="preserve">
-    <value>Pracovisko</value>
-  </data>
-  <data name="Workflow" xml:space="preserve">
-    <value>Pracovný postup</value>
-  </data>
-  <data name="Production_tracing_results" xml:space="preserve">
-    <value>Výsledky sledování výroby</value>
-  </data>
-  <data name="Code" xml:space="preserve">
-    <value>Kód</value>
-  </data>
-  <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.resx

@@ -744,79 +744,4 @@
   <data name="repetition" xml:space="preserve">
     <value>repetition</value>
   </data>
-  <data name="Invalid_Q2_correction_factors" xml:space="preserve">
-    <value>Invalid Q2 correction factors</value>
-  </data>
-  <data name="Previous_step_is_missing_or_NOK" xml:space="preserve">
-    <value>Previous step is missing or NOK</value>
-  </data>
-  <data name="Test_repetition_count_exceeded_upper_limit" xml:space="preserve">
-    <value>Test repetition count exceeded upper limit</value>
-  </data>
-  <data name="Wrong_iPerl_counting_direction" xml:space="preserve">
-    <value>Wrong iPerl counting direction</value>
-  </data>
-  <data name="Failed" xml:space="preserve">
-    <value>NOK</value>
-  </data>
-  <data name="Passed" xml:space="preserve">
-    <value>OK</value>
-  </data>
-  <data name="Test_in_progress" xml:space="preserve">
-    <value>Test in progress</value>
-  </data>
-  <data name="Counter_0" xml:space="preserve">
-    <value>Counter {0}</value>
-  </data>
-  <data name="Date_and_time" xml:space="preserve">
-    <value>Date and time</value>
-  </data>
-  <data name="Name" xml:space="preserve">
-    <value>Name</value>
-  </data>
-  <data name="Step" xml:space="preserve">
-    <value>Step</value>
-  </data>
-  <data name="Workplace" xml:space="preserve">
-    <value>Workplace</value>
-  </data>
-  <data name="Workflow" xml:space="preserve">
-    <value>Workflow</value>
-  </data>
-  <data name="Production_tracing_results" xml:space="preserve">
-    <value>Production tracing results</value>
-  </data>
-  <data name="Code" xml:space="preserve">
-    <value>Code</value>
-  </data>
-  <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;PETERSBURG_200;LANG_RU</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;GENESIS;IPERL;LANG_DE</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;PETERSBURG_200;LANG_RU</DefineConstants>
+    <DefineConstants>TRACE;GENESIS;IPERL;LANG_DE</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>
@@ -112,13 +98,6 @@
     <Compile Include="Forms\ResultsConfigDlg.designer.cs">
       <DependentUpon>ResultsConfigDlg.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\TracingResultsDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\TracingResultsDlg.Designer.cs">
-      <DependentUpon>TracingResultsDlg.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\WaterMeterEventArgs.cs" />
     <Compile Include="ItemID.cs" />
     <Compile Include="Mappings\BatchMap.cs" />
     <Compile Include="Mappings\ComponentsMap.cs" />
@@ -145,12 +124,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>
@@ -170,10 +148,6 @@
       <Project>{743DF7DB-C7B6-42EB-986D-0F485E5588E4}</Project>
       <Name>Config</Name>
     </ProjectReference>
-    <ProjectReference Include="..\TracingDB\TracingDB.csproj">
-      <Project>{EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF}</Project>
-      <Name>TracingDB</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Users\Users.csproj">
       <Project>{6E5CB0E9-E1B6-4E5D-AC6E-B1049E180F2B}</Project>
       <Name>Users</Name>
@@ -191,14 +165,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>
@@ -206,9 +174,6 @@
     <EmbeddedResource Include="Forms\ResultsConfigDlg.resx">
       <DependentUpon>ResultsConfigDlg.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\TracingResultsDlg.resx">
-      <DependentUpon>TracingResultsDlg.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

Results/Utils.cs

@@ -11,7 +11,6 @@ namespace Results
 	{
 		public static string GetTestName(string name, int repeats, int repetitionNr)
 		{
-            if (name == null) return null;
 			if (repeats == 1) return name;
 			return string.Format("{0} ({1}/{2})", name, repetitionNr, repeats);
 		}
@@ -27,9 +26,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 10: return 38;  /// WR16
                 default: return 0;
             }
         }
@@ -45,22 +42,20 @@ namespace Results
                 case 8: return "WR13";
                 case 9: return "WR15";
                 case 10: return "WR14";
-                case 11: return "WR18";
-                case 12: return "WR19";
                 default: return string.Empty;
             }
         }
 
 
         /// <summary>
-        /// Converts ErrorFlags integer to string. Supports up to 31 flags (E1..E31, i.e. bit0..bit30).
+        /// Converts ErrorFlags integer to string. Supports up to 31 flags (E1..E31).
         /// </summary>
         /// <param name="errorFlags">Input</param>
         /// <returns>Output string</returns>
         public static string ErrorFlagsStr(int errorFlags)
         {
             StringBuilder sb = new StringBuilder();
-            for (int i = 0; i < 31; i++)
+            for (int i = 0; i < 30; i++)
             {
                 if ((errorFlags & (1 << i)) != 0)
                 {
@@ -86,23 +81,5 @@ namespace Results
             return (useRedGreenColor) ? (passed ? "OK|Green" : "NOK|Red")        : (passed ? "OK|White" : "NOK|White");
 #endif
         }
-
-
-        public static void GetCounterStates(Results.Entities.Batch batch, int[] counters)
-        {
-            if (batch != null)
-            {
-                batch.Counter1 = ((counters != null) && (counters.Length >= 1)) ? counters[0] : 0;
-                batch.Counter2 = ((counters != null) && (counters.Length >= 2)) ? counters[1] : 0;
-                batch.Counter3 = ((counters != null) && (counters.Length >= 3)) ? counters[2] : 0;
-                batch.Counter4 = ((counters != null) && (counters.Length >= 4)) ? counters[3] : 0;
-                batch.Counter5 = ((counters != null) && (counters.Length >= 5)) ? counters[4] : 0;
-                batch.Counter6 = ((counters != null) && (counters.Length >= 6)) ? counters[5] : 0;
-                batch.Counter7 = ((counters != null) && (counters.Length >= 7)) ? counters[6] : 0;
-                batch.Counter8 = ((counters != null) && (counters.Length >= 8)) ? counters[7] : 0;
-                batch.Counter9 = ((counters != null) && (counters.Length >= 9)) ? counters[8] : 0;
-                batch.Counter10 = ((counters != null) && (counters.Length >= 10)) ? counters[9] : 0;
-            }
-        }
     }
 }

Results/WMeterRsltItemSpec.cs

@@ -149,7 +149,6 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Proc_description, Strings.Procedure_description, Quantity.String, ItemCategory.Other,    (w, t, u, f, p) => FormatStr(f, w.Batch.ProcedureDescription)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_number,     Strings.Batch_nr,              Quantity.Number, ItemCategory.Other,    (w, t, u, f, p) => FormatInt(f, w.BatchNr())));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_method,      Strings.Test_method + "()",    Quantity.String, ItemCategory.TestData, (w, t, u, f, p) => FormatStr(f, (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Method())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_Method_Elde, Strings.Test_method + " Elde ()", Quantity.String, ItemCategory.TestData, (w, t, u, f, p) => FormatStr(f, (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).MethodElde())));
 
             ///
             /// Volume
@@ -196,10 +195,8 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Timestamp_start,        "Timestamp start ()",                                  Quantity.Time, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).TimestampStart)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Timestamp_end,          "Timestamp end ()",                                    Quantity.Time, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).TimestampEnd)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_time_ni,           Strings.T_s + "_ni()",                                 Quantity.Time, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u, f, p, "V3", w.GetMeterTestRslt(t).TestTime)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_time,              Strings.T_s + "()",                                    Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u, f, p, "F1", w.GetTestRslt(t).TestTime)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.TestTimeCorrection,     "Test time correction ()",                             Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).TestTimeCorrection)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.TimeBtwnMassMsrmnts,    "Time between mass measurements ()",                   Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u, f, p, "F0", w.GetTestRslt(t).TimeBtwnMassMsrmnts)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.PMax_test_time,         "Pressure test time ()",     "Pressure test time",     Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsPMaxTest())   ? "" : FormatDbl(u, f, p, "F0", w.GetTestRslt(t).TestTime)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_time,              Strings.T_s + "()",                                    Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TestTime)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.PMax_test_time,         "Pressure test time ()",     "Pressure test time",     Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsPMaxTest())   ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TestTime)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Diverter_start_time,    "Diverter start time ()",    "Diverter start time",    Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsDiverter())   ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).DiverterStart)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Diverter_end_time,      "Diverter end time ()",      "Diverter end time",      Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsDiverter())   ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).DiverterEnd)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_valve_open_time,  "Start valve open time ()",  "Start valve open time",  Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsStartStop())  ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).DiverterStart)));
@@ -211,13 +208,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)));
@@ -226,9 +223,8 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_fall,      string.Format("{0} {1}", Strings.VName_Flow, Strings.fall),                   Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QFall == 0) ? "-" : FormatDbl(u, f, p, "V3", w.QFall)) : ""));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_sensitivity, string.Format("{0} {1}", Strings.VName_Flow, Strings.sensitivity),          Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QRise == 0) ? "-" : FormatDbl(u, f, p, "V3", w.QRise)) : ""));
 
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.ConstMaster,    string.Format("k MID ()"), "Const. of the reference flow meter",           Quantity.PulsePerLtr, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", ((w.GetTestRslt(t).ConstMaster < float.Epsilon) ? 0 : (1 / w.GetTestRslt(t).ConstMaster)))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.ConstMasterRaw, string.Format("k MID raw ()"),"Const. of the ref. flow meter uncorrected", Quantity.PulsePerLtr, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", ((w.GetTestRslt(t).ConstMasterRaw < float.Epsilon) ? 0 : (1 / w.GetTestRslt(t).ConstMasterRaw)))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.ConstMasterCorr,string.Format("k MID corr ()"), "Const. of the ref. flow meter corrected", Quantity.PulsePerLtr, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", ((w.GetTestRslt(t).ConstMasterRaw < float.Epsilon) ? 0 : (1 / w.GetTestRslt(t).ConstMasterCorr)))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.ConstMaster,    string.Format("k MID ()"), "Const. of the reference flow meter",           Quantity.PulsePerLtr, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", ((w.GetTestRslt(t).ConstMaster < float.Epsilon) ? 0 : (1 / w.GetTestRslt(t).ConstMaster)))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.ConstMasterRaw, string.Format("k MID raw ()"), "Const. of the ref. flow meter uncorrected",Quantity.PulsePerLtr, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", ((w.GetTestRslt(t).ConstMasterRaw < float.Epsilon) ? 0 : (1 / w.GetTestRslt(t).ConstMasterRaw)))));
 
             ///
             /// Temperature
@@ -324,8 +320,7 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed, Strings.Result, Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => string.IsNullOrEmpty(t) ? w.PassedColorStr(f)
                                                                                                                                                                       : ((w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PassedColorStr(f))));
 
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.RefFlowmeter,       "Ref. flowmeter", Quantity.String, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).RefFlowmeter()) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.ResultOrErrorFlags, "Winiki lub E",   Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.PassedOrErrorFlagsStr())));    /// PL specific result
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.ResultOrErrorFlags, "Winiki lub E", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.PassedOrErrorFlagsStr())));    /// PL specific result
 
             ///
             /// Water meter info
@@ -425,15 +420,13 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.OrigCalibFactorLNA,"iPerl OrigCalibFactorLNA",Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.OrigCalibFactorLNA)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.CalibFactorLNA,    "iPerl CalibFactorLNA",    Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.CalibFactorLNA)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2ErrWOCorrection, "iPerl Q2ErrWOCorrection", Quantity.Error,  ItemCategory.MeterResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.Q2ErrWOCorrection)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrectionDone,  "iPerl Q2CorrectionDone",  Quantity.Boolean,ItemCategory.MeterResult, (w, t, u, f, p) => (((w.Q2CorrRL != 0) || (w.Q2CorrLR != 0)) ? Strings.Yes : Strings.No)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrectionDone,  "iPerl Q2CorrectionDone",  Quantity.Boolean,ItemCategory.MeterResult, (w, t, u, f, p) => (w.Q2CorrectionDone ? Strings.Yes : Strings.No)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrRFlow,       "iPerl Q2Corr RL",         Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrRL)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrLFlow,       "iPerl Q2Corr LR",         Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrLR)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrFlowRight,   "iPerl Q2CorrFlowRight",   Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrFlowRight)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.FW_Version,        "iPerl FW version",        Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.FWVersion)));
   #if ORACLE_DB
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Max_test_index,    "iPerl test index",        Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, (w.Pruefindex % 100))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.OraWMTypeID,       "OraDB WM Type ID",        Quantity.Number, ItemCategory.MeterData,   (w, t, u, f, p) => FormatInt(f, w.WaterMeterData.WMTypeId)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.OraWMTypeRev,      "OraDB WM Type Rev.",      Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.WMTypeRevision)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Max_test_index,    "iPerl test index",       Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, (w.Pruefindex % 100))));
   #endif
 #endif
 
@@ -457,44 +450,29 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.TestPassed,   Strings.Test_passed + "()", Quantity.Boolean, ItemCategory.TestResult,  (w, t, u, f, p) => FormatBool(f, (w.GetMeterTestRslt(t) != null) && w.GetMeterTestRslt(t).Passed)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.ErrorFlags,   Strings.Error_flags + "()", Quantity.String,  ItemCategory.TestResult,  (w, t, u, f, p) => FormatStr(f, (w.GetTestRslt(t) != null) ? w.GetTestRslt(t).ErrorFlagsStr() : w.ErrorFlagsStr())));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.ErrorFlagsEx, Strings.Error_flags + "Ex", Quantity.String,  ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.ErrorFlagsStrEx())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E1, "E1 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E1) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E2, "E2 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E2) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E3, "E3 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E3) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E4, "E4 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E4) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E5, "E5 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E5) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E6, "E6 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E6) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E7, "E7 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E7) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E8, "E8 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E8) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E9, "E9 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E9) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E10, "E10 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E10) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E11, "E11 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E11) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E12, "E12 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E12) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E13, "E13 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E13) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E14, "E14 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E14) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E15, "E15 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E15) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E16, "E16 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E16) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E21, "E21 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E21) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E25, "E25 ()", Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => ((w.ErrorFlags & (int)ErrorFlagMask.E25) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E26, "E26 ()", Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => ((w.ErrorFlags & (int)ErrorFlagMask.E26) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E27, "E27 ()", Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => ((w.ErrorFlags & (int)ErrorFlagMask.E27) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E28, "E28 ()", Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => ((w.ErrorFlags & (int)ErrorFlagMask.E28) != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E1,  "E1 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0001) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E2,  "E2 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0002) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E3,  "E3 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0004) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E4,  "E4 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0008) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E5,  "E5 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0010) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E6,  "E6 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0020) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E7,  "E7 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0040) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E8,  "E8 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0080) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E9,  "E9 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0100) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E10, "E10 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0200) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E11, "E11 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0400) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E12, "E12 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0800) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E13, "E13 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x1000) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E14, "E14 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x2000) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E15, "E15 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x4000) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E16, "E16 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x8000) != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E21, "E21 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x100000) != 0) ? Strings.Yes : Strings.No));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.TestPartStr, "Test part str.", Quantity.String, ItemCategory.TestResult, (w, t, u, f, p) => FormatEnum(f, (w.GetMeterTestRslt(t) != null) ? w.GetMeterTestRslt(t).TestRslt.Part : 0)));
 
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Table_row_nr, "Table row #", Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? TableRowNr.ToString() : string.Format(f, TableRowNr)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Table_column_nr, "Table column #", Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? TableColumnNr.ToString() : string.Format(f, TableColumnNr)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.WMRemark, string.Format("{0} {1}", Strings.Water_Meter, Strings.Remark), Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.Remark)));
-        
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter1, string.Format(Strings.Counter_0, 1), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter1)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter2, string.Format(Strings.Counter_0, 2), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter2)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter3, string.Format(Strings.Counter_0, 3), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter3)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter4, string.Format(Strings.Counter_0, 4), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter4)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter5, string.Format(Strings.Counter_0, 5), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter5)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter6, string.Format(Strings.Counter_0, 6), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter6)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter7, string.Format(Strings.Counter_0, 7), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter7)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter8, string.Format(Strings.Counter_0, 8), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter8)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter9, string.Format(Strings.Counter_0, 9), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter9)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter10, string.Format(Strings.Counter_0, 10), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter10)));
-        }
+		}
 
 		/// To be updated by Output.FileWriter or Output.Printer
 		public static int TableRowNr;

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.1146.0")]
+[assembly: AssemblyFileVersion("2.18.1146.0")]

ResultsBrowser/Resources/Strings.cs.resx

@@ -129,6 +129,9 @@
   <data name="Columns" xml:space="preserve">
     <value>Slopuce</value>
   </data>
+  <data name="CombinedBtnText" xml:space="preserve">
+    <value>Kombinovaný</value>
+  </data>
   <data name="Connection_string" xml:space="preserve">
     <value>Řetězec pro spojní s databázou</value>
   </data>
@@ -195,8 +198,8 @@
   <data name="Save_filters" xml:space="preserve">
     <value>Uložit filtry</value>
   </data>
-  <data name="Selected_language_not_supported" xml:space="preserve">
-    <value>Vybraný jazyk není podporován.</value>
+  <data name="Selected_results" xml:space="preserve">
+    <value>Vybrané výsledky</value>
   </data>
   <data name="Select_a_filter" xml:space="preserve">
     <value>Vyberte filtr</value>
@@ -207,6 +210,9 @@
   <data name="Settings" xml:space="preserve">
     <value>Nastavení</value>
   </data>
+  <data name="SingleBtnText" xml:space="preserve">
+    <value>Jednoduchý</value>
+  </data>
   <data name="Statistics" xml:space="preserve">
     <value>Statistiky</value>
   </data>
@@ -222,79 +228,19 @@
   <data name="To" xml:space="preserve">
     <value>Do</value>
   </data>
+  <data name="UnlockBtnText" xml:space="preserve">
+    <value>Odemknout</value>
+  </data>
+  <data name="Water_Meter" xml:space="preserve">
+    <value>Vodoměr</value>
+  </data>
   <data name="Print" xml:space="preserve">
     <value>Vytisknout</value>
   </data>
-  <data name="Add" xml:space="preserve">
-    <value>&amp;Přidat &gt;</value>
+  <data name="Add_data_from_Oracle" xml:space="preserve">
+    <value>Dohledej údaje z Oracle</value>
   </data>
   <data name="Histograms" xml:space="preserve">
     <value>Histogramy</value>
   </data>
-  <data name="All_files" xml:space="preserve">
-    <value>Všechny soubory</value>
-  </data>
-  <data name="Count" xml:space="preserve">
-    <value>Počet</value>
-  </data>
-  <data name="Data" xml:space="preserve">
-    <value>Údaje</value>
-  </data>
-  <data name="Error_exporting_results" xml:space="preserve">
-    <value>Chyba při exportování výsledků</value>
-  </data>
-  <data name="Format" xml:space="preserve">
-    <value>Formát</value>
-  </data>
-  <data name="Message" xml:space="preserve">
-    <value>Správa</value>
-  </data>
-  <data name="Name" xml:space="preserve">
-    <value>Jméno</value>
-  </data>
-  <data name="No_printer_defined" xml:space="preserve">
-    <value>Není zadefinována tiskárna</value>
-  </data>
-  <data name="No_program_settings_found" xml:space="preserve">
-    <value>Nebyli nalezeny nastavení programu.</value>
-  </data>
-  <data name="Page_orientation" xml:space="preserve">
-    <value>Otočení strany</value>
-  </data>
-  <data name="Printer" xml:space="preserve">
-    <value>Tiskárna</value>
-  </data>
-  <data name="Printing_completed" xml:space="preserve">
-    <value>Tisk ukončen</value>
-  </data>
-  <data name="Printing_failed" xml:space="preserve">
-    <value>Chyba při tisku</value>
-  </data>
-  <data name="Query_files" xml:space="preserve">
-    <value>Definice dotazů</value>
-  </data>
-  <data name="Question" xml:space="preserve">
-    <value>Otázka</value>
-  </data>
-  <data name="Using_default_settings" xml:space="preserve">
-    <value>Budou použity výchozí nastavení.</value>
-  </data>
-  <data name="Using_English" xml:space="preserve">
-    <value>Bude použita Angličtina.</value>
-  </data>
-  <data name="Warning" xml:space="preserve">
-    <value>Upozornění</value>
-  </data>
-  <data name="Yes_Portrait_No_Landscape" xml:space="preserve">
-    <value>Ano = na výšku, Ne = na šířku</value>
-  </data>
-  <data name="Component" xml:space="preserve">
-    <value>Komponent</value>
-  </data>
-  <data name="Configure" xml:space="preserve">
-    <value>Nakonfigurovat</value>
-  </data>
-  <data name="Configure_printer" xml:space="preserve">
-    <value>Nakonfigurovat tiskárnu</value>
-  </data>
 </root>

ResultsBrowser/Resources/Strings.de.resx

@@ -186,6 +186,9 @@
   <data name="Save_filters" xml:space="preserve">
     <value>Filter speichern</value>
   </data>
+  <data name="Selected_results" xml:space="preserve">
+    <value>Ergebnisse ausgewählt</value>
+  </data>
   <data name="Select_a_filter" xml:space="preserve">
     <value>Wählen Sie einen Filter</value>
   </data>
@@ -195,6 +198,9 @@
   <data name="Settings" xml:space="preserve">
     <value>Einstellungen</value>
   </data>
+  <data name="SingleBtnText" xml:space="preserve">
+    <value>Einzel</value>
+  </data>
   <data name="Statistics" xml:space="preserve">
     <value>Statistiken</value>
   </data>
@@ -210,6 +216,12 @@
   <data name="To" xml:space="preserve">
     <value>Zu</value>
   </data>
+  <data name="UnlockBtnText" xml:space="preserve">
+    <value>Ändern</value>
+  </data>
+  <data name="Water_Meter" xml:space="preserve">
+    <value>Wasserzähler</value>
+  </data>
   <data name="Error_displaying_results" xml:space="preserve">
     <value>Fehler beim Anzeigen der Ergebnisse</value>
   </data>
@@ -219,6 +231,9 @@
   <data name="Error_serializing_filters" xml:space="preserve">
     <value>Fehler Serialisierung Filter</value>
   </data>
+  <data name="CombinedBtnText" xml:space="preserve">
+    <value>Verbund</value>
+  </data>
   <data name="Count" xml:space="preserve">
     <value>Anzahl</value>
   </data>

ResultsBrowser/Resources/Strings.it.resx

@@ -117,66 +117,579 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Confirmation" xml:space="preserve">
+    <value>conferma</value>
+  </data>
+  <data name="Do_you_want_to_save_the_procedure" xml:space="preserve">
+    <value>vuoi salvare la procedura?</value>
+  </data>
   <data name="Error" xml:space="preserve">
     <value>errore</value>
   </data>
+  <data name="Error_loading_users_from_the_database" xml:space="preserve">
+    <value>errore del caricamento del data base</value>
+  </data>
+  <data name="Failed_to_create_a_sample_database" xml:space="preserve">
+    <value>Impossibile creare un database di esempio:</value>
+  </data>
+  <data name="Failed_to_export_the_database" xml:space="preserve">
+    <value>impossibile esportare il database</value>
+  </data>
+  <data name="Invalid_user_password_or_bench" xml:space="preserve">
+    <value>utente password o banco non valido</value>
+  </data>
   <data name="Test_bench" xml:space="preserve">
     <value>banco prova</value>
   </data>
+  <data name="MaxChars" xml:space="preserve">
+    <value>max _X_ caratteri alfanumerici</value>
+  </data>
+  <data name="close" xml:space="preserve">
+    <value>Chiudi</value>
+  </data>
+  <data name="Diverter" xml:space="preserve">
+    <value>deviatore</value>
+  </data>
+  <data name="Emptying_valve" xml:space="preserve">
+    <value>valvola di svuotamento</value>
+  </data>
   <data name="Name" xml:space="preserve">
     <value>nome</value>
   </data>
+  <data name="Reference" xml:space="preserve">
+    <value>riferimento</value>
+  </data>
+  <data name="Reg_valve" xml:space="preserve">
+    <value>regolazione valvola</value>
+  </data>
+  <data name="Balance" xml:space="preserve">
+    <value>bilancia</value>
+  </data>
+  <data name="Duration_s" xml:space="preserve">
+    <value>durata [s]</value>
+  </data>
+  <data name="no" xml:space="preserve">
+    <value>no</value>
+  </data>
+  <data name="New_bench_path_name" xml:space="preserve">
+    <value>P banco</value>
+  </data>
+  <data name="New_feeding_path_name" xml:space="preserve">
+    <value>P di avanzamento</value>
+  </data>
+  <data name="New_output_path_name" xml:space="preserve">
+    <value>PQ</value>
+  </data>
+  <data name="New_procedure_name" xml:space="preserve">
+    <value>procedura</value>
+  </data>
+  <data name="New_sensors_path_name" xml:space="preserve">
+    <value>P sens</value>
+  </data>
+  <data name="New_test_name" xml:space="preserve">
+    <value>prova</value>
+  </data>
+  <data name="New_name_copy" xml:space="preserve">
+    <value>Copia</value>
+  </data>
+  <data name="Correction_g" xml:space="preserve">
+    <value>correzione [g]</value>
+  </data>
+  <data name="Nr" xml:space="preserve">
+    <value>numero</value>
+  </data>
+  <data name="Mass_kg" xml:space="preserve">
+    <value>massa [kg]</value>
+  </data>
+  <data name="AddBtnText" xml:space="preserve">
+    <value>inserisci</value>
+  </data>
   <data name="CancelBtnText" xml:space="preserve">
     <value>Annulla</value>
   </data>
+  <data name="CloseBtnText" xml:space="preserve">
+    <value>Chiudi</value>
+  </data>
+  <data name="LockBtnText" xml:space="preserve">
+    <value>serratura</value>
+  </data>
+  <data name="RemoveBtnText" xml:space="preserve">
+    <value>rimuovere</value>
+  </data>
   <data name="OkBtnText" xml:space="preserve">
     <value>ok</value>
   </data>
+  <data name="Correction_lph" xml:space="preserve">
+    <value>correzione [l/h]</value>
+  </data>
+  <data name="Correction_mbar" xml:space="preserve">
+    <value>correzione [mbar]</value>
+  </data>
+  <data name="Flow_m3h" xml:space="preserve">
+    <value>flusso [m3/h]</value>
+  </data>
+  <data name="Invalid_username_or_password" xml:space="preserve">
+    <value>Username o password non validi</value>
+  </data>
+  <data name="CopyBtnText" xml:space="preserve">
+    <value>copia</value>
+  </data>
+  <data name="DownBtnText" xml:space="preserve">
+    <value>Giù</value>
+  </data>
+  <data name="EditBtnText" xml:space="preserve">
+    <value>Modifica</value>
+  </data>
+  <data name="UpBtnText" xml:space="preserve">
+    <value>Su</value>
+  </data>
+  <data name="NoDatabaseMsg" xml:space="preserve">
+    <value>Impossibile collegarsi al database</value>
+  </data>
   <data name="ConfigureDatabaseText" xml:space="preserve">
     <value>configurare il banco prova (richiesta password)</value>
   </data>
   <data name="ExitBtnText" xml:space="preserve">
     <value>uscita</value>
   </data>
+  <data name="Enter_password" xml:space="preserve">
+    <value>password di ingresso</value>
+  </data>
+  <data name="Invalid_password" xml:space="preserve">
+    <value>Password non valida</value>
+  </data>
+  <data name="Bench_name_conflict_Use_another_name_pls" xml:space="preserve">
+    <value>conflitto nome per banco prova, cambiare nome</value>
+  </data>
+  <data name="DB_was_successfully_created" xml:space="preserve">
+    <value>Il database è stato creato con successo!</value>
+  </data>
+  <data name="DB_will_be_overwritten" xml:space="preserve">
+    <value>il database verrà sovrascritto</value>
+  </data>
+  <data name="Do_you_want_to_proceed" xml:space="preserve">
+    <value>vuoi procedere?</value>
+  </data>
+  <data name="Notification" xml:space="preserve">
+    <value>notifica</value>
+  </data>
+  <data name="NoBenchMsg" xml:space="preserve">
+    <value>nessun banco prova nella configurazione del programma</value>
+  </data>
+  <data name="DescriptionColHdr" xml:space="preserve">
+    <value>Descrizione</value>
+  </data>
   <data name="Procedure" xml:space="preserve">
     <value>procedura</value>
   </data>
   <data name="Test" xml:space="preserve">
     <value>tester</value>
   </data>
+  <data name="Corrected" xml:space="preserve">
+    <value>corretto</value>
+  </data>
+  <data name="Measured" xml:space="preserve">
+    <value>misurato</value>
+  </data>
+  <data name="Bench_is_not_running" xml:space="preserve">
+    <value>il banco prova non è in funzionamento tuttavia è possibile modificare le impostazioni per risolvere il problema</value>
+  </data>
+  <data name="Emptying_chdr" xml:space="preserve">
+    <value>svuotamento</value>
+  </data>
+  <data name="Bench_chdr" xml:space="preserve">
+    <value>banco</value>
+  </data>
+  <data name="Err_cor_neg_pct_chdr" xml:space="preserve">
+    <value>correzione errore - [%]</value>
+  </data>
+  <data name="Err_cor_pos_pct_chdr" xml:space="preserve">
+    <value>correzione errore + [%]</value>
+  </data>
+  <data name="Err_limit_neg_pct_chdr" xml:space="preserve">
+    <value>limite errore - [%]</value>
+  </data>
+  <data name="Err_limit_pos_pct_chdr" xml:space="preserve">
+    <value>limite errore + [%]</value>
+  </data>
+  <data name="Feeding_chdr" xml:space="preserve">
+    <value>alimentazione</value>
+  </data>
+  <data name="Red_type_chdr" xml:space="preserve">
+    <value>tipo rosso</value>
+  </data>
+  <data name="Error_while_creating_DB_Reason" xml:space="preserve">
+    <value>errore durante la creazione del data base , motivi:</value>
+  </data>
+  <data name="Metrology" xml:space="preserve">
+    <value>metrologia</value>
+  </data>
+  <data name="_offline" xml:space="preserve">
+    <value>(disconnesso)</value>
+  </data>
+  <data name="Administrator" xml:space="preserve">
+    <value>Amministratore</value>
+  </data>
+  <data name="Calibration_Specialist" xml:space="preserve">
+    <value>esperto di calibrazione</value>
+  </data>
+  <data name="Head_of_Lab" xml:space="preserve">
+    <value>capo del laboratorio</value>
+  </data>
+  <data name="Maintenance_Specialist" xml:space="preserve">
+    <value>esperto in manutenzione</value>
+  </data>
+  <data name="Metrologist" xml:space="preserve">
+    <value>metrologista</value>
+  </data>
+  <data name="Close_emptying_valve" xml:space="preserve">
+    <value>chiudere la valvola di svuotamento</value>
+  </data>
+  <data name="Get_mass_of_water_in_the_tank" xml:space="preserve">
+    <value>prendi la massa d'acqua nel serbatoio</value>
+  </data>
+  <data name="Ignore" xml:space="preserve">
+    <value>Ignora</value>
+  </data>
+  <data name="Loading_the_procedure" xml:space="preserve">
+    <value>scarica la procedura</value>
+  </data>
+  <data name="Make_tank_empty" xml:space="preserve">
+    <value>svuotare il serbatoio</value>
+  </data>
+  <data name="Measure_the_mass" xml:space="preserve">
+    <value>misura la massa</value>
+  </data>
+  <data name="Ready" xml:space="preserve">
+    <value>pronto</value>
+  </data>
+  <data name="BackBtnText" xml:space="preserve">
+    <value>&lt; indietro</value>
+  </data>
+  <data name="FinishBtnText" xml:space="preserve">
+    <value>finire</value>
+  </data>
+  <data name="NextBtnText" xml:space="preserve">
+    <value>avanti &gt;</value>
+  </data>
+  <data name="Flow_selection" xml:space="preserve">
+    <value>selezionare il flusso</value>
+  </data>
+  <data name="Method_chdr" xml:space="preserve">
+    <value>metodo di prova</value>
+  </data>
+  <data name="RelativeQfrom" xml:space="preserve">
+    <value>Q relativo da</value>
+  </data>
+  <data name="RelativeQto" xml:space="preserve">
+    <value>Q relativo a</value>
+  </data>
+  <data name="Combined_meters" xml:space="preserve">
+    <value>misuratori combinati</value>
+  </data>
+  <data name="DetectionThresholdPct" xml:space="preserve">
+    <value>soglia di rilevazione [%]</value>
+  </data>
+  <data name="RateOfChangePct" xml:space="preserve">
+    <value>tasso di cambio [%]</value>
+  </data>
   <data name="Component" xml:space="preserve">
     <value>componenti</value>
   </data>
+  <data name="_none_" xml:space="preserve">
+    <value>&lt;none&gt;</value>
+  </data>
+  <data name="Method_selection" xml:space="preserve">
+    <value>selezione del metodo di prova</value>
+  </data>
+  <data name="Clear_results" xml:space="preserve">
+    <value>cancella risultati</value>
+  </data>
   <data name="Configure" xml:space="preserve">
     <value>configurare</value>
   </data>
+  <data name="Arrangement_of_meters" xml:space="preserve">
+    <value>disposizioni di misuratori testati</value>
+  </data>
+  <data name="Arrangement_of_tests" xml:space="preserve">
+    <value>disposizione dei test</value>
+  </data>
+  <data name="Horizontally" xml:space="preserve">
+    <value>orizzontalmente</value>
+  </data>
+  <data name="Configuration" xml:space="preserve">
+    <value>configurazione</value>
+  </data>
+  <data name="Failed" xml:space="preserve">
+    <value>NOK</value>
+  </data>
+  <data name="ClearBtnText" xml:space="preserve">
+    <value>chiaro</value>
+  </data>
+  <data name="Emptying_tank" xml:space="preserve">
+    <value>svuotare il serbatorio</value>
+  </data>
+  <data name="Measuring_the_weight" xml:space="preserve">
+    <value>misurazione del peso</value>
+  </data>
+  <data name="Emptying_i_n" xml:space="preserve">
+    <value>svuotamento {0}: passo {1}/{2}</value>
+  </data>
+  <data name="Activity" xml:space="preserve">
+    <value>Attività</value>
+  </data>
+  <data name="Approval_info" xml:space="preserve">
+    <value>Info approvazione</value>
+  </data>
+  <data name="Metrological_class" xml:space="preserve">
+    <value>classe metrologica</value>
+  </data>
+  <data name="Producer" xml:space="preserve">
+    <value>produttore</value>
+  </data>
   <data name="Printer" xml:space="preserve">
     <value>stampante</value>
   </data>
+  <data name="Version" xml:space="preserve">
+    <value>versione</value>
+  </data>
+  <data name="nothing_to_configure" xml:space="preserve">
+    <value>&lt;niente da configurare&gt;</value>
+  </data>
+  <data name="Fill_with_water" xml:space="preserve">
+    <value>riempire il banco prova con acqua?</value>
+  </data>
+  <data name="NoBtn" xml:space="preserve">
+    <value>no</value>
+  </data>
   <data name="Question" xml:space="preserve">
     <value>domanda</value>
   </data>
+  <data name="Bench_parameters" xml:space="preserve">
+    <value>parametri del banco</value>
+  </data>
   <data name="Connection_string" xml:space="preserve">
     <value>stringa di connessione</value>
   </data>
+  <data name="Create_DB" xml:space="preserve">
+    <value>Crea DB</value>
+  </data>
+  <data name="Database_type" xml:space="preserve">
+    <value>tipo di database</value>
+  </data>
+  <data name="Logging" xml:space="preserve">
+    <value>registrazione</value>
+  </data>
+  <data name="Mode" xml:space="preserve">
+    <value>modalità</value>
+  </data>
+  <data name="NewTabBtnText" xml:space="preserve">
+    <value>nuova scheda</value>
+  </data>
+  <data name="New_transition_name" xml:space="preserve">
+    <value>nuovo nome di transizione</value>
+  </data>
+  <data name="Detection_completed" xml:space="preserve">
+    <value>rilevazione completata</value>
+  </data>
+  <data name="Emergency_STOP" xml:space="preserve">
+    <value>STOP di emergenza</value>
+  </data>
   <data name="Add" xml:space="preserve">
     <value>&amp;Aggiungi &gt;</value>
   </data>
+  <data name="Available_results" xml:space="preserve">
+    <value>Risultati disponibili:</value>
+  </data>
+  <data name="Remove" xml:space="preserve">
+    <value>&lt; &amp;rimuovere</value>
+  </data>
+  <data name="Remove_all" xml:space="preserve">
+    <value>r&amp;imuovere tutto</value>
+  </data>
   <data name="Message" xml:space="preserve">
     <value>messaggio</value>
   </data>
+  <data name="dflt" xml:space="preserve">
+    <value>dflt</value>
+  </data>
+  <data name="Detection_failed" xml:space="preserve">
+    <value>rilevazione fallita</value>
+  </data>
+  <data name="Camera_error" xml:space="preserve">
+    <value>errore della fotocamera</value>
+  </data>
+  <data name="remaining_time" xml:space="preserve">
+    <value>tempo restante</value>
+  </data>
+  <data name="LessBtnText" xml:space="preserve">
+    <value>di meno</value>
+  </data>
+  <data name="MoreBtnText" xml:space="preserve">
+    <value>di più</value>
+  </data>
+  <data name="Changes_will_be_lost_Do_you_want_to_proceed" xml:space="preserve">
+    <value>le modifiche andranno perse vuoi procedere?</value>
+  </data>
+  <data name="Flowmeter" xml:space="preserve">
+    <value>misuratore di flusso</value>
+  </data>
+  <data name="CombinedBtnText" xml:space="preserve">
+    <value>combinato</value>
+  </data>
+  <data name="Device" xml:space="preserve">
+    <value>Dispositivo</value>
+  </data>
+  <data name="PrinterBtnText" xml:space="preserve">
+    <value>stampante</value>
+  </data>
+  <data name="Aux_Water_Meter" xml:space="preserve">
+    <value>contatore acqua ausiliario</value>
+  </data>
+  <data name="Aux_Water_Meter_State" xml:space="preserve">
+    <value>stato contatore acqua ausiliario</value>
+  </data>
   <data name="Data" xml:space="preserve">
     <value>dati</value>
   </data>
+  <data name="End_State" xml:space="preserve">
+    <value>fine stato</value>
+  </data>
+  <data name="Main_Water_Meter" xml:space="preserve">
+    <value>contatore acqua principale</value>
+  </data>
+  <data name="Main_Water_Meter_State" xml:space="preserve">
+    <value>stato contatore acqua principale</value>
+  </data>
   <data name="Protocol" xml:space="preserve">
     <value>protocollo</value>
   </data>
   <data name="Serial_Number" xml:space="preserve">
     <value>Numero Seriale</value>
   </data>
+  <data name="Aux_WM_SerialNr" xml:space="preserve">
+    <value>numero seriale contatore acqua ausiliario</value>
+  </data>
+  <data name="Main_WM_SerialNr" xml:space="preserve">
+    <value>numero seriale contatore acqua principale</value>
+  </data>
+  <data name="Adjustment_in_progress" xml:space="preserve">
+    <value>aggiustamento in corso</value>
+  </data>
+  <data name="Error_pct" xml:space="preserve">
+    <value>Errore [%]</value>
+  </data>
+  <data name="Duration_Leak_s" xml:space="preserve">
+    <value>durata delle perdite [s]</value>
+  </data>
+  <data name="Duration_PMax_s" xml:space="preserve">
+    <value>durata portata massima [s]</value>
+  </data>
+  <data name="Closing_valve_Pump_off" xml:space="preserve">
+    <value>chiudere la valvola di ingresso spegnendo la pompa</value>
+  </data>
+  <data name="Purchase_Order" xml:space="preserve">
+    <value>ordine acquisto</value>
+  </data>
+  <data name="Ambient_humidity_" xml:space="preserve">
+    <value>Umidità dell'ambiente:</value>
+  </data>
+  <data name="Ambient_pressure_" xml:space="preserve">
+    <value>Pressione dell'ambiente:</value>
+  </data>
+  <data name="Ambient_temperature_" xml:space="preserve">
+    <value>Temperatura dell'ambiente:</value>
+  </data>
+  <data name="Approval_" xml:space="preserve">
+    <value>Approvazione:</value>
+  </data>
+  <data name="Date_and_time_" xml:space="preserve">
+    <value>Data e ora:</value>
+  </data>
+  <data name="End" xml:space="preserve">
+    <value>Fine</value>
+  </data>
+  <data name="AtTemperature_C" xml:space="preserve">
+    <value>@temperatura [gradiC]</value>
+  </data>
+  <data name="Density_kg_m3" xml:space="preserve">
+    <value>densità [kg/m3]</value>
+  </data>
+  <data name="Density" xml:space="preserve">
+    <value>densità</value>
+  </data>
+  <data name="Nr_meters_in_a_group" xml:space="preserve">
+    <value>numero contatori di un gruppo:</value>
+  </data>
+  <data name="End_Condition" xml:space="preserve">
+    <value>condizioni finali</value>
+  </data>
+  <data name="Communication" xml:space="preserve">
+    <value>Comunicazione</value>
+  </data>
+  <data name="Aux_" xml:space="preserve">
+    <value>ausiliario:</value>
+  </data>
+  <data name="Main_" xml:space="preserve">
+    <value>principale:</value>
+  </data>
+  <data name="cold" xml:space="preserve">
+    <value>freddo</value>
+  </data>
+  <data name="hot" xml:space="preserve">
+    <value>caldo</value>
+  </data>
+  <data name="Product_name" xml:space="preserve">
+    <value>nome prodotto</value>
+  </data>
+  <data name="Address" xml:space="preserve">
+    <value>Indirizzo</value>
+  </data>
+  <data name="Approval_date" xml:space="preserve">
+    <value>Data di approvazione</value>
+  </data>
+  <data name="Approval_ID" xml:space="preserve">
+    <value>ID approvazione</value>
+  </data>
+  <data name="Approved_by" xml:space="preserve">
+    <value>Approvato da</value>
+  </data>
+  <data name="Evaluate" xml:space="preserve">
+    <value>Valuta</value>
+  </data>
+  <data name="iPerl_Communication_in_progress" xml:space="preserve">
+    <value>iPerl comunicazione in corso</value>
+  </data>
   <data name="Language" xml:space="preserve">
     <value>lingua</value>
   </data>
+  <data name="Available_Components_" xml:space="preserve">
+    <value>componenti disponibili:</value>
+  </data>
+  <data name="Database_Settings" xml:space="preserve">
+    <value>impostazioni del data base</value>
+  </data>
+  <data name="About_Test_Bench_Framework" xml:space="preserve">
+    <value>informazioni circa la prova del banco </value>
+  </data>
+  <data name="BuildDateStr" xml:space="preserve">
+    <value>data di costruzione _BUILD_DATE_</value>
+  </data>
+  <data name="CopyrightStr" xml:space="preserve">
+    <value>Copyright © 2013 - {0}</value>
+  </data>
+  <data name="Edit_User" xml:space="preserve">
+    <value>Copyright © 2013 - {0}</value>
+  </data>
+  <data name="Groups" xml:space="preserve">
+    <value>gruppi</value>
+  </data>
+  <data name="An_unhandled_error_occured" xml:space="preserve">
+    <value>Si è verificato un errore imprevisto</value>
+  </data>
+  <data name="IgnoreBtnText" xml:space="preserve">
+    <value>Ignora</value>
+  </data>
   <data name="Add_filter" xml:space="preserve">
     <value>aggiungi filtro</value>
   </data>
@@ -219,6 +732,18 @@
   <data name="RetryDatabaseText" xml:space="preserve">
     <value>riprova</value>
   </data>
+  <data name="Selected_results" xml:space="preserve">
+    <value>selezionare risultati</value>
+  </data>
+  <data name="SingleBtnText" xml:space="preserve">
+    <value>singolo</value>
+  </data>
+  <data name="UnlockBtnText" xml:space="preserve">
+    <value>sbloccare</value>
+  </data>
+  <data name="Water_Meter" xml:space="preserve">
+    <value>contatore acqua</value>
+  </data>
   <data name="Date" xml:space="preserve">
     <value>Data  </value>
   </data>

ResultsBrowser/Resources/Strings.pl.resx

@@ -117,66 +117,579 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Confirmation" xml:space="preserve">
+    <value>Potwierdzenie</value>
+  </data>
+  <data name="Do_you_want_to_save_the_procedure" xml:space="preserve">
+    <value>Zachować procedurę ?</value>
+  </data>
   <data name="Error" xml:space="preserve">
     <value>Błąd</value>
   </data>
+  <data name="Error_loading_users_from_the_database" xml:space="preserve">
+    <value>Błąd przy ładowaniu użytkowników z bazy danych:</value>
+  </data>
+  <data name="Failed_to_create_a_sample_database" xml:space="preserve">
+    <value>Nie udało się utworzyć bazy danych:</value>
+  </data>
+  <data name="Failed_to_export_the_database" xml:space="preserve">
+    <value>Nie powódł się eksport bazy danych:</value>
+  </data>
+  <data name="Invalid_user_password_or_bench" xml:space="preserve">
+    <value>Niezgodny użytkownik, hasło lub stanowisko</value>
+  </data>
   <data name="Test_bench" xml:space="preserve">
     <value>Stanowisko pomiarowe</value>
   </data>
+  <data name="MaxChars" xml:space="preserve">
+    <value>Max._X_znaków alfanumerycznych </value>
+  </data>
+  <data name="close" xml:space="preserve">
+    <value>Zamknąć</value>
+  </data>
+  <data name="Diverter" xml:space="preserve">
+    <value>Zawór</value>
+  </data>
+  <data name="Emptying_valve" xml:space="preserve">
+    <value>Zawór spustowy</value>
+  </data>
   <data name="Name" xml:space="preserve">
     <value>Imię</value>
   </data>
+  <data name="Reference" xml:space="preserve">
+    <value>Odniesienie</value>
+  </data>
+  <data name="Reg_valve" xml:space="preserve">
+    <value>Zawór regulacyjny</value>
+  </data>
+  <data name="Balance" xml:space="preserve">
+    <value>Waga</value>
+  </data>
+  <data name="Duration_s" xml:space="preserve">
+    <value>Czas trwania [s]</value>
+  </data>
+  <data name="no" xml:space="preserve">
+    <value>nie</value>
+  </data>
+  <data name="New_bench_path_name" xml:space="preserve">
+    <value>P stanowisko</value>
+  </data>
+  <data name="New_feeding_path_name" xml:space="preserve">
+    <value>P zasilania</value>
+  </data>
+  <data name="New_output_path_name" xml:space="preserve">
+    <value>PQ</value>
+  </data>
+  <data name="New_procedure_name" xml:space="preserve">
+    <value>Procedura</value>
+  </data>
+  <data name="New_sensors_path_name" xml:space="preserve">
+    <value>P czujnków</value>
+  </data>
+  <data name="New_test_name" xml:space="preserve">
+    <value>Test</value>
+  </data>
+  <data name="New_name_copy" xml:space="preserve">
+    <value>-Kopiuj'</value>
+  </data>
+  <data name="Correction_g" xml:space="preserve">
+    <value>Korekcja [r]</value>
+  </data>
+  <data name="Nr" xml:space="preserve">
+    <value>Nr</value>
+  </data>
+  <data name="Mass_kg" xml:space="preserve">
+    <value>Masa [kg]</value>
+  </data>
+  <data name="AddBtnText" xml:space="preserve">
+    <value>Dodać</value>
+  </data>
   <data name="CancelBtnText" xml:space="preserve">
     <value>Anuluj</value>
   </data>
+  <data name="CloseBtnText" xml:space="preserve">
+    <value>Zamknąć</value>
+  </data>
+  <data name="LockBtnText" xml:space="preserve">
+    <value>Zablokować </value>
+  </data>
+  <data name="RemoveBtnText" xml:space="preserve">
+    <value>Usunąć</value>
+  </data>
   <data name="OkBtnText" xml:space="preserve">
     <value>OK</value>
   </data>
+  <data name="Correction_lph" xml:space="preserve">
+    <value>Korekcja [l/h]</value>
+  </data>
+  <data name="Correction_mbar" xml:space="preserve">
+    <value>Korekcja [mBar]</value>
+  </data>
+  <data name="Flow_m3h" xml:space="preserve">
+    <value>Przepływ [m3/h]</value>
+  </data>
+  <data name="Invalid_username_or_password" xml:space="preserve">
+    <value>Nieprawidłowa nazwa użytkownika lub hasło</value>
+  </data>
+  <data name="CopyBtnText" xml:space="preserve">
+    <value>Kupiuj</value>
+  </data>
+  <data name="DownBtnText" xml:space="preserve">
+    <value>Na dół </value>
+  </data>
+  <data name="EditBtnText" xml:space="preserve">
+    <value>Redagować</value>
+  </data>
+  <data name="UpBtnText" xml:space="preserve">
+    <value>Do góry</value>
+  </data>
+  <data name="NoDatabaseMsg" xml:space="preserve">
+    <value>Nie udane połaczenie z bazą danych</value>
+  </data>
   <data name="ConfigureDatabaseText" xml:space="preserve">
     <value>Konfiguracja testowa (wymagane hasło)</value>
   </data>
   <data name="ExitBtnText" xml:space="preserve">
     <value>Wyjście</value>
   </data>
+  <data name="Enter_password" xml:space="preserve">
+    <value>Wprowadź hasło</value>
+  </data>
+  <data name="Invalid_password" xml:space="preserve">
+    <value>Nieprawidłowe hasło</value>
+  </data>
+  <data name="Bench_name_conflict_Use_another_name_pls" xml:space="preserve">
+    <value>Nazwa stanowiska nieprawidłowa, użyj innej nazwy</value>
+  </data>
+  <data name="DB_was_successfully_created" xml:space="preserve">
+    <value>Utworzono bazę danych !</value>
+  </data>
+  <data name="DB_will_be_overwritten" xml:space="preserve">
+    <value>Baza danych zostanie nadpisana</value>
+  </data>
+  <data name="Do_you_want_to_proceed" xml:space="preserve">
+    <value>Chcesz kontynuować ?</value>
+  </data>
+  <data name="Notification" xml:space="preserve">
+    <value>Powiadomienie</value>
+  </data>
+  <data name="NoBenchMsg" xml:space="preserve">
+    <value>W konfiguracji oprogramowania nie ma stanowiska </value>
+  </data>
+  <data name="DescriptionColHdr" xml:space="preserve">
+    <value>Opis</value>
+  </data>
   <data name="Procedure" xml:space="preserve">
     <value>Procedura</value>
   </data>
   <data name="Test" xml:space="preserve">
     <value>Test</value>
   </data>
+  <data name="Corrected" xml:space="preserve">
+    <value>Poprawiono</value>
+  </data>
+  <data name="Measured" xml:space="preserve">
+    <value>Zmierzono</value>
+  </data>
+  <data name="Bench_is_not_running" xml:space="preserve">
+    <value>Stanowisko nie jest włączone ale można dokonać korekty nastaw dla usunięcia tego błedu.</value>
+  </data>
+  <data name="Emptying_chdr" xml:space="preserve">
+    <value>Spust</value>
+  </data>
+  <data name="Bench_chdr" xml:space="preserve">
+    <value>Stanowisko</value>
+  </data>
+  <data name="Err_cor_neg_pct_chdr" xml:space="preserve">
+    <value>Błąd kor. - [%]</value>
+  </data>
+  <data name="Err_cor_pos_pct_chdr" xml:space="preserve">
+    <value>Błąd kor. +[%]</value>
+  </data>
+  <data name="Err_limit_neg_pct_chdr" xml:space="preserve">
+    <value>Błąd limit - [%]</value>
+  </data>
+  <data name="Err_limit_pos_pct_chdr" xml:space="preserve">
+    <value>Błąd limit + [%]</value>
+  </data>
+  <data name="Feeding_chdr" xml:space="preserve">
+    <value>Zasilanie</value>
+  </data>
+  <data name="Red_type_chdr" xml:space="preserve">
+    <value>Red. Type</value>
+  </data>
+  <data name="Error_while_creating_DB_Reason" xml:space="preserve">
+    <value>Błąd przy tworzeniu bazy danych. Przyczyna:</value>
+  </data>
+  <data name="Metrology" xml:space="preserve">
+    <value>Metrologia</value>
+  </data>
+  <data name="_offline" xml:space="preserve">
+    <value>Ofline</value>
+  </data>
+  <data name="Administrator" xml:space="preserve">
+    <value>Administrator</value>
+  </data>
+  <data name="Calibration_Specialist" xml:space="preserve">
+    <value>Specjalista ds. kalibracji</value>
+  </data>
+  <data name="Head_of_Lab" xml:space="preserve">
+    <value>Kierownik laboratorium</value>
+  </data>
+  <data name="Maintenance_Specialist" xml:space="preserve">
+    <value>Konserwator</value>
+  </data>
+  <data name="Metrologist" xml:space="preserve">
+    <value>Metrolog</value>
+  </data>
+  <data name="Close_emptying_valve" xml:space="preserve">
+    <value>Zamknąć zawór spustowy</value>
+  </data>
+  <data name="Get_mass_of_water_in_the_tank" xml:space="preserve">
+    <value>Uzyskaj masę wody w zbiorniku</value>
+  </data>
+  <data name="Ignore" xml:space="preserve">
+    <value>Wyłączyć</value>
+  </data>
+  <data name="Loading_the_procedure" xml:space="preserve">
+    <value>Procedura ładowania</value>
+  </data>
+  <data name="Make_tank_empty" xml:space="preserve">
+    <value>Opróżnić zbiornik</value>
+  </data>
+  <data name="Measure_the_mass" xml:space="preserve">
+    <value>Pomiar masy</value>
+  </data>
+  <data name="Ready" xml:space="preserve">
+    <value>Gotowe</value>
+  </data>
+  <data name="BackBtnText" xml:space="preserve">
+    <value>&lt; z powrotem</value>
+  </data>
+  <data name="FinishBtnText" xml:space="preserve">
+    <value>Koniec</value>
+  </data>
+  <data name="NextBtnText" xml:space="preserve">
+    <value>Następny &gt;</value>
+  </data>
+  <data name="Flow_selection" xml:space="preserve">
+    <value>Wybór przypływu</value>
+  </data>
+  <data name="Method_chdr" xml:space="preserve">
+    <value>Metoda badania</value>
+  </data>
+  <data name="RelativeQfrom" xml:space="preserve">
+    <value>Q względne od</value>
+  </data>
+  <data name="RelativeQto" xml:space="preserve">
+    <value>Q względne do</value>
+  </data>
+  <data name="Combined_meters" xml:space="preserve">
+    <value>Wodomierze sprzężone</value>
+  </data>
+  <data name="DetectionThresholdPct" xml:space="preserve">
+    <value>Próg detekcji [%]</value>
+  </data>
+  <data name="RateOfChangePct" xml:space="preserve">
+    <value>Prędkość zmiany [%]</value>
+  </data>
   <data name="Component" xml:space="preserve">
     <value>Element</value>
   </data>
+  <data name="_none_" xml:space="preserve">
+    <value>&lt;nie&gt;</value>
+  </data>
+  <data name="Method_selection" xml:space="preserve">
+    <value>Wybór metody badania</value>
+  </data>
+  <data name="Clear_results" xml:space="preserve">
+    <value>Usunąć wyniki</value>
+  </data>
   <data name="Configure" xml:space="preserve">
     <value>Konfigurować</value>
   </data>
+  <data name="Arrangement_of_meters" xml:space="preserve">
+    <value>Połozenie badanych liczników</value>
+  </data>
+  <data name="Arrangement_of_tests" xml:space="preserve">
+    <value>Położenie badań</value>
+  </data>
+  <data name="Horizontally" xml:space="preserve">
+    <value>Poziomo</value>
+  </data>
+  <data name="Configuration" xml:space="preserve">
+    <value>Konfiguracja</value>
+  </data>
+  <data name="Failed" xml:space="preserve">
+    <value>NOK</value>
+  </data>
+  <data name="ClearBtnText" xml:space="preserve">
+    <value>Usunąć</value>
+  </data>
+  <data name="Emptying_tank" xml:space="preserve">
+    <value>Opróżnianie zbiornika</value>
+  </data>
+  <data name="Measuring_the_weight" xml:space="preserve">
+    <value>Pomair wagi</value>
+  </data>
+  <data name="Emptying_i_n" xml:space="preserve">
+    <value>Spust ({0}: krok {1} / {2}</value>
+  </data>
+  <data name="Activity" xml:space="preserve">
+    <value>Aktywny</value>
+  </data>
+  <data name="Approval_info" xml:space="preserve">
+    <value>Informacja o zatwierdzeniu</value>
+  </data>
+  <data name="Metrological_class" xml:space="preserve">
+    <value>Klasa metrologiczna</value>
+  </data>
+  <data name="Producer" xml:space="preserve">
+    <value>Producent</value>
+  </data>
   <data name="Printer" xml:space="preserve">
     <value>Drukarka</value>
   </data>
+  <data name="Version" xml:space="preserve">
+    <value>Wersja</value>
+  </data>
+  <data name="nothing_to_configure" xml:space="preserve">
+    <value>&lt;nie konfigurować&gt;</value>
+  </data>
+  <data name="Fill_with_water" xml:space="preserve">
+    <value>Napełnić stanowisko wodą ?</value>
+  </data>
+  <data name="NoBtn" xml:space="preserve">
+    <value>Nie</value>
+  </data>
   <data name="Question" xml:space="preserve">
     <value>Pytanie</value>
   </data>
+  <data name="Bench_parameters" xml:space="preserve">
+    <value>Parametry stanowiska</value>
+  </data>
   <data name="Connection_string" xml:space="preserve">
     <value>Parametry połączenia</value>
   </data>
+  <data name="Create_DB" xml:space="preserve">
+    <value>Utwórz DB</value>
+  </data>
+  <data name="Database_type" xml:space="preserve">
+    <value>Typ bazy danych</value>
+  </data>
+  <data name="Logging" xml:space="preserve">
+    <value>Logowanie</value>
+  </data>
+  <data name="Mode" xml:space="preserve">
+    <value>Cykl pracy</value>
+  </data>
+  <data name="NewTabBtnText" xml:space="preserve">
+    <value>Nowa Tab</value>
+  </data>
+  <data name="New_transition_name" xml:space="preserve">
+    <value>Nowa nazwa przejścia</value>
+  </data>
+  <data name="Detection_completed" xml:space="preserve">
+    <value>Wykrywanie zakończono</value>
+  </data>
+  <data name="Emergency_STOP" xml:space="preserve">
+    <value>Zatrzymanie awaryjne</value>
+  </data>
   <data name="Add" xml:space="preserve">
     <value>&amp;Dodać &gt;</value>
   </data>
+  <data name="Available_results" xml:space="preserve">
+    <value>Dostępne wyniki:</value>
+  </data>
+  <data name="Remove" xml:space="preserve">
+    <value>&lt;&amp;Usunąć</value>
+  </data>
+  <data name="Remove_all" xml:space="preserve">
+    <value>&lt;&lt;Usunąć wszystko</value>
+  </data>
   <data name="Message" xml:space="preserve">
     <value>Wiadomość</value>
   </data>
+  <data name="dflt" xml:space="preserve">
+    <value>dflt</value>
+  </data>
+  <data name="Detection_failed" xml:space="preserve">
+    <value>Nie udana próba wykrywania</value>
+  </data>
+  <data name="Camera_error" xml:space="preserve">
+    <value>Błąd kamery</value>
+  </data>
+  <data name="remaining_time" xml:space="preserve">
+    <value>pozostały czas</value>
+  </data>
+  <data name="LessBtnText" xml:space="preserve">
+    <value>Mniej</value>
+  </data>
+  <data name="MoreBtnText" xml:space="preserve">
+    <value>Więcej</value>
+  </data>
+  <data name="Changes_will_be_lost_Do_you_want_to_proceed" xml:space="preserve">
+    <value>Zmiany zostaną stracone. Chcesz kontynuować ?</value>
+  </data>
+  <data name="Flowmeter" xml:space="preserve">
+    <value>Przepływomierz</value>
+  </data>
+  <data name="CombinedBtnText" xml:space="preserve">
+    <value>Sprzężony</value>
+  </data>
+  <data name="Device" xml:space="preserve">
+    <value>Urządzenie</value>
+  </data>
+  <data name="PrinterBtnText" xml:space="preserve">
+    <value>Drukarka</value>
+  </data>
+  <data name="Aux_Water_Meter" xml:space="preserve">
+    <value>Wodomierz dodatkowy</value>
+  </data>
+  <data name="Aux_Water_Meter_State" xml:space="preserve">
+    <value>Stan dodatkowego wodomierza</value>
+  </data>
   <data name="Data" xml:space="preserve">
     <value>Dane</value>
   </data>
+  <data name="End_State" xml:space="preserve">
+    <value>Stan końcowy</value>
+  </data>
+  <data name="Main_Water_Meter" xml:space="preserve">
+    <value>Główny wodomierz</value>
+  </data>
+  <data name="Main_Water_Meter_State" xml:space="preserve">
+    <value>Stan wodomierza głównego</value>
+  </data>
   <data name="Protocol" xml:space="preserve">
     <value>Zapiska</value>
   </data>
   <data name="Serial_Number" xml:space="preserve">
     <value>Nr seryjny</value>
   </data>
+  <data name="Aux_WM_SerialNr" xml:space="preserve">
+    <value>Nr seryjny dodatkowego wodomierza</value>
+  </data>
+  <data name="Main_WM_SerialNr" xml:space="preserve">
+    <value>Nr seryjny głównego wodomierza</value>
+  </data>
+  <data name="Adjustment_in_progress" xml:space="preserve">
+    <value>Regulacja trwa</value>
+  </data>
+  <data name="Error_pct" xml:space="preserve">
+    <value>Błąd [%]</value>
+  </data>
+  <data name="Duration_Leak_s" xml:space="preserve">
+    <value>Czas trwania przepływu [s]</value>
+  </data>
+  <data name="Duration_PMax_s" xml:space="preserve">
+    <value>Czas trwania Pmax [s]</value>
+  </data>
+  <data name="Closing_valve_Pump_off" xml:space="preserve">
+    <value>Zamnięcie zaworu zasilania, wyłączenie pompy</value>
+  </data>
+  <data name="Purchase_Order" xml:space="preserve">
+    <value>Zamówienie</value>
+  </data>
+  <data name="Ambient_humidity_" xml:space="preserve">
+    <value>Wilgotność względna otoczenia</value>
+  </data>
+  <data name="Ambient_pressure_" xml:space="preserve">
+    <value>Ciśnienie względne:</value>
+  </data>
+  <data name="Ambient_temperature_" xml:space="preserve">
+    <value>Temperatura otoczenia:</value>
+  </data>
+  <data name="Approval_" xml:space="preserve">
+    <value>Zatwierdzenie:</value>
+  </data>
+  <data name="Date_and_time_" xml:space="preserve">
+    <value>Data i czas:</value>
+  </data>
+  <data name="End" xml:space="preserve">
+    <value>Koniec</value>
+  </data>
+  <data name="AtTemperature_C" xml:space="preserve">
+    <value>@temperatura  [degC]</value>
+  </data>
+  <data name="Density_kg_m3" xml:space="preserve">
+    <value>Gęstość [kg/m3]</value>
+  </data>
+  <data name="Density" xml:space="preserve">
+    <value>Gęstość</value>
+  </data>
+  <data name="Nr_meters_in_a_group" xml:space="preserve">
+    <value>Nr liczników w grupie</value>
+  </data>
+  <data name="End_Condition" xml:space="preserve">
+    <value>Stan końcowy</value>
+  </data>
+  <data name="Communication" xml:space="preserve">
+    <value>Połączenie</value>
+  </data>
+  <data name="Aux_" xml:space="preserve">
+    <value>Dodadkowy</value>
+  </data>
+  <data name="Main_" xml:space="preserve">
+    <value>Główny</value>
+  </data>
+  <data name="cold" xml:space="preserve">
+    <value>zimna</value>
+  </data>
+  <data name="hot" xml:space="preserve">
+    <value>ciepła</value>
+  </data>
+  <data name="Product_name" xml:space="preserve">
+    <value>Nazwa produktu</value>
+  </data>
+  <data name="Address" xml:space="preserve">
+    <value>Adres</value>
+  </data>
+  <data name="Approval_date" xml:space="preserve">
+    <value>Data zatwierdzenia</value>
+  </data>
+  <data name="Approval_ID" xml:space="preserve">
+    <value>ID Zatwierdzenia</value>
+  </data>
+  <data name="Approved_by" xml:space="preserve">
+    <value>Zatwierdzono</value>
+  </data>
+  <data name="Evaluate" xml:space="preserve">
+    <value>Ocena</value>
+  </data>
+  <data name="iPerl_Communication_in_progress" xml:space="preserve">
+    <value>Połączenie z iPERL w trakcie</value>
+  </data>
   <data name="Language" xml:space="preserve">
     <value>Język</value>
   </data>
+  <data name="Available_Components_" xml:space="preserve">
+    <value>Dostępne elementy:</value>
+  </data>
+  <data name="Database_Settings" xml:space="preserve">
+    <value>Ustawienia bazy danych:</value>
+  </data>
+  <data name="About_Test_Bench_Framework" xml:space="preserve">
+    <value>O Framework stanowiska</value>
+  </data>
+  <data name="BuildDateStr" xml:space="preserve">
+    <value>Build Data _BUILD_Data_</value>
+  </data>
+  <data name="CopyrightStr" xml:space="preserve">
+    <value>Praw autorskie © 2013 - {0}</value>
+  </data>
+  <data name="Edit_User" xml:space="preserve">
+    <value>Edytuj użytkownika</value>
+  </data>
+  <data name="Groups" xml:space="preserve">
+    <value>Grupy</value>
+  </data>
+  <data name="An_unhandled_error_occured" xml:space="preserve">
+    <value>Wystąpił nieobsługiwany błąd </value>
+  </data>
+  <data name="IgnoreBtnText" xml:space="preserve">
+    <value>Wyłączyć</value>
+  </data>
   <data name="Add_filter" xml:space="preserve">
     <value>Dodać filtr</value>
   </data>
@@ -219,6 +732,18 @@
   <data name="RetryDatabaseText" xml:space="preserve">
     <value>Powtórka</value>
   </data>
+  <data name="Selected_results" xml:space="preserve">
+    <value>Wybrane wyniki:</value>
+  </data>
+  <data name="SingleBtnText" xml:space="preserve">
+    <value>Pojedynczy</value>
+  </data>
+  <data name="UnlockBtnText" xml:space="preserve">
+    <value>Odblokować</value>
+  </data>
+  <data name="Water_Meter" xml:space="preserve">
+    <value>Licznik wody</value>
+  </data>
   <data name="Date" xml:space="preserve">
     <value>Data</value>
   </data>

ResultsBrowser/Resources/Strings.resx

@@ -117,66 +117,579 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Confirmation" xml:space="preserve">
+    <value>Confirmation</value>
+  </data>
+  <data name="Do_you_want_to_save_the_procedure" xml:space="preserve">
+    <value>Do you want to save the procedure?</value>
+  </data>
   <data name="Error" xml:space="preserve">
     <value>Error</value>
   </data>
+  <data name="Error_loading_users_from_the_database" xml:space="preserve">
+    <value>Error loading users from the database:</value>
+  </data>
+  <data name="Failed_to_create_a_sample_database" xml:space="preserve">
+    <value>Failed to create a sample database:</value>
+  </data>
+  <data name="Failed_to_export_the_database" xml:space="preserve">
+    <value>Failed to export the database:</value>
+  </data>
+  <data name="Invalid_user_password_or_bench" xml:space="preserve">
+    <value>Invalid user, password, or bench</value>
+  </data>
   <data name="Test_bench" xml:space="preserve">
     <value>Test bench</value>
   </data>
+  <data name="MaxChars" xml:space="preserve">
+    <value>(max. _X_  alphanumeric characters)</value>
+  </data>
+  <data name="close" xml:space="preserve">
+    <value>close</value>
+  </data>
+  <data name="Diverter" xml:space="preserve">
+    <value>Diverter</value>
+  </data>
+  <data name="Emptying_valve" xml:space="preserve">
+    <value>Emptying valve</value>
+  </data>
   <data name="Name" xml:space="preserve">
     <value>Name</value>
   </data>
+  <data name="Reference" xml:space="preserve">
+    <value>Reference</value>
+  </data>
+  <data name="Reg_valve" xml:space="preserve">
+    <value>Reg. valve</value>
+  </data>
+  <data name="Balance" xml:space="preserve">
+    <value>Balance</value>
+  </data>
+  <data name="Duration_s" xml:space="preserve">
+    <value>Duration [s]</value>
+  </data>
+  <data name="no" xml:space="preserve">
+    <value>no</value>
+  </data>
+  <data name="New_bench_path_name" xml:space="preserve">
+    <value>PBench</value>
+  </data>
+  <data name="New_feeding_path_name" xml:space="preserve">
+    <value>PFeed</value>
+  </data>
+  <data name="New_output_path_name" xml:space="preserve">
+    <value>PQ</value>
+  </data>
+  <data name="New_procedure_name" xml:space="preserve">
+    <value>Procedure</value>
+  </data>
+  <data name="New_sensors_path_name" xml:space="preserve">
+    <value>PSens</value>
+  </data>
+  <data name="New_test_name" xml:space="preserve">
+    <value>Test</value>
+  </data>
+  <data name="New_name_copy" xml:space="preserve">
+    <value> - Copy</value>
+  </data>
+  <data name="Correction_g" xml:space="preserve">
+    <value>Correction [g]</value>
+  </data>
+  <data name="Nr" xml:space="preserve">
+    <value>Nr.</value>
+  </data>
+  <data name="Mass_kg" xml:space="preserve">
+    <value>Mass [kg]</value>
+  </data>
+  <data name="AddBtnText" xml:space="preserve">
+    <value>Add</value>
+  </data>
   <data name="CancelBtnText" xml:space="preserve">
     <value>Cancel</value>
   </data>
+  <data name="CloseBtnText" xml:space="preserve">
+    <value>Close</value>
+  </data>
+  <data name="LockBtnText" xml:space="preserve">
+    <value>Lock</value>
+  </data>
+  <data name="RemoveBtnText" xml:space="preserve">
+    <value>Remove</value>
+  </data>
   <data name="OkBtnText" xml:space="preserve">
     <value>OK</value>
   </data>
+  <data name="Correction_lph" xml:space="preserve">
+    <value>Correction [l/h]</value>
+  </data>
+  <data name="Correction_mbar" xml:space="preserve">
+    <value>Correction [mbar]</value>
+  </data>
+  <data name="Flow_m3h" xml:space="preserve">
+    <value>Flow [m3/h]</value>
+  </data>
+  <data name="Invalid_username_or_password" xml:space="preserve">
+    <value>Invalid username or password</value>
+  </data>
+  <data name="CopyBtnText" xml:space="preserve">
+    <value>Copy</value>
+  </data>
+  <data name="DownBtnText" xml:space="preserve">
+    <value>Down</value>
+  </data>
+  <data name="EditBtnText" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="UpBtnText" xml:space="preserve">
+    <value>Up</value>
+  </data>
+  <data name="NoDatabaseMsg" xml:space="preserve">
+    <value>Cannot connect to the database.</value>
+  </data>
   <data name="ConfigureDatabaseText" xml:space="preserve">
     <value>Configure test benches (password required)</value>
   </data>
   <data name="ExitBtnText" xml:space="preserve">
     <value>Exit</value>
   </data>
+  <data name="Enter_password" xml:space="preserve">
+    <value>Enter password</value>
+  </data>
+  <data name="Invalid_password" xml:space="preserve">
+    <value>Invalid password</value>
+  </data>
+  <data name="Bench_name_conflict_Use_another_name_pls" xml:space="preserve">
+    <value>Test bench name conflict, use another name please</value>
+  </data>
+  <data name="DB_was_successfully_created" xml:space="preserve">
+    <value>The database was successfully created!</value>
+  </data>
+  <data name="DB_will_be_overwritten" xml:space="preserve">
+    <value>The database will be overwritten</value>
+  </data>
+  <data name="Do_you_want_to_proceed" xml:space="preserve">
+    <value>Do you want to proceed?</value>
+  </data>
+  <data name="Notification" xml:space="preserve">
+    <value>Notification</value>
+  </data>
+  <data name="NoBenchMsg" xml:space="preserve">
+    <value>No test bench in the program configuration.</value>
+  </data>
+  <data name="DescriptionColHdr" xml:space="preserve">
+    <value>Description</value>
+  </data>
   <data name="Procedure" xml:space="preserve">
     <value>Procedure</value>
   </data>
   <data name="Test" xml:space="preserve">
     <value>Test</value>
   </data>
+  <data name="Corrected" xml:space="preserve">
+    <value>Corrected</value>
+  </data>
+  <data name="Measured" xml:space="preserve">
+    <value>Measured</value>
+  </data>
+  <data name="Bench_is_not_running" xml:space="preserve">
+    <value>Test bench is not running, however you can change the settings to resolve the problem.</value>
+  </data>
+  <data name="Emptying_chdr" xml:space="preserve">
+    <value>Emptying</value>
+  </data>
+  <data name="Bench_chdr" xml:space="preserve">
+    <value>Bench</value>
+  </data>
+  <data name="Err_cor_neg_pct_chdr" xml:space="preserve">
+    <value>Err. cor. - [%]</value>
+  </data>
+  <data name="Err_cor_pos_pct_chdr" xml:space="preserve">
+    <value>Err. cor. +[%]</value>
+  </data>
+  <data name="Err_limit_neg_pct_chdr" xml:space="preserve">
+    <value>Err. Limit - [%]</value>
+  </data>
+  <data name="Err_limit_pos_pct_chdr" xml:space="preserve">
+    <value>Err. Limit + [%]</value>
+  </data>
+  <data name="Feeding_chdr" xml:space="preserve">
+    <value>Feeding</value>
+  </data>
+  <data name="Red_type_chdr" xml:space="preserve">
+    <value>Red. type</value>
+  </data>
+  <data name="Error_while_creating_DB_Reason" xml:space="preserve">
+    <value>Error while creating the database. Reason: </value>
+  </data>
+  <data name="Metrology" xml:space="preserve">
+    <value>Metrology</value>
+  </data>
+  <data name="_offline" xml:space="preserve">
+    <value>(offline)</value>
+  </data>
+  <data name="Administrator" xml:space="preserve">
+    <value>Administrator</value>
+  </data>
+  <data name="Calibration_Specialist" xml:space="preserve">
+    <value>Calibration Specialist</value>
+  </data>
+  <data name="Head_of_Lab" xml:space="preserve">
+    <value>Head of Lab</value>
+  </data>
+  <data name="Maintenance_Specialist" xml:space="preserve">
+    <value>Maintenance Specialist</value>
+  </data>
+  <data name="Metrologist" xml:space="preserve">
+    <value>Metrologist</value>
+  </data>
+  <data name="Close_emptying_valve" xml:space="preserve">
+    <value>Close emptying valve</value>
+  </data>
+  <data name="Get_mass_of_water_in_the_tank" xml:space="preserve">
+    <value>Get mass of water in the tank</value>
+  </data>
+  <data name="Ignore" xml:space="preserve">
+    <value>Ignore</value>
+  </data>
+  <data name="Loading_the_procedure" xml:space="preserve">
+    <value>Loading the procedure</value>
+  </data>
+  <data name="Make_tank_empty" xml:space="preserve">
+    <value>Make tank empty</value>
+  </data>
+  <data name="Measure_the_mass" xml:space="preserve">
+    <value>Measure the mass</value>
+  </data>
+  <data name="Ready" xml:space="preserve">
+    <value>Ready</value>
+  </data>
+  <data name="BackBtnText" xml:space="preserve">
+    <value>&lt; Back</value>
+  </data>
+  <data name="FinishBtnText" xml:space="preserve">
+    <value>Finish</value>
+  </data>
+  <data name="NextBtnText" xml:space="preserve">
+    <value>Next &gt;</value>
+  </data>
+  <data name="Flow_selection" xml:space="preserve">
+    <value>Flow Selection</value>
+  </data>
+  <data name="Method_chdr" xml:space="preserve">
+    <value>Test method</value>
+  </data>
+  <data name="RelativeQfrom" xml:space="preserve">
+    <value>Relative Q from</value>
+  </data>
+  <data name="RelativeQto" xml:space="preserve">
+    <value>Relative Q to</value>
+  </data>
+  <data name="Combined_meters" xml:space="preserve">
+    <value>Combined meters</value>
+  </data>
+  <data name="DetectionThresholdPct" xml:space="preserve">
+    <value>Detection threshold [%]</value>
+  </data>
+  <data name="RateOfChangePct" xml:space="preserve">
+    <value>Rate of change [%]</value>
+  </data>
   <data name="Component" xml:space="preserve">
     <value>Component</value>
   </data>
+  <data name="_none_" xml:space="preserve">
+    <value>&lt;none&gt;</value>
+  </data>
+  <data name="Method_selection" xml:space="preserve">
+    <value>Test method selection</value>
+  </data>
+  <data name="Clear_results" xml:space="preserve">
+    <value>Clear results</value>
+  </data>
   <data name="Configure" xml:space="preserve">
     <value>Configure</value>
   </data>
+  <data name="Arrangement_of_meters" xml:space="preserve">
+    <value>Arrangements of tested meters</value>
+  </data>
+  <data name="Arrangement_of_tests" xml:space="preserve">
+    <value>Arrangement of tests</value>
+  </data>
+  <data name="Horizontally" xml:space="preserve">
+    <value>Horizontally</value>
+  </data>
+  <data name="Configuration" xml:space="preserve">
+    <value>Configuration</value>
+  </data>
+  <data name="Failed" xml:space="preserve">
+    <value>NOK</value>
+  </data>
+  <data name="ClearBtnText" xml:space="preserve">
+    <value>Clear</value>
+  </data>
+  <data name="Emptying_tank" xml:space="preserve">
+    <value>Emptying the tank</value>
+  </data>
+  <data name="Measuring_the_weight" xml:space="preserve">
+    <value>Measuring the weight</value>
+  </data>
+  <data name="Emptying_i_n" xml:space="preserve">
+    <value>Emptying ({0}: step {1}/{2})</value>
+  </data>
+  <data name="Activity" xml:space="preserve">
+    <value>Activity</value>
+  </data>
+  <data name="Approval_info" xml:space="preserve">
+    <value>Approval info.</value>
+  </data>
+  <data name="Metrological_class" xml:space="preserve">
+    <value>Metrological class</value>
+  </data>
+  <data name="Producer" xml:space="preserve">
+    <value>Producer</value>
+  </data>
   <data name="Printer" xml:space="preserve">
     <value>Printer</value>
   </data>
+  <data name="Version" xml:space="preserve">
+    <value>Version</value>
+  </data>
+  <data name="nothing_to_configure" xml:space="preserve">
+    <value>&lt;nothing to configure&gt;</value>
+  </data>
+  <data name="Fill_with_water" xml:space="preserve">
+    <value>Fill the test bench with water?</value>
+  </data>
+  <data name="NoBtn" xml:space="preserve">
+    <value>No</value>
+  </data>
   <data name="Question" xml:space="preserve">
     <value>Question</value>
   </data>
+  <data name="Bench_parameters" xml:space="preserve">
+    <value>Bench parameters</value>
+  </data>
   <data name="Connection_string" xml:space="preserve">
     <value>Connection string</value>
   </data>
+  <data name="Create_DB" xml:space="preserve">
+    <value>Create DB</value>
+  </data>
+  <data name="Database_type" xml:space="preserve">
+    <value>Database type</value>
+  </data>
+  <data name="Logging" xml:space="preserve">
+    <value>Logging</value>
+  </data>
+  <data name="Mode" xml:space="preserve">
+    <value>Mode</value>
+  </data>
+  <data name="NewTabBtnText" xml:space="preserve">
+    <value>New Tab</value>
+  </data>
+  <data name="New_transition_name" xml:space="preserve">
+    <value>New transition name</value>
+  </data>
+  <data name="Detection_completed" xml:space="preserve">
+    <value>Detection completed</value>
+  </data>
+  <data name="Emergency_STOP" xml:space="preserve">
+    <value>Emergency STOP</value>
+  </data>
   <data name="Add" xml:space="preserve">
     <value>&amp;Add &gt;</value>
   </data>
+  <data name="Available_results" xml:space="preserve">
+    <value>Available results:</value>
+  </data>
+  <data name="Remove" xml:space="preserve">
+    <value>&lt; &amp;Remove</value>
+  </data>
+  <data name="Remove_all" xml:space="preserve">
+    <value>&lt;&lt; R&amp;emove all</value>
+  </data>
   <data name="Message" xml:space="preserve">
     <value>Message</value>
   </data>
+  <data name="dflt" xml:space="preserve">
+    <value>dflt</value>
+  </data>
+  <data name="Detection_failed" xml:space="preserve">
+    <value>Detection failed</value>
+  </data>
+  <data name="Camera_error" xml:space="preserve">
+    <value>Camera error</value>
+  </data>
+  <data name="remaining_time" xml:space="preserve">
+    <value>remaining time</value>
+  </data>
+  <data name="LessBtnText" xml:space="preserve">
+    <value>Less</value>
+  </data>
+  <data name="MoreBtnText" xml:space="preserve">
+    <value>More</value>
+  </data>
+  <data name="Changes_will_be_lost_Do_you_want_to_proceed" xml:space="preserve">
+    <value>Changes will be lost. Do you want to proceed?</value>
+  </data>
+  <data name="Flowmeter" xml:space="preserve">
+    <value>Flowmeter</value>
+  </data>
+  <data name="CombinedBtnText" xml:space="preserve">
+    <value>Combined</value>
+  </data>
+  <data name="Device" xml:space="preserve">
+    <value>Device</value>
+  </data>
+  <data name="PrinterBtnText" xml:space="preserve">
+    <value>Printer</value>
+  </data>
+  <data name="Aux_Water_Meter" xml:space="preserve">
+    <value>Aux Water Meter</value>
+  </data>
+  <data name="Aux_Water_Meter_State" xml:space="preserve">
+    <value>Aux. WM State</value>
+  </data>
   <data name="Data" xml:space="preserve">
     <value>Data</value>
   </data>
+  <data name="End_State" xml:space="preserve">
+    <value>End State</value>
+  </data>
+  <data name="Main_Water_Meter" xml:space="preserve">
+    <value>Main Water Meter</value>
+  </data>
+  <data name="Main_Water_Meter_State" xml:space="preserve">
+    <value>Main WM State</value>
+  </data>
   <data name="Protocol" xml:space="preserve">
     <value>Protocol</value>
   </data>
   <data name="Serial_Number" xml:space="preserve">
     <value>Serial Number</value>
   </data>
+  <data name="Aux_WM_SerialNr" xml:space="preserve">
+    <value>Aux. WM Serial Nr.</value>
+  </data>
+  <data name="Main_WM_SerialNr" xml:space="preserve">
+    <value>Main WM Serial Nr.</value>
+  </data>
+  <data name="Adjustment_in_progress" xml:space="preserve">
+    <value>Adjustment in progress</value>
+  </data>
+  <data name="Error_pct" xml:space="preserve">
+    <value>Error [%]</value>
+  </data>
+  <data name="Duration_Leak_s" xml:space="preserve">
+    <value>Leak duration [s]</value>
+  </data>
+  <data name="Duration_PMax_s" xml:space="preserve">
+    <value>PMax duration [s]</value>
+  </data>
+  <data name="Closing_valve_Pump_off" xml:space="preserve">
+    <value>Closing input valve, switching the pump off</value>
+  </data>
+  <data name="Purchase_Order" xml:space="preserve">
+    <value>Purchase Order</value>
+  </data>
+  <data name="Ambient_humidity_" xml:space="preserve">
+    <value>Ambient humidity: </value>
+  </data>
+  <data name="Ambient_pressure_" xml:space="preserve">
+    <value>Ambient pressure: </value>
+  </data>
+  <data name="Ambient_temperature_" xml:space="preserve">
+    <value>Ambient temperature: </value>
+  </data>
+  <data name="Approval_" xml:space="preserve">
+    <value>Approval: </value>
+  </data>
+  <data name="Date_and_time_" xml:space="preserve">
+    <value>Date and time: </value>
+  </data>
+  <data name="End" xml:space="preserve">
+    <value>End</value>
+  </data>
+  <data name="AtTemperature_C" xml:space="preserve">
+    <value>@temperature [degC]</value>
+  </data>
+  <data name="Density_kg_m3" xml:space="preserve">
+    <value>Density [kg/m3]</value>
+  </data>
+  <data name="Density" xml:space="preserve">
+    <value>Density</value>
+  </data>
+  <data name="Nr_meters_in_a_group" xml:space="preserve">
+    <value>Nr. meters in a group:</value>
+  </data>
+  <data name="End_Condition" xml:space="preserve">
+    <value>End condition</value>
+  </data>
+  <data name="Communication" xml:space="preserve">
+    <value>Communication</value>
+  </data>
+  <data name="Aux_" xml:space="preserve">
+    <value>Aux:</value>
+  </data>
+  <data name="Main_" xml:space="preserve">
+    <value>Main:</value>
+  </data>
+  <data name="cold" xml:space="preserve">
+    <value>cold</value>
+  </data>
+  <data name="hot" xml:space="preserve">
+    <value>hot</value>
+  </data>
+  <data name="Product_name" xml:space="preserve">
+    <value>Product name</value>
+  </data>
+  <data name="Address" xml:space="preserve">
+    <value>Address</value>
+  </data>
+  <data name="Approval_date" xml:space="preserve">
+    <value>Approval date</value>
+  </data>
+  <data name="Approval_ID" xml:space="preserve">
+    <value>Approval ID</value>
+  </data>
+  <data name="Approved_by" xml:space="preserve">
+    <value>Approved by</value>
+  </data>
+  <data name="Evaluate" xml:space="preserve">
+    <value>Evaluate</value>
+  </data>
+  <data name="iPerl_Communication_in_progress" xml:space="preserve">
+    <value>iPerl Communication in progress</value>
+  </data>
   <data name="Language" xml:space="preserve">
     <value>Language</value>
   </data>
+  <data name="Available_Components_" xml:space="preserve">
+    <value>Available Components:</value>
+  </data>
+  <data name="Database_Settings" xml:space="preserve">
+    <value>Database Settings</value>
+  </data>
+  <data name="About_Test_Bench_Framework" xml:space="preserve">
+    <value>About Test Bench Framework</value>
+  </data>
+  <data name="BuildDateStr" xml:space="preserve">
+    <value>Build date _BUILD_DATE_</value>
+  </data>
+  <data name="CopyrightStr" xml:space="preserve">
+    <value>Copyright © 2013 - {0}</value>
+  </data>
+  <data name="Edit_User" xml:space="preserve">
+    <value>Edit User</value>
+  </data>
+  <data name="Groups" xml:space="preserve">
+    <value>Groups</value>
+  </data>
+  <data name="An_unhandled_error_occured" xml:space="preserve">
+    <value>An unhandled error occured</value>
+  </data>
+  <data name="IgnoreBtnText" xml:space="preserve">
+    <value>Ignore</value>
+  </data>
   <data name="Add_filter" xml:space="preserve">
     <value>Add filter</value>
   </data>
@@ -219,6 +732,18 @@
   <data name="RetryDatabaseText" xml:space="preserve">
     <value>Retry</value>
   </data>
+  <data name="Selected_results" xml:space="preserve">
+    <value>Selected results</value>
+  </data>
+  <data name="SingleBtnText" xml:space="preserve">
+    <value>Single</value>
+  </data>
+  <data name="UnlockBtnText" xml:space="preserve">
+    <value>Unlock</value>
+  </data>
+  <data name="Water_Meter" xml:space="preserve">
+    <value>Water Meter</value>
+  </data>
   <data name="Date" xml:space="preserve">
     <value>Date</value>
   </data>
@@ -300,6 +825,9 @@
   <data name="Error_exporting_results" xml:space="preserve">
     <value>Error exporting results</value>
   </data>
+  <data name="Add_data_from_Oracle" xml:space="preserve">
+    <value>Add data from Oracle</value>
+  </data>
   <data name="Histograms" xml:space="preserve">
     <value>Histograms</value>
   </data>

ResultsBrowser/Resources/Strings.ru.resx

@@ -117,66 +117,579 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Confirmation" xml:space="preserve">
+    <value>Подтверждение</value>
+  </data>
+  <data name="Do_you_want_to_save_the_procedure" xml:space="preserve">
+    <value>Хотите сохранить процедуру?</value>
+  </data>
   <data name="Error" xml:space="preserve">
     <value>Ошибка</value>
   </data>
+  <data name="Error_loading_users_from_the_database" xml:space="preserve">
+    <value>Ошибка при загрузке пользователей из базы данных:</value>
+  </data>
+  <data name="Failed_to_create_a_sample_database" xml:space="preserve">
+    <value>Не удалось создать базу данных:</value>
+  </data>
+  <data name="Failed_to_export_the_database" xml:space="preserve">
+    <value>Не удалось экспортировать базу данных:</value>
+  </data>
+  <data name="Invalid_user_password_or_bench" xml:space="preserve">
+    <value>Неверный пользователь, пароль, или установка</value>
+  </data>
   <data name="Test_bench" xml:space="preserve">
     <value>Поверочная установка</value>
   </data>
+  <data name="MaxChars" xml:space="preserve">
+    <value>(Макс. _X_ Буквенно-цифровых символов)</value>
+  </data>
+  <data name="close" xml:space="preserve">
+    <value>закрыть</value>
+  </data>
+  <data name="Diverter" xml:space="preserve">
+    <value>Клапан</value>
+  </data>
+  <data name="Emptying_valve" xml:space="preserve">
+    <value>Выпускной клапан</value>
+  </data>
   <data name="Name" xml:space="preserve">
     <value>Имя</value>
   </data>
+  <data name="Reference" xml:space="preserve">
+    <value>Ссылка</value>
+  </data>
+  <data name="Reg_valve" xml:space="preserve">
+    <value>Рег. вентиль</value>
+  </data>
+  <data name="Balance" xml:space="preserve">
+    <value>Весы</value>
+  </data>
+  <data name="Duration_s" xml:space="preserve">
+    <value>Продолжительность [с]</value>
+  </data>
+  <data name="no" xml:space="preserve">
+    <value>нет</value>
+  </data>
+  <data name="New_bench_path_name" xml:space="preserve">
+    <value>PУстановка</value>
+  </data>
+  <data name="New_feeding_path_name" xml:space="preserve">
+    <value>PFeed</value>
+  </data>
+  <data name="New_output_path_name" xml:space="preserve">
+    <value>PQ</value>
+  </data>
+  <data name="New_procedure_name" xml:space="preserve">
+    <value>Процедура</value>
+  </data>
+  <data name="New_sensors_path_name" xml:space="preserve">
+    <value>PSens</value>
+  </data>
+  <data name="New_test_name" xml:space="preserve">
+    <value>Тест</value>
+  </data>
+  <data name="New_name_copy" xml:space="preserve">
+    <value> - Копировать</value>
+  </data>
+  <data name="Correction_g" xml:space="preserve">
+    <value>Коррекция [г]</value>
+  </data>
+  <data name="Nr" xml:space="preserve">
+    <value>№</value>
+  </data>
+  <data name="Mass_kg" xml:space="preserve">
+    <value>Масса [кг]</value>
+  </data>
+  <data name="AddBtnText" xml:space="preserve">
+    <value>Добавить</value>
+  </data>
   <data name="CancelBtnText" xml:space="preserve">
     <value>Отмена</value>
   </data>
+  <data name="CloseBtnText" xml:space="preserve">
+    <value>Закрыть</value>
+  </data>
+  <data name="LockBtnText" xml:space="preserve">
+    <value>Заблокировать</value>
+  </data>
+  <data name="RemoveBtnText" xml:space="preserve">
+    <value>Удалить</value>
+  </data>
   <data name="OkBtnText" xml:space="preserve">
     <value>OK</value>
   </data>
+  <data name="Correction_lph" xml:space="preserve">
+    <value>Коррекция [л/ч]</value>
+  </data>
+  <data name="Correction_mbar" xml:space="preserve">
+    <value>Коррекция [мбар]</value>
+  </data>
+  <data name="Flow_m3h" xml:space="preserve">
+    <value>Расход [м3/ч]</value>
+  </data>
+  <data name="Invalid_username_or_password" xml:space="preserve">
+    <value>Неправильное имя пользователя или пароль</value>
+  </data>
+  <data name="CopyBtnText" xml:space="preserve">
+    <value>Копировать</value>
+  </data>
+  <data name="DownBtnText" xml:space="preserve">
+    <value>Вниз</value>
+  </data>
+  <data name="EditBtnText" xml:space="preserve">
+    <value>Редактировать</value>
+  </data>
+  <data name="UpBtnText" xml:space="preserve">
+    <value>Вверх</value>
+  </data>
+  <data name="NoDatabaseMsg" xml:space="preserve">
+    <value>Не удается подключиться к базе данных.</value>
+  </data>
   <data name="ConfigureDatabaseText" xml:space="preserve">
     <value>Тестовая конфигурация установки (требуется пароль)</value>
   </data>
   <data name="ExitBtnText" xml:space="preserve">
     <value>Выход</value>
   </data>
+  <data name="Enter_password" xml:space="preserve">
+    <value>Введите пароль</value>
+  </data>
+  <data name="Invalid_password" xml:space="preserve">
+    <value>Неверный пароль</value>
+  </data>
+  <data name="Bench_name_conflict_Use_another_name_pls" xml:space="preserve">
+    <value>Имя поверочной установки неверно, используйте другое имя, пожалуйста</value>
+  </data>
+  <data name="DB_was_successfully_created" xml:space="preserve">
+    <value>База данных была успешно создана!</value>
+  </data>
+  <data name="DB_will_be_overwritten" xml:space="preserve">
+    <value>База данных будет перезаписана</value>
+  </data>
+  <data name="Do_you_want_to_proceed" xml:space="preserve">
+    <value>Вы хотите продолжить?</value>
+  </data>
+  <data name="Notification" xml:space="preserve">
+    <value>Уведомление</value>
+  </data>
+  <data name="NoBenchMsg" xml:space="preserve">
+    <value>Нет поверочной установки в конфигурации программы.</value>
+  </data>
+  <data name="DescriptionColHdr" xml:space="preserve">
+    <value>Описание</value>
+  </data>
   <data name="Procedure" xml:space="preserve">
     <value>Процедура</value>
   </data>
   <data name="Test" xml:space="preserve">
     <value>Тест</value>
   </data>
+  <data name="Corrected" xml:space="preserve">
+    <value>Исправлено</value>
+  </data>
+  <data name="Measured" xml:space="preserve">
+    <value>Измерено</value>
+  </data>
+  <data name="Bench_is_not_running" xml:space="preserve">
+    <value>Поверочная установка не запущена, однако вы можете изменить настройки, чтобы решить эту проблему.</value>
+  </data>
+  <data name="Emptying_chdr" xml:space="preserve">
+    <value>Выпуск</value>
+  </data>
+  <data name="Bench_chdr" xml:space="preserve">
+    <value>Установка</value>
+  </data>
+  <data name="Err_cor_neg_pct_chdr" xml:space="preserve">
+    <value>Err. cor. - [%]</value>
+  </data>
+  <data name="Err_cor_pos_pct_chdr" xml:space="preserve">
+    <value>Err. cor. +[%]</value>
+  </data>
+  <data name="Err_limit_neg_pct_chdr" xml:space="preserve">
+    <value>Err. Limit - [%]</value>
+  </data>
+  <data name="Err_limit_pos_pct_chdr" xml:space="preserve">
+    <value>Err. Limit + [%]</value>
+  </data>
+  <data name="Feeding_chdr" xml:space="preserve">
+    <value>Feeding</value>
+  </data>
+  <data name="Red_type_chdr" xml:space="preserve">
+    <value>Red. type</value>
+  </data>
+  <data name="Error_while_creating_DB_Reason" xml:space="preserve">
+    <value>Ошибка при создании базы данных. Причина:</value>
+  </data>
+  <data name="Metrology" xml:space="preserve">
+    <value>Метрология</value>
+  </data>
+  <data name="_offline" xml:space="preserve">
+    <value>(не в сети)</value>
+  </data>
+  <data name="Administrator" xml:space="preserve">
+    <value>Администратор</value>
+  </data>
+  <data name="Calibration_Specialist" xml:space="preserve">
+    <value>Специалист по калибровке</value>
+  </data>
+  <data name="Head_of_Lab" xml:space="preserve">
+    <value>Руководитель лаборатории</value>
+  </data>
+  <data name="Maintenance_Specialist" xml:space="preserve">
+    <value>Специалист по техобслуживанию</value>
+  </data>
+  <data name="Metrologist" xml:space="preserve">
+    <value>Метролог</value>
+  </data>
+  <data name="Close_emptying_valve" xml:space="preserve">
+    <value>Закрыть выпускной клапан</value>
+  </data>
+  <data name="Get_mass_of_water_in_the_tank" xml:space="preserve">
+    <value>Получить массу воды в резервуаре</value>
+  </data>
+  <data name="Ignore" xml:space="preserve">
+    <value>Отклонить</value>
+  </data>
+  <data name="Loading_the_procedure" xml:space="preserve">
+    <value>Процедура загрузки</value>
+  </data>
+  <data name="Make_tank_empty" xml:space="preserve">
+    <value>Оборожнить бак</value>
+  </data>
+  <data name="Measure_the_mass" xml:space="preserve">
+    <value>Измерьте массу</value>
+  </data>
+  <data name="Ready" xml:space="preserve">
+    <value>Готов</value>
+  </data>
+  <data name="BackBtnText" xml:space="preserve">
+    <value>&lt; Назад</value>
+  </data>
+  <data name="FinishBtnText" xml:space="preserve">
+    <value>Завершить</value>
+  </data>
+  <data name="NextBtnText" xml:space="preserve">
+    <value>Дальше &gt;</value>
+  </data>
+  <data name="Flow_selection" xml:space="preserve">
+    <value>Выбор расхода</value>
+  </data>
+  <data name="Method_chdr" xml:space="preserve">
+    <value>Метод испытания</value>
+  </data>
+  <data name="RelativeQfrom" xml:space="preserve">
+    <value>Относительный Q от</value>
+  </data>
+  <data name="RelativeQto" xml:space="preserve">
+    <value>Относительный Q до</value>
+  </data>
+  <data name="Combined_meters" xml:space="preserve">
+    <value>Комбинированные счетчики</value>
+  </data>
+  <data name="DetectionThresholdPct" xml:space="preserve">
+    <value>Порог [%]</value>
+  </data>
+  <data name="RateOfChangePct" xml:space="preserve">
+    <value>Скорость изменения [%]</value>
+  </data>
   <data name="Component" xml:space="preserve">
     <value>Компонент</value>
   </data>
+  <data name="_none_" xml:space="preserve">
+    <value>&lt;нет&gt;</value>
+  </data>
+  <data name="Method_selection" xml:space="preserve">
+    <value>Выбор метода испытаний</value>
+  </data>
+  <data name="Clear_results" xml:space="preserve">
+    <value>Очистить Результаты</value>
+  </data>
   <data name="Configure" xml:space="preserve">
     <value>Конфигурировать</value>
   </data>
+  <data name="Arrangement_of_meters" xml:space="preserve">
+    <value>Расположение испытуемых счетчиков</value>
+  </data>
+  <data name="Arrangement_of_tests" xml:space="preserve">
+    <value>Расположение испытаний</value>
+  </data>
+  <data name="Horizontally" xml:space="preserve">
+    <value>Горизонтально</value>
+  </data>
+  <data name="Configuration" xml:space="preserve">
+    <value>Конфигурация</value>
+  </data>
+  <data name="Failed" xml:space="preserve">
+    <value>NOK</value>
+  </data>
+  <data name="ClearBtnText" xml:space="preserve">
+    <value>Очистить</value>
+  </data>
+  <data name="Emptying_tank" xml:space="preserve">
+    <value>Опорожнение бака</value>
+  </data>
+  <data name="Measuring_the_weight" xml:space="preserve">
+    <value>Измерение веса</value>
+  </data>
+  <data name="Emptying_i_n" xml:space="preserve">
+    <value>Слив ({0}: шаг {1} / {2})</value>
+  </data>
+  <data name="Activity" xml:space="preserve">
+    <value>Активность</value>
+  </data>
+  <data name="Approval_info" xml:space="preserve">
+    <value>Информация об утверждении</value>
+  </data>
+  <data name="Metrological_class" xml:space="preserve">
+    <value>Метрологический класс</value>
+  </data>
+  <data name="Producer" xml:space="preserve">
+    <value>Производитель</value>
+  </data>
   <data name="Printer" xml:space="preserve">
     <value>Принтер</value>
   </data>
+  <data name="Version" xml:space="preserve">
+    <value>Версия</value>
+  </data>
+  <data name="nothing_to_configure" xml:space="preserve">
+    <value>&lt;нечего настраивать&gt;</value>
+  </data>
+  <data name="Fill_with_water" xml:space="preserve">
+    <value>Заполнить установку водой?</value>
+  </data>
+  <data name="NoBtn" xml:space="preserve">
+    <value>Нет</value>
+  </data>
   <data name="Question" xml:space="preserve">
     <value>Вопрос</value>
   </data>
+  <data name="Bench_parameters" xml:space="preserve">
+    <value>Установка параметров</value>
+  </data>
   <data name="Connection_string" xml:space="preserve">
     <value>Строка подключения БД</value>
   </data>
+  <data name="Create_DB" xml:space="preserve">
+    <value>Создание БД</value>
+  </data>
+  <data name="Database_type" xml:space="preserve">
+    <value>Тип БД</value>
+  </data>
+  <data name="Logging" xml:space="preserve">
+    <value>Логирование</value>
+  </data>
+  <data name="Mode" xml:space="preserve">
+    <value>Режим</value>
+  </data>
+  <data name="NewTabBtnText" xml:space="preserve">
+    <value>Новая вкладка</value>
+  </data>
+  <data name="New_transition_name" xml:space="preserve">
+    <value>Новое имя перехода</value>
+  </data>
+  <data name="Detection_completed" xml:space="preserve">
+    <value>Обнаружение завершено</value>
+  </data>
+  <data name="Emergency_STOP" xml:space="preserve">
+    <value>Аварийная остановка</value>
+  </data>
   <data name="Add" xml:space="preserve">
     <value>&amp;Добавить &gt;</value>
   </data>
+  <data name="Available_results" xml:space="preserve">
+    <value>Доступные результаты</value>
+  </data>
+  <data name="Remove" xml:space="preserve">
+    <value>&lt; &amp;Удалить</value>
+  </data>
+  <data name="Remove_all" xml:space="preserve">
+    <value>&lt;&lt; Удалить все</value>
+  </data>
   <data name="Message" xml:space="preserve">
     <value>Сообщение</value>
   </data>
+  <data name="dflt" xml:space="preserve">
+    <value>dflt</value>
+  </data>
+  <data name="Detection_failed" xml:space="preserve">
+    <value>Обнаружение не удалось</value>
+  </data>
+  <data name="Camera_error" xml:space="preserve">
+    <value>Ошибка камеры</value>
+  </data>
+  <data name="remaining_time" xml:space="preserve">
+    <value>оставшееся время</value>
+  </data>
+  <data name="LessBtnText" xml:space="preserve">
+    <value>Меньше</value>
+  </data>
+  <data name="MoreBtnText" xml:space="preserve">
+    <value>Больше</value>
+  </data>
+  <data name="Changes_will_be_lost_Do_you_want_to_proceed" xml:space="preserve">
+    <value>Изменения будут потеряны. Вы хотите продолжить?</value>
+  </data>
+  <data name="Flowmeter" xml:space="preserve">
+    <value>Расходомер</value>
+  </data>
+  <data name="CombinedBtnText" xml:space="preserve">
+    <value>Комбинированный</value>
+  </data>
+  <data name="Device" xml:space="preserve">
+    <value>Устройство</value>
+  </data>
+  <data name="PrinterBtnText" xml:space="preserve">
+    <value>Принтер</value>
+  </data>
+  <data name="Aux_Water_Meter" xml:space="preserve">
+    <value>Доп.счетчик воды</value>
+  </data>
+  <data name="Aux_Water_Meter_State" xml:space="preserve">
+    <value>Статус доп.счетчика</value>
+  </data>
   <data name="Data" xml:space="preserve">
     <value>Данные</value>
   </data>
+  <data name="End_State" xml:space="preserve">
+    <value>Конечное состояние</value>
+  </data>
+  <data name="Main_Water_Meter" xml:space="preserve">
+    <value>Главный счетчик воды</value>
+  </data>
+  <data name="Main_Water_Meter_State" xml:space="preserve">
+    <value>Статус главного счетчика</value>
+  </data>
   <data name="Protocol" xml:space="preserve">
     <value>Протокол</value>
   </data>
   <data name="Serial_Number" xml:space="preserve">
     <value>Серийный номер</value>
   </data>
+  <data name="Aux_WM_SerialNr" xml:space="preserve">
+    <value>Сер. № доп. счетчика</value>
+  </data>
+  <data name="Main_WM_SerialNr" xml:space="preserve">
+    <value>Сер. № главн. счетчика</value>
+  </data>
+  <data name="Adjustment_in_progress" xml:space="preserve">
+    <value>Настройка выполняется</value>
+  </data>
+  <data name="Error_pct" xml:space="preserve">
+    <value>Погрешность [%]</value>
+  </data>
+  <data name="Duration_Leak_s" xml:space="preserve">
+    <value>Продолжительность расхода [с]</value>
+  </data>
+  <data name="Duration_PMax_s" xml:space="preserve">
+    <value>Продолжительность Pмакс [с]</value>
+  </data>
+  <data name="Closing_valve_Pump_off" xml:space="preserve">
+    <value>Закрытие впускного клапана, выключение насоса</value>
+  </data>
+  <data name="Purchase_Order" xml:space="preserve">
+    <value>Заказ</value>
+  </data>
+  <data name="Ambient_humidity_" xml:space="preserve">
+    <value>Относительная влажность окружающей среды:</value>
+  </data>
+  <data name="Ambient_pressure_" xml:space="preserve">
+    <value>Относительное давление: </value>
+  </data>
+  <data name="Ambient_temperature_" xml:space="preserve">
+    <value>Температура окружающей среды: </value>
+  </data>
+  <data name="Approval_" xml:space="preserve">
+    <value>Утверждение: </value>
+  </data>
+  <data name="Date_and_time_" xml:space="preserve">
+    <value>Дата и время: </value>
+  </data>
+  <data name="End" xml:space="preserve">
+    <value>Конец</value>
+  </data>
+  <data name="AtTemperature_C" xml:space="preserve">
+    <value>температура [degC]</value>
+  </data>
+  <data name="Density_kg_m3" xml:space="preserve">
+    <value>Плотность [кг/м3]</value>
+  </data>
+  <data name="Density" xml:space="preserve">
+    <value>Плотность</value>
+  </data>
+  <data name="Nr_meters_in_a_group" xml:space="preserve">
+    <value>№ счетчиков в группе</value>
+  </data>
+  <data name="End_Condition" xml:space="preserve">
+    <value>Конечное состояние</value>
+  </data>
+  <data name="Communication" xml:space="preserve">
+    <value>Соединение</value>
+  </data>
+  <data name="Aux_" xml:space="preserve">
+    <value>Доп.</value>
+  </data>
+  <data name="Main_" xml:space="preserve">
+    <value>Главн:</value>
+  </data>
+  <data name="cold" xml:space="preserve">
+    <value>холодный</value>
+  </data>
+  <data name="hot" xml:space="preserve">
+    <value>горячий</value>
+  </data>
+  <data name="Product_name" xml:space="preserve">
+    <value>Наименование продукта</value>
+  </data>
+  <data name="Address" xml:space="preserve">
+    <value>Адрес</value>
+  </data>
+  <data name="Approval_date" xml:space="preserve">
+    <value>Дата утверждения</value>
+  </data>
+  <data name="Approval_ID" xml:space="preserve">
+    <value>ID Утверждения </value>
+  </data>
+  <data name="Approved_by" xml:space="preserve">
+    <value>Утверждено</value>
+  </data>
+  <data name="Evaluate" xml:space="preserve">
+    <value>Оценка</value>
+  </data>
+  <data name="iPerl_Communication_in_progress" xml:space="preserve">
+    <value>Осуществляется связь с iPerl </value>
+  </data>
   <data name="Language" xml:space="preserve">
     <value>Язык</value>
   </data>
+  <data name="Available_Components_" xml:space="preserve">
+    <value>Доступные компоненты:</value>
+  </data>
+  <data name="Database_Settings" xml:space="preserve">
+    <value>Настройки Базы данных</value>
+  </data>
+  <data name="About_Test_Bench_Framework" xml:space="preserve">
+    <value>О Framework поверочной установки</value>
+  </data>
+  <data name="BuildDateStr" xml:space="preserve">
+    <value>Build Data _BUILD_Data_</value>
+  </data>
+  <data name="CopyrightStr" xml:space="preserve">
+    <value>Copyright © 2013 - {0}</value>
+  </data>
+  <data name="Edit_User" xml:space="preserve">
+    <value>Редактировать пользователя</value>
+  </data>
+  <data name="Groups" xml:space="preserve">
+    <value>Группы</value>
+  </data>
+  <data name="An_unhandled_error_occured" xml:space="preserve">
+    <value>Произошла необрабатываемая ошибка</value>
+  </data>
+  <data name="IgnoreBtnText" xml:space="preserve">
+    <value>Отклонить</value>
+  </data>
   <data name="Add_filter" xml:space="preserve">
     <value>Добавить фильтр</value>
   </data>
@@ -219,6 +732,18 @@
   <data name="RetryDatabaseText" xml:space="preserve">
     <value>Повтор</value>
   </data>
+  <data name="Selected_results" xml:space="preserve">
+    <value>Выбанные результаты</value>
+  </data>
+  <data name="SingleBtnText" xml:space="preserve">
+    <value>Единый</value>
+  </data>
+  <data name="UnlockBtnText" xml:space="preserve">
+    <value>Разблокировать</value>
+  </data>
+  <data name="Water_Meter" xml:space="preserve">
+    <value>Счетчик воды</value>
+  </data>
   <data name="Date" xml:space="preserve">
     <value>Дата</value>
   </data>

ResultsBrowser/ResultsBrowser.csproj

@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;PETERSBURG_200;LANG_RU</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;GENESIS;IPERL;LANG_DE</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;PETERSBURG_200;LANG_RU</DefineConstants>
+    <DefineConstants>TRACE;GENESIS;IPERL;LANG_DE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

Statistics/Statistics.csproj

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

TBF.sln

@@ -48,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
@@ -190,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/BenchControl/Ambient/Comet/Ambient.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2016 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -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;
@@ -113,9 +109,6 @@ namespace TBF.BenchControl.Ambient.Comet
 
                             msrmntTimeStamp = StateMachine.Time;
                             msrmntState = MsrmntState.Valid;
-
-                            UpdateProcessData(temperature, pressure, humidity);
-
                             log.InfoFormat("Ambient: temperature = {0:F1} C, humidity = {1:F1} %, pressure = {2:F0} mbar", temperature, humidity, 1000 * pressure);
                         }
                     }
@@ -192,14 +185,6 @@ namespace TBF.BenchControl.Ambient.Comet
 
 		public void StopDevice2() { }
 
-        void UpdateProcessData(float temperature, float pressure, float humidity)
-        {
-            TBF.BenchControl.Sequences.ProcessData.AmbTemp.Val = temperature;
-            TBF.BenchControl.Sequences.ProcessData.AmbPress.Val = pressure;
-            TBF.BenchControl.Sequences.ProcessData.AmbHumi.Val = humidity;
-        }
-
-
 		///
 		/// Boxes for the operation result
 		///

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/Ambient/Greco/Ambient.cs

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

TBF/BenchControl/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/Combined/EntryForm.cs

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

TBF/BenchControl/DataEntry/Fewa/CycleBeginningForm.cs

@@ -1,431 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-using log4net;
-using TBF.Resources;
-
-namespace TBF.BenchControl.DataEntry.Fewa
-{
-	public partial class CycleBeginningForm : Form, GenericDevices.IHasCompleted
-    {
-		private static readonly ILog log = LogManager.GetLogger(typeof(CycleBeginningForm));
-
-		/// <summary> Number of water meters </summary>
-        public readonly int WMsCount;
-
-		/// To be retrieved after the form is closed
-		public string PurchaseOrder;
-		public string[] SNText;
-        public string[] SN2Text;
-        string[] suffixText;
-        public bool[] Disabled;
-
-		/// Set to 'true' when the form closes
-        public bool Completed { get { return completed; } }
-		bool completed;
-
-		/// <summary> Number of text boxes for serial numbers </summary>
-		int textBoxesCount;
-		Label[] labels;
-		ComboBox[] comboBoxes;
-        ComboBox[] suffixComboBoxes;
-        CheckBox[] checkBoxes;
-		IList<ComboBox> enabledComboBoxes;
-
-
-		/// <summary> Parameterless constructor for common functionality </summary>
-		public CycleBeginningForm()
-		{
-			InitializeComponent();
-			ControlBox = false;
-
-			textBoxesCount = 24;
-			labels = new Label[]
-				{
-					label1,  label2,  label3,  label4,  label5,  label6,  label7,  label8,  label9,  label10,
-					label11, label12, label13, label14, label15, label16, label17, label18, label19, label20,
-					label21, label22, label23, label24,
-				};
-			comboBoxes = new ComboBox[]
-				{
-					comboBox1,  comboBox2,  comboBox3,  comboBox4,  comboBox5,  comboBox6,
-					comboBox7,  comboBox8,  comboBox9,  comboBox10, comboBox11, comboBox12,
-					comboBox13, comboBox14, comboBox15, comboBox16, comboBox17, comboBox18,
-					comboBox19, comboBox20, comboBox21, comboBox22, comboBox23, comboBox24,
-				};
-            suffixComboBoxes = new ComboBox[]
-				{
-					suffixComboBox1,  suffixComboBox2,  suffixComboBox3,  suffixComboBox4,  suffixComboBox5,  suffixComboBox6,
-					suffixComboBox7,  suffixComboBox8,  suffixComboBox9,  suffixComboBox10, suffixComboBox11, suffixComboBox12,
-					suffixComboBox13, suffixComboBox14, suffixComboBox15, suffixComboBox16, suffixComboBox17, suffixComboBox18,
-					suffixComboBox19, suffixComboBox20, suffixComboBox21, suffixComboBox22, suffixComboBox23, suffixComboBox24,
-				};
-            checkBoxes = new CheckBox[]
-				{
-					checkBox1,  checkBox2,  checkBox3,  checkBox4,  checkBox5,  checkBox6,
-					checkBox7,  checkBox8,  checkBox9,  checkBox10, checkBox11, checkBox12,
-					checkBox13, checkBox14, checkBox15, checkBox16, checkBox17, checkBox18,
-					checkBox19, checkBox20, checkBox21, checkBox22, checkBox23, checkBox24,
-				};
-			enabledComboBoxes = new List<ComboBox>();
-
-			completed = false;
-			StartForceCloseHandler();
-		}
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
-        public CycleBeginningForm(int waterMetersCount)
-			: this()
-        {
-            this.WMsCount = waterMetersCount;
-            SNText = new string[WMsCount];
-            SN2Text = new string[WMsCount];
-            suffixText = new string[WMsCount];
-			Disabled = new bool[WMsCount];
-
-			ShuffleTextBoxes(Config.Data.WMsCount, Config.Data.LineSize);
-
-            //Height = 147 + WaterMetersCount * 90;
-        }
-
-		/// <summary>
-		/// Make sure the layout of labels/text boxes on the screen
-		/// corresponds to the layout of watermeters of the test bench.
-		/// </summary>
-		/// <param name="wmsCount">Number of watermeters</param>
-		/// <param name="lineSize">Number of watermeters in one line</param>
-		void ShuffleTextBoxes(int wmsCount, int lineSize)
-		{
-			if (wmsCount < textBoxesCount && lineSize > 0)
-			{
-				int nrLines = (wmsCount + lineSize - 1) / lineSize;
-				int gap = (textBoxesCount - wmsCount) / nrLines;
-
-				int dest = 0;
-				for (int l = 0; l < nrLines; l++)
-				{
-					for (int i = 0; i < lineSize; i++)
-					{
-						labels[dest] = labels[l * lineSize + l * gap + i];
-						comboBoxes[dest] = comboBoxes[l * lineSize + l * gap + i];
-                        suffixComboBoxes[dest] = suffixComboBoxes[l * lineSize + l * gap + i];
-                        checkBoxes[dest] = checkBoxes[l * lineSize + l * gap + i];
-						dest++;
-					}
-				}
-				textBoxesCount = wmsCount;
-			}
-		}
-
-        private void CycleBeginningForm_Load(object sender, EventArgs e)
-        {
-			Localize();
-			
-			PrepareOrderCombo(orderComboBox);
-            PreparePrefixCombo(prefixComboBox);
-
-			for (int i = 0; i < textBoxesCount; i++)
-			{
-				if (Program.LocalSettings.LastSNTextsCount == textBoxesCount)
-				{
-                    comboBoxes[i].Items.Add((Program.LocalSettings.LastSNTexts[i] == null) ? string.Empty : Program.LocalSettings.LastSNTexts[i]);
-                    suffixComboBoxes[i].Items.Add((Program.LocalSettings.LastAuxSNTexts[i] == null) ? string.Empty : Program.LocalSettings.LastAuxSNTexts[i]);
-                }
-
-                labels[i].Visible = comboBoxes[i].Visible = suffixComboBoxes[i].Visible = checkBoxes[i].Visible = true;
-
-				enabledComboBoxes.Add(comboBoxes[i]);
-                enabledComboBoxes.Add(suffixComboBoxes[i]);
-            }
-		}
-
-		void Localize()
-		{
-			Text = Strings.Data;
-			orderGroupBox.Text = Strings.Purchase_order;
-			for (int i = 0; i < textBoxesCount; i++)
-			{
-				labels[i].Text = Strings.Serial_Number + " " + (i + 1).ToString();
-			}
-			okButton.Text = Strings.OkBtnText;
-			clearButton.Text = Strings.ClearBtnText;
-		}
-
-		/// <summary>
-		/// Load Purchase order combo box items from the LocalSettings PurchaseOrderHistory array
-		/// </summary>
-		/// <param name="orderComboBox">Puchase order ComboBox</param>
-        void PrepareOrderCombo(ComboBox orderComboBox)
-        {
-            for (int i = 0; i < Program.LocalSettings.PurchaseOrderHistoryCount; i++)
-            {
-                orderComboBox.Items.Add(Program.LocalSettings.PurchaseOrderHistory[i]);
-            }
-
-            if (orderComboBox.Items.Count > 0) orderComboBox.Text = orderComboBox.Items[0].ToString();
-        }
-
-        /// <summary>
-        /// Load Prefix combo box items from the LocalSettings PrefixHistory array
-        /// </summary>
-        /// <param name="orderComboBox">Prefix ComboBox</param>
-        void PreparePrefixCombo(ComboBox prefixComboBox)
-		{
-            for (int i = 0; i < Program.LocalSettings.PrefixHistoryCount; i++)
-            {
-                prefixComboBox.Items.Add(Program.LocalSettings.PrefixHistory[i]);
-            }
-
-            if (prefixComboBox.Items.Count > 0) prefixComboBox.Text = prefixComboBox.Items[0].ToString();
-        }
-
-		private void okButton_Click(object sender, EventArgs e)
-        {
-			for (int i = 0; i < Math.Min(WMsCount, textBoxesCount); i++)
-			{
-				SNText[i] = comboBoxes[i].Text;
-                suffixText[i] = suffixComboBoxes[i].Text;
-                SN2Text[i] = string.Format("{0}{1}", prefixComboBox.Text, suffixComboBoxes[i].Text);
-                Disabled[i] = !checkBoxes[i].Checked;
-			}
-
-            PurchaseOrder = orderComboBox.Text;
-            Program.LocalSettings.UpdateHistory(orderComboBox.Text, ref Program.LocalSettings.PurchaseOrderHistory);
-            Program.LocalSettings.UpdateHistory(prefixComboBox.Text, ref Program.LocalSettings.PrefixHistory);
-            Program.LocalSettings.LastSNTexts = SNText;
-            Program.LocalSettings.LastAuxSNTexts = suffixText;
-
-            completed = true;
-            Close();
-        }
-
-		private void clearButton_Click(object sender, EventArgs e)
-		{
-			for (int i = 0; i < Math.Min(WMsCount, textBoxesCount); i++)
-			{			
-				comboBoxes[i].Text = string.Empty;
-				checkBoxes[i].Checked = false;
-			}
-		}
-
-
-		private void comboBox1_SelectedIndexChanged(object s, EventArgs e) { if (comboBox1.Text.Equals(comboBox1.Items[0])) UpdateAllCombos(); }
-		private void comboBox2_SelectedIndexChanged(object s, EventArgs e) { if (comboBox2.Text.Equals(comboBox2.Items[0])) UpdateAllCombos(); }
-		private void comboBox3_SelectedIndexChanged(object s, EventArgs e) { if (comboBox3.Text.Equals(comboBox3.Items[0])) UpdateAllCombos(); }
-		private void comboBox4_SelectedIndexChanged(object s, EventArgs e) { if (comboBox4.Text.Equals(comboBox4.Items[0])) UpdateAllCombos(); }
-		private void comboBox5_SelectedIndexChanged(object s, EventArgs e) { if (comboBox5.Text.Equals(comboBox5.Items[0])) UpdateAllCombos(); }
-		private void comboBox6_SelectedIndexChanged(object s, EventArgs e) { if (comboBox6.Text.Equals(comboBox6.Items[0])) UpdateAllCombos(); }
-		private void comboBox7_SelectedIndexChanged(object s, EventArgs e) { if (comboBox7.Text.Equals(comboBox7.Items[0])) UpdateAllCombos(); }
-		private void comboBox8_SelectedIndexChanged(object s, EventArgs e) { if (comboBox8.Text.Equals(comboBox8.Items[0])) UpdateAllCombos(); }
-		private void comboBox9_SelectedIndexChanged(object s, EventArgs e) { if (comboBox9.Text.Equals(comboBox9.Items[0])) UpdateAllCombos(); }
-		private void comboBox10_SelectedIndexChanged(object s, EventArgs e) { if (comboBox10.Text.Equals(comboBox10.Items[0])) UpdateAllCombos(); }
-		private void comboBox11_SelectedIndexChanged(object s, EventArgs e) { if (comboBox11.Text.Equals(comboBox11.Items[0])) UpdateAllCombos(); }
-		private void comboBox12_SelectedIndexChanged(object s, EventArgs e) { if (comboBox12.Text.Equals(comboBox12.Items[0])) UpdateAllCombos(); }
-		private void comboBox13_SelectedIndexChanged(object s, EventArgs e) { if (comboBox13.Text.Equals(comboBox13.Items[0])) UpdateAllCombos(); }
-		private void comboBox14_SelectedIndexChanged(object s, EventArgs e) { if (comboBox14.Text.Equals(comboBox14.Items[0])) UpdateAllCombos(); }
-		private void comboBox15_SelectedIndexChanged(object s, EventArgs e) { if (comboBox15.Text.Equals(comboBox15.Items[0])) UpdateAllCombos(); }
-		private void comboBox16_SelectedIndexChanged(object s, EventArgs e) { if (comboBox16.Text.Equals(comboBox16.Items[0])) UpdateAllCombos(); }
-		private void comboBox17_SelectedIndexChanged(object s, EventArgs e) { if (comboBox17.Text.Equals(comboBox17.Items[0])) UpdateAllCombos(); }
-		private void comboBox18_SelectedIndexChanged(object s, EventArgs e) { if (comboBox18.Text.Equals(comboBox18.Items[0])) UpdateAllCombos(); }
-		private void comboBox19_SelectedIndexChanged(object s, EventArgs e) { if (comboBox19.Text.Equals(comboBox19.Items[0])) UpdateAllCombos(); }
-		private void comboBox20_SelectedIndexChanged(object s, EventArgs e) { if (comboBox20.Text.Equals(comboBox20.Items[0])) UpdateAllCombos(); }
-		private void comboBox21_SelectedIndexChanged(object s, EventArgs e) { if (comboBox21.Text.Equals(comboBox21.Items[0])) UpdateAllCombos(); }
-		private void comboBox22_SelectedIndexChanged(object s, EventArgs e) { if (comboBox22.Text.Equals(comboBox22.Items[0])) UpdateAllCombos(); }
-		private void comboBox23_SelectedIndexChanged(object s, EventArgs e) { if (comboBox23.Text.Equals(comboBox23.Items[0])) UpdateAllCombos(); }
-		private void comboBox24_SelectedIndexChanged(object s, EventArgs e) { if (comboBox24.Text.Equals(comboBox24.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox1_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox1.Text.Equals(suffixComboBox1.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox2_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox2.Text.Equals(suffixComboBox2.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox3_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox3.Text.Equals(suffixComboBox3.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox4_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox4.Text.Equals(suffixComboBox4.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox5_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox5.Text.Equals(suffixComboBox5.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox6_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox6.Text.Equals(suffixComboBox6.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox7_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox7.Text.Equals(suffixComboBox7.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox8_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox8.Text.Equals(suffixComboBox8.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox9_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox9.Text.Equals(suffixComboBox9.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox10_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox10.Text.Equals(suffixComboBox10.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox11_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox11.Text.Equals(suffixComboBox11.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox12_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox12.Text.Equals(suffixComboBox12.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox13_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox13.Text.Equals(suffixComboBox13.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox14_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox14.Text.Equals(suffixComboBox14.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox15_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox15.Text.Equals(suffixComboBox15.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox16_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox16.Text.Equals(suffixComboBox16.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox17_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox17.Text.Equals(suffixComboBox17.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox18_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox18.Text.Equals(suffixComboBox18.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox19_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox19.Text.Equals(suffixComboBox19.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox20_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox20.Text.Equals(suffixComboBox20.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox21_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox21.Text.Equals(suffixComboBox21.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox22_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox22.Text.Equals(suffixComboBox22.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox23_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox23.Text.Equals(suffixComboBox23.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox24_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox24.Text.Equals(suffixComboBox24.Items[0])) UpdateAllCombos(); }
-
-        /// <summary>
-        /// When one combo box is updated using drop-down menu, all combo boxes
-        /// are updated by this function.
-        /// </summary>
-        private void UpdateAllCombos()
-        {
-            for (int i = 0; i < Math.Min(WMsCount, textBoxesCount); i++)
-            {
-                if (Program.LocalSettings.LastSNTextsCount > i) comboBoxes[i].Text = Program.LocalSettings.LastSNTexts[i];
-                if (Program.LocalSettings.LastAuxSNTextsCount > i) suffixComboBoxes[i].Text = Program.LocalSettings.LastAuxSNTexts[i];
-                checkBoxes[i].Checked = !string.IsNullOrEmpty(comboBoxes[i].Text) || !string.IsNullOrEmpty(suffixComboBoxes[i].Text);
-            }
-        }
-
-
-		private void comboBox1_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox1); }
-		private void comboBox2_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox2); }
-		private void comboBox3_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox3); }
-		private void comboBox4_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox4); }
-		private void comboBox5_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox5); }
-		private void comboBox6_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox6); }
-		private void comboBox7_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox7); }
-		private void comboBox8_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox8); }
-		private void comboBox9_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox9); }
-		private void comboBox10_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox10); }
-		private void comboBox11_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox11); }
-		private void comboBox12_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox12); }
-		private void comboBox13_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox13); }
-		private void comboBox14_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox14); }
-		private void comboBox15_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox15); }
-		private void comboBox16_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox16); }
-		private void comboBox17_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox17); }
-		private void comboBox18_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox18); }
-		private void comboBox19_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox19); }
-		private void comboBox20_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox20); }
-		private void comboBox21_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox21); }
-		private void comboBox22_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox22); }
-		private void comboBox23_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox23); }
-		private void comboBox24_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox24); }
-        private void suffixComboBox1_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox1); }
-        private void suffixComboBox2_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox2); }
-        private void suffixComboBox3_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox3); }
-        private void suffixComboBox4_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox4); }
-        private void suffixComboBox5_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox5); }
-        private void suffixComboBox6_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox6); }
-        private void suffixComboBox7_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox7); }
-        private void suffixComboBox8_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox8); }
-        private void suffixComboBox9_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox9); }
-        private void suffixComboBox10_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox10); }
-        private void suffixComboBox11_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox11); }
-        private void suffixComboBox12_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox12); }
-        private void suffixComboBox13_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox13); }
-        private void suffixComboBox14_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox14); }
-        private void suffixComboBox15_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox15); }
-        private void suffixComboBox16_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox16); }
-        private void suffixComboBox17_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox17); }
-        private void suffixComboBox18_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox18); }
-        private void suffixComboBox19_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox19); }
-        private void suffixComboBox20_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox20); }
-        private void suffixComboBox21_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox21); }
-        private void suffixComboBox22_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox22); }
-        private void suffixComboBox23_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox23); }
-        private void suffixComboBox24_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox24); }
-
-        /// <summary>
-        /// Process a key press within any enabled text boxe
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        /// <param name="currentFocusOwner">TextBox control which received the event</param>
-        private void ProcKeyPress(object sender, KeyPressEventArgs e, ComboBox currentFocusOwner)
-        {
-            if (e.KeyChar == '+')
-            {
-                /// Process '+' key ..... Form completed
-                okButton_Click(sender, e);
-            }
-            if (e.KeyChar == '\r')
-            {
-                /// Process <enter> key ..... Next text field
-                if (enabledComboBoxes.Count < 2) return;		/// There is just one enabled textbox
-
-                for (int i = 0; i < enabledComboBoxes.Count; i++)
-                {
-                    if (enabledComboBoxes[i] == currentFocusOwner)
-                    {
-                        /// Change focus to the next enabled text box
-                        enabledComboBoxes[(i + 1) % enabledComboBoxes.Count].Focus();
-                        return;
-                    }
-                }
-            }
-        }
-
-
-        private void comboBox1_TextChanged(object sender, EventArgs e) { checkBox1.Checked = true; }
-        private void comboBox2_TextChanged(object sender, EventArgs e) { checkBox2.Checked = true; }
-        private void comboBox3_TextChanged(object sender, EventArgs e) { checkBox3.Checked = true; }
-        private void comboBox4_TextChanged(object sender, EventArgs e) { checkBox4.Checked = true; }
-        private void comboBox5_TextChanged(object sender, EventArgs e) { checkBox5.Checked = true; }
-        private void comboBox6_TextChanged(object sender, EventArgs e) { checkBox6.Checked = true; }
-        private void comboBox7_TextChanged(object sender, EventArgs e) { checkBox7.Checked = true; }
-        private void comboBox8_TextChanged(object sender, EventArgs e) { checkBox8.Checked = true; }
-        private void comboBox9_TextChanged(object sender, EventArgs e) { checkBox9.Checked = true; }
-        private void comboBox10_TextChanged(object sender, EventArgs e) { checkBox10.Checked = true; }
-        private void comboBox11_TextChanged(object sender, EventArgs e) { checkBox11.Checked = true; }
-        private void comboBox12_TextChanged(object sender, EventArgs e) { checkBox12.Checked = true; }
-        private void comboBox13_TextChanged(object sender, EventArgs e) { checkBox13.Checked = true; }
-        private void comboBox14_TextChanged(object sender, EventArgs e) { checkBox14.Checked = true; }
-        private void comboBox15_TextChanged(object sender, EventArgs e) { checkBox15.Checked = true; }
-        private void comboBox16_TextChanged(object sender, EventArgs e) { checkBox16.Checked = true; }
-        private void comboBox17_TextChanged(object sender, EventArgs e) { checkBox17.Checked = true; }
-        private void comboBox18_TextChanged(object sender, EventArgs e) { checkBox18.Checked = true; }
-        private void comboBox19_TextChanged(object sender, EventArgs e) { checkBox19.Checked = true; }
-        private void comboBox20_TextChanged(object sender, EventArgs e) { checkBox20.Checked = true; }
-        private void comboBox21_TextChanged(object sender, EventArgs e) { checkBox21.Checked = true; }
-        private void comboBox22_TextChanged(object sender, EventArgs e) { checkBox22.Checked = true; }
-        private void comboBox23_TextChanged(object sender, EventArgs e) { checkBox23.Checked = true; }
-        private void comboBox24_TextChanged(object sender, EventArgs e) { checkBox24.Checked = true; }
-        private void suffixComboBox1_TextChanged(object sender, EventArgs e) { checkBox1.Checked = true; }
-        private void suffixComboBox2_TextChanged(object sender, EventArgs e) { checkBox2.Checked = true; }
-        private void suffixComboBox3_TextChanged(object sender, EventArgs e) { checkBox3.Checked = true; }
-        private void suffixComboBox4_TextChanged(object sender, EventArgs e) { checkBox4.Checked = true; }
-        private void suffixComboBox5_TextChanged(object sender, EventArgs e) { checkBox5.Checked = true; }
-        private void suffixComboBox6_TextChanged(object sender, EventArgs e) { checkBox6.Checked = true; }
-        private void suffixComboBox7_TextChanged(object sender, EventArgs e) { checkBox7.Checked = true; }
-        private void suffixComboBox8_TextChanged(object sender, EventArgs e) { checkBox8.Checked = true; }
-        private void suffixComboBox9_TextChanged(object sender, EventArgs e) { checkBox9.Checked = true; }
-        private void suffixComboBox10_TextChanged(object sender, EventArgs e) { checkBox10.Checked = true; }
-        private void suffixComboBox11_TextChanged(object sender, EventArgs e) { checkBox11.Checked = true; }
-        private void suffixComboBox12_TextChanged(object sender, EventArgs e) { checkBox12.Checked = true; }
-        private void suffixComboBox13_TextChanged(object sender, EventArgs e) { checkBox13.Checked = true; }
-        private void suffixComboBox14_TextChanged(object sender, EventArgs e) { checkBox14.Checked = true; }
-        private void suffixComboBox15_TextChanged(object sender, EventArgs e) { checkBox15.Checked = true; }
-        private void suffixComboBox16_TextChanged(object sender, EventArgs e) { checkBox16.Checked = true; }
-        private void suffixComboBox17_TextChanged(object sender, EventArgs e) { checkBox17.Checked = true; }
-        private void suffixComboBox18_TextChanged(object sender, EventArgs e) { checkBox18.Checked = true; }
-        private void suffixComboBox19_TextChanged(object sender, EventArgs e) { checkBox19.Checked = true; }
-        private void suffixComboBox20_TextChanged(object sender, EventArgs e) { checkBox20.Checked = true; }
-        private void suffixComboBox21_TextChanged(object sender, EventArgs e) { checkBox21.Checked = true; }
-        private void suffixComboBox22_TextChanged(object sender, EventArgs e) { checkBox22.Checked = true; }
-        private void suffixComboBox23_TextChanged(object sender, EventArgs e) { checkBox23.Checked = true; }
-        private void suffixComboBox24_TextChanged(object sender, EventArgs e) { checkBox24.Checked = true; }
-
-
-        #region Forced close handling
-
-        public void StartForceCloseHandler()
-        {
-            UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args)
-            {
-                if (InvokeRequired) { Invoke(new EventHandler<EventArgs>(OnForceClose), sender, args); }
-                else OnForceClose(sender, args);
-            };
-        }
-
-        private void OnForceClose(object sender, EventArgs args)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-
-        #endregion
-    }
-}

TBF/BenchControl/DataEntry/Fewa/CycleEndForm.Designer.cs

@@ -1,652 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-namespace TBF.BenchControl.DataEntry.Fewa
-{
-    partial class CycleEndForm
-    {
-        /// <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.textBox2 = new System.Windows.Forms.TextBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.textBox1 = new System.Windows.Forms.TextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.okButton = new System.Windows.Forms.Button();
-            this.textBox3 = new System.Windows.Forms.TextBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.textBox4 = new System.Windows.Forms.TextBox();
-            this.label4 = new System.Windows.Forms.Label();
-            this.textBox5 = new System.Windows.Forms.TextBox();
-            this.label5 = new System.Windows.Forms.Label();
-            this.textBox6 = new System.Windows.Forms.TextBox();
-            this.label6 = new System.Windows.Forms.Label();
-            this.textBox7 = new System.Windows.Forms.TextBox();
-            this.label7 = new System.Windows.Forms.Label();
-            this.textBox8 = new System.Windows.Forms.TextBox();
-            this.label8 = new System.Windows.Forms.Label();
-            this.textBox9 = new System.Windows.Forms.TextBox();
-            this.label9 = new System.Windows.Forms.Label();
-            this.textBox10 = new System.Windows.Forms.TextBox();
-            this.label10 = new System.Windows.Forms.Label();
-            this.textBox11 = new System.Windows.Forms.TextBox();
-            this.label11 = new System.Windows.Forms.Label();
-            this.textBox12 = new System.Windows.Forms.TextBox();
-            this.label12 = new System.Windows.Forms.Label();
-            this.textBox13 = new System.Windows.Forms.TextBox();
-            this.label13 = new System.Windows.Forms.Label();
-            this.textBox14 = new System.Windows.Forms.TextBox();
-            this.label14 = new System.Windows.Forms.Label();
-            this.textBox15 = new System.Windows.Forms.TextBox();
-            this.label15 = new System.Windows.Forms.Label();
-            this.textBox16 = new System.Windows.Forms.TextBox();
-            this.label16 = new System.Windows.Forms.Label();
-            this.textBox17 = new System.Windows.Forms.TextBox();
-            this.label17 = new System.Windows.Forms.Label();
-            this.textBox18 = new System.Windows.Forms.TextBox();
-            this.label18 = new System.Windows.Forms.Label();
-            this.textBox19 = new System.Windows.Forms.TextBox();
-            this.label19 = new System.Windows.Forms.Label();
-            this.textBox20 = new System.Windows.Forms.TextBox();
-            this.label20 = new System.Windows.Forms.Label();
-            this.textBox21 = new System.Windows.Forms.TextBox();
-            this.label21 = new System.Windows.Forms.Label();
-            this.textBox22 = new System.Windows.Forms.TextBox();
-            this.label22 = new System.Windows.Forms.Label();
-            this.textBox23 = new System.Windows.Forms.TextBox();
-            this.label23 = new System.Windows.Forms.Label();
-            this.textBox24 = new System.Windows.Forms.TextBox();
-            this.label24 = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // textBox2
-            // 
-            this.textBox2.Location = new System.Drawing.Point(205, 66);
-            this.textBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(169, 27);
-            this.textBox2.TabIndex = 1;
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(38, 71);
-            this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(62, 18);
-            this.label2.TabIndex = 0;
-            this.label2.Text = "Stand:";
-            // 
-            // textBox1
-            // 
-            this.textBox1.Location = new System.Drawing.Point(205, 30);
-            this.textBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(169, 27);
-            this.textBox1.TabIndex = 1;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(38, 35);
-            this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(62, 18);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "Stand:";
-            // 
-            // okButton
-            // 
-            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.okButton.ForeColor = System.Drawing.Color.Black;
-            this.okButton.Location = new System.Drawing.Point(832, 30);
-            this.okButton.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.okButton.Name = "okButton";
-            this.okButton.Size = new System.Drawing.Size(90, 60);
-            this.okButton.TabIndex = 7;
-            this.okButton.Text = "OK";
-            this.okButton.UseVisualStyleBackColor = true;
-            this.okButton.Click += new System.EventHandler(this.okButton_Click);
-            // 
-            // textBox3
-            // 
-            this.textBox3.Location = new System.Drawing.Point(205, 102);
-            this.textBox3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox3.Name = "textBox3";
-            this.textBox3.Size = new System.Drawing.Size(169, 27);
-            this.textBox3.TabIndex = 1;
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(38, 107);
-            this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(62, 18);
-            this.label3.TabIndex = 0;
-            this.label3.Text = "Stand:";
-            // 
-            // textBox4
-            // 
-            this.textBox4.Location = new System.Drawing.Point(205, 138);
-            this.textBox4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox4.Name = "textBox4";
-            this.textBox4.Size = new System.Drawing.Size(169, 27);
-            this.textBox4.TabIndex = 1;
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(38, 143);
-            this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(62, 18);
-            this.label4.TabIndex = 0;
-            this.label4.Text = "Stand:";
-            // 
-            // textBox5
-            // 
-            this.textBox5.Location = new System.Drawing.Point(205, 174);
-            this.textBox5.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox5.Name = "textBox5";
-            this.textBox5.Size = new System.Drawing.Size(169, 27);
-            this.textBox5.TabIndex = 1;
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(38, 179);
-            this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(62, 18);
-            this.label5.TabIndex = 0;
-            this.label5.Text = "Stand:";
-            // 
-            // textBox6
-            // 
-            this.textBox6.Location = new System.Drawing.Point(205, 210);
-            this.textBox6.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox6.Name = "textBox6";
-            this.textBox6.Size = new System.Drawing.Size(169, 27);
-            this.textBox6.TabIndex = 1;
-            // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(38, 215);
-            this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(62, 18);
-            this.label6.TabIndex = 0;
-            this.label6.Text = "Stand:";
-            // 
-            // textBox7
-            // 
-            this.textBox7.Location = new System.Drawing.Point(205, 246);
-            this.textBox7.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox7.Name = "textBox7";
-            this.textBox7.Size = new System.Drawing.Size(169, 27);
-            this.textBox7.TabIndex = 9;
-            // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(38, 251);
-            this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(62, 18);
-            this.label7.TabIndex = 8;
-            this.label7.Text = "Stand:";
-            // 
-            // textBox8
-            // 
-            this.textBox8.Location = new System.Drawing.Point(205, 282);
-            this.textBox8.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox8.Name = "textBox8";
-            this.textBox8.Size = new System.Drawing.Size(169, 27);
-            this.textBox8.TabIndex = 11;
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(38, 287);
-            this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(62, 18);
-            this.label8.TabIndex = 10;
-            this.label8.Text = "Stand:";
-            // 
-            // textBox9
-            // 
-            this.textBox9.Location = new System.Drawing.Point(205, 318);
-            this.textBox9.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox9.Name = "textBox9";
-            this.textBox9.Size = new System.Drawing.Size(169, 27);
-            this.textBox9.TabIndex = 13;
-            // 
-            // label9
-            // 
-            this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(38, 323);
-            this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(62, 18);
-            this.label9.TabIndex = 12;
-            this.label9.Text = "Stand:";
-            // 
-            // textBox10
-            // 
-            this.textBox10.Location = new System.Drawing.Point(205, 354);
-            this.textBox10.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox10.Name = "textBox10";
-            this.textBox10.Size = new System.Drawing.Size(169, 27);
-            this.textBox10.TabIndex = 15;
-            // 
-            // label10
-            // 
-            this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(38, 359);
-            this.label10.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(62, 18);
-            this.label10.TabIndex = 14;
-            this.label10.Text = "Stand:";
-            // 
-            // textBox11
-            // 
-            this.textBox11.Location = new System.Drawing.Point(205, 390);
-            this.textBox11.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox11.Name = "textBox11";
-            this.textBox11.Size = new System.Drawing.Size(169, 27);
-            this.textBox11.TabIndex = 17;
-            // 
-            // label11
-            // 
-            this.label11.AutoSize = true;
-            this.label11.Location = new System.Drawing.Point(38, 395);
-            this.label11.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(62, 18);
-            this.label11.TabIndex = 16;
-            this.label11.Text = "Stand:";
-            // 
-            // textBox12
-            // 
-            this.textBox12.Location = new System.Drawing.Point(205, 426);
-            this.textBox12.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox12.Name = "textBox12";
-            this.textBox12.Size = new System.Drawing.Size(169, 27);
-            this.textBox12.TabIndex = 19;
-            // 
-            // label12
-            // 
-            this.label12.AutoSize = true;
-            this.label12.Location = new System.Drawing.Point(38, 431);
-            this.label12.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(62, 18);
-            this.label12.TabIndex = 18;
-            this.label12.Text = "Stand:";
-            // 
-            // textBox13
-            // 
-            this.textBox13.Location = new System.Drawing.Point(623, 30);
-            this.textBox13.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox13.Name = "textBox13";
-            this.textBox13.Size = new System.Drawing.Size(169, 27);
-            this.textBox13.TabIndex = 21;
-            // 
-            // label13
-            // 
-            this.label13.AutoSize = true;
-            this.label13.Location = new System.Drawing.Point(456, 35);
-            this.label13.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(62, 18);
-            this.label13.TabIndex = 20;
-            this.label13.Text = "Stand:";
-            // 
-            // textBox14
-            // 
-            this.textBox14.Location = new System.Drawing.Point(623, 66);
-            this.textBox14.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox14.Name = "textBox14";
-            this.textBox14.Size = new System.Drawing.Size(169, 27);
-            this.textBox14.TabIndex = 23;
-            // 
-            // label14
-            // 
-            this.label14.AutoSize = true;
-            this.label14.Location = new System.Drawing.Point(456, 71);
-            this.label14.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(62, 18);
-            this.label14.TabIndex = 22;
-            this.label14.Text = "Stand:";
-            // 
-            // textBox15
-            // 
-            this.textBox15.Location = new System.Drawing.Point(623, 102);
-            this.textBox15.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox15.Name = "textBox15";
-            this.textBox15.Size = new System.Drawing.Size(169, 27);
-            this.textBox15.TabIndex = 25;
-            // 
-            // label15
-            // 
-            this.label15.AutoSize = true;
-            this.label15.Location = new System.Drawing.Point(456, 107);
-            this.label15.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(62, 18);
-            this.label15.TabIndex = 24;
-            this.label15.Text = "Stand:";
-            // 
-            // textBox16
-            // 
-            this.textBox16.Location = new System.Drawing.Point(623, 138);
-            this.textBox16.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox16.Name = "textBox16";
-            this.textBox16.Size = new System.Drawing.Size(169, 27);
-            this.textBox16.TabIndex = 27;
-            // 
-            // label16
-            // 
-            this.label16.AutoSize = true;
-            this.label16.Location = new System.Drawing.Point(456, 143);
-            this.label16.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label16.Name = "label16";
-            this.label16.Size = new System.Drawing.Size(62, 18);
-            this.label16.TabIndex = 26;
-            this.label16.Text = "Stand:";
-            // 
-            // textBox17
-            // 
-            this.textBox17.Location = new System.Drawing.Point(623, 174);
-            this.textBox17.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox17.Name = "textBox17";
-            this.textBox17.Size = new System.Drawing.Size(169, 27);
-            this.textBox17.TabIndex = 29;
-            // 
-            // label17
-            // 
-            this.label17.AutoSize = true;
-            this.label17.Location = new System.Drawing.Point(456, 179);
-            this.label17.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(62, 18);
-            this.label17.TabIndex = 28;
-            this.label17.Text = "Stand:";
-            // 
-            // textBox18
-            // 
-            this.textBox18.Location = new System.Drawing.Point(623, 210);
-            this.textBox18.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox18.Name = "textBox18";
-            this.textBox18.Size = new System.Drawing.Size(169, 27);
-            this.textBox18.TabIndex = 31;
-            // 
-            // label18
-            // 
-            this.label18.AutoSize = true;
-            this.label18.Location = new System.Drawing.Point(456, 215);
-            this.label18.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label18.Name = "label18";
-            this.label18.Size = new System.Drawing.Size(62, 18);
-            this.label18.TabIndex = 30;
-            this.label18.Text = "Stand:";
-            // 
-            // textBox19
-            // 
-            this.textBox19.Location = new System.Drawing.Point(623, 246);
-            this.textBox19.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox19.Name = "textBox19";
-            this.textBox19.Size = new System.Drawing.Size(169, 27);
-            this.textBox19.TabIndex = 33;
-            // 
-            // label19
-            // 
-            this.label19.AutoSize = true;
-            this.label19.Location = new System.Drawing.Point(456, 251);
-            this.label19.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label19.Name = "label19";
-            this.label19.Size = new System.Drawing.Size(62, 18);
-            this.label19.TabIndex = 32;
-            this.label19.Text = "Stand:";
-            // 
-            // textBox20
-            // 
-            this.textBox20.Location = new System.Drawing.Point(623, 282);
-            this.textBox20.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox20.Name = "textBox20";
-            this.textBox20.Size = new System.Drawing.Size(169, 27);
-            this.textBox20.TabIndex = 35;
-            // 
-            // label20
-            // 
-            this.label20.AutoSize = true;
-            this.label20.Location = new System.Drawing.Point(456, 287);
-            this.label20.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label20.Name = "label20";
-            this.label20.Size = new System.Drawing.Size(62, 18);
-            this.label20.TabIndex = 34;
-            this.label20.Text = "Stand:";
-            // 
-            // textBox21
-            // 
-            this.textBox21.Location = new System.Drawing.Point(623, 318);
-            this.textBox21.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox21.Name = "textBox21";
-            this.textBox21.Size = new System.Drawing.Size(169, 27);
-            this.textBox21.TabIndex = 37;
-            // 
-            // label21
-            // 
-            this.label21.AutoSize = true;
-            this.label21.Location = new System.Drawing.Point(456, 323);
-            this.label21.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label21.Name = "label21";
-            this.label21.Size = new System.Drawing.Size(62, 18);
-            this.label21.TabIndex = 36;
-            this.label21.Text = "Stand:";
-            // 
-            // textBox22
-            // 
-            this.textBox22.Location = new System.Drawing.Point(623, 354);
-            this.textBox22.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox22.Name = "textBox22";
-            this.textBox22.Size = new System.Drawing.Size(169, 27);
-            this.textBox22.TabIndex = 39;
-            // 
-            // label22
-            // 
-            this.label22.AutoSize = true;
-            this.label22.Location = new System.Drawing.Point(456, 359);
-            this.label22.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(62, 18);
-            this.label22.TabIndex = 38;
-            this.label22.Text = "Stand:";
-            // 
-            // textBox23
-            // 
-            this.textBox23.Location = new System.Drawing.Point(623, 390);
-            this.textBox23.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox23.Name = "textBox23";
-            this.textBox23.Size = new System.Drawing.Size(169, 27);
-            this.textBox23.TabIndex = 41;
-            // 
-            // label23
-            // 
-            this.label23.AutoSize = true;
-            this.label23.Location = new System.Drawing.Point(456, 395);
-            this.label23.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label23.Name = "label23";
-            this.label23.Size = new System.Drawing.Size(62, 18);
-            this.label23.TabIndex = 40;
-            this.label23.Text = "Stand:";
-            // 
-            // textBox24
-            // 
-            this.textBox24.Location = new System.Drawing.Point(623, 426);
-            this.textBox24.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox24.Name = "textBox24";
-            this.textBox24.Size = new System.Drawing.Size(169, 27);
-            this.textBox24.TabIndex = 43;
-            // 
-            // label24
-            // 
-            this.label24.AutoSize = true;
-            this.label24.Location = new System.Drawing.Point(456, 431);
-            this.label24.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label24.Name = "label24";
-            this.label24.Size = new System.Drawing.Size(62, 18);
-            this.label24.TabIndex = 42;
-            this.label24.Text = "Stand:";
-            // 
-            // CycleEndForm
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 18F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = System.Drawing.Color.DarkGoldenrod;
-            this.ClientSize = new System.Drawing.Size(959, 489);
-            this.Controls.Add(this.textBox24);
-            this.Controls.Add(this.label24);
-            this.Controls.Add(this.textBox23);
-            this.Controls.Add(this.label23);
-            this.Controls.Add(this.textBox22);
-            this.Controls.Add(this.label22);
-            this.Controls.Add(this.textBox21);
-            this.Controls.Add(this.label21);
-            this.Controls.Add(this.textBox20);
-            this.Controls.Add(this.label20);
-            this.Controls.Add(this.textBox19);
-            this.Controls.Add(this.label19);
-            this.Controls.Add(this.textBox18);
-            this.Controls.Add(this.label18);
-            this.Controls.Add(this.textBox17);
-            this.Controls.Add(this.label17);
-            this.Controls.Add(this.textBox16);
-            this.Controls.Add(this.label16);
-            this.Controls.Add(this.textBox15);
-            this.Controls.Add(this.label15);
-            this.Controls.Add(this.textBox14);
-            this.Controls.Add(this.label14);
-            this.Controls.Add(this.textBox13);
-            this.Controls.Add(this.label13);
-            this.Controls.Add(this.textBox12);
-            this.Controls.Add(this.label12);
-            this.Controls.Add(this.textBox11);
-            this.Controls.Add(this.label11);
-            this.Controls.Add(this.textBox10);
-            this.Controls.Add(this.label10);
-            this.Controls.Add(this.textBox9);
-            this.Controls.Add(this.label9);
-            this.Controls.Add(this.textBox8);
-            this.Controls.Add(this.label8);
-            this.Controls.Add(this.textBox7);
-            this.Controls.Add(this.label7);
-            this.Controls.Add(this.textBox6);
-            this.Controls.Add(this.label6);
-            this.Controls.Add(this.textBox5);
-            this.Controls.Add(this.label5);
-            this.Controls.Add(this.textBox4);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.textBox3);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.textBox2);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.textBox1);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.okButton);
-            this.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-            this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.Name = "CycleEndForm";
-            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
-            this.Text = "Daten";
-            this.TopMost = true;
-            this.Load += new System.EventHandler(this.CycleEndForm_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TextBox textBox2;
-        private System.Windows.Forms.Label label2;
-		private System.Windows.Forms.TextBox textBox1;
-		private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Button okButton;
-        private System.Windows.Forms.TextBox textBox3;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.TextBox textBox4;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.TextBox textBox5;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.TextBox textBox6;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.TextBox textBox7;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.TextBox textBox8;
-        private System.Windows.Forms.Label label8;
-        private System.Windows.Forms.TextBox textBox9;
-        private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.TextBox textBox10;
-        private System.Windows.Forms.Label label10;
-        private System.Windows.Forms.TextBox textBox11;
-        private System.Windows.Forms.Label label11;
-        private System.Windows.Forms.TextBox textBox12;
-        private System.Windows.Forms.Label label12;
-        private System.Windows.Forms.TextBox textBox13;
-        private System.Windows.Forms.Label label13;
-        private System.Windows.Forms.TextBox textBox14;
-        private System.Windows.Forms.Label label14;
-        private System.Windows.Forms.TextBox textBox15;
-        private System.Windows.Forms.Label label15;
-        private System.Windows.Forms.TextBox textBox16;
-        private System.Windows.Forms.Label label16;
-        private System.Windows.Forms.TextBox textBox17;
-        private System.Windows.Forms.Label label17;
-        private System.Windows.Forms.TextBox textBox18;
-        private System.Windows.Forms.Label label18;
-        private System.Windows.Forms.TextBox textBox19;
-        private System.Windows.Forms.Label label19;
-        private System.Windows.Forms.TextBox textBox20;
-        private System.Windows.Forms.Label label20;
-        private System.Windows.Forms.TextBox textBox21;
-        private System.Windows.Forms.Label label21;
-        private System.Windows.Forms.TextBox textBox22;
-        private System.Windows.Forms.Label label22;
-        private System.Windows.Forms.TextBox textBox23;
-        private System.Windows.Forms.Label label23;
-        private System.Windows.Forms.TextBox textBox24;
-        private System.Windows.Forms.Label label24;
-
-	}
-}

TBF/BenchControl/DataEntry/Fewa/CycleEndForm.cs

@@ -1,155 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using System.Windows.Forms;
-using log4net;
-using TBF.Resources;
-
-namespace TBF.BenchControl.DataEntry.Fewa
-{
-	public partial class CycleEndForm : Form, GenericDevices.IHasCompleted
-    {
-		private static readonly ILog log = LogManager.GetLogger(typeof(CycleEndForm));
-
-		/// <summary> Number of text boxes for serial numbers </summary>
-        public readonly int WMsCount;
-        readonly int lineSize;
-
- 		// To be retrieved after the form closes
-        public string[] EndStateText;
-
-		// Set to 'true' when the form closes
-        public bool Completed { get { return completed; } }
-		bool completed;
-
-        int textBoxesCount;
-        Label[] labels;
-        TextBox[] textBoxes;
-
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
-        public CycleEndForm()
-        {
-            InitializeComponent();
-			ControlBox = false;
-
-            labels = new Label[]
-				{
-					label1,  label2,  label3,  label4,  label5,  label6,  label7,  label8,  label9,  label10,
-					label11, label12, label13, label14, label15, label16, label17, label18, label19, label20,
-					label21, label22, label23, label24,
-				};
-            textBoxes = new TextBox[]
-				{
-					textBox1,  textBox2,  textBox3,  textBox4,  textBox5,  textBox6,
-					textBox7,  textBox8,  textBox9,  textBox10, textBox11, textBox12,
-					textBox13, textBox14, textBox15, textBox16, textBox17, textBox18,
-					textBox19, textBox20, textBox21, textBox22, textBox23, textBox24,
-				};
-            textBoxesCount = textBoxes.Length;
-            this.WMsCount = textBoxesCount;
-            this.lineSize = textBoxesCount / 2;
-
-            completed = false;
-			StartForceCloseHandler();
-		}
-
-        /// <summary> Parameterless constructor for 3 watermeters </summary>
-        public CycleEndForm(int waterMetersCount, int lineSize)
-            : this()
-        {
-            this.WMsCount = waterMetersCount;
-            this.lineSize = lineSize;
-            ShuffleTextBoxes(waterMetersCount, lineSize);
-            EndStateText = new string[WMsCount];
-        }
-
-        /// <summary>
-        /// Make sure the layout of labels/text boxes on the screen
-        /// corresponds to the layout of watermeters of the test bench.
-        /// </summary>
-        /// <param name="wmsCount">Number of watermeters</param>
-        /// <param name="lineSize">Number of watermeters in one line</param>
-        void ShuffleTextBoxes(int wmsCount, int lineSize)
-        {
-            if (wmsCount < textBoxesCount && lineSize > 0)
-            {
-                int nrLines = (wmsCount + lineSize - 1) / lineSize;
-                int gap = (textBoxesCount - wmsCount) / nrLines;
-
-                int dest = 0;
-                for (int l = 0; l < nrLines; l++)
-                {
-                    for (int i = 0; i < lineSize; i++)
-                    {
-                        labels[dest] = labels[l * lineSize + l * gap + i];
-                        textBoxes[dest] = textBoxes[l * lineSize + l * gap + i];
-                        dest++;
-                    }
-                }
-                textBoxesCount = wmsCount;
-            }
-        }
-
-		private void CycleEndForm_Load(object sender, EventArgs e)
-		{
-			Localize();
-
-            Height = 60 + 36 * lineSize;
-
-            for (int i = 0; i < textBoxesCount; i++)
-            {
-                if (i >= WMsCount)
-                {
-                    labels[i].Visible = false;
-                    textBoxes[i].Visible = false;
-                }
-            }
-		}
-
-		void Localize()
-		{
-			Text = Strings.Data;
-            okButton.Text = Strings.OkBtnText;
-
-            for (int i = 0; i < WMsCount; i++)
-            {
-                labels[i].Text = string.Format("{0} {1}:", Strings.Water_Meter, (i + 1).ToString());
-            }
-		}
-
-		private void okButton_Click(object sender, EventArgs e)
-		{
-            for (int i = 0; i < WMsCount; i++)
-            {
-                EndStateText[i] = textBoxes[i].Text;
-            }
-
-			completed = true;
-			Close();
-		}
-
-		#region Forced close handling
-
-		public void StartForceCloseHandler()
-		{
-			UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args)
-			{
-				if (InvokeRequired) { Invoke(new EventHandler<EventArgs>(OnForceClose), sender, args); }
-				else OnForceClose(sender, args);
-			};
-		}
-
-		void OnForceClose(object sender, EventArgs args)
-		{
-			DialogResult = DialogResult.Cancel;
-			Close();
-		}
-
-		#endregion
-	}
-}

TBF/BenchControl/DataEntry/Fewa/CycleEndForm.resx

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

TBF/BenchControl/DataEntry/Fewa/EntryForm.cs

@@ -1,20 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using TBF.BenchControl.GenericDevices;
-
-namespace TBF.BenchControl.DataEntry.Fewa
-{
-	public class EntryForm : EntryFormNoStartEnd, IHasWMStatesForm
-	{
-		public EntryForm()
-			: base()
-		{
-		}
-
-		public EntryForm(Generic.IComponentCfg cfg)
-			: base(cfg)
-		{
-		}
-	}
-}

TBF/BenchControl/DataEntry/Fewa/EntryFormCfg.cs

@@ -1,45 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml.Serialization;
-using TBF.BenchControl.Generic;
-
-namespace TBF.BenchControl.DataEntry.Fewa
-{
-	public class EntryFormCfg : ComponentCfgBase, Generic.IComponentCfg
-	{
-		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EntryFormCfg) })[0];
-		public override XmlSerializer GetSerializer() { return Serializer; }
-
-		public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
-
-		///
-		/// Serialized parameters
-		///
-		public bool EnterSerialNrsAtTheEnd;
-		public bool ShowCycleEndForm;
-
-		/// Private parameterless constructor invoked by all other (public) constructors
-		EntryFormCfg()
-        {
-			Name = "DataEntry-FEWA";
-            ParentName = string.Empty;
-			EnterSerialNrsAtTheEnd = false;
-			ShowCycleEndForm = false;
-        }
-
-        public EntryFormCfg(IComponentFactory factory)
-            : this()
-        {
-            this.Factory = factory;
-        }
-
-        public string ToString(int i)
-        {
-            return string.Format("Name={0}, EnterSNsAtTheEnd={1}, ShowEndForm={2}", Name, EnterSerialNrsAtTheEnd, ShowCycleEndForm);
-        }
-    }
-}

TBF/BenchControl/DataEntry/Fewa/EntryFormCfgCtrl.cs

@@ -1,83 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using System.Windows.Forms;
-using Config.Entities;
-using TBF.BenchControl.Generic;
-using TBF.Resources;
-
-namespace TBF.BenchControl.DataEntry.Fewa
-{
-	public partial class EntryFormCfgCtrl : UserControl, IComponentCfgCtrl
-	{
-		public bool ShowMore { get { return false; } }
-
-		EntryFormCfg config;
-		public IComponentCfg Config
-		{
-			get { return config as IComponentCfg; }
-			set
-			{
-				config = value as EntryFormCfg;
-				Redraw();
-			}
-		}
-
-		public EntryFormCfgCtrl()
-		{
-			InitializeComponent();
-		}
-
-		private void EntryFormCfgCtrl_Load(object sender, EventArgs e)
-		{
-			Localize();
-			Redraw();
-		}
-
-		void Localize()
-		{
-			enterSNsAtTheEndCheckBox.Text = Strings.Enter_SNs_at_the_end;
-			showEndStateFormCheckBox.Text = Strings.Show_cycle_end_form;
-        }
-
-		public void Closing()
-		{
-		}
-
-		void Redraw()
-		{
-			if (config == null) return;			/// Control was not loaded, settings were not changed
-			classNameLabel.Text = config.Factory.ClassName;
-			nameTextBox.Text = config.Name;
-			enterSNsAtTheEndCheckBox.Checked = config.EnterSerialNrsAtTheEnd;
-			showEndStateFormCheckBox.Checked = config.ShowCycleEndForm;
-		}
-
-		public void Unlock()
-		{
-			nameTextBox.Enabled = true;
-			enterSNsAtTheEndCheckBox.Enabled = true;
-			showEndStateFormCheckBox.Enabled = true;
-        }
-
-		public CfgUpdateFlags VerifyCfg(ref string message)
-		{
-            CfgUpdateFlags flags = CfgUpdateFlags.None;
-			return flags;
-		}
-
-		public CfgUpdateFlags UpdateCfg()
-		{
-			CfgUpdateFlags flags = CfgUpdateFlags.RestartRqrd;
-
-			if (config == null) return CfgUpdateFlags.Error;	/// Control was not loaded, settings were not changed
-
-			config.Name = nameTextBox.Text;
-			config.EnterSerialNrsAtTheEnd = enterSNsAtTheEndCheckBox.Checked;
-			config.ShowCycleEndForm = showEndStateFormCheckBox.Checked;
-
-			return flags;
-		}
-	}
-}

TBF/BenchControl/DataEntry/Fewa/EntryFormCfgCtrl.designer.cs

@@ -1,114 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-namespace TBF.BenchControl.DataEntry.Fewa
-{
-	partial class EntryFormCfgCtrl
-	{
-		/// <summary> 
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary> 
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Component Designer generated code
-
-		/// <summary> 
-		/// Required method for Designer support - do not modify 
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.nameTextBox = new System.Windows.Forms.TextBox();
-			this.nameLabel = new System.Windows.Forms.Label();
-			this.classNameLabel = new System.Windows.Forms.Label();
-			this.showEndStateFormCheckBox = new System.Windows.Forms.CheckBox();
-			this.enterSNsAtTheEndCheckBox = new System.Windows.Forms.CheckBox();
-			this.SuspendLayout();
-			// 
-			// nameTextBox
-			// 
-			this.nameTextBox.Enabled = false;
-			this.nameTextBox.Location = new System.Drawing.Point(99, 57);
-			this.nameTextBox.Name = "nameTextBox";
-			this.nameTextBox.Size = new System.Drawing.Size(130, 20);
-			this.nameTextBox.TabIndex = 2;
-			// 
-			// nameLabel
-			// 
-			this.nameLabel.AutoSize = true;
-			this.nameLabel.Location = new System.Drawing.Point(35, 60);
-			this.nameLabel.Name = "nameLabel";
-			this.nameLabel.Size = new System.Drawing.Size(35, 13);
-			this.nameLabel.TabIndex = 1;
-			this.nameLabel.Text = "Name";
-			// 
-			// classNameLabel
-			// 
-			this.classNameLabel.AutoSize = true;
-			this.classNameLabel.Location = new System.Drawing.Point(96, 33);
-			this.classNameLabel.Name = "classNameLabel";
-			this.classNameLabel.Size = new System.Drawing.Size(83, 13);
-			this.classNameLabel.TabIndex = 0;
-			this.classNameLabel.Text = "ComonentName";
-			// 
-			// showEndStateFormCheckBox
-			// 
-			this.showEndStateFormCheckBox.AutoSize = true;
-			this.showEndStateFormCheckBox.Enabled = false;
-			this.showEndStateFormCheckBox.Location = new System.Drawing.Point(99, 112);
-			this.showEndStateFormCheckBox.Name = "showEndStateFormCheckBox";
-			this.showEndStateFormCheckBox.Size = new System.Drawing.Size(151, 17);
-			this.showEndStateFormCheckBox.TabIndex = 4;
-			this.showEndStateFormCheckBox.Text = "Watermeter end state form";
-			this.showEndStateFormCheckBox.UseVisualStyleBackColor = true;
-			// 
-			// enterSNsAtTheEndCheckBox
-			// 
-			this.enterSNsAtTheEndCheckBox.AutoSize = true;
-			this.enterSNsAtTheEndCheckBox.Enabled = false;
-			this.enterSNsAtTheEndCheckBox.Location = new System.Drawing.Point(99, 89);
-			this.enterSNsAtTheEndCheckBox.Name = "enterSNsAtTheEndCheckBox";
-			this.enterSNsAtTheEndCheckBox.Size = new System.Drawing.Size(167, 17);
-			this.enterSNsAtTheEndCheckBox.TabIndex = 3;
-			this.enterSNsAtTheEndCheckBox.Text = "Enter serial number at the end";
-			this.enterSNsAtTheEndCheckBox.UseVisualStyleBackColor = true;
-			// 
-			// EntryFormCfgCtrl
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.Controls.Add(this.enterSNsAtTheEndCheckBox);
-			this.Controls.Add(this.showEndStateFormCheckBox);
-			this.Controls.Add(this.nameTextBox);
-			this.Controls.Add(this.nameLabel);
-			this.Controls.Add(this.classNameLabel);
-			this.Name = "EntryFormCfgCtrl";
-			this.Size = new System.Drawing.Size(300, 200);
-			this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load);
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.TextBox nameTextBox;
-		private System.Windows.Forms.Label nameLabel;
-		private System.Windows.Forms.Label classNameLabel;
-		private System.Windows.Forms.CheckBox showEndStateFormCheckBox;
-		private System.Windows.Forms.CheckBox enterSNsAtTheEndCheckBox;
-	}
-}

TBF/BenchControl/DataEntry/Fewa/EntryFormCfgCtrl.resx

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

TBF/BenchControl/DataEntry/Fewa/EntryFormNoStartEnd.cs

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

TBF/BenchControl/DataEntry/Fewa/Factory.cs

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

TBF/BenchControl/DataEntry/Fewa/FactoryNoStartEnd.cs

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

TBF/BenchControl/DataEntry/Fewa/TestStartEndForm.cs

@@ -1,533 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-using log4net;
-using TBF.BenchControl.GenericDevices;
-using TBF.Resources;
-
-namespace TBF.BenchControl.DataEntry.Fewa
-{
-	public partial class TestStartEndForm : Form, GenericDevices.IHasCompleted
-    {
-		private static readonly ILog log = LogManager.GetLogger(typeof(TestStartEndForm));
-
-		// Set to 'true' when the form closes
-		public bool Completed { get { return completed; } }
-		bool completed;
-
-		/// <summary> Number of text boxes for serial numbers </summary>
-        public readonly int WMsCount;
-		readonly IRegisterReader[] regReaders;
-		readonly bool[] disabled;
-
-		// To be retrieved after the form closes
-		public double[] WMStartState;
-
-		// To be retrieved after the form closes
-		public readonly string[] WMStartStateStr;
-
-		// To be retrieved after the form closes
-        public double[] WMEndState;
-
-		bool endStates;			/// false=start states, true=end states
-		double refVolume;
-		double warningLimLo;	/// limit to display exclamation mark, typically 2x errLimLo
-		double warningLimHi;	/// limit to display exclamation mark, typically 2x errLimHi
-        bool fixedErrorLimits;  /// false in case of calculated error limits
-
-		int TextBoxesCount;
-		///
-		Label[] labels;
-		TextBox[] startTextBoxes;
-		TextBox[] endTextBoxes;
-        Label[] exclamations;
-
-		IList<TextBox> activeTextBoxes;
-        IList<int> activeWmNrs;
-
-		/// <summary>
-		/// Parameterless constructor initializing common part for start and endstate form
-		/// </summary>
-		public TestStartEndForm()
-		{
-			InitializeComponent();
-			ControlBox = false;
-
-			TextBoxesCount = 24;
-
-			labels = new Label[]
-				{
-					label1,  label2,  label3,  label4,  label5,  label6,  label7,  label8,  label9,  label10,
-					label11, label12, label13, label14, label15, label16, label17, label18, label19, label20,
-					label21, label22, label23, label24,
-				};
-			startTextBoxes = new TextBox[]
-				{
-					startTextBox1, startTextBox2, startTextBox3, startTextBox4, startTextBox5, startTextBox6,
-					startTextBox7, startTextBox8, startTextBox9, startTextBox10, startTextBox11, startTextBox12,
-					startTextBox13, startTextBox14, startTextBox15, startTextBox16, startTextBox17, startTextBox18,
-					startTextBox19, startTextBox20, startTextBox21, startTextBox22, startTextBox23, startTextBox24,
-				};
-			endTextBoxes = new TextBox[]
-				{
-					endTextBox1, endTextBox2, endTextBox3, endTextBox4, endTextBox5, endTextBox6,
-					endTextBox7, endTextBox8, endTextBox9, endTextBox10, endTextBox11, endTextBox12,
-					endTextBox13, endTextBox14, endTextBox15, endTextBox16, endTextBox17, endTextBox18,
-					endTextBox19, endTextBox20, endTextBox21, endTextBox22, endTextBox23, endTextBox24,
-				};
-            exclamations = new Label[]
-                {
-					exclamation1, exclamation2, exclamation3, exclamation4, exclamation5, exclamation6,
-					exclamation7, exclamation8, exclamation9, exclamation10, exclamation11, exclamation12,
-					exclamation13, exclamation14, exclamation15, exclamation16, exclamation17, exclamation18,
-					exclamation19, exclamation20, exclamation21, exclamation22, exclamation23, exclamation24,
-                };
-
-			activeTextBoxes = new List<TextBox>();
-            activeWmNrs = new List<int>();
-
-			completed = false;
-			StartForceCloseHandler();
-		}
-
-		/// <summary>
-		/// Constructor to fill in start states
-		/// </summary>
-		/// <param name="waterMetersCount">Number of water meters</param>
-		/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
-		public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, bool[] disabled)
-			: this()
-		{
-			endStates = false;
-
-			this.WMsCount = waterMetersCount;
-			this.regReaders = regReaders;
-			this.disabled = disabled;
-
-			ShuffleTextBoxes();
-
-			WMStartState = new double[waterMetersCount];
-			WMStartStateStr = new string[waterMetersCount];
-		}
-
-        /// <summary>
-        /// Constructor to fill in end states
-        /// </summary>
-		/// <param name="waterMetersCount">Number of water meters</param>
-		/// <param name="wmStartStateStr">Information entered on test start</param>
-		/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
-		/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
-		/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
-		/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
-		public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
-								double refVolume, double errLimLo, double errLimHi)
-			: this()
-        {
-			endStates = true;
-
-			this.WMsCount = waterMetersCount;
-			this.regReaders = regReaders;
-			if (wmStartStateStr == null || wmStartStateStr.Length != waterMetersCount)
-				throw (new Exception("Invalid 'wmStartStateStr' argument"));
-			this.WMStartStateStr = wmStartStateStr;
-			this.disabled = disabled;
-            this.refVolume = refVolume;
-            this.warningLimLo = 2 * errLimLo;
-            this.warningLimHi = 2 * errLimHi;
-            this.fixedErrorLimits = (errLimHi > errLimLo);
-
-			ShuffleTextBoxes();
-
-            WMEndState = new double[waterMetersCount];
-		}
-
-		/// <summary>
-		/// Make sure the layout of labels/text boxes on the screen
-		/// corresponds to the layout of watermeters of the test bench.
-		/// </summary>
-		void ShuffleTextBoxes()
-		{
-			if (TextBoxesCount > WMsCount)
-			{
-				int nrLines = WMsCount / Config.Data.LineSize;
-				int gap = (TextBoxesCount - WMsCount) / nrLines;
-
-				int dest = 0;
-				for (int l = 0; l < nrLines; l++)
-				{
-					for (int i = 0; i < Config.Data.LineSize; i++)
-					{
-						labels[dest] = labels[l * Config.Data.LineSize + l * gap + i];
-						startTextBoxes[dest] = startTextBoxes[l * Config.Data.LineSize + l * gap + i];
-						endTextBoxes[dest] = endTextBoxes[l * Config.Data.LineSize + l * gap + i];
-                        exclamations[dest] = exclamations[l * Config.Data.LineSize + l * gap + i];
-                        dest++;
-					}
-				}
-				TextBoxesCount = WMsCount;
-			}
-		}
-
-		private void CycleEndForm_Load(object sender, EventArgs e)
-		{
-            Localize();
-
-            //Height = 115 + 90 * WaterMetersCount;
-
-			for (int i = 0; i < TextBoxesCount; i++)
-			{
-				if (i < WMsCount)
-				{
-					labels[i].Visible = startTextBoxes[i].Visible = endTextBoxes[i].Visible = true;
-				}
-			}
-
-            if (endStates)
-			{
-                /// End of test
-				for (int i = 0; i < TextBoxesCount; i++)
-				{
-					if (WMStartStateStr != null && i < WMStartStateStr.Length)
-					{
-						startTextBoxes[i].Text = WMStartStateStr[i];
-					}
-
-					if (((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null)))
-					{
-						endTextBoxes[i].Enabled = false;
-					}
-					else
-					{
-						endTextBoxes[i].Enabled = true;
-						activeTextBoxes.Add(endTextBoxes[i]);
-                        activeWmNrs.Add(i);
-                    }
-				}
-			}
-			else
-			{ 
-                /// Start of test
-				for (int i = 0; i < TextBoxesCount; i++)
-				{
-					if (((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null)))
-					{
-						startTextBoxes[i].Enabled = false;
-					}
-					else
-					{
-						startTextBoxes[i].Enabled = true;
-						activeTextBoxes.Add(startTextBoxes[i]);
-                        activeWmNrs.Add(i);
-                    }
-				}
-			}
-
-            if ((activeTextBoxes.Count > 0) && (activeWmNrs.Count > 0))
-            {
-                activeTextBoxes[0].Focus();
-                largeTextBox.Text = string.Format("{0} {1}:   {2}", Strings.Water_Meter, activeWmNrs[0] + 1, string.Empty);
-            }
-		}
-
-		void Localize()
-		{
-			Text = Strings.Water_Meter_States;
-			for (int i = 0; i < TextBoxesCount; i++)
-			{
-				labels[i].Text = string.Format("{0} {1}", Strings.Water_Meter, i + 1);
-			}
-			startLabel.Text = startLabel2.Text = Strings.Start;
-			endLabel.Text = endLabel2.Text = Strings.End;
-			okButton.Text = Strings.OkBtnText;
-		}
-
-		private void okButton_Click(object sender, EventArgs eArgs)
-		{
-            try
-            {
-				if (endStates)
-				{
-					for (int i = 0; i < Math.Min(WMsCount, TextBoxesCount); i++)
-					{
-						if (endTextBoxes[i].Visible && endTextBoxes[i].Enabled)
-						{
-							WMEndState[i] = Utils.ParseUDouble(endTextBoxes[i].Text);
-						}
-					}
-				}
-				else
-				{
-					for (int i = 0; i < Math.Min(WMsCount, TextBoxesCount); i++)
-					{
-						if (startTextBoxes[i].Visible && startTextBoxes[i].Enabled)
-						{
-							WMStartStateStr[i] = startTextBoxes[i].Text;
-							WMStartState[i] = Utils.ParseUDouble(startTextBoxes[i].Text);
-						}
-					}
-				}
-			}
-            catch(Exception e)
-            {
-				log.ErrorFormat("Exception: {0}", e.Message);
-                return;
-            }
-
-			completed = true;
-			Close();
-		}
-
-		#region Forced close handling
-
-		public void StartForceCloseHandler()
-		{
-			UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args)
-			{
-				if (InvokeRequired) { Invoke(new EventHandler<EventArgs>(OnForceClose), sender, args); }
-				else OnForceClose(sender, args);
-			};
-		}
-
-		void OnForceClose(object sender, EventArgs args)
-		{
-			DialogResult = DialogResult.Cancel;
-			Close();
-		}
-
-		#endregion
-
-
-        /// <summary>
-        /// Calculate the approximate error and verify whether it is within limits.
-        /// Make an exclamation mark visible if out of range.
-        /// Similar event handler is implemented for all endTextBoxes (1..24).
-        /// </summary>
-        private void ProcEndTextChanged(object sender, EventArgs e, TextBox endTBox)
-        {
-            int wmIx = -1;
-            for (int i = 0; i < endTextBoxes.Length; i++)
-            {
-                if (endTextBoxes[i] == endTBox)
-                {
-                    wmIx = i;
-                    break;
-                }
-            }
-
-            double err = 0;
-            try
-            {
-                double endState = Utils.ParseUDouble(endTextBoxes[wmIx].Text);
-                double startState = Utils.ParseUDouble(startTextBoxes[wmIx].Text);
-                err = 100.0 * (endState - startState - refVolume) / refVolume;
-            }
-            catch { err = 1000.0f; };
-
-            bool errorOoR = fixedErrorLimits ? ((err < warningLimLo) || (warningLimHi < err)) : ((err < -6) || (+6 < err));
-            exclamations[wmIx].Visible = errorOoR;
-            largeExclamationLabel.Visible = errorOoR;
-            largeTextBox.Text = string.Format("{0} {1}:   {2}", Strings.Water_Meter, wmIx + 1, endTextBoxes[wmIx].Text);
-        }
-
-        private void endTextBox1_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox1); }
-        private void endTextBox2_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox2); }
-        private void endTextBox3_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox3); }
-        private void endTextBox4_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox4); }
-        private void endTextBox5_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox5); }
-        private void endTextBox6_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox6); }
-        private void endTextBox7_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox7); }
-        private void endTextBox8_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox8); }
-        private void endTextBox9_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox9); }
-        private void endTextBox10_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox10); }
-        private void endTextBox11_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox11); }
-        private void endTextBox12_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox12); }
-        private void endTextBox13_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox13); }
-        private void endTextBox14_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox14); }
-        private void endTextBox15_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox15); }
-        private void endTextBox16_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox16); }
-        private void endTextBox17_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox17); }
-        private void endTextBox18_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox18); }
-        private void endTextBox19_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox19); }
-        private void endTextBox20_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox20); }
-        private void endTextBox21_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox21); }
-        private void endTextBox22_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox22); }
-        private void endTextBox23_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox23); }
-        private void endTextBox24_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox24); }
-
-        private void endTextBox1_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox1); }
-        private void endTextBox2_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox2); }
-        private void endTextBox3_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox3); }
-        private void endTextBox4_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox4); }
-        private void endTextBox5_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox5); }
-        private void endTextBox6_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox6); }
-        private void endTextBox7_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox7); }
-        private void endTextBox8_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox8); }
-        private void endTextBox9_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox9); }
-        private void endTextBox10_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox10); }
-        private void endTextBox11_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox11); }
-        private void endTextBox12_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox12); }
-        private void endTextBox13_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox13); }
-        private void endTextBox14_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox14); }
-        private void endTextBox15_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox15); }
-        private void endTextBox16_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox16); }
-        private void endTextBox17_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox17); }
-        private void endTextBox18_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox18); }
-        private void endTextBox19_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox19); }
-        private void endTextBox20_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox20); }
-        private void endTextBox21_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox21); }
-        private void endTextBox22_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox22); }
-        private void endTextBox23_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox23); }
-        private void endTextBox24_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox24); }
-
-		/// <summary>
-		/// Process a key press within any enabled text boxe
-		/// </summary>
-		/// <param name="sender"></param>
-		/// <param name="e"></param>
-		/// <param name="currentFocusOwner">TextBox control which received the event</param>
-		private void ProcKeyPress(object sender, KeyPressEventArgs e, TextBox currentFocusOwner)
-		{
-			if (e.KeyChar == '+')
-			{
-				/// Process '+' key ..... Form completed
-				okButton_Click(sender, e);
-			}
-
-            if (e.KeyChar == '\r')
-            {
-                /// Process <enter> key ..... Next text field
-                if (activeTextBoxes.Count < 2) return;		/// There is just one enabled textbox
-
-                for (int i = 0; i < activeTextBoxes.Count; i++)
-                {
-                    if (activeTextBoxes[i] == currentFocusOwner)
-                    {
-                        /// Change focus to the next enabled text box
-                        int newTBIdx = (i + 1) % activeTextBoxes.Count;
-                        activeTextBoxes[newTBIdx].Focus();
-                        largeTextBox.Text = string.Format("{0} {1}:   {2}", Strings.Water_Meter, activeWmNrs[newTBIdx] + 1, activeTextBoxes[newTBIdx].Text);
-                        largeExclamationLabel.Visible = false;
-                        return;
-                    }
-                }
-            }
-		}
-
-		private void startTextBox1_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox1); }
-		private void startTextBox2_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox2); }
-		private void startTextBox3_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox3); }
-		private void startTextBox4_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox4); }
-		private void startTextBox5_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox5); }
-		private void startTextBox6_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox6); }
-		private void startTextBox7_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox7); }
-		private void startTextBox8_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox8); }
-		private void startTextBox9_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox9); }
-		private void startTextBox10_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox10); }
-		private void startTextBox11_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox11); }
-		private void startTextBox12_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox12); }
-		private void startTextBox13_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox13); }
-		private void startTextBox14_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox14); }
-		private void startTextBox15_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox15); }
-		private void startTextBox16_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox16); }
-		private void startTextBox17_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox17); }
-		private void startTextBox18_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox18); }
-		private void startTextBox19_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox19); }
-		private void startTextBox20_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox20); }
-		private void startTextBox21_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox21); }
-		private void startTextBox22_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox22); }
-		private void startTextBox23_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox23); }
-		private void startTextBox24_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox24); }
-
-        private void endTextBox1_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox1); }
-        private void endTextBox2_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox2); }
-        private void endTextBox3_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox3); }
-        private void endTextBox4_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox4); }
-        private void endTextBox5_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox5); }
-        private void endTextBox6_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox6); }
-        private void endTextBox7_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox7); }
-        private void endTextBox8_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox8); }
-        private void endTextBox9_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox9); }
-		private void endTextBox10_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox10); }
-		private void endTextBox11_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox11); }
-		private void endTextBox12_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox12); }
-		private void endTextBox13_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox13); }
-		private void endTextBox14_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox14); }
-		private void endTextBox15_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox15); }
-		private void endTextBox16_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox16); }
-		private void endTextBox17_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox17); }
-		private void endTextBox18_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox18); }
-		private void endTextBox19_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox19); }
-		private void endTextBox20_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox20); }
-		private void endTextBox21_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox21); }
-		private void endTextBox22_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox22); }
-		private void endTextBox23_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox23); }
-		private void endTextBox24_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox24); }
-
-
-        private void ProcStartTextChanged(object sender, EventArgs e, TextBox startTBox)
-        {
-            for (int i = 0; i < startTextBoxes.Length; i++)
-            {
-                if (startTextBoxes[i] == startTBox)
-                {
-                    largeTextBox.Text = string.Format("{0} {1}:   {2}", Strings.Water_Meter, i + 1, startTextBoxes[i].Text);
-                    largeExclamationLabel.Visible = false;
-                    break;
-                }
-            }
-        }
-
-        private void startTextBox1_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox1); }
-        private void startTextBox2_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox2); }
-        private void startTextBox3_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox3); }
-        private void startTextBox4_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox4); }
-        private void startTextBox5_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox5); }
-        private void startTextBox6_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox6); }
-        private void startTextBox7_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox7); }
-        private void startTextBox8_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox8); }
-        private void startTextBox9_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox9); }
-        private void startTextBox10_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox10); }
-        private void startTextBox11_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox11); }
-        private void startTextBox12_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox12); }
-        private void startTextBox13_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox13); }
-        private void startTextBox14_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox14); }
-        private void startTextBox15_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox15); }
-        private void startTextBox16_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox16); }
-        private void startTextBox17_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox17); }
-        private void startTextBox18_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox18); }
-        private void startTextBox19_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox19); }
-        private void startTextBox20_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox20); }
-        private void startTextBox21_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox21); }
-        private void startTextBox22_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox22); }
-        private void startTextBox23_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox23); }
-        private void startTextBox24_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox24); }
-
-        private void startTextBox1_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox1); }
-        private void startTextBox2_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox2); }
-        private void startTextBox3_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox3); }
-        private void startTextBox4_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox4); }
-        private void startTextBox5_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox5); }
-        private void startTextBox6_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox6); }
-        private void startTextBox7_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox7); }
-        private void startTextBox8_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox8); }
-        private void startTextBox9_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox9); }
-        private void startTextBox10_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox10); }
-        private void startTextBox11_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox11); }
-        private void startTextBox12_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox12); }
-        private void startTextBox13_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox13); }
-        private void startTextBox14_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox14); }
-        private void startTextBox15_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox15); }
-        private void startTextBox16_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox16); }
-        private void startTextBox17_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox17); }
-        private void startTextBox18_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox18); }
-        private void startTextBox19_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox19); }
-        private void startTextBox20_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox20); }
-        private void startTextBox21_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox21); }
-        private void startTextBox22_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox22); }
-        private void startTextBox23_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox23); }
-        private void startTextBox24_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox24); }
-    }
-}

TBF/BenchControl/DataEntry/Fewa/TestStartEndForm.resx

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

TBF/BenchControl/DataEntry/HeatMeters12/EntryForm.cs

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

TBF/BenchControl/DataEntry/HeatMeters6/EntryForm.cs

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

TBF/BenchControl/DataEntry/Munich/EntryForm.cs

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

TBF/BenchControl/DataEntry/Munich3/EntryForm.cs

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

TBF/BenchControl/DataEntry/Single/EntryFormNoStartEnd.cs

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

TBF/BenchControl/DataEntry/Standard12/EntryFormNoStartEnd.cs

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

TBF/BenchControl/DataEntry/Standard24/EntryFormNoStartEnd.cs

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

TBF/BenchControl/DataEntry/Standard48/EntryFormNoStartEnd.cs

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

TBF/BenchControl/DataEntry/Standard6/EntryFormNoStartEnd.cs

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

TBF/BenchControl/DataEntry/StandardCamera/EntryForm.cs

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

TBF/BenchControl/DataEntry/WMStates/EntryForm.cs

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

TBF/BenchControl/DataEntry/iPerl/EntryForm.cs

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