ResetBatchNr console application added to solution.

.gitignore

@@ -2,8 +2,6 @@ Common/bin/
 Common/obj/
 Config/bin/
 Config/obj/
-DataMatrix4Net/bin/
-DataMatrix4Net/obj/
 DataStreamInterface/bin/
 DataStreamInterface/obj/
 Decrypt/bin/
@@ -16,42 +14,24 @@ Encrypt/bin/
 Encrypt/obj/
 EventViewer/bin/
 EventViewer/obj/
-FeatureVectorCalculator/bin/
-FeatureVectorCalculator/obj/
-GemCard/bin/
-GemCard/obj/
-GenCode128/bin/
-GenCode128/obj/
-GenericTest/bin/
-GenericTest/obj/
-GraphLib/bin/
-GraphLib/obj/
-LabelPrinting/bin/
-LabelPrinting/obj/
-MergeResultsDBs/bin/
-MergeResultsDBs/obj/
-OrderManagement/bin/
-OrderManagement/obj/
-ProductionTracing/bin/
-ProductionTracing/obj/
-RecordProcessing/bin/
-RecordProcessing/obj/
-ResetBatchNr/bin/
-ResetBatchNr/obj/
-RestClient/bin/
-RestClient/obj/
+Events/bin/
+Events/obj/
+GemCard/bin
+GemCard/obj
+GenCode128/bin
+GenCode128/obj
+GraphLib/bin
+GraphLib/obj
+TracingDB/bin
+TracingDB/obj
+ResetBatchNr/bin
+ResetBatchNr/obj
+RestClient/bin
+RestClient/obj
 Results/bin/
 Results/obj/
 ResultsBrowser/bin/
 ResultsBrowser/obj/
-ResultsParser/bin/
-ResultsParser/obj/
-S640TestApp/bin/
-S640TestApp/obj/
-SharedDatabase/bin
-SharedDatabase/obj
-SchematicDrawing/bin
-SchematicDrawing/obj
 Statistics/bin/
 Statistics/obj/
 TBF/bin/
@@ -60,23 +40,10 @@ ToFirstMonitor/bin/
 ToFirstMonitor/obj/
 ToSecondMonitor/bin/
 ToSecondMonitor/obj/
-UserManagement/bin/
-UserManagement/obj/
-WorkflowConfigurator/bin/
-WorkflowConfigurator/obj/
-Workplace/bin/
-Workplace/obj/
-DataStreamInterfaceTest/bin/
-DataStreamInterfaceTest/obj/
-DataStreamMeter/bin/
-DataStreamMeter/obj/
-Events/bin/
-Events/obj/
-TracingDB/bin/
-TracingDB/obj/
 Users/bin/
 Users/obj/
+UserManagement/bin/
+UserManagement/obj/
 .vs/
-.idea/
 *.suo
 *.bak

Common/BackgroundBeep.cs

@@ -1,37 +0,0 @@
-///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
-///
-using System;
-using System.Threading;
-
-namespace Common
-{
-    public class BackgroundBeep
-    {
-        static Thread beepThread;
-        static AutoResetEvent signalBeep;
-
-        static BackgroundBeep()
-        {
-            signalBeep = new AutoResetEvent(false);
-            beepThread = new Thread(() =>
-            {
-                while (true)
-                {
-                    signalBeep.WaitOne();       /// waits for an event
-                    Console.Beep(500, 400);     /// frequency (Hz), duration (ms)
-                }
-            }, 1);
-            beepThread.IsBackground = true;
-            beepThread.Start();
-        }
-
-        /// <summary>
-        /// Invokes one beep in a separate thread (non-blocking function)
-        /// </summary>
-        public static void Beep()
-        {
-            signalBeep.Set();
-        }
-    }
-}

Common/Common.csproj

@@ -17,7 +17,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;LANG_PL</DefineConstants>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -25,14 +25,11 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;LANG_PL</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -44,61 +41,25 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BackgroundBeep.cs" />
-    <Compile Include="DatabaseSettings.cs" />
-    <Compile Include="DBSettings.cs" />
-    <Compile Include="Enums.cs" />
-    <Compile Include="Forms\ListViewEx.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Forms\ListViewExtensions.cs" />
-    <Compile Include="Forms\LviDateTimeColumnComparer.cs" />
-    <Compile Include="Forms\LviIntColumnComparer.cs" />
-    <Compile Include="Forms\LviNameSurnameColumnComparer.cs" />
-    <Compile Include="Forms\LviTextColumnComparer.cs" />
-    <Compile Include="Forms\MessageEventArgs.cs" />
-    <Compile Include="Forms\ModelessForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\ModelessForm.designer.cs">
-      <DependentUpon>ModelessForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Formulas.cs" />
-    <Compile Include="CurrentUser.cs" />
-    <Compile Include="GlobalData.cs" />
-    <Compile Include="IMeasurementCorrection.cs" />
-    <Compile Include="IOrderInfo.cs" />
-    <Compile Include="IParamsProvider.cs" />
-    <Compile Include="Iperl\OptoTelegramRaw.cs" />
-    <Compile Include="IUncertainty.cs" />
-    <Compile Include="IUser.cs" />
-    <Compile Include="Printers\PrintersCommon.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="QuitAppException.cs" />
     <Compile Include="SerializableDictionary.cs" />
-    <Compile Include="StatisticalMetrics.cs" />
-    <Compile Include="Telegram.cs" />
     <Compile Include="UIControls\CoolButtonCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="UIControls\CoolButtonCtrl.Designer.cs">
       <DependentUpon>CoolButtonCtrl.cs</DependentUpon>
     </Compile>
+    <Compile Include="UIControls\LviDateTimeColumnComparer.cs" />
     <Compile Include="UIControls\RoundedRectangle.cs" />
-    <Compile Include="Units.cs" />
     <Compile Include="Utils.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UIControls\ListViewEx.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="UIControls\ListViewExtensions.cs" />
+    <Compile Include="UIControls\LviIntColumnComparer.cs" />
+    <Compile Include="UIControls\LviTextColumnComparer.cs" />
   </ItemGroup>
   <ItemGroup />
-  <ItemGroup>
-    <EmbeddedResource Include="Forms\ListViewEx.resx">
-      <DependentUpon>ListViewEx.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\ModelessForm.resx">
-      <DependentUpon>ModelessForm.cs</DependentUpon>
-    </EmbeddedResource>
-  </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.

Common/CurrentUser.cs

@@ -1,132 +0,0 @@
-///
-/// Copyright (c) 2021-2022 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-
-namespace Common
-{
-    class UserAndForm
-    {
-        public readonly IUser User;
-        public readonly Form Form;
-
-        public UserAndForm(IUser user, Form form)
-        {
-            User = user;
-            Form = form;
-        }
-    }
-
-    public static class CurrentUser
-    {
-        public const string AdminUsername = "admin";
-        public const string AdminPassword = "staratura";
-
-        public static int MinPasswdLength = 0;
-        public static int PasswdExpirationPeriodDays = 0; 
-
-        public static DBSettings RemoteUsersDB = null;
-		public static DBSettings LocalUsersDB = null;
-
-
-        static readonly Stack<UserAndForm> userStack = new Stack<UserAndForm>();
-
-        public static Common.AuthorizedAs AuthorizedAs;
-        public static DateTime LastAuthorization = DateTime.Now;
-
-
-        /// <summary>
-        /// Push a new user into the stack of users and form references.
-        /// Prevent double user stack entry for the same Windows form.
-        /// </summary>
-        /// <param name="newUser">New user</param>
-        /// <param name="currentForm">Reference to the current form</param>
-        public static void Change(IUser newUser, Form currentForm)
-        {
-            if (userStack.Count > 0 && userStack.Peek().Form == currentForm)
-            {
-                userStack.Pop();
-            }
-
-            userStack.Push(new UserAndForm(newUser, currentForm));
-        }
-
-        /// <summary>
-        /// Restore an original user from the stack of users - remove user at the top of the stack.
-        /// Prevent restoring when there is no entry for the form currently being closed.
-        /// </summary>
-        /// <param name="formBeingClosed">Reference to the form currently being closed</param>
-        /// <returns>true = current user was restored, false = no current user change</returns>
-        public static bool Restore(Form formBeingClosed)
-        {
-            if (userStack.Count > 0 && userStack.Peek().Form == formBeingClosed)
-            {
-                userStack.Pop();
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Return the user currenty at the top of the stack of users.
-        /// </summary>
-        public static IUser User()
-        {
-            return (userStack.Count > 0) ? userStack.Peek().User : null;    /// TODO: Return default user when stack is empty
-        }
-
-        public static IUser User2;
-        public static IUser User3;
-
-        /// <summary>
-        /// Return the current user name or an empty string
-        /// </summary>
-        public static string UserName()
-        {
-            if (User() == null || User().UserName == null)
-                return string.Empty;
-            else if (User2 == null || User2.UserName == null)
-                return User().UserName;
-            else if (User3 == null || User3.UserName == null)
-                return string.Format("{0},{1}", User().UserName, User2.UserName);
-            else
-                return string.Format("{0},{1},{2}", User().UserName, User2.UserName, User3.UserName);
-        }
-
-        public static string GetEncodedString(string legalizator)
-        {
-            if (User() == null || User().UserName == null) return string.Empty;
-            return string.Format("{0}~{1}~{2}",
-                                 User().UserName,
-                                 User().FullName == null ? string.Empty : User().FullName,
-                                 legalizator == null ? string.Empty : legalizator);
-        }
-                
-
-        /// <summary>
-        /// Return the current user number or 0
-        /// </summary>
-        public static int Number()
-        {
-            return (User() != null) ? User().Number : 0;
-        }
-
-        public static bool IsPowerUser()
-        {
-            return (User() != null) ? User().IsPowerUser() : false;
-        }
-
-        public static bool IsMemberOf(GID groupId)
-        {
-            return (User() != null) ? User().IsMemberOf(groupId) : false;
-        }
-
-        public static bool IsMemberOf(GID[] groupIds)
-        {
-            return (User() != null) ? User().IsMemberOf(groupIds) : (groupIds == null);
-        }
-    }
-}

Common/DBSettings.cs

@@ -1,31 +0,0 @@
-///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
-///
-using System;
-
-namespace Common
-{
-	/// <summary>
-	/// Database settings required to make a connection
-	/// </summary>
-	public class DBSettings : ICloneable
-	{
-		public DBType DbType;
-		public string ConnectionString;
-
-		public DBSettings()
-		{
-		}
-
-		public DBSettings(DBType dbType, string connectionString)
-		{
-			this.DbType = dbType;
-			this.ConnectionString = connectionString;
-		}
-
-		public object Clone()
-		{
-			return new DBSettings(DbType, ConnectionString);
-		}
-	}
-}

Common/DatabaseSettings.cs

@@ -1,121 +0,0 @@
-///
-/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
-///
-using System;
-using System.Text;
-using System.Xml.Serialization;
-
-namespace Common
-{
-    /// <summary>
-    /// Test bench database settings, contains bench name and settings od several databases
-    /// </summary>
-    public class DatabaseSettings : ICloneable, IComparable
-    {
-        // Public fields
-        public string BenchName;
-        public bool IsRealBench;
-        public DBSettings ProceduresDBSettings;	/// Configuration database settings
-        public DBSettings WaterMetersDBSettings;	/// Results database settings
-        public DBSettings EventsDBSettings;	    /// Events database settings
-        public DBSettings UsersDBSettings;		/// Shared configuration database settings
-
-        // Constructor
-        public DatabaseSettings()
-        {
-            BenchName = String.Empty;               /// Empty string (avoid null)
-            IsRealBench = false;
-			ProceduresDBSettings  = new DBSettings(DBType.MySql, string.Empty);
-			WaterMetersDBSettings = new DBSettings(DBType.MySql, string.Empty);
-            EventsDBSettings      = new DBSettings(DBType.MySql, string.Empty);
-			UsersDBSettings       = new DBSettings(DBType.MySql, string.Empty);
-        }
-
-        public object Clone()
-        {
-            DatabaseSettings result = new DatabaseSettings();
-
-            result.BenchName    = BenchName;
-            result.IsRealBench  = IsRealBench;
-            result.ProceduresDBSettings = (DBSettings)ProceduresDBSettings.Clone();
-            result.WaterMetersDBSettings = (DBSettings)WaterMetersDBSettings.Clone();
-            result.EventsDBSettings = (DBSettings)EventsDBSettings.Clone();
-            result.UsersDBSettings = (DBSettings)UsersDBSettings.Clone();
-
-            return result;
-        }
-
-        public int CompareTo(object dbs2)
-        {
-            if (!(dbs2 is DatabaseSettings)) return 0;
-            return String.Compare(BenchName, (dbs2 as DatabaseSettings).BenchName);
-        }
-
-
-        /// <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;
-        }
-
-
-		public override string ToString()
-		{
-            return string.Format("{0} config={1} results={2} events={3} users={4}",
-                                 BenchName,
-                                 ProceduresDBSettings.ConnectionString,
-                                 WaterMetersDBSettings.ConnectionString,
-                                 EventsDBSettings.ConnectionString,
-                                 UsersDBSettings.ConnectionString);
-		}
-    }
-}

Common/Enums.cs

@@ -1,871 +0,0 @@
-///
-/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace Common
-{
-    /// <summary>
-    /// Helper class to assign descriptions to enum values
-    /// </summary>
-    public class Description : Attribute
-    {
-        public string Text;
-        public Description(string t)
-        {
-            Text = t;
-        }
-    }
-
-    public static class GetDescription
-    {
-        /// Extension method for enum-s
-        public static string ToDescription(this Enum en)
-        {
-            Type type = en.GetType();
-            MemberInfo[] memInfo = type.GetMember(en.ToString());
-
-            if (memInfo != null && memInfo.Length > 0)
-            {
-                object[] attrs = memInfo[0].GetCustomAttributes(typeof(Description), false);
-                if (attrs != null && attrs.Length > 0)
-                    return ((Description)attrs[0]).Text;
-            }
-
-            return en.ToString();   /// Return ToString() value in case there is no description
-        }
-    }
-
-    /// <summary>
-    /// Identifies the type of a database
-    /// </summary>
-    public enum DBType
-    {
-        None,               /// Database disabled
-        MySql,              /// MySQL database
-        SQLite,             /// SQLite
-        Count
-    }
-
-    /// <summary> Identifies the database based on the content </summary>
-    public enum DBKind
-    {
-        Config,
-        Results,
-        RemoteConfig,
-        Count
-    }
-
-    public enum ProcedureSelection
-    {
-#if LANG_CS
-        [Description("Žádné")]                          None,
-        [Description("Lokální postupy")]                FromLocalDB,
-        [Description("Postupy ze sdílené databázy")]    FromSharedDB,
-        [Description("Zakázky z Oracle databázy")]      OrderNrFromOracleDB,
-        [Description("Zakázky ze sledovací databázy")]  OrderNrFromTracingDB,
-#else
-        [Description("None")]                           None,
-        [Description("Local procedures")]               FromLocalDB,
-        [Description("Shared procedures")]              FromSharedDB,
-        [Description("Orders from Oracle DB")]          OrderFromOracleDB,
-        [Description("Orders from Tracing DB")]         OrderFromTracingDB,
-#endif
-        Count
-    }
-
-    public enum LoginMethod
-    {
-        UserName,		/// = alias, abbreviation
-        FullName,		/// = description
-        Number,
-        Count
-    }
-
-    public enum AuthorizedAs
-    {
-        PowerUser,
-        LocalUser,
-        RemoteUser,
-        Count
-    }
-
-    /// <summary>
-    /// GID-s of user groups, each user is member of one or more groups.
-    /// </summary>
-    public enum GID
-    {
-        Testers,
-        TestingSpecialists,
-        HeadOfLab,
-        MaintenanceSpecialists,
-        Metrologists,
-        CalibrationSpecialists,
-        Administrators,             /// application / network / database administrator
-        TraceabilityManagement,
-        MetrologicalAuthority,
-        WaterMeterAuthority,
-        NrOfGroups,                 /// Number of groups (this is not a GroupID)
-        None,
-    }
-
-    public enum MySortOrder
-    {
-        None,
-        Ascending,      /// The same like SortOrder.Ascending
-        Descending,     /// The same like SortOrder.Descending
-        Ascending2,     /// Sorts by a surname in ascending order in case or 'Name Surname' column
-        Descending2,    /// Sorts by a surname in descending order in case or 'Name Surname' column
-    }
-
-    /// <summary>
-    /// Flags returned by each device configuration control Verify(...) function.
-    /// </summary>
-    public enum CfgUpdateFlags
-    {
-        None = 0,
-        Error = 0x1,			/// Some settings in the user control are invalid and cannot be set
-        Warning = 0x02,			/// Some settings in the user control are suspicious, can be set after user confirmation
-        RestartRqrd = 0x04,		/// TBF program restart is required to apply all changed parameters
-        AnyChange = 0x08,		/// At least one parameter have changed
-        VolatileChange = 0x10,
-        InvokeCfgChange = 0x20,	/// Invoke CfgChange handler of the component 
-    }
-
-    /// <summary>
-    /// Event severity
-    /// </summary>
-    public enum Severity
-    {
-        Undefined,
-        Notification,
-        Warning,
-        Error,
-        FatalError,
-        Count
-    }
-
-    public enum EventClass
-    {
-        Undefined,
-        EquipmentHW,
-        Metrology,
-        TestingProcess,
-        BadResults,
-        ComputerResources,
-        Network,
-        Other,
-        Count
-    }
-
-    public enum SubscriberGroup : long
-    {
-        None = 0,
-        Metrology = 1,
-        Maintenance = 2,
-        Production = 4,
-        Management = 8,
-        Finish = 16,
-    }
-
-    public enum EViewerOption
-    {
-        Undefined,
-        AllEvents,
-        RecentEvents,
-        UnreadEvents,
-    }
-
-    public enum ProcedureState
-	{
-		Active,
-		History,
-		Count,
-	}
-
-    public enum FlowNames
-    {
-        QnQtQmin = 0,
-        Q3Q2Q1 = 1,
-        QpQi = 2,
-        Count,
-    }
-
-    public enum ProfileType
-    {
-        Q3R,
-        QnClassColdWater,
-        QnClassHotWater,
-        QpQi,
-        CompoundQ3RQ3R,
-        CompoundQnClassQnClass,
-        CompoundQ3RQnClass,
-        CompoundQnClassQ3R,
-        CompoundQpQiQpQi,
-        Manual,
-        Count,
-    }
-
-    public enum FlowId
-    {
-        Any,
-        Q4,
-        Q3,
-        Q2,
-        Q1,
-        Q4Main,
-        Q3Main,
-        Q2Main,
-        Q1Main,
-        Q4Aux,
-        Q3Aux,
-        Q2Aux,
-        Q1Aux,
-        Qmax,
-        Qn,
-        Qt,
-        Qmin,
-        QmaxMain,
-        QnMain,
-        QtMain,
-        QminMain,
-        QmaxAux,
-        QnAux,
-        QtAux,
-        QminAux,
-        Qp,
-        Qp10,
-        Qi,
-        QpMain,
-        Qp10Main,
-        QiMain,
-        QpAux,
-        Qp10Aux,
-        QiAux,
-        Qdetected,
-        Qfall,
-        Qrise,
-    }
-
-    public enum ErrorLimitType
-    {
-        Manual,
-        QpClass,
-        Count,
-    }
-
-	/// <summary> Kind of meters for the procedure / test </summary>
-	public enum MetersKind
-	{
-#if LANG_DE
-		[Description("Wasserzähler")]			Single,
-		[Description("Verbundwasserzähler")]	Combined,
-		[Description("Wärmezähler")]			HeatMeter,
-#elif LANG_FR
-        [Description("Compteurs eau")]          Single,
-        [Description("Mètres composés")]        Combined,
-        [Description("Thermomètres")]           HeatMeter,
-#elif LANG_CS
-		[Description("Vodoměry")]				Single,
-		[Description("Kombinované vodoměry")]	Combined,
-		[Description("Měřiče tepla")]			HeatMeter,
-#elif LANG_RU
-        [Description("Счетчик")]                 Single,
-        [Description("Комбинированный счетчик")] Combined,
-        [Description("Счетчик тепла")]           HeatMeter,
-#else
-        [Description("Water meters")]			Single,
-		[Description("Compound water meters")]	Combined,
-		[Description("Heat meters")]			HeatMeter,
-#endif
-	}
-
-	public enum CompoundMeterId : byte
-	{
-		Single,
-		CompoundMain,
-		CompoundAux,
-		Compound,
-		HeatMeterVolume,
-		HeatMeterEnergy,
-		SingleOrCompound,		/// Only used when querying results
-	}
-
-	public enum Medium
-	{
-        [Description("")]       NotSpecified,
-#if LANG_PL
-        [Description("zimna")]  ColdWater,
-        [Description("ciepła")] HotWater,
-#elif LANG_IT
-        [Description("freddo")] ColdWater,
-        [Description("caldo")]  HotWater,
-#elif LANG_FR
-        [Description("eau froide")] ColdWater,
-        [Description("eau chaude")] HotWater,
-#else
-		[Description("cold")]   ColdWater,
-		[Description("hot")]    HotWater,
-#endif
-        Count
-    }
-
-    public enum Mounting
-    {
-        [Description("")]       NotSpecified,
-#if LANG_DE
-        [Description("H")]      H,         /// horizontal
-        [Description("V")]      V,         /// vertical
-        [Description("STR")]    S,         /// standrohre
-        [Description("F")]      F,         /// fall
-        [Description("H/V")]    HV,        /// horizontal / vertical
-#else
-        [Description("H")]      H,         /// horizontal
-        [Description("V")]      V,         /// vertical
-        [Description("S")]      S,         /// steig
-        [Description("F")]      F,         /// fall
-        [Description("H/V")]    HV,        /// horizontal / vertical
-#endif
-		Count
-    }
-
-    public enum TemperatureClass
-    {
-        [Description("")]        NotSpecified,
-        [Description("T30")]     T30,
-        [Description("T50")]     T50,
-        [Description("T70")]     T70,
-        [Description("T90")]     T90,
-        [Description("T130")]    T130,
-        [Description("T180")]    T180,
-        [Description("T30/70")]  T30_70,
-        [Description("T30/90")]  T30_90,
-        [Description("T30/130")] T30_130,
-        [Description("T30/180")] T30_180,
-        [Description("30")]      t30,
-        [Description("50")]      t50,
-        [Description("70")]      t70,
-        [Description("90")]      t90,
-        [Description("130")]     t130,
-        [Description("180")]     t180,
-        Count
-    }
-
-    public enum FlowProfileSensitivityClass
-    {
-        [Description("")]   NotSpecified,
-        [Description("U0")] U0,              /// ?
-        [Description("D0")] D0,              /// ?
-        Count
-    }
-
-    public enum PressureLossClass
-    {
-        [Description("")]     NotSpecified,
-        [Description("dp63")] dp63,           /// 0.063 MPa = 0.63 bar, TODO: Change to "Δp63"
-        [Description("dp40")] dp40,           /// 0.040 MPa = 0.40 bar
-        [Description("dp25")] dp25,           /// 0.025 MPa = 0.25 bar
-        [Description("dp16")] dp16,           /// 0.016 MPa = 0.16 bar
-        [Description("dp10")] dp10,           /// 0.010 MPa = 0.10 bar
-        Count
-    }
-
-    /// <summary> Maximum Admissible Pressure </summary>
-    public enum MaxAdmissiblePressure
-    {
-        [Description("")]      NotSpecified,
-        [Description("MAP6")]  MAP6,
-        [Description("MAP10")] MAP10,
-        [Description("MAP16")] MAP16,
-        [Description("MAP25")] MAP25,
-        [Description("MAP40")] MAP40,
-        Count
-    }
-
-    /// <summary> Register reader type </summary>
-    public enum RegisterReaderType
-    {
-        Unknown,
-        Pulses,         /// Sick, optical and similar
-        Camera,         /// CLP1611
-        DataStream,     /// iPerl
-        Manual,         /// Entered by human via form (also from camera images)
-        Count
-    }
-
-	/// <summary> Transition step is finished when this condition is fulfilled </summary>
-	public enum StepCondition
-	{
-		None,
-		Scale1Empty,
-		Scale2Empty,
-		Scale3Empty,
-		AllScalesEmpty,
-		Count
-	}
-
-    /// <summary>
-    /// State of water filled in the test bench.
-    /// </summary>
-    public enum FillState
-    {
-        Unknown,            /// Test bench fill state is unknown
-        Empty,              /// Test bench is empty, no water
-        Full,               /// Test bench is full of water
-        Count
-    }
-
-    public enum MeretProtocol
-    {
-        [Description("<undefined>")]        Undefined,
-        [Description("Meret (obsolete)")]   Meret,
-        [Description("Modbus")]             Modbus,
-        Count
-    }
-
-	public enum Publish : sbyte
-	{
-#if LANG_DE
-        /// german
-        [Description("nie")]          Never = 0,
-        [Description("immer")]        Always = 1,
-        [Description("Bildschirm")]   OnScreen = 2,
-        [Description("intern")]       Internal = 3,
-#elif LANG_FR
-        [Description("jamais")]       Never = 0,
-        [Description("toujours")]     Always = 1,
-        [Description("À l'écran")]    OnScreen = 2,
-        [Description("interne")]      Internal = 3,
-#elif LANG_CS
-        /// czech
-        [Description("nikdy")]        Never = 0,
-        [Description("vždy")]         Always = 1,
-        [Description("na obrazovku")] OnScreen = 2,
-        [Description("interně")]      Internal = 3,
-#elif LANG_SK
-        /// slovak
-        [Description("nikdy")]        Never = 0,
-        [Description("vždy")]         Always = 1,
-        [Description("na obrazovku")] OnScreen = 2,
-        [Description("interne")]      Internal = 3,
-#elif LANG_PL
-        /// polish
-        [Description("nigdy")]        Never = 0,
-        [Description("zawsze")]       Always = 1,
-        [Description("na ekranie")]   OnScreen = 2,
-        [Description("wewnętrznie")]  Internal = 3,
-#elif LANG_RU
-        /// russian
-        [Description("никогда")]      Never = 0,
-        [Description("всегда")]       Always = 1,
-        [Description("толька экран")] OnScreen = 2,
-        [Description("внутренно")]    Internal = 3,
-#else
-		/// english
-		[Description("Never")]        Never = 0,
-        [Description("Always")]       Always = 1,
-        [Description("On screen")]    OnScreen = 2,
-        [Description("Internal")]     Internal = 3,
-#endif
-        Count
-	}
-
-	public enum MassMethod : byte
-	{
-#if LANG_DE
-        /// nemecky
-		[Description("Waage")]			Scale,
-		[Description("Spanne")]			Spread,
-		[Description("Standardabw.")]	StdDev,
-#elif LANG_FR
-        [Description("Balance")]        Scale,
-        [Description("Envergure")]      Spread,
-        [Description("Déviation std.")] StdDev,
-#elif LANG_CS
-        /// cesky
-		[Description("váhou")]			Scale,
-		[Description("max.rozdíl")]		Spread,
-		[Description("std.dev.")]		StdDev,
-#else
-		[Description("Scale")]			Scale,
-		[Description("Spread")]			Spread,
-		[Description("Std.dev.")]		StdDev,
-#endif
-        Count
-	}
-
-    /// <summary>
-    /// Three state test results and/or water meter result (Algeria PT25 requirement).
-    /// NearlyOK means error is within error limits not narrowed by uncertainty
-    ///   OK:                   Uncertainty + ErrLimLo <= error <= ErrLimHi - Uncertainty
-    ///   NearlyOK:  not OK but stil          ErrLimLo <= error <= ErrLimHi
-    ///   Nok:       otherwise
-    /// </summary>
-    public enum ThreeState
-    {
-#if LANG_FR
-        [Description("NC")]         Nok,        /// Totally failed: not OK and not NearlyOK
-        [Description("2e/Ff")]      NearlyOK,   /// Nearly OK, not OK but not totally failed 
-        [Description("***")]        OK,         /// OK
-#else
-        [Description("NOK")]        Nok,        /// Totally failed: not OK and not NearlyOK
-        [Description("Nearly OK")]  NearlyOK,   /// Nearly OK, not OK but not totally failed 
-        [Description("OK")]         OK,         /// OK
-#endif
-        Count
-    }
-
-    public enum TestProfile
-    {
-        UserDefined,
-        UserDefinedCompound,
-        UserDefinedHeatMeter,
-        Protected,                  /// The first protected one
-        ProtectedCompound,
-        ProtectedHeatMeter,
-    }
-
-	public enum Progress
-	{
-		JustStarted,
-        TransitionBefore,
-		SwitchingFlowDetection,
-		FlowSetting,
-        Aborted,                /// Use as an argument when a test was aborted
-        Test,
-		TransitionAfter,
-		Completed,
-		Count,
-	}
-
-	public enum Device
-	{
-		Screen,
-		Printer,
-		Disk,
-	}
-
-	public enum PageOrientation
-	{
-		Portrait,
-		Landscape,
-		Count,
-	}
-
-	public enum ItemCategory
-	{
-#if LANG_DE
-		[Description("Allgemein")]				Other,
-		[Description("Prüfstanddaten")]			BenchData,
-		[Description("Prüfstandergebnisse")]	BenchResult,
-		[Description("Prüfpunktdaten")]			TestData,
-		[Description("Prüfpunktergebnisse")]	TestResult,
-		[Description("Wasserzelledaten")]		MeterData,
-		[Description("Wasserzelleergebnisse")]	MeterResult,
-#elif LANG_FR
-        [Description("Autres")]                         Other,
-        [Description("Données de banc")]                BenchData,
-        [Description("Résultats du banc")]              BenchResult,
-        [Description("Données de test")]                TestData,
-        [Description("Résultats de test")]              TestResult,
-        [Description("Données du compteur d'eau")]      MeterData,
-        [Description("Résultats du compteur d'eau")]    MeterResult,
-#else
-		[Description("Other")]			Other,
-		[Description("Bench data")]		BenchData,
-		[Description("Bench result")]	BenchResult,
-		[Description("Test data")]		TestData,
-		[Description("Test result")]	TestResult,
-		[Description("Meter data")]		MeterData,
-		[Description("Meter result")]	MeterResult,
-#endif
-        Count,
-	}
-
-	/// <summary> Possible modes of operation of components and devices. </summary>
-	public enum DebugMode
-	{
-#if LANG_DE
-		[Description("Erkennen-aus")]	DetectedOff = -2,
-        [Description("Erkennen-ein")]	DetectedOn = -1,
-        [Description("Normal")]         Normal = 0,				/// Normal operation
-        [Description("Auto-erkennen")]  AutoDetect,				/// The component (device) will be auto-detected
-        [Description("Fehler")]         FailureDuringOperation,	/// Failure during operation -> disabled 
-        [Description("Aus")]            Off,					/// The component is off
-        [Description("Aufzeichnen")]    Record,
-        [Description("Abspielen")]      Replay,
-        [Description("Simuliert")]      Simulate,				/// Test bench simulation, this mode does not require any hardware
-        [Description("Geerbt")]         Inherit,
-#elif LANG_FR
-        [Description("Détection automatique: Éteindre")]    DetectedOff = -2,
-        [Description("Détection automatique: Allumé")]      DetectedOn = -1,
-        [Description("Ordinaire")]                          Normal = 0,
-        [Description("Détection automatique")]              AutoDetect,
-        [Description("Erreur d'exécution")]                 FailureDuringOperation,
-        [Description("Éteindre")]                           Off,
-        [Description("Record")]                             Record,
-        [Description("Répondre")]                           Replay,
-        [Description("Simuler")]                            Simulate,
-        [Description("Hériter")]                            Inherit,
-#else
-        [Description("Detected off")]   DetectedOff = -2,
-        [Description("Detected on")]    DetectedOn = -1,
-        [Description("Normal")]         Normal = 0,				/// Normal operation
-        [Description("Auto detect")]    AutoDetect,				/// The component (device) will be auto-detected
-        [Description("Run-time error")] FailureDuringOperation,	/// Failure during operation -> disabled 
-        [Description("Off")]            Off,					/// The component is off
-        [Description("Record")]         Record,
-        [Description("Replay")]         Replay,
-        [Description("Simulate")]       Simulate,				/// Test bench simulation, this mode does not require any hardware
-        [Description("Inherit")]        Inherit,
-#endif
-        Count,
-    }
-
-    public enum LogLevel
-	{
-#if LANG_DE
-		[Description("Aus")]			Off,
-		[Description("Schwerwiegend")]	Fatal,
-        [Description("Fehler")]			Error,
-		[Description("Warnung")]		Warn,
-        [Description("Info")]			Info,
-        [Description("Debug")]			Debug,
-        [Description("Alles")]			All,
-#else
-        [Description("Off")]    Off,
-        [Description("Fatal")]  Fatal,
-        [Description("Error")]  Error,
-        [Description("Warn")]   Warn,
-        [Description("Info")]   Info,
-        [Description("Debug")]  Debug,
-        [Description("All")]    All,
-#endif
-        Count,
-    }
-
-
-	/// <summary> Arrangement of tests </summary>
-	public enum TestsArrangement
-	{
-		Rows,
-		Columns,
-	}
-
-	/// <summary> Arrangement of meters </summary>
-	public enum MetersArrangement
-	{
-		Vertically,
-		Horizontally,
-	}
-
-    public enum Alignment
-	{
-#if LANG_DE
-		[Description("links")]      Left,
-        [Description("zentriert")]  Center,
-        [Description("rechts")]     Right,
-        [Description("angepasst")]  Justified,
-#elif LANG_FR
-        [Description("gauche")]     Left,
-        [Description("centré")]     Center,
-        [Description("droit")]      Right,
-        [Description("justifié")]   Justified,
-#else
-        [Description("Left")]       Left,
-        [Description("Center")]     Center,
-        [Description("Right")]      Right,
-        [Description("Justified")]  Justified,
-#endif
-        Count
-    }
-
-    public enum VertAlignment
-    {
-        [Description("Top")]        Top,
-        [Description("Middle")]     Middle,
-        [Description("Bottom")]     Bottom,
-    }
-
-    public enum TableForm
-    {
-        None,
-        Rows,
-        Columns,
-        ColumnsPL,
-        Count,
-    }
-
-    public enum DivResolution : int
-    {
-        [Description("1 ms (0.25 s)")]  _1ms = 0,
-        [Description("2 ms (0.5 s)")]   _2ms = 1,
-        [Description("4 ms (1 s)")]     _4ms = 2,
-        [Description("8 ms (2 s)")]     _8ms = 3,
-        Count,
-    }
-
-    public enum ImageRotation
-	{
-		[Description("0 deg")]		None,
-		[Description("90 deg")]		Deg90,
-		[Description("180 deg")]	Deg180,
-		[Description("270 deg")]	Deg270,
-		Count
-	}
-
-    public enum CameraDisplayResolution
-    {
-        Small,
-        Medium,
-        Large,
-        // FullScreen,
-        Count,
-    }
-
-	public enum ErrorFlagsMode : sbyte
-	{
-#if LANG_DE
-		[Description("aus")]		Off,
-		[Description("info")]		Info,
-		[Description("ein")]		On,
-		[Description("stopp")]		Stop,
-#elif LANG_FR
-        [Description("éteindre")]   Off,
-        [Description("info")]       Info,
-        [Description("allumé")]     On,
-        [Description("arrêter")]    Stop,
-#elif LANG_CS
-		[Description("vypnuto")]	Off,
-		[Description("info")]		Info,
-		[Description("zapnuto")]	On,
-		[Description("stop")]	    Stop,
-#elif LANG_RU
-        [Description("выкл")]       Off,
-        [Description("инфо")]       Info,
-        [Description("вкл")]        On,
-        [Description("останов")]    Stop,
-#elif LANG_PL
-		[Description("nie")]		Off,
-		[Description("info")]		Info,
-		[Description("tak")]		On,
-		[Description("przestać")]	Stop,
-#else // LANG_EN
-        [Description("off")]		Off,
-		[Description("info")]		Info,
-		[Description("on")]			On,
-        [Description("stop")]       Stop,
-#endif
-        Count
-	}
-
-
-    public enum ErrorFlagMask : long
-    {
-        E1  = (1L << 0),    /// shift = 0, E1 = 1L
-        E2  = (1L << 1),
-        E3  = (1L << 2),
-        E4  = (1L << 3),
-        E5  = (1L << 4),
-        E6  = (1L << 5),
-        E7  = (1L << 6),
-        E8  = (1L << 7),
-        E9  = (1L << 8),
-        E10 = (1L << 9),
-        E11 = (1L << 10),
-        E12 = (1L << 11),
-        E13 = (1L << 12),
-        E14 = (1L << 13),
-        E15 = (1L << 14),
-        E16 = (1L << 15),
-        E17 = (1L << 16),
-        E18 = (1L << 17),
-        E19 = (1L << 18),
-        E20 = (1L << 19),
-        E21 = (1L << 20),
-        E22 = (1L << 21),
-        E23 = (1L << 22),
-        E24 = (1L << 23),
-        E25 = (1L << 24),
-        E26 = (1L << 25),       /// iPERL: Invalid Q2 correction factors, mismatch between factors in the water meter and in DB
-        E27 = (1L << 26),       /// iPERL: Wrong counting direction
-        E28 = (1L << 27),       /// iPERL: Missing workflow step (assembly or test)
-        E29 = (1L << 28),
-        E30 = (1L << 29),
-        E31 = (1L << 30),
-        E32 = (1L << 31),
-        E33 = (1L << 32),
-        E34 = (1L << 33),
-        E35 = (1L << 34),
-        E36 = (1L << 35),
-        E37 = (1L << 36),
-        E38 = (1L << 37),
-        E39 = (1L << 38),
-        E40 = (1L << 39),
-        E41 = (1L << 40),
-        E42 = (1L << 41),
-        E43 = (1L << 42),
-        E44 = (1L << 43),
-        E45 = (1L << 44),
-        E46 = (1L << 45),
-        E47 = (1L << 46),
-        E48 = (1L << 47),
-        E49 = (1L << 48),
-        E50 = (1L << 49),
-        E51 = (1L << 50),
-        E52 = (1L << 51),
-        E53 = (1L << 52),
-        E54 = (1L << 53),
-        E55 = (1L << 54),
-        E56 = (1L << 55),
-        E57 = (1L << 56),
-        E58 = (1L << 57),
-        E59 = (1L << 58),
-        E60 = (1L << 59),
-        E61 = (1L << 60),
-        E62 = (1L << 61),
-        E63 = (1L << 62),
-    }
-
-    #region iPERL enums
-
-    public enum Side
-    {
-#if LANG_CS
-        [Description("Levá")]   Left,
-        [Description("Pravá")]  Right,
-#else
-        [Description("Left")]   Left,
-        [Description("Right")]  Right,
-#endif
-        Count
-    }
-
-    public enum FlowDir
-    {
-        R_L,
-        L_R,
-        Count
-    }
-
-    public enum Counting
-    {
-        Arbitrary,
-        Positive,
-        Negative,
-        Count
-    }
-
-    public enum OptoHeadState
-    {
-        Disabled,
-        OptoAndDirOK,
-        OptoNok,
-        DirNok,
-        Count
-    }
-
-    #endregion iPERL enums
-}

Common/Forms/ListViewEx.cs

@@ -1,495 +0,0 @@
-///
-/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Windows.Forms;
-using System.Runtime.InteropServices;
-
-namespace Common.Forms
-{
-	/// <summary>
-	/// Event Handler for SubItem events
-	/// </summary>
-	public delegate void SubItemEventHandler(object sender, SubItemEventArgs e);
-	/// <summary>
-	/// Event Handler for SubItemEndEditing events
-	/// </summary>
-	public delegate void SubItemEndEditingEventHandler(object sender, SubItemEndEditingEventArgs e);
-
-
-	///	<summary>
-	///	Inherited ListView to allow in-place editing of subitems
-	///	</summary>
-	public class ListViewEx	: System.Windows.Forms.ListView
-	{
-		#region Interop structs, imports and constants
-		/// <summary>
-		/// MessageHeader for WM_NOTIFY
-		/// </summary>
-		private struct NMHDR 
-		{ 
-#pragma warning disable
-			public IntPtr hwndFrom; 
-			public Int32  idFrom; 
-			public Int32  code;
-#pragma warning restore
-        }
-
-
-		[DllImport("user32.dll")]
-		private	static extern IntPtr SendMessage(IntPtr hWnd, int msg,	IntPtr wPar, IntPtr	lPar);
-		[DllImport("user32.dll", CharSet=CharSet.Ansi)]
-		private	static extern IntPtr SendMessage(IntPtr	hWnd, int msg, int len,	ref	int	[] order);
-
-		// ListView messages
-		private const int LVM_FIRST					= 0x1000;
-		private const int LVM_GETCOLUMNORDERARRAY	= (LVM_FIRST + 59);
-
-		// Windows Messages that will abort editing
-		private	const int WM_HSCROLL = 0x114;
-		private	const int WM_VSCROLL = 0x115;
-		private const int WM_SIZE	 = 0x05;
-		private const int WM_NOTIFY	 = 0x4E;
-
-		private const int HDN_FIRST = -300;
-		private const int HDN_BEGINDRAG = (HDN_FIRST-10);
-		private const int HDN_ITEMCHANGINGA = (HDN_FIRST-0);
-		private const int HDN_ITEMCHANGINGW = (HDN_FIRST-20);
-		#endregion
-
-        public MySortOrder SortOrder = MySortOrder.None;
-        public int SortColumn = -1;
-
-		///	<summary>
-		///	Required designer variable.
-		///	</summary>
-		private	System.ComponentModel.Container	components = null;
-
-		public event SubItemEventHandler SubItemClicked;
-        public event SubItemEventHandler SubItemRightClicked;
-        public event SubItemEventHandler SubItemBeginEditing;
-		public event SubItemEndEditingEventHandler SubItemEndEditing;
-
-		public ListViewEx()
-		{
-			// This	call is	required by	the	Windows.Forms Form Designer.
-			InitializeComponent();
-
-			base.FullRowSelect = true;
-			base.View = View.Details;
-			base.AllowColumnReorder = true;
-		}
-
-		///	<summary>
-		///	Clean up any resources being used.
-		///	</summary>
-		protected override void	Dispose( bool disposing	)
-		{
-			if(	disposing )
-			{
-				if(	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()
-		{
-			components = new System.ComponentModel.Container();
-		}
-	  #endregion
-
-		private bool _doubleClickActivation = false;
-		/// <summary>
-		/// Is a double click required to start editing a cell?
-		/// </summary>
-		public bool DoubleClickActivation
-		{
-			get {  return _doubleClickActivation; }
-			set { _doubleClickActivation = value; }    
-		}
-
-
-		/// <summary>
-		/// Retrieve the order in which columns appear
-		/// </summary>
-		/// <returns>Current display order of column indices</returns>
-		public int[] GetColumnOrder()
-		{
-			IntPtr lPar	= Marshal.AllocHGlobal(Marshal.SizeOf(typeof(int)) * Columns.Count);
-
-			IntPtr res = SendMessage(Handle, LVM_GETCOLUMNORDERARRAY, new IntPtr(Columns.Count), lPar);
-			if (res.ToInt32() == 0)	// Something went wrong
-			{
-				Marshal.FreeHGlobal(lPar);
-				return null;
-			}
-
-			int	[] order = new int[Columns.Count];
-			Marshal.Copy(lPar, order, 0, Columns.Count);
-
-			Marshal.FreeHGlobal(lPar);
-
-			return order;
-		}
-
-
-		/// <summary>
-		/// Find ListViewItem and SubItem Index at position (x,y)
-		/// </summary>
-		/// <param name="x">relative to ListView</param>
-		/// <param name="y">relative to ListView</param>
-		/// <param name="item">Item at position (x,y)</param>
-		/// <returns>SubItem index</returns>
-		public int GetSubItemAt(int x, int y, out ListViewItem item)
-		{
-			item = this.GetItemAt(x, y);
-		
-			if (item !=	null)
-			{
-				int[] order = GetColumnOrder();
-				Rectangle lviBounds;
-				int	subItemX;
-
-				lviBounds =	item.GetBounds(ItemBoundsPortion.Entire);
-				subItemX = lviBounds.Left;
-				for (int i=0; i<order.Length; i++)
-				{
-					ColumnHeader h = this.Columns[order[i]];
-					if (x <	subItemX+h.Width)
-					{
-						return h.Index;
-					}
-					subItemX += h.Width;
-				}
-			}
-			
-			return -1;
-		}
-
-
-		/// <summary>
-		/// Get bounds for a SubItem
-		/// </summary>
-		/// <param name="Item">Target ListViewItem</param>
-		/// <param name="SubItem">Target SubItem index</param>
-		/// <returns>Bounds of SubItem (relative to ListView)</returns>
-		public Rectangle GetSubItemBounds(ListViewItem Item, int SubItem)
-		{
-			int[] order = GetColumnOrder();
-
-			Rectangle subItemRect = Rectangle.Empty;
-			if (SubItem >= order.Length)
-				throw new IndexOutOfRangeException("SubItem "+SubItem+" out of range");
-
-			if (Item == null)
-				throw new ArgumentNullException("Item");
-			
-			Rectangle lviBounds = Item.GetBounds(ItemBoundsPortion.Entire);
-			int	subItemX = lviBounds.Left;
-
-			ColumnHeader col;
-			int i;
-			for (i=0; i<order.Length; i++)
-			{
-				col = this.Columns[order[i]];
-				if (col.Index == SubItem)
-					break;
-				subItemX += col.Width;
-			} 
-			subItemRect	= new Rectangle(subItemX, lviBounds.Top, this.Columns[order[i]].Width, lviBounds.Height);
-			return subItemRect;
-		}
-
-
-		protected override void	WndProc(ref	Message	msg)
-		{
-			switch (msg.Msg)
-			{
-				// Look	for	WM_VSCROLL,WM_HSCROLL or WM_SIZE messages.
-				case WM_VSCROLL:
-				case WM_HSCROLL:
-				case WM_SIZE:
-					EndEditing(false);
-					break;
-				case WM_NOTIFY:
-					// Look for WM_NOTIFY of events that might also change the
-					// editor's position/size: Column reordering or resizing
-					NMHDR h = (NMHDR)Marshal.PtrToStructure(msg.LParam, typeof(NMHDR));
-					if (h.code == HDN_BEGINDRAG ||
-						h.code == HDN_ITEMCHANGINGA ||
-						h.code == HDN_ITEMCHANGINGW)
-						EndEditing(false);
-					break;
-			}
-
-			base.WndProc(ref msg);
-		}
-
-
-		#region Initialize editing depending of DoubleClickActivation property
-		protected override void OnMouseUp(System.Windows.Forms.MouseEventArgs e)
-		{
-			base.OnMouseUp(e);
-
-            MouseEventArgs me = (MouseEventArgs)e;
-            if (me.Button == MouseButtons.Right)
-            {
-                /// Right mouse button click function
-                RightClickFunctionSubitemAt(new Point(e.X, e.Y));
-            }
-            else
-            {
-                /// Normal function (=edit item)
-                if (DoubleClickActivation)
-                {
-                    return;
-                }
-
-                EditSubitemAt(new Point(e.X, e.Y));
-            }
-		}
-		
-		protected override void OnDoubleClick(EventArgs e)
-		{
-			base.OnDoubleClick (e);
-
-			if (!DoubleClickActivation)
-			{
-				return;
-			} 
-
-			Point pt = this.PointToClient(Cursor.Position);
-		
-			EditSubitemAt(pt);
-		}
-
-		///<summary>
-		/// Fire SubItemClicked
-		///</summary>
-		///<param name="p">Point of click/doubleclick</param>
-		private void EditSubitemAt(Point p)
-		{
-			ListViewItem item;
-			int idx = GetSubItemAt(p.X, p.Y, out item);
-			if (idx >= 0)
-			{
-				OnSubItemClicked(new SubItemEventArgs(item, idx));
-			}
-		}
-
-        ///<summary>
-        /// Fire SubItemRightClicked
-        ///</summary>
-        ///<param name="p">Point of click/doubleclick</param>
-        private void RightClickFunctionSubitemAt(Point p)
-        {
-            ListViewItem item;
-            int idx = GetSubItemAt(p.X, p.Y, out item);
-            if (idx >= 0)
-            {
-                OnSubItemRightClicked(new SubItemEventArgs(item, idx));
-            }
-        }
-
-		#endregion
-
-		#region In-place editing functions
-		// The control performing the actual editing
-		private Control _editingControl;
-		// The LVI being edited
-		private ListViewItem _editItem;
-		// The SubItem being edited
-		private int _editSubItem;
-
-		protected void OnSubItemBeginEditing(SubItemEventArgs e)
-		{
-			if (SubItemBeginEditing != null) SubItemBeginEditing(this, e);
-		}
-
-		protected void OnSubItemEndEditing(SubItemEndEditingEventArgs e)
-		{
-			if (SubItemEndEditing != null) SubItemEndEditing(this, e);
-		}
-
-		protected void OnSubItemClicked(SubItemEventArgs e)
-		{
-			if (SubItemClicked != null) SubItemClicked(this, e);
-		}
-
-        protected void OnSubItemRightClicked(SubItemEventArgs e)
-        {
-            if (SubItemRightClicked != null) SubItemRightClicked(this, e);
-        }
-
-
-		/// <summary>
-		/// Begin in-place editing of given cell
-		/// </summary>
-		/// <param name="c">Control used as cell editor</param>
-		/// <param name="Item">ListViewItem to edit</param>
-		/// <param name="SubItem">SubItem index to edit</param>
-		public void StartEditing(Control c, ListViewItem Item, int SubItem)
-		{
-			OnSubItemBeginEditing(new SubItemEventArgs(Item, SubItem));
-
-			Rectangle rcSubItem = GetSubItemBounds(Item, SubItem);
-
-			if (rcSubItem.X < 0)
-			{
-				// Left edge of SubItem not visible - adjust rectangle position and width
-				rcSubItem.Width += rcSubItem.X;
-				rcSubItem.X=0;
-			}
-			if (rcSubItem.X+rcSubItem.Width > this.Width)
-			{
-				// Right edge of SubItem not visible - adjust rectangle width
-				rcSubItem.Width = this.Width-rcSubItem.Left;
-			}
-
-			// Subitem bounds are relative to the location of the ListView!
-			rcSubItem.Offset(Left, Top);
-
-			// In case the editing control and the listview are on different parents,
-			// account for different origins
-			Point origin = new Point(0,0);
-			Point lvOrigin  = this.Parent.PointToScreen(origin);
-			Point ctlOrigin  = c.Parent.PointToScreen(origin);
-
-			rcSubItem.Offset(lvOrigin.X-ctlOrigin.X, lvOrigin.Y-ctlOrigin.Y);
-
-			// Position and show editor
-			c.Bounds = rcSubItem;
-			c.Text = Item.SubItems[SubItem].Text;
-			c.Visible = true;
-			c.BringToFront();
-			c.Focus();
-
-			_editingControl = c;
-			_editingControl.Leave += new EventHandler(_editControl_Leave);
-			_editingControl.KeyPress += new KeyPressEventHandler(_editControl_KeyPress);
-
-			_editItem = Item;
-			_editSubItem = SubItem;
-		}
-
-
-		private void _editControl_Leave(object sender, EventArgs e)
-		{
-			// cell editor losing focus
-			EndEditing(true);
-		}
-
-		private void _editControl_KeyPress(object sender, System.Windows.Forms.KeyPressEventArgs e)
-		{
-			switch (e.KeyChar)
-			{
-				case (char)(int)Keys.Escape:
-				{
-					EndEditing(false);
-					break;
-				}
-
-				case (char)(int)Keys.Enter:
-				{  
-					EndEditing(true);
-					break;
-				}
-			}
-		}
-
-		/// <summary>
-		/// Accept or discard current value of cell editor control
-		/// </summary>
-		/// <param name="AcceptChanges">Use the _editingControl's Text as new SubItem text or discard changes?</param>
-		public void EndEditing(bool AcceptChanges)
-		{
-			if (_editingControl == null)
-				return;
-
-			SubItemEndEditingEventArgs e = new SubItemEndEditingEventArgs(
-				_editItem,		// The item being edited
-				_editSubItem,	// The subitem index being edited
-				AcceptChanges ?
-					_editingControl.Text :	// Use editControl text if changes are accepted
-					_editItem.SubItems[_editSubItem].Text,	// or the original subitem's text, if changes are discarded
-				!AcceptChanges	// Cancel?
-			);
-
-			OnSubItemEndEditing(e);
-
-            if (_editSubItem >= 0 && _editSubItem < _editItem.SubItems.Count)
-            {
-                _editItem.SubItems[_editSubItem].Text = e.DisplayText;
-            }
-
-            if (_editingControl != null)
-            {
-                _editingControl.Leave -= new EventHandler(_editControl_Leave);
-                _editingControl.KeyPress -= new KeyPressEventHandler(_editControl_KeyPress);
-
-                _editingControl.Visible = false;
-            }
-
-			_editingControl = null;
-			_editItem = null;
-			_editSubItem = -1;
-		}
-		#endregion
-	}
-
-	
-	/// <summary>
-	/// Event Args for SubItemClicked event
-	/// </summary>
-	public class SubItemEventArgs : EventArgs
-	{
-        int subItem = -1;     /// Sub-item index
-        ListViewItem item = null;
-
-        public int SubItem { get { return subItem; } }
-        public ListViewItem Item { get { return item; } }
-
-        public SubItemEventArgs(ListViewItem item, int subItem)
-		{
-			this.subItem = subItem;
-			this.item = item;
-		}
-	}
-
-
-	/// <summary>
-	/// Event Args for SubItemEndEditingClicked event
-	/// </summary>
-	public class SubItemEndEditingEventArgs : SubItemEventArgs
-	{
-		string displayText = string.Empty;
-		bool cancel = true;
-
-		public SubItemEndEditingEventArgs(ListViewItem item, int subItem, string displayText, bool cancel) :
-			base(item, subItem)
-		{
-			this.displayText = displayText;
-			this.cancel = cancel;
-		}
-		public string DisplayText
-		{
-			get { return displayText; }
-			set { displayText = value; }
-		}
-		public bool Cancel
-		{
-			get { return cancel; }
-			set { cancel = value; }
-		}
-	}
-}

Common/Forms/ListViewExtensions.cs

@@ -1,109 +0,0 @@
-///
-/// Copyright (c) 2019-2020 Sensus Slovensko a.s.
-///
-using System;
-using System.ComponentModel;
-using System.Runtime.InteropServices;
-using System.Windows.Forms;
-
-namespace Common.Forms
-{
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public static class ListViewExtensions
-    {
-        [StructLayout(LayoutKind.Sequential)]
-        public struct HDITEM
-        {
-            public Mask mask;
-            public int cxy;
-            [MarshalAs(UnmanagedType.LPTStr)]
-            public string pszText;
-            public IntPtr hbm;
-            public int cchTextMax;
-            public Format fmt;
-            public IntPtr lParam;
-            // _WIN32_IE >= 0x0300 
-            public int iImage;
-            public int iOrder;
-            // _WIN32_IE >= 0x0500
-            public uint type;
-            public IntPtr pvFilter;
-            // _WIN32_WINNT >= 0x0600
-            public uint state;
-
-            [Flags]
-            public enum Mask
-            {
-                Format = 0x4,       // HDI_FORMAT
-            };
-
-            [Flags]
-            public enum Format
-            {
-                SortDown = 0x200,   // HDF_SORTDOWN
-                SortUp = 0x400,     // HDF_SORTUP
-            };
-        };
-
-        public const int LVM_FIRST = 0x1000;
-        public const int LVM_GETHEADER = LVM_FIRST + 31;
-
-        public const int HDM_FIRST = 0x1200;
-        public const int HDM_GETITEM = HDM_FIRST + 11;
-        public const int HDM_SETITEM = HDM_FIRST + 12;
-
-        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern IntPtr SendMessage(IntPtr hWnd, UInt32 msg, IntPtr wParam, IntPtr lParam);
-
-        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern IntPtr SendMessage(IntPtr hWnd, UInt32 msg, IntPtr wParam, ref HDITEM lParam);
-
-        public static void SetSortIcon(this ListViewEx listViewControl, int columnIndex, MySortOrder order)
-        {
-            IntPtr columnHeader = SendMessage(listViewControl.Handle, LVM_GETHEADER, IntPtr.Zero, IntPtr.Zero);
-            for (int columnNumber = 0; columnNumber <= listViewControl.Columns.Count - 1; columnNumber++)
-            {
-                var columnPtr = new IntPtr(columnNumber);
-                var item = new HDITEM
-                {
-                    mask = HDITEM.Mask.Format
-                };
-
-                if (SendMessage(columnHeader, HDM_GETITEM, columnPtr, ref item) == IntPtr.Zero)
-                {
-                    throw new Win32Exception();
-                }
-
-                if (order != MySortOrder.None && columnNumber == columnIndex)
-                {
-                    switch (order)
-                    {
-                        case MySortOrder.Ascending:
-                        case MySortOrder.Ascending2:
-                            item.fmt &= ~HDITEM.Format.SortDown;
-                            item.fmt |= HDITEM.Format.SortUp;
-                            break;
-
-                        case MySortOrder.Descending:
-                        case MySortOrder.Descending2:
-                            item.fmt &= ~HDITEM.Format.SortUp;
-                            item.fmt |= HDITEM.Format.SortDown;
-                            break;
-
-                        default:
-                            break;
-                    }
-                }
-                else
-                {
-                    item.fmt &= ~HDITEM.Format.SortDown & ~HDITEM.Format.SortUp;
-                }
-
-                if (SendMessage(columnHeader, HDM_SETITEM, columnPtr, ref item) == IntPtr.Zero)
-                {
-                    throw new Win32Exception();
-                }
-            }
-        }
-    }
-}

Common/Forms/LviDateTimeColumnComparer.cs

@@ -1,46 +0,0 @@
-///
-/// Copyright (c) 2019-2021 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections;
-using System.Windows.Forms;
-
-namespace Common.Forms
-{
-    public class LviDateTimeColumnComparer : IComparer
-    {
-        int column;
-        MySortOrder order;
-
-        public LviDateTimeColumnComparer()
-        {
-            column = 0;
-            order = MySortOrder.Ascending;
-        }
-
-        public LviDateTimeColumnComparer(int column, MySortOrder order)
-        {
-            this.column = column;
-            this.order = order;
-        }
-
-        public int Compare(object x, object y)
-        {
-            DateTime valX = DateTime.Parse(((ListViewItem)x).SubItems[column].Text);
-            DateTime valY = DateTime.Parse(((ListViewItem)y).SubItems[column].Text);
-
-            if (valX == valY)
-            {
-                return 0;
-            }
-            else if ((order == MySortOrder.Descending || order == MySortOrder.Descending2))
-            {
-                return (valY > valX) ? 1 : -1;
-            }
-            else
-            {
-                return (valX > valY) ? 1 : -1;
-            }
-        }
-    }
-}

Common/Forms/LviIntColumnComparer.cs

@@ -1,34 +0,0 @@
-///
-/// Copyright (c) 2019-2021 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections;
-using System.Windows.Forms;
-
-namespace Common.Forms
-{
-    public class LviIntColumnComparer : IComparer
-    {
-        int column;
-        MySortOrder order;
-
-        public LviIntColumnComparer()
-        {
-            column = 0;
-            order = MySortOrder.Ascending;
-        }
-
-        public LviIntColumnComparer(int column, MySortOrder order)
-        {
-            this.column = column;
-            this.order = order;
-        }
-
-        public int Compare(object x, object y)
-        {
-            int valX = int.Parse(((ListViewItem)x).SubItems[column].Text);
-            int valY = int.Parse(((ListViewItem)y).SubItems[column].Text);
-            return (order == MySortOrder.Descending || order == MySortOrder.Descending2) ? (valY - valX) : (valX - valY);
-        }
-    }
-}

Common/Forms/LviTextColumnComparer.cs

@@ -1,34 +0,0 @@
-///
-/// Copyright (c) 2019-2021 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections;
-using System.Windows.Forms;
-
-namespace Common.Forms
-{
-    public class LviTextColumnComparer : IComparer
-    {
-        private int column;
-        MySortOrder order;
-
-        public LviTextColumnComparer()
-        {
-            column = 0;
-            order = MySortOrder.Ascending;
-        }
-
-        public LviTextColumnComparer(int column, MySortOrder order)
-        {
-            this.column = column;
-            this.order = order;
-        }
-
-        public int Compare(object x, object y)
-        {
-            string txtX = ((ListViewItem)x).SubItems[column].Text;
-            string txtY = ((ListViewItem)y).SubItems[column].Text;
-            return (order == MySortOrder.Descending || order == MySortOrder.Descending2) ? String.Compare(txtY, txtX) : String.Compare(txtX, txtY);
-        }
-    }
-}

Common/Forms/MessageEventArgs.cs

@@ -1,13 +0,0 @@
-///
-/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
-///
-using System;
-
-namespace Common.Forms
-{
-    public class MessageEventArgs : EventArgs
-    {
-        public string Message;
-        public MessageEventArgs(string message) { Message = message; }
-    }
-}

Common/Forms/ModelessForm.cs

@@ -1,79 +0,0 @@
-///
-/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
-///
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace Common.Forms
-{
-    public partial class ModelessForm : Form
-    {
-        /// <summary>
-        /// Constructor to be used by the application
-        /// </summary>
-        /// <param name="title">Window title</param>
-        /// <param name="message">Displayed message</param>
-        public ModelessForm(string message, int backArgb = 0, int textArgb = 0, Font textFont = null, string title = null)
-        {
-            InitializeComponent();
-            ControlBox = false;
-
-            label1.Text = (message != null)  ? message : "Please wait";
-            BackColor   = (backArgb != 0)    ? Color.FromArgb(backArgb) : Color.LightGreen;
-            ForeColor   = (textArgb != 0)    ? Color.FromArgb(textArgb) : Color.Black;
-            label1.Font = (textFont != null) ? textFont : new Font("Arial", 14, FontStyle.Regular);
-            Text = (title != null) ? title : string.Empty;
-
-            float textWidth = Graphics.FromImage(new Bitmap(1, 1)).MeasureString(label1.Text, label1.Font).Width;
-            float textHeight = Graphics.FromImage(new Bitmap(1, 1)).MeasureString(label1.Text, label1.Font).Height;
-            Width = (int)textWidth + 120;		/// Form width calculated from the text width
-            Height += (int)textHeight;		    /// Form height calculated from the text height
-
-            UpdateMessageHandler += delegate(object sender, MessageEventArgs args)
-            {
-                if (InvokeRequired) { Invoke(new EventHandler<MessageEventArgs>(OnUpdateMessage), sender, args); }
-                else OnUpdateMessage(sender, args);
-            };
-
-            CloseFormHandler += delegate(object sender, EventArgs args)
-            {
-                if (InvokeRequired) { Invoke(new EventHandler<EventArgs>(OnCloseForm), sender, args); }
-                else OnCloseForm(sender, args);
-            };
-        }
-
-
-        /// <summary>
-        /// Called from the state machine when an operation forces a modeless dialog close.
-        /// </summary>
-        public void UpdateMessage(MessageEventArgs args)
-        {
-            if (UpdateMessageHandler == null) return;
-            try { UpdateMessageHandler(null, args); }
-            catch (Exception) { }
-        }
-        public event EventHandler<MessageEventArgs> UpdateMessageHandler;
-        void OnUpdateMessage(object sender, MessageEventArgs args)
-        {
-            if (args != null && args.Message != null) label1.Text = args.Message;
-        }
-
-
-        /// <summary>
-        /// Called from the state machine when an operation forces a modeless dialog close.
-        /// </summary>
-        public void CloseForm()
-        {
-            if (CloseFormHandler == null) return;
-            try { CloseFormHandler(null, null); }
-            catch (Exception) { }
-        }
-        public event EventHandler<EventArgs> CloseFormHandler;
-        void OnCloseForm(object sender, EventArgs args)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

Common/Formulas.cs

@@ -1,352 +0,0 @@
-///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using log4net;
-
-namespace Common
-{
-    public static class Formulas
-    {
-		private static readonly ILog log = LogManager.GetLogger(typeof(Formulas));
-
-
-        ///
-        /// Wrappers
-        ///
-        public static double RealDensity() { return GlobalData.SampleDensity; }
-        public static double AtTemperature() { return GlobalData.SampleTemp; }
-        public static double Buoyancy() { return GlobalData.Buoyancy; }
-
-
-        /// Private tables with coeficients to calculate specific enthalpy
-        static readonly int[] Ii;
-        static readonly int[] Ji;
-        static readonly double[] ni;
-
-        /// Private table with coeficients to calculate temperature of a platinum thermometer
-        static readonly double[] Di;
-
-
-        /// <summary> 
-		/// Constructor
-		/// </summary>
-        static Formulas()
-        {
-            ///
-            /// Initialize tables to calculate specific enthalpies
-            ///
-            Ii = new int[34] { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 8, 8, 21, 23, 29, 30, 31, 32 };
-            Ji = new int[34] { -2, -1, 0, 1, 2, 3, 4, 5, -9, -7, -1, 0, 1, 3, -3, 0, 1, 3, 17, -4, 0, 6, -5, -2, 10, -8, -11, -6, -29, -31, -38, -39, -40, -41 };
-            ni = new double[34] {
-                 0.14632971213167,      /// 1
-                -0.84548187169114,      /// 2
-                -0.37563603672040E1,    /// 3
-                 0.33855169168385E1,    /// 4
-                -0.95791963387872,      /// 5
-                 0.15772038513228,      /// 6
-                -0.16616417199501E-1,   /// 7
-                 0.81214629983568E-3,   /// 8
-                 0.28319080123804E-3,   /// 9
-                -0.60706301565874E-3,   /// 10
-                -0.18990068218419E-1,   /// 11
-                -0.32529748770505E-1,   /// 12
-                -0.21841717175414E-1,   /// 13
-                -0.52838357969930E-4,   /// 14
-                -0.47184321073267E-3,   /// 15
-                -0.30001780793026E-3,   /// 16
-                 0.47661393906987E-4,   /// 17
-                -0.44141845330846E-5,   /// 18
-                -0.72694996297594E-15,  /// 19
-                -0.31679644845054E-4,   /// 20
-                -0.28270797985312E-5,   /// 21
-                -0.85205128120103E-9,   /// 22
-                -0.22425281908000E-5,   /// 23
-                -0.65171222895601E-6,   /// 24
-                -0.14341729937924E-12,  /// 25
-                -0.40516996860117E-6,   /// 26
-                -0.12734301741641E-8,   /// 27
-                -0.17424871230634E-9,   /// 28
-                -0.68762131295531E-18,  /// 29
-                 0.14478307828521E-19,  /// 30
-                 0.26335781662795E-22,  /// 31
-                -0.11947622640071E-22,  /// 32
-                 0.18228094581404E-23,  /// 33
-                -0.93537087292458E-25,  /// 34
-            };
-
-			///
-			/// Initialize a table to calculate temperature of a platinum thermometer from resistance
-			///
-			Di = new double[]
-			{
-				 439.932854,
-				 472.418020,
-				 37.684494,
-				 7.472018,
-				 2.920828,
-				 0.005184,
-				-0.963864,
-				-0.188732,
-				 0.191203,
-				 0.049025,
-			};
-        }
-
-        /// <summary>
-        /// Calculate density of distilled water from temperature
-        /// </summary>
-        /// <param name="t">ITS-90 temperature in [°C]</param>
-        /// <returns>Density in [kg/m3]</returns>
-        public static double DistilledWaterDensityFromTemp(double t)
-        {
-            if (t <= 40)
-            {
-                const double c0 = 999.839564;
-                const double c1 = 0.067998613;
-                const double c2 = -0.0091101468;
-                const double c3 = 0.00010058299;
-                const double c4 = -0.0000011275659;
-                const double c5 = 6.5985371e-09;
-
-                return ((((c5 * t + c4) * t + c3) * t + c2) * t + c1) * t + c0;
-            }
-            else
-            {
-                const double a0 = 9.9983952E2;
-                const double a1 = 1.6952577E1;
-                const double a2 = -7.9905127E-3;
-                const double a3 = -4.6241757E-5;
-                const double a4 = 1.0584601E-7;
-                const double a5 = -2.8103006E-10;
-                const double b = 1.6887236E-2;
-
-                return (((((a5 * t + a4) * t + a3) * t + a2) * t + a1) * t + a0) / (1.0 + b * t);
-            }
-        }
-
-		/// <summary>
-		/// Calculate density of distilled water from temperature (obsolete)
-		/// </summary>
-		/// <param name="t">IPTS-68 temperature in [°C]</param>
-		/// <returns>Density in [kg/m3]</returns>
-        public static double DistilledWaterDensityFromTempIPTS68(double t)
-        {
-            const double a0 = 999.842594;
-            const double a1 = 0.06793952;
-            const double a2 = -0.009095290;
-            const double a3 = 0.0001001685;
-            const double a4 = -0.000001120083;
-            const double a5 = 6.536332e-09;
-
-            return ((((a5 * t + a4) * t + a3) * t + a2) * t + a1) * t + a0;
-        }
-
-		/// <summary>
-		/// Calculate density by comparing calculated data and data from a certificate
-		/// </summary>
-		/// <param name="realDensity">Density from a certificate in [kg/m3]</param>
-		/// <param name="atTemperature">Temperature from a certificate in [°C]</param>
-		/// <returns>Density correction in [kg/m3]</returns>
-		public static double DensityCorrection(double realDensity, double atTemperature)
-		{
-			/// Calculated data
-			double calculatedDensity = DistilledWaterDensityFromTemp(atTemperature);
-
-			return realDensity - calculatedDensity;
-		}
-
-		/// <summary>
-		/// Calculate corrected (real) water density from temperature
-		/// </summary>
-		/// <param name="t">Temperature in [°C]</param>
-		/// <returns>Density in [kg/m3]</returns>
-		public static double WaterDensityFromTemp(double t)
-		{
-            return DistilledWaterDensityFromTemp(t) + DensityCorrection(RealDensity(), AtTemperature());
-		}
-
-        /// <summary>
-        /// Calculate corrected (real) water density from temperature
-        /// </summary>
-        /// <param name="t">Temperature in [°C]</param>
-        /// <returns>Density in [kg/m3]</returns>
-        public static double WaterDensityFromTempPress(double temp, double pressure)
-        {
-            double x0 = 5.08821E-10;
-            double x1 = 1.2639418;
-            double x2 = 0.2660269;
-            double x3 = 0.3734838;
-            double x4 = 2.0205242;
-            double theta = temp / 100.0;
-            double B = x0 * (((x3 * theta + x2) * theta + x1) * theta + 1) / (1 + x4 * theta);
-
-            return WaterDensityFromTemp(temp) * (1 + B * Common.Units.ConvertTo(Common.Unit.Pa, pressure));
-        }
-
-
-		public static float AirDensityFromAmbientVales(float tempC, float pressureBar, float humiPct)
-		{
-			double pressurePa = 100000.0 * (double)pressureBar;		/// [Pa]
-			double tempKelvin = 273.15 + (double)tempC;
-			double coef1 = 1.2811805 / 10000.0 * tempKelvin * tempKelvin
-						 - 1.950987 / 100.0 * tempKelvin
-						 + 34.04926034
-						 - 6.353631 * 1000.0 / tempKelvin;
-			double coef3 = humiPct / 100.0 * System.Math.Exp(coef1) / pressurePa;
-			double airDensityKgm3 = 0.00348353 * pressurePa * (1.0 - 0.378 * coef3) / tempKelvin;	/// kg/m3
-			return (float)airDensityKgm3;
-		}
-
-		/// <summary>
-		/// Convert 'pulses' to 'volume', prevent division by zero
-		/// </summary>
-		public static double VolumeFromPulses(int pulses, double pulsesPerLiter)
-		{
-			if (pulsesPerLiter <= double.Epsilon) return 0;
-			return Convert.ToDouble(pulses) / pulsesPerLiter;
-		}
-
-		/// <summary>
-		/// Calculate the error in % from 'measured' and 'true' volume, prevent division by zero
-		/// </summary>
-		public static double ErrorFromVolumes(double measuredVolume, double trueVolume)
-		{
-			if (Math.Abs(trueVolume) <= float.Epsilon)
-			{
-				if (Math.Abs(measuredVolume) <= float.Epsilon)
-				{
-					log.WarnFormat("ErrorFromVolumes({0},{1}) returns {2}", measuredVolume, trueVolume, -100.0);
-					return -100.0;
-				}
-
-				log.WarnFormat("ErrorFromVolumes({0},{1}) returns {2}", measuredVolume, trueVolume, 99.0);
-				return 99.0;
-			}
-
-			double error = 100.0 * (measuredVolume - trueVolume) / trueVolume;
-			log.InfoFormat("ErrorFromVolumes({0},{1}) returns {2}", measuredVolume, trueVolume, error);
-			return error;
-		}
-
-
-        /// <summary>
-        /// Converts a measurement error to a correction (used when preparing correction tables).
-        /// </summary>
-        /// <param name="measuredValue">Measured value (in arbitrary units)</param>
-        /// <param name="error">Measurement error in %</param>
-        /// <returns>Correction in the same units as the measured value</returns>
-        public static double CorrectionFromError(double measuredValue, double error)
-        {
-            double trueValue = measuredValue / (1 + error/100);
-            double correction = trueValue - measuredValue;
-            return correction;
-        }
-
-
-        /// <summary>
-        /// Calculates the heat coefficient for water
-        /// </summary>
-        /// <param name="pressure">Pressure [bar]</param>
-		/// <param name="T_in">Inlet temperature [°C]</param>
-		/// <param name="T_out">Outlet temperature [°C]</param>
-        /// <param name="flowMeasuredAtInlet">true = flow measured @inlet, false = flow measured @outlet</param>
-        /// <returns> Heat coefficient for water [J/(m3 K)]</returns>
-        public static double HeatCoefficientWater(double pressure, double T_in, double T_out, bool flowMeasuredAtInlet)
-        {
-            if (T_in == T_out) return 0;
-
-            const double R = 461.526;                       /// [J kg^-1 K^-1]
-            const double p_star_Pa = 16.53E6;               /// [Pa] (=16.53 MPa)
-            const double T_star = 1386.0;                   /// [K]
-
-            double T_in_K = Common.Units.ConvertTo(Common.Unit.K, T_in);
-            double T_out_K = Common.Units.ConvertTo(Common.Unit.K, T_out);
-            double tau_in = T_star / T_in_K;
-            double tau_out = T_star / T_out_K;
-            double pi = Common.Units.ConvertTo(Common.Unit.Pa, pressure) / p_star_Pa;
-
-            double h_in = tau_in * GammaTau(pi, tau_in) * R * T_in_K;
-            double h_out = tau_out * GammaTau(pi, tau_out) * R * T_out_K;
-
-            double ni = flowMeasuredAtInlet ? GammaPi(pi, tau_in) * R * T_in_K / p_star_Pa
-                                            : GammaPi(pi, tau_out) * R * T_out_K / p_star_Pa;
-
-            return (h_in - h_out) / (ni * (T_in - T_out));
-        }
-
-        /// <summary>
-        /// gamma(pi) see also STN EN 1434-1 Annex A (A.4)
-        /// </summary>
-        /// <param name="pi">pi = p / p* where p* = 16.53 MPa</param>
-        /// <param name="tau">tau = T* / T where T* = 1386 K</param>
-        /// <returns>gamma(pi)</returns>
-        static double GammaPi(double pi, double tau)
-        {
-            double result = 0;
-            for (int i = 0; i < 34; i++)
-            {
-                result -= ni[i] * Ii[i] * Math.Pow(7.1 - pi, Ii[i] - 1) * Math.Pow(tau - 1.222, Ji[i]);
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// gamma(tau) see also STN EN 1434-1 Annex A (A.7)
-        /// </summary>
-        /// <param name="pi">pi = p / p* where p* = 16.53 MPa</param>
-        /// <param name="tau">tau = T* / T where T* = 1386 K</param>
-        /// <returns>gamma(tau)</returns>
-        static double GammaTau(double pi, double tau)
-        {
-            double result = 0;
-            for (int i = 0; i < 34; i++)
-            {
-                result += ni[i] * Math.Pow(7.1 - pi, Ii[i]) * Ji[i] * Math.Pow(tau - 1.222, Ji[i] - 1);
-            }
-            return result;
-        }
-
-		/// <summary>
-		/// Conversion of measured resistance of a platinum thermometer to temperature according to ITS-90
-		/// </summary>
-		/// <param name="R">Measured resistance in [°C]</param>
-		/// <param name="R001C">Calibrated resistance in Ohm at 0.01°C</param>
-		/// <param name="a7">Calibrated ITS-90 coefficient a7</param>
-		/// <param name="b7">Calibrated ITS-90 coefficient b7</param>
-		/// <param name="c7">Calibrated ITS-90 coefficient c7</param>
-        /// <returns>Temperature in [°C]</returns>
-		public static double PlatinumResistanceTM_ITS90_R2T(double R, double R001C, double a7, double b7, double c7)
-		{
-			double w = R / R001C;			/// ratio
-			double r1 = w - 1.0;
-			double dw = r1 * (a7 + r1 * (b7 + r1 * c7));	/// = a7*r1 + b7*r1^2 + c7*r1^3
-			double wr = w - dw;
-			double x = (wr - 2.64) / 1.64;
-
-			double sum = 0;
-			for (int i = Di.Length - 1; i >= 0; i--)
-			{
-				sum = sum * x + Di[i];
-			}
-
-			return sum;
-		}
-
-        /// <summary>
-        /// Conversion of measured resistance of a platinum thermometer to temperature using Callendar-Van Dusen equations
-        /// </summary>
-        /// <param name="R">Measured resistance in [°C]</param>
-        /// <param name="R0">Calibrated resistance in Ohm at 0°C</param>
-        /// <param name="A">Calibration coefficient a</param>
-        /// <param name="B">Calibration coefficient b</param>
-        /// <returns>Temperature in [°C]</returns>
-        public static double PlatinumResistanceTM_ITS27_R2T(double R, double R0, double A, double B)
-        {
-            if (R0 * R0 * A * A - 4 * R0 * B * (R0 - R) <= 0) return 0;     /// Out of range
-
-            return (-(R0 * A) + Math.Sqrt(R0 * R0 * A * A - 4 * R0 * B * (R0 - R))) / (2 * R0 * B);
-        }
-	}
-}

Common/GlobalData.cs

@@ -1,14 +0,0 @@
-///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
-///
-using System;
-
-namespace Common
-{
-    public static class GlobalData
-    {
-        public static double SampleDensity = 0; /// sample water density measured in an accredited labo [kg/m3]
-        public static double SampleTemp = 0;    /// sample temperature when density measured in an accredited labo [°C]
-        public static double Buoyancy = 0;
-    }
-}

Common/IMeasurementCorrection.cs

@@ -1,11 +0,0 @@
-using System;
-
-namespace Common
-{
-    public interface IMeasurementCorrection
-    {
-        int RangeIx { get; set; }
-        double Measurement { get; set; }
-        double Correction { get; set; }
-    }
-}

Common/IOrderInfo.cs

@@ -1,26 +0,0 @@
-///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
-///
-using System;
-
-namespace Common
-{
-    public interface IOrderInfo
-    {
-        string POName { get; }
-        string VariantCode { get; }
-        string ModuleParam { get; }
-        int    PiecesCount { get; }
-        string SNPrefix { get; }
-        int    SNFirst { get; }
-        int    SNDigitsCount { get; }
-        string SNSuffix { get; }
-        string RAPrefix { get; }
-        int    RAFirst { get; }
-        string RASuffix { get; }
-        string Remark { get; }
-        int    CurrentPcsCount { get; set; }
-        int    CurrentSN { get; set; }
-        int    CurrentRA { get; set; }
-    }
-}

Common/IUncertainty.cs

@@ -1,14 +0,0 @@
-using System;
-
-namespace Common
-{
-    public interface IUncertainty
-    {
-        float Measurement { get; }
-        float MainUncertainty { get; }
-        float Resolution { get; }
-        float DriftPerYr { get; }
-        float Conditions { get; }
-        float UncertaintyOfCorrection { get; }
-    }
-}

Common/IUser.cs

@@ -1,23 +0,0 @@
-using System;
-
-namespace Common
-{
-    public interface IUser
-    {
-        string UserName { get; }	    /// = name, alias, abbreviation
-        string FullName { get; }	    /// = description
-        string Tag { get; }
-        int Number { get; }
-
-        /// Access rights
-        bool IsPowerUser();
-        bool IsMemberOf(GID group);
-        bool IsMemberOf(GID[] groups);
-        bool IsCorrectPassword(string password);
-
-        /// Password complexity, history, etc.
-        bool IsPasswordExpired();
-        bool IsPasswordUsedInPast(string passwordCandidate);
-        void SetPassword(string password);
-    }
-}

Common/Iperl/OptoTelegramRaw.cs

@@ -1,269 +0,0 @@
-///
-/// Copyright (c) 2015-2021 Sensus Metering Systems
-///
-using System;
-using System.Globalization;
-
-namespace Common.Iperl
-{
-    public enum OptoTelegramFlags : byte
-    {
-        OK = 0,
-        OK_TestStart,
-        OK_TestEnd,
-        InvalidTelegram,	/// Wrong telegram format of checksum error
-        SyncError,
-    }
-
-    public class OptoTelegramRaw
-	{
-		public static readonly int Length = 42;
-		private static CultureInfo culture;
-
-
-        ///
-        /// Strobed value
-        ///
-        public static decimal TestStartTimestampDec;
-
-		///
-		/// Stored values
-		///
-		public OptoTelegramFlags Flags;
-
-		public DateTime DateTime;		/// From PC
-		public float RefFlow;			/// [m3/h]
-		public int Counter;				
-
-		public Int32 EmfRaw;			/// Signed EMF from iPerl opto data
-		public Int16 MagneticFieldRaw;
-		public Int16 FlowRaw;
-		public UInt32 VolumeRaw;
-        public Int64 VolumeRawExt;
-		public Int16 Impedance;
-		public UInt32 Timestamp;
-        public Int64 TimestampExt;
-        public byte CheckSum;
-
-		///
-		/// Calculated values
-		///
-		public double EMF()
-		{
-            return 0.000000333 * (double)EmfRaw;
-		}
-		public double MagneticField() { return (double)MagneticFieldRaw; }
-		public double Flow(double scalingFactor) { return 0.225 * scalingFactor * (double)FlowRaw; }
-		public double Volume(double scalingFactor) { return 0.0000625 * scalingFactor * (double)VolumeRawExt; }
-		public Int32 FlipTime() { return Impedance; }
-		public decimal TimestampDec() { return (decimal)TimestampExt / (decimal)8192; }
-		public double VolumeDelta(double scalingFactor, OptoTelegramRaw previous) { return (previous == null) ? 0 : Volume(scalingFactor) - previous.Volume(scalingFactor); }
-        public decimal TimeDelta() { return TimestampDec() - TestStartTimestampDec; }
-		public string Label()
-		{
-            if (Flags == OptoTelegramFlags.OK_TestStart) return "####  start test  ####";
-			else if (Flags == OptoTelegramFlags.OK_TestEnd) return "####  end of test  ####";
-			else return string.Empty;
-		}
-
-
-		static OptoTelegramRaw()
-		{
-			culture = CultureInfo.CreateSpecificCulture("DE");		/// This is to use comma as decimal number separator
-        }
-
-		public OptoTelegramRaw()
-		{
-		}
-
-        /// <summary>
-        /// Parses optical telegram and returns OptoTelegramRaw object
-        /// </summary>
-        /// <description>
-        /// Create a configuration structure from a complete byte array
-		/// 
-		/// Telegram description:
-		/// 
-		/// AAAAAA[tab]BBBB[tab]CCCC[tab]DDDDDD[tab]EEEE[tab]FFFFFFFF[tab]GG[cr][lf]  (42 bytes)
-		/// 
-		/// Data     Comment         Type     Calculate to decimal
-		/// ----------------------------------------------------------------
-		/// AAAAAA   EMF             Int24    Value * 0.000000333
-		/// BBBB     Magnetic field  Int16    Value
-		/// CCCC     Flow            Int16    Value * 0.225 * Scalig factor
-		/// DDDDDD   Volume          Int24    Value / 16000 * Scaling factor
-		/// EEEE     Impedance       Int16    Value
-		/// FFFFFFFF Timestamp       Uint32   Value / 8192
-		/// GG       Checksum        Byte
-		/// ----------------------------------------------------------------
-		/// 
-		/// Example:
-		/// FFFFFE	51EA	0000	65324E	0087	F6319DFF	86
-		/// FFDD3A	51F9	0000	65324E	0088	F631A60B	45
-		/// ...
-        /// </description>
-        /// <param name="data">A complete byte array data</param>
-        /// <returns>true = telegram OK, false = telegram NOK</returns>
-        public bool UpdateFromString(string telegram, int counter, float refFlow, ref Int64 volumeRawExtLast, ref Int64 timestampExtLast, bool isLog = false)
-		{
-			DateTime = DateTime.Now;
-			Counter = counter;
-			RefFlow = refFlow;
-
-			if ((telegram == null) || (telegram.Length < Length) ||
-				(telegram[6]  != '\t') || (telegram[11] != '\t') || (telegram[16] != '\t') ||
-				(telegram[23] != '\t') || (telegram[28] != '\t') || (telegram[37] != '\t') ||
-                (!isLog && (telegram[40] != '\r' || telegram[41] != '\n')))
-			{
-                Flags = OptoTelegramFlags.InvalidTelegram;
-				return false;
-			}
-
-            UInt32 uEmfRaw;
-            bool f1 = UInt32.TryParse(telegram.Substring(0, 6), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out uEmfRaw);
-            EmfRaw = (uEmfRaw > 0x7FFFFF) ? ((int)uEmfRaw - 0x1000000) : (int)uEmfRaw;
-
-			bool f2 = Int16.TryParse(telegram.Substring(7, 4), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out MagneticFieldRaw);
-			bool f3 = Int16.TryParse(telegram.Substring(12, 4), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out FlowRaw);
-			bool f4 = UInt32.TryParse(telegram.Substring(17, 6), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out VolumeRaw);
-			bool f5 = Int16.TryParse(telegram.Substring(24, 4), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out Impedance);
-			bool f6 = UInt32.TryParse(telegram.Substring(29, 8), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out Timestamp);
-			bool f7 = byte.TryParse(telegram.Substring(38, 2), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out CheckSum);
-
-            byte calculatedCheckSum = 0;
-            for (int i = 0; i < Length - 4; i++)
-            {
-                calculatedCheckSum += (byte)telegram[i];
-            }
-
-            bool allOk = f1 && f2 && f3 && f4 && f5 && f6 && f7 && (calculatedCheckSum == CheckSum);
-
-            if (allOk)
-            {
-                ///
-                /// Cope with 'VolumeRaw' overflow
-                ///
-                Int64 uncorrected = (Int64)(((UInt64)volumeRawExtLast & 0xFFFFFFFFFF000000UL) | VolumeRaw);
-                if (Math.Abs(uncorrected - volumeRawExtLast) <= 0x800000L)
-                {
-                    VolumeRawExt = volumeRawExtLast = uncorrected;
-                }
-                else if (Math.Abs(uncorrected + 0x1000000L - volumeRawExtLast) <= 0x800000L)
-                {
-                    VolumeRawExt = volumeRawExtLast = uncorrected + 0x1000000L;
-                }
-                else if (Math.Abs(uncorrected - 0x1000000L - volumeRawExtLast) <= 0x800000L)
-                {
-                    VolumeRawExt = volumeRawExtLast = uncorrected - 0x1000000L;
-                }
-                else
-                {
-                    VolumeRawExt = volumeRawExtLast = uncorrected;
-                }
-
-                ///
-                /// Cope with 'Timestamp' overflow
-                ///
-                uncorrected = (Int64)(((UInt64)timestampExtLast & 0xFFFFFFFF00000000UL) | Timestamp);
-                if (Math.Abs(uncorrected - timestampExtLast) <= 0x80000000L)
-                {
-                    TimestampExt = timestampExtLast = uncorrected;
-                }
-                else if (Math.Abs(uncorrected + 0x100000000L - timestampExtLast) <= 0x80000000L)
-                {
-                    TimestampExt = timestampExtLast = uncorrected + 0x100000000L;
-                }
-                else if (Math.Abs(uncorrected - 0x100000000L - timestampExtLast) <= 0x80000000L)
-                {
-                    TimestampExt = timestampExtLast = uncorrected - 0x100000000L;
-                }
-                else
-                {
-                    TimestampExt = timestampExtLast = uncorrected;
-                }
-            }
-
-            Flags = allOk ? OptoTelegramFlags.OK : OptoTelegramFlags.InvalidTelegram;
-
-            return allOk;
-		}
-
-        /// <summary>
-        /// Alternative to UpdateFromString(...) when data are flushed
-        /// </summary>
-        public bool UpdateFromStringDummy(string telegram)
-        {
-            DateTime = DateTime.Now;
-            RefFlow = 0;
-
-            if ((telegram == null) || (telegram.Length < Length) ||
-                (telegram[6]  != '\t') || (telegram[11] != '\t') || (telegram[16] != '\t') ||
-                (telegram[23] != '\t') || (telegram[28] != '\t') || (telegram[37] != '\t') ||
-                (telegram[40] != '\r') || (telegram[41] != '\n'))
-            {
-                Flags = OptoTelegramFlags.InvalidTelegram;
-                return false;
-            }
-
-            bool f7 = byte.TryParse(telegram.Substring(38, 2), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out CheckSum);
-
-            byte calculatedCheckSum = 0;
-            for (int i = 0; i < Length - 4; i++)
-            {
-                calculatedCheckSum += (byte)telegram[i];
-            }
-
-            bool allOk = f7 && (calculatedCheckSum == CheckSum);
-            
-            Flags = allOk ? OptoTelegramFlags.OK : OptoTelegramFlags.InvalidTelegram;
-
-            return allOk;
-        }
-
-
-        public void SetFlags(OptoTelegramFlags flags)
-		{
-			this.Flags = flags;
-		}
-
-
-		public string ToString(double scalingFactor, OptoTelegramRaw previous)
-		{
-			if (Flags == OptoTelegramFlags.SyncError)
-			{
-				return "Sychronization error";
-			}
-			else if (Flags == OptoTelegramFlags.InvalidTelegram)
-			{
-				return "Invalid telegram";
-			}
-			else /// if (flags == OptoTelegramFlags.OK / OptoTelegramFlags.OK_TestStart / OptoTelegramFlags.OK_TestEnd)
-			{
-                return string.Format("{0}:{1}:{2}.{3}\t{4} :\t{5}\t{6}\t{7}\t{8}\t{9}\t{10}\t{11}\t{12}\t{13}\t{14}\t{15}\t{16}\t{17}\t{18}\t{19}\t{20}\t{21}\t{22}",
-									DateTime.Hour.ToString("D2"),
-									DateTime.Minute.ToString("D2"),
-									DateTime.Second.ToString("D2"),
-									DateTime.Millisecond.ToString("D4"),
-									Counter,
-									(EmfRaw & 0x00FFFFFF).ToString("X6"),
-									MagneticFieldRaw.ToString("X4"),
-									FlowRaw.ToString("X4"),
-									VolumeRaw.ToString("X6"),
-                                    Impedance.ToString("X4"),
-									Timestamp.ToString("X8"),
-									CheckSum.ToString("X2"),
-									EMF().ToString("F4", culture),
-									MagneticField().ToString("F0", culture),
-									Flow(scalingFactor).ToString("F2", culture),
-									Volume(scalingFactor).ToString("F4", culture),
-									FlipTime().ToString("F0", culture),
-									TimestampDec().ToString("F4", culture),
-									(RefFlow * 1000).ToString("F2", culture),
-									VolumeDelta(scalingFactor, previous).ToString("F4", culture),
-									TimeDelta().ToString("F3", culture),
-									scalingFactor.ToString("F1", culture),
-									Label());
-			}
-		}
-	}
-}

Common/Printers/PrintersCommon.cs

@@ -1,84 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Printing;
-
-namespace Common.Printers
-{
-    public class PrintersCommon : PrintDocument
-    {
-        static Font lastFont = null;
-        static float lastSpacing = 0;
-
-        /// <summary>
-        /// Measure the size of a paragraph of text, lines are separated by '~'.
-        /// </summary>
-        /// <param name="e">PrintPageEventArgs</param>
-        /// <param name="text">Text, lines are separated by '~'</param>
-        /// <param name="font">Font</param>
-        /// <returns>Size of the paragraph of text</returns>
-        public static SizeF Measure(System.Drawing.Printing.PrintPageEventArgs e, string text, Font font)
-        {
-            if (font != lastFont)
-            {
-                lastFont = font;
-                lastSpacing = e.Graphics.MeasureString("Abcgq", font).Height;
-            }
-
-            string[] lines = text.Split(new char[] { '~' });
-            float width = 0;
-            foreach (var line in lines)
-            {
-                float lineWid = e.Graphics.MeasureString(line, font).Width;
-                if (lineWid > width) width = lineWid;
-            }
-
-            return new SizeF(width, 0.8f * lines.Length * lastSpacing + 0.2f);
-        }
-
-        /// <summary>
-        /// Print a paragraph of text, lines are separated by '~'.
-        /// </summary>
-        /// <param name="e">PrintPageEventArgs</param>
-        /// <param name="text">Text, lines are separated by '~'</param>
-        /// <param name="font">Font</param>
-        /// <param name="x">Position x</param>
-        /// <param name="y">Position y</param>
-        /// <param name="width">Width (required when alignment=Alignment.Center or alignment=Aligmenr.Right</param>
-        /// <param name="height">Height, 0 = no vertical centering</param>
-        /// <param name="horizAlignment">Horizontal alignment</param>
-        /// <param name="vertAlignment">Vertical alignment</param>
-        public static void PrintAt(System.Drawing.Printing.PrintPageEventArgs e, string text, Font font,
-                                   float x, float y, float width, float height,
-                                   Alignment horizAlignment, VertAlignment vertAlignment)
-        {
-            SizeF size = PrintersCommon.Measure(e, text, font);
-
-            string[] lines = text.Split(new char[] { '~' });
-
-            if (height <= size.Height) vertAlignment = VertAlignment.Top;
-            float y0;
-            switch (vertAlignment)
-            {
-                default:
-                case VertAlignment.Top:     y0 = y; break;
-                case VertAlignment.Middle:  y0 = y + (height - size.Height) / 2; break;
-                case VertAlignment.Bottom:  y0 = y + (height - size.Height); break;
-            }
-                     
-            foreach (var line in lines)
-            {
-                float x0;
-                switch (horizAlignment)
-                {
-                    default:
-                    case Alignment.Left:    x0 = x; break;
-                    case Alignment.Center:  x0 = x + (width - e.Graphics.MeasureString(line, font).Width) / 2; break;
-                    case Alignment.Right:   x0 = x + width - e.Graphics.MeasureString(line, font).Width; break;
-                }
-                e.Graphics.DrawString(line, font, Brushes.Black, new PointF(x0, y0));
-                y0 += 0.8f * lastSpacing;
-            }
-        }
-    }
-}

Common/SerializableDictionary.cs

@@ -1,7 +1,4 @@
-///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
-///
-using System;
+using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
 

Common/StatisticalMetrics.cs

@@ -1,338 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Common.Iperl;
-
-namespace Common
-{
-    public static class Extensions
-    {
-        public static float[] SubArray(this float[] array, int offset, int length)
-        {
-            float[] result = new float[length];
-            Array.Copy(array, offset, result, 0, length);
-            return result;
-        }
-    }
-
-    public class StatisticalMetrics
-    {
-        const int VectorSize = 7;
-        const int MinLength = 100;
-        const float AdcBit = (float)57e-9;
-        const int NeighbourhoodSize = 30;       /// To determine extended outliers
-
-        /// <summary>
-        /// Calculates a 7-dimensional vector with these components:
-        /// x[0] = X1 = Number of outliers
-        /// x[1] = X2 = Relative cal-factor shift due to outliers
-        /// x[2] = X3 = Standard deviation of high-pass filteres ++++ demodulation of EMF (cut-off at Nyquist frequency)
-        /// x[3] = X4 = Robust standard deviation of high-pass filtered ++++ demodulation
-        /// x[4] = X5 = Peak-to-peak of low-pass filtered ++++ demodulation of EMF (cut-off TBD)
-        /// x[5] = X6 = Peak-to-peak of reference flow rate
-        /// x[6] = X7 = Mean impedance (++-- demodulation)
-        /// </summary>
-        /// <param name="optoData"></param>
-        /// <param name="optoDataCount"></param>
-        /// <param name="startIx"></param>
-        /// <param name="endIx"></param>
-        /// <returns></returns>
-        public static float[] Calculate(OptoTelegramRaw[] optoData, int optoDataCount, int startIx, int endIx, bool downsample,
-                                        out float[] offsetV, out float[] kOhmsR, out float[] kOhmsC, out float[] dutFlow,
-                                        out float[] refFlow, out float[] flowRatio, out float[] magField, out float[] emfV,
-                                        out PointF[] outliers, out PointF[] extendedOutliers)
-        {
-            offsetV = kOhmsR = kOhmsC = dutFlow = refFlow = flowRatio = magField = emfV = null;
-            outliers = extendedOutliers = null;
-
-            if (optoData == null || optoData.Length < optoDataCount ||
-                startIx < 0 || endIx >= optoDataCount || endIx <= startIx + MinLength + 3) return null;
-
-            float[] modulatedData = GetModulatedEmf(optoData, optoDataCount, AdcBit);
-
-            FindShiftAndDemodulate(modulatedData, downsample,
-                                   new float[] { +1, +1, +1, +1 }, out offsetV,
-                                   new float[] { +1, +1, -1, -1 }, out kOhmsR,
-                                   new float[] { +1, -1, -1, +1 }, out kOhmsC,
-                                   new float[] { +1, -1, +1, -1 }, out dutFlow);
-            //offsetV = FirFilter(modulatedData, new float[] { 1, 3, 4, 4, 3, 1}, 0.0625F); 
-
-            magField = GetMagField(optoData, optoDataCount, downsample, new float[] { 1, 1, 1, 1 });
-            
-            refFlow = GetRefFlow(optoData, optoDataCount, downsample, new float[] { 1, 1, 1, 1 });
-            
-            flowRatio = new float[Math.Min(dutFlow.Length, refFlow.Length)];
-            for (int i = 0; i < flowRatio.Length; i++)
-            {
-                flowRatio[i] = (refFlow[i] != 0) ? dutFlow[i] / refFlow[i] : 1;
-            }
-
-
-            float[] x = new float[VectorSize];
-
-            /// X1 = Number of outliers
-            int outliersCount = GetOutliers(flowRatio, out outliers, out extendedOutliers);
-
-            
-            /// X2 = Relative cal-factor shift due to outliers
-
-            /// X3 = Standard deviation of high-pass filteres ++++ demodulation of EMF (cut-off at Nyquist frequency)
-
-            /// X4 = Robust standard deviation of high-pass filtered ++++ demodulation
-            
-            /// X5 = Peak-to-peak of low-pass filtered ++++ demodulation of EMF (cut-off TBD)
-            
-            /// X6 = Peak-to-peak of reference flow rate
-            
-            /// X7 = Mean impedance (++-- demodulation)
-            double sum = 0;
-            foreach (var z in kOhmsR) sum += z;
-            x[6] = Convert.ToSingle(sum / kOhmsR.Length);
-
-            return x;
-        }
-
-
-        static float[] GetModulatedEmf(OptoTelegramRaw[] optoData, int optoDataCount, float factor)
-        {
-            if (optoData == null || optoDataCount < 0) return null;
-
-            float[] result = new float[optoDataCount];
-            for (int i = 0; i < optoDataCount; i++)
-            {
-                result[i] = optoData[i].EmfRaw * factor;
-            }
-            return result;
-        }
-
-
-        static float[] GetMagField(OptoTelegramRaw[] optoData, int optoDataCount, bool downsample, float[] kernel)
-        {
-            if (optoData == null || optoDataCount < 0 || (downsample && (kernel == null || kernel.Length < 4))) return null;
-
-            int resultLen = downsample ? (optoDataCount / 4) : optoDataCount;
-            float[] result = new float[resultLen];
-
-            if (downsample)
-            {
-                float ksum = 0;
-                for (int j = 0; j < kernel.Length; j++) ksum += kernel[j];
-                for (int j = 0; j < kernel.Length; j++) kernel[j] /= ksum;
-
-                for (int i = 0; (4 * i) + kernel.Length - 1 < optoDataCount; i++)
-                {
-                    float sum = 0;
-                    for (int j = 0; j < kernel.Length; j++) sum += Convert.ToSingle(optoData[4 * i + j].MagneticFieldRaw) * kernel[j]; 
-                    result[i] = sum;
-                }
-            }
-            else
-            {
-                for (int i = 0; i < optoDataCount; i++) result[i] = optoData[i].MagneticFieldRaw;
-            }
-
-            return result;
-        }
-
-
-        static float[] GetRefFlow(OptoTelegramRaw[] optoData, int optoDataCount, bool downsample, float[] kernel)
-        {
-            if (optoData == null || optoDataCount < 0 || (downsample && (kernel == null || kernel.Length < 4))) return null;
-
-            int resultLen = downsample ? (optoDataCount / 4) : optoDataCount;
-            float[] result = new float[resultLen];
-
-            if (downsample)
-            {
-                float ksum = 0;
-                for (int j = 0; j < kernel.Length; j++) ksum += kernel[j];
-                for (int j = 0; j < kernel.Length; j++) kernel[j] /= ksum;
-
-                for (int i = 0; (4 * i) + kernel.Length - 1 < optoDataCount; i++)
-                {
-                    float sum = 0;
-                    for (int j = 0; j < kernel.Length; j++) sum += Convert.ToSingle(optoData[4 * i + j].RefFlow) * kernel[j];
-                    result[i] = sum;
-                }
-            }
-            else
-            {
-                for (int i = 0; i < optoDataCount; i++) result[i] = optoData[i].RefFlow;
-            }
-
-            return result;
-        }
-
-
-        public static void FindShiftAndDemodulate(float[] modulatedData, bool downsample,
-                                                  float[] kernel1, out float[] data1,
-                                                  float[] kernel2, out float[] data2,
-                                                  float[] kernel3, out float[] data3,
-                                                  float[] kernel4, out float[] data4)
-        {
-            int shift = GetShift(modulatedData.SubArray(0, MinLength));
-
-            data1 = (kernel1 != null) ? Demodulate(modulatedData, kernel1, shift, downsample) : null;
-            data2 = (kernel2 != null) ? Demodulate(modulatedData, kernel2, shift, downsample) : null;
-            data3 = (kernel3 != null) ? Demodulate(modulatedData, kernel3, shift, downsample) : null;
-            data4 = (kernel4 != null) ? Demodulate(modulatedData, kernel4, shift, downsample) : null;
-        }
-
-
-        /// <summary>
-        /// Unlike FIR filtering, demodulation shifts the kernel in 4 phases
-        /// </summary>
-        /// <param name="data">Input data</param>
-        /// <param name="kernel">Demodulation kernel</param>
-        /// <param name="shift">shift 0..3</param>
-        /// <returns>Output data</returns>
-        static float[] Demodulate(float[] data, float[] kernel, int shift, bool downsample)
-        {
-            if (data == null || data.Length < MinLength || kernel == null || kernel.Length != 4)
-            {
-                return null;
-            }
-
-            float ksum = 0;
-            for (int i = 0; i < 4; i++) ksum += Math.Abs(kernel[i]);
-            for (int i = 0; i < 4; i++) kernel[i] /= ksum;
-
-            int rsltLen = downsample ? (data.Length - 3) / 4 : data.Length - 3;
-            float[] result = new float[rsltLen];
-
-            if (downsample)
-            {
-                for (int i = shift; i < 4 * rsltLen; i += 4)
-                {
-                    float sum = 0;
-                    for (int j = 0; j < 4; j++) sum += data[i + j] * kernel[(i + j + 4 - shift) % 4];
-                    result[i / 4] = sum;
-                }
-            }
-            else
-            {
-                for (int i = 0; i < rsltLen; i++)
-                {
-                    float sum = 0;
-                    for (int j = 0; j < 4; j++) sum += data[i + j] * kernel[(i + j + 4 - shift) % 4];
-                    result[i] = sum;
-                }
-            }
-
-            return result;
-        }
-
-
-        /// <summary>
-        /// Determine modulation phase by maximizing ++-- demodulation result.
-        /// </summary>
-        /// <param name="modulatedEmf">Input data</param>
-        /// <returns>0..3 = modulation phase or, -1 = error</returns>
-        static int GetShift(float[] modulatedData)
-        {
-            float[] kernel = new float[4] { 1, 1, -1, -1 };
-            int maximizingShift = -1;
-            float maximum = float.MinValue;
-
-            for (int shift = 0; shift <= 3; shift++)
-            {
-                var demodulatedCandidate = Demodulate(modulatedData, kernel, shift, false);
-                float sum = 0;
-                foreach (var d in demodulatedCandidate) sum += d;
-                if (sum > maximum)
-                {
-                    maximum = sum;
-                    maximizingShift = shift;
-                }
-            }
-
-            return maximizingShift;
-        }
-
-
-        /// <summary>
-        /// FIR filtering = convolution with a kernel
-        /// </summary>
-        /// <param name="data">Input data</param>
-        /// <param name="kernel">Convolution kernel</param>
-        /// <returns>Output data</returns>
-        static float[] FirFilter(float[] data, float[] kernel, float factor)
-        {
-            if (data == null || kernel == null) return null;
-
-            int kernelLen = kernel.Length;
-            int rsltLen = data.Length - kernelLen + 1;
-            if (rsltLen < 0) return null;
-
-            float[] result = new float[rsltLen];
-            for (int i = 0; i < rsltLen; i++)
-            {
-                float sum = 0;
-                for (int j = 0; j < kernelLen; j++) sum += data[i + j] * kernel[j];
-                result[i] = sum * factor;
-            }
-            return result;
-        }
-
-
-        static int GetOutliers(float[] flowRatio, out PointF[] outliers, out PointF[] extendedOutliers)
-        {
-            float mean = Enumerable.Average(flowRatio);
-            var fr = new float[flowRatio.Length];
-            for (int i = 0; i < fr.Length; i++) fr[i] = flowRatio[i] - mean;
-
-            Array.Sort(fr);
-            float qLo = fr[fr.Length / 4];
-            float qHi = fr[3 * fr.Length / 4];
-
-            int N = fr.Length / 2;
-            float sumY = 0;
-            float sumYY = 0;
-            for (int i = fr.Length / 4; i < 3 * fr.Length / 4; i++)
-            {
-                sumY += fr[i];
-                sumYY += fr[i] * fr[i];
-            }
-            float std = (float)Math.Sqrt(sumYY / N - (sumY / N) * (sumY / N));
-            float robustStd = std * 5.1812824F;
-            float threshold = 7 * robustStd;
-
-            /// Restore fr as it was before sorting
-            for (int i = 0; i < fr.Length; i++) fr[i] = flowRatio[i] - mean;
-
-            IList<PointF> listOfOutliers = new List<PointF>();
-            bool[] boolExtendedOutliers = new bool[fr.Length];
-            int outliersCount = 0;
-            for (int i = 0; i < fr.Length; i++)
-            {
-                if (fr[i] < -threshold || fr[i] > threshold)
-                {
-                    /// This is an outlier
-                    listOfOutliers.Add(new PointF(Convert.ToSingle(i), fr[i] + mean));
-                    outliersCount++;
-                    for (int j = Math.Max(0, i - NeighbourhoodSize); j <= Math.Min(i + NeighbourhoodSize, fr.Length - 1); j++)
-                    {
-                        boolExtendedOutliers[j] = true;
-                    }
-                }
-            }
-
-            IList<PointF> listOfExtendedOutliers = new List<PointF>();
-            for (int i = 0; i < fr.Length; i++)
-            {
-                if (boolExtendedOutliers[i])
-                {
-                    listOfExtendedOutliers.Add(new PointF(Convert.ToSingle(i), fr[i] + mean));
-                }
-            }
-
-            outliers = listOfOutliers.ToArray<PointF>();
-            extendedOutliers = listOfExtendedOutliers.ToArray<PointF>();
-
-            return outliersCount;
-        }
-    }
-}

Common/Telegram.cs

@@ -1,272 +0,0 @@
-///
-/// Copyright (c) 2013-2021 Sensus Metering Systems
-///
-using System;
-using System.Collections.Generic;
-
-namespace Common
-{
-	public static class Telegram
-	{
-		const UInt16 crcSeed = 0xFFFF;		// Initial crc value
-		const UInt16 crcGP = 0xA001;		// Generating polynomial
-
-		/// <summary>
-		/// For standard CRC16 (remainder of division)
-		/// to start a new crc, set CRC16 = SEED
-		/// then for each byte call UpdateCRC(byte, &CRC16);
-		/// CRC16 will contain the result
-		/// (if you calculate all of the incoming data
-		/// INCLUDING the crc, the result should be 0x0000
-		/// and if you are sending the crc be sure to
-		/// send the bytes in the correct order)
-		/// <summary>
-		static void UpdateCRC(byte b, ref UInt16 crc)
-		{
-			crc ^= (UInt16)b;
-			for (int i = 0; i < 8; i++)
-			{
-				bool carry = (crc & 0x0001) != 0;
-				crc >>= 1;
-				if (carry) crc ^= crcGP;
-			}
-		}
-
-		/// <summary>
-		/// Calculates the CRC from a data telegram (an array of bytes).
-		/// A complete telegram including two bytes reserved for the CRC
-		/// must be supplied as an argument.
-		/// </summary>
-		/// <param name="data">Data telegram</param>
-		/// <returns>Calculated CRC</returns>
-		public static UInt16 CalculateTelegramCRC(byte[] data, int enforcedLen = 0)
-		{
-            int len = (enforcedLen != 0) ? Math.Min(enforcedLen, data.Length) : data.Length;
-			UInt16 crc = crcSeed;
-            for (int i = 0; i < len - 2; i++) UpdateCRC(data[i], ref crc);
-			return crc;
-		}
-
-        /// <summary>
-        /// Calculates the CRC from a data telegram (an array of bytes).
-        /// A complete telegram including two bytes reserved for the CRC
-        /// must be supplied as an argument.
-        /// </summary>
-        /// <param name="data">Data telegram</param>
-        /// <returns>Calculated CRC</returns>
-        public static UInt16 CalculateTelegramCRC(int offset, byte[] data, int enforcedLen = 0)
-        {
-            int len = (enforcedLen != 0) ? Math.Min(enforcedLen, data.Length - offset) : data.Length - offset;
-            UInt16 crc = crcSeed;
-            for (int i = 0; i < len - 2; i++) UpdateCRC(data[offset + i], ref crc);
-            return crc;
-        }
-
-		/// <summary>
-		/// This function modifies the last 2 bytes in the message buffer
-		/// by the CRC calculated from the remaining first (Lenght - 2) bytes.
-		/// A complete telegram including two bytes reserved for the CRC
-		/// must be supplied as an argument.
-		/// </summary>
-		/// <param name="data">Data telegram</param>
-		public static void UpdateTelegramCRC(byte[] data)
-		{
-			int len = data.Length;
-			if (len < 2) return;
-
-			UInt16 crc = CalculateTelegramCRC(data);
-
-			data[len - 2] = (byte)(crc & 0xFF);
-			data[len - 1] = (byte)(crc >> 8);
-		}
-
-		/// <summary>
-		/// This function compares the last 2 bytes in the message buffer
-		/// with the CRC calculated from the remaining first (Lenght - 2) bytes.
-		/// A complete telegram including two bytes reserved for the CRC
-		/// must be supplied as an argument.
-		/// </summary>
-		/// <param name="data">Data telegram</param>
-		/// <returns>true if the CRC in the telegram is correct</returns>
-		public static bool VerifyTelegramCRC(byte[] data, int enforcedLen = 0)
-		{
-            if (data == null || data.Length == 0 || enforcedLen > data.Length) return false;
-
-			int len = (enforcedLen != 0) ? enforcedLen : data.Length;
-			if (len < 2) return false;
-
-			UInt16 crc = CalculateTelegramCRC(data, len);
-
-			return (data[len - 2] == (byte)(crc & 0xFF)) && (data[len - 1] == (byte)(crc >> 8));
-		}
-
-        /// <summary>
-        /// This function compares the last 2 bytes in the message buffer
-        /// with the CRC calculated from the remaining first (Lenght - 2) bytes.
-        /// A complete telegram including two bytes reserved for the CRC
-        /// must be supplied as an argument.
-        /// </summary>
-        /// <param name="data">Data telegram</param>
-        /// <returns>true if the CRC in the telegram is correct</returns>
-        public static bool VerifyTelegramCRC(int offset, byte[] data, int enforcedLen = 0)
-        {
-            if (data == null || data.Length == 0 || enforcedLen > data.Length - offset) return false;
-
-            int len = (enforcedLen != 0) ? enforcedLen : data.Length - offset;
-            if (len < 2) return false;
-
-            UInt16 crc = CalculateTelegramCRC(offset, data, len);
-
-            return (data[offset + len - 2] == (byte)(crc & 0xFF)) && (data[offset + len - 1] == (byte)(crc >> 8));
-        }
-
-
-
-		/// <summary>
-		/// Calculates the checksum from a data telegram (an array of bytes).
-		/// A complete telegram including one byte reserved for the checksum
-		/// must be supplied as an argument.
-		/// </summary>
-		/// <param name="data">Data telegram</param>
-		/// <returns>Calculated checksum</returns>
-		public static byte CalculateTelegramChecksum(byte[] data)
-		{
-			byte checksum = 0;
-			for (int i = 0; i < data.Length - 1; i++) checksum = (byte)(checksum ^ data[i]);
-			return checksum;
-		}
-
-		/// <summary>
-		/// Calculates the checksum from a data telegram (an array of bytes).
-		/// A complete telegram including one bytes reserved for the checksum
-		/// must be supplied as an argument.
-		/// </summary>
-		/// <param name="hartPreambLen">Length of HART telegram preamble (FF bytes)</param>
-		/// <param name="data">Data telegram</param>
-		/// <returns>Calculated checksum</returns>
-		public static byte CalculateTelegramChecksum(int hartPreambLen, byte[] data)
-		{
-			byte checksum = 0;
-			for (int i = hartPreambLen; i < data.Length - 1; i++) checksum = (byte)(checksum ^ data[i]);
-			return checksum;
-		}
-
-		/// <summary>
-		/// This function modifies the last byte in the message buffer
-		/// by the checksum calculated from the remaining first (Lenght - 1) bytes.
-		/// A complete telegram including one bytes reserved for the checksum
-		/// must be supplied as an argument.
-		/// </summary>
-		/// <param name="data">Data telegram</param>
-		public static void UpdateTelegramChecksum(byte[] data)
-		{
-			int len = data.Length;
-			if (len < 1) return;
-			data[len - 1] = CalculateTelegramChecksum(data);
-		}
-
-		/// <summary>
-		/// This function modifies the last byte in the message buffer
-		/// by the checksum calculated from the preceeding (Lenght - hartPreambLen - 1) bytes.
-		/// First hartPreambLen bytes in the telegram are skipped.
-		/// A complete telegram including preamble and one bytes reserved for the checksum
-		/// after data bytes must be supplied as an argument.
-		/// </summary>
-		/// <param name="hartPreambLen">Length of HART telegram preamble (FF bytes)</param>
-		/// <param name="data">Data telegram</param>
-		public static void UpdateTelegramChecksum(int hartPreambLen, byte[] data)
-		{
-			if (data.Length - hartPreambLen < 1) return;
-			data[data.Length - 1] = CalculateTelegramChecksum(hartPreambLen, data);
-		}
-
-		/// <summary>
-		/// This function compares the last byte in the message buffer
-		/// with the checksum calculated from the remaining first (Lenght - 1) bytes.
-		/// A complete telegram including two bytes reserved for the checksum
-		/// must be supplied as an argument.
-		/// </summary>
-		/// <param name="data">Data telegram</param>
-		/// <returns>true if the checksum in the telegram is correct</returns>
-		public static bool VerifyTelegramChecksum(byte[] data)
-		{
-			int len = data.Length;
-			if (len < 1) return false;
-			return (data[len - 1] == CalculateTelegramChecksum(data));
-		}
-
-		/// <summary>
-		/// This function compares the last byte in the message buffer
-		/// with the checksum calculated from the remaining first (Lenght - 1) bytes.
-		/// A complete telegram including two bytes reserved for the checksum
-		/// must be supplied as an argument.
-		/// </summary>
-		/// <param name="hartPreambLen">Length of HART telegram preamble (FF bytes)</param>
-		/// <param name="data">Data telegram</param>
-		/// <returns>true if the checksum in the telegram is correct</returns>
-		public static bool VerifyTelegramChecksum(int hartPreambLen, byte[] data)
-		{
-			if (data.Length - hartPreambLen < 1) return false;
-			return (data[data.Length - 1] == CalculateTelegramChecksum(hartPreambLen, data));
-		}
-
-
-		public static string LogTelegram(string intro, byte[] data, int from = 0, int len = -1)
-		{
-			System.Text.StringBuilder sb = new System.Text.StringBuilder(256);
-
-            int length = (len >= 0) ? len : (data.Length - from);
-
-            sb.Append(intro);
-            sb.Append(length.ToString());
-			sb.Append(" bytes:");
-			
-            for (int i = from; i < from + length; i++)
-			{
-                byte b = data[i];
-				sb.Append(" ");
-				sb.Append(((int)b).ToString("X2"));
-			}
-
-			return sb.ToString();
-		}
-
-
-        public static string LogTelegram(string intro, IList<byte> data, int from = 0, int len = -1)
-        {
-            System.Text.StringBuilder sb = new System.Text.StringBuilder(256);
-
-            int length = (len >= 0) ? len : (data.Count - from);
-            
-            sb.Append(intro);
-            sb.Append(length.ToString());
-            sb.Append(" bytes:");
-
-            for (int i = from; i < from + length; i++)
-            {
-                byte b = data[i];
-                sb.Append(" ");
-                sb.Append(((int)b).ToString("X2"));
-            }
-
-            return sb.ToString();
-        }
-
-
-		public static string LogTelegram(string intro, string data)
-		{
-			System.Text.StringBuilder sb = new System.Text.StringBuilder(80);
-
-			sb.Append(intro);
-			sb.Append(data.Length.ToString());
-			sb.Append(" bytes:");
-			foreach (var d in data)
-			{
-				sb.Append(" ");
-				sb.Append(((int)d).ToString("X2"));
-			}
-
-			return sb.ToString();
-		}
-	}
-}

Common/UIControls/ListViewEx.cs

@@ -0,0 +1,486 @@
+///
+/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
+
+namespace Common.UIControls
+{
+	/// <summary>
+	/// Event Handler for SubItem events
+	/// </summary>
+	public delegate void SubItemEventHandler(object sender, SubItemEventArgs e);
+	/// <summary>
+	/// Event Handler for SubItemEndEditing events
+	/// </summary>
+	public delegate void SubItemEndEditingEventHandler(object sender, SubItemEndEditingEventArgs e);
+
+
+	///	<summary>
+	///	Inherited ListView to allow in-place editing of subitems
+	///	</summary>
+	public class ListViewEx	: System.Windows.Forms.ListView
+	{
+		#region Interop structs, imports and constants
+		/// <summary>
+		/// MessageHeader for WM_NOTIFY
+		/// </summary>
+		private struct NMHDR 
+		{ 
+#pragma warning disable
+			public IntPtr hwndFrom; 
+			public Int32  idFrom; 
+			public Int32  code;
+#pragma warning restore
+        }
+
+
+		[DllImport("user32.dll")]
+		private	static extern IntPtr SendMessage(IntPtr hWnd, int msg,	IntPtr wPar, IntPtr	lPar);
+		[DllImport("user32.dll", CharSet=CharSet.Ansi)]
+		private	static extern IntPtr SendMessage(IntPtr	hWnd, int msg, int len,	ref	int	[] order);
+
+		// ListView messages
+		private const int LVM_FIRST					= 0x1000;
+		private const int LVM_GETCOLUMNORDERARRAY	= (LVM_FIRST + 59);
+
+		// Windows Messages that will abort editing
+		private	const int WM_HSCROLL = 0x114;
+		private	const int WM_VSCROLL = 0x115;
+		private const int WM_SIZE	 = 0x05;
+		private const int WM_NOTIFY	 = 0x4E;
+
+		private const int HDN_FIRST = -300;
+		private const int HDN_BEGINDRAG = (HDN_FIRST-10);
+		private const int HDN_ITEMCHANGINGA = (HDN_FIRST-0);
+		private const int HDN_ITEMCHANGINGW = (HDN_FIRST-20);
+		#endregion
+
+		///	<summary>
+		///	Required designer variable.
+		///	</summary>
+		private	System.ComponentModel.Container	components = null;
+
+		public event SubItemEventHandler SubItemClicked;
+        public event SubItemEventHandler SubItemRightClicked;
+        public event SubItemEventHandler SubItemBeginEditing;
+		public event SubItemEndEditingEventHandler SubItemEndEditing;
+
+		public ListViewEx()
+		{
+			// This	call is	required by	the	Windows.Forms Form Designer.
+			InitializeComponent();
+
+			base.FullRowSelect = true;
+			base.View = View.Details;
+			base.AllowColumnReorder = true;
+		}
+
+		///	<summary>
+		///	Clean up any resources being used.
+		///	</summary>
+		protected override void	Dispose( bool disposing	)
+		{
+			if(	disposing )
+			{
+				if(	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()
+		{
+			components = new System.ComponentModel.Container();
+		}
+	  #endregion
+
+		private bool _doubleClickActivation = false;
+		/// <summary>
+		/// Is a double click required to start editing a cell?
+		/// </summary>
+		public bool DoubleClickActivation
+		{
+			get {  return _doubleClickActivation; }
+			set { _doubleClickActivation = value; }    
+		}
+
+
+		/// <summary>
+		/// Retrieve the order in which columns appear
+		/// </summary>
+		/// <returns>Current display order of column indices</returns>
+		public int[] GetColumnOrder()
+		{
+			IntPtr lPar	= Marshal.AllocHGlobal(Marshal.SizeOf(typeof(int)) * Columns.Count);
+
+			IntPtr res = SendMessage(Handle, LVM_GETCOLUMNORDERARRAY, new IntPtr(Columns.Count), lPar);
+			if (res.ToInt32() == 0)	// Something went wrong
+			{
+				Marshal.FreeHGlobal(lPar);
+				return null;
+			}
+
+			int	[] order = new int[Columns.Count];
+			Marshal.Copy(lPar, order, 0, Columns.Count);
+
+			Marshal.FreeHGlobal(lPar);
+
+			return order;
+		}
+
+
+		/// <summary>
+		/// Find ListViewItem and SubItem Index at position (x,y)
+		/// </summary>
+		/// <param name="x">relative to ListView</param>
+		/// <param name="y">relative to ListView</param>
+		/// <param name="item">Item at position (x,y)</param>
+		/// <returns>SubItem index</returns>
+		public int GetSubItemAt(int x, int y, out ListViewItem item)
+		{
+			item = this.GetItemAt(x, y);
+		
+			if (item !=	null)
+			{
+				int[] order = GetColumnOrder();
+				Rectangle lviBounds;
+				int	subItemX;
+
+				lviBounds =	item.GetBounds(ItemBoundsPortion.Entire);
+				subItemX = lviBounds.Left;
+				for (int i=0; i<order.Length; i++)
+				{
+					ColumnHeader h = this.Columns[order[i]];
+					if (x <	subItemX+h.Width)
+					{
+						return h.Index;
+					}
+					subItemX += h.Width;
+				}
+			}
+			
+			return -1;
+		}
+
+
+		/// <summary>
+		/// Get bounds for a SubItem
+		/// </summary>
+		/// <param name="Item">Target ListViewItem</param>
+		/// <param name="SubItem">Target SubItem index</param>
+		/// <returns>Bounds of SubItem (relative to ListView)</returns>
+		public Rectangle GetSubItemBounds(ListViewItem Item, int SubItem)
+		{
+			int[] order = GetColumnOrder();
+
+			Rectangle subItemRect = Rectangle.Empty;
+			if (SubItem >= order.Length)
+				throw new IndexOutOfRangeException("SubItem "+SubItem+" out of range");
+
+			if (Item == null)
+				throw new ArgumentNullException("Item");
+			
+			Rectangle lviBounds = Item.GetBounds(ItemBoundsPortion.Entire);
+			int	subItemX = lviBounds.Left;
+
+			ColumnHeader col;
+			int i;
+			for (i=0; i<order.Length; i++)
+			{
+				col = this.Columns[order[i]];
+				if (col.Index == SubItem)
+					break;
+				subItemX += col.Width;
+			} 
+			subItemRect	= new Rectangle(subItemX, lviBounds.Top, this.Columns[order[i]].Width, lviBounds.Height);
+			return subItemRect;
+		}
+
+
+		protected override void	WndProc(ref	Message	msg)
+		{
+			switch (msg.Msg)
+			{
+				// Look	for	WM_VSCROLL,WM_HSCROLL or WM_SIZE messages.
+				case WM_VSCROLL:
+				case WM_HSCROLL:
+				case WM_SIZE:
+					EndEditing(false);
+					break;
+				case WM_NOTIFY:
+					// Look for WM_NOTIFY of events that might also change the
+					// editor's position/size: Column reordering or resizing
+					NMHDR h = (NMHDR)Marshal.PtrToStructure(msg.LParam, typeof(NMHDR));
+					if (h.code == HDN_BEGINDRAG ||
+						h.code == HDN_ITEMCHANGINGA ||
+						h.code == HDN_ITEMCHANGINGW)
+						EndEditing(false);
+					break;
+			}
+
+			base.WndProc(ref msg);
+		}
+
+
+		#region Initialize editing depending of DoubleClickActivation property
+		protected override void OnMouseUp(System.Windows.Forms.MouseEventArgs e)
+		{
+			base.OnMouseUp(e);
+
+            MouseEventArgs me = (MouseEventArgs)e;
+            if (me.Button == MouseButtons.Right)
+            {
+                /// Right mouse button click function
+                RightClickFunctionSubitemAt(new Point(e.X, e.Y));
+            }
+            else
+            {
+                /// Normal function (=edit item)
+                if (DoubleClickActivation)
+                {
+                    return;
+                }
+
+                EditSubitemAt(new Point(e.X, e.Y));
+            }
+		}
+		
+		protected override void OnDoubleClick(EventArgs e)
+		{
+			base.OnDoubleClick (e);
+
+			if (!DoubleClickActivation)
+			{
+				return;
+			} 
+
+			Point pt = this.PointToClient(Cursor.Position);
+		
+			EditSubitemAt(pt);
+		}
+
+		///<summary>
+		/// Fire SubItemClicked
+		///</summary>
+		///<param name="p">Point of click/doubleclick</param>
+		private void EditSubitemAt(Point p)
+		{
+			ListViewItem item;
+			int idx = GetSubItemAt(p.X, p.Y, out item);
+			if (idx >= 0)
+			{
+				OnSubItemClicked(new SubItemEventArgs(item, idx));
+			}
+		}
+
+        ///<summary>
+        /// Fire SubItemRightClicked
+        ///</summary>
+        ///<param name="p">Point of click/doubleclick</param>
+        private void RightClickFunctionSubitemAt(Point p)
+        {
+            ListViewItem item;
+            int idx = GetSubItemAt(p.X, p.Y, out item);
+            if (idx >= 0)
+            {
+                OnSubItemRightClicked(new SubItemEventArgs(item, idx));
+            }
+        }
+
+		#endregion
+
+		#region In-place editing functions
+		// The control performing the actual editing
+		private Control _editingControl;
+		// The LVI being edited
+		private ListViewItem _editItem;
+		// The SubItem being edited
+		private int _editSubItem;
+
+		protected void OnSubItemBeginEditing(SubItemEventArgs e)
+		{
+			if (SubItemBeginEditing != null) SubItemBeginEditing(this, e);
+		}
+
+		protected void OnSubItemEndEditing(SubItemEndEditingEventArgs e)
+		{
+			if (SubItemEndEditing != null) SubItemEndEditing(this, e);
+		}
+
+		protected void OnSubItemClicked(SubItemEventArgs e)
+		{
+			if (SubItemClicked != null) SubItemClicked(this, e);
+		}
+
+        protected void OnSubItemRightClicked(SubItemEventArgs e)
+        {
+            if (SubItemRightClicked != null) SubItemRightClicked(this, e);
+        }
+
+
+		/// <summary>
+		/// Begin in-place editing of given cell
+		/// </summary>
+		/// <param name="c">Control used as cell editor</param>
+		/// <param name="Item">ListViewItem to edit</param>
+		/// <param name="SubItem">SubItem index to edit</param>
+		public void StartEditing(Control c, ListViewItem Item, int SubItem)
+		{
+			OnSubItemBeginEditing(new SubItemEventArgs(Item, SubItem));
+
+			Rectangle rcSubItem = GetSubItemBounds(Item, SubItem);
+
+			if (rcSubItem.X < 0)
+			{
+				// Left edge of SubItem not visible - adjust rectangle position and width
+				rcSubItem.Width += rcSubItem.X;
+				rcSubItem.X=0;
+			}
+			if (rcSubItem.X+rcSubItem.Width > this.Width)
+			{
+				// Right edge of SubItem not visible - adjust rectangle width
+				rcSubItem.Width = this.Width-rcSubItem.Left;
+			}
+
+			// Subitem bounds are relative to the location of the ListView!
+			rcSubItem.Offset(Left, Top);
+
+			// In case the editing control and the listview are on different parents,
+			// account for different origins
+			Point origin = new Point(0,0);
+			Point lvOrigin  = this.Parent.PointToScreen(origin);
+			Point ctlOrigin  = c.Parent.PointToScreen(origin);
+
+			rcSubItem.Offset(lvOrigin.X-ctlOrigin.X, lvOrigin.Y-ctlOrigin.Y);
+
+			// Position and show editor
+			c.Bounds = rcSubItem;
+			c.Text = Item.SubItems[SubItem].Text;
+			c.Visible = true;
+			c.BringToFront();
+			c.Focus();
+
+			_editingControl = c;
+			_editingControl.Leave += new EventHandler(_editControl_Leave);
+			_editingControl.KeyPress += new KeyPressEventHandler(_editControl_KeyPress);
+
+			_editItem = Item;
+			_editSubItem = SubItem;
+		}
+
+
+		private void _editControl_Leave(object sender, EventArgs e)
+		{
+			// cell editor losing focus
+			EndEditing(true);
+		}
+
+		private void _editControl_KeyPress(object sender, System.Windows.Forms.KeyPressEventArgs e)
+		{
+			switch (e.KeyChar)
+			{
+				case (char)(int)Keys.Escape:
+				{
+					EndEditing(false);
+					break;
+				}
+
+				case (char)(int)Keys.Enter:
+				{  
+					EndEditing(true);
+					break;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Accept or discard current value of cell editor control
+		/// </summary>
+		/// <param name="AcceptChanges">Use the _editingControl's Text as new SubItem text or discard changes?</param>
+		public void EndEditing(bool AcceptChanges)
+		{
+			if (_editingControl == null)
+				return;
+
+			SubItemEndEditingEventArgs e = new SubItemEndEditingEventArgs(
+				_editItem,		// The item being edited
+				_editSubItem,	// The subitem index being edited
+				AcceptChanges ?
+					_editingControl.Text :	// Use editControl text if changes are accepted
+					_editItem.SubItems[_editSubItem].Text,	// or the original subitem's text, if changes are discarded
+				!AcceptChanges	// Cancel?
+			);
+
+			OnSubItemEndEditing(e);
+
+			_editItem.SubItems[_editSubItem].Text = e.DisplayText;
+
+			_editingControl.Leave -= new EventHandler(_editControl_Leave);
+			_editingControl.KeyPress -= new KeyPressEventHandler(_editControl_KeyPress);
+
+			_editingControl.Visible = false;
+
+			_editingControl = null;
+			_editItem = null;
+			_editSubItem = -1;
+		}
+		#endregion
+	}
+
+	
+	/// <summary>
+	/// Event Args for SubItemClicked event
+	/// </summary>
+	public class SubItemEventArgs : EventArgs
+	{
+        int subItem = -1;     /// Sub-item index
+        ListViewItem item = null;
+
+        public int SubItem { get { return subItem; } }
+        public ListViewItem Item { get { return item; } }
+
+        public SubItemEventArgs(ListViewItem item, int subItem)
+		{
+			this.subItem = subItem;
+			this.item = item;
+		}
+	}
+
+
+	/// <summary>
+	/// Event Args for SubItemEndEditingClicked event
+	/// </summary>
+	public class SubItemEndEditingEventArgs : SubItemEventArgs
+	{
+		string displayText = string.Empty;
+		bool cancel = true;
+
+		public SubItemEndEditingEventArgs(ListViewItem item, int subItem, string displayText, bool cancel) :
+			base(item, subItem)
+		{
+			this.displayText = displayText;
+			this.cancel = cancel;
+		}
+		public string DisplayText
+		{
+			get { return displayText; }
+			set { displayText = value; }
+		}
+		public bool Cancel
+		{
+			get { return cancel; }
+			set { cancel = value; }
+		}
+	}
+}

Common/UIControls/ListViewExtensions.cs

@@ -0,0 +1,107 @@
+///
+/// Copyright (c) 2019-2020 Sensus Slovensko a.s.
+///
+using System;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+
+namespace Common.UIControls
+{
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public static class ListViewExtensions
+    {
+        [StructLayout(LayoutKind.Sequential)]
+        public struct HDITEM
+        {
+            public Mask mask;
+            public int cxy;
+            [MarshalAs(UnmanagedType.LPTStr)]
+            public string pszText;
+            public IntPtr hbm;
+            public int cchTextMax;
+            public Format fmt;
+            public IntPtr lParam;
+            // _WIN32_IE >= 0x0300 
+            public int iImage;
+            public int iOrder;
+            // _WIN32_IE >= 0x0500
+            public uint type;
+            public IntPtr pvFilter;
+            // _WIN32_WINNT >= 0x0600
+            public uint state;
+
+            [Flags]
+            public enum Mask
+            {
+                Format = 0x4,       // HDI_FORMAT
+            };
+
+            [Flags]
+            public enum Format
+            {
+                SortDown = 0x200,   // HDF_SORTDOWN
+                SortUp = 0x400,     // HDF_SORTUP
+            };
+        };
+
+        public const int LVM_FIRST = 0x1000;
+        public const int LVM_GETHEADER = LVM_FIRST + 31;
+
+        public const int HDM_FIRST = 0x1200;
+        public const int HDM_GETITEM = HDM_FIRST + 11;
+        public const int HDM_SETITEM = HDM_FIRST + 12;
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern IntPtr SendMessage(IntPtr hWnd, UInt32 msg, IntPtr wParam, IntPtr lParam);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern IntPtr SendMessage(IntPtr hWnd, UInt32 msg, IntPtr wParam, ref HDITEM lParam);
+
+        public static void SetSortIcon(this ListViewEx listViewControl, int columnIndex, SortOrder order)
+        {
+            IntPtr columnHeader = SendMessage(listViewControl.Handle, LVM_GETHEADER, IntPtr.Zero, IntPtr.Zero);
+            for (int columnNumber = 0; columnNumber <= listViewControl.Columns.Count - 1; columnNumber++)
+            {
+                var columnPtr = new IntPtr(columnNumber);
+                var item = new HDITEM
+                {
+                    mask = HDITEM.Mask.Format
+                };
+
+                if (SendMessage(columnHeader, HDM_GETITEM, columnPtr, ref item) == IntPtr.Zero)
+                {
+                    throw new Win32Exception();
+                }
+
+                if (order != SortOrder.None && columnNumber == columnIndex)
+                {
+                    switch (order)
+                    {
+                        case SortOrder.Ascending:
+                            item.fmt &= ~HDITEM.Format.SortDown;
+                            item.fmt |= HDITEM.Format.SortUp;
+                            break;
+
+                        case SortOrder.Descending:
+                            item.fmt &= ~HDITEM.Format.SortUp;
+                            item.fmt |= HDITEM.Format.SortDown;
+                            break;
+
+                        default:
+                            break;
+                    }
+                }
+                else
+                {
+                    item.fmt &= ~HDITEM.Format.SortDown & ~HDITEM.Format.SortUp;
+                }
+
+                if (SendMessage(columnHeader, HDM_SETITEM, columnPtr, ref item) == IntPtr.Zero)
+                {
+                    throw new Win32Exception();
+                }
+            }
+        }
+    }
+}

Common/UIControls/LviDateTimeColumnComparer.cs

@@ -0,0 +1,46 @@
+///
+/// Copyright (c) 2019-2020 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections;
+using System.Windows.Forms;
+
+namespace Common.UIControls
+{
+    public class LviDateTimeColumnComparer : IComparer
+    {
+        int column;
+        SortOrder order;
+
+        public LviDateTimeColumnComparer()
+        {
+            column = 0;
+            order = SortOrder.Ascending;
+        }
+
+        public LviDateTimeColumnComparer(int column, SortOrder order)
+        {
+            this.column = column;
+            this.order = order;
+        }
+
+        public int Compare(object x, object y)
+        {
+            DateTime valX = DateTime.Parse(((ListViewItem)x).SubItems[column].Text);
+            DateTime valY = DateTime.Parse(((ListViewItem)y).SubItems[column].Text);
+
+            if (valX == valY)
+            {
+                return 0;
+            }
+            else if (order == SortOrder.Ascending)
+            {
+                return (valX > valY) ? 1 : -1;
+            }
+            else
+            {
+                return (valY > valX) ? 1 : -1;
+            }
+        }
+    }
+}

Common/UIControls/LviIntColumnComparer.cs

@@ -0,0 +1,34 @@
+///
+/// Copyright (c) 2019-2020 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections;
+using System.Windows.Forms;
+
+namespace Common.UIControls
+{
+    public class LviIntColumnComparer : IComparer
+    {
+        int column;
+        SortOrder order;
+
+        public LviIntColumnComparer()
+        {
+            column = 0;
+            order = SortOrder.Ascending;
+        }
+
+        public LviIntColumnComparer(int column, SortOrder order)
+        {
+            this.column = column;
+            this.order = order;
+        }
+
+        public int Compare(object x, object y)
+        {
+            int valX = int.Parse(((ListViewItem)x).SubItems[column].Text);
+            int valY = int.Parse(((ListViewItem)y).SubItems[column].Text);
+            return (order == SortOrder.Descending) ? (valY - valX) : (valX - valY);
+        }
+    }
+}

Common/UIControls/LviTextColumnComparer.cs

@@ -0,0 +1,34 @@
+///
+/// Copyright (c) 2019-2020 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections;
+using System.Windows.Forms;
+
+namespace Common.UIControls
+{
+    public class LviTextColumnComparer : IComparer
+    {
+        private int column;
+        SortOrder order;
+
+        public LviTextColumnComparer()
+        {
+            column = 0;
+            order = SortOrder.Ascending;
+        }
+
+        public LviTextColumnComparer(int column, SortOrder order)
+        {
+            this.column = column;
+            this.order = order;
+        }
+
+        public int Compare(object x, object y)
+        {
+            string txtX = ((ListViewItem)x).SubItems[column].Text;
+            string txtY = ((ListViewItem)y).SubItems[column].Text;
+            return (order == SortOrder.Descending) ? String.Compare(txtY, txtX) : String.Compare(txtX, txtY);
+        }
+    }
+}

Common/Units.cs

@@ -1,606 +0,0 @@
-///
-/// Copyright (c) 2016-2021 Sensus Slovensko a.s.
-///
-using System;
-
-namespace Common
-{
-    public enum Unit
-    {
-		[Description("---")]		None,
-
-        [Description("imp.")]       pulse,
-#if LANG_PL
-        [Description("stopień")]    degree,
-#else
-        [Description("degree")]     degree,
-#endif
-        [Description("ml")]         ml,         ///   1 ml = 0.001 l
-        [Description("l")]          l,          /// * 1 liter
-        [Description("dm3")]        dm3,        ///   1 dm3 = 1 l
-        [Description("US gal")]     USgal,      ///   1 US gallon = 3.78541178 l
-        [Description("imper.gal")]  UKgal,      ///   1 imperial gallon = 4.54609 l
-        [Description("cf")]         cf,         ///   1 cubic foot = 28.316846592 l
-        [Description("m3")]         m3,         ///   1 m3 = 1000 l
-
-        [Description("l/h")]        lph,        ///   1 l/h = 0.001 m3/h
-        [Description("cf/h")]       cfph,       ///   1 cf/h = 0.028316846592 m3/h
-        [Description("l/m")]        lpm,        ///   1 l/m = 60 l/h = 0.06 m3/h
-        [Description("US gal/m")]   USgalpm,    ///   1 US gallon per minute = 0.2271247068 m3/h
-        [Description("m3/h")]       m3ph,       /// * 1 m3/h
-        [Description("l/s")]        lps,        ///   1 liter/s = 3.6 m3/h
-        [Description("US gal/s")]   USgalps,    ///   1 US gallon per second = 13.627482408 m3/h
-        [Description("m3/m")]       m3pm,       ///   1 m3/m = 60 m3/h
-        [Description("cf/s")]       cfs,        ///   1 cubic foot per second = 101.9406477312 m3/h
-
-        [Description("g")]          g,          ///   0.001 kg
-        [Description("oz")]         oz,         ///   0.0283495231 kg
-        [Description("lb")]         lb,         ///   0.45359237 kg
-        [Description("kg")]         kg,         /// * 1 kilogram
-        [Description("t")]          t,          ///   1000 kg
-
-        [Description("ms")]         ms,         ///   1 ms = 0.001 s
-        [Description("s")]          s,          /// * 1 second
-        [Description("min")]        min,        ///   1 min = 60 s
-        [Description("hr")]         hour,       ///   1 hour = 60 min = 3600 s
-
-		[Description("°C")]         C,          /// * degree Celsius (°C)
-        [Description("°F")]         F,          ///   degree Fahrenheit
-        [Description("K")]          K,          ///   degree Kelvin
-
-        [Description("Pa")]         Pa,         ///   1 Pa = 0.01 hPa
-        [Description("hPa")]        hPa,        ///   1 hPa = 100 Pa
-        [Description("mbar")]       mbar,       ///   1 mbar = 1 hPa = 100 Pa
-        [Description("kPa")]        kPa,        ///   1 kPa = 10 hPa = 1000 Pa
-        [Description("inHg")]       inHg,       ///   1 inHg = 33.864 hPa
-        [Description("psi")]        psi,        ///   1 psi = 0.0689475729 bar
-        [Description("bar")]        bar,        /// * 1 Bar = 1000 mbar = 0.1 MPa = 100000 Pa
-        [Description("MPa")]        MPa,        ///   1 MPa = 10000 hPa
-
-        [Description("R%")]         RPct,       /// * 1 R%
-
-        [Description("promile")]    Promile,    ///   1 promile = 0.1 %
-        [Description("%")]          Pct,        /// * 1 %
-
-        [Description("mm")]         mm,         /// * 1 millimeter
-        [Description("cm")]         cm,         ///   1 cm = 10 mm
-        [Description("in")]         inch,       ///   1 inch = 25.4 mm
-        [Description("dm")]         dm,         ///   1 dm = 100 mm
-        [Description("ft")]         foot,       ///   1 foot = 304.8 mm
-        [Description("yd")]         yard,       ///   1 yard = 914.4 mm
-        [Description("m")]          m,          ///   1 m = 1000 mm
-
-        [Description("kg/m3")]      kgpm3,		/// * 1 kg/m3 = 0.001 kg/l
-        [Description("kg/l")]       kgpl,		///   1 kg/l = 1000 kg/m3
-
-        [Description("J")]          J,			/// * 1 Joul
-        [Description("kJ")]         kJ,			///   1 kJ = 1000 J
-        [Description("MJ")]         MJ,         ///   1 MJ = 1000000 J
-        [Description("Wh")]         Wh,			///   1 Wh = 3600 J
-        [Description("kWh")]        kWh,		///   1 kWh = 3600000 J
-        [Description("MWh")]        MWh,		///   1 MWh = 3600000000 J
-
-        [Description("uS/cm")]      uSpcm,      /// * 1 uS/cm
-        [Description("mS/m")]       mSpm,       ///   1 mS/m = 10 uS/cm
-
-#if LANG_PL
-        [Description("imp/l")]       ppl,		/// * 1 pulse/l
-        [Description("imp/dm3")]     ppdm3,		/// * 1 pulse/dm3
-        [Description("stopień/l")]   degpl,		/// * 1 degree/l
-        [Description("stopień/dm3")] degpdm3,	/// * 1 degree/dm3
-        [Description("l/imp")]       lpp,		/// * 1 l/pulse
-        [Description("dm3/imp")]     dm3pp,		/// * 1 dm3/pulse
-        [Description("l/stopień")]   lpdeg,		/// * 1 l/degree
-        [Description("dm3/stopień")] dm3pdeg,	/// * 1 dm3/degree
-#else
-        [Description("pulse/l")]    ppl,		/// * 1 pulse/l
-        [Description("pulse/dm3")]  ppdm3,		///   1 pulse/dm3
-        [Description("degree/l")]   degpl,		///   1 degree/l
-        [Description("degree/dm3")] degpdm3,	///   1 degree/dm3
-        [Description("l/pulse")]    lpp,		///   1 l/pulse
-        [Description("dm3/pulse")]  dm3pp,		///   1 dm3/pulse
-        [Description("l/degree")]   lpdeg,		///   1 l/degree
-        [Description("dm3/degree")] dm3pdeg,	///   1 dm3/degree
-#endif
-        /// 
-        [Description("pulse/kWh")]  ppkWh,		/// * 1 pulse/kWh
-        [Description("kWh/pulse")]  kWhpp,		///   1 kWh/pulse
-        
-        ///
-        [Description("A")]  A, /// *1 A
-	    [Description("mA")] mA, /// 1 mA = 0.001 A
-        ///
-        [Description("V")]  V, /// *1 V
-        [Description("mV")] mV, /// 1 mV = 0.001 V                     
-                               
-                                                
-        Count
-    }
-
-	public enum Quantity
-	{
-        /// Quantities with units and conversions (double -> double)
-#if LANG_DE
-		[Description("Volumen")]			Volume,
-		[Description("Durchfluss")]			Flow,
-		[Description("Masse")]				Mass,
-        [Description("Zeit")]				Time,
-        [Description("Temperatur")]			Temperature,
-		[Description("Druck")]				Pressure,
-        [Description("Feuchtigkeit")]		Humidity,
-        [Description("Fehler")]				Error,
-		[Description("Länge")]				Length,
-		[Description("Dichte")]				Density,
-		[Description("Energie")]			Energy,
-		[Description("Impulse")]			Pulses,
-        [Description("Impulse/l")]			PulsePerLtr,
-        [Description("Impulse/kWh")]		PulsePerKWh,
-        [Description("Leitfähigkeit")]      Conductivity,
-
-        /// Quantities without units and conversions
-        [Description("Nummer")]				Number,
-        [Description("Text")]				String,
-        [Description("Boolean")]			Boolean,
-        [Description("Datum und Uhrzeit")]  DateTime,
-        [Description("Aufgezählt")]         Enumerated,
-        [Description("Strom")]              Current,
-		[Description("Spannung")]           Voltage,
-#elif LANG_PL
-        [Description("Objętość")]			Volume,
-		[Description("Przepływ")]           Flow,
-		[Description("Masa")]				Mass,
-        [Description("Czas")]				Time,
-        [Description("Temperatura")]		Temperature,
-		[Description("Ciśnienie")]			Pressure,
-        [Description("Wilgotność")]			Humidity,
-        [Description("Błąd")]				Error,
-		[Description("Długość")]			Length,
-		[Description("Gęstość")]			Density,
-		[Description("Energia")]			Energy,
-        [Description("Impulsy")]            Pulses,
-        [Description("Impulsy/litr")]       PulsePerLtr,
-        [Description("Impulsy/kWh")]		PulsePerKWh,
-        [Description("Przewodność")]        Conductivity,
-
-        /// Quantities without units and conversions
-        [Description("Numer")]				Number,
-        [Description("Tekst")]				String,
-        [Description("Boolean")]			Boolean,
-        [Description("Data i czas")]		DateTime,
-        [Description("Wyliczone")]          Enumerated,
-        [Description("Prąd")]               Current,
-        [Description("Napięcie")]            Voltage,
-#elif LANG_CS
-		[Description("Objem")]				Volume,
-		[Description("Průtok")]				Flow,
-		[Description("Hmotnost")]           Mass,
-        [Description("Čas")]				Time,
-        [Description("Teplota")]			Temperature,
-		[Description("Tlak")]				Pressure,
-        [Description("Vlhkost")]			Humidity,
-        [Description("Chyba")]				Error,
-		[Description("Délka")]				Length,
-		[Description("Hustota")]			Density,
-		[Description("Energie")]			Energy,
-		[Description("Pulzy")]				Pulses,
-        [Description("Pulzy/litr")]			PulsePerLtr,
-        [Description("Pulzy/kWh")]			PulsePerKWh,
-        [Description("Vodivost")]           Conductivity,
-
-        /// Quantities without units and conversions
-        [Description("Počet")]				Number,
-        [Description("Text")]				String,
-        [Description("Boolean")]			Boolean,
-        [Description("Datum a čas")]		DateTime,
-        [Description("Vyjmenované")]        Enumerated,
-		[Description("Proud")]				Current,
-		[Description("Napětí")]            Voltage,
-#elif LANG_IT
-		[Description("Volume")]				Volume,
-		[Description("Flusso")]				Flow,
-		[Description("Massa")]              Mass,
-        [Description("Tempo")]				Time,
-        [Description("Temperatura")]	    Temperature,
-		[Description("Pressione")]			Pressure,
-        [Description("Umidità")]			Humidity,
-        [Description("Errore")]				Error,
-		[Description("Lungezza")]			Length,
-		[Description("Densità")]			Density,
-		[Description("Energia")]			Energy,
-		[Description("Impulso")]			Pulses,
-        [Description("Impulso/litro")]		PulsePerLtr,
-        [Description("Impulso/kWh")]		PulsePerKWh,
-        [Description("Conduttività")]       Conductivity,
-
-        /// Quantities without units and conversions
-        [Description("Numero")]				Number,
-        [Description("Stringa")]			String,
-        [Description("Boolean")]			Boolean,
-        [Description("Data e ora")]		    DateTime,
-        [Description("Enumerato")]          Enumerated,
-		[Description("Corrente")]            Current,
-		[Description("Voltaggio")]            Voltage,
-#else
-        [Description("Volume")]				Volume,
-		[Description("Flow")]				Flow,
-		[Description("Mass")]				Mass,
-        [Description("Time")]				Time,
-        [Description("Temperature")]		Temperature,
-		[Description("Pressure")]			Pressure,
-        [Description("Humidity")]			Humidity,
-        [Description("Error")]				Error,
-		[Description("Length")]				Length,
-		[Description("Density")]			Density,
-		[Description("Energy")]				Energy,
-		[Description("Pulses")]				Pulses,
-        [Description("Pulses/liter")]		PulsePerLtr,
-        [Description("Pulses/kWh")]			PulsePerKWh,
-        [Description("Conductivity")]       Conductivity,
-
-        /// Quantities without units and conversions
-        [Description("Number")]				Number,
-        [Description("String")]				String,
-        [Description("Boolean")]			Boolean,
-        [Description("Date and time")]		DateTime,
-        [Description("Enumerated")]         Enumerated,
-		[Description("Current")]            Current,
-		[Description("Voltage")]            Voltage,
-#endif
-        Count,
-	}
-
-    public static class Units
-    {
-        public static bool IsUnitless(Quantity quantity)
-        {
-            return quantity >= Quantity.Number;
-        }
-
-        public static bool IsDefaultUnit(Unit unit)
-        {
-            return unit == Unit.l || unit == Unit.m3ph || unit == Unit.kg || unit == Unit.s || unit == Unit.C ||
-                   unit == Unit.bar || unit == Unit.RPct || unit == Unit.Pct || unit == Unit.mm || unit == Unit.kgpm3 ||
-                   unit == Unit.J || unit == Unit.uSpcm || unit == Unit.ppl || unit == Unit.ppkWh || unit == Unit.A || 
-                   unit == Unit.V;
-        }
-
-        public static bool IsQuantity(Unit unit, Quantity quantity)
-        {
-            return (quantity == GetQuantity(unit));
-        }
-
-        public static Quantity GetQuantity(Unit unit)
-		{
-            switch (unit)
-            {
-                case Unit.pulse:
-                case Unit.degree:
-                    return Quantity.Pulses;
-
-                case Unit.ml:
-                case Unit.l:
-                case Unit.dm3:
-                case Unit.USgal:
-                case Unit.UKgal:
-                case Unit.cf:
-                case Unit.m3:
-					return Quantity.Volume;
-
-                case Unit.lph:
-                case Unit.cfph:
-                case Unit.lpm:
-                case Unit.USgalpm:
-                case Unit.m3ph:
-                case Unit.lps:
-                case Unit.USgalps:
-                case Unit.m3pm:
-                case Unit.cfs:
-                    return Quantity.Flow;
-
-                case Unit.g:
-                case Unit.oz:
-                case Unit.lb:
-                case Unit.kg:
-                case Unit.t:
-					return Quantity.Mass;
-
-                case Unit.ms:
-                case Unit.s:
-                case Unit.min:
-                case Unit.hour:
-                    return Quantity.Time;
-
-                case Unit.C:
-                case Unit.F:
-                case Unit.K:
-					return Quantity.Temperature;
-
-                case Unit.Pa:
-                case Unit.hPa:
-                case Unit.mbar:
-                case Unit.kPa:
-                case Unit.inHg:
-                case Unit.psi:
-                case Unit.bar:
-                case Unit.MPa:
-                    return Quantity.Pressure;
-
-                case Unit.RPct:
-                    return Quantity.Humidity;
-
-                case Unit.Promile:
-                case Unit.Pct:
-					return Quantity.Error;
-
-                case Unit.mm:
-                case Unit.cm:
-                case Unit.inch:
-                case Unit.dm:
-                case Unit.foot:
-                case Unit.yard:
-                case Unit.m:
-					return Quantity.Length;
-
-				case Unit.kgpm3:
-				case Unit.kgpl:
-					return Quantity.Density;
-
-				case Unit.J:
-				case Unit.kJ:
-                case Unit.MJ:
-                case Unit.Wh:
-				case Unit.kWh:
-                case Unit.MWh:
-                    return Quantity.Energy;
-
-                case Unit.uSpcm:
-                case Unit.mSpm:
-                    return Quantity.Conductivity;
-
-                case Unit.ppl:
-                case Unit.ppdm3:
-                case Unit.degpl:
-                case Unit.degpdm3:
-                case Unit.lpp:
-                case Unit.dm3pp:
-                case Unit.lpdeg:
-                case Unit.dm3pdeg:
-                    return Quantity.PulsePerLtr;
-
-                case Unit.ppkWh:
-                case Unit.kWhpp:
-                    return Quantity.PulsePerKWh;
-                
-                case Unit.A:
-                case Unit.mA:
-		                return Quantity.Current;
-                
-                case Unit.V:
-                case Unit.mV:
-	                return Quantity.Voltage;
-
-                default:
-					return Quantity.Number;
-            }
-		}
-
-		public static bool IsVolume(Unit unit)       { return IsQuantity(unit, Quantity.Volume); }
-		public static bool IsFlow(Unit unit)         { return IsQuantity(unit, Quantity.Flow); }
-        public static bool IsMass(Unit unit)         { return IsQuantity(unit, Quantity.Mass); }
-        public static bool IsTime(Unit unit)         { return IsQuantity(unit, Quantity.Time); }
-        public static bool IsTemperature(Unit unit)  { return IsQuantity(unit, Quantity.Temperature); }
-		public static bool IsPressure(Unit unit)     { return IsQuantity(unit, Quantity.Pressure); }
-        public static bool IsHumidity(Unit unit)     { return IsQuantity(unit, Quantity.Humidity); }
-        public static bool IsError(Unit unit)        { return IsQuantity(unit, Quantity.Error); }
-		public static bool IsLength(Unit unit)       { return IsQuantity(unit, Quantity.Length); }
-		public static bool IsDensity(Unit unit)      { return IsQuantity(unit, Quantity.Density); }
-		public static bool IsEnergy(Unit unit)       { return IsQuantity(unit, Quantity.Energy); }
-        public static bool IsPulses(Unit unit)       { return IsQuantity(unit, Quantity.Pulses); }
-        public static bool IsPulsePerLtr(Unit unit)  { return IsQuantity(unit, Quantity.PulsePerLtr); }
-        public static bool IsPulsePerKWh(Unit unit)  { return IsQuantity(unit, Quantity.PulsePerKWh); }
-        public static bool IsConductivity(Unit unit) { return IsQuantity(unit, Quantity.Conductivity); }
-        public static bool IsCurrent(Unit unit) { return IsQuantity(unit, Quantity.Current); }
-        public static bool IsVoltage(Unit unit) { return IsQuantity(unit, Quantity.Voltage); }
-
-
-
-        public static float ConvertTo(Unit unit, float v)
-        {
-            return (float)ConvertTo(unit, (double)v);
-        }
-
-        public static double ConvertTo(Unit unit, double v)
-        {
-            switch (unit)
-            {
-                /// Volume: internal representation in l
-                case Unit.ml:       return 1000 * v;            /// 1 ml = 0.001 l
-                case Unit.USgal:    return 0.26417205 * v;      /// 1 gal(US) = 3.78541178 l
-                case Unit.UKgal:    return 0.21996925 * v;      /// 1 gal(UK) = 4.54609 l
-                case Unit.cf:       return 0.0353146667215 * v; /// 1 cubic foot = 28.316846592 l
-                case Unit.m3:       return 0.001 * v;           /// 1 m3 = 1000 l
-
-                /// Flow: internal representation in m3/h
-                case Unit.lph:      return 1000 * v;            /// 1 l/h
-                case Unit.cfph:     return 35.3146667214886 * v;/// 1 cf/h
-                case Unit.lpm:      return v / 0.06;            /// 1 l/m
-                case Unit.USgalpm:  return 4.40286754395493 * v;/// 1 US gallon per minute
-                case Unit.lps:      return v / 3.6;             /// 1 l/s
-                case Unit.USgalps:  return 0.0733811257326 * v; /// 1 US gallon per second
-                case Unit.m3pm:     return v / 60;              /// 1 m3/m
-                case Unit.cfs:      return 0.009809629644858 * v; /// 1 cubic foot per second
-
-                /// Mass: internal representation in kg
-                case Unit.g:        return 1000 * v;            /// 1 g = 0.001 kg
-                case Unit.oz:       return 35.273962 * v;       /// 1 oz = 0.0283495231 kg
-                case Unit.lb:       return 2.2046226 * v;       /// 1 lb = 0.45359237 kg
-                case Unit.t:        return 0.001 * v;           /// 1 t = 1000 kg
-
-                /// Time or duration: internal representation in seconds [s] 
-                case Unit.ms:       return 1000 * v;
-                case Unit.min:      return v / 60;
-                case Unit.hour:     return v / 3600;
-
-				/// Temperature: internal representation in °C
-                case Unit.F:        return 1.8 * v + 32;        /// degree Fahrenheit
-                case Unit.K:        return v + 273.15;          /// degree Kelvin
-
-                /// Pressure: internal representation in  bar = 0.1 MPa
-                case Unit.Pa:       return 100000 * v;          /// 1 hPa = 100 Pa
-                case Unit.hPa:      return 1000 * v;            /// 1 hPa = 100 Pa
-                case Unit.mbar:     return 1000 * v;            /// 1 mbar = 1 hPa = 100 Pa
-                case Unit.kPa:      return 100 * v;             /// 1 kPa = 10 HPa
-                case Unit.inHg:     return 29.53 * v;           /// 1 inHg =
-                case Unit.psi:      return 14.5037738 * v;      /// 1 psi =
-                case Unit.MPa:      return 0.1 * v;             /// 1 MPa = 10000 hPa
-
-                /// Relative error: internal representation in %
-                case Unit.Promile:  return 10 * v;              /// 1 promile = 0.1 %
-
-                /// Diameter, length: internal representation in mm
-                case Unit.cm:       return 0.1 * v;             /// 1 cm = 10 mm
-                case Unit.inch:     return v / 25.4;            /// 1 inch = 25.4 mm
-                case Unit.dm:       return 0.01 * v;            /// 1 dm = 100 mm
-                case Unit.foot:     return v / 304.8;           /// 1 foot = 304.8 mm
-                case Unit.yard:     return v / 914.4;           /// 1 yard = 914,4 mm
-                case Unit.m:        return 0.001 * v;           /// 1 m = 1000 mm
-                                                                
-				/// Density: internal representation in kg/m3
-				case Unit.kgpl:     return 0.001 * v;
-
-				/// Energy, internal representation in Joul
-				case Unit.kJ:       return 0.001 * v;           /// 1 kJ = 1000 J
-                case Unit.MJ:       return 0.000001 * v;        /// 1 kJ = 1000000 J
-                case Unit.Wh:       return v / 3600.0;          /// 1 Wh = 3600 J
-				case Unit.kWh:      return v / 3600000.0;       /// 1 kWh = 3600000 J
-                case Unit.MWh:      return v / 3600000000.0;    /// 1 MWh = 3600000000 J
-
-                /// Electrical conductivity
-                case Unit.mSpm:     return 0.1 * v;
-
-                /// Invert pulses
-                case Unit.kWhpp:
-                case Unit.lpp:
-                case Unit.dm3pp:
-                case Unit.lpdeg:
-                case Unit.dm3pdeg:  return (v <= float.Epsilon) ? 0 : 1/v;
-                
-                /// Current: internal representation in A
-                case Unit.mA:       return 1000 * v;           /// 1000 mA = 1 A
-                                                                
-                /// Voltage: internal representation in V
-                case Unit.mV:     return 1000 * v;				/// 1000 mV = 1 V
-
-
-                default:            return v;                   /// Do not convert
-            }
-        }
-
-
-        public static float ConvertFrom(Unit unit, float v)
-        {
-            return (float)ConvertFrom(unit, (double)v);
-        }
-
-        public static double ConvertFrom(Unit unit, double v)
-        {
-            switch (unit)
-            {
-                /// Volume: internal representation in l
-                case Unit.ml:       return 0.001 * v;           /// 0.001 l
-                case Unit.USgal:    return 3.78541178 * v;      /// 1 gal(US) = 3.78541178 l
-                case Unit.UKgal:    return 4.54609 * v;         /// 1 gal(UK) = 4.54609 l
-                case Unit.cf:       return 28.316846592 * v;    /// 1 cubic foot = 28.316846592 l
-                case Unit.m3:       return 1000 * v;            /// 1000 l
-
-                /// Flow: internal representation in m3/h
-                case Unit.lph:      return 0.001 * v;           /// 1 l/h
-                case Unit.cfph:     return 0.028316846592 * v;  /// 1 cf/h
-                case Unit.lpm:      return 0.06 * v;            /// 1 l/m
-                case Unit.USgalpm:  return 0.2271247068 * v;    /// 1 US gallon per minute
-                case Unit.lps:      return 3.6 * v;             /// 1 l/s
-                case Unit.USgalps:  return 13.627482408 * v;    /// 1 US gallon per second
-                case Unit.m3pm:     return 60 * v;              /// 1 m3/m
-                case Unit.cfs:      return 101.9406477312 * v;  /// 1 cubic foot per second
-
-                /// Mass: internal representation in kg
-                case Unit.g:        return 0.001 * v;           /// 1 g = 0.001 kg
-                case Unit.oz:       return 0.0283495231 * v;    /// 1 oz = 0.0283495231 kg
-                case Unit.lb:       return 0.45359237 * v;      /// 1 lb = 0.45359237 kg
-                case Unit.t:        return 1000 * v;            /// 1 t = 1000 kg
-
-                /// Time or duration: internal representation in seconds [s] 
-                case Unit.ms:       return 0.001 * v;
-                case Unit.min:      return 60 * v;
-                case Unit.hour:     return 3600 * v;
-
-				/// Temperature: internal representation in °C
-                case Unit.F:        return 5 * (v - 32) / 9;    /// degree Fahrenheit
-                case Unit.K:        return v - 273.15;          /// degree Kelvin
-
-                /// Pressure: internal representation in  bar = 0.1 MPa
-                case Unit.Pa:       return 0.00001 * v;         /// 1 hPa = 100 Pa
-                case Unit.hPa:      return 0.001 * v;           /// 1 hPa = 100 Pa
-                case Unit.mbar:     return 0.001 * v;           /// 1 mbar = 1 hPa = 100 Pa
-                case Unit.kPa:      return 0.01 * v;            /// 1 kPa = 10 HPa
-                case Unit.inHg:     return 0.033864 * v;        /// 1 inHg = 33.864 hPa
-                case Unit.psi:      return 0.0689475729 * v;    /// 1 psi = 0.0689475729 bar
-                case Unit.MPa:      return 10 * v;              /// 1 MPa = 10000 hPa
-
-                /// Relative error: internal representation in %
-                case Unit.Promile:  return 0.1 * v;             /// 1 promile = 0.1 %
-
-                /// Diameter, length: internal representation in mm
-                case Unit.cm:       return 10 * v;              /// 1 cm = 10 mm
-                case Unit.inch:     return 25.4 * v;            /// 1 inch = 25.4 mm
-                case Unit.dm:       return 100 * v;             /// 1 dm = 100 mm
-                case Unit.foot:     return 304.8 * v;           /// 1 foot = 304.8 mm
-                case Unit.yard:     return 914.4 * v;           /// 1 yard = 914,4 mm
-                case Unit.m:        return 1000 * v;            /// 1 m = 1000 mm
-
-				/// Density: internal representation in kg/m3
-				case Unit.kgpl:     return 1000 * v;
-
-				/// Energy, internal representation in Joul
-				case Unit.kJ:		return 1000 * v;            /// 1 kJ = 1000 J
-                case Unit.MJ:       return 1000000 * v;         /// 1 kJ = 1000000 J
-                case Unit.Wh:       return 3600 * v;            /// 1 Wh = 3600 J
-				case Unit.kWh:		return 3600000 * v;         /// 1 kWh = 3600000 J
-                case Unit.MWh:      return 3600000000 * v;      /// 1 kWh = 3600000000 J
-
-                /// Electrical conductivity
-                case Unit.mSpm:     return 10 * v;
-                
-                /// Current: internal representation in A
-                case Unit.mA:       return 0.001 * v;           /// 1 mA = 0.001 A
-                                                                
-                /// Voltage: internal representation in V
-                case Unit.mV:     return 0.001 * v;				/// 1 mV = 0.001 V
-
-                /// Invert
-                case Unit.kWhpp:
-                case Unit.lpp:
-                case Unit.dm3pp:
-                case Unit.lpdeg:
-                case Unit.dm3pdeg:  return (v <= float.Epsilon) ? 0 : 1/v;
-
-                default:            return v;                   /// Do not convert
-            }
-        }
-
-        /// <summary>
-        /// Converts a string to a unit
-        /// </summary>
-        /// <param name="description">Unit description string</param>
-        /// <returns>Converted unit or Unit.None if not recognized</returns>
-        public static Unit FromDescription(string description)
-        {
-            for (Unit unit = 0; unit < Unit.Count; unit++)
-            {
-                if (unit.ToDescription() == description) return unit;
-            }
-
-            return Unit.None;
-        }
-	}
-}

Common/Utils.cs

@@ -1,357 +1,12 @@
-///
-/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
-///
-using System;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace Common
 {
-    public static class Utils
+    public class Utils
     {
-        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);
-        }
-
-        public static string ToNiceString(double value, int sigDigits)
-        {
-            string format = SignificantDigitsToFmt(value, sigDigits);
-            return (format == "F0") ? value.ToString("F0") : value.ToString(format).TrimEnd(new char[] { '0' });
-        }
-
-        public static FlowNames ProfileType2FlowNames(ProfileType pt, bool isAux = false)
-        {
-            switch (pt)
-            {
-                case ProfileType.Q3R:
-                case ProfileType.CompoundQ3RQ3R:
-                    return FlowNames.Q3Q2Q1;
-                case ProfileType.CompoundQ3RQnClass:
-                    return isAux ? FlowNames.QnQtQmin : FlowNames.Q3Q2Q1;
-                case ProfileType.QnClassColdWater:
-                case ProfileType.QnClassHotWater:
-                case ProfileType.CompoundQnClassQnClass:
-                    return FlowNames.QnQtQmin;
-                case ProfileType.CompoundQnClassQ3R:
-                    return isAux ? FlowNames.Q3Q2Q1 : FlowNames.QnQtQmin;
-                case ProfileType.QpQi:
-                case ProfileType.CompoundQpQiQpQi:
-                    return FlowNames.QpQi;
-                default:
-                    return FlowNames.Q3Q2Q1;
-            }
-        }
-
-        public static string SignificantDigitsToFmt(double value, int sigDigits)
-        {
-            if (sigDigits == 6)
-            {
-                if (value >= 99999.5 || value < -99999.5) return "F0";
-                else if (value >= 9999.95 || value < -9999.95) return "F1";
-                else if (value >= 999.995 || value < -999.995) return "F2";
-                else if (value >= 99.9995 || value < -99.9995) return "F3";
-                else if (value >= 9.99995 || value < -9.99995) return "F4";
-                else if (value >= 0.999995 || value < -0.999995) return "F5";
-                else if (value >= 0.0999995 || value < -0.0999995) return "F6";
-                else if (value >= 0.00999995 || value < -0.00999995) return "F7";
-                else if (value >= 0.000999995 || value < -0.000999995) return "F8";
-                else if (value >= 0.0000999995 || value < -0.0000999995) return "F9";
-                else return "F10";
-            }
-            else if (sigDigits == 5)
-            {
-                if (value >= 9999.5 || value < -9999.5) return "F0";
-                else if (value >= 999.95 || value < -999.95) return "F1";
-                else if (value >= 99.995 || value < -99.995) return "F2";
-                else if (value >= 9.9995 || value < -9.9995) return "F3";
-                else if (value >= 0.99995 || value < -0.99995) return "F4";
-                else if (value >= 0.099995 || value < -0.099995) return "F5";
-                else if (value >= 0.0099995 || value < -0.0099995) return "F6";
-                else if (value >= 0.00099995 || value < -0.00099995) return "F7";
-                else if (value >= 0.000099995 || value < -0.000099995) return "F8";
-                else return "F9";
-            }
-            else if (sigDigits == 4)
-            {
-                if (value >= 999.5 || value < -999.5) return "F0";
-                else if (value >= 99.95 || value < -99.95) return "F1";
-                else if (value >= 9.995 || value < -9.995) return "F2";
-                else if (value >= 0.9995 || value < -0.9995) return "F3";
-                else if (value >= 0.09995 || value < -0.09995) return "F4";
-                else if (value >= 0.009995 || value < -0.009995) return "F5";
-                else if (value >= 0.0009995 || value < -0.0009995) return "F6";
-                else if (value >= 0.00009995 || value < -0.00009995) return "F7";
-                else return "F8";
-            }
-            else if (sigDigits == 3)
-            {
-                if (value >= 99.5 || value < -99.5) return "F0";
-                else if (value >= 9.95 || value < -9.95) return "F1";
-                else if (value >= 0.995 || value < -0.995) return "F2";
-                else if (value >= 0.0995 || value < -0.0995) return "F3";
-                else if (value >= 0.00995 || value < -0.00995) return "F4";
-                else if (value >= 0.000995 || value < -0.000995) return "F5";
-                else if (value >= 0.0000995 || value < -0.0000995) return "F6";
-                else return "F7";
-            }
-            else if (sigDigits == 2)
-            {
-                if (value >= 9.5 || value < -9.5) return "F0";
-                else if (value >= 0.95 || value < -0.95) return "F1";
-                else if (value >= 0.095 || value < -0.095) return "F2";
-                else if (value >= 0.0095 || value < -0.0095) return "F3";
-                else if (value >= 0.00095 || value < -0.00095) return "F4";
-                else if (value >= 0.000095 || value < -0.000095) return "F5";
-                else return "F6";
-            }
-            else /// if (sigDigits == 1)
-            {
-                if (value >= 0.95 || value < -0.95) return "F0";
-                else if (value >= 0.095 || value < -0.095) return "F1";
-                else if (value >= 0.0095 || value < -0.0095) return "F2";
-                else if (value >= 0.00095 || value < -0.00095) return "F3";
-                else if (value >= 0.000095 || value < -0.000095) return "F4";
-                else return "F5";
-            }
-        }
-
-        /// <summary>
-        /// Get either Q1 or Qmin flow for a given Qn and metrological class
-        /// </summary>
-        /// <param name="Qn">Nominal flow in m3/h</param>
-        /// <param name="metroClass">Metrological class ("A" ,"B", "C" or "R#")</param>
-        /// <param name="medium">NotSpecified, ColdWater or HotWater</param>
-        /// <param name="Qdflt">Default flow when metrologic does not match pattern</param>
-        /// <returns>Q1 or Qmin flow in m3/h</returns>
-        public static double GetQ1Qmin(double Qn, string metroClass, Medium medium = Medium.ColdWater, double Qdflt = 0)
-        {
-            if (string.IsNullOrEmpty(metroClass)) return Qdflt;
-
-            int metroClassRatio;
-            if ((metroClass[0] == 'R') && int.TryParse(metroClass.Substring(1), out metroClassRatio) && (metroClassRatio > 0))
-            {
-                return Qn / (double)metroClassRatio;
-            }
-            else
-            {
-                if (medium == Medium.HotWater)
-                {
-                    switch (metroClass)
-                    {
-                        case "A": return (Qn < 15) ? (0.04 * Qn) : (0.08 * Qn);
-                        case "B": return (Qn < 15) ? (0.02 * Qn) : (0.04 * Qn);
-                        case "C": return (Qn < 15) ? (0.01 * Qn) : (0.02 * Qn);
-                        case "D": return (Qn < 15) ? (0.01 * Qn) : Qdflt;
-                        default: break;
-                    }
-                }
-                else
-                {
-                    switch (metroClass)
-                    {
-                        case "A": return (Qn < 15) ? (0.04 * Qn) : (0.08 * Qn);
-                        case "B": return (Qn < 15) ? (0.02 * Qn) : (0.03 * Qn);
-                        case "C": return (Qn < 15) ? (0.01 * Qn) : (0.006 * Qn);
-                        default: break;
-                    }
-                }
-            }
-
-            return Qdflt;
-        }
-
-        /// <summary>
-        /// Get either Q2 or Qt flow for a given Qn and metrological class
-        /// </summary>
-        /// <param name="Qn">Nominal flow in m3/h</param>
-        /// <param name="metroClass">Metrological class ("A" ,"B", "C" or "R#")</param>
-        /// <param name="medium">NotSpecified, ColdWater or HotWater</param>
-        /// <param name="Qdflt">Default flow when metrologic does not match pattern</param>
-        /// <returns>Q2 or Qt flow in m3/h</returns>
-        public static double GetQ2Qt(double Qn, string metroClass, Medium medium = Medium.ColdWater, double Qdflt = 0)
-        {
-            if (string.IsNullOrEmpty(metroClass)) return Qdflt;
-
-            int metroClassRatio;
-            if ((metroClass[0] == 'R') && int.TryParse(metroClass.Substring(1), out metroClassRatio) && (metroClassRatio > 0))
-            {
-                return 1.6 * Qn / (double)metroClassRatio;
-            }
-
-            if (medium == Medium.HotWater)
-            {
-                switch (metroClass)
-                {
-                    case "A": return (Qn < 15) ? (0.1 * Qn) : (0.2 * Qn);
-                    case "B": return (Qn < 15) ? (0.08 * Qn) : (0.15 * Qn);
-                    case "C": return (Qn < 15) ? (0.06 * Qn) : (0.1 * Qn);
-                    case "D": return (Qn < 15) ? (0.015 * Qn) : Qdflt;
-                    default: break;
-                }
-            }
-            else
-            {
-                switch (metroClass)
-                {
-                    case "A": return (Qn < 15) ? (0.1 * Qn) : (0.3 * Qn);
-                    case "B": return (Qn < 15) ? (0.08 * Qn) : (0.2 * Qn);
-                    case "C": return (Qn < 15) ? (0.015 * Qn) : (0.015 * Qn);
-                    default: break;
-                }
-            }
-
-            return Qdflt;
-        }
-
-        /// <summary>
-        /// Get either Q4 or Qmax flow for a given Qn and metrological class
-        /// </summary>
-        /// <param name="Qn">Nominal flow in m3/h</param>
-        /// <param name="metroClass">Metrological class ("A" ,"B", "C" or "R#")</param>
-        /// <param name="medium">NotSpecified, ColdWater or HotWater</param>
-        /// <param name="Qdflt">Default flow when metrologic does not match pattern</param>
-        /// <returns>Q4 or Qmax flow in m3/h</returns>
-        public static double GetQ4Qmax(double Qn, string metroClass, Medium medium = Medium.ColdWater, double Qdflt = 0)
-        {
-            if (string.IsNullOrEmpty(metroClass)) return Qdflt;
-
-            switch (metroClass[0])
-            {
-                case 'A':
-                case 'B':
-                case 'C':
-                case 'D':
-                    return 2 * Qn;
-                case 'R':
-                    return 1.25 * Qn;
-                default:
-                    return Qdflt;
-            }
-        }
-
-
-        /// <summary>
-        /// Checks requirements on the password regardless of the password history
-        /// </summary>
-        /// <param name="password">Password</param>
-        /// <returns>true when the password is OK</returns>
-        public static bool IsPasswordMeetsRequirements(string password, out string explanation)
-        {
-            int length = string.IsNullOrEmpty(password) ? 0 : password.Length;
-
-            /// Password length must be at least 6
-            if (length < CurrentUser.MinPasswdLength)
-            {
-                explanation = string.Format("Password must have at least {0} characters", CurrentUser.MinPasswdLength);
-                return false;
-            }
-            else
-            {
-                explanation = string.Empty;
-                return true;
-            }
-        }
-
-        /// <summary>
-        /// getHash encrypts a string 
-        /// </summary>
-        /// <param name="text">the string to encrypt</param>
-        /// <returns></returns>
-        public static string GetHash(string text)
-        {
-            byte[] bytes = System.Text.Encoding.Unicode.GetBytes(text);
-            System.Security.Cryptography.SHA512Managed hashstring = new System.Security.Cryptography.SHA512Managed();
-            byte[] hash = hashstring.ComputeHash(bytes);
-            string hashString = string.Empty;
-            foreach (byte x in hash)
-            {
-                hashString += String.Format("{0:x2}", x);
-            }
-            return hashString;
-        }
-
-        public static string EncodedStrToUserName(string encodedStr)
-        {
-            string[] subStrings = encodedStr.Split(new char[] { '~' });
-            return (subStrings.Length >= 1) ? subStrings[0] : string.Empty;
-        }
-
-        public static string EncodedStrToFullName(string encodedStr)
-        {
-            string[] subStrings = encodedStr.Split(new char[] { '~' });
-            return (subStrings.Length >= 2) ? subStrings[1] : string.Empty;
-        }
-
-        public static string EncodedStrToLegalizator(string encodedStr)
-        {
-            string[] subStrings = encodedStr.Split(new char[] { '~' });
-            return (subStrings.Length >= 3) ? subStrings[2] : string.Empty;
-        }
-
-        /// <summary>
-        /// Returns 'true' when authentication data are valid for a power user.
-        /// </summary>
-        /// <param name="userName">User name</param>
-        /// <param name="password">Password</param>
-        /// <returns>true = authenticated, false = refused</returns>
-        public static bool IsPowerUser(string userName, string password)
-        {
-            DateTime date = DateTime.Now.Date;
-            int number = (date.Year % 10) + 10 * (date.Month - 1) + 120 * date.Day;
-            string passwordOfDay = Convert.ToString(number, 8);
-
-            return (userName.Equals("milan") && password.Equals("kraken")) ||
-                   (userName.Equals("igor") && password.Equals("mojronko8")) ||
-                   (userName.Equals("lubo1212") && password.Equals("Tatry52")) ||
-                   (userName.Equals("Michal") && password.Equals("Plok789456123")) ||
-                   (userName.Equals("martin") && password.Equals("vaclavek84")) ||
-                   (userName.Equals("pakan") && password.Equals("kuriatko")) ||
-                   (userName.Equals("jan") && password.Equals("jaugust")) ||
-                   (userName.Equals("JCermak") && password.Equals("Zt6911")) ||
-                   (userName.Equals("gilles") && password.Equals("alibaba")) ||
-                   (userName.Equals(passwordOfDay) && password.Equals(passwordOfDay));
-        }
-
-        public static void CalculateFeatureVector(Iperl.OptoTelegramRaw[] optoData, int optoDataCount, int startIx, int endIx, ref float[] x)
-        {
-            if (startIx < 0 || endIx >= optoDataCount || startIx >= endIx) return;
-
-            int n = 0;
-            Int64 sumFlow = 0;
-            Int64 sumFlow2 = 0;
-            Int64 sumEmf = 0;
-            Int64 sumEmf2 = 0;
-            Int64 sumMagF = 0;
-            Int64 sumMagF2 = 0;
-            Int64 sumImp = 0;
-            Int64 sumImp2 = 0;
-
-            for (int ix = startIx; ix <= endIx; ix++)
-            {
-                if (optoData[ix].Flags == Iperl.OptoTelegramFlags.OK ||
-                    optoData[ix].Flags == Iperl.OptoTelegramFlags.OK_TestStart ||
-                    optoData[ix].Flags == Iperl.OptoTelegramFlags.OK_TestEnd)
-                {
-                    n++;
-                    sumFlow += optoData[ix].FlowRaw;
-                    sumFlow2 += ((int)optoData[ix].FlowRaw * (int)optoData[ix].FlowRaw);
-                    sumEmf += (int)optoData[ix].EmfRaw;
-                    sumEmf2 += ((Int64)optoData[ix].EmfRaw * (Int64)optoData[ix].EmfRaw);
-                    sumMagF += optoData[ix].MagneticFieldRaw;
-                    sumMagF2 += ((int)optoData[ix].MagneticFieldRaw * (int)optoData[ix].MagneticFieldRaw);
-                    sumImp += optoData[ix].Impedance;
-                    sumImp2 += ((int)optoData[ix].Impedance * (int)optoData[ix].Impedance);
-                }
-            }
-
-            if (n >= 2)
-            {
-                if (x.Length > 0) x[0] = ((float)sumFlow2 - (float)sumFlow * (float)sumFlow / n) / (n - 1);
-                if (x.Length > 1) x[1] = ((float)sumEmf2 - (float)sumEmf * (float)sumEmf / n) / (n - 1);
-                if (x.Length > 2) x[2] = ((float)sumMagF2 - (float)sumMagF * (float)sumMagF / n) / (n - 1);
-                if (x.Length > 3) x[3] = ((float)sumImp2 - (float)sumImp * (float)sumImp / n) / (n - 1);
-            }
-        }
     }
 }

Common/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="log4net" version="2.0.15" targetFramework="net472" />
-</packages>

Config/Config.csproj

@@ -19,18 +19,18 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;JUZNA_AFRIKA_NEW</DefineConstants>
+    <DefineConstants>TRACE;MUNICH</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -43,7 +43,7 @@
       <HintPath>..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
     </Reference>
     <Reference Include="log4net">
-      <HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
+      <HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="MySql.Data">
       <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
@@ -68,17 +68,22 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CalendarEvent\ICalendarEvent.cs" />
+    <Compile Include="Data.cs" />
+    <Compile Include="DatabaseSettings.cs" />
     <Compile Include="Entities\BenchPath.cs" />
     <Compile Include="Entities\CustomEvent.cs" />
     <Compile Include="Entities\Component.cs" />
     <Compile Include="Entities\ComponentProcedure.cs" />
     <Compile Include="Entities\ComponentTest.cs" />
+    <Compile Include="Entities\Enums.cs" />
     <Compile Include="Entities\FeedingPath.cs" />
     <Compile Include="Entities\Group.cs" />
     <Compile Include="Entities\HeatMetersPath.cs" />
     <Compile Include="Entities\IHasItemNr.cs" />
     <Compile Include="Entities\IHasName.cs" />
     <Compile Include="Entities\IHasValves.cs" />
+    <Compile Include="Entities\IParamsProvider.cs" />
+    <Compile Include="Entities\IperlEnums.cs" />
     <Compile Include="Entities\MeasurementCorrection.cs" />
     <Compile Include="Entities\MetersPath.cs" />
     <Compile Include="Entities\OutputPath.cs" />
@@ -86,7 +91,6 @@
     <Compile Include="Entities\Profile.cs" />
     <Compile Include="Entities\PTest.cs" />
     <Compile Include="Entities\Test.cs" />
-    <Compile Include="Entities\TestInstance.cs" />
     <Compile Include="Entities\TransitionSequence.cs" />
     <Compile Include="Entities\TransitionStep.cs" />
     <Compile Include="Entities\Uncertainty.cs" />
@@ -95,6 +99,7 @@
     <Compile Include="Entities\VirtualBenchStep.cs" />
     <Compile Include="CalendarEvent\Utils.cs" />
     <Compile Include="FluentCommon.cs" />
+    <Compile Include="Formulas.cs" />
     <Compile Include="Mappings\BenchPathMap.cs" />
     <Compile Include="Mappings\ComponentMap.cs" />
     <Compile Include="Mappings\ComponentProcedureMap.cs" />
@@ -115,12 +120,13 @@
     <Compile Include="Mappings\UncertaintyMap.cs" />
     <Compile Include="Mappings\UserMap.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PurchaseResources.cs" />
     <Compile Include="Resources\Strings.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Strings.resx</DependentUpon>
     </Compile>
+    <Compile Include="Units.cs" />
+    <Compile Include="Utils.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\Strings.cs.resx" />
@@ -135,9 +141,9 @@
     <EmbeddedResource Include="Resources\Strings.zh-CN.resx" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Common\Common.csproj">
-      <Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
-      <Name>Common</Name>
+    <ProjectReference Include="..\Users\Users.csproj">
+      <Project>{6E5CB0E9-E1B6-4E5D-AC6E-B1049E180F2B}</Project>
+      <Name>Users</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

Config/Data.cs

@@ -0,0 +1,118 @@
+using System;
+
+namespace Config
+{
+	public class Data : Users.GlobalData
+	{
+		public const string AdminUsername = "admin";
+		public const string AdminPassword = "staratura";
+		public const string SQLiteDbFName = "SQLite.db";
+
+#if MUNICH
+		public const int WMsCount = 3;
+		public const int LineSize = 3;
+		public const int CompoundWMsCount = 3;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = 3;
+#elif DN100 || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || CEVAK_200
+		public const int WMsCount = 3;
+		public const int LineSize = 3;
+		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
+		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 || ROMA_200
+        public const int WMsCount = 10;
+        public const int LineSize = 10;
+        public const int CompoundWMsCount = 1;
+        public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
+#elif DUBAJ_50
+		public const int WMsCount = 10;
+		public const int LineSize = 5;
+		public const int CompoundWMsCount = 0;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
+#elif IZRAEL_50
+		public const int WMsCount = 40;
+		public const int LineSize = 10;
+		public const int CompoundWMsCount = 0;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
+#elif FUZHOU_100
+		public const int WMsCount = 10;
+		public const int LineSize = 10;
+		public const int CompoundWMsCount = 1;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
+#elif TORINO_50 || BADGER_MALA_TRAT || BERLIN || GELSENWASSER
+		public const int WMsCount = 6;
+		public const int LineSize = 6;
+		public const int CompoundWMsCount = 1;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = 1;
+#elif TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || ALZIR_25
+        public const int WMsCount = 20;
+		public const int LineSize = 10;
+		public const int CompoundWMsCount = 1;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
+#elif RUM_MOB
+        public const int WMsCount = 8;
+		public const int LineSize = 8;
+		public const int CompoundWMsCount = 1;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
+#elif TURA_IPERL || TURA_IPERL_NEW
+		public const int WMsCount = 40;
+		public const int LineSize = 20;
+		public const int CompoundWMsCount = 1;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
+#elif TURA_SPECIAL || SENTEC
+        public const int WMsCount = 6;
+		public const int LineSize = 6;
+		public const int CompoundWMsCount = 1;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
+#elif SLM_50
+		public const int WMsCount = 12;
+		public const int LineSize = 12;
+		public const int CompoundWMsCount = 1;
+		public const int HeatMetersCount = 6;
+        public const int MaxPartNr = WMsCount / LineSize;
+#elif SLM_END || WARSAW_END
+        public const int WMsCount = 10;
+		public const int LineSize = 5;
+		public const int CompoundWMsCount = 1;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = 4;
+#elif MALTA_WSD25
+		public const int WMsCount = 6;
+		public const int LineSize = 6;
+		public const int CompoundWMsCount = 0;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
+#endif
+
+        ///
+		/// Database related: This object reference is set after a successful user login
+		///
+		public static DatabaseSettings CurrentBench;
+
+        public static double RealDensity = 0;       /// true water density [kg/m3]
+        public static double AtTemperature = 0;     /// measured at temperature [°C]
+        public static double Buoyancy = 0;
+    }
+}

Config/DatabaseSettings.cs

@@ -0,0 +1,58 @@
+///
+/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
+///
+using System;
+using System.Text;
+using System.Xml.Serialization;
+
+namespace Config
+{
+    /// <summary>
+    /// Test bench database settings, contains bench name and settings od several databases
+    /// </summary>
+    public class DatabaseSettings : ICloneable
+    {
+        // Public fields
+        public string BenchName;
+        public bool IsRealBench;
+        public Users.DBSettings ProceduresDBSettings;	/// Configuration database settings
+		public Users.DBSettings WaterMetersDBSettings;	/// Results database settings
+        public Users.DBSettings EventsDBSettings;	    /// Events database settings
+        public Users.DBSettings UsersDBSettings;		/// Shared configuration database settings
+
+        // Constructor
+        public DatabaseSettings()
+        {
+            BenchName = String.Empty;               /// Empty string (avoid null)
+            IsRealBench = false;
+			ProceduresDBSettings = new Users.DBSettings(Users.Entities.DBType.MySql, string.Empty);
+			WaterMetersDBSettings = new Users.DBSettings(Users.Entities.DBType.MySql, string.Empty);
+            EventsDBSettings = new Users.DBSettings(Users.Entities.DBType.MySql, string.Empty);
+			UsersDBSettings = new Users.DBSettings(Users.Entities.DBType.MySql, string.Empty);
+        }
+
+        public object Clone()
+        {
+            DatabaseSettings result = new DatabaseSettings();
+
+            result.BenchName    = BenchName;
+            result.IsRealBench  = IsRealBench;
+			result.ProceduresDBSettings = (Users.DBSettings)ProceduresDBSettings.Clone();
+			result.WaterMetersDBSettings = (Users.DBSettings)WaterMetersDBSettings.Clone();
+            result.EventsDBSettings = (Users.DBSettings)EventsDBSettings.Clone();
+            result.UsersDBSettings = (Users.DBSettings)UsersDBSettings.Clone();
+
+            return result;
+        }
+
+		public override string ToString()
+		{
+            return string.Format("{0} config={1} results={2} events={3} users={4}",
+                                 BenchName,
+                                 ProceduresDBSettings.ConnectionString,
+                                 WaterMetersDBSettings.ConnectionString,
+                                 EventsDBSettings.ConnectionString,
+                                 UsersDBSettings.ConnectionString);
+		}
+    }
+}

Config/Entities/BenchPath.cs

@@ -1,9 +1,8 @@
 ///
-/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
-using Common;
 
 namespace Config.Entities
 {
@@ -13,34 +12,26 @@ namespace Config.Entities
 		public virtual int    ItemNr { get; set; }
 		public virtual string Name { get; set; }
         public virtual string OriName { get; set; }         /// Not mapped to database
-        public virtual double Qfrom { get; set; }           /// Water flow in [m3/h]
-        public virtual double Qto { get; set; }             /// Water flow in [m3/h]
-        public virtual Unit   FlowUnit { get; set; }        /// Not mapped to database, used in UI
-        public virtual string Selector { get; set; }
+        public virtual float  Qfrom { get; set; }           /// Water flow in [m3/h]
+        public virtual float  Qto { get; set; }             /// Water flow in [m3/h]
         public virtual string TempMtrUp { get; set; }
         public virtual string TempMtrDown { get; set; }
         public virtual string PressMtrUp { get; set; }
         public virtual string PressMtrDown { get; set; }
 		public virtual string PressMtrDelta { get; set; }
-		public virtual string ElectricMtrUp { get; set; }
-		public virtual string ElectricMtrDown { get; set; }
-		public virtual string ElectricMtrDelta { get; set; }
 		public virtual string StopBFValve { get; set; }
 
         /// Valves		
 		public virtual string ValvesOpen { get; set; }
 		public virtual string ValvesClose { get; set; }
 
-        public virtual bool QfromTextChngd { get; set; }    /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual bool QtoTextChngd { get; set; }      /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-
         /// ------------- Additional stuff not mapped into the database -------------
 
 		public BenchPath()
         {
 			ValvesOpen  = string.Empty;
 			ValvesClose = string.Empty;
-        }
+		}
 
 		public BenchPath(string name, int itemNr)
 			: this()
@@ -55,16 +46,11 @@ namespace Config.Entities
 
 			result.Qfrom         = Qfrom;
             result.Qto           = Qto;
-            result.FlowUnit      = FlowUnit;
-            result.Selector      = Selector;
-            result.TempMtrUp     = TempMtrUp;
+			result.TempMtrUp     = TempMtrUp;
 			result.TempMtrDown   = TempMtrDown;
 			result.PressMtrUp    = PressMtrUp;
 			result.PressMtrDown  = PressMtrDown;
 			result.PressMtrDelta = PressMtrDelta;
-			result.ElectricMtrUp    = ElectricMtrUp;
-			result.ElectricMtrDown  = ElectricMtrDown;
-			result.ElectricMtrDelta = ElectricMtrDelta;
 			result.StopBFValve   = StopBFValve;
 			result.ValvesOpen    = ValvesOpen;
 			result.ValvesClose   = ValvesClose;

Config/Entities/Component.cs

@@ -1,10 +1,9 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Common;
 
 namespace Config.Entities
 {
@@ -14,11 +13,11 @@ namespace Config.Entities
 		public virtual int ItemNr { get; set; }
 		public virtual string Name { get; set; }
 		public virtual string ClassName { get; set; }
-		public virtual string Parent { get; set; }
-        public virtual DebugMode DebugMode { get; set; }
-		public virtual LogLevel LogLevel { get; set; }
+		public virtual string ParentName { get; set; }
+        public virtual DebugMode Mode { get; set; }
+		public virtual LogLevel Logging { get; set; }
 		public virtual string Parameters { get; set; }
-        public virtual IList<MeasurementCorrection> Corrections { get; set; }
+		public virtual IList<MeasurementCorrection> Corrections { get; set; }
         public virtual IList<Uncertainty> Uncertainties { get; set; }
 
 		/// ------------- Additional stuff not mapped into the database -------------
@@ -38,9 +37,9 @@ namespace Config.Entities
 			result.ItemNr = itemNr;
 			result.Name = name;
 			result.ClassName = className;
-			result.Parent = parentName;
-            result.DebugMode = debugLevel;
-			result.LogLevel = logLevel;
+			result.ParentName = parentName;
+            result.Mode = debugLevel;
+			result.Logging = logLevel;
 			result.Parameters = parameters;
 			return result;
 		}
@@ -52,9 +51,9 @@ namespace Config.Entities
 			result.ItemNr = ItemNr;
 			result.Name = Name;
             result.ClassName = ClassName;
-			result.Parent = Parent;
-            result.DebugMode = DebugMode;
-			result.LogLevel = LogLevel;
+			result.ParentName = ParentName;
+            result.Mode = Mode;
+			result.Logging = Logging;
 			result.Parameters = Parameters;
 			return result;
 		}
@@ -63,9 +62,9 @@ namespace Config.Entities
         {
             output.WriteLine(Name);
             output.WriteLine(ClassName);
-            output.WriteLine(Parent);
-            output.WriteLine(DebugMode.ToString());
-            output.WriteLine(LogLevel.ToString());
+            output.WriteLine(ParentName);
+            output.WriteLine(Mode.ToString());
+            output.WriteLine(Logging.ToString());
             output.Write(Parameters);
 
             output.Close();
@@ -77,28 +76,28 @@ namespace Config.Entities
 
             result.Name = input.ReadLine();
             result.ClassName = input.ReadLine();
-            result.Parent = input.ReadLine();
+            result.ParentName = input.ReadLine();
 
             string line = input.ReadLine();
-            if (line.Equals(DebugMode.DetectedOff.ToString()))                 result.DebugMode = DebugMode.DetectedOff;
-            else if (line.Equals(DebugMode.DetectedOn.ToString()))             result.DebugMode = DebugMode.DetectedOn;
-            else if (line.Equals(DebugMode.Normal.ToString()))                 result.DebugMode = DebugMode.Normal;
-            else if (line.Equals(DebugMode.AutoDetect.ToString()))             result.DebugMode = DebugMode.AutoDetect;
-            else if (line.Equals(DebugMode.FailureDuringOperation.ToString())) result.DebugMode = DebugMode.FailureDuringOperation;
-            else if (line.Equals(DebugMode.Off.ToString()))                    result.DebugMode = DebugMode.Off;
-            else if (line.Equals(DebugMode.Record.ToString()))                 result.DebugMode = DebugMode.Record;
-            else if (line.Equals(DebugMode.Replay.ToString()))                 result.DebugMode = DebugMode.Replay;
-            else if (line.Equals(DebugMode.Simulate.ToString()))               result.DebugMode = DebugMode.Simulate;
-            else if (line.Equals(DebugMode.Inherit.ToString()))                result.DebugMode = DebugMode.Inherit;
+            if (line.Equals(DebugMode.DetectedOff.ToString())) result.Mode = DebugMode.DetectedOff;
+            else if (line.Equals(DebugMode.DetectedOn.ToString())) result.Mode = DebugMode.DetectedOn;
+            else if (line.Equals(DebugMode.Normal.ToString())) result.Mode = DebugMode.Normal;
+            else if (line.Equals(DebugMode.AutoDetect.ToString())) result.Mode = DebugMode.AutoDetect;
+            else if (line.Equals(DebugMode.FailureDuringOperation.ToString())) result.Mode = DebugMode.FailureDuringOperation;
+            else if (line.Equals(DebugMode.Off.ToString())) result.Mode = DebugMode.Off;
+            else if (line.Equals(DebugMode.Record.ToString())) result.Mode = DebugMode.Record;
+            else if (line.Equals(DebugMode.Reply.ToString())) result.Mode = DebugMode.Reply;
+            else if (line.Equals(DebugMode.Simulate.ToString())) result.Mode = DebugMode.Simulate;
+            else if (line.Equals(DebugMode.Inherit.ToString())) result.Mode = DebugMode.Inherit;
 
             line = input.ReadLine();
-            if (line.Equals(LogLevel.Off.ToString()))        result.LogLevel = LogLevel.Off;
-            else if (line.Equals(LogLevel.Fatal.ToString())) result.LogLevel = LogLevel.Fatal;
-            else if (line.Equals(LogLevel.Error.ToString())) result.LogLevel = LogLevel.Error;
-            else if (line.Equals(LogLevel.Warn.ToString()))  result.LogLevel = LogLevel.Warn;
-            else if (line.Equals(LogLevel.Info.ToString()))  result.LogLevel = LogLevel.Info;
-            else if (line.Equals(LogLevel.Debug.ToString())) result.LogLevel = LogLevel.Debug;
-            else if (line.Equals(LogLevel.All.ToString()))   result.LogLevel = LogLevel.All;
+            if (line.Equals(LogLevel.Off.ToString())) result.Logging = LogLevel.Off;
+            else if (line.Equals(LogLevel.Fatal.ToString())) result.Logging = LogLevel.Fatal;
+            else if (line.Equals(LogLevel.Error.ToString())) result.Logging = LogLevel.Error;
+            else if (line.Equals(LogLevel.Warn.ToString())) result.Logging = LogLevel.Warn;
+            else if (line.Equals(LogLevel.Info.ToString())) result.Logging = LogLevel.Info;
+            else if (line.Equals(LogLevel.Debug.ToString())) result.Logging = LogLevel.Debug;
+            else if (line.Equals(LogLevel.All.ToString())) result.Logging = LogLevel.All;
 
             result.Parameters = string.Empty;
             line = input.ReadLine();
@@ -119,12 +118,12 @@ namespace Config.Entities
             result += indent + "ItemNr = " + (ItemNr + 1).ToString() + Environment.NewLine;
             result += indent + "Name = " + Name + Environment.NewLine;
 			result += indent + "ClassName = " + ClassName + Environment.NewLine;
-			if (Parent != null)
+			if (ParentName != null)
 			{
-				result += indent + "ParentName = " + Parent + Environment.NewLine;
+				result += indent + "ParentName = " + ParentName + Environment.NewLine;
 			}
-			result += indent + "DebugLevel = " + DebugMode.ToString() + Environment.NewLine;
-			result += indent + "LogLevel = " + LogLevel.ToString() + Environment.NewLine;
+			result += indent + "DebugLevel = " + Mode.ToString() + Environment.NewLine;
+			result += indent + "LogLevel = " + Logging.ToString() + Environment.NewLine;
 			result += indent + "Parameters = " + Parameters + Environment.NewLine;
 
 			return result;

Config/Entities/ComponentProcedure.cs

@@ -1,9 +1,8 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
 ///
 using System;
 using System.IO;
-using Common;
 
 namespace Config.Entities
 {

Config/Entities/ComponentTest.cs

@@ -1,9 +1,8 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
 ///
 using System;
 using System.IO;
-using Common;
 
 namespace Config.Entities
 {

Config/Entities/Enums.cs

@@ -0,0 +1,645 @@
+///
+/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace Config.Entities
+{
+    /// <summary>
+    /// Helper class to assign descriptions to enum values
+    /// </summary>
+    public class Description : Attribute
+    {
+        public string Text;
+        public Description(string t)
+        {
+            Text = t;
+        }
+    }
+
+    public static class GetDescription
+    {
+        /// Extension method for enum-s
+        public static string ToDescription(this Enum en)
+        {
+            Type type = en.GetType();
+            MemberInfo[] memInfo = type.GetMember(en.ToString());
+
+            if (memInfo != null && memInfo.Length > 0)
+            {
+                object[] attrs = memInfo[0].GetCustomAttributes(typeof(Description), false);
+                if (attrs != null && attrs.Length > 0)
+                    return ((Description)attrs[0]).Text;
+            }
+
+            return en.ToString();   /// Return ToString() value in case there is no description
+        }
+    }
+
+    /// <summary>
+    /// Flags returned by each device configuration control Verify(...) function.
+    /// </summary>
+    public enum CfgUpdateFlags
+    {
+        None = 0,
+        Error = 0x1,			/// Some settings in the user control are invalid and cannot be set
+        Warning = 0x02,			/// Some settings in the user control are suspicious, can be set after user confirmation
+        RestartRqrd = 0x04,		/// TBF program restart is required to apply all changed parameters
+        AnyChange = 0x08,		/// At least one parameter have changed
+        VolatileChange = 0x10,
+        InvokeCfgChange = 0x20,	/// Invoke CfgChange handler of the component 
+    }
+
+    public enum RemoteDBUse
+    {
+        [Description("Local DB only")]          LocalDBOnly,
+        [Description("Remote DB only")]         RemoteDBOnly,
+        [Description("Both DB-s, local 1st")]   BothDBsLocalFirst,
+        [Description("Both DB-s, remote 1st")]  BothDBsRemoteFirst,
+        Count
+    }
+
+    /// <summary>
+    /// Contains a procedure name and a database specification (local/remote).
+    /// </summary>
+    public class ProcedureInfo
+    {
+        public readonly string Name;
+        public readonly bool IsRemote;
+
+        public ProcedureInfo(string name, bool isRemote)
+        {
+            Name = name;
+            IsRemote = isRemote;
+        }
+    }
+
+    public enum ProcedureState
+	{
+		Active,
+		History,
+		Count,
+	}
+
+    public enum ProfileType
+    {
+        Q3R,
+        QnClassColdWater,
+        QnClassHotWater,
+        QpQi,
+        Manual,
+        Count,
+    }
+
+    public enum ErrorLimitType
+    {
+        Manual,
+        QpClass,
+        Count,
+    }
+
+	/// <summary> Kind of meters for the procedure / test </summary>
+	public enum MetersKind
+	{
+#if LANG_DE
+		[Description("Wasserzähler")]			Single,
+		[Description("Verbundwasserzähler")]	Combined,
+		[Description("Wärmezähler")]			HeatMeter,
+#elif LANG_FR
+        [Description("Compteurs eau")]          Single,
+        [Description("Mètres composés")]        Combined,
+        [Description("Thermomètres")]           HeatMeter,
+#elif LANG_CS
+		[Description("Vodoměry")]				Single,
+		[Description("Kombinované vodoměry")]	Combined,
+		[Description("Měřiče tepla")]			HeatMeter,
+#elif LANG_RU
+        [Description("Счетчик")]                 Single,
+        [Description("Комбинированный счетчик")] Combined,
+        [Description("Счетчик тепла")]           HeatMeter,
+#else
+        [Description("Water meters")]			Single,
+		[Description("Compound water meters")]	Combined,
+		[Description("Heat meters")]			HeatMeter,
+#endif
+	}
+
+	public enum CompoundMeterId : byte
+	{
+		Single,
+		CompoundMain,
+		CompoundAux,
+		Compound,
+		HeatMeterVolume,
+		HeatMeterEnergy,
+		SingleOrCompound,		/// Only used when querying results
+	}
+
+	public enum Medium
+	{
+        [Description("")]       NotSpecified,
+#if LANG_PL
+        [Description("zimna")]  ColdWater,
+        [Description("ciepła")] HotWater,
+#elif LANG_IT
+        [Description("freddo")] ColdWater,
+        [Description("caldo")]  HotWater,
+#elif LANG_FR
+        [Description("eau froide")] ColdWater,
+        [Description("eau chaude")] HotWater,
+#else
+		[Description("cold")]   ColdWater,
+		[Description("hot")]    HotWater,
+#endif
+        Count
+    }
+
+    public enum Mounting
+    {
+        [Description("")]       NotSpecified,
+#if LANG_DE
+        [Description("H")]      H,         /// horizontal
+        [Description("V")]      V,         /// vertical
+        [Description("STR")]    S,         /// standrohre
+        [Description("F")]      F,         /// fall
+#else
+        [Description("H")] H,              /// horizontal
+        [Description("V")] V,              /// vertical
+        [Description("S")] S,              /// steig
+        [Description("F")] F,              /// fall
+#endif
+		Count
+    }
+
+    public enum TemperatureClass
+    {
+        [Description("")]        NotSpecified,
+        [Description("T30")]     T30,
+        [Description("T50")]     T50,
+        [Description("T70")]     T70,
+        [Description("T90")]     T90,
+        [Description("T130")]    T130,
+        [Description("T180")]    T180,
+        [Description("T30/70")]  T30_70,
+        [Description("T30/90")]  T30_90,
+        [Description("T30/130")] T30_130,
+        [Description("T30/180")] T30_180,
+        [Description("30")]      t30,
+        [Description("50")]      t50,
+        [Description("70")]      t70,
+        [Description("90")]      t90,
+        [Description("130")]     t130,
+        [Description("180")]     t180,
+        Count
+    }
+
+    public enum FlowProfileSensitivityClass
+    {
+        [Description("")]   NotSpecified,
+        [Description("U0")] U0,              /// ?
+        [Description("D0")] D0,              /// ?
+        Count
+    }
+
+    public enum PressureLossClass
+    {
+        [Description("")]     NotSpecified,
+        [Description("dp63")] dp63,           /// 0.063 MPa = 0.63 bar, TODO: Change to "Δp63"
+        [Description("dp40")] dp40,           /// 0.040 MPa = 0.40 bar
+        [Description("dp25")] dp25,           /// 0.025 MPa = 0.25 bar
+        [Description("dp16")] dp16,           /// 0.016 MPa = 0.16 bar
+        [Description("dp10")] dp10,           /// 0.010 MPa = 0.10 bar
+        Count
+    }
+
+    /// <summary> Maximum Admissible Pressure </summary>
+    public enum MaxAdmissiblePressure
+    {
+        [Description("")]      NotSpecified,
+        [Description("MAP6")]  MAP6,
+        [Description("MAP10")] MAP10,
+        [Description("MAP16")] MAP16,
+        [Description("MAP25")] MAP25,
+        [Description("MAP40")] MAP40,
+        Count
+    }
+
+    /// <summary> Register reader type </summary>
+    public enum RegisterReaderType
+    {
+        Unknown,
+        Pulses,         /// Sick, optical and similar
+        Camera,         /// CLP1611
+        DataStream,     /// iPerl
+        Manual,         /// Entered by human via form (also from camera images)
+        Count
+    }
+
+	/// <summary> Transition step is finished when this condition is fulfilled </summary>
+	public enum StepCondition
+	{
+		None,
+		Scale1Empty,
+		Scale2Empty,
+		Scale3Empty,
+		AllScalesEmpty,
+		Count
+	}
+
+    public enum MeretProtocol
+    {
+        [Description("<undefined>")]        Undefined,
+        [Description("Meret (obsolete)")]   Meret,
+        [Description("Modbus")]             Modbus,
+        Count
+    }
+
+	public enum Publish : sbyte
+	{
+#if LANG_DE
+        /// german
+        [Description("nie")]          Never = 0,
+        [Description("immer")]        Always = 1,
+        [Description("Bildschirm")]   OnScreen = 2,
+        [Description("intern")]       Internal = 3,
+#elif LANG_FR
+        [Description("jamais")]       Never = 0,
+        [Description("toujours")]     Always = 1,
+        [Description("À l'écran")]    OnScreen = 2,
+        [Description("interne")]      Internal = 3,
+#elif LANG_CS
+        /// czech
+        [Description("nikdy")]        Never = 0,
+        [Description("vždy")]         Always = 1,
+        [Description("na obrazovku")] OnScreen = 2,
+        [Description("interně")]      Internal = 3,
+#elif LANG_SK
+        /// slovak
+        [Description("nikdy")]        Never = 0,
+        [Description("vždy")]         Always = 1,
+        [Description("na obrazovku")] OnScreen = 2,
+        [Description("interne")]      Internal = 3,
+#elif LANG_PL
+        /// polish
+        [Description("nigdy")]        Never = 0,
+        [Description("zawsze")]       Always = 1,
+        [Description("na ekranie")]   OnScreen = 2,
+        [Description("wewnętrznie")]  Internal = 3,
+#elif LANG_RU
+        /// russian
+        [Description("никогда")]      Never = 0,
+        [Description("всегда")]       Always = 1,
+        [Description("толька экран")] OnScreen = 2,
+        [Description("внутренно")]    Internal = 3,
+#else
+		/// english
+		[Description("Never")]        Never = 0,
+        [Description("Always")]       Always = 1,
+        [Description("On screen")]    OnScreen = 2,
+        [Description("Internal")]     Internal = 3,
+#endif
+        Count
+	}
+
+	public enum MassMethod : byte
+	{
+#if LANG_DE
+        /// nemecky
+		[Description("Waage")]			Scale,
+		[Description("Spanne")]			Spread,
+		[Description("Standardabw.")]	StdDev,
+#elif LANG_FR
+        [Description("Balance")]        Scale,
+        [Description("Envergure")]      Spread,
+        [Description("Déviation std.")] StdDev,
+#elif LANG_CS
+        /// cesky
+		[Description("váhou")]			Scale,
+		[Description("max.rozdíl")]		Spread,
+		[Description("std.dev.")]		StdDev,
+#else
+		[Description("Scale")]			Scale,
+		[Description("Spread")]			Spread,
+		[Description("Std.dev.")]		StdDev,
+#endif
+        Count
+	}
+
+    /// <summary>
+    /// Three state test results and/or water meter result (Algeria PT25 requirement).
+    /// NearlyOK means error is within error limits not narrowed by uncertainty
+    ///   OK:                   Uncertainty + ErrLimLo <= error <= ErrLimHi - Uncertainty
+    ///   NearlyOK:  not OK but stil          ErrLimLo <= error <= ErrLimHi
+    ///   Nok:       otherwise
+    /// </summary>
+    public enum ThreeState
+    {
+#if LANG_FR
+        [Description("NC")]         Nok,        /// Totally failed: not OK and not NearlyOK
+        [Description("2e/Ff")]      NearlyOK,   /// Nearly OK, not OK but not totally failed 
+        [Description("***")]        OK,         /// OK
+#else
+        [Description("NOK")]        Nok,        /// Totally failed: not OK and not NearlyOK
+        [Description("Nearly OK")]  NearlyOK,   /// Nearly OK, not OK but not totally failed 
+        [Description("OK")]         OK,         /// OK
+#endif
+        Count
+    }
+
+    public enum TestProfile
+    {
+        UserDefined,
+        UserDefinedHeatMeter,
+        Protected,                  /// The first protected one
+        ProtectedHeatMeter,
+    }
+
+	public enum Progress
+	{
+		JustStarted,
+        TransitionBefore,
+		SwitchingFlowDetection,
+		FlowSetting,
+        Aborted,                /// Use as an argument when a test was aborted
+        Test,
+		TransitionAfter,
+		Completed,
+		Count,
+	}
+
+	public enum Device
+	{
+		Screen,
+		Printer,
+		Disk,
+	}
+
+	public enum PageOrientation
+	{
+		Portrait,
+		Landscape,
+		Count,
+	}
+
+	public enum ItemCategory
+	{
+#if LANG_DE
+		[Description("Allgemein")]				Other,
+		[Description("Prüfstanddaten")]			BenchData,
+		[Description("Prüfstandergebnisse")]	BenchResult,
+		[Description("Prüfpunktdaten")]			TestData,
+		[Description("Prüfpunktergebnisse")]	TestResult,
+		[Description("Wasserzelledaten")]		MeterData,
+		[Description("Wasserzelleergebnisse")]	MeterResult,
+#elif LANG_FR
+        [Description("Autres")]                         Other,
+        [Description("Données de banc")]                BenchData,
+        [Description("Résultats du banc")]              BenchResult,
+        [Description("Données de test")]                TestData,
+        [Description("Résultats de test")]              TestResult,
+        [Description("Données du compteur d'eau")]      MeterData,
+        [Description("Résultats du compteur d'eau")]    MeterResult,
+#else
+		[Description("Other")]			Other,
+		[Description("Bench data")]		BenchData,
+		[Description("Bench result")]	BenchResult,
+		[Description("Test data")]		TestData,
+		[Description("Test result")]	TestResult,
+		[Description("Meter data")]		MeterData,
+		[Description("Meter result")]	MeterResult,
+#endif
+        Count,
+	}
+
+	/// <summary> Possible modes of operation of components and devices. </summary>
+	public enum DebugMode
+	{
+#if LANG_DE
+		[Description("Erkennen-aus")]	DetectedOff = -2,
+        [Description("Erkennen-ein")]	DetectedOn = -1,
+        [Description("Normal")]         Normal = 0,				/// Normal operation
+        [Description("Auto-erkennen")]  AutoDetect,				/// The component (device) will be auto-detected
+        [Description("Fehler")]         FailureDuringOperation,	/// Failure during operation -> disabled 
+        [Description("Aus")]            Off,					/// The component is off
+        [Description("Aufzeichnen")]    Record,
+        [Description("Reply")]          Reply,
+        [Description("Simuliert")]      Simulate,				/// Test bench simulation, this mode does not require any hardware
+        [Description("Geerbt")]         Inherit,
+#elif LANG_FR
+        [Description("Détection automatique: Éteindre")]    DetectedOff = -2,
+        [Description("Détection automatique: Allumé")]      DetectedOn = -1,
+        [Description("Ordinaire")]                          Normal = 0,
+        [Description("Détection automatique")]              AutoDetect,
+        [Description("Erreur d'exécution")]                 FailureDuringOperation,
+        [Description("Éteindre")]                           Off,
+        [Description("Record")]                             Record,
+        [Description("Répondre")]                           Reply,
+        [Description("Simuler")]                            Simulate,
+        [Description("Hériter")]                            Inherit,
+#else
+        [Description("Detected off")]   DetectedOff = -2,
+        [Description("Detected on")]    DetectedOn = -1,
+        [Description("Normal")]         Normal = 0,				/// Normal operation
+        [Description("Auto detect")]    AutoDetect,				/// The component (device) will be auto-detected
+        [Description("Run-time error")] FailureDuringOperation,	/// Failure during operation -> disabled 
+        [Description("Off")]            Off,					/// The component is off
+        [Description("Record")]         Record,
+        [Description("Reply")]          Reply,
+        [Description("Simulate")]       Simulate,				/// Test bench simulation, this mode does not require any hardware
+        [Description("Inherit")]        Inherit,
+#endif
+        Count,
+    }
+
+    public enum LogLevel
+	{
+#if LANG_DE
+		[Description("Aus")]			Off,
+		[Description("Schwerwiegend")]	Fatal,
+        [Description("Fehler")]			Error,
+		[Description("Warnung")]		Warn,
+        [Description("Info")]			Info,
+        [Description("Debug")]			Debug,
+        [Description("Alles")]			All,
+#else
+        [Description("Off")]    Off,
+        [Description("Fatal")]  Fatal,
+        [Description("Error")]  Error,
+        [Description("Warn")]   Warn,
+        [Description("Info")]   Info,
+        [Description("Debug")]  Debug,
+        [Description("All")]    All,
+#endif
+        Count,
+    }
+
+
+	/// <summary> Arrangement of tests </summary>
+	public enum TestsArrangement
+	{
+		Rows,
+		Columns,
+	}
+
+	/// <summary> Arrangement of meters </summary>
+	public enum MetersArrangement
+	{
+		Vertically,
+		Horizontally,
+	}
+
+    public enum Alignment
+	{
+#if LANG_DE
+		[Description("links")]      Left,
+        [Description("zentriert")]  Center,
+        [Description("rechts")]     Right,
+        [Description("angepasst")]  Justified,
+#elif LANG_FR
+        [Description("gauche")]     Left,
+        [Description("centré")]     Center,
+        [Description("droit")]      Right,
+        [Description("justifié")]   Justified,
+#else
+        [Description("Left")]       Left,
+        [Description("Center")]     Center,
+        [Description("Right")]      Right,
+        [Description("Justified")]  Justified,
+#endif
+        Count
+    }
+
+    public enum VertAlignment
+    {
+        [Description("Top")]        Top,
+        [Description("Middle")]     Middle,
+        [Description("Bottom")]     Bottom,
+    }
+
+    public enum TableForm
+    {
+        None,
+        Rows,
+        Columns,
+        ColumnsPL,
+        Count,
+    }
+
+	public enum ImageRotation
+	{
+		[Description("0 deg")]		None,
+		[Description("90 deg")]		Deg90,
+		[Description("180 deg")]	Deg180,
+		[Description("270 deg")]	Deg270,
+		Count
+	}
+
+    public enum CameraDisplayResolution
+    {
+        Small,
+        Medium,
+        Large,
+        // FullScreen,
+        Count,
+    }
+
+	public enum ErrorFlagsMode : sbyte
+	{
+#if LANG_DE
+		[Description("aus")]		Off,
+		[Description("info")]		Info,
+		[Description("ein")]		On,
+#elif LANG_FR
+        [Description("éteindre")]   Off,
+        [Description("info")]       Info,
+        [Description("allumé")]     On,
+#elif LANG_CS
+		[Description("vypnuto")]	Off,
+		[Description("info")]		Info,
+		[Description("zapnuto")]	On,
+#elif LANG_RU
+        [Description("выкл")]       Off,
+        [Description("инфо")]       Info,
+        [Description("вкл")]        On,
+#elif LANG_PL
+		[Description("nie")]		Off,
+		[Description("info")]		Info,
+		[Description("tak")]		On,
+#else // LANG_EN
+        [Description("off")]		Off,
+		[Description("info")]		Info,
+		[Description("on")]			On,
+#endif
+        Count
+	}
+
+
+    public enum ErrorFlagMask : long
+    {
+        E1 = (1L << 0),    /// shift = 0, E1 = 1L
+        E2 = (1L << 1),
+        E3 = (1L << 2),
+        E4 = (1L << 3),
+        E5 = (1L << 4),
+        E6 = (1L << 5),
+        E7 = (1L << 6),
+        E8 = (1L << 7),
+        E9 = (1L << 8),
+        E10 = (1L << 9),
+        E11 = (1L << 10),
+        E12 = (1L << 11),
+        E13 = (1L << 12),
+        E14 = (1L << 13),
+        E15 = (1L << 14),
+        E16 = (1L << 15),
+        E17 = (1L << 16),
+        E18 = (1L << 17),
+        E19 = (1L << 18),
+        E20 = (1L << 19),
+        E21 = (1L << 20),
+        E22 = (1L << 21),
+        E23 = (1L << 22),
+        E24 = (1L << 23),
+        E25 = (1L << 24),
+        E26 = (1L << 25),       /// iPERL: Invalid Q2 correction factors, mismatch between factors in the water meter and in DB
+        E27 = (1L << 26),       /// iPERL: Wrong counting direction
+        E28 = (1L << 27),       /// iPERL: Missing workflow step (assembly or test)
+        E29 = (1L << 28),
+        E30 = (1L << 29),
+        E31 = (1L << 30),
+        E32 = (1L << 31),
+        E33 = (1L << 32),
+        E34 = (1L << 33),
+        E35 = (1L << 34),
+        E36 = (1L << 35),
+        E37 = (1L << 36),
+        E38 = (1L << 37),
+        E39 = (1L << 38),
+        E40 = (1L << 39),
+        E41 = (1L << 40),
+        E42 = (1L << 41),
+        E43 = (1L << 42),
+        E44 = (1L << 43),
+        E45 = (1L << 44),
+        E46 = (1L << 45),
+        E47 = (1L << 46),
+        E48 = (1L << 47),
+        E49 = (1L << 48),
+        E50 = (1L << 49),
+        E51 = (1L << 50),
+        E52 = (1L << 51),
+        E53 = (1L << 52),
+        E54 = (1L << 53),
+        E55 = (1L << 54),
+        E56 = (1L << 55),
+        E57 = (1L << 56),
+        E58 = (1L << 57),
+        E59 = (1L << 58),
+        E60 = (1L << 59),
+        E61 = (1L << 60),
+        E62 = (1L << 61),
+        E63 = (1L << 62),
+    }
+}

Config/Entities/FeedingPath.cs

@@ -1,32 +1,26 @@
 ///
-/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
-using Common;
 
 namespace Config.Entities
 {
 	public class FeedingPath : IHasName, IHasItemNr, IHasValves
     {
-        public virtual int    Id { get; protected set; }
-		public virtual int    ItemNr { get; set; }
+        public virtual int Id { get; protected set; }
+		public virtual int ItemNr { get; set; }
 		public virtual string Name { get; set; }
         public virtual string OriName { get; set; }         /// Not mapped to database
-        public virtual double Qfrom { get; set; }           /// Water flow in [m3/h]
-        public virtual double Qto { get; set; }             /// Water flow in [m3/h]
-        public virtual Unit   FlowUnit { get; set; }        /// Not mapped to database, used in UI
-        public virtual string Selector { get; set; }
+        public virtual float Qfrom { get; set; }            /// Water flow in [m3/h]
+        public virtual float Qto { get; set; }              /// Water flow in [m3/h]
 		public virtual string Pump { get; set; }
-        public virtual string RegVPositions { get; set; }	/// Positions of regulation valves in Category.Feeding in % separated by ';'
+        public virtual string RegulValvesPct { get; set; }	/// Positions of regulation valves in % separated by ';'
 
         /// Valves
 		public virtual string ValvesOpen { get; set; }
 		public virtual string ValvesClose { get; set; }
 
-        public virtual bool QfromTextChngd { get; set; }    /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual bool QtoTextChngd { get; set; }      /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-
         /// ------------- Additional stuff not mapped into the database -------------
 
 		public FeedingPath()
@@ -46,14 +40,12 @@ namespace Config.Entities
         {
 			FeedingPath result = new FeedingPath(name, itemNr);
 
-			result.Qfrom         = Qfrom;
-            result.Qto           = Qto;
-            result.FlowUnit      = FlowUnit;
-            result.Selector      = Selector;
-			result.Pump          = Pump;
-            result.RegVPositions = RegVPositions;
-            result.ValvesOpen    = ValvesOpen;
-			result.ValvesClose   = ValvesClose;
+			result.Qfrom = Qfrom;
+            result.Qto = Qto;
+			result.Pump = Pump;
+            result.RegulValvesPct = RegulValvesPct;
+            result.ValvesOpen = ValvesOpen;
+			result.ValvesClose = ValvesClose;
 
             return result;
         }

Config/Entities/Group.cs

@@ -1,16 +1,15 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
-using Common;
 
 namespace Config.Entities
 {
     public class Group
     {
         public virtual int Id { get; protected set; }
-        public virtual GID GID { get; set; }
+        public virtual Users.Entities.GID GID { get; set; }
         public virtual long AccessFlags { get; set; }		/// Bitfield of access flags: bit0 .. bit62
         public virtual IList<User> Users { get; set; }      /// Group can be a member of a list of users
 
@@ -19,7 +18,7 @@ namespace Config.Entities
             Users = new List<User>();
 		}
 
-        public Group(GID gid)
+        public Group(Users.Entities.GID gid)
             : this()
         {
 			GID = gid;

Config/Entities/IParamsProvider.cs

@@ -1,11 +1,11 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace Common
+namespace Config.Entities
 {
 	public interface IParamsProvider
 	{
@@ -31,7 +31,7 @@ namespace Common
         /// Returns a list of possible values of one parameter (ComboBox when editing) or null (Textbox when editing).
         /// </summary>
         /// <param name="ix">Zero based index of the parameter</param>
-        ICollection<string> ParamValues(int ix);
+        IList<string> ParamValues(int ix);
 
 		/// <summary>
 		/// Returns a parameter value in the string form

Config/Entities/IperlEnums.cs

@@ -0,0 +1,44 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
+
+namespace Config.Entities
+{
+
+    public enum Side
+    {
+#if LANG_CS
+        [Description("Levá")]   Left,
+        [Description("Pravá")]  Right,
+#else
+        [Description("Left")]   Left,
+        [Description("Right")]  Right,
+#endif
+        Count
+    }
+
+    public enum FlowDir
+    {
+        R_L,
+        L_R,
+        Count
+    }
+
+    public enum Counting
+    {
+        Arbitrary,
+        Positive,
+        Negative,
+        Count
+    }
+
+    public enum OptoHeadState
+    {
+        Disabled,
+        OptoAndDirOK,
+        OptoNok,
+        DirNok,
+        Count
+    }
+}

Config/Entities/MeasurementCorrection.cs

@@ -1,17 +1,16 @@
 ///
-/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
 ///
 using System;
-using System.Collections.Generic;
 
 namespace Config.Entities
 {
-    public class MeasurementCorrection : Common.IMeasurementCorrection, IComparable<MeasurementCorrection>
+	public class MeasurementCorrection
 	{
 		public virtual int Id { get; protected set; }
         public virtual int RangeIx { get; set; }        /// 0..5
-		public virtual double Measurement { get; set; }
-		public virtual double Correction { get; set; }
+		public virtual float Measurement { get; set; }
+		public virtual float Correction { get; set; }
 
         public MeasurementCorrection()
         {
@@ -22,69 +21,5 @@ namespace Config.Entities
         {
             RangeIx = rangeIx; 
         }
-
-        public virtual int CompareTo(MeasurementCorrection other)
-        {
-            return (Measurement > other.Measurement) ? 1 : ((Measurement == other.Measurement) ? 0 : -1);
-        }
-
-
-        /// <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<MeasurementCorrection> corrections)
-        {
-            return rawValue + GetCorrection(rawValue, corrections);
-        }
-
-        /// <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<MeasurementCorrection> corrections)
-        {
-            if ((corrections == null) || (corrections.Count == 0)) return 0;    /// No correction
-
-            if (rawValue < corrections[0].Measurement)
-            {
-                /// rawValue is below the lowest value in the correction table
-                return corrections[0].Correction;
-            }
-
-            for (int i = 1; i < corrections.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[corrections.Count - 1].Correction;
-        }
-
-        public override string ToString()
-        {
-            return string.Format("{0} {1} ({2})", Measurement, Correction, RangeIx);
-        }
-    }
+	}
 }

Config/Entities/MetersPath.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -14,15 +14,15 @@ namespace Config.Entities
         public virtual string OriName { get; set; }     /// Not mapped to database
 
         /// Sensors
-		public virtual string Sensor1  { get; set; }
-		public virtual string Sensor2  { get; set; }
-		public virtual string Sensor3  { get; set; }
-		public virtual string Sensor4  { get; set; }
-		public virtual string Sensor5  { get; set; }
-		public virtual string Sensor6  { get; set; }
-		public virtual string Sensor7  { get; set; }
-		public virtual string Sensor8  { get; set; }
-		public virtual string Sensor9  { get; set; }
+		public virtual string Sensor1 { get; set; }
+		public virtual string Sensor2 { get; set; }
+		public virtual string Sensor3 { get; set; }
+		public virtual string Sensor4 { get; set; }
+		public virtual string Sensor5 { get; set; }
+		public virtual string Sensor6 { get; set; }
+		public virtual string Sensor7 { get; set; }
+		public virtual string Sensor8 { get; set; }
+		public virtual string Sensor9 { get; set; }
 		public virtual string Sensor10 { get; set; }
 		public virtual string Sensor11 { get; set; }
 		public virtual string Sensor12 { get; set; }
@@ -34,6 +34,26 @@ namespace Config.Entities
 		public virtual string Sensor18 { get; set; }
 		public virtual string Sensor19 { get; set; }
 		public virtual string Sensor20 { get; set; }
+        public virtual string Sensor21 { get; set; }
+        public virtual string Sensor22 { get; set; }
+        public virtual string Sensor23 { get; set; }
+        public virtual string Sensor24 { get; set; }
+        public virtual string Sensor25 { get; set; }
+        public virtual string Sensor26 { get; set; }
+        public virtual string Sensor27 { get; set; }
+        public virtual string Sensor28 { get; set; }
+        public virtual string Sensor29 { get; set; }
+        public virtual string Sensor30 { get; set; }
+        public virtual string Sensor31 { get; set; }
+        public virtual string Sensor32 { get; set; }
+        public virtual string Sensor33 { get; set; }
+        public virtual string Sensor34 { get; set; }
+        public virtual string Sensor35 { get; set; }
+        public virtual string Sensor36 { get; set; }
+        public virtual string Sensor37 { get; set; }
+        public virtual string Sensor38 { get; set; }
+        public virtual string Sensor39 { get; set; }
+        public virtual string Sensor40 { get; set; }
 
         /// ------------- Additional stuff not mapped into the database -------------
 
@@ -51,15 +71,15 @@ namespace Config.Entities
 		public virtual MetersPath Clone(string name, int itemNr)
         {
             MetersPath result = new MetersPath(name, itemNr);
-			result.Sensor1  = Sensor1;
-			result.Sensor2  = Sensor2;
-			result.Sensor3  = Sensor3;
-			result.Sensor4  = Sensor4;
-            result.Sensor5  = Sensor5;
-            result.Sensor6  = Sensor6;
-            result.Sensor7  = Sensor7;
-            result.Sensor8  = Sensor8;
-            result.Sensor9  = Sensor9;
+			result.Sensor1 = Sensor1;
+			result.Sensor2 = Sensor2;
+			result.Sensor3 = Sensor3;
+			result.Sensor4 = Sensor4;
+            result.Sensor5 = Sensor5;
+            result.Sensor6 = Sensor6;
+            result.Sensor7 = Sensor7;
+            result.Sensor8 = Sensor8;
+            result.Sensor9 = Sensor9;
             result.Sensor10 = Sensor10;
             result.Sensor11 = Sensor11;
             result.Sensor12 = Sensor12;
@@ -71,59 +91,119 @@ namespace Config.Entities
             result.Sensor18 = Sensor18;
             result.Sensor19 = Sensor19;
             result.Sensor20 = Sensor20;
+            result.Sensor21 = Sensor21;
+            result.Sensor22 = Sensor22;
+            result.Sensor23 = Sensor23;
+            result.Sensor24 = Sensor24;
+            result.Sensor25 = Sensor25;
+            result.Sensor26 = Sensor26;
+            result.Sensor27 = Sensor27;
+            result.Sensor28 = Sensor28;
+            result.Sensor29 = Sensor29;
+            result.Sensor30 = Sensor30;
+            result.Sensor31 = Sensor31;
+            result.Sensor32 = Sensor32;
+            result.Sensor33 = Sensor33;
+            result.Sensor34 = Sensor34;
+            result.Sensor35 = Sensor35;
+            result.Sensor36 = Sensor36;
+            result.Sensor37 = Sensor37;
+            result.Sensor38 = Sensor38;
+            result.Sensor39 = Sensor39;
+            result.Sensor40 = Sensor40;
 
             return result;
         }
 
         /// Returns the component name
-        public virtual string GetSensor(int wmNr0)
+        public virtual string GetSensor(int i)
         {
-            if      (wmNr0 == 0)  return Sensor1;
-            else if (wmNr0 == 1)  return Sensor2;
-            else if (wmNr0 == 2)  return Sensor3;
-            else if (wmNr0 == 3)  return Sensor4;
-            else if (wmNr0 == 4)  return Sensor5;
-            else if (wmNr0 == 5)  return Sensor6;
-            else if (wmNr0 == 6)  return Sensor7;
-            else if (wmNr0 == 7)  return Sensor8;
-            else if (wmNr0 == 8)  return Sensor9;
-            else if (wmNr0 == 9)  return Sensor10;
-            else if (wmNr0 == 10) return Sensor11;
-            else if (wmNr0 == 11) return Sensor12;
-            else if (wmNr0 == 12) return Sensor13;
-            else if (wmNr0 == 13) return Sensor14;
-            else if (wmNr0 == 14) return Sensor15;
-            else if (wmNr0 == 15) return Sensor16;
-            else if (wmNr0 == 16) return Sensor17;
-            else if (wmNr0 == 17) return Sensor18;
-            else if (wmNr0 == 18) return Sensor19;
-            else if (wmNr0 == 19) return Sensor20;
+            if (i == 0) return Sensor1;
+            else if (i == 1) return Sensor2;
+            else if (i == 2) return Sensor3;
+            else if (i == 3) return Sensor4;
+            else if (i == 4) return Sensor5;
+            else if (i == 5) return Sensor6;
+            else if (i == 6) return Sensor7;
+            else if (i == 7) return Sensor8;
+            else if (i == 8) return Sensor9;
+            else if (i == 9) return Sensor10;
+            else if (i == 10) return Sensor11;
+            else if (i == 11) return Sensor12;
+            else if (i == 12) return Sensor13;
+            else if (i == 13) return Sensor14;
+            else if (i == 14) return Sensor15;
+            else if (i == 15) return Sensor16;
+            else if (i == 16) return Sensor17;
+            else if (i == 17) return Sensor18;
+            else if (i == 18) return Sensor19;
+            else if (i == 19) return Sensor20;
+            else if (i == 20) return Sensor21;
+            else if (i == 21) return Sensor22;
+            else if (i == 22) return Sensor23;
+            else if (i == 23) return Sensor24;
+            else if (i == 24) return Sensor25;
+            else if (i == 25) return Sensor26;
+            else if (i == 26) return Sensor27;
+            else if (i == 27) return Sensor28;
+            else if (i == 28) return Sensor29;
+            else if (i == 29) return Sensor30;
+            else if (i == 30) return Sensor31;
+            else if (i == 31) return Sensor32;
+            else if (i == 32) return Sensor33;
+            else if (i == 33) return Sensor34;
+            else if (i == 34) return Sensor35;
+            else if (i == 35) return Sensor36;
+            else if (i == 36) return Sensor37;
+            else if (i == 37) return Sensor38;
+            else if (i == 38) return Sensor39;
+            else if (i == 39) return Sensor40;
             else return null;
         }
 
         /// Sets the component name
-        public virtual void SetSensor(int wmNr0, string cmpntName)
+        public virtual void SetSensor(int i, string cmpntName)
         {
-            if      (wmNr0 == 0)  Sensor1  = cmpntName;
-            else if (wmNr0 == 1)  Sensor2  = cmpntName;
-            else if (wmNr0 == 2)  Sensor3  = cmpntName;
-            else if (wmNr0 == 3)  Sensor4  = cmpntName;
-            else if (wmNr0 == 4)  Sensor5  = cmpntName;
-            else if (wmNr0 == 5)  Sensor6  = cmpntName;
-            else if (wmNr0 == 6)  Sensor7  = cmpntName;
-            else if (wmNr0 == 7)  Sensor8  = cmpntName;
-            else if (wmNr0 == 8)  Sensor9  = cmpntName;
-            else if (wmNr0 == 9)  Sensor10 = cmpntName;
-            else if (wmNr0 == 10) Sensor11 = cmpntName;
-            else if (wmNr0 == 11) Sensor12 = cmpntName;
-            else if (wmNr0 == 12) Sensor13 = cmpntName;
-            else if (wmNr0 == 13) Sensor14 = cmpntName;
-            else if (wmNr0 == 14) Sensor15 = cmpntName;
-            else if (wmNr0 == 15) Sensor16 = cmpntName;
-            else if (wmNr0 == 16) Sensor17 = cmpntName;
-            else if (wmNr0 == 17) Sensor18 = cmpntName;
-            else if (wmNr0 == 18) Sensor19 = cmpntName;
-            else if (wmNr0 == 19) Sensor20 = cmpntName;
+            if (i == 0) Sensor1 = cmpntName;
+            else if (i == 1) Sensor2 = cmpntName;
+            else if (i == 2) Sensor3 = cmpntName;
+            else if (i == 3) Sensor4 = cmpntName;
+            else if (i == 4) Sensor5 = cmpntName;
+            else if (i == 5) Sensor6 = cmpntName;
+            else if (i == 6) Sensor7 = cmpntName;
+            else if (i == 7) Sensor8 = cmpntName;
+            else if (i == 8) Sensor9 = cmpntName;
+            else if (i == 9) Sensor10 = cmpntName;
+            else if (i == 10) Sensor11 = cmpntName;
+            else if (i == 11) Sensor12 = cmpntName;
+            else if (i == 12) Sensor13 = cmpntName;
+            else if (i == 13) Sensor14 = cmpntName;
+            else if (i == 14) Sensor15 = cmpntName;
+            else if (i == 15) Sensor16 = cmpntName;
+            else if (i == 16) Sensor17 = cmpntName;
+            else if (i == 17) Sensor18 = cmpntName;
+            else if (i == 18) Sensor19 = cmpntName;
+            else if (i == 19) Sensor20 = cmpntName;
+            else if (i == 20) Sensor21 = cmpntName;
+            else if (i == 21) Sensor22 = cmpntName;
+            else if (i == 22) Sensor23 = cmpntName;
+            else if (i == 23) Sensor24 = cmpntName;
+            else if (i == 24) Sensor25 = cmpntName;
+            else if (i == 25) Sensor26 = cmpntName;
+            else if (i == 26) Sensor27 = cmpntName;
+            else if (i == 27) Sensor28 = cmpntName;
+            else if (i == 28) Sensor29 = cmpntName;
+            else if (i == 29) Sensor30 = cmpntName;
+            else if (i == 30) Sensor31 = cmpntName;
+            else if (i == 31) Sensor32 = cmpntName;
+            else if (i == 32) Sensor33 = cmpntName;
+            else if (i == 33) Sensor34 = cmpntName;
+            else if (i == 34) Sensor35 = cmpntName;
+            else if (i == 35) Sensor36 = cmpntName;
+            else if (i == 36) Sensor37 = cmpntName;
+            else if (i == 37) Sensor38 = cmpntName;
+            else if (i == 38) Sensor39 = cmpntName;
+            else if (i == 39) Sensor40 = cmpntName;
         }
     }
 }

Config/Entities/OutputPath.cs

@@ -1,45 +1,39 @@
 ///
-/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
-using Common;
 
 namespace Config.Entities
 {
 	public class OutputPath : IHasName, IHasItemNr, IHasValves
     {
-        public virtual int    Id { get; protected set; }
-		public virtual int    ItemNr { get; set; }
+        public virtual int Id { get; protected set; }
+		public virtual int ItemNr { get; set; }
 		public virtual string Name { get; set; }
         public virtual string OriName { get; set; }         /// Not mapped to database
-        public virtual double Qfrom { get; set; }			/// Water flow in [m3/h]
-        public virtual double Qto { get; set; }				/// Water flow in [m3/h]
-        public virtual Unit   FlowUnit { get; set; }        /// Not mapped to database, used in UI
-        public virtual string Selector { get; set; }
-        public virtual string RegValve { get; set; }
+        public virtual float Qfrom { get; set; }			/// Water flow in [m3/h]
+        public virtual float Qto { get; set; }				/// Water flow in [m3/h]
+        public virtual string RegulValve { get; set; }
 		public virtual string FlowMeter { get; set; }
-		public virtual float  PidCoef { get; set; }			/// PID coefficient for the regulation path
+		public virtual float PidCoef { get; set; }			/// PID coefficient for the regulation path
         public virtual string StartValve { get; set; }
         public virtual string Diverter { get; set; }
-		public virtual string TempMtrDiv { get; set; }
+		public virtual string TempDiv { get; set; }
 		public virtual string Scale { get; set; }
-        public virtual string RegVPositions { get; set; }	/// Positions of regulation valves in Category.Output in % separated by ';'
+		public virtual string EmptyTankValve { get; set; }	/// Not used anywhere
 
         /// Valves		
 		public virtual string ValvesOpen { get; set; }
 		public virtual string ValvesClose { get; set; }
 
-        public virtual bool QfromTextChngd { get; set; }    /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual bool QtoTextChngd { get; set; }      /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-
         /// ------------- Additional stuff not mapped into the database -------------
 
 		public OutputPath()
         {
 			ValvesOpen = string.Empty;
 			ValvesClose = string.Empty;
-        }
+		}
 
 		public OutputPath(string name, int itemNr)
 			: this()
@@ -52,20 +46,18 @@ namespace Config.Entities
         {
 			OutputPath result = new OutputPath(name, itemNr);
 
-			result.Name        = Name;
-			result.Qfrom       = Qfrom;
-            result.Qto         = Qto;
-            result.FlowUnit    = FlowUnit;
-            result.Selector    = Selector;
-            result.RegValve    = RegValve;
-			result.FlowMeter   = FlowMeter;
-			result.PidCoef     = PidCoef;
-            result.StartValve  = StartValve;
-			result.Diverter    = Diverter;
-			result.TempMtrDiv  = TempMtrDiv;
-			result.Scale       = Scale;
-            result.RegVPositions= RegVPositions;
-			result.ValvesOpen  = ValvesOpen;
+			result.Name = Name;
+			result.Qfrom = Qfrom;
+            result.Qto = Qto;
+			result.RegulValve = RegulValve;
+			result.FlowMeter = FlowMeter;
+			result.PidCoef = PidCoef;
+            result.StartValve = StartValve;
+			result.Diverter = Diverter;
+			result.TempDiv = TempDiv;
+			result.Scale = Scale;
+			result.EmptyTankValve = EmptyTankValve;
+			result.ValvesOpen = ValvesOpen;
 			result.ValvesClose = ValvesClose;
 
             return result;

Config/Entities/PTest.cs

@@ -1,10 +1,9 @@
 ///
-/// Copyright (c) 2019-2023 Sensus Slovensko a.s.
+/// Copyright (c) 2019 Sensus Slovensko a.s.
 ///
 using System;
 using System.Globalization;
 using System.IO;
-using Common;
 
 namespace Config.Entities
 {
@@ -16,9 +15,7 @@ namespace Config.Entities
         public virtual int Id { get; protected set; }
         public virtual int ItemNr { get; set; }
         public virtual string Name { get; set; }
-        public virtual int Part { get; set; }                   /// Part=0 ... test of all WM-s    
-                                                                /// Part>0 ... part of a set of tests with the same Name: subset of WM-s is given by MetersPath
-        public virtual FlowId FlowId { get; set; }
+        public virtual int Part { get; set; }				    /// Part=0 ... test of all WM-s                                                               /// Part>0 ... part of a set of tests with the same Name: subset of WM-s is given by MetersPath
         public virtual double CoefQfrom { get; set; }           /// Water flow low limit in [m3/h]
         public virtual double CoefQto { get; set; }				/// Water flow high limit in [m3/h]
         public virtual double ErrLimLo { get; set; }			/// in [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
@@ -29,7 +26,6 @@ namespace Config.Entities
         public virtual double PressLimHi { get; set; }          /// [bar] max. water pressure                                            
         public virtual sbyte Publish { get; set; }			    /// 0=no, 1=in all protocols, 2=on screen, 3=internal
         public virtual bool Evaluate { get; set; }
-        public virtual string Method { get; set; }              /// Test method (component name)
 
         public virtual sbyte E1 { get; set; }                   ///
         public virtual sbyte E2 { get; set; }                   ///
@@ -82,9 +78,8 @@ namespace Config.Entities
             TempLimHi = 25.0;	    /// [°C]
             PressLimLo = 0;	        /// [bar]
             PressLimHi = 16.0;	    /// [bar]
-            Publish = (sbyte)Common.Publish.Always;
+            Publish = (sbyte)Config.Entities.Publish.Always;
             Evaluate = true;
-            Method = string.Empty;
 
             E1 = (sbyte)ErrorFlagsMode.On;
             E2 = (sbyte)ErrorFlagsMode.On;
@@ -144,7 +139,6 @@ namespace Config.Entities
             result.PressLimHi = PressLimHi;
             result.Publish = Publish;
             result.Evaluate = Evaluate;
-            result.Method = Method;
 
             result.E1 = E1;
             result.E2 = E2;
@@ -188,7 +182,6 @@ namespace Config.Entities
 
             output.WriteLine(Name);
             output.WriteLine(Part);
-            output.WriteLine(((ushort)FlowId).ToString(ci));
             output.WriteLine(CoefQfrom.ToString(ci));
             output.WriteLine(CoefQto.ToString(ci));
             output.WriteLine(ErrLimLo.ToString(ci));
@@ -199,7 +192,6 @@ namespace Config.Entities
             output.WriteLine(PressLimHi.ToString(ci));
             output.WriteLine(Publish.ToString());
             output.WriteLine(Evaluate.ToString());
-            output.WriteLine(Method);
 
             output.WriteLine(E1.ToString());
             output.WriteLine(E2.ToString());
@@ -248,36 +240,16 @@ namespace Config.Entities
 
             tst.Name = firstLine;
             tst.Part = int.Parse(input.ReadLine());
-            tst.FlowId = (FlowId)ushort.Parse(input.ReadLine(), ci);
             tst.CoefQfrom = double.Parse(input.ReadLine(), ci);
 			tst.CoefQto = double.Parse(input.ReadLine(), ci);
 			tst.ErrLimLo = double.Parse(input.ReadLine(), ci);
 			tst.ErrLimHi = double.Parse(input.ReadLine(), ci);
 			tst.TempLimLo = double.Parse(input.ReadLine(), ci);
 			tst.TempLimHi = double.Parse(input.ReadLine(), ci);
-            tst.PressLimLo = double.Parse(input.ReadLine(), ci);
-            tst.PressLimHi = double.Parse(input.ReadLine(), ci);
-            tst.Publish = sbyte.Parse(input.ReadLine(), ci);
+            tst.Publish = sbyte.Parse(input.ReadLine());
             tst.Evaluate = bool.Parse(input.ReadLine());
-            tst.Method = input.ReadLine();
 
-            tst.E1 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E2 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E3 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E4 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E5 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E6 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E7 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E8 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E9 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E10 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E11 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E12 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E13 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E14 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E15 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E16 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E21 = sbyte.Parse(input.ReadLine(), ci);
+            /// TODO (E1 .. E21)
 
             tst.Delta_Q_pct = double.Parse(input.ReadLine(), ci);
             tst.Delta_T = double.Parse(input.ReadLine(), ci);
@@ -310,7 +282,6 @@ namespace Config.Entities
 
                                  if (Name != firstLine)               { diff.AppendFormat(fmt, "Name", Name, firstLine); };
             ln = inp.ReadLine(); if (ln != Part.ToString())           { diff.AppendFormat(fmt, "Part", Part.ToString(), ln); };
-            ln = inp.ReadLine(); if (ln != ((ushort)FlowId).ToString()){diff.AppendFormat(fmt, "FlowId", ((ushort)FlowId).ToString(), ln); };
             ln = inp.ReadLine(); if (ln != CoefQfrom.ToString(ci))    { diff.AppendFormat(fmt, "CoefQfrom", CoefQfrom.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != CoefQto.ToString(ci))      { diff.AppendFormat(fmt, "CoefQto", CoefQto.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != ErrLimLo.ToString(ci))     { diff.AppendFormat(fmt, "ErrLimLo", ErrLimLo.ToString(ci), ln); };
@@ -321,7 +292,6 @@ namespace Config.Entities
             ln = inp.ReadLine(); if (ln != PressLimHi.ToString(ci))   { diff.AppendFormat(fmt, "Pressure_max", PressLimHi.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Publish.ToString())        { diff.AppendFormat(fmt, "Publish", Publish.ToString(), ln); };
             ln = inp.ReadLine(); if (ln != Evaluate.ToString())       { diff.AppendFormat(fmt, "Evaluate", Evaluate.ToString(), ln); };
-            ln = inp.ReadLine(); if (ln != Method)                    { diff.AppendFormat(fmt, "Method", Method, ln); };
 
             ln = inp.ReadLine(); if (ln != E1.ToString()) { diff.AppendFormat(fmt, "E1", E1.ToString(), ln); };
             ln = inp.ReadLine(); if (ln != E2.ToString()) { diff.AppendFormat(fmt, "E2", E2.ToString(), ln); };

Config/Entities/Procedure.cs

@@ -1,18 +1,17 @@
 ///
-/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using Common;
 
 namespace Config.Entities
 {
     /// <summary>
     /// Stores one test procedure, supports revisions and history log
     /// </summary>
-    public class Procedure : IHasName, IHasItemNr
+	public class Procedure : IHasName, IHasItemNr
     {
         public virtual int Id { get; protected set; }
 		public virtual int ItemNr { get; set; }
@@ -47,20 +46,21 @@ namespace Config.Entities
         public virtual int AltProcPeriod { get; set; }			/// Period of alternative procedures (0 = no alt. procedure)
 
         public virtual float DN { get; set; }                   /// Not mapped to DB, valid in ProceduresCtrl for procedure filtering only
-        public virtual double Qn { get; set; }                  ///   - ' ' -
+        public virtual float Qn { get; set; }                   ///   - ' ' -
         public virtual string MClass { get; set; }              ///   - ' ' -
         public virtual string Producer { get; set; }            ///   - ' ' -
 
 		public virtual IList<ComponentProcedure> MoreParams { get; set; }
 		public virtual IList<Test> Tests { get; set; }
 
-        TestInstance[] testInstances;
-
         /// Wrapper
         public virtual IList<Test> RegularTests()
         {
             IList<Test> rslt = new List<Test>();
-            foreach (var t in Tests) if (t.IsRegular()) rslt.Add(t);
+            foreach (var t in Tests)
+            {
+                if ((t.Name.Length > 0 && t.Name[0] != '[') || !t.Name.Contains("]"))  rslt.Add(t);
+            }
             return rslt;
         }
 
@@ -70,16 +70,15 @@ namespace Config.Entities
         {
 			MoreParams = new List<ComponentProcedure>();
 			Tests = new List<Test>();
-            testInstances = null;
 
 			///
 			/// Default values
 			/// 
-            CreationUser = Common.CurrentUser.UserName();
+			CreationUser = (Users.GlobalData.CurrentUser != null) ? Users.GlobalData.CurrentUser.UserName : null;
 			CreationTime = DateTime.Now;
 			LastChgUser = CreationUser;
 			LastChgTime = CreationTime;
-			MetersKind = MetersKind.Single;
+			MetersKind = Entities.MetersKind.Single;
 			Watermeters = string.Empty;
 			Description = string.Empty;
 			LongDescription = string.Empty;
@@ -97,70 +96,6 @@ namespace Config.Entities
 			ItemNr = itemNr;
 		}
 
-        public virtual TestInstance[] UpdateTestInstances(IList<string> loopStartNames, IList<string> loopEndNames, IList<string> autoTests = null)
-        {
-            List<TestInstance> instances = new List<TestInstance>();
-
-            if (Tests != null)
-            {
-                int i = 0;
-                while (i < Tests.Count)
-                {
-                    if (!loopStartNames.Contains(Tests[i].Method) && !loopEndNames.Contains(Tests[i].Method))   /// Loop.End is ignored outside a loop
-                    {
-                        ///
-                        /// Outside a loop
-                        ///
-                        for (int j = 1; j <= Tests[i].Repeats; j++)
-                            if (Tests[i].BelongsTo(autoTests))
-                                instances.Add(new TestInstance(Tests[i], j));
-                    }
-                    else if (loopStartNames.Contains(Tests[i].Method))
-                    {
-                        ///
-                        /// Entering a loop
-                        ///
-                        int loopsCount = Tests[i].Repeats;
-                        List<Test> testsInsideLoop = new List<Test>();
-                        i++;
-
-                        while (i < Tests.Count && !loopEndNames.Contains(Tests[i].Method))
-                        {
-                            ///
-                            /// Inside a loop
-                            ///
-                            if (Tests[i].Repeats == loopsCount && !loopStartNames.Contains(Tests[i].Method))    /// Loop.Start is ignored inside a loop
-                            {
-                                if (Tests[i].BelongsTo(autoTests))
-                                    testsInsideLoop.Add(Tests[i]);
-                            }
-
-                            i++;
-                        }
-
-                        ///
-                        /// Append instances of tests inside the last loop to the list
-                        ///
-                        for (int j = 1; j <= loopsCount; j++)
-                        {
-                            foreach (var t in testsInsideLoop)
-                                instances.Add(new TestInstance(t, j));
-                        }
-                    }
-
-                    i++;
-                }
-            }
-
-            testInstances = instances.ToArray();
-            return testInstances;
-        }
-
-        public virtual TestInstance[] GetTestInstances()
-        {
-            return testInstances;
-        }
-
         public virtual Procedure Clone()
         {
             Procedure result = new Procedure();

Config/Entities/Profile.cs

@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using Common;
 
 namespace Config.Entities
 {
@@ -36,7 +35,7 @@ namespace Config.Entities
 			///
 			/// Default values
 			/// 
-            CreationUser = CurrentUser.UserName();
+			CreationUser = (Users.GlobalData.CurrentUser != null) ? Users.GlobalData.CurrentUser.UserName : null;
 			CreationTime = DateTime.Now;
 			LastChgUser = CreationUser;
 			LastChgTime = CreationTime;
@@ -78,8 +77,6 @@ namespace Config.Entities
 			output.WriteLine(CreationTime.ToString(CultureInfo.InvariantCulture));
             output.WriteLine(LastChgUser);
 			output.WriteLine(LastChgTime.ToString(CultureInfo.InvariantCulture));
-            output.WriteLine(((sbyte)ProfileType).ToString());
-            output.WriteLine(((sbyte)ErrorLimitType).ToString());
 
             foreach (var test in Tests) { test.Export(output); }
             output.WriteLine();
@@ -98,8 +95,7 @@ namespace Config.Entities
 			result.CreationTime = DateTime.Parse(input.ReadLine(), CultureInfo.InvariantCulture);
             result.LastChgUser = input.ReadLine();
 			result.LastChgTime = DateTime.Parse(input.ReadLine(), CultureInfo.InvariantCulture);
-            result.ProfileType = (ProfileType)sbyte.Parse(input.ReadLine());
-            result.ErrorLimitType = (ErrorLimitType)sbyte.Parse(input.ReadLine());
+            string line = input.ReadLine();
 
             while (true)
             {

Config/Entities/Test.cs

@@ -1,11 +1,10 @@
 ///
-/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using Common;
 
 namespace Config.Entities
 {
@@ -19,15 +18,14 @@ namespace Config.Entities
         public virtual string Name { get; set; }	
 		public virtual int Part { get; set; }				/// Part=0 ... test of all WM-s
 															/// Part>0 ... part of a set of tests with the same Name: subset of WM-s is given by MetersPath
-        public virtual TestProfile Profile { get; set; }    /// UserDefined, UserDefinedCompound, UserDefinedHeatMeter, Protected, ProtectedCompound, ProtectedHeatMeter
+        public virtual TestProfile Profile { get; set; }    /// UserDefined, Protected, UserDefinedHeatMeter, ProtectedHeatMeter
         public virtual sbyte Publish { get; set; }			/// 0=no, 1=in all protocols, 2=on screen, 3=internal
 		public virtual bool DoEvaluate { get; set; }
-        public virtual double Qtg { get; set; }             /// When == -1 => Qtg is determined by the test method, otherwise Qtg is in [m3/h], 
-        public virtual double Qfrom { get; set; }			/// Water flow low limit in [m3/h] or in [%] of Qtg
-        public virtual double Qto { get; set; }				/// Water flow high limit in [m3/h] or in [%] of Qtg
-        public virtual bool IsFromToInPct { get; set; }     /// true: Qfrom and Qto are in % of Qtg, false: Qfrom and Qto are in [m3/h]
-		public virtual double Volume { get; set; }			/// Test volume (target) in [l]
-        public virtual double TestTime { get; set; }	    /// Test time (estimate) in [s]
+        public virtual float Qtg { get; set; }              /// Target water flow [m3/h]
+        public virtual float Qfrom { get; set; }			/// Water flow low limit in [m3/h]
+        public virtual float Qto { get; set; }				/// Water flow high limit in [m3/h]
+		public virtual float Volume { get; set; }			/// Test volume (target) in [l]
+        public virtual float TstTime { get; set; }			/// Test time (estimate) in [s]
         public virtual string Method { get; set; }
         public virtual float ErrLimLo { get; set; }			/// in [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
         public virtual float ErrLimHi { get; set; }			/// in [%] usually > 0, in case of heat meters: -Qn in m3/h
@@ -35,10 +33,10 @@ namespace Config.Entities
         public virtual int Repeats { get; set; }
         public virtual bool DoDraining { get; set; }
         public virtual bool DoDrainingAfter { get; set; }
+		public virtual bool DoControlWaterTemp { get; set; }
 		public virtual float TempLimLo { get; set; }		/// Lower limit for the controlled temperature
 		public virtual float TempLimHi { get; set; }		/// Upper limit for the controlled temperature
-        public virtual string TempControl { get; set; }     /// Water temperature controller, null or empty = Do not control water temp
-        public virtual float PumpPower { get; set; }		/// Power of the pump in [%] in the range 0 .. 100.0f, use values 0% and 100% for non-FM pumps
+		public virtual float PumpPower { get; set; }		/// Power of the pump in [%] in the range 0 .. 100.0f, use values 0% and 100% for non-FM pumps
         public virtual int MassRepeats { get; set; }		/// Number of mass. measurements at the beginning/end of test, 0 = default (=5)
         public virtual float MassSpread { get; set; }		/// Max spread of mass. measurements at the beginning/end of test, 0 = default
 		public virtual MassMethod MassMethod { get; set; }	/// method of mass. measurement at the beginning/end of test: false=slow (precise), true=using immediate mass measurement and evaluation
@@ -46,7 +44,8 @@ namespace Config.Entities
         public virtual int TimeFlow2Mass { get; set; }		/// Delay time from the flow stable to the 1st mass measurement in [s]
         public virtual int TimePump2StartV { get; set; }	/// Delay time from the start of the pump to opening the start valve in [s]
         public virtual int TimeStop2Mass { get; set; }		/// Delay time from the test end (diverted) to the 2nd mass measuremen in [s]
-		public virtual int ShortPulses { get; set; }		/// Short pulses
+		public virtual double TolerRed { get; set; }		///  = Filter
+        public virtual string RedType { get; set; }
 		public virtual string FeedingPath { get; set; }
 		public virtual string BenchPath { get; set; }
 		public virtual string OutputPath { get; set; }
@@ -54,41 +53,18 @@ namespace Config.Entities
 #if HEAT_METERS
         public virtual string HeatMetersPath { get; set; }
 #endif
-        public virtual string TransBefore { get; set; }
-		public virtual string TransBetween { get; set; }
-		public virtual string TransAfter { get; set; }
+        public virtual string RelTransBefore { get; set; }
+		public virtual string RelTransBetween { get; set; }
+		public virtual string TransitionAfter { get; set; }
 
-        public virtual IList<ComponentTest> MoreParams { get; set; }
+        public virtual bool IsOuterLoopStart { get; set; }  /// Not mapped to database
+        public virtual bool IsOuterLoopEnd { get; set; }    /// Not mapped to database
 
-        public virtual Procedure Procedure { get; set; }
+		public virtual IList<ComponentTest> MoreParams { get; set; }
 
-        /// Additional stuff not mapped into the database
-        public virtual bool IsOuterLoopStart { get; set; }   /// Not mapped to database
-        public virtual bool IsOuterLoopEnd { get; set; }     /// Not mapped to database
+		public virtual Procedure Procedure { get; set; }
 
-        public virtual bool QtgTextChngd { get; set; }       /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual bool QfromTextChngd { get; set; }     /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual bool QtoTextChngd { get; set; }       /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual bool VolumeTextChngd { get; set; }    /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual bool TempLimLoTextChngd { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual bool TempLimHiTextChngd { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual Unit VolumeUnit { get; set; }         /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual Unit FlowUnit { get; set; }           /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual Unit MassUnit { get; set; }           /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual Unit TempUnit { get; set; }           /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual Unit PressUnit { get; set; }          /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual Unit LengthUnit { get; set; }         /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-	    public virtual Unit ElectricUnit { get; set; }         /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-
-        /// Wrappers        
-        public virtual double QfromM3ph()
-        {
-            return !IsFromToInPct ? Qfrom : Qtg >= 0 ? Qtg * Qfrom / 100 : 0;
-        }
-        public virtual double QtoM3ph()
-        {
-            return !IsFromToInPct ? Qto : Qtg >= 0 ? Qtg * Qto / 100 : 0;
-        }
+        /// ------------- Additional stuff not mapped into the database -------------
 
         public Test()
         {
@@ -99,30 +75,29 @@ namespace Config.Entities
 			///
             Part = 0;
             Profile = TestProfile.UserDefined;
-            Publish = (sbyte)Common.Publish.Always;
+            Publish = (sbyte)Config.Entities.Publish.Always;
 			DoEvaluate = true;
-            IsFromToInPct = false;
-            ErrLimLo = -2.0f;				/// [%] lower error limit
-            ErrLimHi = 2.0f;				/// [%] upper error limit
-            Uncertainty = 0;
-            Repeats = 1;
+			Repeats = 1;
 			DoDraining = false;
 			DoDrainingAfter = false;
+			DoControlWaterTemp = false;
 			TempLimLo = 15.0f;
 			TempLimHi = 25.0f;
-            TempControl = string.Empty;
+			ErrLimLo = -2.0f;				/// [%] lower error limit
+			ErrLimHi = 2.0f;				/// [%] upper error limit
+			Uncertainty = 0;
             PumpPower = 60.0f;				/// [%]
             MassRepeats = 0;				/// default
             MassSpread = 0;					/// default
-            MassMethod = MassMethod.Scale;  /// default
+            MassMethod = MassMethod.Scale;     /// default
             TimeBeforeFlow = 10;			/// [s] time before the start of flow control in [s]
             TimeFlow2Mass = 5;				/// [s] time from the flow stable to the 1st mass measurement in [s]
             TimePump2StartV = 1;			/// [s] time from the 1st mass measurement to the test start in [s]
             TimeStop2Mass = 5;				/// [s] between the test end and the final mass measurement
-            ShortPulses = 0;				/// Short pulses parameter (0 or 1)
-			TransBefore = string.Empty;
-			TransBetween = string.Empty;
-			TransAfter = string.Empty;
+            TolerRed = 0;					/// = Filter parameter
+			RelTransBefore  = string.Empty;
+			RelTransBetween = string.Empty;
+			TransitionAfter = string.Empty;
 		}
 
 		public Test(string name, int itemNr, Procedure procedure)
@@ -133,32 +108,6 @@ namespace Config.Entities
 			Procedure = procedure;
 		}
 
-        public virtual bool IsRegular()
-        {
-            /// Irregular / event triggered test names have form "[event] TestName"
-            return (Name.Length > 0 && Name[0] != '[') || !Name.Contains("]");
-        }
-
-        public virtual bool BelongsTo(IList<string> autoTests)
-        {
-            if (IsRegular()) return true;
-
-            if (autoTests == null) return false;
-
-            string action = Name.Substring(1, Name.IndexOf(']') - 1);
-            return autoTests.Contains(action);
-        }
-
-        public virtual void ResetChngdFlags()
-        {
-            QtgTextChngd = false;
-            QfromTextChngd = false;
-            QtoTextChngd = false;
-            VolumeTextChngd = false;
-            TempLimLoTextChngd = false;
-            TempLimHiTextChngd = false;
-        }
-
         // Makes a new copy of this object (not just a reference)
         public virtual Test Clone()
         {
@@ -171,9 +120,8 @@ namespace Config.Entities
             result.Qtg = Qtg;
 			result.Qfrom = Qfrom;
             result.Qto = Qto;
-            result.IsFromToInPct = IsFromToInPct;
-            result.Volume = Volume;
-			result.TestTime = TestTime;
+			result.Volume = Volume;
+			result.TstTime = TstTime;
 			result.Method = Method;
 			result.ErrLimLo = ErrLimLo;
 			result.ErrLimHi = ErrLimHi;
@@ -181,10 +129,10 @@ namespace Config.Entities
 			result.Repeats = Repeats;
             result.DoDraining = DoDraining;
             result.DoDrainingAfter = DoDrainingAfter;
+			result.DoControlWaterTemp = DoControlWaterTemp;
 			result.TempLimLo = TempLimLo;
 			result.TempLimHi = TempLimHi;
-            result.TempControl = TempControl;
-            result.PumpPower = PumpPower;
+			result.PumpPower = PumpPower;
             result.MassRepeats = MassRepeats;
             result.MassSpread = MassSpread;
             result.MassMethod = MassMethod;
@@ -192,7 +140,8 @@ namespace Config.Entities
             result.TimeFlow2Mass = TimeFlow2Mass;
             result.TimePump2StartV = TimePump2StartV;
 			result.TimeStop2Mass = TimeStop2Mass;
-			result.ShortPulses = ShortPulses;
+			result.TolerRed = TolerRed;
+            result.RedType = RedType;
 			result.FeedingPath = FeedingPath;
 			result.BenchPath = BenchPath;
 			result.OutputPath = OutputPath;
@@ -200,18 +149,10 @@ namespace Config.Entities
 #if HEAT_METERS
             result.HeatMetersPath = HeatMetersPath;
 #endif
-			result.TransBefore = TransBefore;
-			result.TransBetween = TransBetween;
-			result.TransAfter = TransAfter;
-            result.VolumeUnit = VolumeUnit;
-            result.FlowUnit = FlowUnit;
-            result.FlowUnit = FlowUnit;
-            result.MassUnit = MassUnit;
-            result.TempUnit = TempUnit;
-            result.PressUnit = PressUnit;
-            result.LengthUnit = LengthUnit;
-            result.ElectricUnit = ElectricUnit;
-            foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone()); }
+			result.RelTransBefore = RelTransBefore;
+			result.RelTransBetween = RelTransBetween;
+			result.TransitionAfter = TransitionAfter;
+			foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone()); }
 
             return result;
         }
@@ -227,9 +168,8 @@ namespace Config.Entities
             output.WriteLine(Qtg.ToString(ci));
             output.WriteLine(Qfrom.ToString(ci));
             output.WriteLine(Qto.ToString(ci));
-            output.WriteLine(IsFromToInPct.ToString());
             output.WriteLine(Volume.ToString(ci));
-            output.WriteLine(TestTime.ToString(ci));
+            output.WriteLine(TstTime.ToString(ci));
             output.WriteLine(Method);
             output.WriteLine(ErrLimLo.ToString(ci));
             output.WriteLine(ErrLimHi.ToString(ci));
@@ -237,10 +177,10 @@ namespace Config.Entities
             output.WriteLine(Repeats.ToString(ci));
             output.WriteLine(DoDraining.ToString());
             output.WriteLine(DoDrainingAfter.ToString());
+			output.WriteLine(DoControlWaterTemp.ToString());
 			output.WriteLine(TempLimLo.ToString(ci));
 			output.WriteLine(TempLimHi.ToString(ci));
-            output.WriteLine((TempControl != null) ? TempControl : string.Empty);
-            output.WriteLine(PumpPower.ToString(ci));
+			output.WriteLine(PumpPower.ToString(ci));
             output.WriteLine(MassRepeats.ToString(ci));
             output.WriteLine(MassSpread.ToString(ci));
 			output.WriteLine(((byte)MassMethod).ToString(ci));
@@ -248,15 +188,14 @@ namespace Config.Entities
             output.WriteLine(TimeFlow2Mass.ToString(ci));
             output.WriteLine(TimePump2StartV.ToString(ci));
             output.WriteLine(TimeStop2Mass.ToString(ci));
-            output.WriteLine(ShortPulses.ToString(ci));
             output.WriteLine(FeedingPath);
             output.WriteLine(BenchPath);
             output.WriteLine(OutputPath);
             output.WriteLine(MetersPath);
-            output.WriteLine(TransBefore);
-            output.WriteLine(TransBetween);
+            output.WriteLine(RelTransBefore);
+            output.WriteLine(RelTransBetween);
             output.WriteLine(Profile);
-            output.WriteLine(TransAfter);
+            output.WriteLine(TransitionAfter);
 
             foreach (var prms in MoreParams) { prms.Export(output); }
             output.WriteLine();
@@ -277,12 +216,11 @@ namespace Config.Entities
 			tst.Part = int.Parse(input.ReadLine(), ci);
 			tst.Publish = sbyte.Parse(input.ReadLine(), ci);
 			tst.DoEvaluate = bool.Parse(input.ReadLine());
-            tst.Qtg = double.Parse(input.ReadLine(), ci);
-            tst.Qfrom = double.Parse(input.ReadLine(), ci);
-            tst.Qto = double.Parse(input.ReadLine(), ci);
-            tst.IsFromToInPct = bool.Parse(input.ReadLine());
-            tst.Volume = double.Parse(input.ReadLine(), ci);
-            tst.TestTime = double.Parse(input.ReadLine(), ci);
+            tst.Qtg = float.Parse(input.ReadLine(), ci);
+            tst.Qfrom = float.Parse(input.ReadLine(), ci);
+			tst.Qto = float.Parse(input.ReadLine(), ci);
+			tst.Volume = float.Parse(input.ReadLine(), ci);
+			tst.TstTime = float.Parse(input.ReadLine(), ci);
             tst.Method = input.ReadLine();
 			tst.ErrLimLo = float.Parse(input.ReadLine(), ci);
 			tst.ErrLimHi = float.Parse(input.ReadLine(), ci);
@@ -290,10 +228,10 @@ namespace Config.Entities
 			tst.Repeats = int.Parse(input.ReadLine(), ci);
             tst.DoDraining = bool.Parse(input.ReadLine());
 			tst.DoDrainingAfter = bool.Parse(input.ReadLine());
+			tst.DoControlWaterTemp = bool.Parse(input.ReadLine());
 			tst.TempLimLo = float.Parse(input.ReadLine(), ci);
 			tst.TempLimHi = float.Parse(input.ReadLine(), ci);
-            tst.TempControl = input.ReadLine();
-            tst.PumpPower = float.Parse(input.ReadLine(), ci);
+			tst.PumpPower = float.Parse(input.ReadLine(), ci);
 			tst.MassRepeats = int.Parse(input.ReadLine(), ci);
 			tst.MassSpread = float.Parse(input.ReadLine(), ci);
 			tst.MassMethod = (MassMethod)byte.Parse(input.ReadLine(), ci);
@@ -301,21 +239,17 @@ namespace Config.Entities
 			tst.TimeFlow2Mass = int.Parse(input.ReadLine(), ci);
 			tst.TimePump2StartV = int.Parse(input.ReadLine(), ci);
 			tst.TimeStop2Mass = int.Parse(input.ReadLine(), ci);
-            tst.ShortPulses = int.Parse(input.ReadLine(), ci);
             tst.FeedingPath = input.ReadLine();
             tst.BenchPath = input.ReadLine();
             tst.OutputPath = input.ReadLine();
             tst.MetersPath = input.ReadLine();
-            tst.TransBefore = input.ReadLine();
-            tst.TransBetween = input.ReadLine();
+            tst.RelTransBefore = input.ReadLine();
+            tst.RelTransBetween = input.ReadLine();
             string line = input.ReadLine();
             tst.Profile = line.Equals(TestProfile.ProtectedHeatMeter.ToString()) ? TestProfile.ProtectedHeatMeter
-                        : line.Equals(TestProfile.ProtectedCompound.ToString()) ? TestProfile.ProtectedCompound
-                        : line.Equals(TestProfile.Protected.ToString()) ? TestProfile.Protected
-                        : line.Equals(TestProfile.UserDefinedHeatMeter.ToString()) ? TestProfile.UserDefinedHeatMeter
-                        : line.Equals(TestProfile.UserDefinedCompound.ToString()) ? TestProfile.UserDefinedCompound
-                        : TestProfile.UserDefined;  /// UserDefined is the default
-            tst.TransAfter = input.ReadLine();
+                          : line.Equals(TestProfile.UserDefinedHeatMeter.ToString()) ? TestProfile.UserDefinedHeatMeter
+                          : line.Equals(TestProfile.Protected.ToString()) ? TestProfile.Protected : TestProfile.UserDefined;  /// UserDefined is the default
+            tst.TransitionAfter = input.ReadLine();
 
             while (true)
             {
@@ -347,19 +281,18 @@ namespace Config.Entities
             ln = inp.ReadLine(); if (ln != Qtg.ToString(ci))                { diff.AppendFormat(fmt, "Qtg", Qtg.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Qfrom.ToString(ci))              { diff.AppendFormat(fmt, "Qfrom", Qfrom.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Qto.ToString(ci))                { diff.AppendFormat(fmt, "Qto", Qto.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != IsFromToInPct.ToString())        { diff.AppendFormat(fmt, "IsFromToInPct", IsFromToInPct.ToString(), ln); };
             ln = inp.ReadLine(); if (ln != Volume.ToString(ci))             { diff.AppendFormat(fmt, "Volume", Volume.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != TestTime.ToString(ci))           { diff.AppendFormat(fmt, "TstTime", TestTime.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != TstTime.ToString(ci))            { diff.AppendFormat(fmt, "TstTime", TstTime.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Method)                          { diff.AppendFormat(fmt, "Method", Method, ln); };
             ln = inp.ReadLine(); if (ln != ErrLimLo.ToString(ci))           { diff.AppendFormat(fmt, "ErrLimLo", ErrLimLo.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != ErrLimHi.ToString(ci))           { diff.AppendFormat(fmt, "ErrLimHi", ErrLimHi.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Uncertainty.ToString(ci))        { diff.AppendFormat(fmt, "Uncertainty", Uncertainty.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Repeats.ToString(ci))            { diff.AppendFormat(fmt, "Repeats", Repeats.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != DoDraining.ToString())           { diff.AppendFormat(fmt, "DoDraining", DoDraining.ToString(), ln); };
-            ln = inp.ReadLine(); if (ln != DoDrainingAfter.ToString())      { diff.AppendFormat(fmt, "DoDrainingAfter", DoDrainingAfter.ToString(), ln); };
+            ln = inp.ReadLine(); if (ln != DoDraining.ToString(ci))         { diff.AppendFormat(fmt, "Draining", DoDraining.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != DoDrainingAfter.ToString(ci))    { diff.AppendFormat(fmt, "Zeroing", DoDrainingAfter.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != DoControlWaterTemp.ToString())   { diff.AppendFormat(fmt, "DoControlWaterTemp", DoControlWaterTemp.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != TempLimLo.ToString(ci))          { diff.AppendFormat(fmt, "TempLimLo", TempLimLo.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != TempLimHi.ToString(ci))          { diff.AppendFormat(fmt, "TempLimHi", TempLimHi.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != TempControl)                     { diff.AppendFormat(fmt, "TempController", TempControl, ln); };
             ln = inp.ReadLine(); if (ln != PumpPower.ToString(ci))          { diff.AppendFormat(fmt, "PumpPower", PumpPower.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != MassRepeats.ToString(ci))        { diff.AppendFormat(fmt, "MassRepeats", MassRepeats.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != MassSpread.ToString(ci))         { diff.AppendFormat(fmt, "MassSpread", MassSpread.ToString(ci), ln); };
@@ -372,10 +305,10 @@ namespace Config.Entities
             ln = inp.ReadLine(); if (ln != BenchPath)                       { diff.AppendFormat(fmt, "BenchPath", BenchPath, ln); };
             ln = inp.ReadLine(); if (ln != OutputPath)                      { diff.AppendFormat(fmt, "OutputPath", OutputPath, ln); };
             ln = inp.ReadLine(); if (ln != MetersPath)                      { diff.AppendFormat(fmt, "MetersPath", MetersPath, ln); };
-            ln = inp.ReadLine(); if (ln != TransBefore)                     { diff.AppendFormat(fmt, "TransBefore", TransBefore, ln); };
-            ln = inp.ReadLine(); if (ln != TransBetween)                    { diff.AppendFormat(fmt, "TransBetween", TransBetween, ln); };
-            ln = inp.ReadLine(); if (ln != Profile.ToString())              { diff.AppendFormat(fmt, "Profile", Profile, ln); };
-            ln = inp.ReadLine(); if (ln != TransAfter)                      { diff.AppendFormat(fmt, "TransAfter", TransAfter, ln); };
+            ln = inp.ReadLine(); if (ln != RelTransBefore)                  { diff.AppendFormat(fmt, "RelTransBefore", RelTransBefore, ln); };
+            ln = inp.ReadLine(); if (ln != RelTransBetween)                 { diff.AppendFormat(fmt, "RelTransBetween", RelTransBetween, ln); };
+            ln = inp.ReadLine(); if (ln != Profile.ToString())            { diff.AppendFormat(fmt, "RelTransAfter", Profile, ln); };
+            ln = inp.ReadLine(); if (ln != TransitionAfter)                 { diff.AppendFormat(fmt, "TransitionAfter", TransitionAfter, ln); };
 
             return diff.ToString();
         }
@@ -476,6 +409,29 @@ namespace Config.Entities
 			return false;
 		}
 
+		/// <summary>
+		/// Determines whether tests part number is OK.
+		/// Examples of correct part number are:
+		///	1, 2, 12, 21 in case of max. part nr.== 2
+		///	1, 2, 3, 4, 12, 13, 14, 23, 24, 34, 123, 124, 134, 234, 1234 in case of max. part nr.== 4
+		/// </summary>
+		/// <param name="partNr">Tests par tnumber</param>
+		/// <returns>true when Part number is OK</returns>
+		public static bool IsGoodPartNr(int partNr)
+		{
+			bool firstDigitIsOK  = ((partNr % 10) > 0) && ((partNr % 10) <= Config.Data.MaxPartNr);
+			bool secondDigitIsOK = (((partNr/10) % 10) > 0) && (((partNr/10) % 10) <= Config.Data.MaxPartNr);
+			bool thirdDigitIsOK  = (((partNr/100) % 10) > 0) && (((partNr/100) % 10) <= Config.Data.MaxPartNr);
+			bool fourthDigitIsOK = (((partNr/1000) % 10) > 0) && (((partNr/1000) % 10) <= Config.Data.MaxPartNr);
+
+			if (firstDigitIsOK && (partNr / 10 == 0)) return true;
+			if (firstDigitIsOK && secondDigitIsOK && (partNr / 100 == 0)) return true;
+			if (firstDigitIsOK && secondDigitIsOK && thirdDigitIsOK && (partNr / 1000 == 0)) return true;
+			if (firstDigitIsOK && secondDigitIsOK && thirdDigitIsOK && fourthDigitIsOK && (partNr / 10000 == 0)) return true;
+
+			return false;
+		}
+
 		public override string ToString()
 		{
 			string partStr = (Part > 0) ? string.Format(", part {0}", Part) : string.Empty;

Config/Entities/TestInstance.cs

@@ -1,32 +0,0 @@
-///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
-///
-using System;
-
-namespace Config.Entities
-{
-    public class TestInstance
-    {
-        public Test Test;
-        public int Repetition;
-
-        public string Name
-        {
-            get
-            {
-                return (Test != null) ? Common.Utils.GetTestName(Test.Name, Test.Repeats, Repetition) : string.Empty;
-            }
-        }
-
-        public TestInstance(Test test, int repetition)
-        {
-            Test = test;
-            Repetition = repetition;
-        }
-
-        public override string ToString()
-        {
-            return Name;
-        }
-    }
-}

Config/Entities/Uncertainty.cs

@@ -1,11 +1,11 @@
 ///
-/// Copyright (c) 2019-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2019 Sensus Slovensko a.s.
 ///
 using System;
 
 namespace Config.Entities
 {
-    public class Uncertainty : Common.IUncertainty
+    public class Uncertainty
     {
         public virtual int Id { get; protected set; }
         public virtual float Measurement { get; set; }

Config/Entities/User.cs

@@ -1,19 +1,14 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
-using log4net;
-using Common;
-using Config.Resources;
 
 namespace Config.Entities
 {
-    public class User : Common.IUser
+    public class User
     {
-        static readonly ILog log = LogManager.GetLogger(typeof(User));
-
-        public virtual int Id { get; protected set; }
+		public virtual int Id { get; protected set; }
         public virtual string UserName { get; set; }	/// = name, alias, abbreviation
 		public virtual string FullName { get; set; }	/// = description
         public virtual string Tag { get; set; }
@@ -25,27 +20,11 @@ namespace Config.Entities
         public virtual DateTime LastPwChange { get; set; }
         public virtual IList<Group> Groups { get; set; }   //User can be a member of a list of groups
 
-        private bool powerUser;		        /// true for built-in users, power users have full access even with empty Groups list
-        public virtual bool IsPowerUser() { return powerUser; }
-
-        private string legalizator;         /// Not mapped to a database !!!, 2nd user entered in a logging dialog
-        public virtual void SetLegalizator(string value) { legalizator = value; }
-        public virtual string GetLegalizator() { return legalizator; }
-
         public User()
         {
             Groups = new List<Group>();
         }
 
-        public User(string userName, int number, bool powerUser)
-        {
-            UserName = userName;
-            Number = number;
-            this.powerUser = powerUser;
-            Groups = new List<Group>();
-            FullName = powerUser ? "Power User" : string.Empty;
-        }
-
 		/// <summary>
 		/// Adds a group to the user.
 		/// </summary>
@@ -55,155 +34,14 @@ namespace Config.Entities
 			Groups.Add(group);
 		}
 
-        /// <summary>
-        /// All members are copied except of ID (so that NHibernate works properly).
-        /// List of groups is empty.
-        /// </summary>
-        /// <param name="user"></param>
-        /// <returns></returns>
-        public virtual object Clone()
-        {
-            User newUser = new User(UserName, Number, false);
-            newUser.FullName = FullName;
-            newUser.Number = Number;
-            newUser.Tag = Tag;
-            newUser.Password = Password;
-            newUser.LastPwChange = LastPwChange;
-            return newUser;
-        }
-
-        public override string ToString()
-        {
-            return (UserName != null) ? UserName : Number.ToString();
-        }
-
-        /// ------------- Additional stuff not mapped into the database -------------
-
-        /// <summary>
-        /// Check whether user is a member of a group.
-        /// </summary>
-        /// <param name="groupId">Group GID</param>
-        /// <returns>true is user is a member of the specified group</returns>
-        public virtual bool IsMemberOf(GID groupId)
-        {
-            if (powerUser)
-            {
-                return true;
-            }
-            else if ((groupId >= 0) && (groupId < GID.NrOfGroups))
-            {
-                foreach (var g in Groups)
-                {
-                    if (g.GID == groupId) return true;
-                }
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Check whether user is a member of any of specified groups.
-        /// Returns true also when no groups are defined (groupIds = null).
-        /// </summary>
-        /// <param name="groupIds">An array of group GID-s or null (no membership required)</param>
-        /// <returns>true if user is a member of any of specified groups</returns>
-        public virtual bool IsMemberOf(GID[] groupIds)
-        {
-            if (groupIds == null || powerUser)
-            {
-                return true;
-            }
-
-            foreach (var gid in groupIds)
-            {
-                if ((gid >= 0) && (gid < GID.NrOfGroups))
-                {
-                    /// for all group elements in User.Groups
-                    foreach (var grp in Groups)
-                    {
-                        /// element GID = parameter GroupId ?
-                        if (grp.GID == gid) return true;
-                    }
-                }
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Checks requirements on the password regardless of the password history
-        /// </summary>
-        /// <param name="password">Password</param>
-        /// <returns>true when the password is OK</returns>
-        public static bool IsPasswordMeetsRequirements(string password, out string explanation)
-        {
-            return Common.Utils.IsPasswordMeetsRequirements(password, out explanation);
-        }
-
-        /// <summary>
-        /// Returns true when password was already used in the past
-        /// </summary>
-        /// <param name="passwordCandidate">Password</param>
-        /// <returns>false when password is new, true when it was used in the past</returns>
-        public virtual bool IsPasswordUsedInPast(string passwordCandidate)
-        {
-            string encryptedPW = EncryptedPassword(passwordCandidate);
-            return (encryptedPW == Password) || (encryptedPW == Password2) || (encryptedPW == Password3);
-        }
-
-        /// <summary>
-        /// Checks 'LastPwChange' and returns true when password expired
-        /// </summary>
-        /// <returns></ returns>
-        public virtual bool IsPasswordExpired()
-        {
-            if (IsPowerUser() || IsMemberOf(GID.Administrators) || CurrentUser.PasswdExpirationPeriodDays == 0)
-            {
-                /// Password cannot expirate for this user or this feature is disabled in Backup and Security options
-                return false;
-            }
-
-            /// Password expiration time is 3 months
-            return (DateTime.Now - LastPwChange > new TimeSpan(CurrentUser.PasswdExpirationPeriodDays, 0, 0, 0));
-        }
-
-        /// <summary>
-        /// Encrypts and saves users password.
-        /// </summary>
-        /// <param name="password">Password</param>
-        public virtual void SetPassword(string password)
-        {
-            Password4 = Password3;
-            Password3 = Password2;
-            Password2 = Password;
-            Password = EncryptedPassword(password);
-            LastPwChange = DateTime.Now;
-        }
-
-        string EncryptedPassword(string password)
-        {
-            return Common.Utils.GetHash(password);
-        }
-
-        /// <summary>
-        /// Verifies users password. Used by static bool Authorisation(...)
-        /// </summary>
-        /// <param name="password">Password</param>
-        /// <returns>true if password is correct</returns>
-        public virtual bool IsCorrectPassword(string password)
-        {
-            if (string.IsNullOrEmpty(password) && string.IsNullOrEmpty(Password))
-            {
-                /// Currently saved and verified passwords are both empty => return true
-                return true;
-            }
-
-            return (Password == EncryptedPassword(password));
-        }
-
-        public virtual string ToEncodedStr()
-        {
-            return string.Format("{0}~{1}~{2}", UserName, FullName, legalizator);
-        }
-    }
+		/// <summary>
+		/// Encrypts and sets users password.
+		/// </summary>
+		/// <param name="password">Unencrypted password</param>
+		public virtual void SetPassword(string password)
+		{
+			Password = Users.Entities.User.getHash(password);
+			LastPwChange = DateTime.Now;
+		}
+	}
 }

Config/FluentCommon.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
 ///
 using System;
 using System.Windows.Forms;
@@ -8,18 +8,51 @@ using FluentNHibernate.Cfg.Db;
 using NHibernate;
 using NHibernate.Cfg;
 using NHibernate.Tool.hbm2ddl;
-using Common;
 using Config.Resources;
 
 namespace Config
 {
-    public class FluentCommon
+    public static class FluentCommon
     {
+		/// <summary>
+		/// Session factories for regular sessions.
+		/// </summary>
+		public static ISessionFactory[] SessionFactories = new ISessionFactory[(int)Users.Entities.DBKind.Count];
+
         /// <summary>
         /// NHibernate session factory (to create the database session 'SessionFactory')
         /// </summary>
         /// <returns>A database session</returns>
-		public static ISessionFactory CreateSessionFactory(DBKind database, DBType dbType, string connectionString, bool createDB)
+        static ISessionFactory CreateSessionFactory(Users.Entities.DBKind database)
+        {
+            Users.Entities.DBType dbType;
+            string connectionString;
+
+			switch (database)
+			{
+                default:
+                case Users.Entities.DBKind.Config:
+					dbType = Data.CurrentBench.ProceduresDBSettings.DbType;
+					connectionString = Data.CurrentBench.ProceduresDBSettings.ConnectionString;
+                    break;
+                case Users.Entities.DBKind.Results:
+					dbType = Data.CurrentBench.WaterMetersDBSettings.DbType;
+					connectionString = Data.CurrentBench.WaterMetersDBSettings.ConnectionString;
+                    break;
+                case Users.Entities.DBKind.RemoteConfig:
+                    dbType = Data.CurrentBench.UsersDBSettings.DbType;
+                    connectionString = Data.CurrentBench.UsersDBSettings.ConnectionString;
+                    break;
+            }
+
+            return CreateSessionFactory(database, dbType, connectionString, false);
+		}
+
+        /// <summary>
+        /// NHibernate session factory (to create the database session 'SessionFactory')
+        /// </summary>
+        /// <returns>A database session</returns>
+		public static ISessionFactory CreateSessionFactory(Users.Entities.DBKind database, Users.Entities.DBType dbType, string connectionString, bool createDB)
         {
 			try
 			{
@@ -28,23 +61,23 @@ namespace Config
                 switch (dbType)
 				{
 					default:
-                    case DBType.MySql:
+                    case Users.Entities.DBType.SQLite:
+						cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
+                        break;
+                    case Users.Entities.DBType.MySql:
                         cfg = cfg.Database(MySQLConfiguration.Standard.ConnectionString(connectionString));
                         break;
-                    case DBType.SQLite:
-                        cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
-                        break;
-                }
+				}
 
                 switch (database)
                 {
                     default:
-					case DBKind.Config:
-                    case DBKind.RemoteConfig:
-                        cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<FluentCommon>());
+					case Users.Entities.DBKind.Config:
+                    case Users.Entities.DBKind.RemoteConfig:
+                        cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<Data>());
                         break;
-                    case DBKind.Results:
-                        cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<FluentCommon>());
+                    case Users.Entities.DBKind.Results:
+                        cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<Data>());
                         break;
                 }
 
@@ -83,6 +116,17 @@ namespace Config
             new SchemaExport(config).Create(true, true);
         }
 
+		/// Create a NHibernate session for the given database
+		public static ISession CreateSession(Users.Entities.DBKind database)
+		{
+            if (database < 0 || database >= Users.Entities.DBKind.Count) return null;
+
+            int ix = (int)database;
+            if (SessionFactories[ix] == null) SessionFactories[ix] = CreateSessionFactory(database);
+
+			return SessionFactories[ix].OpenSession();
+		}
+
         /// <summary>
         /// Create an empty users database.
 		/// Database contains only the user 'admin' and the control board component 'CB'.
@@ -90,9 +134,9 @@ namespace Config
         /// <param name="dbType">DBType.SQLite or DBType.MySql</param>
         /// <param name="connectionString">Connection string</param>
         /// <returns>true=success, false=error</returns>
-		public static bool CreateEmptyConfigDB(DBType dbType, string connectionString)
+		public static bool CreateEmptyConfigDB(Users.Entities.DBType dbType, string connectionString)
 		{
-			ISessionFactory sessionFactory = CreateSessionFactory(DBKind.Config, dbType, connectionString, true);
+			ISessionFactory sessionFactory = CreateSessionFactory(Users.Entities.DBKind.Config, dbType, connectionString, true);
 			if (sessionFactory == null) return false;
 
             /// Populate the database
@@ -105,32 +149,32 @@ namespace Config
                     ///
                     var admin = new Config.Entities.User
                     {
-						UserName = CurrentUser.AdminUsername,
+						UserName = Data.AdminUsername,
                         FullName = Strings.Administrator,
                         LastPwChange = DateTime.Now
                     };
-					admin.SetPassword(CurrentUser.AdminPassword);
+					admin.SetPassword(Data.AdminPassword);
 
                     ///
                     /// Prepare all groups, add some of them to admin
                     ///
-                    for (GID gid = 0; gid < GID.NrOfGroups; gid++)
+                    for (Users.Entities.GID gid = 0; gid < Users.Entities.GID.NrOfGroups; gid++)
                     {
                         Config.Entities.Group group = new Config.Entities.Group(gid);
                         switch (gid)
                         {
-                            case GID.Testers:
-                            case GID.TestingSpecialists:
-                            case GID.HeadOfLab:
-                            case GID.MaintenanceSpecialists:
-                            case GID.Metrologists:
-                            case GID.CalibrationSpecialists:
-                            case GID.Administrators:
+                            case Users.Entities.GID.Testers:
+                            case Users.Entities.GID.TestingSpecialists:
+                            case Users.Entities.GID.HeadOfLab:
+                            case Users.Entities.GID.MaintenanceSpecialists:
+                            case Users.Entities.GID.Metrologists:
+                            case Users.Entities.GID.CalibrationSpecialists:
+                            case Users.Entities.GID.Administrators:
 #if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
-                            case GID.TraceabilityManagement:
-#elif LANG_PL
-                            case GID.MetrologicalAuthority:
-                            case GID.WaterMeterAuthority:
+                            case Users.Entities.GID.TraceabilityManagement:
+#elif KEMPNO_50 || KRAKOW_50 || TORUN_50 || WARSAW_END
+                            case Users.Entities.GID.MetrologicalAuthority:
+                            case Users.Entities.GID.WaterMeterAuthority:
 #endif
                                 admin.AddGroup(group);
                                 session.SaveOrUpdate(group);    /// Save this group

Config/Formulas.cs

@@ -0,0 +1,407 @@
+///
+/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using log4net;
+
+namespace Config
+{
+    public static class Formulas
+    {
+		private static readonly ILog log = LogManager.GetLogger(typeof(Formulas));
+
+
+        ///
+        /// Wrappers
+        ///
+        public static double RealDensity() { return Data.RealDensity; }
+        public static double AtTemperature() { return Data.AtTemperature; }
+        public static double Buoyancy() { return Data.Buoyancy; }
+
+
+        /// Private tables with coeficients to calculate specific enthalpy
+        static readonly int[] Ii;
+        static readonly int[] Ji;
+        static readonly double[] ni;
+
+        /// Private table with coeficients to calculate temperature of a platinum thermometer
+        static readonly double[] Di;
+
+
+        /// <summary> 
+		/// Constructor
+		/// </summary>
+        static Formulas()
+        {
+            ///
+            /// Initialize tables to calculate specific enthalpies
+            ///
+            Ii = new int[34] { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 8, 8, 21, 23, 29, 30, 31, 32 };
+            Ji = new int[34] { -2, -1, 0, 1, 2, 3, 4, 5, -9, -7, -1, 0, 1, 3, -3, 0, 1, 3, 17, -4, 0, 6, -5, -2, 10, -8, -11, -6, -29, -31, -38, -39, -40, -41 };
+            ni = new double[34] {
+                 0.14632971213167,      /// 1
+                -0.84548187169114,      /// 2
+                -0.37563603672040E1,    /// 3
+                 0.33855169168385E1,    /// 4
+                -0.95791963387872,      /// 5
+                 0.15772038513228,      /// 6
+                -0.16616417199501E-1,   /// 7
+                 0.81214629983568E-3,   /// 8
+                 0.28319080123804E-3,   /// 9
+                -0.60706301565874E-3,   /// 10
+                -0.18990068218419E-1,   /// 11
+                -0.32529748770505E-1,   /// 12
+                -0.21841717175414E-1,   /// 13
+                -0.52838357969930E-4,   /// 14
+                -0.47184321073267E-3,   /// 15
+                -0.30001780793026E-3,   /// 16
+                 0.47661393906987E-4,   /// 17
+                -0.44141845330846E-5,   /// 18
+                -0.72694996297594E-15,  /// 19
+                -0.31679644845054E-4,   /// 20
+                -0.28270797985312E-5,   /// 21
+                -0.85205128120103E-9,   /// 22
+                -0.22425281908000E-5,   /// 23
+                -0.65171222895601E-6,   /// 24
+                -0.14341729937924E-12,  /// 25
+                -0.40516996860117E-6,   /// 26
+                -0.12734301741641E-8,   /// 27
+                -0.17424871230634E-9,   /// 28
+                -0.68762131295531E-18,  /// 29
+                 0.14478307828521E-19,  /// 30
+                 0.26335781662795E-22,  /// 31
+                -0.11947622640071E-22,  /// 32
+                 0.18228094581404E-23,  /// 33
+                -0.93537087292458E-25,  /// 34
+            };
+
+			///
+			/// Initialize a table to calculate temperature of a platinum thermometer from resistance
+			///
+			Di = new double[]
+			{
+				 439.932854,
+				 472.418020,
+				 37.684494,
+				 7.472018,
+				 2.920828,
+				 0.005184,
+				-0.963864,
+				-0.188732,
+				 0.191203,
+				 0.049025,
+			};
+        }
+
+        /// <summary>
+        /// Calculate density of distilled water from temperature
+        /// </summary>
+        /// <param name="t">ITS-90 temperature in [°C]</param>
+        /// <returns>Density in [kg/m3]</returns>
+        public static double DistilledWaterDensityFromTemp(double t)
+        {
+            if (t <= 40)
+            {
+                const double c0 = 999.839564;
+                const double c1 = 0.067998613;
+                const double c2 = -0.0091101468;
+                const double c3 = 0.00010058299;
+                const double c4 = -0.0000011275659;
+                const double c5 = 6.5985371e-09;
+
+                return ((((c5 * t + c4) * t + c3) * t + c2) * t + c1) * t + c0;
+            }
+            else
+            {
+                const double a0 = 9.9983952E2;
+                const double a1 = 1.6952577E1;
+                const double a2 = -7.9905127E-3;
+                const double a3 = -4.6241757E-5;
+                const double a4 = 1.0584601E-7;
+                const double a5 = -2.8103006E-10;
+                const double b = 1.6887236E-2;
+
+                return (((((a5 * t + a4) * t + a3) * t + a2) * t + a1) * t + a0) / (1.0 + b * t);
+            }
+        }
+
+		/// <summary>
+		/// Calculate density of distilled water from temperature (obsolete)
+		/// </summary>
+		/// <param name="t">IPTS-68 temperature in [°C]</param>
+		/// <returns>Density in [kg/m3]</returns>
+        public static double DistilledWaterDensityFromTempIPTS68(double t)
+        {
+            const double a0 = 999.842594;
+            const double a1 = 0.06793952;
+            const double a2 = -0.009095290;
+            const double a3 = 0.0001001685;
+            const double a4 = -0.000001120083;
+            const double a5 = 6.536332e-09;
+
+            return ((((a5 * t + a4) * t + a3) * t + a2) * t + a1) * t + a0;
+        }
+
+		/// <summary>
+		/// Calculate density by comparing calculated data and data from a certificate
+		/// </summary>
+		/// <param name="realDensity">Density from a certificate in [kg/m3]</param>
+		/// <param name="atTemperature">Temperature from a certificate in [°C]</param>
+		/// <returns>Density correction in [kg/m3]</returns>
+		public static double DensityCorrection(double realDensity, double atTemperature)
+		{
+			/// Calculated data
+			double calculatedDensity = DistilledWaterDensityFromTemp(atTemperature);
+
+			return realDensity - calculatedDensity;
+		}
+
+		/// <summary>
+		/// Calculate corrected (real) water density from temperature
+		/// </summary>
+		/// <param name="t">Temperature in [°C]</param>
+		/// <returns>Density in [kg/m3]</returns>
+		public static double WaterDensityFromTemp(double t)
+		{
+            return DistilledWaterDensityFromTemp(t) + DensityCorrection(RealDensity(), AtTemperature());
+		}
+
+        /// <summary>
+        /// Calculate corrected (real) water density from temperature
+        /// </summary>
+        /// <param name="t">Temperature in [°C]</param>
+        /// <returns>Density in [kg/m3]</returns>
+        public static double WaterDensityFromTempPress(double temp, double pressure)
+        {
+            double x0 = 5.08821E-10;
+            double x1 = 1.2639418;
+            double x2 = 0.2660269;
+            double x3 = 0.3734838;
+            double x4 = 2.0205242;
+            double theta = temp / 100.0;
+            double B = x0 * (((x3 * theta + x2) * theta + x1) * theta + 1) / (1 + x4 * theta);
+
+            return WaterDensityFromTemp(temp) * (1 + B * Config.Units.ConvertTo(Config.Unit.Pa, pressure));
+        }
+
+
+		public static float AirDensityFromAmbientVales(float tempC, float pressureBar, float humiPct)
+		{
+			double pressurePa = 100000.0 * (double)pressureBar;		/// [Pa]
+			double tempKelvin = 273.15 + (double)tempC;
+			double coef1 = 1.2811805 / 10000.0 * tempKelvin * tempKelvin
+						 - 1.950987 / 100.0 * tempKelvin
+						 + 34.04926034
+						 - 6.353631 * 1000.0 / tempKelvin;
+			double coef3 = humiPct / 100.0 * System.Math.Exp(coef1) / pressurePa;
+			double airDensityKgm3 = 0.00348353 * pressurePa * (1.0 - 0.378 * coef3) / tempKelvin;	/// kg/m3
+			return (float)airDensityKgm3;
+		}
+
+		/// <summary>
+		/// Convert 'pulses' to 'volume', prevent division by zero
+		/// </summary>
+		public static double VolumeFromPulses(int pulses, double pulsesPerLiter)
+		{
+			if (pulsesPerLiter <= double.Epsilon) return 0;
+			return Convert.ToDouble(pulses) / pulsesPerLiter;
+		}
+
+		/// <summary>
+		/// Calculate the error in % from 'measured' and 'true' volume, prevent division by zero
+		/// </summary>
+		public static double ErrorFromVolumes(double measuredVolume, double trueVolume)
+		{
+			if (trueVolume <= float.Epsilon)
+			{
+				if (measuredVolume <= float.Epsilon)
+				{
+					log.WarnFormat("ErrorFromVolumes({0},{1}) returns {2}", measuredVolume, trueVolume, -100.0);
+					return -100.0;
+				}
+
+				log.WarnFormat("ErrorFromVolumes({0},{1}) returns {2}", measuredVolume, trueVolume, 99.0);
+				return 99.0;
+			}
+
+			double error = 100.0 * (measuredVolume - trueVolume) / trueVolume;
+			log.InfoFormat("ErrorFromVolumes({0},{1}) returns {2}", measuredVolume, trueVolume, error);
+			return error;
+		}
+
+
+        /// <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);
+        }
+
+        /// <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
+
+            if (rawValue < corrections[0].Measurement)
+            {
+                /// rawValue is below the lowest value in the correction table
+                return corrections[0].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 (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;
+        }
+
+
+        /// <summary>
+        /// Converts a measurement error to a correction (used when preparing correction tables).
+        /// </summary>
+        /// <param name="measuredValue">Measured value (in arbitrary units)</param>
+        /// <param name="error">Measurement error in %</param>
+        /// <returns>Correction in the same units as the measured value</returns>
+        public static double CorrectionFromError(double measuredValue, double error)
+        {
+            double trueValue = measuredValue / (1 + error/100);
+            double correction = trueValue - measuredValue;
+            return correction;
+        }
+
+
+        /// <summary>
+        /// Calculates the heat coefficient for water
+        /// </summary>
+        /// <param name="pressure">Pressure [bar]</param>
+		/// <param name="T_in">Inlet temperature [°C]</param>
+		/// <param name="T_out">Outlet temperature [°C]</param>
+        /// <param name="flowMeasuredAtInlet">true = flow measured @inlet, false = flow measured @outlet</param>
+        /// <returns> Heat coefficient for water [J/(m3 K)]</returns>
+        public static double HeatCoefficientWater(double pressure, double T_in, double T_out, bool flowMeasuredAtInlet)
+        {
+            if (T_in == T_out) return 0;
+
+            const double R = 461.526;                       /// [J kg^-1 K^-1]
+            const double p_star_Pa = 16.53E6;               /// [Pa] (=16.53 MPa)
+            const double T_star = 1386.0;                   /// [K]
+
+            double T_in_K = Config.Units.ConvertTo(Config.Unit.K, T_in);
+            double T_out_K = Config.Units.ConvertTo(Config.Unit.K, T_out);
+            double tau_in = T_star / T_in_K;
+            double tau_out = T_star / T_out_K;
+			double pi = Config.Units.ConvertTo(Config.Unit.Pa, pressure) / p_star_Pa;
+
+            double h_in = tau_in * GammaTau(pi, tau_in) * R * T_in_K;
+            double h_out = tau_out * GammaTau(pi, tau_out) * R * T_out_K;
+
+            double ni = flowMeasuredAtInlet ? GammaPi(pi, tau_in) * R * T_in_K / p_star_Pa
+                                            : GammaPi(pi, tau_out) * R * T_out_K / p_star_Pa;
+
+            return (h_in - h_out) / (ni * (T_in - T_out));
+        }
+
+        /// <summary>
+        /// gamma(pi) see also STN EN 1434-1 Annex A (A.4)
+        /// </summary>
+        /// <param name="pi">pi = p / p* where p* = 16.53 MPa</param>
+        /// <param name="tau">tau = T* / T where T* = 1386 K</param>
+        /// <returns>gamma(pi)</returns>
+        static double GammaPi(double pi, double tau)
+        {
+            double result = 0;
+            for (int i = 0; i < 34; i++)
+            {
+                result -= ni[i] * Ii[i] * Math.Pow(7.1 - pi, Ii[i] - 1) * Math.Pow(tau - 1.222, Ji[i]);
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// gamma(tau) see also STN EN 1434-1 Annex A (A.7)
+        /// </summary>
+        /// <param name="pi">pi = p / p* where p* = 16.53 MPa</param>
+        /// <param name="tau">tau = T* / T where T* = 1386 K</param>
+        /// <returns>gamma(tau)</returns>
+        static double GammaTau(double pi, double tau)
+        {
+            double result = 0;
+            for (int i = 0; i < 34; i++)
+            {
+                result += ni[i] * Math.Pow(7.1 - pi, Ii[i]) * Ji[i] * Math.Pow(tau - 1.222, Ji[i] - 1);
+            }
+            return result;
+        }
+
+		/// <summary>
+		/// Conversion of measured resistance of a platinum thermometer to temperature according to ITS-90
+		/// </summary>
+		/// <param name="R">Measured resistance in [°C]</param>
+		/// <param name="R001C">Calibrated resistance in Ohm at 0.01°C</param>
+		/// <param name="a7">Calibrated ITS-90 coefficient a7</param>
+		/// <param name="b7">Calibrated ITS-90 coefficient b7</param>
+		/// <param name="c7">Calibrated ITS-90 coefficient c7</param>
+        /// <returns>Temperature in [°C]</returns>
+		public static double PlatinumResistanceTM_ITS90_R2T(double R, double R001C, double a7, double b7, double c7)
+		{
+			double w = R / R001C;			/// ratio
+			double r1 = w - 1.0;
+			double dw = r1 * (a7 + r1 * (b7 + r1 * c7));	/// = a7*r1 + b7*r1^2 + c7*r1^3
+			double wr = w - dw;
+			double x = (wr - 2.64) / 1.64;
+
+			double sum = 0;
+			for (int i = Di.Length - 1; i >= 0; i--)
+			{
+				sum = sum * x + Di[i];
+			}
+
+			return sum;
+		}
+
+        /// <summary>
+        /// Conversion of measured resistance of a platinum thermometer to temperature using Callendar-Van Dusen equations
+        /// </summary>
+        /// <param name="R">Measured resistance in [°C]</param>
+        /// <param name="R0">Calibrated resistance in Ohm at 0°C</param>
+        /// <param name="A">Calibration coefficient a</param>
+        /// <param name="B">Calibration coefficient b</param>
+        /// <returns>Temperature in [°C]</returns>
+        public static double PlatinumResistanceTM_ITS27_R2T(double R, double R0, double A, double B)
+        {
+            if (R0 * R0 * A * A - 4 * R0 * B * (R0 - R) <= 0) return 0;     /// Out of range
+
+            return (-(R0 * A) + Math.Sqrt(R0 * R0 * A * A - 4 * R0 * B * (R0 - R))) / (2 * R0 * B);
+        }
+	}
+}

Config/Mappings/BenchPathMap.cs

@@ -15,15 +15,11 @@ namespace Config.Mappings
 			Map(x => x.Name);
 			Map(x => x.Qfrom);
 			Map(x => x.Qto);
-            Map(x => x.Selector);
-            Map(x => x.TempMtrUp);
-			Map(x => x.TempMtrDown);
-			Map(x => x.PressMtrUp);
-			Map(x => x.PressMtrDown);
+			Map(x => x.TempMtrUp).Column("TempIn");
+			Map(x => x.TempMtrDown).Column("TempOut");
+			Map(x => x.PressMtrUp).Column("PressIn");
+			Map(x => x.PressMtrDown).Column("PressOut");
 			Map(x => x.PressMtrDelta);
-			//Map(x => x.ElectricMtrUp);
-			//Map(x => x.ElectricMtrDown);
-			//Map(x => x.ElectricMtrDelta);
 			Map(x => x.StopBFValve);
 			Map(x => x.ValvesOpen)
 				.CustomType("StringClob")

Config/Mappings/ComponentMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Config.Entities;
@@ -13,13 +13,13 @@ namespace Config.Mappings
             Id(x => x.Id);
             Map(x => x.Name);
             Map(x => x.ClassName);
-            Map(x => x.Parent);
+            Map(x => x.ParentName);
             Map(x => x.ItemNr);
-			Map(x => x.DebugMode);
-			Map(x => x.LogLevel);
+			Map(x => x.Mode);
+			Map(x => x.Logging);
 			Map(x => x.Parameters)
 				.CustomType("StringClob")
-				.CustomSqlType("varchar(12000)");
+				.CustomSqlType("varchar(8000)");
 			HasMany(x => x.Corrections)
 				.OrderBy("Measurement")
 				.Cascade.All();

Config/Mappings/FeedingPathMap.cs

@@ -15,9 +15,8 @@ namespace Config.Mappings
 			Map(x => x.Name);
 			Map(x => x.Qfrom);
 			Map(x => x.Qto);
-            Map(x => x.Selector);
 			Map(x => x.Pump);
-            Map(x => x.RegVPositions);
+            Map(x => x.RegulValvesPct);
 			Map(x => x.ValvesOpen)
 				.CustomType("StringClob")
 				.CustomSqlType("varchar(8000)");

Config/Mappings/MeasurementCorrectionMap.cs

@@ -1,12 +1,12 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Config.Entities;
 
 namespace Config.Mappings
 {
-	class MeasurementCorrectionMap : ClassMap<Entities.MeasurementCorrection>
+	class MeasurementCorrectionMap : ClassMap<MeasurementCorrection>
 	{
 		public MeasurementCorrectionMap()
 		{

Config/Mappings/MetersPathMap.cs

@@ -1,11 +1,12 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
 using FluentNHibernate.Mapping;
+using Config.Entities;
 
 namespace Config.Mappings
 {
-    class MetersPathMap : ClassMap<Entities.MetersPath>
+	class MetersPathMap : ClassMap<MetersPath>
     {
         public MetersPathMap()
         {
@@ -13,26 +14,48 @@ namespace Config.Mappings
 			Map(x => x.ItemNr);
 			Map(x => x.Name);
 
-            Map(x => x.Sensor1);
-            Map(x => x.Sensor2);
-			Map(x => x.Sensor3);
-			Map(x => x.Sensor4);
-			Map(x => x.Sensor5);
-			Map(x => x.Sensor6);
-			Map(x => x.Sensor7);
-			Map(x => x.Sensor8);
-			Map(x => x.Sensor9);
-			Map(x => x.Sensor10);
-			Map(x => x.Sensor11);
-			Map(x => x.Sensor12);
-			Map(x => x.Sensor13);
-			Map(x => x.Sensor14);
-			Map(x => x.Sensor15);
-			Map(x => x.Sensor16);
-			Map(x => x.Sensor17);
-			Map(x => x.Sensor18);
-			Map(x => x.Sensor19);
-			Map(x => x.Sensor20);
+#pragma warning disable
+            if (Config.Data.WMsCount >= 1) Map(x => x.Sensor1);
+            if (Config.Data.WMsCount >= 2) Map(x => x.Sensor2);
+			if (Config.Data.WMsCount >= 3) Map(x => x.Sensor3);
+			if (Config.Data.WMsCount >= 4) Map(x => x.Sensor4);
+			if (Config.Data.WMsCount >= 5) Map(x => x.Sensor5);
+			if (Config.Data.WMsCount >= 6) Map(x => x.Sensor6);
+			if (Config.Data.WMsCount >= 7) Map(x => x.Sensor7);
+			if (Config.Data.WMsCount >= 8) Map(x => x.Sensor8);
+			if (Config.Data.WMsCount >= 9) Map(x => x.Sensor9);
+			if (Config.Data.WMsCount >= 10) Map(x => x.Sensor10);
+			if (Config.Data.WMsCount >= 11) Map(x => x.Sensor11);
+			if (Config.Data.WMsCount >= 12) Map(x => x.Sensor12);
+			if (Config.Data.WMsCount >= 13) Map(x => x.Sensor13);
+			if (Config.Data.WMsCount >= 14) Map(x => x.Sensor14);
+			if (Config.Data.WMsCount >= 15) Map(x => x.Sensor15);
+			if (Config.Data.WMsCount >= 16) Map(x => x.Sensor16);
+			if (Config.Data.WMsCount >= 17) Map(x => x.Sensor17);
+			if (Config.Data.WMsCount >= 18) Map(x => x.Sensor18);
+			if (Config.Data.WMsCount >= 19) Map(x => x.Sensor19);
+			if (Config.Data.WMsCount >= 20) Map(x => x.Sensor20);
+            if (Config.Data.WMsCount >= 21) Map(x => x.Sensor21);
+            if (Config.Data.WMsCount >= 22) Map(x => x.Sensor22);
+            if (Config.Data.WMsCount >= 23) Map(x => x.Sensor23);
+            if (Config.Data.WMsCount >= 24) Map(x => x.Sensor24);
+            if (Config.Data.WMsCount >= 25) Map(x => x.Sensor25);
+            if (Config.Data.WMsCount >= 26) Map(x => x.Sensor26);
+            if (Config.Data.WMsCount >= 27) Map(x => x.Sensor27);
+            if (Config.Data.WMsCount >= 28) Map(x => x.Sensor28);
+            if (Config.Data.WMsCount >= 29) Map(x => x.Sensor29);
+            if (Config.Data.WMsCount >= 30) Map(x => x.Sensor30);
+            if (Config.Data.WMsCount >= 31) Map(x => x.Sensor31);
+            if (Config.Data.WMsCount >= 32) Map(x => x.Sensor32);
+            if (Config.Data.WMsCount >= 33) Map(x => x.Sensor33);
+            if (Config.Data.WMsCount >= 34) Map(x => x.Sensor34);
+            if (Config.Data.WMsCount >= 35) Map(x => x.Sensor35);
+            if (Config.Data.WMsCount >= 36) Map(x => x.Sensor36);
+            if (Config.Data.WMsCount >= 37) Map(x => x.Sensor37);
+            if (Config.Data.WMsCount >= 38) Map(x => x.Sensor38);
+            if (Config.Data.WMsCount >= 39) Map(x => x.Sensor39);
+            if (Config.Data.WMsCount >= 40) Map(x => x.Sensor40);
+#pragma warning restore
 		}
     }
 }

Config/Mappings/OutputPathMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
 using FluentNHibernate.Mapping;
 using Config.Entities;
@@ -15,15 +15,15 @@ namespace Config.Mappings
 			Map(x => x.Name);
 			Map(x => x.Qfrom);
 			Map(x => x.Qto);
-            Map(x => x.Selector);
-            Map(x => x.RegValve);
+			Map(x => x.RegulValve);
 			Map(x => x.FlowMeter);
 			Map(x => x.PidCoef);
             Map(x => x.StartValve);
             Map(x => x.Diverter);
-			Map(x => x.TempMtrDiv);
-			Map(x => x.Scale);
-            Map(x => x.RegVPositions);
+			Map(x => x.TempDiv);
+			Map(x => x.Scale)
+				.Column("Balance");
+			Map(x => x.EmptyTankValve);
 			Map(x => x.ValvesOpen)
 				.CustomType("StringClob")
 				.CustomSqlType("varchar(8000)");

Config/Mappings/PTestMap.cs

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

Config/Mappings/TestMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using FluentNHibernate.Mapping;
 using Config.Entities;
@@ -16,33 +16,38 @@ namespace Config.Mappings
 			Map(x => x.Part);
             Map(x => x.Profile);
             Map(x => x.Publish);
-			Map(x => x.DoEvaluate);
+			Map(x => x.DoEvaluate)
+				.Column("Evaluate");
             Map(x => x.Qtg);
             Map(x => x.Qfrom);
 			Map(x => x.Qto);
-            Map(x => x.IsFromToInPct);
-            Map(x => x.Volume);
-			Map(x => x.TestTime);
+			Map(x => x.Volume);
+			Map(x => x.TstTime);
 			Map(x => x.Repeats);
-            Map(x => x.DoDraining);
-            Map(x => x.DoDrainingAfter);
+            Map(x => x.DoDraining)
+				.Column("Emptying");
+            Map(x => x.DoDrainingAfter)
+				.Column("Zeroing");
+            Map(x => x.DoControlWaterTemp);
             Map(x => x.TempLimLo);
 			Map(x => x.TempLimHi);
-            Map(x => x.TempControl);
-            Map(x => x.PumpPower);
+			Map(x => x.PumpPower);
             Map(x => x.MassRepeats);
             Map(x => x.MassSpread);
 			Map(x => x.MassMethod)
-                .CustomType<byte>();
+				.CustomType<byte>();
             Map(x => x.TimeBeforeFlow);
             Map(x => x.TimeFlow2Mass);
-            Map(x => x.TimePump2StartV);
+            Map(x => x.TimePump2StartV)
+				.Column("TimeMass2Start");
             Map(x => x.TimeStop2Mass);
 			Map(x => x.Method);
 			Map(x => x.ErrLimLo);
 			Map(x => x.ErrLimHi);
 			Map(x => x.Uncertainty);
-			Map(x => x.ShortPulses);
+			Map(x => x.TolerRed)
+                .Column("TolerRed");	/// ???
+			Map(x => x.RedType);
 			Map(x => x.FeedingPath);
 			Map(x => x.BenchPath);
 			Map(x => x.OutputPath);
@@ -50,9 +55,12 @@ namespace Config.Mappings
 #if HEAT_METERS
             Map(x => x.HeatMetersPath);
 #endif
-            Map(x => x.TransBefore);
-			Map(x => x.TransBetween);
-			Map(x => x.TransAfter);
+            Map(x => x.RelTransBefore)
+                .Column("RelTransBefore");
+			Map(x => x.RelTransBetween)
+                .Column("RelTransBetween");
+			Map(x => x.TransitionAfter)
+                .Column("TransitionAfter");
 
             HasMany(x => x.MoreParams)
 				.Cascade.All();

Config/Mappings/UserMap.cs

@@ -10,16 +10,14 @@ namespace Config.Mappings
         public UserMap()
         {
             Id(x => x.Id);
-            Map(x => x.UserName)
-                .Column("Name");
+            Map(x => x.UserName).Column("Name");
 			Map(x => x.Number);
             Map(x => x.Tag);
 			Map(x => x.Password);
             Map(x => x.Password2);
             Map(x => x.Password3);
             Map(x => x.Password4);
-            Map(x => x.FullName)
-                .Column("Description");
+            Map(x => x.FullName).Column("Description");
             Map(x => x.LastPwChange);
             HasManyToMany(x => x.Groups)
                 .Cascade.SaveUpdate()

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("3.1.1464.0")]
-[assembly: AssemblyFileVersion("3.1.1464.0")]
+[assembly: AssemblyVersion("2.26.1458.0")]
+[assembly: AssemblyFileVersion("2.26.1458.0")]

Config/PurchaseResources.cs

@@ -1,7 +0,0 @@
-namespace Config
-{
-    public class PurchaseResources
-    {
-        
-    }
-}

Config/Resources/Strings.de.resx

@@ -118,15 +118,15 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Failed" xml:space="preserve">
-    <value>Nicht OK</value>
+    <value>NiO</value>
   </data>
   <data name="Passed" xml:space="preserve">
-    <value>OK</value>
+    <value>iO</value>
   </data>
   <data name="Error" xml:space="preserve">
     <value>Fehler</value>
   </data>
   <data name="Cannot_open_DB_Cause_0" xml:space="preserve">
-    <value>Datenbank kann nicht geöffnet werden.\\r\\nUrsache:\\r\\n{0}</value>
+    <value>Datenbank kann nicht geöffnet.\\r\\nUrsache:\\r\\n{0}</value>
   </data>
 </root>

Config/Resources/Strings.resx

@@ -162,7 +162,4 @@
   <data name="Administrator" xml:space="preserve">
     <value>Administrator</value>
   </data>
-  <data name="Password_must_have_at_least_0_characters" xml:space="preserve">
-    <value>Password must have at least {0} characters</value>
-  </data>
 </root>

Config/Units.cs

@@ -0,0 +1,491 @@
+///
+/// Copyright (c) 2016-2018 Sensus Slovensko a.s.
+///
+using System;
+using System.Reflection;
+using Config.Entities;
+
+namespace Config
+{
+    public enum Unit
+    {
+		[Description("---")]		None,
+
+        [Description("imp.")]       pulse,
+#if LANG_PL
+        [Description("stopień")]    degree,
+#else
+        [Description("degree")]     degree,
+#endif
+        [Description("l")]          l,          /// * 1 liter
+        [Description("dm3")]        dm3,        ///   1 dm3 = 1 liter
+        [Description("m3")]         m3,         ///   1000 l
+        [Description("gal(UK)")]    gal_UK,     ///   1 gal(UK) = 4.54609 l
+        [Description("gal(US)")]    gal_US,     ///   1 gal(US) = 3.78541178 l
+
+        [Description("l/h")]        lph,        ///   1 liter/h
+        [Description("m3/h")]       m3ph,       /// * 1 m3/h = 1000 l/h
+
+        [Description("g")]          g,          ///   0.001 kg
+        [Description("kg")]         kg,         /// * 1 kilogram
+        [Description("t")]          t,          ///   1000 kg
+        [Description("lb")]         lb,         ///   0.45359237 kg
+
+        [Description("s")]          s,          /// * 1 second
+        [Description("min")]        min,        ///   1 min = 60 s
+        [Description("hr")]         hour,       ///   1 hour = 60 min = 3600 s
+        [Description("ms")]         ms,         ///   1 ms = 0.001 s
+
+		[Description("°C")]         C,          /// * degree Celsius (°C)
+        [Description("°F")]         F,          ///   degree Fahrenheit
+        [Description("K")]          K,          ///   degree Kelvin
+
+        [Description("Pa")]         Pa,         ///   1 Pa = 0.01 hPa
+        [Description("hPa")]        hPa,        ///   1 hPa = 100 Pa
+        [Description("kPa")]        kPa,        ///   1 kPa = 10 HPa
+        [Description("MPa")]        MPa,        ///   1 MPa = 10000 hPa
+        [Description("mbar")]       mbar,       ///   1 mbar = 1 hPa = 100 Pa
+        [Description("bar")]        bar,        /// * 1 Bar = 1000 mbar = 0.1 MPa = 100000 Pa
+        [Description("inHg")]       inHg,       ///   1 inHg = 33.864 hPa
+
+        [Description("R%")]         RPct,       /// * 1 R%
+
+        [Description("%")]          Pct,        /// * 1 %
+        [Description("promile")]    Promile,    ///   1 promile = 0.1 %
+
+        [Description("mm")]         mm,         /// * 1 millimeter
+        [Description("cm")]         cm,         ///   1 cm = 10 mm
+        [Description("m")]          m,          ///   1 m = 1000 mm
+        [Description("in")]         inch,       ///   1 inch = 25.4 mm
+
+        [Description("kg/m3")]      kgpm3,		/// * 1 kg/m3 = 0.001 kg/l
+        [Description("kg/l")]       kgpl,		///   1 kg/l = 1000 kg/m3
+
+        [Description("J")]          J,			/// * 1 Joul
+        [Description("kJ")]         kJ,			///   1 kJ = 1000 J
+        [Description("MJ")]         MJ,         ///   1 MJ = 1000000 J
+        [Description("Wh")]         Wh,			///   1 Wh = 3600 J
+        [Description("kWh")]        kWh,		///   1 kWh = 3600000 J
+        [Description("MWh")]        MWh,		///   1 MWh = 3600000000 J
+
+        [Description("uS/cm")]      uSpcm,      /// * 1 uS/cm
+
+#if LANG_PL
+        [Description("imp/l")]       ppl,		/// * 1 pulse/l
+        [Description("imp/dm3")]     ppdm3,		/// * 1 pulse/dm3
+        [Description("stopień/l")]   degpl,		/// * 1 degree/l
+        [Description("stopień/dm3")] degpdm3,	/// * 1 degree/dm3
+        [Description("l/imp")]       lpp,		/// * 1 l/pulse
+        [Description("dm3/imp")]     dm3pp,		/// * 1 dm3/pulse
+        [Description("l/stopień")]   lpdeg,		/// * 1 l/degree
+        [Description("dm3/stopień")] dm3pdeg,	/// * 1 dm3/degree
+#else
+        [Description("pulse/l")]    ppl,		/// * 1 pulse/l
+        [Description("pulse/dm3")]  ppdm3,		/// * 1 pulse/dm3
+        [Description("degree/l")]   degpl,		/// * 1 degree/l
+        [Description("degree/dm3")] degpdm3,	/// * 1 degree/dm3
+        [Description("l/pulse")]    lpp,		/// * 1 l/pulse
+        [Description("dm3/pulse")]  dm3pp,		/// * 1 dm3/pulse
+        [Description("l/degree")]   lpdeg,		/// * 1 l/degree
+        [Description("dm3/degree")] dm3pdeg,	/// * 1 dm3/degree
+#endif
+        /// 
+        [Description("pulse/kWh")]  ppkWh,		/// * 1 pulse/kWh
+        [Description("kWh/pulse")]  kWhpp,		/// * 1 kWh/pulse
+                                                
+        Count
+    }
+
+	public enum Quantity
+	{
+        /// Quantities with units and conversions (double -> double)
+#if LANG_DE
+		[Description("Volumen")]			Volume,
+		[Description("Durchfluss")]			Flow,
+		[Description("Masse")]				Mass,
+        [Description("Zeit")]				Time,
+        [Description("Temperatur")]			Temperature,
+		[Description("Druck")]				Pressure,
+        [Description("Feuchtigkeit")]		Humidity,
+        [Description("Fehler")]				Error,
+		[Description("Länge")]				Length,
+		[Description("Dichte")]				Density,
+		[Description("Energie")]			Energy,
+		[Description("Impulse")]			Pulses,
+        [Description("Impulse/l")]			PulsePerLtr,
+        [Description("Impulse/kWh")]		PulsePerKWh,
+        [Description("Leitfähigkeit")]      Conductivity,
+
+        /// Quantities without units and conversions
+        [Description("Nummer")]				Number,
+        [Description("Text")]				String,
+        [Description("Boolean")]			Boolean,
+        [Description("Datum und Uhrzeit")]  DateTime,
+#elif LANG_PL
+        [Description("Objętość")]			Volume,
+		[Description("Przepływ")]           Flow,
+		[Description("Masa")]				Mass,
+        [Description("Czas")]				Time,
+        [Description("Temperatura")]		Temperature,
+		[Description("Ciśnienie")]			Pressure,
+        [Description("Wilgotność")]			Humidity,
+        [Description("Błąd")]				Error,
+		[Description("Długość")]			Length,
+		[Description("Gęstość")]			Density,
+		[Description("Energia")]			Energy,
+        [Description("Impulsy")]            Pulses,
+        [Description("Impulsy/litr")]       PulsePerLtr,
+        [Description("Impulsy/kWh")]		PulsePerKWh,
+        [Description("Przewodność")]        Conductivity,
+
+        /// Quantities without units and conversions
+        [Description("Numer")]				Number,
+        [Description("Tekst")]				String,
+        [Description("Boolean")]			Boolean,
+        [Description("Data i czas")]		DateTime,
+#elif LANG_CS
+		[Description("Objem")]				Volume,
+		[Description("Průtok")]				Flow,
+		[Description("Hmotnost")]           Mass,
+        [Description("Čas")]				Time,
+        [Description("Teplota")]			Temperature,
+		[Description("Tlak")]				Pressure,
+        [Description("Vlhkost")]			Humidity,
+        [Description("Chyba")]				Error,
+		[Description("Délka")]				Length,
+		[Description("Hustota")]			Density,
+		[Description("Energie")]			Energy,
+		[Description("Pulzy")]				Pulses,
+        [Description("Pulzy/litr")]			PulsePerLtr,
+        [Description("Pulzy/kWh")]			PulsePerKWh,
+        [Description("Vodivost")]           Conductivity,
+
+        /// Quantities without units and conversions
+        [Description("Počet")]				Number,
+        [Description("Text")]				String,
+        [Description("Boolean")]			Boolean,
+        [Description("Datum a čas")]		DateTime,
+#elif LANG_IT
+		[Description("Volume")]				Volume,
+		[Description("Flusso")]				Flow,
+		[Description("Massa")]              Mass,
+        [Description("Tempo")]				Time,
+        [Description("Temperatura")]	    Temperature,
+		[Description("Pressione")]			Pressure,
+        [Description("Umidità")]			Humidity,
+        [Description("Errore")]				Error,
+		[Description("Lungezza")]			Length,
+		[Description("Densità")]			Density,
+		[Description("Energia")]			Energy,
+		[Description("Impulso")]			Pulses,
+        [Description("Impulso/litro")]		PulsePerLtr,
+        [Description("Impulso/kWh")]		PulsePerKWh,
+        [Description("Conduttività")]       Conductivity,
+
+        /// Quantities without units and conversions
+        [Description("Numero")]				Number,
+        [Description("Stringa")]			String,
+        [Description("Boolean")]			Boolean,
+        [Description("Data e ora")]		    DateTime,
+#else
+        [Description("Volume")]				Volume,
+		[Description("Flow")]				Flow,
+		[Description("Mass")]				Mass,
+        [Description("Time")]				Time,
+        [Description("Temperature")]		Temperature,
+		[Description("Pressure")]			Pressure,
+        [Description("Humidity")]			Humidity,
+        [Description("Error")]				Error,
+		[Description("Length")]				Length,
+		[Description("Density")]			Density,
+		[Description("Energy")]				Energy,
+		[Description("Pulses")]				Pulses,
+        [Description("Pulses/liter")]		PulsePerLtr,
+        [Description("Pulses/kWh")]			PulsePerKWh,
+        [Description("Conductivity")]       Conductivity,
+
+        /// Quantities without units and conversions
+        [Description("Number")]				Number,
+        [Description("String")]				String,
+        [Description("Boolean")]			Boolean,
+        [Description("Date and time")]		DateTime,
+        [Description("Enum")]               Enum,
+#endif
+        Count,
+	}
+
+    public static class Units
+    {
+        public static bool IsUnitless(Quantity quantity)
+        {
+            return quantity >= Quantity.Number;
+        }
+
+        public static bool IsDefaultUnit(Unit unit)
+        {
+            return unit == Unit.l || unit == Unit.m3ph || unit == Unit.kg || unit == Unit.s || unit == Unit.C || unit == Unit.bar || unit == Unit.RPct ||
+                   unit == Unit.Pct || unit == Unit.mm || unit == Unit.kgpm3 || unit == Unit.J || unit == Unit.ppl || unit == Unit.ppkWh || unit == Unit.uSpcm;
+        }
+
+        public static bool IsQuantity(Unit units, Quantity quantity)
+        {
+            return (quantity == GetQuantity(units));
+        }
+
+        public static Quantity GetQuantity(Unit units)
+		{
+            switch (units)
+            {
+                case Unit.pulse:
+                case Unit.degree:
+                    return Config.Quantity.Pulses;
+
+                case Unit.l:
+                case Unit.dm3:
+                case Unit.m3:
+                case Unit.gal_UK:
+                case Unit.gal_US:
+					return Config.Quantity.Volume;
+
+                case Unit.lph:
+                case Unit.m3ph:
+					return Config.Quantity.Flow;
+
+                case Unit.g:
+                case Unit.kg:
+                case Unit.t:
+                case Unit.lb:
+					return Config.Quantity.Mass;
+
+                case Unit.s:
+                case Unit.min:
+                case Unit.hour:
+                case Unit.ms:
+                    return Config.Quantity.Time;
+
+                case Unit.C:
+                case Unit.F:
+                case Unit.K:
+					return Config.Quantity.Temperature;
+
+                case Unit.Pa:
+                case Unit.hPa:
+                case Unit.mbar:
+                case Unit.kPa:
+                case Unit.bar:
+                case Unit.MPa:
+                case Unit.inHg:
+					return Config.Quantity.Pressure;
+
+                case Unit.RPct:
+                    return Config.Quantity.Humidity;
+
+                case Unit.Pct:
+                case Unit.Promile:
+					return Config.Quantity.Error;
+
+                case Unit.mm:
+                case Unit.cm:
+                case Unit.m:
+                case Unit.inch:
+					return Config.Quantity.Length;
+
+				case Unit.kgpm3:
+				case Unit.kgpl:
+					return Config.Quantity.Density;
+
+				case Unit.J:
+				case Unit.kJ:
+                case Unit.MJ:
+                case Unit.Wh:
+				case Unit.kWh:
+                case Unit.MWh:
+                    return Config.Quantity.Energy;
+
+                case Unit.ppl:
+                case Unit.ppdm3:
+                case Unit.degpl:
+                case Unit.degpdm3:
+                case Unit.lpp:
+                case Unit.dm3pp:
+                case Unit.lpdeg:
+                case Unit.dm3pdeg:
+                    return Config.Quantity.PulsePerLtr;
+
+                case Unit.ppkWh:
+                case Unit.kWhpp:
+                    return Config.Quantity.PulsePerKWh;
+
+                case Unit.uSpcm:
+                    return Config.Quantity.Conductivity;
+
+                default:
+					return Config.Quantity.Number;
+            }
+		}
+
+		public static bool IsVolume(Unit units) { return IsQuantity(units, Config.Quantity.Volume); }
+		public static bool IsFlow(Unit units) { return IsQuantity(units, Config.Quantity.Flow); }
+        public static bool IsMass(Unit units) { return IsQuantity(units, Config.Quantity.Mass); }
+        public static bool IsTime(Unit units) { return IsQuantity(units, Config.Quantity.Time); }
+        public static bool IsTemperature(Unit units) { return IsQuantity(units, Config.Quantity.Temperature); }
+		public static bool IsPressure(Unit units) { return IsQuantity(units, Config.Quantity.Pressure); }
+        public static bool IsHumidity(Unit units) { return IsQuantity(units, Config.Quantity.Humidity); }
+        public static bool IsError(Unit units) { return IsQuantity(units, Config.Quantity.Error); }
+		public static bool IsLength(Unit units) { return IsQuantity(units, Config.Quantity.Length); }
+		public static bool IsDensity(Unit units) { return IsQuantity(units, Config.Quantity.Density); }
+		public static bool IsEnergy(Unit units) { return IsQuantity(units, Config.Quantity.Energy); }
+        public static bool IsPulses(Unit units) { return IsQuantity(units, Config.Quantity.Pulses); }
+        public static bool IsPulsePerLtr(Unit units) { return IsQuantity(units, Config.Quantity.PulsePerLtr); }
+        public static bool IsPulsePerKWh(Unit units) { return IsQuantity(units, Config.Quantity.PulsePerKWh); }
+        public static bool IsConductivity(Unit units) { return IsQuantity(units, Config.Quantity.Conductivity); }
+
+
+
+		public static double ConvertTo(Unit units, double v)
+        {
+            switch (units)
+            {
+                /// Volume: internal representation in l
+                case Unit.dm3:
+                case Unit.l:        return v;               /// 1 liter
+                case Unit.m3:       return 0.001 * v;       /// 1 m3 = 1000 l
+                case Unit.gal_UK:   return 0.21996925 * v;  /// 1 gal(UK) = 4.54609 l
+                case Unit.gal_US:   return 0.26417205 * v;  /// 1 gal(US) = 3.78541178 l
+
+                /// Flow: internal representation in m3/h
+                case Unit.lph:      return 1000 * v;        /// 1 liter/h
+                case Unit.m3ph:     return v;               /// 1 m3/h = 1000 l/h
+
+                /// Mass: internal representation in kg
+                case Unit.g:        return 1000 * v;        /// 1 g = 0.001 kg
+                case Unit.kg:       return v;               /// 1 kilogram
+                case Unit.t:        return 0.001 * v;       /// 1 t = 1000 kg
+                case Unit.lb:       return 2.2046226 * v;   /// 1 lb = 0.45359237 kg
+
+                /// Time or duration: internal representation in seconds [s] 
+                case Unit.s:        return v;
+                case Unit.min:      return v / 60;
+                case Unit.hour:     return v / 3600;
+                case Unit.ms:       return 1000 * v;
+
+				/// Temperature: internal representation in °C
+				case Unit.C:        return v;               /// degree Celsius (°C)
+                case Unit.F:        return 1.8 * v + 32;    /// degree Fahrenheit
+                case Unit.K:        return v + 273.15;      /// degree Kelvin
+
+                /// Pressure: internal representation in  bar = 0.1 MPa
+                case Unit.Pa:       return 100000 * v;      /// 1 hPa = 100 Pa
+                case Unit.hPa:      return 1000 * v;        /// 1 hPa = 100 Pa
+                case Unit.mbar:     return 1000 * v;        /// 1 mbar = 1 hPa = 100 Pa
+                case Unit.kPa:      return 100 * v;         /// 1 kPa = 10 HPa
+                case Unit.bar:      return v;               /// 1 bar = 1000 mbar = 100000 Pa
+                case Unit.MPa:      return 0.1 * v;         /// 1 MPa = 10000 hPa
+                case Unit.inHg:     return 29.53 * v;       /// 1 inHg = 33.864 hPa
+
+                /// Error: internal representation in %
+                case Unit.Pct:      return v;               /// 1 %
+                case Unit.Promile:  return 10 * v;          /// 1 promile = 0.1 %
+
+                /// Diameter, length: internal representation in mm
+                case Unit.mm:       return v;               /// 1 mm
+                case Unit.cm:       return 0.1 * v;         /// 1 cm = 10 mm
+                case Unit.m:        return 0.001 * v;       /// 1 m = 1000 mm
+                case Unit.inch:     return v / 25.4;        /// 1 inch = 25.4 mm
+
+				/// Density: internal representation in kg/m3
+				case Unit.kgpm3:    return v;
+				case Unit.kgpl:     return 0.001 * v;
+
+				/// Energy, internal representation in Joul
+				case Unit.J:        return v;               /// 1 Joul
+				case Unit.kJ:       return 0.001 * v;       /// 1 kJ = 1000 J
+                case Unit.MJ:       return 0.000001 * v;    /// 1 kJ = 1000000 J
+                case Unit.Wh:       return v / 3600.0;      /// 1 Wh = 3600 J
+				case Unit.kWh:      return v / 3600000.0;   /// 1 kWh = 3600000 J
+                case Unit.MWh:      return v / 3600000000.0;/// 1 MWh = 3600000000 J
+
+                case Unit.kWhpp:
+                case Unit.lpp:
+                case Unit.dm3pp:
+                case Unit.lpdeg:
+                case Unit.dm3pdeg:  return ((v <= float.Epsilon) ? 0 : 1 / v);
+
+                default:            return v;
+            }
+        }
+
+        public static double ConvertFrom(Unit units, double v)
+        {
+            switch (units)
+            {
+                /// Volume: internal representation in l
+                case Unit.dm3:
+                case Unit.l:        return v;               /// 1 liter
+                case Unit.m3:       return 1000 * v;        /// 1000 l
+                case Unit.gal_UK:   return 4.54609 * v;     /// 1 gal(UK) = 4.54609 l
+                case Unit.gal_US:   return 3.78541178 * v;  /// 1 gal(US) = 3.78541178 l
+
+                /// Flow: internal representation in m3/h
+                case Unit.lph:      return 0.001 * v;       /// 1 liter/h
+                case Unit.m3ph:     return v;               /// 1 m3/h = 1000 l/h
+
+                /// Mass: internal representation in kg
+                case Unit.g:        return 0.001 * v;       /// 1 g = 0.001 kg
+                case Unit.kg:       return v;               /// 1 kilogram
+                case Unit.t:        return 1000 * v;        /// 1 t = 1000 kg
+                case Unit.lb:       return 0.45359237 * v;  /// 1 lb = 0.45359237 kg
+
+                /// Time or duration: internal representation in seconds [s] 
+                case Unit.s:        return v;
+                case Unit.min:      return 60 * v;
+                case Unit.hour:     return 3600 * v;
+                case Unit.ms:       return v / 1000;
+
+				/// Temperature: internal representation in °C
+				case Unit.C:        return v;               /// degree Celsius (°C)
+                case Unit.F:        return 5 * (v-32) / 9;  /// degree Fahrenheit
+                case Unit.K:        return v - 273.15;      /// degree Kelvin
+
+                /// Pressure: internal representation in  bar = 0.1 MPa
+                case Unit.Pa:       return 0.00001 * v;     /// 1 hPa = 100 Pa
+                case Unit.hPa:      return 0.001 * v;       /// 1 hPa = 100 Pa
+                case Unit.mbar:     return 0.001 * v;       /// 1 mbar = 1 hPa = 100 Pa
+                case Unit.kPa:      return 0.01 * v;        /// 1 kPa = 10 HPa
+                case Unit.bar:      return v;               /// 1 bar = 1000 mbar = 100000 Pa
+                case Unit.MPa:      return 10 * v;          /// 1 MPa = 10000 hPa
+                case Unit.inHg:     return 0.033864 * v;    /// 1 inHg = 33.864 hPa
+
+                /// Error: internal representation in %
+                case Unit.Pct:      return v;               /// 1 %
+                case Unit.Promile:  return 0.1 * v;         /// 1 promile = 0.1 %
+
+                /// Diameter, length: internal representation in mm
+                case Unit.mm:       return v;               /// 1 mm
+                case Unit.cm:       return 10 * v;          /// 1 cm = 10 mm
+                case Unit.m:        return 1000 * v;        /// 1 m = 1000 mm
+                case Unit.inch:     return 25.4 * v;        /// 1 inch = 25.4 mm
+
+				/// Density: internal representation in kg/m3
+				case Unit.kgpm3:    return v;
+				case Unit.kgpl:     return 1000 * v;
+
+				/// Energy, internal representation in Joul
+				case Unit.J:		return v;               /// 1 Joul
+				case Unit.kJ:		return 1000 * v;        /// 1 kJ = 1000 J
+                case Unit.MJ:       return 1000000 * v;     /// 1 kJ = 1000000 J
+                case Unit.Wh:       return 3600 * v;        /// 1 Wh = 3600 J
+				case Unit.kWh:		return 3600000 * v;     /// 1 kWh = 3600000 J
+                case Unit.MWh:      return 3600000000 * v;  /// 1 kWh = 3600000000 J
+
+                case Unit.kWhpp:
+                case Unit.lpp:
+                case Unit.dm3pp:
+                case Unit.lpdeg:
+                case Unit.dm3pdeg:  return ((v == 0) ? 0 : 1 / v);
+
+                default:            return v;
+            }
+        }
+	}
+}

Config/Utils.cs

@@ -0,0 +1,256 @@
+///
+/// Copyright (c) 2017-2018 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Config
+{
+    public static class Utils
+    {
+        public static string SignificantDigitsToFmt(double value, int sigDigits)
+        {
+            if (sigDigits == 6)
+            {
+                if (value >= 99999.5 || value < -99999.5) return "F0";
+                else if (value >= 9999.95 || value < -9999.95) return "F1";
+                else if (value >= 999.995 || value < -999.995) return "F2";
+                else if (value >= 99.9995 || value < -99.9995) return "F3";
+                else if (value >= 9.99995 || value < -9.99995) return "F4";
+                else if (value >= 0.999995 || value < -0.999995) return "F5";
+                else if (value >= 0.0999995 || value < -0.0999995) return "F6";
+                else if (value >= 0.00999995 || value < -0.00999995) return "F7";
+                else if (value >= 0.000999995 || value < -0.000999995) return "F8";
+                else if (value >= 0.0000999995 || value < -0.0000999995) return "F9";
+                else return "F10";
+            }
+            else if (sigDigits == 5)
+            {
+                if (value >= 9999.5 || value < -9999.5) return "F0";
+                else if (value >= 999.95 || value < -999.95) return "F1";
+                else if (value >= 99.995 || value < -99.995) return "F2";
+                else if (value >= 9.9995 || value < -9.9995) return "F3";
+                else if (value >= 0.99995 || value < -0.99995) return "F4";
+                else if (value >= 0.099995 || value < -0.099995) return "F5";
+                else if (value >= 0.0099995 || value < -0.0099995) return "F6";
+                else if (value >= 0.00099995 || value < -0.00099995) return "F7";
+                else if (value >= 0.000099995 || value < -0.000099995) return "F8";
+                else return "F9";
+            }
+            else if (sigDigits == 4)
+            {
+                if (value >= 999.5 || value < -999.5) return "F0";
+                else if (value >= 99.95 || value < -99.95) return "F1";
+                else if (value >= 9.995 || value < -9.995) return "F2";
+                else if (value >= 0.9995 || value < -0.9995) return "F3";
+                else if (value >= 0.09995 || value < -0.09995) return "F4";
+                else if (value >= 0.009995 || value < -0.009995) return "F5";
+                else if (value >= 0.0009995 || value < -0.0009995) return "F6";
+                else if (value >= 0.00009995 || value < -0.00009995) return "F7";
+                else return "F8";
+            }
+            else if (sigDigits == 3)
+            {
+                if (value >= 99.5 || value < -99.5) return "F0";
+                else if (value >= 9.95 || value < -9.95) return "F1";
+                else if (value >= 0.995 || value < -0.995) return "F2";
+                else if (value >= 0.0995 || value < -0.0995) return "F3";
+                else if (value >= 0.00995 || value < -0.00995) return "F4";
+                else if (value >= 0.000995 || value < -0.000995) return "F5";
+                else if (value >= 0.0000995 || value < -0.0000995) return "F6";
+                else return "F7";
+            }
+            else if (sigDigits == 2)
+            {
+                if (value >= 9.5 || value < -9.5) return "F0";
+                else if (value >= 0.95 || value < -0.95) return "F1";
+                else if (value >= 0.095 || value < -0.095) return "F2";
+                else if (value >= 0.0095 || value < -0.0095) return "F3";
+                else if (value >= 0.00095 || value < -0.00095) return "F4";
+                else if (value >= 0.000095 || value < -0.000095) return "F5";
+                else return "F6";
+            }
+            else /// if (sigDigits == 1)
+            {
+                if (value >= 0.95 || value < -0.95) return "F0";
+                else if (value >= 0.095 || value < -0.095) return "F1";
+                else if (value >= 0.0095 || value < -0.0095) return "F2";
+                else if (value >= 0.00095 || value < -0.00095) return "F3";
+                else if (value >= 0.000095 || value < -0.000095) return "F4";
+                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;
+        }
+
+        /// <summary>
+        /// Get either Q1 or Qmin flow for a given Qn and metrological class
+        /// </summary>
+        /// <param name="Qn">Nominal flow in m3/h</param>
+        /// <param name="metroClass">Metrological class ("A" ,"B", "C" or "R#")</param>
+        /// <param name="medium">NotSpecified, ColdWater or HotWater</param>
+        /// <param name="Qdflt">Default flow when metrologic does not match pattern</param>
+        /// <returns>Q1 or Qmin flow in m3/h</returns>
+        public static double GetQ1Qmin(double Qn, string metroClass, Entities.Medium medium = Entities.Medium.ColdWater, double Qdflt = 0)
+        {
+            if (string.IsNullOrEmpty(metroClass)) return Qdflt;
+
+            int metroClassRatio;
+            if ((metroClass[0] == 'R') && int.TryParse(metroClass.Substring(1), out metroClassRatio) && (metroClassRatio > 0))
+            {
+                return Qn / (double)metroClassRatio;
+            }
+            else
+            {
+                if (medium == Entities.Medium.HotWater)
+                {
+                    switch (metroClass)
+                    {
+                        case "A": return (Qn < 15) ? (0.04 * Qn) : (0.08 * Qn);
+                        case "B": return (Qn < 15) ? (0.02 * Qn) : (0.04 * Qn);
+                        case "C": return (Qn < 15) ? (0.01 * Qn) : (0.02 * Qn);
+                        case "D": return (Qn < 15) ? (0.01 * Qn) : Qdflt;
+                        default: break;
+                    }
+                }
+                else
+                {
+                    switch (metroClass)
+                    {
+                        case "A": return (Qn < 15) ? (0.04 * Qn) : (0.08 * Qn);
+                        case "B": return (Qn < 15) ? (0.02 * Qn) : (0.03 * Qn);
+                        case "C": return (Qn < 15) ? (0.01 * Qn) : (0.006 * Qn);
+                        default: break;
+                    }
+                }
+            }
+
+            return Qdflt;
+        }
+
+        /// <summary>
+        /// Get either Q2 or Qt flow for a given Qn and metrological class
+        /// </summary>
+        /// <param name="Qn">Nominal flow in m3/h</param>
+        /// <param name="metroClass">Metrological class ("A" ,"B", "C" or "R#")</param>
+        /// <param name="medium">NotSpecified, ColdWater or HotWater</param>
+        /// <param name="Qdflt">Default flow when metrologic does not match pattern</param>
+        /// <returns>Q2 or Qt flow in m3/h</returns>
+        public static double GetQ2Qt(double Qn, string metroClass, Entities.Medium medium = Entities.Medium.ColdWater, double Qdflt = 0)
+        {
+            if (string.IsNullOrEmpty(metroClass)) return Qdflt;
+
+            int metroClassRatio;
+            if ((metroClass[0] == 'R') && int.TryParse(metroClass.Substring(1), out metroClassRatio) && (metroClassRatio > 0))
+            {
+                return 1.6 * Qn / (double)metroClassRatio;
+            }
+
+            if (medium == Entities.Medium.HotWater)
+            {
+                switch (metroClass)
+                {
+                    case "A": return (Qn < 15) ? (0.1 * Qn) : (0.2 * Qn);
+                    case "B": return (Qn < 15) ? (0.08 * Qn) : (0.15 * Qn);
+                    case "C": return (Qn < 15) ? (0.06 * Qn) : (0.1 * Qn);
+                    case "D": return (Qn < 15) ? (0.015 * Qn) : Qdflt;
+                    default: break;
+                }
+            }
+            else
+            {
+                switch (metroClass)
+                {
+                    case "A": return (Qn < 15) ? (0.1 * Qn) : (0.3 * Qn);
+                    case "B": return (Qn < 15) ? (0.08 * Qn) : (0.2 * Qn);
+                    case "C": return (Qn < 15) ? (0.015 * Qn) : (0.015 * Qn);
+                    default: break;
+                }
+            }
+
+            return Qdflt;
+        }
+
+        /// <summary>
+        /// Get either Q4 or Qmax flow for a given Qn and metrological class
+        /// </summary>
+        /// <param name="Qn">Nominal flow in m3/h</param>
+        /// <param name="metroClass">Metrological class ("A" ,"B", "C" or "R#")</param>
+        /// <param name="medium">NotSpecified, ColdWater or HotWater</param>
+        /// <param name="Qdflt">Default flow when metrologic does not match pattern</param>
+        /// <returns>Q4 or Qmax flow in m3/h</returns>
+        public static double GetQ4Qmax(double Qn, string metroClass, Entities.Medium medium = Entities.Medium.ColdWater, double Qdflt = 0)
+        {
+            if (string.IsNullOrEmpty(metroClass)) return Qdflt;
+
+            switch (metroClass[0])
+            {
+                case 'A':
+                case 'B':
+                case 'C':
+                case 'D':
+                    return 2 * Qn;
+                case 'R':
+                    return 1.25 * Qn;
+                default:
+                    return Qdflt;
+            }
+        }
+    }
+}

DataMatrix4Net/DataMatrix.cs

@@ -1,271 +0,0 @@
-using System;
-
-namespace DataMatrix4Net
-{
-    public class DataMatrix
-    {
-        ///
-        /// Public interface
-        ///
-        public bool isContainMatrix { get { return Matrix != null; } }
-        public Gma.QrCodeNet.Encoding.BitMatrix Matrix;
-
-        ///
-        /// Internal member variables
-        ///
-        readonly SymbolSize chosenSize;
-        readonly bool[,] visited;
-        int width { get { return isContainMatrix ? Matrix.Width : 0; } }
-        int height { get { return isContainMatrix ? Matrix.Height : 0; } }
-
-        /// <summary>
-        /// Data matrix constructor
-        /// Data matrix size up to 26x26 supported, one data region.
-        /// </summary>
-        /// <param name="content">Content of the data matrix (ASCII characters only)</param>
-        /// <param name="symbolSize">Chosen data matrix size</param>
-        public DataMatrix(string content, SymbolSize symbolSize = SymbolSize.SquareAuto)
-        {
-            byte[] contentBytes = Utils.MakeByteArray(content);
-
-            if (symbolSize >= 0)
-            {
-                chosenSize = symbolSize;
-            }
-            else if (symbolSize == SymbolSize.SquareAuto)
-            {
-                for (SymbolSize ss = 0; ss < Symbol.SymbolSquareCount; ss++)
-                {
-                    if (contentBytes.Length <= Symbol.GetSymbolAttribute(SymbolAttribute.SymbolDataWords, ss))
-                    {
-                        chosenSize = ss;
-                        break;
-                    }
-                }
-            }
-
-            int w = Symbol.GetSymbolAttribute(SymbolAttribute.SymbolCols, chosenSize);
-            int h = Symbol.GetSymbolAttribute(SymbolAttribute.SymbolRows, chosenSize);
-            if (w == -1 || h == -1)
-            {
-                throw new ArgumentOutOfRangeException("symboSize");
-            }
-
-            /// Add padding and Reed-Solomon error correction bytes to the content
-            byte[] data = ReedSolomon.Encode(contentBytes, chosenSize);
-
-            /// Create matrix, fill in frame cells
-            Matrix = new MyBitMatrix(w, h);
-            visited = new bool[w - 2, h - 2];
-            MakeFrame(chosenSize);
-
-            int ix = 0;
-            int x = 0;      /// inside data region in the range 0 .. width-2  (x coordinate, frame excluded)
-            int y = 4;      /// inside data region in the range 0 .. height-2 (y coordinate, frame excluded)
-
-            /// Walk through the data matrix area and fill in data bytes
-            do
-            {
-                if (x == 0 && y == height - 2)
-                {
-                    PlaceByteSpecial1(data[ix++], width, height);
-                }
-                else if (x == 0 && y == height - 4 && (height - 2) % 4 != 0)
-                {
-                    PlaceByteSpecial2(data[ix++], width, height);
-                }
-                else if (x == 0 && y == height - 4 && (height - 2) % 8 == 4)
-                {
-                    PlaceByteSpecial3(data[ix++], width, height);
-                }
-                else if (x == 2 && y == height + 2 && (height - 2) % 8 == 0)
-                {
-                    PlaceByteSpecial4(data[ix++], width, height);
-                }
-
-                do
-                {
-                    if (x >= 0 && y < height - 2 && !visited[x, y])
-                    {
-                        PlaceByteStandard(data[ix++], x, y, width, height);
-                        visited[x, y] = true;
-                    }
-                    x += 2;
-                    y -= 2;
-                }
-                while (x < width - 2 && y >= 0);
-                x += 3;
-                y += 1;
-
-                do
-                {
-                    if (x < width - 2 && y >= 0 && !visited[x, y])
-                    {
-                        PlaceByteStandard(data[ix++], x, y, width, height);
-                        visited[x, y] = true;
-                    }
-                    x -= 2;
-                    y += 2;
-                }
-                while (x >= 0 && y < height - 2);
-                x += 1;
-                y += 3;
-            }
-            while (ix < data.Length);
-        }
-
-        /// All matrix sizes
-        void PlaceByteSpecial1(byte dataByte, int width, int height)
-        {
-            Matrix[width - 2, 4] = (dataByte & 0x01) != 0;
-            Matrix[width - 2, 3] = (dataByte & 0x02) != 0;
-            Matrix[width - 2, 2] = (dataByte & 0x04) != 0;
-            Matrix[width - 2, 1] = (dataByte & 0x08) != 0;
-            Matrix[width - 3, 1] = (dataByte & 0x10) != 0;
-            Matrix[3, height - 2] = (dataByte & 0x20) != 0;
-            Matrix[2, height - 2] = (dataByte & 0x40) != 0;
-            Matrix[1, height - 2] = (dataByte & 0x80) != 0;
-            
-            visited[width - 3, 3] = true;
-            visited[width - 3, 2] = true;
-            visited[width - 3, 1] = true;
-            visited[width - 3, 0] = true;
-            visited[width - 4, 0] = true;
-            visited[2, height - 3] = true;
-            visited[1, height - 3] = true;
-            visited[0, height - 3] = true;
-        }
-
-        void PlaceByteSpecial2(byte dataByte, int width, int height)
-        {
-            Matrix[width - 2, 2] = (dataByte & 0x01) != 0;
-            Matrix[width - 2, 1] = (dataByte & 0x02) != 0;
-            Matrix[width - 3, 1] = (dataByte & 0x04) != 0;
-            Matrix[width - 4, 1] = (dataByte & 0x08) != 0;
-            Matrix[width - 5, 1] = (dataByte & 0x10) != 0;
-            Matrix[1, height - 2] = (dataByte & 0x20) != 0;
-            Matrix[1, height - 3] = (dataByte & 0x40) != 0;
-            Matrix[1, height - 4] = (dataByte & 0x80) != 0;
-
-            visited[width - 3, 1] = true;
-            visited[width - 3, 0] = true;
-            visited[width - 4, 0] = true;
-            visited[width - 5, 0] = true;
-            visited[width - 6, 0] = true;
-            visited[0, height - 3] = true;
-            visited[0, height - 4] = true;
-            visited[0, height - 5] = true;
-        }
-
-        void PlaceByteSpecial3(byte dataByte, int width, int height)
-        {
-            Matrix[width - 2, 2] = (dataByte & 0x01) != 0;
-            Matrix[width - 3, 2] = (dataByte & 0x02) != 0;
-            Matrix[width - 4, 2] = (dataByte & 0x04) != 0;
-            Matrix[width - 2, 1] = (dataByte & 0x08) != 0;
-            Matrix[width - 3, 1] = (dataByte & 0x10) != 0;
-            Matrix[width - 4, 1] = (dataByte & 0x20) != 0;
-            Matrix[width - 2, height - 2] = (dataByte & 0x40) != 0;
-            Matrix[1,         height - 2] = (dataByte & 0x80) != 0;
-
-            visited[width - 3, 1] = true;
-            visited[width - 4, 1] = true;
-            visited[width - 5, 1] = true;
-            visited[width - 3, 0] = true;
-            visited[width - 4, 0] = true;
-            visited[width - 5, 0] = true;
-            visited[width - 3, height - 3] = true;
-            visited[0,         height - 3] = true;
-        }
-
-        void PlaceByteSpecial4(byte dataByte, int width, int height)
-        {
-            Matrix[width - 2, 4] = (dataByte & 0x01) != 0;
-            Matrix[width - 2, 3] = (dataByte & 0x02) != 0;
-            Matrix[width - 2, 2] = (dataByte & 0x04) != 0;
-            Matrix[width - 2, 1] = (dataByte & 0x08) != 0;
-            Matrix[width - 3, 1] = (dataByte & 0x10) != 0;
-            Matrix[1, height - 2] = (dataByte & 0x20) != 0;
-            Matrix[1, height - 3] = (dataByte & 0x40) != 0;
-            Matrix[1, height - 4] = (dataByte & 0x80) != 0;
-
-            visited[width - 3, 3] = true;
-            visited[width - 3, 2] = true;
-            visited[width - 3, 1] = true;
-            visited[width - 3, 0] = true;
-            visited[width - 4, 0] = true;
-            visited[0, height - 3] = true;
-            visited[0, height - 4] = true;
-            visited[0, height - 5] = true;
-        }
-
-        ///
-        /// Standard bit positioning (all matrix sizes)
-        ///
-        int[] xOffs = new int[8] { 1, 0, -1, 1, 0, -1, 0, -1 };
-        int[] yOffs = new int[8] { 1, 1, 1, 0, 0, 0, -1, -1 };
-
-        /// <summary>
-        /// Standard placemnt of a byte into a matrix 
-        /// </summary>
-        /// <param name="dataByte">Data byte</param>
-        /// <param name="x">X-coordinate in range  0..width-2 (from left, frame excluded)</param>
-        /// <param name="y">Y-coordinate in range  0..height-2 (from top, frame excluded)</param>
-        /// <param name="width">Matrix width incl. frame</param>
-        /// <param name="height">Matrix height incl. frame</param>
-        void PlaceByteStandard(byte dataByte, int x, int y, int width, int height)
-        {
-            int mask = 1;
-            for (int i = 0; i < 8; i++)
-            {
-                int xx = x + xOffs[i];
-                int yy = y + yOffs[i];
-                if (xx < 1)
-                {
-                    xx += width - 2;
-                    yy += 4 - (width + 4) % 8;
-                }
-                else if (yy < 1)
-                {
-                    xx += 4 - (height + 4) % 8;
-                    yy += height - 2;
-                }
-                Matrix[xx, yy] = (dataByte & mask) != 0;
-                mask = mask << 1;
-            }
-        }
-
-        /// <summary>
-        /// Crate data matrix frame.
-        /// All square data matrix sizes supported (incl. 4, 16 and 36 data regions).
-        /// </summary>
-        void MakeFrame(SymbolSize size)
-        {
-            int drw = Symbol.GetSymbolAttribute(SymbolAttribute.DataRegionCols, size);
-            int drh = Symbol.GetSymbolAttribute(SymbolAttribute.DataRegionRows, size);
-            int totalhdr = Symbol.GetSymbolAttribute(SymbolAttribute.HorizDataRegions, size);
-            int totalvdr = Symbol.GetSymbolAttribute(SymbolAttribute.VertDataRegions, size);
-
-            for (int hdr = 0; hdr < totalhdr; hdr++)
-            {
-                for (int vdr = 0; vdr < totalvdr; vdr++)
-                {
-                    int offsx = hdr * (drw + 2);
-                    int offsy = vdr * (drh + 2);
-
-                    for (int i = 0; i < drw + 2; i++)
-                    {
-                        Matrix[offsx + i, offsy + drh + 1] = true;
-                        if (i % 2 == 0) Matrix[offsx + i, offsy] = true;
-                    }
-
-                    for (int j = 0; j < drh + 2; j++)
-                    {
-                        Matrix[offsx, offsy + j] = true;
-                        if (j % 2 == 1) Matrix[offsx + drw + 1, offsy + j] = true;
-                    }
-                }
-            }
-        }
-    }
-}

DataMatrix4Net/DataMatrix4Net.csproj

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7CD2B5B4-3304-4151-B8B4-76A8B8AF9B06}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DataMatrix4Net</RootNamespace>
-    <AssemblyName>DataMatrix4Net</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Gma.QrCodeNet.Encoding">
-      <HintPath>..\packages\QrCode.Net.0.4.0.0\net40\Gma.QrCodeNet.Encoding.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DataMatrix.cs" />
-    <Compile Include="MyBitMatrix.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ReedSolomon.cs" />
-    <Compile Include="Symbol.cs" />
-    <Compile Include="Utils.cs" />
-  </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>

DataMatrix4Net/MyBitMatrix.cs

@@ -1,39 +0,0 @@
-using System;
-
-namespace DataMatrix4Net
-{
-    public class MyBitMatrix : Gma.QrCodeNet.Encoding.BitMatrix
-    {
-        ///
-        /// Public interface
-        ///
-        public override int Width { get { return width; } }
-        public override int Height { get { return height; } }
-        public override bool[,] InternalArray { get { return internalArray; } }
-        ///
-        public override bool this[int i, int j]
-        {
-            get { return (i >= 0 && j >= 0 && i < width && j < height) ? internalArray[i, j] : false; }
-            set { if (i >= 0 && j >= 0 && i < width && j < height) internalArray[i, j] = value; }
-        }
-
-        ///
-        /// Private members
-        ///
-        readonly int width;
-        readonly int height;
-        readonly bool[,] internalArray;
-
-        /// <summary>
-        /// Public constructor
-        /// </summary>
-        /// <param name="width">Matrix width</param>
-        /// <param name="height">Matrix height</param>
-        public MyBitMatrix(int width, int height)
-        {
-            this.width = width;
-            this.height = height;
-            internalArray = new bool[width, height];
-        }
-    }
-}

DataMatrix4Net/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("DataMatrix4Net")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("DataMatrix4Net")]
-[assembly: AssemblyCopyright("Copyright ©  2021")]
-[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("efc81899-2be9-4a5c-a120-667d20c5265f")]
-
-// 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")]

DataMatrix4Net/ReedSolomon.cs

@@ -1,156 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace DataMatrix4Net
-{
-    public class ReedSolomon
-    {
-        const int NN = 255;
-        const int MAX_ERROR_WORD_COUNT = 68;
-
-        static byte[] log301 = new byte[]
-        {
-            255,   0,   1, 240,   2, 225, 241,  53,   3,  38, 226, 133, 242,  43,  54, 210,
-              4, 195,  39, 114, 227, 106, 134,  28, 243, 140,  44,  23,  55, 118, 211, 234,
-              5, 219, 196,  96,  40, 222, 115, 103, 228,  78, 107, 125, 135,   8,  29, 162,
-            244, 186, 141, 180,  45,  99,  24,  49,  56,  13, 119, 153, 212, 199, 235,  91,
-              6,  76, 220, 217, 197,  11,  97, 184,  41,  36, 223, 253, 116, 138, 104, 193,
-            229,  86,  79, 171, 108, 165, 126, 145, 136,  34,   9,  74,  30,  32, 163,  84,
-            245, 173, 187, 204, 142,  81, 181, 190,  46,  88, 100, 159,  25, 231,  50, 207,
-             57, 147,  14,  67, 120, 128, 154, 248, 213, 167, 200,  63, 236, 110,  92, 176,
-              7, 161,  77, 124, 221, 102, 218,  95, 198,  90,  12, 152,  98,  48, 185, 179,
-             42, 209,  37, 132, 224,  52, 254, 239, 117, 233, 139,  22, 105,  27, 194, 113,
-            230, 206,  87, 158,  80, 189, 172, 203, 109, 175, 166,  62, 127, 247, 146,  66,
-            137, 192,  35, 252,  10, 183,  75, 216,  31,  83,  33,  73, 164, 144,  85, 170,
-            246,  65, 174,  61, 188, 202, 205, 157, 143, 169,  82,  72, 182, 215, 191, 251,
-             47, 178,  89, 151, 101,  94, 160, 123,  26, 112, 232,  21,  51, 238, 208, 131,
-             58,  69, 148,  18,  15,  16,  68,  17, 121, 149, 129,  19, 155,  59, 249,  70,
-            214, 250, 168,  71, 201, 156,  64,  60, 237, 130, 111,  20,  93, 122, 177, 150,
-        };
-
-        static byte[] antilog301 = new byte[]
-        {
-              1,   2,   4,   8,  16,  32,  64, 128,  45,  90, 180,  69, 138,  57, 114, 228,
-            229, 231, 227, 235, 251, 219, 155,  27,  54, 108, 216, 157,  23,  46,  92, 184,
-             93, 186,  89, 178,  73, 146,   9,  18,  36,  72, 144,  13,  26,  52, 104, 208,
-            141,  55, 110, 220, 149,   7,  14,  28,  56, 112, 224, 237, 247, 195, 171, 123,
-            246, 193, 175, 115, 230, 225, 239, 243, 203, 187,  91, 182,  65, 130,  41,  82,
-            164, 101, 202, 185,  95, 190,  81, 162, 105, 210, 137,  63, 126, 252, 213, 135,
-             35,  70, 140,  53, 106, 212, 133,  39,  78, 156,  21,  42,  84, 168, 125, 250,
-            217, 159,  19,  38,  76, 152,  29,  58, 116, 232, 253, 215, 131,  43,  86, 172,
-            117, 234, 249, 223, 147,  11,  22,  44,  88, 176,  77, 154,  25,  50, 100, 200,
-            189,  87, 174, 113, 226, 233, 255, 211, 139,  59, 118, 236, 245, 199, 163, 107,
-            214, 129,  47,  94, 188,  85, 170, 121, 242, 201, 191,  83, 166,  97, 194, 169,
-            127, 254, 209, 143,  51, 102, 204, 181,  71, 142,  49,  98, 196, 165, 103, 206,
-            177,  79, 158,  17,  34,  68, 136,  61, 122, 244, 197, 167,  99, 198, 161, 111,
-            222, 145,  15,  30,  60, 120, 240, 205, 183,  67, 134,  33,  66, 132,  37,  74,
-            148,   5,  10,  20,  40,  80, 160, 109, 218, 153,  31,  62, 124, 248, 221, 151,
-              3,   6,  12,  24,  48,  96, 192, 173, 119, 238, 241, 207, 179,  75, 150,   0,
-        };
-
-        /// <summary>
-        /// GF add (a + b)
-        /// </summary>
-        static byte GfAdd(byte a, byte b)
-        {
-            return (byte)(a ^ b);
-        }
-
-        /// <summary>
-        /// GF multiply (a * b)
-        /// </summary>
-        static byte GfMult(byte a, byte b)
-        {
-            return (a == 0 || b == 0) ? (byte)0 : antilog301[(log301[a] + log301[b]) % NN];
-        }
-
-        /// <summary>
-        /// GF multiply by antilog (a * alpha**b)
-        /// </summary>
-        static byte GfMultAntilog(byte a, byte b)
-        {
-            return (a == 0) ? (byte)0 : antilog301[(log301[a] + b) % NN];
-        }
-
-
-        /// <summary>
-        /// Encode a byte array using Reed-Solomon error correction
-        /// </summary>
-        /// <param name="message">Input byte array</param>
-        /// <param name="sizeId"></param>
-        /// <returns>true when successful</returns>
-        public static byte[] Encode(byte[] message, SymbolSize sizeId)
-        {
-            int blockStride = Symbol.GetSymbolAttribute(SymbolAttribute.InterleavedBlocks, sizeId);
-            int blockErrorWords = Symbol.GetSymbolAttribute(SymbolAttribute.BlockErrorWords, sizeId);
-            int symbolDataWords = Symbol.GetSymbolAttribute(SymbolAttribute.SymbolDataWords, sizeId);
-            int symbolErrorWords = Symbol.GetSymbolAttribute(SymbolAttribute.SymbolErrorWords, sizeId);
-            int symbolTotalWords = symbolDataWords + symbolErrorWords;
-
-            byte[] output = new byte[symbolTotalWords];
-            for (int i = 0; i < Math.Min(message.Length, symbolDataWords); i++)
-            {
-                output[i] = message[i];   /// Copy the original message to output
-            }
-
-            /// Populate generator polynomial
-            byte[] gen = RsGenPoly(blockErrorWords);
-        
-            /// For each interleaved block...
-            for (int blockIdx = 0; blockIdx < blockStride; blockIdx++)
-            {
-                /// Generate error codewords
-                byte[] ecc = new byte[blockErrorWords];
-                for (int i = 0; i < blockErrorWords; i++) ecc[i] = 0;
-                
-                for (int i = blockIdx; i < symbolDataWords; i += blockStride)
-                {
-                    byte val = (byte)(ecc[blockErrorWords - 1] ^ output[i]);
- 
-                    for (int j = blockErrorWords - 1; j > 0; j--)
-                    {
-                       //DMTX_CHECK_BOUNDS(&ecc, j); DMTX_CHECK_BOUNDS(&ecc, j-1); DMTX_CHECK_BOUNDS(&gen, j);
-                       ecc[j] = GfAdd(ecc[j - 1], GfMult(gen[j], val));
-                    }
- 
-                    ecc[0] = GfMult(gen[0], val);
-                }
- 
-                /// Copy to output message
-                int jj = blockErrorWords;
-                for (int i = symbolDataWords + blockIdx; i < symbolTotalWords; i += blockStride)
-                {
-                    output[i] = ecc[--jj];
-                }
-            }
-        
-            return output;
-        }
-
-
-        static byte[] RsGenPoly(int errorWordCount)
-        {
-            byte[] gen = new byte[errorWordCount];
-
-            /// Initialize all coefficients to 1
-            for (int i = 0; i < errorWordCount; i++) gen[i] = (byte)1;
-        
-            /* Generate polynomial */
-            for (int i = 0; i < gen.Length; i++)
-            {
-               for (int j = i; j >= 0; j--)
-               {
-                   gen[j] = GfMultAntilog(gen[j], (byte)(i + 1));
-                   if (j > 0)
-                   {
-                       gen[j] = (byte)(gen[j] ^ gen[j - 1]);
-                   }
-               }
-            }
-      
-            return gen;
-        }
-    }
-}

DataMatrix4Net/Symbol.cs

@@ -1,108 +0,0 @@
-using System;
-
-namespace DataMatrix4Net
-{
-    public enum SymbolSize
-    {
-        RectAuto   = -3,
-        SquareAuto = -2,
-        ShapeAuto  = -1,
-
-        Sq10x10    =  0,
-        Sq12x12,
-        Sq14x14,
-        Sq16x16,
-        Sq18x18,
-        Sq20x20,
-        Sq22x22,
-        Sq24x24,
-        Sq26x26,
-        Sq32x32,
-        Sq36x36,
-        Sq40x40,
-        Sq44x44,
-        Sq48x48,
-        Sq52x52,
-        Sq64x64,
-        Sq72x72,
-        Sq80x80,
-        Sq88x88,
-        Sq96x96,
-        Sq104x104,
-        Sq120x120,
-        Sq132x132,
-        Sq144x144,
-
-        Rect8x18,
-        Rect8x32,
-        Rect12x26,
-        Rect12x36,
-        Rect16x36,
-        Rect16x48,
-
-        Count
-    }
-
-    public enum SymbolAttribute
-    {
-        SymbolRows,
-        SymbolCols,
-        DataRegionRows,
-        DataRegionCols,
-        HorizDataRegions,
-        VertDataRegions,
-        MappingMatrixRows,
-        MappingMatrixCols,
-        InterleavedBlocks,
-        BlockErrorWords,
-        BlockMaxCorrectable,
-        SymbolDataWords,
-        SymbolErrorWords,
-        SymbolMaxCorrectable,
-    }
-
-    public static class Symbol
-    {
-        public const SymbolSize SymbolSquareCount = SymbolSize.Rect8x18;
-        ///                                                     (---------------------------------------------- square ------------------------------------------------------)    (--- rectangular ---)
-        static readonly int[] symbolRows          = new int[] { 10, 12, 14, 16, 18, 20, 22, 24, 26, 32, 36,  40,  44,  48,  52,  64,  72,  80,  88,  96, 104,  120,  132,  144,   8,  8, 12, 12, 16, 16 };
-        static readonly int[] symbolCols          = new int[] { 10, 12, 14, 16, 18, 20, 22, 24, 26, 32, 36,  40,  44,  48,  52,  64,  72,  80,  88,  96, 104,  120,  132,  144,  18, 32, 26, 36, 36, 48 };
-        static readonly int[] dataRegionRows      = new int[] {  8, 10, 12, 14, 16, 18, 20, 22, 24, 14, 16,  18,  20,  22,  24,  14,  16,  18,  20,  22,  24,   18,   20,   22,   6,  6, 10, 10, 14, 14 };
-        static readonly int[] dataRegionCols      = new int[] {  8, 10, 12, 14, 16, 18, 20, 22, 24, 14, 16,  18,  20,  22,  24,  14,  16,  18,  20,  22,  24,   18,   20,   22,  16, 14, 24, 16, 16, 22 };
-        static readonly int[] horizDataRegions    = new int[] {  1,  1,  1,  1,  1,  1,  1,  1,  1,  2,  2,   2,   2,   2,   2,   4,   4,   4,   4,   4,   4,    6,    6,    6,   1,  2,  1,  2,  2,  2 };
-        static readonly int[] interleavedBlocks   = new int[] {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,   1,   1,   1,   2,   2,   4,   4,   4,   4,   6,    6,    8,   10,   1,  1,  1,  1,  1,  1 };
-        static readonly int[] symbolDataWords     = new int[] {  3,  5,  8, 12, 18, 22, 30, 36, 44, 62, 86, 114, 144, 174, 204, 280, 368, 456, 576, 696, 816, 1050, 1304, 1558,   5, 10, 16, 22, 32, 49 };
-        static readonly int[] blockErrorWords     = new int[] {  5,  7, 10, 12, 14, 18, 20, 24, 28, 36, 42,  48,  56,  68,  42,  56,  36,  48,  56,  68,  56,   68,   62,   62,   7, 11, 14, 18, 24, 28 };
-        static readonly int[] blockMaxCorrectable = new int[] {  2,  3,  5,  6,  7,  9, 10, 12, 14, 18, 21,  24,  28,  34,  21,  28,  18,  24,  28,  34,  28,   34,   31,   31,   3,  5,  7,  9, 12, 14 };
-
-        /// <summary>
-        /// Return a symbol attribute
-        /// </summary>
-        /// <param name="attribute">Symbol attribute</param>
-        /// <param name="sizeId">Size ID (or index)</param>
-        /// <returns>Sybol attribute value, -1 when undefined</returns>
-        public static int GetSymbolAttribute(SymbolAttribute attribute, SymbolSize sizeId)
-        {
-            if (sizeId < 0 || sizeId >= SymbolSize.Count) return -1;
-
-           switch (attribute)
-           {
-               case SymbolAttribute.SymbolRows:           return symbolRows[(int)sizeId];
-               case SymbolAttribute.SymbolCols:           return symbolCols[(int)sizeId];
-               case SymbolAttribute.DataRegionRows:       return dataRegionRows[(int)sizeId];
-               case SymbolAttribute.DataRegionCols:       return dataRegionCols[(int)sizeId];
-               case SymbolAttribute.HorizDataRegions:     return horizDataRegions[(int)sizeId];
-               case SymbolAttribute.VertDataRegions:      return (sizeId < SymbolSquareCount) ? horizDataRegions[(int)sizeId] : 1;
-               case SymbolAttribute.MappingMatrixRows:    return dataRegionRows[(int)sizeId] * GetSymbolAttribute(SymbolAttribute.VertDataRegions, sizeId);
-               case SymbolAttribute.MappingMatrixCols:    return dataRegionCols[(int)sizeId] * horizDataRegions[(int)sizeId];
-               case SymbolAttribute.InterleavedBlocks:    return interleavedBlocks[(int)sizeId];
-               case SymbolAttribute.BlockErrorWords:      return blockErrorWords[(int)sizeId];
-               case SymbolAttribute.BlockMaxCorrectable:  return blockMaxCorrectable[(int)sizeId];
-               case SymbolAttribute.SymbolDataWords:      return symbolDataWords[(int)sizeId];
-               case SymbolAttribute.SymbolErrorWords:     return blockErrorWords[(int)sizeId] * interleavedBlocks[(int)sizeId];
-               case SymbolAttribute.SymbolMaxCorrectable: return blockMaxCorrectable[(int)sizeId] * interleavedBlocks[(int)sizeId];
-               default: return -1;
-           }
-        }
-    }
-}

DataMatrix4Net/Utils.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace DataMatrix4Net
-{
-    public static class Utils
-    {
-        const byte EndOfMessage = (byte)129;
-
-        public static bool IsDigit(char znak)
-        {
-            if (znak >= '0' && znak <= '9') return true;
-            return false;
-        }
-
-        public static bool IsAscii(char znak)
-        {
-            if (znak >= 0 && znak <= '~' + 1) return true;
-            return false;
-        }
-
-        public static byte EncodeTwoDigits(char znak1, char znak2)
-        {
-            return (byte)(130 + 10 * (znak1 - '0') + znak2 - '0');
-        }
-
-        public static byte[] MakeByteArray(string text)
-        {
-            IList<byte> bytes = new List<byte>();
-
-            int ix = 0;
-            while (ix < text.Length)
-            {
-                if (ix < text.Length - 1 && Utils.IsDigit(text[ix]) && Utils.IsDigit(text[ix + 1]))
-                {
-                    bytes.Add(Utils.EncodeTwoDigits(text[ix], text[ix + 1]));
-                    ix += 2;
-                }
-                else if (Utils.IsAscii(text[ix]))
-                {
-                    bytes.Add((byte)(text[ix] + 1));
-                    ix++;
-                }
-                else
-                {
-                    /// Skip non ASCII characters
-                    ix++;
-                }
-            }
-            bytes.Add(EndOfMessage);
-
-            return bytes.ToArray();
-        }
-    }
-}

DataStreamInterface/DataFrame.cs

@@ -7,12 +7,12 @@ namespace DataStreamInterface
 {
     public class DataFrame
     {
-        public readonly Int64 ID;          /// Frame ID
+        public readonly UInt64 ID;          /// Frame ID
         public readonly double Time;        /// Time stamp in units of time
         public readonly double Volume;      /// Volume in units of volume
         public readonly double[] Quantity;  /// An array of optional quantities in their respective units
 
-        public DataFrame(Int64 id, double time, double volume, double[] quantity)
+        public DataFrame(UInt64 id, double time, double volume, double[] quantity)
         {
             ID = id;
             Time = time;

DataStreamInterface/DataStreamInterface.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DataStreamInterface</RootNamespace>
     <AssemblyName>DataStreamInterface</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -21,7 +21,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -30,11 +29,9 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

DataStreamInterface/Enums.cs

@@ -13,28 +13,22 @@ namespace DataStreamInterface
         degree,
 
         /// Volume
-        ml,         ///   1 ml = 0.001 l
-        l,          /// * 1 liter
+        ml,         ///   0.001 l
+        l,          /// * 1 liter = 1 l
         dm3,        ///   1 dm3 = 1 l
-        USgal,      ///   1 US gallon = 3.78541178 l
-        UKgal,      ///   1 imperial gallon = 4.54609 l
-        cf,         ///   1 cubic foot = 28.316846592 l
-        m3,         ///   1 m3 = 1000 l
+        m3,         ///   1000 l
+        gal_UK,     ///   1 gal(UK) = 4.54609 l
+        gal_US,     ///   1 gal(US) = 3.78541178 l
 
         /// Flow
-        lph,        ///   1 l/h = 0.001 m3/h
-        lpm,        ///   1 l/m = 60 l/h = 0.06 m3/h
-        m3ph,       /// * 1 m3/h
-        lps,        ///   1 liter/s = 3.6 m3/h
-        USgalps,    ///   1 US gallon per second = 13.627482408 m3/h
-        m3pm,       ///   1 m3/m = 60 m3/h
-        cfs,        ///   1 cubic foot per second = 101.9406477312 m3/h
+        lph,        ///   1 liter/h
+        m3ph,       /// * 1 m3/h = 1000 l/h
 
         /// Mass
         g,          ///   0.001 kg
-        lb,         ///   0.45359237 kg
         kg,         /// * 1 kilogram
         t,          ///   1000 kg
+        lb,         ///   0.45359237 kg
 
         /// Time
         ms,         ///   1 ms = 0.001 s
@@ -53,7 +47,6 @@ namespace DataStreamInterface
         mbar,       ///   1 mbar = 1 hPa = 100 Pa
         kPa,        ///   1 kPa = 10 HPa
         inHg,       ///   1 inHg = 33.864 hPa
-        psi,        ///   1 psi = 0.0689475729 bar
         bar,        /// * 1 Bar = 1000 mbar = 0.1 MPa = 100000 Pa
         MPa,        ///   1 MPa = 10000 hPa
 
@@ -68,9 +61,7 @@ namespace DataStreamInterface
         mm,         /// * 1 millimeter
         cm,         ///   1 cm = 10 mm
         inch,       ///   1 inch = 25.4 mm
-        dm,         ///   1 dm = 100 mm
         foot,       ///   1 foot = 304.8 mm
-        yard,       ///   1 yard = 914.4 mm
         m,          ///   1 m = 1000 mm
 
         /// Density
@@ -85,317 +76,20 @@ namespace DataStreamInterface
         kWh,		///   1 kWh = 3600000 J
         MWh,		///   1 MWh = 3600000000 J
 
-        /// Electrical conductivity
-        uSpcm,      /// * 1 uS/cm
-        mSpm,       ///   1 mS/m = 10 uS/cm
-
         /// Meter coefficient - volume
         ppl,		/// * 1 pulse/l
-        ppdm3,		///   1 pulse/dm3
-        degpl,		///   1 degree/l
-        degpdm3,	///   1 degree/dm3
-        lpp,		///   1 l/pulse
-        dm3pp,		///   1 dm3/pulse
-        lpdeg,		///   1 l/degree
-        dm3pdeg,	///   1 dm3/degree
+        ppdm3,		/// * 1 pulse/dm3
+        degpl,		/// * 1 degree/l
+        degpdm3,	/// * 1 degree/dm3
+        lpp,		/// * 1 l/pulse
+        dm3pp,		/// * 1 dm3/pulse
+        lpdeg,		/// * 1 l/degree
+        dm3pdeg,	/// * 1 dm3/degree
 
         /// Meter coefficient - energy
         ppkWh,		/// * 1 pulse/kWh
-        kWhpp,		///   1 kWh/pulse
+        kWhpp,		/// * 1 kWh/pulse
+
+        Count
     }
-
-    public enum Quantity
-    {
-        /// Quantities with units and conversions (double -> double)
-        Volume,
-        Flow,
-        Mass,
-        Time,
-        Temperature,
-        Pressure,
-        Humidity,
-        Error,
-        Length,
-        Density,
-        Energy,
-        Pulses,
-        PulsePerLtr,
-        PulsePerKWh,
-        Conductivity,
-
-        /// Quantities without units and conversions
-        Number,
-        String,
-        Boolean,
-        DateTime,
-        Enumerated,
-    }
-
-    public static class Units
-    {
-        public static bool IsDefaultUnit(Unit unit)
-        {
-            return unit == Unit.l || unit == Unit.m3ph || unit == Unit.kg || unit == Unit.s || unit == Unit.C ||
-                   unit == Unit.bar || unit == Unit.RPct || unit == Unit.Pct || unit == Unit.mm || unit == Unit.kgpm3 ||
-                   unit == Unit.J || unit == Unit.uSpcm || unit == Unit.ppl || unit == Unit.ppkWh;
-        }
-
-        public static Quantity GetQuantity(Unit units)
-        {
-            switch (units)
-            {
-                case Unit.pulse:
-                case Unit.degree:
-                    return Quantity.Pulses;
-
-                case Unit.ml:
-                case Unit.l:
-                case Unit.dm3:
-                case Unit.USgal:
-                case Unit.UKgal:
-                case Unit.cf:
-                case Unit.m3:
-                    return Quantity.Volume;
-
-                case Unit.lph:
-                case Unit.lpm:
-                case Unit.m3ph:
-                case Unit.lps:
-                case Unit.USgalps:
-                case Unit.m3pm:
-                case Unit.cfs:
-                    return Quantity.Flow;
-
-                case Unit.g:
-                case Unit.lb:
-                case Unit.kg:
-                case Unit.t:
-                    return Quantity.Mass;
-
-                case Unit.ms:
-                case Unit.s:
-                case Unit.min:
-                case Unit.hour:
-                    return Quantity.Time;
-
-                case Unit.C:
-                case Unit.F:
-                case Unit.K:
-                    return Quantity.Temperature;
-
-                case Unit.Pa:
-                case Unit.hPa:
-                case Unit.mbar:
-                case Unit.kPa:
-                case Unit.inHg:
-                case Unit.psi:
-                case Unit.bar:
-                case Unit.MPa:
-                    return Quantity.Pressure;
-
-                case Unit.RPct:
-                    return Quantity.Humidity;
-
-                case Unit.Promile:
-                case Unit.Pct:
-                    return Quantity.Error;
-
-                case Unit.mm:
-                case Unit.cm:
-                case Unit.inch:
-                case Unit.dm:
-                case Unit.foot:
-                case Unit.yard:
-                case Unit.m:
-                    return Quantity.Length;
-
-                case Unit.kgpm3:
-                case Unit.kgpl:
-                    return Quantity.Density;
-
-                case Unit.J:
-                case Unit.kJ:
-                case Unit.MJ:
-                case Unit.Wh:
-                case Unit.kWh:
-                case Unit.MWh:
-                    return Quantity.Energy;
-
-                case Unit.uSpcm:
-                case Unit.mSpm:
-                    return Quantity.Conductivity;
-
-                case Unit.ppl:
-                case Unit.ppdm3:
-                case Unit.degpl:
-                case Unit.degpdm3:
-                case Unit.lpp:
-                case Unit.dm3pp:
-                case Unit.lpdeg:
-                case Unit.dm3pdeg:
-                    return Quantity.PulsePerLtr;
-
-                case Unit.ppkWh:
-                case Unit.kWhpp:
-                    return Quantity.PulsePerKWh;
-
-                default:
-                    return Quantity.Number;
-            }
-        }
-
-        public static double ConvertTo(Unit units, double v)
-        {
-            switch (units)
-            {
-                /// Volume: internal representation in l
-                case Unit.ml:       return 1000 * v;            /// 1 l = 1000 ml
-                case Unit.USgal:    return 0.26417205 * v;      /// 1 gal(US) = 3.78541178 l
-                case Unit.UKgal:    return 0.21996925 * v;      /// 1 gal(UK) = 4.54609 l
-                case Unit.cf:       return 0.0353146667215 * v; /// 1 cubic foot = 28.316846592 l
-                case Unit.m3:       return 0.001 * v;           /// 1 m3 = 1000 l
-
-                /// Flow: internal representation in m3/h
-                case Unit.lph:      return 1000 * v;            /// 1 l/h
-                case Unit.lpm:      return v / 0.06;            /// 1 l/m
-                case Unit.lps:      return v / 3.6;             /// 1 l/s
-                case Unit.USgalps:  return 0.0733811257326 * v; /// 1 US gallon per second
-                case Unit.m3pm:     return v / 60;              /// 1 m3/m
-                case Unit.cfs:      return 0.009809629644858 * v; /// 1 cubic foot per second
-
-                /// Mass: internal representation in kg
-                case Unit.g:        return 1000 * v;            /// 1 g = 0.001 kg
-                case Unit.lb:       return 2.2046226 * v;       /// 1 lb = 0.45359237 kg
-                case Unit.t:        return 0.001 * v;           /// 1 t = 1000 kg
-
-                /// Time or duration: internal representation in seconds [s] 
-                case Unit.ms:       return 1000 * v;
-                case Unit.min:      return v / 60;
-                case Unit.hour:     return v / 3600;
-
-                /// Temperature: internal representation in °C
-                case Unit.F:        return 1.8 * v + 32;        /// degree Fahrenheit
-                case Unit.K:        return v + 273.15;          /// degree Kelvin
-
-                /// Pressure: internal representation in  bar = 0.1 MPa
-                case Unit.Pa:       return 100000 * v;
-                case Unit.hPa:      return 1000 * v;            /// 1 hPa = 100 Pa
-                case Unit.mbar:     return 1000 * v;            /// 1 mbar = 1 hPa = 100 Pa
-                case Unit.kPa:      return 100 * v;             /// 1 kPa = 10 HPa
-                case Unit.inHg:     return 29.53 * v;           /// 1 inHg =
-                case Unit.psi:      return 14.5037738 * v;      /// 1 psi =
-                case Unit.MPa:      return 0.1 * v;             /// 1 MPa = 10000 hPa
-
-                /// Relative error: internal representation in %
-                case Unit.Promile:  return 10 * v;              /// 1 promile = 0.1 %
-
-                /// Diameter, length: internal representation in mm
-                case Unit.cm:       return 0.1 * v;             /// 1 cm = 10 mm
-                case Unit.inch:     return v / 25.4;            /// 1 inch = 25.4 mm
-                case Unit.dm:       return 0.01 * v;            /// 1 dm = 100 mm
-                case Unit.foot:     return v / 304.8;           /// 1 foot = 304.8 mm
-                case Unit.yard:     return v / 914.4;           /// 1 yard = 914,4 mm
-                case Unit.m:        return 0.001 * v;           /// 1 m = 1000 mm
-
-                /// Density: internal representation in kg/m3
-                case Unit.kgpl:     return 0.001 * v;
-
-                /// Energy, internal representation in Joul
-                case Unit.kJ:       return 0.001 * v;           /// 1 kJ = 1000 J
-                case Unit.MJ:       return 0.000001 * v;        /// 1 kJ = 1000000 J
-                case Unit.Wh:       return v / 3600.0;          /// 1 Wh = 3600 J
-                case Unit.kWh:      return v / 3600000.0;       /// 1 kWh = 3600000 J
-                case Unit.MWh:      return v / 3600000000.0;    /// 1 MWh = 3600000000 J
-
-                /// Electrical conductivity
-                case Unit.mSpm:     return 0.1 * v;
-
-                /// Invert pulses
-                case Unit.kWhpp:
-                case Unit.lpp:
-                case Unit.dm3pp:
-                case Unit.lpdeg:
-                case Unit.dm3pdeg:  return (v <= float.Epsilon) ? 0 : 1/v;
-
-                default:            return v;                   /// Do not convert
-            }
-        }
-
-        public static double ConvertFrom(Unit units, double v)
-        {
-            switch (units)
-            {
-                /// Volume: internal representation in l
-                case Unit.ml:       return 0.001 * v;           /// 0.001 l
-                case Unit.USgal:    return 3.78541178 * v;      /// 1 gal(US) = 3.78541178 l
-                case Unit.UKgal:    return 4.54609 * v;         /// 1 gal(UK) = 4.54609 l
-                case Unit.cf:       return 28.316846592 * v;    /// 1 cubic foot = 28.316846592 l
-                case Unit.m3:       return 1000 * v;            /// 1000 l
-
-                /// Flow: internal representation in m3/h
-                case Unit.lph:      return 0.001 * v;           /// 1 l/h
-                case Unit.lpm:      return 0.06 * v;            /// 1 l/m
-                case Unit.lps:      return 3.6 * v;             /// 1 l/s
-                case Unit.USgalps:  return 13.627482408 * v;    /// 1 US gallon per second
-                case Unit.m3pm:     return 60 * v;              /// 1 m3/m
-                case Unit.cfs:      return 101.9406477312 * v;  /// 1 cubic foot per second
-
-                /// Mass: internal representation in kg
-                case Unit.g:        return 0.001 * v;           /// 1 g = 0.001 kg
-                case Unit.lb:       return 0.45359237 * v;      /// 1 lb = 0.45359237 kg
-                case Unit.t:        return 1000 * v;            /// 1 t = 1000 kg
-
-                /// Time or duration: internal representation in seconds [s] 
-                case Unit.ms:       return 0.001 * v;
-                case Unit.min:      return 60 * v;
-                case Unit.hour:     return 3600 * v;
-
-                /// Temperature: internal representation in °C
-                case Unit.F:        return 5 * (v - 32) / 9;    /// degree Fahrenheit
-                case Unit.K:        return v - 273.15;          /// degree Kelvin
-
-                /// Pressure: internal representation in  bar = 0.1 MPa
-                case Unit.Pa:       return 0.00001 * v;         /// 1 hPa = 100 Pa
-                case Unit.hPa:      return 0.001 * v;           /// 1 hPa = 100 Pa
-                case Unit.mbar:     return 0.001 * v;           /// 1 mbar = 1 hPa = 100 Pa
-                case Unit.kPa:      return 0.01 * v;            /// 1 kPa = 10 HPa
-                case Unit.inHg:     return 0.033864 * v;        /// 1 inHg = 33.864 hPa
-                case Unit.psi:      return 0.0689475729 * v;    /// 1 psi = 0.0689475729 bar
-                case Unit.MPa:      return 10 * v;              /// 1 MPa = 10000 hPa
-
-                /// Relative error: internal representation in %
-                case Unit.Promile:  return 0.1 * v;             /// 1 promile = 0.1 %
-
-                /// Diameter, length: internal representation in mm
-                case Unit.cm:       return 10 * v;              /// 1 cm = 10 mm
-                case Unit.inch:     return 25.4 * v;            /// 1 inch = 25.4 mm
-                case Unit.dm:       return 100 * v;             /// 1 dm = 100 mm
-                case Unit.foot:     return 304.8 * v;           /// 1 foot = 304.8 mm
-                case Unit.yard:     return 914.4 * v;           /// 1 yard = 914,4 mm
-                case Unit.m:        return 1000 * v;            /// 1 m = 1000 mm
-
-                /// Density: internal representation in kg/m3
-                case Unit.kgpl:     return 1000 * v;
-
-                /// Energy, internal representation in Joul
-                case Unit.kJ:       return 1000 * v;            /// 1 kJ = 1000 J
-                case Unit.MJ:       return 1000000 * v;         /// 1 kJ = 1000000 J
-                case Unit.Wh:       return 3600 * v;            /// 1 Wh = 3600 J
-                case Unit.kWh:      return 3600000 * v;         /// 1 kWh = 3600000 J
-                case Unit.MWh:      return 3600000000 * v;      /// 1 kWh = 3600000000 J
-
-                /// Electrical conductivity
-                case Unit.mSpm:     return 10 * v;
-
-                /// Invert
-                case Unit.kWhpp:
-                case Unit.lpp:
-                case Unit.dm3pp:
-                case Unit.lpdeg:
-                case Unit.dm3pdeg:  return (v <= float.Epsilon) ? 0 : 1/v;
-
-                default:            return v;                   /// Do not convert
-            }
-        }
-	}
 }

DataStreamInterface/IDataStreamMeter.cs

@@ -2,82 +2,58 @@
 /// Copyright (c) 2020 Sensus Slovensko a.s.
 ///
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace DataStreamInterface
 {
     public interface IDataStreamMeter
     {
-        /// <summary>
-        /// Returns count of water meters supported by the data stream component
-        /// </summary>
-        /// <returns>Water meters count</returns>
-        int GetMetersCount();
-
         /// <summary>
         /// Get state of the connected data stream meter
         /// </summary>
-        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
         /// <param name="state">Current state of the meter</param>
-        /// <param name="parameter">Current extra parameter of the meter</param>
         /// <returns>true when successful</returns>
-        bool GetState(int meterIx, out int state, out string parameter);
+        bool GetState(out int state, out string parameter);
 
         /// <summary>
         /// Set state of the connected data stream meter
         /// </summary>
-        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
         /// <param name="state">Required state of the meter</param>
-        /// <param name="parameter">Required extra parameter of the meter</param>
         /// <returns>true when successful</returns>
-        bool SetState(int meterIx, int state, string parameter);
-
-        bool SetStateAll(int state, string parameter);
+        bool SetState(int state, string parameter);
 
         /// <summary>
         /// Establish connection with a data stream meter
         /// </summary>
-        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
         /// <param name="connectionParameters">Connection parameters</param>
         /// <param name="meterId">Meter ID (e.g. serial number)</param>
         /// <returns>true when successful</returns>
-        bool OpenConnection(int meterIx, string connectionParameters, out string meterId);
+        bool OpenConnection(string connectionParameters, out string meterId);
+
+        /// <summary>
+        /// Closes connection with the data stream meter
+        /// </summary>
+        /// <returns>true when successful</returns>
+        bool CloseConnection();
 
         /// <summary>
         /// Stars saving measurement results into internal data structures of the component.
         /// Each data frame obtains a unique ID.
         /// The very first data fraim obrains ID = 0.
         /// </summary>
-        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
         /// <returns>true when successful</returns>
-        bool StartMeasurement(int meterIx);
-
-        bool StartMeasurementAll();
+        bool StartMeasurement();
 
         /// <summary>
         /// Stops saving measurement results into internal data structures of the component.
         /// Updates ID of the last date frame received from the meter.
         /// </summary>
-        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
-        /// <param name="storedFramesCount">Number of stored date frames</param>
+        /// <param name="lastFrameID">ID of the last date frame</param>
         /// <returns>true when successful</returns>
-        bool StopMeasurement(int meterIx, out Int64 storedFramesCount);
-
-        bool StopMeasurementAll(out Int64[] storedFramesCounts);
-
-        /// <summary>
-        /// Closes connection with the data stream meter
-        /// </summary>
-        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
-        /// <returns>true when successful</returns>
-        bool CloseConnection(int meterIx);
-
-        bool CloseConnectionAll();
-
-        /// <summary>
-        /// This function is called when TBF program is shutting down.
-        /// </summary>
-        /// <returns>true when successful</returns>
-        bool Shutdown();
+        bool StopMeasurement(out UInt64 lastFrameID);
 
         ///------------------------------------------------
         /// Units of time, volume and optional quantities
@@ -94,7 +70,7 @@ namespace DataStreamInterface
         Unit GetVolumeUnits();
 
         ///-----------------------------------------------
-        /// Optional quantities: count, units, captions
+        /// Ooptional quantities: count, units, captions
         ///-----------------------------------------------
 
         /// <summary>
@@ -107,13 +83,13 @@ namespace DataStreamInterface
         /// Returns units of the specified quantity
         /// </summary>
         /// <param name="quanityNr">Zero based quantity number 0 .. quantites count-1</param>
-        Unit GetQuantityUnits(int quantityNr);
+        Unit GetQuantityUnits(int quanityNr);
 
         /// <summary>
         /// Returns caption of the specified quantity
         /// </summary>
         /// <param name="quanityNr">Zero based quantity number 0 .. quantites count-1</param>
-        string GetQuantityCaption(int quantityNr);
+        string GetQuantityCaption(int quanityNr);
 
         ///---------------------------
         /// Datastream data exchange
@@ -122,19 +98,17 @@ namespace DataStreamInterface
         /// <summary>
         /// Retuns 'count' data frames starting with data frame with ID = 'id' 
         /// </summary>
-        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
         /// <param name="id">First frame ID</param>
         /// <param name="count">Frames count</param>
         /// <returns>Selected data frames</returns>
-        DataFrame[] GetFrames(int meterIx, Int64 id, int count);
+        DataFrame[] GetFrames(UInt64 id, int count);
 
         /// <summary>
         /// Returns ID of the data frame where time equals or exceeds the specified time.
         /// When time of the first frame (ID=0) is larger then specified time, function returns 0.
         /// </summary>
-        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
         /// <param name="time">Time</param>
         /// <returns>ID of the data frame at or after the pecified time</returns>
-        Int64 GetID(int meterIx, double time);
+        UInt64 GetID(double time);
     }
 }

DataStreamInterfaceTest/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs

@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.2", FrameworkDisplayName = ".NET Framework 4.7.2")]

DataStreamMeter/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs

@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.2", FrameworkDisplayName = ".NET Framework 4.7.2")]

DeviceTest/DeviceTest.csproj

@@ -16,7 +16,7 @@
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -27,7 +27,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
@@ -40,8 +40,9 @@
     <StartupObject>DeviceTest.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=1.2.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -89,18 +90,10 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Common\Common.csproj">
-      <Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
-      <Name>Common</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Config\Config.csproj">
       <Project>{743DF7DB-C7B6-42EB-986D-0F485E5588E4}</Project>
       <Name>Config</Name>
     </ProjectReference>
-    <ProjectReference Include="..\SchematicDrawing\SchematicDrawing.csproj">
-      <Project>{0f79ca69-9dbc-41f3-a6fc-5a2937365343}</Project>
-      <Name>SchematicDrawing</Name>
-    </ProjectReference>
     <ProjectReference Include="..\TBF\TBF.csproj">
       <Project>{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}</Project>
       <Name>TBF</Name>

DeviceTest/DeviceTestDlg.cs

@@ -5,11 +5,9 @@ using System.IO;
 using System.Text;
 using System.Threading;
 using System.Windows.Forms;
+using TBF.BenchControl;
+using TBF.BenchControl.Generic;
 using System.Xml.Serialization;
-using Common;
-using TBF.Rig;
-using TBF.Rig.Generic;
-using TBF.UI.Bench.Components;
 
 
 namespace DeviceTest
@@ -81,7 +79,7 @@ namespace DeviceTest
                 compClasses.Add(componentFactory.ClassName);
             }
 
-			tbfComponents = new List<TBF.Rig.Generic.IComponent>();
+			tbfComponents = new List<TBF.BenchControl.Generic.IComponent>();
 			tbfDevices = new List<IDevice>();
 		}
 
@@ -110,8 +108,8 @@ namespace DeviceTest
 						config.Name = Program.LocalSettings.ParentName;
 						config.ParentName = string.Empty;
 						config.ItemNr = 0;
-						config.DebugLevel = DebugMode.Normal;
-						config.LogLevel = LogLevel.Debug;
+						config.DebugLevel = Config.Entities.DebugMode.Normal;
+						config.LogLevel = Config.Entities.LogLevel.Debug;
 						config.Corrections = null;
 						config.Factory = parentFactory;
 						parentCfg = config;
@@ -143,8 +141,8 @@ namespace DeviceTest
 						config.Name = Program.LocalSettings.ComponentName;
 						config.ParentName = string.IsNullOrEmpty(Program.LocalSettings.ComponentParentName) ? string.Empty : Program.LocalSettings.ComponentParentName;
 						config.ItemNr = 1;
-						config.DebugLevel = DebugMode.Normal;
-						config.LogLevel = LogLevel.Debug;
+						config.DebugLevel = Config.Entities.DebugMode.Normal;
+						config.LogLevel = Config.Entities.LogLevel.Debug;
 						config.Corrections = null;
 						config.Factory = component1Factory;
 						component1Cfg = config;
@@ -178,8 +176,8 @@ namespace DeviceTest
 						config.Name = Program.LocalSettings.Component2Name;
 						config.ParentName = string.IsNullOrEmpty(Program.LocalSettings.Component2ParentName) ? string.Empty : Program.LocalSettings.Component2ParentName;
 						config.ItemNr = 2;
-						config.DebugLevel = DebugMode.Normal;
-						config.LogLevel = LogLevel.Debug;
+						config.DebugLevel = Config.Entities.DebugMode.Normal;
+						config.LogLevel = Config.Entities.LogLevel.Debug;
 						config.Corrections = null;
 						config.Factory = component2Factory;
 						component2Cfg = config;
@@ -213,8 +211,8 @@ namespace DeviceTest
 						config.Name = Program.LocalSettings.Component3Name;
 						config.ParentName = string.IsNullOrEmpty(Program.LocalSettings.Component3ParentName) ? string.Empty : Program.LocalSettings.Component3ParentName;
 						config.ItemNr = 3;
-						config.DebugLevel = DebugMode.Normal;
-						config.LogLevel = LogLevel.Debug;
+						config.DebugLevel = Config.Entities.DebugMode.Normal;
+						config.LogLevel = Config.Entities.LogLevel.Debug;
 						config.Corrections = null;
 						config.Factory = component3Factory;
 						component3Cfg = config;
@@ -423,13 +421,13 @@ namespace DeviceTest
 			{
 				parentCfg = parentFactory.DefaultConfig();
 			}
-            ComponentParametersDlg cfgForm = new ComponentParametersDlg(this);
-            cfgForm.CmpntEntities = new List<Config.Entities.Component>();
-
-            IComponentCfgCtrl cfgControl = parentCfg.GetControl(cfgForm.CmpntEntities);
+			IComponentCfgCtrl cfgControl = parentCfg.GetControl();
 			cfgControl.Config = parentCfg;
 			cfgControl.Config.ItemNr = 0;
 
+			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+			cfgForm.TbfComponents = new List<Config.Entities.Component>();
+
 			cfgForm.ComponentCfgCtrl = cfgControl;
 			cfgForm.UnlockAfterStart = true;
 			DialogResult dr = cfgForm.ShowDialog();
@@ -452,17 +450,17 @@ namespace DeviceTest
 			{
 				component1Cfg = component1Factory.DefaultConfig();
 			}
-			ComponentParametersDlg cfgForm = new ComponentParametersDlg(this);
+			IComponentCfgCtrl cfgControl = component1Cfg.GetControl();
+			cfgControl.Config = component1Cfg;
+			cfgControl.Config.ItemNr = 1;
+
+			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
 			///
-			var compEntities = new List<Config.Entities.Component>();
+			IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
-			cfgForm.CmpntEntities = compEntities;
+			cfgForm.TbfComponents = compEntities;
 
-            IComponentCfgCtrl cfgControl = component1Cfg.GetControl(compEntities);
-            cfgControl.Config = component1Cfg;
-            cfgControl.Config.ItemNr = 1;
-
-            cfgForm.ComponentCfgCtrl = cfgControl;
+			cfgForm.ComponentCfgCtrl = cfgControl;
 			cfgForm.UnlockAfterStart = true;
 			DialogResult dr = cfgForm.ShowDialog();
 			if (dr != DialogResult.OK) return;
@@ -486,18 +484,18 @@ namespace DeviceTest
 			{
 				component2Cfg = component2Factory.DefaultConfig();
 			}
-			ComponentParametersDlg cfgForm = new ComponentParametersDlg(this);
+			IComponentCfgCtrl cfgControl = component2Cfg.GetControl();
+			cfgControl.Config = component2Cfg;
+			cfgControl.Config.ItemNr = 1;
+
+			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
 			///
-			var compEntities = new List<Config.Entities.Component>();
+			IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
 			if (component1Factory != null && component1Cfg != null) compEntities.Add(component1Cfg.CreateDbEntity());
-			cfgForm.CmpntEntities = compEntities;
+			cfgForm.TbfComponents = compEntities;
 
-            IComponentCfgCtrl cfgControl = component2Cfg.GetControl(compEntities);
-            cfgControl.Config = component2Cfg;
-            cfgControl.Config.ItemNr = 1;
-
-            cfgForm.ComponentCfgCtrl = cfgControl;
+			cfgForm.ComponentCfgCtrl = cfgControl;
 			cfgForm.UnlockAfterStart = true;
 			DialogResult dr = cfgForm.ShowDialog();
 			if (dr != DialogResult.OK) return;
@@ -521,19 +519,19 @@ namespace DeviceTest
 			{
 				component3Cfg = component3Factory.DefaultConfig();
 			}
-			ComponentParametersDlg cfgForm = new ComponentParametersDlg(this);
+			IComponentCfgCtrl cfgControl = component3Cfg.GetControl();
+			cfgControl.Config = component3Cfg;
+			cfgControl.Config.ItemNr = 1;
+
+			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
 			///
-			var compEntities = new List<Config.Entities.Component>();
+			IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
 			if (component1Factory != null && component1Cfg != null) compEntities.Add(component1Cfg.CreateDbEntity());
 			if (component2Factory != null && component2Cfg != null) compEntities.Add(component2Cfg.CreateDbEntity());
-			cfgForm.CmpntEntities = compEntities;
+			cfgForm.TbfComponents = compEntities;
 
-            IComponentCfgCtrl cfgControl = component3Cfg.GetControl(compEntities);
-            cfgControl.Config = component3Cfg;
-            cfgControl.Config.ItemNr = 1;
-
-            cfgForm.ComponentCfgCtrl = cfgControl;
+			cfgForm.ComponentCfgCtrl = cfgControl;
 			cfgForm.UnlockAfterStart = true;
 			DialogResult dr = cfgForm.ShowDialog();
 			if (dr != DialogResult.OK) return;
@@ -570,7 +568,7 @@ namespace DeviceTest
 			{
 				if (parentFactory != null && parentCfg != null)
 				{
-					TBF.Rig.Generic.IComponent component = parentFactory.GetComponent(parentCfg, tbfComponents);
+					TBF.BenchControl.Generic.IComponent component = parentFactory.GetComponent(parentCfg, tbfComponents);
 					tbfComponents.Add(component);
 					IDevice dev = component as IDevice;
 					if (dev != null)
@@ -582,7 +580,7 @@ namespace DeviceTest
 				}
 				if (component1Factory != null && component1Cfg != null)
 				{
-					TBF.Rig.Generic.IComponent component = component1Factory.GetComponent(component1Cfg, tbfComponents);
+					TBF.BenchControl.Generic.IComponent component = component1Factory.GetComponent(component1Cfg, tbfComponents);
 					tbfComponents.Add(component);
 					tbfComponent1forOp = component;
 					IDevice dev = component as IDevice;
@@ -595,7 +593,7 @@ namespace DeviceTest
 				}
 				if (component2Factory != null && component2Cfg != null)
 				{
-					TBF.Rig.Generic.IComponent component2 = component2Factory.GetComponent(component2Cfg, tbfComponents);
+					TBF.BenchControl.Generic.IComponent component2 = component2Factory.GetComponent(component2Cfg, tbfComponents);
 					tbfComponents.Add(component2);
 					tbfComponent2forOp = component2;
 					IDevice dev = component2 as IDevice;
@@ -608,7 +606,7 @@ namespace DeviceTest
 				}
 				if (component3Factory != null && component3Cfg != null)
 				{
-					TBF.Rig.Generic.IComponent component3 = component3Factory.GetComponent(component3Cfg, tbfComponents);
+					TBF.BenchControl.Generic.IComponent component3 = component3Factory.GetComponent(component3Cfg, tbfComponents);
 					tbfComponents.Add(component3);
 					tbfComponent3forOp = component3;
 					IDevice dev = component3 as IDevice;
@@ -647,7 +645,6 @@ namespace DeviceTest
 								MessageBoxIcon.Exclamation);
 
 				foreach (var dev in tbfDevices) dev.StopDevice();
-                foreach (var dev in tbfDevices) dev.StopDevice2();
 				tbfDevices.Clear();
 
 				startButton.Enabled = true;
@@ -665,135 +662,120 @@ namespace DeviceTest
 			int previousOperation = 0;
 
 
-            if (tbfComponent1forOp is TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter)
+			if (tbfComponent1forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
 			{
-                operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref dblBox1);
+				operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
 			}
-			else if (tbfComponent1forOp is TBF.Rig.Network.Camera.CLP1611.Camera)
+			else if (tbfComponent1forOp is TBF.BenchControl.Network.Camera.CLP1611.Camera)
 			{
-				operation1 = (tbfComponent1forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
-				operation2 = (tbfComponent1forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
+				operation1 = (tbfComponent1forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
+				operation2 = (tbfComponent1forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
 			}
-			else if (tbfComponent1forOp is TBF.Rig.Network.Camera.Roi.Roi)
+			else if (tbfComponent1forOp is TBF.BenchControl.Network.Camera.Roi.Roi)
 			{
-				operation1 = (tbfComponent1forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
+				operation1 = (tbfComponent1forOp as TBF.BenchControl.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent1forOp is TBF.Rig.Modbus.TempControl.Easytherm.TControl)
+			else if (tbfComponent1forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
 			{
-				operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.TempControl.Easytherm.TControl).SetTemperatureSetpointOp(10);
-                operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.TempControl.Easytherm.TControl).SetTemperatureSetpointOp(20);
+				operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation2 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
-            else if (tbfComponent1forOp is TBF.Rig.Modbus.TempControl.Novus.TControl)
+            else if (tbfComponent1forOp is TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
-                operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.TempControl.Novus.TControl).SetTemperatureSetpointOp(10);
-                operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.TempControl.Novus.TControl).SetTemperatureSetpointOp(20);
+                operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
+                operation2 = (tbfComponent1forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
             }
-            else if (tbfComponent1forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
-            {
-                operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
-                operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
-            }
-            else if (tbfComponent1forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent1forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
 			{
-				//operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(1);
-				//operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(2);
-				//operation3 = (tbfComponent1forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(3);
-				//operation4 = (tbfComponent1forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(0);
+				//operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(1);
+				//operation2 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(2);
+				//operation3 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(3);
+				//operation4 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(0);
 			}
-            else if (tbfComponent3forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
             {
-                operation1 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
-                operation2 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
-                operation3 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
-                operation4 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
+                operation1 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
+                operation2 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
+                operation3 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
+                operation4 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
             }
 
 
-            if (tbfComponent2forOp is TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter)
+			if (tbfComponent2forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
 			{
-                operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref dblBox2);
+				operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
 			}
-			else if (tbfComponent2forOp is TBF.Rig.Network.Camera.CLP1611.Camera)
+			else if (tbfComponent2forOp is TBF.BenchControl.Network.Camera.CLP1611.Camera)
 			{
-				operation21 = (tbfComponent2forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
-				operation22 = (tbfComponent2forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
+				operation21 = (tbfComponent2forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
+				operation22 = (tbfComponent2forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
 			}
-			else if (tbfComponent2forOp is TBF.Rig.Network.Camera.Roi.Roi)
+			else if (tbfComponent2forOp is TBF.BenchControl.Network.Camera.Roi.Roi)
 			{
-				operation21 = (tbfComponent2forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
+				operation21 = (tbfComponent2forOp as TBF.BenchControl.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-            else if (tbfComponent2forOp is TBF.Rig.Modbus.TempControl.Easytherm.TControl)
+			else if (tbfComponent2forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
 			{
-                operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.TempControl.Easytherm.TControl).SetTemperatureSetpointOp(10);
-                operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.TempControl.Easytherm.TControl).SetTemperatureSetpointOp(20);
+				operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation22 = (tbfComponent2forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
-            else if (tbfComponent2forOp is TBF.Rig.Modbus.TempControl.Novus.TControl)
+            else if (tbfComponent2forOp is TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
-                operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.TempControl.Novus.TControl).SetTemperatureSetpointOp(10);
-                operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.TempControl.Novus.TControl).SetTemperatureSetpointOp(20);
+                operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
+                operation22 = (tbfComponent2forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
             }
-            else if (tbfComponent2forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
-            {
-                operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
-                operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
-            }
-            else if (tbfComponent2forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent2forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
 			{
-				//operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(1);
-                //operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(2);
-                //operation23 = (tbfComponent2forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(3);
-                //operation24 = (tbfComponent2forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(0);
+				//operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(1);
+                //operation22 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(2);
+                //operation23 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(3);
+                //operation24 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(0);
 			}
-            else if (tbfComponent3forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
             {
-                operation21 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
-                operation22 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
-                operation23 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
-                operation24 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
+                operation21 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
+                operation22 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
+                operation23 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
+                operation24 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
             }
 
 
-            if (tbfComponent3forOp is TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter)
+			if (tbfComponent3forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
 			{
-                operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref dblBox3);
+				operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
 			}
-			else if (tbfComponent3forOp is TBF.Rig.Network.Camera.CLP1611.Camera)
+			else if (tbfComponent3forOp is TBF.BenchControl.Network.Camera.CLP1611.Camera)
 			{
-				operation31 = (tbfComponent3forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
-				operation33 = (tbfComponent3forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
+				operation31 = (tbfComponent3forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
+				operation33 = (tbfComponent3forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
 			}
-			else if (tbfComponent3forOp is TBF.Rig.Network.Camera.Roi.Roi)
+			else if (tbfComponent3forOp is TBF.BenchControl.Network.Camera.Roi.Roi)
 			{
-				operation31 = (tbfComponent3forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
+				operation31 = (tbfComponent3forOp as TBF.BenchControl.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-            else if (tbfComponent3forOp is TBF.Rig.Modbus.TempControl.Easytherm.TControl)
+			else if (tbfComponent3forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
+			{
+				operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+			}
+            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
-                operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.TempControl.Easytherm.TControl).SetTemperatureSetpointOp(10);
-                operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.TempControl.Easytherm.TControl).SetTemperatureSetpointOp(20);
+                operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
+                operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
             }
-            else if (tbfComponent3forOp is TBF.Rig.Modbus.TempControl.Novus.TControl)
-            {
-                operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.TempControl.Novus.TControl).SetTemperatureSetpointOp(10);
-                operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.TempControl.Novus.TControl).SetTemperatureSetpointOp(20);
-            }
-            else if (tbfComponent3forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
-            {
-                operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
-                operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
-            }
-            else if (tbfComponent3forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
 			{
-				//operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(1);
-				//operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(2);
-				//operation33 = (tbfComponent3forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(3);
-				//operation34 = (tbfComponent3forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(0);
+				//operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(1);
+				//operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(2);
+				//operation33 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(3);
+				//operation34 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(0);
 			}
-            else if (tbfComponent3forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
             {
-                operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
-                operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
-                operation33 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
-                operation34 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
+                operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
+                operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
+                operation33 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
+                operation34 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
             }
 
 
@@ -874,7 +856,6 @@ namespace DeviceTest
 			}
 
 			foreach (var d in tbfDevices) d.StopDevice();
-            foreach (var d in tbfDevices) d.StopDevice2();
 		}
 
 		private void stopButton_Click(object sender, EventArgs e)
@@ -899,8 +880,6 @@ namespace DeviceTest
 		{
 			Cursor = Cursors.WaitCursor;
 
-            CurrentUser.Restore(this);
-
 			if (workerThread != null)
 			{
 				workerThreadRunning = false;

DeviceTest/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="log4net" version="2.0.15" targetFramework="net472" />
-</packages>

Dirichlet.Numerics/UInt128.cs

@@ -183,7 +183,7 @@ namespace Dirichlet.Numerics
 
         public override string ToString()
         {
-            return ((BigInteger)this).ToString("x");
+            return ((BigInteger)this).ToString();
         }
 
         public string ToString(string format)

EventViewer/EventViewer.csproj

@@ -13,7 +13,7 @@
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -21,7 +21,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -128,9 +127,13 @@
       <Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
       <Name>Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\SharedDatabase\SharedDatabase.csproj">
-      <Project>{211b5e3f-9996-48a7-abde-c878dd2d71c2}</Project>
-      <Name>SharedDatabase</Name>
+    <ProjectReference Include="..\Events\Events.csproj">
+      <Project>{5d9b49e3-cdf9-4a27-80b4-58141d0eb0e0}</Project>
+      <Name>Events</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Users\Users.csproj">
+      <Project>{6e5cb0e9-e1b6-4e5d-ac6e-b1049e180f2b}</Project>
+      <Name>Users</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup />

EventViewer/EventViewerWnd.Designer.cs

@@ -35,7 +35,7 @@
             this.unreadEventsRadioButton = new System.Windows.Forms.RadioButton();
             this.allEventsRadioButton = new System.Windows.Forms.RadioButton();
             this.settingsButton = new System.Windows.Forms.Button();
-            this.eventsListView = new Common.Forms.ListViewEx();
+            this.eventsListView = new Common.UIControls.ListViewEx();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
             this.splitContainer1.Panel2.SuspendLayout();
@@ -175,7 +175,7 @@
 
         private System.Windows.Forms.SplitContainer splitContainer1;
         private System.Windows.Forms.Button settingsButton;
-        private Common.Forms.ListViewEx eventsListView;
+        private Common.UIControls.ListViewEx eventsListView;
         private System.Windows.Forms.GroupBox eventsSelectionGroupBox;
         private System.Windows.Forms.RadioButton unreadEventsRadioButton;
         private System.Windows.Forms.RadioButton allEventsRadioButton;

EventViewer/EventViewerWnd.cs

@@ -3,14 +3,13 @@
 ///
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Windows.Forms;
 using NHibernate;
-using Common;
-using Common.Forms;
-using SharedDatabase;
-using SharedDatabase.Entities;
+using Common.UIControls;
+using Events;
+using Events.Entities;
 using EventViewer.Resources;
+using System.Drawing;
 
 namespace EventViewer
 {
@@ -33,7 +32,7 @@ namespace EventViewer
         ISession session;
         IList<Subscriber> subscribers;
         IList<Event> events;
-        MySortOrder sortOrder = MySortOrder.Ascending;
+        SortOrder sortOrder = SortOrder.Ascending;
         int sortColumn = -1;                        /// 0-based index of column to be used for sorting
 
         EViewerOption eViewerOption;
@@ -102,9 +101,9 @@ namespace EventViewer
         {
             try
             {
-                EventsDB.DbType = DBType.MySql;
-                EventsDB.ConnectionString = Program.LocalSettings.ConnectionString;
-                session = EventsDB.CreateSession();
+                DB.DbType = DBType.MySql;
+                DB.ConnectionString = Program.LocalSettings.ConnectionString;
+                session = DB.CreateSession();
                 subscribers = session.QueryOver<Subscriber>().List();
                 unreadEventsRadioButton.Checked = true;
             }
@@ -211,8 +210,8 @@ namespace EventViewer
             {
                 lvi.UseItemStyleForSubItems = false;
                 lvi.SubItems.Add(evnt.Severity.ToString());
-                lvi.SubItems[lvi.SubItems.Count - 1].BackColor = SharedDatabase.Utils.GetSeverityColor(evnt.Severity);
-                lvi.SubItems[lvi.SubItems.Count - 1].ForeColor = SharedDatabase.Utils.GetSeverityColor(evnt.Severity, true);
+                lvi.SubItems[lvi.SubItems.Count - 1].BackColor = Utils.GetSeverityColor(evnt.Severity);
+                lvi.SubItems[lvi.SubItems.Count - 1].ForeColor = Utils.GetSeverityColor(evnt.Severity, true);
             }
             lvi.SubItems.Add(evnt.Message);
             eventsListView.Items.Add(lvi);
@@ -222,13 +221,13 @@ namespace EventViewer
         {
             if (e.Column == sortColumn)
             {
-                sortOrder = (sortOrder == MySortOrder.Ascending) ? MySortOrder.Descending : MySortOrder.Ascending;
+                sortOrder = (sortOrder == SortOrder.Ascending) ? SortOrder.Descending : SortOrder.Ascending;
             }
             else
             {
                 /// Clicked on another column header => set sortOrder to SortOrder.Ascending
                 sortColumn = e.Column;
-                sortOrder = MySortOrder.Ascending;
+                sortOrder = SortOrder.Ascending;
             }
 
             switch ((Column)sortColumn)
@@ -253,7 +252,7 @@ namespace EventViewer
         private void eventsListView_MouseDoubleClick(object sender, MouseEventArgs e)
         {
             if (eventsListView.SelectedIndices.Count != 1) return;
-            Event evnt = eventsListView.SelectedItems[0].Tag as Event;
+            Event evnt = eventsListView.SelectedItems[0].Tag as Events.Entities.Event;
             if (evnt == null) return;
             bool enableConfirmReadButton = (session != null) && (eViewerOption == EViewerOption.UnreadEvents) && !string.IsNullOrEmpty(currentUser);
 
@@ -276,8 +275,8 @@ namespace EventViewer
 
         private void settingsButton_Click(object sender, EventArgs e)
         {
-            //Common.GID[] groupsWithAccess = new Common.GID[] { Common.GID.Administrators };
-            SharedDatabase.Forms.LoginDlg dlg = new SharedDatabase.Forms.LoginDlg(true);
+            //Users.Entities.GID[] groupsWithAccess = new Users.Entities.GID[] { Users.Entities.GID.Administrators };
+            Users.Forms.LoginDlg dlg = new Users.Forms.LoginDlg(true);
             if (dlg.ShowDialog() == DialogResult.OK)
             {
                 if ((new Forms.SettingsDlg()).ShowDialog() == DialogResult.OK)
@@ -291,8 +290,8 @@ namespace EventViewer
         {
             try
             {
-                CurrentUser.RemoteUsersDB = new DBSettings(DBType.MySql, Program.LocalSettings.UsersDBConnString);
-                SharedDatabase.Forms.LoginDlg dlg = new SharedDatabase.Forms.LoginDlg();
+                Users.GlobalData.RemoteUsersDB = new Users.DBSettings(Users.Entities.DBType.MySql, Program.LocalSettings.UsersDBConnString);
+                Users.Forms.LoginDlg dlg = new Users.Forms.LoginDlg();
                 if (dlg.ShowDialog() == DialogResult.OK)
                 {
                     loginUserName = dlg.UserName;

EventViewer/Forms/EventDetailsDlg.cs

@@ -3,14 +3,13 @@
 ///
 using System;
 using System.Windows.Forms;
-using SharedDatabase.Entities;
 using EventViewer.Resources;
 
 namespace EventViewer.Forms
 {
     public partial class EventDetailsDlg : Form
     {
-        Event evnt;
+        Events.Entities.Event evnt;
 
         public EventDetailsDlg()
         {
@@ -18,7 +17,7 @@ namespace EventViewer.Forms
             Localize();
         }
 
-        public EventDetailsDlg(Event evnt, bool enableConfirmReadButton)
+        public EventDetailsDlg(Events.Entities.Event evnt, bool enableConfirmReadButton)
             : this()
         {
             this.evnt = evnt;

EventViewer/LocalSettings.cs

@@ -59,8 +59,8 @@ namespace EventViewer
             ConnectionString = "SERVER=localhost; DATABASE=test-e; UID=root; PASSWORD=kraken; CHARSET=utf8";
             UsersDBConnString = "SERVER=localhost; DATABASE=test; UID=root; PASSWORD=kraken; CHARSET=utf8;";
 #else
-            ConnectionString = "SERVER=10.42.128.24; DATABASE=st_wr_shared_events; UID=v9305784; PASSWORD=p89344390; CHARSET=utf8";
-            UsersDBConnString = "SERVER=10.42.128.24; DATABASE=st_wr_shared_config; UID=u9305784; PASSWORD=p89344390; CHARSET=utf8;";
+            ConnectionString = "SERVER=10.42.128.16; DATABASE=st_wr_shared_events; UID=v9305784; PASSWORD=p89344390; CHARSET=utf8";
+            UsersDBConnString = "SERVER=10.42.128.16; DATABASE=st_wr_shared_config; UID=u9305784; PASSWORD=p89344390; CHARSET=utf8;";
 #endif
             RecentTimeDays = 7;
             Language = "sk";
@@ -147,7 +147,7 @@ namespace EventViewer
                     }
                 }
             }
-            catch (Exception)
+            catch (Exception e)
             {
                 //log.ErrorFormat("Failed to load from '{0}': {1}", fileName, e.Message);
                 return null;
@@ -203,7 +203,7 @@ namespace EventViewer
                 }
 #endif
             }
-            catch (Exception)
+            catch (Exception e)
             {
                 //log.ErrorFormat("Failed to save to '{0}': {1}", Program.LocalSettingsFileName, e.Message);
             }

EventViewer/Program.cs

@@ -122,7 +122,7 @@ namespace EventViewer
                 /// Open the main application window
                 Application.Run(new EventViewerWnd());
             }
-            catch (Exception)
+            catch (Exception e)
             {
                 //LogException(log, "Exception in Application.Run(new ResultsBrowserWnd(args))", e);
             }

Events/DB.cs

@@ -0,0 +1,219 @@
+///
+/// Copyright (c) 2020 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using FluentNHibernate.Cfg;
+using FluentNHibernate.Cfg.Db;
+using NHibernate;
+using NHibernate.Cfg;
+using NHibernate.Tool.hbm2ddl;
+using Events.Entities;
+
+namespace Events
+{
+    public static class DB
+    {
+		/// <summary> Session factory for all regular sessions, not for CreateEmptyResultsDB(). </summary>
+		public static ISessionFactory SessionFactory;
+
+		/// <summary> Connection string for all sessions </summary>
+		static string connectionString;
+		/// 
+		public static string ConnectionString
+		{
+			get { return connectionString; }
+            set
+            {
+                if (value != connectionString)
+                {
+                    connectionString = value;
+                    SessionFactory = null;          /// Clear SessionFactory on connection string change
+                }
+            }
+		}
+
+		/// <summary> Database type (MySQL or SQLite) for all sessions </summary>
+		private static Entities.DBType dbType;
+		/// 
+		public static Entities.DBType DbType
+		{
+			get { return dbType; }
+			set { dbType = value; SessionFactory = null; }
+		}
+
+        /// <summary>
+        /// NHibernate session factory (to create the database session 'SessionFactory')
+        /// </summary>
+        /// <returns>A database session</returns>
+		static ISessionFactory CreateSessionFactory()
+        {
+			return CreateSessionFactory(false);
+		}
+
+        /// <summary>
+        /// NHibernate session factory (to create the database session 'SessionFactory')
+        /// </summary>
+		/// <param name="createDB">true = Create a new DB, false = Regular DB</param>
+        /// <returns>A database session</returns>
+		public static ISessionFactory CreateSessionFactory(bool createDB)
+        {
+            FluentConfiguration cfg = Fluently.Configure();
+
+			switch (dbType)
+			{
+				default:
+				case Entities.DBType.SQLite:
+					cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
+                    break;
+				case Entities.DBType.MySql:
+                    cfg = cfg.Database(MySQLConfiguration.Standard.ConnectionString(connectionString));
+                    break;
+			}
+
+            cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<Entities.Event>());
+
+            if (createDB)
+            {
+                return cfg.ExposeConfiguration(BuildSchemaCreate).BuildSessionFactory();
+            }
+            else
+            {
+                return cfg.ExposeConfiguration(BuildSchema).BuildSessionFactory();
+            }
+        }
+
+        static void BuildSchema(Configuration config)
+        {
+            /// This NHibernate tool takes a configuration with mapping info and exports a database schema
+            new SchemaExport(config).SetOutputFile("db_schema");
+        }
+
+        static void BuildSchemaCreate(Configuration config)
+        {
+			/// This NHibernate tool takes a configuration with mapping info and exports a database schema
+			new SchemaExport(config).Create(true, true);
+        }
+
+		/// Create a NHibernate session for the given database
+		public static ISession CreateSession()
+		{
+			if (string.IsNullOrEmpty(connectionString))
+			{
+				throw new Exception("Connection string was not specified");
+			}
+
+			if (SessionFactory == null) SessionFactory = CreateSessionFactory();
+
+			return SessionFactory.OpenSession();
+		}
+
+
+		public static void SaveObject(object obj)
+		{
+			SaveObject(CreateSession(), obj);
+		}
+		/// 
+		public static void SaveObject(ISession session, object obj)
+		{
+            using (var transaction = session.BeginTransaction())
+            {
+                session.SaveOrUpdate(obj);
+                try { transaction.Commit(); }
+                catch { }
+            }
+        }
+
+
+		public static void DeleteObject(object obj)
+		{
+			DeleteObject(CreateSession(), obj);
+		}
+		/// 
+		public static void DeleteObject(ISession session, object obj)
+        {
+            using (var transaction = session.BeginTransaction())
+            {
+                session.Delete(obj);
+                transaction.Commit();
+            }
+        }
+
+
+        /// <summary>
+        /// Create an empty users database.
+		/// Database contains only the user 'admin' and the control board component 'CB'.
+        /// </summary>
+        /// <param name="dbType">DBType.SQLite or DBType.MySql</param>
+        /// <param name="connectionString">Connection string</param>
+        /// <returns>true=success, false=error</returns>
+		public static bool CreateEmptyDB()
+        {
+			ISessionFactory sessionFactory = CreateSessionFactory(true);
+            if (sessionFactory == null) return false;
+
+            /// Populate the database
+            using (var session = sessionFactory.OpenSession())
+            {
+                using (var transaction = session.BeginTransaction())
+                {
+                    transaction.Commit();
+                }
+            }
+
+            return true;
+        }
+
+		/// <summary>
+		/// Shared data (initially empty)
+		/// </summary>
+        public static string BenchName = "undefined";
+        public static IList<Entities.Event> RecentEvents = null;
+        static IList<Entities.Subscriber> allSubscribers = null;
+
+        /// <summary>
+        /// Set test bench name used in Events.Entities.Event constructors
+        /// </summary>
+        public static void SetBenchName(string benchName)
+        {
+            DB.BenchName = benchName;
+        }
+
+		/// <summary>
+		/// Loads shared data from the database
+		/// </summary>
+        public static void LoadSubscribers(ISession session)
+        {
+            allSubscribers = session.QueryOver<Subscriber>().List();
+        }
+
+        /// <summary>
+        /// Loads shared data from the database
+        /// </summary>
+        public static void LoadRecentEvents(ISession session, string benchName, int days)
+        {
+            RecentEvents = session.QueryOver<Event>()
+                                  .Where(e => (e.Bench == benchName))
+                                  .And(e => (e.TimeStamp >= DateTime.Now - new TimeSpan(days, 0, 0, 0)))
+                                  .List();
+        }
+
+        public static void SaveEvent(ISession session, Event evnt, SubscriberGroup groups)
+        {
+            if (allSubscribers == null) return;
+            IList<Subscriber> thisEventSubscribers = new List<Subscriber>();
+            foreach (var s in allSubscribers)
+            {
+                if ((s.Groups & (long)groups) != 0)
+                {
+                    /// Subscriber 's' belongs to at least one of SubscriberGroup(s) in 'groups' bit field
+                    thisEventSubscribers.Add(s);
+                }
+            }
+            evnt.Bench = BenchName;
+            evnt.Subscribers = thisEventSubscribers;
+            session.SaveOrUpdate(evnt);
+            session.Flush();
+        }
+    }
+}