Reconfigured for Nanjing: ORACLE_DB, MANAGED, TURA_IPERL defined

.gitignore

@@ -16,20 +16,30 @@ EventViewer/bin/
 EventViewer/obj/
 Events/bin/
 Events/obj/
+FeatureVectorCalculator/bin/
+FeatureVectorCalculator/obj/
 GemCard/bin
 GemCard/obj
 GenCode128/bin
 GenCode128/obj
 GraphLib/bin
 GraphLib/obj
+MergeResultsDBs/bin
+MergeResultsDBs/obj
 TracingDB/bin
 TracingDB/obj
+ResetBatchNr/bin
+ResetBatchNr/obj
 RestClient/bin
 RestClient/obj
 Results/bin/
 Results/obj/
 ResultsBrowser/bin/
 ResultsBrowser/obj/
+SharedDatabase/bin
+SharedDatabase/obj
+SchematicDrawing/bin
+SchematicDrawing/obj
 Statistics/bin/
 Statistics/obj/
 TBF/bin/

Common/BackgroundBeep.cs

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

@@ -30,6 +30,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="log4net">
+      <HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -41,7 +44,34 @@
     <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\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="GlobalData.cs" />
+    <Compile Include="IMeasurementCorrection.cs" />
+    <Compile Include="IParamsProvider.cs" />
+    <Compile Include="Iperl\OptoTelegramRaw.cs" />
+    <Compile Include="IUncertainty.cs" />
+    <Compile Include="IUser.cs" />
+    <Compile Include="ProcedureInfo.cs" />
     <Compile Include="SerializableDictionary.cs" />
+    <Compile Include="Telegram.cs" />
     <Compile Include="UIControls\CoolButtonCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -50,6 +80,7 @@
     </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">
@@ -60,6 +91,14 @@
     <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/DBSettings.cs

@@ -0,0 +1,31 @@
+///
+/// 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 Common.DBType DbType;
+		public string ConnectionString;
+
+		public DBSettings()
+		{
+		}
+
+		public DBSettings(Common.DBType dbType, string connectionString)
+		{
+			this.DbType = dbType;
+			this.ConnectionString = connectionString;
+		}
+
+		public object Clone()
+		{
+			return new DBSettings(DbType, ConnectionString);
+		}
+	}
+}

Common/DatabaseSettings.cs

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

@@ -0,0 +1,795 @@
+///
+/// Copyright (c) 2013-2021 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")]          OrderNrFromOracleDB,
+        [Description("Orders from Tracing DB")]         OrderNrFromTracingDB,
+#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 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("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 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,5 +1,5 @@
 ///
-/// Copyright (c) 2016 Sensus Metering Systems
+/// Copyright (c) 2016-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections;
@@ -9,7 +9,7 @@ using System.Data;
 using System.Windows.Forms;
 using System.Runtime.InteropServices;
 
-namespace TracingDB.Forms
+namespace Common.Forms
 {
 	/// <summary>
 	/// Event Handler for SubItem events

Common/Forms/ListViewExtensions.cs

@@ -0,0 +1,104 @@
+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, 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/Forms/LviIntColumnComparer.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections;
+using System.Windows.Forms;
+using Common;
+
+namespace Common.Forms
+{
+    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/LviNameSurnameColumnComparer.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections;
+using System.Windows.Forms;
+using Common;
+
+namespace Common.Forms
+{
+    class LviNameSurnameColumnComparer : IComparer
+    {
+        private int column;
+        MySortOrder order;
+
+        public LviNameSurnameColumnComparer()
+        {
+            column = 0;
+            order = MySortOrder.Ascending;
+        }
+
+        public LviNameSurnameColumnComparer(int column, MySortOrder order)
+        {
+            this.column = column;
+            this.order = order;
+        }
+
+        public int Compare(object x, object y)
+        {
+            string nameX = ((ListViewItem)x).SubItems[column].Text;
+            string nameY = ((ListViewItem)y).SubItems[column].Text;
+            string surnameX;
+            string surnameY;
+
+            switch (order)
+            {
+                case MySortOrder.Ascending:
+                    return String.Compare(nameX, nameY);
+
+                case MySortOrder.Descending:
+                    return String.Compare(nameY, nameX);
+
+                case MySortOrder.Ascending2:
+                    surnameX = (nameX.IndexOf(' ') > 0) ? nameX.Substring(nameX.IndexOf(' ') + 1) : nameX;
+                    surnameY = (nameX.IndexOf(' ') > 0) ? nameY.Substring(nameY.IndexOf(' ') + 1) : nameY;
+                    return String.Compare(surnameX, surnameY);
+
+                case MySortOrder.Descending2:
+                    surnameX = (nameX.IndexOf(' ') > 0) ? nameX.Substring(nameX.IndexOf(' ') + 1) : nameX;
+                    surnameY = (nameX.IndexOf(' ') > 0) ? nameY.Substring(nameY.IndexOf(' ') + 1) : nameY;
+                    return String.Compare(surnameY, surnameX);
+
+                default:
+                    return 0;
+            }
+        }
+    }
+}

Common/Forms/LviTextColumnComparer.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections;
+using System.Windows.Forms;
+using Common;
+
+namespace Common.Forms
+{
+    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

@@ -0,0 +1,10 @@
+using System;
+
+namespace Common.Forms
+{
+    public class MessageEventArgs : EventArgs
+    {
+        public string Message;
+        public MessageEventArgs(string message) { Message = message; }
+    }
+}

Common/Forms/ModelessForm.Designer.cs

@@ -1,4 +1,4 @@
-namespace TracingDB.Forms
+namespace Common.Forms
 {
     partial class ModelessForm
     {

Common/Forms/ModelessForm.cs

@@ -0,0 +1,92 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace Common.Forms
+{
+    public partial class ModelessForm : Form
+    {
+        /// <summary>
+        /// Called from the state machine when an operation forces a modeless dialog close.
+        /// </summary>
+        public static void UpdateMessage(MessageEventArgs args)
+        {
+            if (UpdateMessageHandler == null) return;
+            try { UpdateMessageHandler(null, args); }
+            catch (Exception) { }
+        }
+        public static event EventHandler<MessageEventArgs> UpdateMessageHandler;
+
+        void OnUpdateMessage(object sender, MessageEventArgs args)
+        {
+            Message = args.Message;
+            if (Message != null) label1.Text = Message;
+        }
+
+
+        /// <summary>
+        /// Called from the state machine when an operation forces a modeless dialog close.
+        /// </summary>
+        public static void CloseForm()
+        {
+            if (CloseFormHandler == null) return;
+            try { CloseFormHandler(null, null); }
+            catch (Exception) { }
+        }
+        public static event EventHandler<EventArgs> CloseFormHandler;
+
+        void OnCloseForm(object sender, EventArgs args)
+        {
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+
+
+        public string Title;
+        public string Message;
+        public Color BackgroundColor;
+        public Color TextColor;
+        public Font TextFont;
+        public string FontFamily;
+        public int FontSize;
+        public FontStyle FontStyle;
+
+
+        /// <summary>
+        /// Constructor to be used by the application
+        /// </summary>
+        /// <param name="title">Window title</param>
+        /// <param name="message">Displayed message</param>
+        public ModelessForm()
+        {
+            InitializeComponent();
+            ControlBox = false;
+
+            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);
+            };
+        }
+
+        private void ModelessForm_Load(object sender, EventArgs e)
+        {
+            if (Title != null) Text = Title;
+            if (Message != null) label1.Text = Message;
+            if (BackgroundColor != null) BackColor = BackgroundColor;
+            if (TextColor != null) ForeColor = TextColor;
+            if (FontFamily != null) label1.Font = new Font(FontFamily, FontSize, FontStyle);
+
+            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
+        }
+    }
+}

Common/Formulas.cs

@@ -1,11 +1,11 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using log4net;
 
-namespace Config
+namespace Common
 {
     public static class Formulas
     {
@@ -15,9 +15,9 @@ namespace Config
         ///
         /// Wrappers
         ///
-        public static double RealDensity() { return Data.RealDensity; }
-        public static double AtTemperature() { return Data.AtTemperature; }
-        public static double Buoyancy() { return Data.Buoyancy; }
+        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
@@ -182,7 +182,7 @@ namespace Config
             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));
+            return WaterDensityFromTemp(temp) * (1 + B * Common.Units.ConvertTo(Common.Unit.Pa, pressure));
         }
 
 
@@ -231,61 +231,6 @@ namespace Config
 		}
 
 
-        /// <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>
@@ -316,11 +261,11 @@ namespace Config
             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 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 = Config.Units.ConvertTo(Config.Unit.Pa, pressure) / p_star_Pa;
+            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;

Common/GlobalData.cs

@@ -0,0 +1,32 @@
+///
+/// Copyright (c) 2021 Sensus Slovensko a.s.
+///
+using System;
+
+namespace Common
+{
+    public 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;
+
+        public const string AdminUsername = "admin";
+        public const string AdminPassword = "staratura";
+
+        public static DBSettings RemoteUsersDB = null;
+		public static DBSettings LocalUsersDB = null;
+
+        public static IUser CurrentUser;
+		public static Common.AuthorizedAs AuthorizedAs;
+		public static DateTime LastAuthorization = DateTime.Now;
+
+        public static int MinPasswdLength = 0;
+        public static int PasswdExpirationPeriodDays = 0; 
+
+        public static string GetCurrentUserName()
+        {
+            return (CurrentUser != null && CurrentUser.UserName != null) ? CurrentUser.UserName : string.Empty;
+        }
+    }
+}

Common/IMeasurementCorrection.cs

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

Common/IParamsProvider.cs

@@ -1,11 +1,11 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace Config.Entities
+namespace Common
 {
 	public interface IParamsProvider
 	{
@@ -31,7 +31,7 @@ namespace Config.Entities
         /// 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>
-        IList<string> ParamValues(int ix);
+        ICollection<string> ParamValues(int ix);
 
 		/// <summary>
 		/// Returns a parameter value in the string form

Common/IUncertainty.cs

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

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

@@ -0,0 +1,267 @@
+///
+/// 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 UInt32 EmfRaw;			/// 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()
+		{
+			Int32 signedEmf = (EmfRaw > 0x7FFFFF) ? ((int)EmfRaw - 0x1000000) : (int)EmfRaw;
+			return 0.000000333 * (double)signedEmf;
+		}
+		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;
+			}
+
+			bool f1 = UInt32.TryParse(telegram.Substring(0, 6), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out EmfRaw);
+			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.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/ProcedureInfo.cs

@@ -0,0 +1,55 @@
+///
+/// Copyright (c) 2021 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+
+namespace Common
+{
+    /// <summary>
+    /// Contains a procedure name and procedure selection source specification
+    /// (local/shared/order from Oracle/order from tracing DB)
+    /// </summary>
+    public class ProcedureInfo
+    {
+        public readonly ProcedureSelection Source;
+        public readonly string Signature;
+        public readonly int ItemNr;
+        public readonly string Name;
+        public ProcedureSelection ResolvedSource;  /// ProcedureSelection.FromLocalDB or ProcedureSelection.FromSharedDB when Resolved==true
+        public string ResolvedName;
+        public string Variant;
+
+        public ProcedureInfo(ProcedureSelection source, int itemNr, string name, string signature = null, string variant = null)
+        {
+            Source = source;
+            Signature = (signature == null) ? string.Empty : signature;
+            ItemNr = itemNr;
+            Name = name;
+            if (source == ProcedureSelection.FromLocalDB || source == ProcedureSelection.FromSharedDB)
+            {
+                ResolvedSource = source;
+                ResolvedName = name;
+            }
+            else
+            {
+                ResolvedSource = ProcedureSelection.None;
+                ResolvedName = string.Empty;
+            }
+            Variant = (variant == null) ? string.Empty : variant;
+        }
+
+        public static string GetSignature(ProcedureSelection source, ICollection<ProcedureSelection> allSources)
+        {
+            return (source == ProcedureSelection.OrderNrFromOracleDB) ? "O"
+                 : (source == ProcedureSelection.OrderNrFromTracingDB) ? "T"
+                 : (source == ProcedureSelection.FromSharedDB) ? "R"
+                 : (allSources != null && allSources.Contains(ProcedureSelection.FromSharedDB)) ? "L" : "";
+        }
+
+        public override string ToString()
+        {
+            return string.Format("{0}{1}  {2}", Signature, ItemNr, Name);
+        }
+    }
+}

Common/SerializableDictionary.cs

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

Common/Telegram.cs

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

@@ -0,0 +1,538 @@
+///
+/// Copyright (c) 2016-2021 Sensus Slovensko a.s.
+///
+using System;
+using System.Reflection;
+
+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
+                                                
+        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,
+#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,
+#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,
+#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,
+#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,
+#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;
+        }
+
+        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 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;
+
+                default:
+					return Quantity.Number;
+            }
+		}
+
+		public static bool IsVolume(Unit units)       { return IsQuantity(units, Quantity.Volume); }
+		public static bool IsFlow(Unit units)         { return IsQuantity(units, Quantity.Flow); }
+        public static bool IsMass(Unit units)         { return IsQuantity(units, Quantity.Mass); }
+        public static bool IsTime(Unit units)         { return IsQuantity(units, Quantity.Time); }
+        public static bool IsTemperature(Unit units)  { return IsQuantity(units, Quantity.Temperature); }
+		public static bool IsPressure(Unit units)     { return IsQuantity(units, Quantity.Pressure); }
+        public static bool IsHumidity(Unit units)     { return IsQuantity(units, Quantity.Humidity); }
+        public static bool IsError(Unit units)        { return IsQuantity(units, Quantity.Error); }
+		public static bool IsLength(Unit units)       { return IsQuantity(units, Quantity.Length); }
+		public static bool IsDensity(Unit units)      { return IsQuantity(units, Quantity.Density); }
+		public static bool IsEnergy(Unit units)       { return IsQuantity(units, Quantity.Energy); }
+        public static bool IsPulses(Unit units)       { return IsQuantity(units, Quantity.Pulses); }
+        public static bool IsPulsePerLtr(Unit units)  { return IsQuantity(units, Quantity.PulsePerLtr); }
+        public static bool IsPulsePerKWh(Unit units)  { return IsQuantity(units, Quantity.PulsePerKWh); }
+        public static bool IsConductivity(Unit units) { return IsQuantity(units, Quantity.Conductivity); }
+
+
+		public static double ConvertTo(Unit units, double v)
+        {
+            switch (units)
+            {
+                /// 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;
+
+                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.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;
+
+                /// 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
+            }
+        }
+	}
+}

Common/Utils.cs

@@ -1,12 +1,329 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+///
+/// Copyright (c) 2021 Sensus Slovensko a.s.
+///
+using System;
 
 namespace Common
 {
-    public class Utils
+    public static 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 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 < GlobalData.MinPasswdLength)
+            {
+                explanation = string.Format("Password must have at least {0} characters", GlobalData.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("kremik")) ||
+                   (userName.Equals("igor") && password.Equals("mojronko8")) ||
+                   (userName.Equals("MARIAN") && password.Equals("NM-309BN")) ||
+                   (userName.Equals("lubo1212") && password.Equals("Tatry52")) ||
+                   (userName.Equals("Michal") && password.Equals("1236natahA8")) ||
+                   (userName.Equals("martin") && password.Equals("vaclavek84")) ||
+                   (userName.Equals("pakan") && password.Equals("kuriatko")) ||
+                   (userName.Equals("augustin") && 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);
+            }
+        }
     }
 }

Config/Config.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -30,7 +30,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;JUZNA_AFRIKA_NEW</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -68,22 +68,17 @@
   </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" />
@@ -91,6 +86,7 @@
     <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" />
@@ -99,7 +95,6 @@
     <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" />
@@ -125,8 +120,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Strings.resx</DependentUpon>
     </Compile>
-    <Compile Include="Units.cs" />
-    <Compile Include="Utils.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\Strings.cs.resx" />
@@ -141,9 +134,9 @@
     <EmbeddedResource Include="Resources\Strings.zh-CN.resx" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Users\Users.csproj">
-      <Project>{6E5CB0E9-E1B6-4E5D-AC6E-B1049E180F2B}</Project>
-      <Name>Users</Name>
+    <ProjectReference Include="..\Common\Common.csproj">
+      <Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
+      <Name>Common</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

Config/Data.cs

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

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

@@ -14,6 +14,7 @@ namespace Config.Entities
         public virtual string OriName { get; set; }         /// Not mapped to database
         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 Selector { get; set; }
         public virtual string TempMtrUp { get; set; }
         public virtual string TempMtrDown { get; set; }
         public virtual string PressMtrUp { get; set; }
@@ -46,7 +47,8 @@ namespace Config.Entities
 
 			result.Qfrom         = Qfrom;
             result.Qto           = Qto;
-			result.TempMtrUp     = TempMtrUp;
+            result.Selector      = Selector;
+            result.TempMtrUp     = TempMtrUp;
 			result.TempMtrDown   = TempMtrDown;
 			result.PressMtrUp    = PressMtrUp;
 			result.PressMtrDown  = PressMtrDown;

Config/Entities/Component.cs

@@ -1,9 +1,10 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Common;
 
 namespace Config.Entities
 {
@@ -13,11 +14,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 ParentName { get; set; }
-        public virtual DebugMode Mode { get; set; }
-		public virtual LogLevel Logging { get; set; }
+		public virtual string Parent { get; set; }
+        public virtual DebugMode DebugMode { get; set; }
+		public virtual LogLevel LogLevel { 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 -------------
@@ -37,9 +38,9 @@ namespace Config.Entities
 			result.ItemNr = itemNr;
 			result.Name = name;
 			result.ClassName = className;
-			result.ParentName = parentName;
-            result.Mode = debugLevel;
-			result.Logging = logLevel;
+			result.Parent = parentName;
+            result.DebugMode = debugLevel;
+			result.LogLevel = logLevel;
 			result.Parameters = parameters;
 			return result;
 		}
@@ -51,9 +52,9 @@ namespace Config.Entities
 			result.ItemNr = ItemNr;
 			result.Name = Name;
             result.ClassName = ClassName;
-			result.ParentName = ParentName;
-            result.Mode = Mode;
-			result.Logging = Logging;
+			result.Parent = Parent;
+            result.DebugMode = DebugMode;
+			result.LogLevel = LogLevel;
 			result.Parameters = Parameters;
 			return result;
 		}
@@ -62,9 +63,9 @@ namespace Config.Entities
         {
             output.WriteLine(Name);
             output.WriteLine(ClassName);
-            output.WriteLine(ParentName);
-            output.WriteLine(Mode.ToString());
-            output.WriteLine(Logging.ToString());
+            output.WriteLine(Parent);
+            output.WriteLine(DebugMode.ToString());
+            output.WriteLine(LogLevel.ToString());
             output.Write(Parameters);
 
             output.Close();
@@ -76,28 +77,28 @@ namespace Config.Entities
 
             result.Name = input.ReadLine();
             result.ClassName = input.ReadLine();
-            result.ParentName = input.ReadLine();
+            result.Parent = input.ReadLine();
 
             string line = input.ReadLine();
-            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;
+            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;
 
             line = input.ReadLine();
-            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;
+            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;
 
             result.Parameters = string.Empty;
             line = input.ReadLine();
@@ -118,12 +119,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 (ParentName != null)
+			if (Parent != null)
 			{
-				result += indent + "ParentName = " + ParentName + Environment.NewLine;
+				result += indent + "ParentName = " + Parent + Environment.NewLine;
 			}
-			result += indent + "DebugLevel = " + Mode.ToString() + Environment.NewLine;
-			result += indent + "LogLevel = " + Logging.ToString() + Environment.NewLine;
+			result += indent + "DebugLevel = " + DebugMode.ToString() + Environment.NewLine;
+			result += indent + "LogLevel = " + LogLevel.ToString() + Environment.NewLine;
 			result += indent + "Parameters = " + Parameters + Environment.NewLine;
 
 			return result;

Config/Entities/ComponentProcedure.cs

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

Config/Entities/ComponentTest.cs

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

Config/Entities/Enums.cs

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

@@ -14,8 +14,9 @@ namespace Config.Entities
         public virtual string OriName { get; set; }         /// Not mapped to database
         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 Selector { get; set; }
 		public virtual string Pump { get; set; }
-        public virtual string RegulValvesPct { get; set; }	/// Positions of regulation valves in % separated by ';'
+        public virtual string RegVPositions { get; set; }	/// Positions of regulation valves in % separated by ';'
 
         /// Valves
 		public virtual string ValvesOpen { get; set; }
@@ -40,12 +41,13 @@ namespace Config.Entities
         {
 			FeedingPath result = new FeedingPath(name, itemNr);
 
-			result.Qfrom = Qfrom;
-            result.Qto = Qto;
-			result.Pump = Pump;
-            result.RegulValvesPct = RegulValvesPct;
-            result.ValvesOpen = ValvesOpen;
-			result.ValvesClose = ValvesClose;
+			result.Qfrom         = Qfrom;
+            result.Qto           = Qto;
+            result.Selector      = Selector;
+			result.Pump          = Pump;
+            result.RegVPositions = RegVPositions;
+            result.ValvesOpen    = ValvesOpen;
+			result.ValvesClose   = ValvesClose;
 
             return result;
         }

Config/Entities/Group.cs

@@ -1,15 +1,16 @@
 ///
-/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2021 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 Users.Entities.GID GID { get; set; }
+        public virtual 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
 
@@ -18,7 +19,7 @@ namespace Config.Entities
             Users = new List<User>();
 		}
 
-        public Group(Users.Entities.GID gid)
+        public Group(GID gid)
             : this()
         {
 			GID = gid;

Config/Entities/IperlEnums.cs

@@ -1,44 +0,0 @@
-///
-/// 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,11 +1,12 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
 ///
 using System;
+using System.Collections.Generic;
 
 namespace Config.Entities
 {
-	public class MeasurementCorrection
+	public class MeasurementCorrection : Common.IMeasurementCorrection
 	{
 		public virtual int Id { get; protected set; }
         public virtual int RangeIx { get; set; }        /// 0..5
@@ -21,5 +22,60 @@ namespace Config.Entities
         {
             RangeIx = rangeIx; 
         }
-	}
+
+
+        /// <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;
+            }
+
+            int count = corrections.Count;
+            for (int i = 1; i < count; i++)
+            {
+                if (rawValue < corrections[0].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;
+        }
+    }
 }

Config/Entities/MetersPath.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2017 Sensus Metering Systems
+/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
 ///
 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,26 +34,6 @@ 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 -------------
 
@@ -71,15 +51,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;
@@ -91,119 +71,59 @@ 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 i)
+        public virtual string GetSensor(int wmNr0)
         {
-            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;
+            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;
             else return null;
         }
 
         /// Sets the component name
-        public virtual void SetSensor(int i, string cmpntName)
+        public virtual void SetSensor(int wmNr0, string 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;
+            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;
         }
     }
 }

Config/Entities/OutputPath.cs

@@ -14,14 +14,14 @@ namespace Config.Entities
         public virtual string OriName { get; set; }         /// Not mapped to database
         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 Selector { get; set; }
+        public virtual string RegValve { get; set; }
 		public virtual string FlowMeter { get; set; }
 		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 TempDiv { get; set; }
+		public virtual string TempMtrDiv { get; set; }
 		public virtual string Scale { get; set; }
-		public virtual string EmptyTankValve { get; set; }	/// Not used anywhere
 
         /// Valves		
 		public virtual string ValvesOpen { get; set; }
@@ -46,18 +46,18 @@ namespace Config.Entities
         {
 			OutputPath result = new OutputPath(name, itemNr);
 
-			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.Name        = Name;
+			result.Qfrom       = Qfrom;
+            result.Qto         = Qto;
+            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.ValvesOpen  = ValvesOpen;
 			result.ValvesClose = ValvesClose;
 
             return result;

Config/Entities/PTest.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Globalization;
 using System.IO;
+using Common;
 
 namespace Config.Entities
 {
@@ -78,7 +79,7 @@ namespace Config.Entities
             TempLimHi = 25.0;	    /// [°C]
             PressLimLo = 0;	        /// [bar]
             PressLimHi = 16.0;	    /// [bar]
-            Publish = (sbyte)Config.Entities.Publish.Always;
+            Publish = (sbyte)Common.Publish.Always;
             Evaluate = true;
 
             E1 = (sbyte)ErrorFlagsMode.On;

Config/Entities/Procedure.cs

@@ -1,17 +1,18 @@
 ///
-/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2021 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; }
@@ -53,14 +54,13 @@ namespace Config.Entities
 		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.Name.Length > 0 && t.Name[0] != '[') || !t.Name.Contains("]"))  rslt.Add(t);
-            }
+            foreach (var t in Tests) if (t.IsRegular()) rslt.Add(t);
             return rslt;
         }
 
@@ -70,15 +70,16 @@ namespace Config.Entities
         {
 			MoreParams = new List<ComponentProcedure>();
 			Tests = new List<Test>();
+            testInstances = null;
 
 			///
 			/// Default values
 			/// 
-			CreationUser = (Users.GlobalData.CurrentUser != null) ? Users.GlobalData.CurrentUser.UserName : null;
+            CreationUser = Common.GlobalData.GetCurrentUserName();
 			CreationTime = DateTime.Now;
 			LastChgUser = CreationUser;
 			LastChgTime = CreationTime;
-			MetersKind = Entities.MetersKind.Single;
+			MetersKind = MetersKind.Single;
 			Watermeters = string.Empty;
 			Description = string.Empty;
 			LongDescription = string.Empty;
@@ -96,6 +97,70 @@ 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,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using Common;
 
 namespace Config.Entities
 {
@@ -35,7 +36,7 @@ namespace Config.Entities
 			///
 			/// Default values
 			/// 
-			CreationUser = (Users.GlobalData.CurrentUser != null) ? Users.GlobalData.CurrentUser.UserName : null;
+            CreationUser = GlobalData.GetCurrentUserName();
 			CreationTime = DateTime.Now;
 			LastChgUser = CreationUser;
 			LastChgTime = CreationTime;

Config/Entities/Test.cs

@@ -1,10 +1,11 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using Common;
 
 namespace Config.Entities
 {
@@ -25,7 +26,7 @@ namespace Config.Entities
         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 float TestTime { get; set; }			/// Test time (estimate) in [s]
         public virtual string Method { get; set; }
         public virtual float ErrLimLo { get; set; }			/// in [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
         public virtual float ErrLimHi { get; set; }			/// in [%] usually > 0, in case of heat meters: -Qn in m3/h
@@ -44,8 +45,7 @@ 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 double TolerRed { get; set; }		///  = Filter
-        public virtual string RedType { get; set; }
+		public virtual int ShortPulses { get; set; }		/// Short pulses
 		public virtual string FeedingPath { get; set; }
 		public virtual string BenchPath { get; set; }
 		public virtual string OutputPath { get; set; }
@@ -53,9 +53,9 @@ namespace Config.Entities
 #if HEAT_METERS
         public virtual string HeatMetersPath { get; set; }
 #endif
-        public virtual string RelTransBefore { get; set; }
-		public virtual string RelTransBetween { get; set; }
-		public virtual string TransitionAfter { get; set; }
+        public virtual string TransBefore { get; set; }
+		public virtual string TransBetween { get; set; }
+		public virtual string TransAfter { get; set; }
 
         public virtual bool IsOuterLoopStart { get; set; }  /// Not mapped to database
         public virtual bool IsOuterLoopEnd { get; set; }    /// Not mapped to database
@@ -75,7 +75,7 @@ namespace Config.Entities
 			///
             Part = 0;
             Profile = TestProfile.UserDefined;
-            Publish = (sbyte)Config.Entities.Publish.Always;
+            Publish = (sbyte)Common.Publish.Always;
 			DoEvaluate = true;
 			Repeats = 1;
 			DoDraining = false;
@@ -89,15 +89,15 @@ namespace Config.Entities
             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
-            TolerRed = 0;					/// = Filter parameter
-			RelTransBefore  = string.Empty;
-			RelTransBetween = string.Empty;
-			TransitionAfter = string.Empty;
+            ShortPulses = 0;				/// Short pulses parameter (0 or 1)
+			TransBefore = string.Empty;
+			TransBetween = string.Empty;
+			TransAfter = string.Empty;
 		}
 
 		public Test(string name, int itemNr, Procedure procedure)
@@ -108,6 +108,22 @@ 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);
+        }
+
         // Makes a new copy of this object (not just a reference)
         public virtual Test Clone()
         {
@@ -121,7 +137,7 @@ namespace Config.Entities
 			result.Qfrom = Qfrom;
             result.Qto = Qto;
 			result.Volume = Volume;
-			result.TstTime = TstTime;
+			result.TestTime = TestTime;
 			result.Method = Method;
 			result.ErrLimLo = ErrLimLo;
 			result.ErrLimHi = ErrLimHi;
@@ -140,8 +156,7 @@ namespace Config.Entities
             result.TimeFlow2Mass = TimeFlow2Mass;
             result.TimePump2StartV = TimePump2StartV;
 			result.TimeStop2Mass = TimeStop2Mass;
-			result.TolerRed = TolerRed;
-            result.RedType = RedType;
+			result.ShortPulses = ShortPulses;
 			result.FeedingPath = FeedingPath;
 			result.BenchPath = BenchPath;
 			result.OutputPath = OutputPath;
@@ -149,9 +164,9 @@ namespace Config.Entities
 #if HEAT_METERS
             result.HeatMetersPath = HeatMetersPath;
 #endif
-			result.RelTransBefore = RelTransBefore;
-			result.RelTransBetween = RelTransBetween;
-			result.TransitionAfter = TransitionAfter;
+			result.TransBefore = TransBefore;
+			result.TransBetween = TransBetween;
+			result.TransAfter = TransAfter;
 			foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone()); }
 
             return result;
@@ -169,7 +184,7 @@ namespace Config.Entities
             output.WriteLine(Qfrom.ToString(ci));
             output.WriteLine(Qto.ToString(ci));
             output.WriteLine(Volume.ToString(ci));
-            output.WriteLine(TstTime.ToString(ci));
+            output.WriteLine(TestTime.ToString(ci));
             output.WriteLine(Method);
             output.WriteLine(ErrLimLo.ToString(ci));
             output.WriteLine(ErrLimHi.ToString(ci));
@@ -188,14 +203,15 @@ 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(RelTransBefore);
-            output.WriteLine(RelTransBetween);
+            output.WriteLine(TransBefore);
+            output.WriteLine(TransBetween);
             output.WriteLine(Profile);
-            output.WriteLine(TransitionAfter);
+            output.WriteLine(TransAfter);
 
             foreach (var prms in MoreParams) { prms.Export(output); }
             output.WriteLine();
@@ -220,7 +236,7 @@ namespace Config.Entities
             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.TestTime = float.Parse(input.ReadLine(), ci);
             tst.Method = input.ReadLine();
 			tst.ErrLimLo = float.Parse(input.ReadLine(), ci);
 			tst.ErrLimHi = float.Parse(input.ReadLine(), ci);
@@ -239,17 +255,18 @@ 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.RelTransBefore = input.ReadLine();
-            tst.RelTransBetween = input.ReadLine();
+            tst.TransBefore = input.ReadLine();
+            tst.TransBetween = input.ReadLine();
             string line = input.ReadLine();
             tst.Profile = line.Equals(TestProfile.ProtectedHeatMeter.ToString()) ? TestProfile.ProtectedHeatMeter
                           : line.Equals(TestProfile.UserDefinedHeatMeter.ToString()) ? TestProfile.UserDefinedHeatMeter
                           : line.Equals(TestProfile.Protected.ToString()) ? TestProfile.Protected : TestProfile.UserDefined;  /// UserDefined is the default
-            tst.TransitionAfter = input.ReadLine();
+            tst.TransAfter = input.ReadLine();
 
             while (true)
             {
@@ -282,14 +299,14 @@ namespace Config.Entities
             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 != Volume.ToString(ci))             { diff.AppendFormat(fmt, "Volume", Volume.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != TstTime.ToString(ci))            { diff.AppendFormat(fmt, "TstTime", TstTime.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != TestTime.ToString(ci))           { diff.AppendFormat(fmt, "TstTime", TestTime.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Method)                          { diff.AppendFormat(fmt, "Method", Method, ln); };
             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(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 != DoDraining.ToString(ci))         { diff.AppendFormat(fmt, "DoDraining", DoDraining.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != DoDrainingAfter.ToString(ci))    { diff.AppendFormat(fmt, "DoDrainingAfter", DoDrainingAfter.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != 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); };
@@ -305,10 +322,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 != 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); };
+            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); };
 
             return diff.ToString();
         }
@@ -409,29 +426,6 @@ 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

@@ -0,0 +1,32 @@
+///
+/// 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 Sensus Slovensko a.s.
+/// Copyright (c) 2019-2021 Sensus Slovensko a.s.
 ///
 using System;
 
 namespace Config.Entities
 {
-    public class Uncertainty
+    public class Uncertainty : Common.IUncertainty
     {
         public virtual int Id { get; protected set; }
         public virtual float Measurement { get; set; }

Config/Entities/User.cs

@@ -1,14 +1,19 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
+using log4net;
+using Common;
+using Config.Resources;
 
 namespace Config.Entities
 {
-    public class User
+    public class User : Common.IUser
     {
-		public virtual int Id { get; protected set; }
+        static readonly ILog log = LogManager.GetLogger(typeof(User));
+
+        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; }
@@ -20,11 +25,27 @@ 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>
@@ -34,14 +55,155 @@ namespace Config.Entities
 			Groups.Add(group);
 		}
 
-		/// <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;
-		}
-	}
+        /// <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) || GlobalData.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(GlobalData.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);
+        }
+    }
 }

Config/FluentCommon.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Windows.Forms;
@@ -8,51 +8,18 @@ using FluentNHibernate.Cfg.Db;
 using NHibernate;
 using NHibernate.Cfg;
 using NHibernate.Tool.hbm2ddl;
+using Common;
 using Config.Resources;
 
 namespace Config
 {
-    public static class FluentCommon
+    public 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>
-        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)
+		public static ISessionFactory CreateSessionFactory(DBKind database, DBType dbType, string connectionString, bool createDB)
         {
 			try
 			{
@@ -61,10 +28,10 @@ namespace Config
                 switch (dbType)
 				{
 					default:
-                    case Users.Entities.DBType.SQLite:
+                    case DBType.SQLite:
 						cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
                         break;
-                    case Users.Entities.DBType.MySql:
+                    case DBType.MySql:
                         cfg = cfg.Database(MySQLConfiguration.Standard.ConnectionString(connectionString));
                         break;
 				}
@@ -72,12 +39,12 @@ namespace Config
                 switch (database)
                 {
                     default:
-					case Users.Entities.DBKind.Config:
-                    case Users.Entities.DBKind.RemoteConfig:
-                        cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<Data>());
+					case DBKind.Config:
+                    case DBKind.RemoteConfig:
+                        cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<FluentCommon>());
                         break;
-                    case Users.Entities.DBKind.Results:
-                        cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<Data>());
+                    case DBKind.Results:
+                        cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<FluentCommon>());
                         break;
                 }
 
@@ -116,17 +83,6 @@ 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'.
@@ -134,9 +90,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(Users.Entities.DBType dbType, string connectionString)
+		public static bool CreateEmptyConfigDB(DBType dbType, string connectionString)
 		{
-			ISessionFactory sessionFactory = CreateSessionFactory(Users.Entities.DBKind.Config, dbType, connectionString, true);
+			ISessionFactory sessionFactory = CreateSessionFactory(DBKind.Config, dbType, connectionString, true);
 			if (sessionFactory == null) return false;
 
             /// Populate the database
@@ -149,32 +105,32 @@ namespace Config
                     ///
                     var admin = new Config.Entities.User
                     {
-						UserName = Data.AdminUsername,
+						UserName = GlobalData.AdminUsername,
                         FullName = Strings.Administrator,
                         LastPwChange = DateTime.Now
                     };
-					admin.SetPassword(Data.AdminPassword);
+					admin.SetPassword(GlobalData.AdminPassword);
 
                     ///
                     /// Prepare all groups, add some of them to admin
                     ///
-                    for (Users.Entities.GID gid = 0; gid < Users.Entities.GID.NrOfGroups; gid++)
+                    for (GID gid = 0; gid < GID.NrOfGroups; gid++)
                     {
                         Config.Entities.Group group = new Config.Entities.Group(gid);
                         switch (gid)
                         {
-                            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:
+                            case GID.Testers:
+                            case GID.TestingSpecialists:
+                            case GID.HeadOfLab:
+                            case GID.MaintenanceSpecialists:
+                            case GID.Metrologists:
+                            case GID.CalibrationSpecialists:
+                            case GID.Administrators:
 #if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
-                            case Users.Entities.GID.TraceabilityManagement:
+                            case GID.TraceabilityManagement:
 #elif KEMPNO_50 || KRAKOW_50 || TORUN_50 || WARSAW_END
-                            case Users.Entities.GID.MetrologicalAuthority:
-                            case Users.Entities.GID.WaterMeterAuthority:
+                            case GID.MetrologicalAuthority:
+                            case GID.WaterMeterAuthority:
 #endif
                                 admin.AddGroup(group);
                                 session.SaveOrUpdate(group);    /// Save this group

Config/Mappings/BenchPathMap.cs

@@ -15,10 +15,11 @@ namespace Config.Mappings
 			Map(x => x.Name);
 			Map(x => x.Qfrom);
 			Map(x => x.Qto);
-			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.Selector);
+            Map(x => x.TempMtrUp);
+			Map(x => x.TempMtrDown);
+			Map(x => x.PressMtrUp);
+			Map(x => x.PressMtrDown);
 			Map(x => x.PressMtrDelta);
 			Map(x => x.StopBFValve);
 			Map(x => x.ValvesOpen)

Config/Mappings/ComponentMap.cs

@@ -13,10 +13,10 @@ namespace Config.Mappings
             Id(x => x.Id);
             Map(x => x.Name);
             Map(x => x.ClassName);
-            Map(x => x.ParentName);
+            Map(x => x.Parent);
             Map(x => x.ItemNr);
-			Map(x => x.Mode);
-			Map(x => x.Logging);
+			Map(x => x.DebugMode);
+			Map(x => x.LogLevel);
 			Map(x => x.Parameters)
 				.CustomType("StringClob")
 				.CustomSqlType("varchar(8000)");

Config/Mappings/FeedingPathMap.cs

@@ -15,8 +15,9 @@ 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.RegulValvesPct);
+            Map(x => x.RegVPositions);
 			Map(x => x.ValvesOpen)
 				.CustomType("StringClob")
 				.CustomSqlType("varchar(8000)");

Config/Mappings/MeasurementCorrectionMap.cs

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

Config/Mappings/MetersPathMap.cs

@@ -1,12 +1,11 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
-using Config.Entities;
 
 namespace Config.Mappings
 {
-	class MetersPathMap : ClassMap<MetersPath>
+    class MetersPathMap : ClassMap<Entities.MetersPath>
     {
         public MetersPathMap()
         {
@@ -14,48 +13,26 @@ namespace Config.Mappings
 			Map(x => x.ItemNr);
 			Map(x => x.Name);
 
-#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
+            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);
 		}
     }
 }

Config/Mappings/OutputPathMap.cs

@@ -15,15 +15,14 @@ namespace Config.Mappings
 			Map(x => x.Name);
 			Map(x => x.Qfrom);
 			Map(x => x.Qto);
-			Map(x => x.RegulValve);
+            Map(x => x.Selector);
+            Map(x => x.RegValve);
 			Map(x => x.FlowMeter);
 			Map(x => x.PidCoef);
             Map(x => x.StartValve);
             Map(x => x.Diverter);
-			Map(x => x.TempDiv);
-			Map(x => x.Scale)
-				.Column("Balance");
-			Map(x => x.EmptyTankValve);
+			Map(x => x.TempMtrDiv);
+			Map(x => x.Scale);
 			Map(x => x.ValvesOpen)
 				.CustomType("StringClob")
 				.CustomSqlType("varchar(8000)");

Config/Mappings/TestMap.cs

@@ -16,18 +16,15 @@ namespace Config.Mappings
 			Map(x => x.Part);
             Map(x => x.Profile);
             Map(x => x.Publish);
-			Map(x => x.DoEvaluate)
-				.Column("Evaluate");
+			Map(x => x.DoEvaluate);
             Map(x => x.Qtg);
             Map(x => x.Qfrom);
 			Map(x => x.Qto);
 			Map(x => x.Volume);
-			Map(x => x.TstTime);
+			Map(x => x.TestTime);
 			Map(x => x.Repeats);
-            Map(x => x.DoDraining)
-				.Column("Emptying");
-            Map(x => x.DoDrainingAfter)
-				.Column("Zeroing");
+            Map(x => x.DoDraining);
+            Map(x => x.DoDrainingAfter);
             Map(x => x.DoControlWaterTemp);
             Map(x => x.TempLimLo);
 			Map(x => x.TempLimHi);
@@ -35,19 +32,16 @@ namespace Config.Mappings
             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)
-				.Column("TimeMass2Start");
+            Map(x => x.TimePump2StartV);
             Map(x => x.TimeStop2Mass);
 			Map(x => x.Method);
 			Map(x => x.ErrLimLo);
 			Map(x => x.ErrLimHi);
 			Map(x => x.Uncertainty);
-			Map(x => x.TolerRed)
-                .Column("TolerRed");	/// ???
-			Map(x => x.RedType);
+			Map(x => x.ShortPulses);
 			Map(x => x.FeedingPath);
 			Map(x => x.BenchPath);
 			Map(x => x.OutputPath);
@@ -55,12 +49,9 @@ namespace Config.Mappings
 #if HEAT_METERS
             Map(x => x.HeatMetersPath);
 #endif
-            Map(x => x.RelTransBefore)
-                .Column("RelTransBefore");
-			Map(x => x.RelTransBetween)
-                .Column("RelTransBetween");
-			Map(x => x.TransitionAfter)
-                .Column("TransitionAfter");
+            Map(x => x.TransBefore);
+			Map(x => x.TransBetween);
+			Map(x => x.TransAfter);
 
             HasMany(x => x.MoreParams)
 				.Cascade.All();

Config/Mappings/UserMap.cs

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

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>NiO</value>
+    <value>Nicht OK</value>
   </data>
   <data name="Passed" xml:space="preserve">
-    <value>iO</value>
+    <value>OK</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.\\r\\nUrsache:\\r\\n{0}</value>
+    <value>Datenbank kann nicht geöffnet werden.\\r\\nUrsache:\\r\\n{0}</value>
   </data>
 </root>

Config/Resources/Strings.resx

@@ -162,4 +162,7 @@
   <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

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

@@ -1,256 +0,0 @@
-///
-/// 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;
-            }
-        }
-    }
-}

DataStreamInterface/DataFrame.cs

@@ -7,12 +7,12 @@ namespace DataStreamInterface
 {
     public class DataFrame
     {
-        public readonly UInt64 ID;          /// Frame ID
+        public readonly Int64 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(UInt64 id, double time, double volume, double[] quantity)
+        public DataFrame(Int64 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.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,9 +30,11 @@
     <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,22 +13,28 @@ namespace DataStreamInterface
         degree,
 
         /// Volume
-        ml,         ///   0.001 l
-        l,          /// * 1 liter = 1 l
+        ml,         ///   1 ml = 0.001 l
+        l,          /// * 1 liter
         dm3,        ///   1 dm3 = 1 l
-        m3,         ///   1000 l
-        gal_UK,     ///   1 gal(UK) = 4.54609 l
-        gal_US,     ///   1 gal(US) = 3.78541178 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
 
         /// Flow
-        lph,        ///   1 liter/h
-        m3ph,       /// * 1 m3/h = 1000 l/h
+        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
 
         /// 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
@@ -47,6 +53,7 @@ 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
 
@@ -61,7 +68,9 @@ 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
@@ -76,20 +85,317 @@ 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
-
-        Count
+        kWhpp,		///   1 kWh/pulse
     }
+
+    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,58 +2,82 @@
 /// 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(out int state, out string parameter);
+        bool GetState(int meterIx, 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 state, string parameter);
+        bool SetState(int meterIx, int state, string parameter);
+
+        bool SetStateAll(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(string connectionParameters, out string meterId);
-
-        /// <summary>
-        /// Closes connection with the data stream meter
-        /// </summary>
-        /// <returns>true when successful</returns>
-        bool CloseConnection();
+        bool OpenConnection(int meterIx, string connectionParameters, out string meterId);
 
         /// <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();
+        bool StartMeasurement(int meterIx);
+
+        bool StartMeasurementAll();
 
         /// <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="lastFrameID">ID of the last date frame</param>
+        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
+        /// <param name="storedFramesCount">Number of stored date frames</param>
         /// <returns>true when successful</returns>
-        bool StopMeasurement(out UInt64 lastFrameID);
+        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();
 
         ///------------------------------------------------
         /// Units of time, volume and optional quantities
@@ -70,7 +94,7 @@ namespace DataStreamInterface
         Unit GetVolumeUnits();
 
         ///-----------------------------------------------
-        /// Ooptional quantities: count, units, captions
+        /// Optional quantities: count, units, captions
         ///-----------------------------------------------
 
         /// <summary>
@@ -83,13 +107,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 quanityNr);
+        Unit GetQuantityUnits(int quantityNr);
 
         /// <summary>
         /// Returns caption of the specified quantity
         /// </summary>
         /// <param name="quanityNr">Zero based quantity number 0 .. quantites count-1</param>
-        string GetQuantityCaption(int quanityNr);
+        string GetQuantityCaption(int quantityNr);
 
         ///---------------------------
         /// Datastream data exchange
@@ -98,17 +122,19 @@ 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(UInt64 id, int count);
+        DataFrame[] GetFrames(int meterIx, Int64 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>
-        UInt64 GetID(double time);
+        Int64 GetID(int meterIx, double time);
     }
 }

DeviceTest/DeviceTest.csproj

@@ -90,10 +90,18 @@
     </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,9 +5,11 @@ 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
@@ -79,7 +81,7 @@ namespace DeviceTest
                 compClasses.Add(componentFactory.ClassName);
             }
 
-			tbfComponents = new List<TBF.BenchControl.Generic.IComponent>();
+			tbfComponents = new List<TBF.Rig.Generic.IComponent>();
 			tbfDevices = new List<IDevice>();
 		}
 
@@ -108,8 +110,8 @@ namespace DeviceTest
 						config.Name = Program.LocalSettings.ParentName;
 						config.ParentName = string.Empty;
 						config.ItemNr = 0;
-						config.DebugLevel = Config.Entities.DebugMode.Normal;
-						config.LogLevel = Config.Entities.LogLevel.Debug;
+						config.DebugLevel = DebugMode.Normal;
+						config.LogLevel = LogLevel.Debug;
 						config.Corrections = null;
 						config.Factory = parentFactory;
 						parentCfg = config;
@@ -141,8 +143,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 = Config.Entities.DebugMode.Normal;
-						config.LogLevel = Config.Entities.LogLevel.Debug;
+						config.DebugLevel = DebugMode.Normal;
+						config.LogLevel = LogLevel.Debug;
 						config.Corrections = null;
 						config.Factory = component1Factory;
 						component1Cfg = config;
@@ -176,8 +178,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 = Config.Entities.DebugMode.Normal;
-						config.LogLevel = Config.Entities.LogLevel.Debug;
+						config.DebugLevel = DebugMode.Normal;
+						config.LogLevel = LogLevel.Debug;
 						config.Corrections = null;
 						config.Factory = component2Factory;
 						component2Cfg = config;
@@ -211,8 +213,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 = Config.Entities.DebugMode.Normal;
-						config.LogLevel = Config.Entities.LogLevel.Debug;
+						config.DebugLevel = DebugMode.Normal;
+						config.LogLevel = LogLevel.Debug;
 						config.Corrections = null;
 						config.Factory = component3Factory;
 						component3Cfg = config;
@@ -421,13 +423,13 @@ namespace DeviceTest
 			{
 				parentCfg = parentFactory.DefaultConfig();
 			}
-			IComponentCfgCtrl cfgControl = parentCfg.GetControl();
+            ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+            cfgForm.CmpntEntities = new List<Config.Entities.Component>();
+
+            IComponentCfgCtrl cfgControl = parentCfg.GetControl(cfgForm.CmpntEntities);
 			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();
@@ -450,17 +452,17 @@ namespace DeviceTest
 			{
 				component1Cfg = component1Factory.DefaultConfig();
 			}
-			IComponentCfgCtrl cfgControl = component1Cfg.GetControl();
-			cfgControl.Config = component1Cfg;
-			cfgControl.Config.ItemNr = 1;
-
 			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
 			///
-			IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
+			var compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
-			cfgForm.TbfComponents = compEntities;
+			cfgForm.CmpntEntities = compEntities;
 
-			cfgForm.ComponentCfgCtrl = cfgControl;
+            IComponentCfgCtrl cfgControl = component1Cfg.GetControl(compEntities);
+            cfgControl.Config = component1Cfg;
+            cfgControl.Config.ItemNr = 1;
+
+            cfgForm.ComponentCfgCtrl = cfgControl;
 			cfgForm.UnlockAfterStart = true;
 			DialogResult dr = cfgForm.ShowDialog();
 			if (dr != DialogResult.OK) return;
@@ -484,18 +486,18 @@ namespace DeviceTest
 			{
 				component2Cfg = component2Factory.DefaultConfig();
 			}
-			IComponentCfgCtrl cfgControl = component2Cfg.GetControl();
-			cfgControl.Config = component2Cfg;
-			cfgControl.Config.ItemNr = 1;
-
 			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
 			///
-			IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
+			var 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.TbfComponents = compEntities;
+			cfgForm.CmpntEntities = compEntities;
 
-			cfgForm.ComponentCfgCtrl = cfgControl;
+            IComponentCfgCtrl cfgControl = component2Cfg.GetControl(compEntities);
+            cfgControl.Config = component2Cfg;
+            cfgControl.Config.ItemNr = 1;
+
+            cfgForm.ComponentCfgCtrl = cfgControl;
 			cfgForm.UnlockAfterStart = true;
 			DialogResult dr = cfgForm.ShowDialog();
 			if (dr != DialogResult.OK) return;
@@ -519,19 +521,19 @@ namespace DeviceTest
 			{
 				component3Cfg = component3Factory.DefaultConfig();
 			}
-			IComponentCfgCtrl cfgControl = component3Cfg.GetControl();
-			cfgControl.Config = component3Cfg;
-			cfgControl.Config.ItemNr = 1;
-
 			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
 			///
-			IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
+			var 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.TbfComponents = compEntities;
+			cfgForm.CmpntEntities = compEntities;
 
-			cfgForm.ComponentCfgCtrl = cfgControl;
+            IComponentCfgCtrl cfgControl = component3Cfg.GetControl(compEntities);
+            cfgControl.Config = component3Cfg;
+            cfgControl.Config.ItemNr = 1;
+
+            cfgForm.ComponentCfgCtrl = cfgControl;
 			cfgForm.UnlockAfterStart = true;
 			DialogResult dr = cfgForm.ShowDialog();
 			if (dr != DialogResult.OK) return;
@@ -568,7 +570,7 @@ namespace DeviceTest
 			{
 				if (parentFactory != null && parentCfg != null)
 				{
-					TBF.BenchControl.Generic.IComponent component = parentFactory.GetComponent(parentCfg, tbfComponents);
+					TBF.Rig.Generic.IComponent component = parentFactory.GetComponent(parentCfg, tbfComponents);
 					tbfComponents.Add(component);
 					IDevice dev = component as IDevice;
 					if (dev != null)
@@ -580,7 +582,7 @@ namespace DeviceTest
 				}
 				if (component1Factory != null && component1Cfg != null)
 				{
-					TBF.BenchControl.Generic.IComponent component = component1Factory.GetComponent(component1Cfg, tbfComponents);
+					TBF.Rig.Generic.IComponent component = component1Factory.GetComponent(component1Cfg, tbfComponents);
 					tbfComponents.Add(component);
 					tbfComponent1forOp = component;
 					IDevice dev = component as IDevice;
@@ -593,7 +595,7 @@ namespace DeviceTest
 				}
 				if (component2Factory != null && component2Cfg != null)
 				{
-					TBF.BenchControl.Generic.IComponent component2 = component2Factory.GetComponent(component2Cfg, tbfComponents);
+					TBF.Rig.Generic.IComponent component2 = component2Factory.GetComponent(component2Cfg, tbfComponents);
 					tbfComponents.Add(component2);
 					tbfComponent2forOp = component2;
 					IDevice dev = component2 as IDevice;
@@ -606,7 +608,7 @@ namespace DeviceTest
 				}
 				if (component3Factory != null && component3Cfg != null)
 				{
-					TBF.BenchControl.Generic.IComponent component3 = component3Factory.GetComponent(component3Cfg, tbfComponents);
+					TBF.Rig.Generic.IComponent component3 = component3Factory.GetComponent(component3Cfg, tbfComponents);
 					tbfComponents.Add(component3);
 					tbfComponent3forOp = component3;
 					IDevice dev = component3 as IDevice;
@@ -645,6 +647,7 @@ namespace DeviceTest
 								MessageBoxIcon.Exclamation);
 
 				foreach (var dev in tbfDevices) dev.StopDevice();
+                foreach (var dev in tbfDevices) dev.StopDevice2();
 				tbfDevices.Clear();
 
 				startButton.Enabled = true;
@@ -662,120 +665,120 @@ namespace DeviceTest
 			int previousOperation = 0;
 
 
-			if (tbfComponent1forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
+            if (tbfComponent1forOp is TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter)
 			{
-				operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
+                operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref dblBox1);
 			}
-			else if (tbfComponent1forOp is TBF.BenchControl.Network.Camera.CLP1611.Camera)
+			else if (tbfComponent1forOp is TBF.Rig.Network.Camera.CLP1611.Camera)
 			{
-				operation1 = (tbfComponent1forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
-				operation2 = (tbfComponent1forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
+				operation1 = (tbfComponent1forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
+				operation2 = (tbfComponent1forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
 			}
-			else if (tbfComponent1forOp is TBF.BenchControl.Network.Camera.Roi.Roi)
+			else if (tbfComponent1forOp is TBF.Rig.Network.Camera.Roi.Roi)
 			{
-				operation1 = (tbfComponent1forOp as TBF.BenchControl.Network.Camera.Roi.Roi).RoiDetectionOp();
+				operation1 = (tbfComponent1forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent1forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
+			else if (tbfComponent1forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
 			{
-				operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation2 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
-            else if (tbfComponent1forOp is TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter)
+            else if (tbfComponent1forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
-                operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
-                operation2 = (tbfComponent1forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
+                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.BenchControl.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent1forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
 			{
-				//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);
+				//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);
 			}
-            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent3forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
             {
-                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);
+                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);
             }
 
 
-			if (tbfComponent2forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
+            if (tbfComponent2forOp is TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter)
 			{
-				operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
+                operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref dblBox2);
 			}
-			else if (tbfComponent2forOp is TBF.BenchControl.Network.Camera.CLP1611.Camera)
+			else if (tbfComponent2forOp is TBF.Rig.Network.Camera.CLP1611.Camera)
 			{
-				operation21 = (tbfComponent2forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
-				operation22 = (tbfComponent2forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
+				operation21 = (tbfComponent2forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
+				operation22 = (tbfComponent2forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
 			}
-			else if (tbfComponent2forOp is TBF.BenchControl.Network.Camera.Roi.Roi)
+			else if (tbfComponent2forOp is TBF.Rig.Network.Camera.Roi.Roi)
 			{
-				operation21 = (tbfComponent2forOp as TBF.BenchControl.Network.Camera.Roi.Roi).RoiDetectionOp();
+				operation21 = (tbfComponent2forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent2forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
+			else if (tbfComponent2forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
 			{
-				operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation22 = (tbfComponent2forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
-            else if (tbfComponent2forOp is TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter)
+            else if (tbfComponent2forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
-                operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
-                operation22 = (tbfComponent2forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
+                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.BenchControl.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent2forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
 			{
-				//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);
+				//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);
 			}
-            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent3forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
             {
-                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);
+                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);
             }
 
 
-			if (tbfComponent3forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
+            if (tbfComponent3forOp is TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter)
 			{
-				operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
+                operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref dblBox3);
 			}
-			else if (tbfComponent3forOp is TBF.BenchControl.Network.Camera.CLP1611.Camera)
+			else if (tbfComponent3forOp is TBF.Rig.Network.Camera.CLP1611.Camera)
 			{
-				operation31 = (tbfComponent3forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
-				operation33 = (tbfComponent3forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
+				operation31 = (tbfComponent3forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
+				operation33 = (tbfComponent3forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
 			}
-			else if (tbfComponent3forOp is TBF.BenchControl.Network.Camera.Roi.Roi)
+			else if (tbfComponent3forOp is TBF.Rig.Network.Camera.Roi.Roi)
 			{
-				operation31 = (tbfComponent3forOp as TBF.BenchControl.Network.Camera.Roi.Roi).RoiDetectionOp();
+				operation31 = (tbfComponent3forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent3forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
+			else if (tbfComponent3forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
 			{
-				operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
-            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter)
+            else if (tbfComponent3forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
-                operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
-                operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
+                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.BenchControl.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent3forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
 			{
-				//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);
+				//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);
 			}
-            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent3forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
             {
-                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);
+                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);
             }
 
 
@@ -856,6 +859,7 @@ namespace DeviceTest
 			}
 
 			foreach (var d in tbfDevices) d.StopDevice();
+            foreach (var d in tbfDevices) d.StopDevice2();
 		}
 
 		private void stopButton_Click(object sender, EventArgs e)

Dirichlet.Numerics/UInt128.cs

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

EventViewer/EventViewer.csproj

@@ -13,7 +13,7 @@
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -127,13 +128,9 @@
       <Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
       <Name>Common</Name>
     </ProjectReference>
-    <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 Include="..\SharedDatabase\SharedDatabase.csproj">
+      <Project>{211b5e3f-9996-48a7-abde-c878dd2d71c2}</Project>
+      <Name>SharedDatabase</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup />

EventViewer/EventViewerWnd.cs

@@ -3,13 +3,14 @@
 ///
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Windows.Forms;
 using NHibernate;
+using Common;
 using Common.UIControls;
-using Events;
-using Events.Entities;
+using SharedDatabase;
+using SharedDatabase.Entities;
 using EventViewer.Resources;
-using System.Drawing;
 
 namespace EventViewer
 {
@@ -101,9 +102,9 @@ namespace EventViewer
         {
             try
             {
-                DB.DbType = DBType.MySql;
-                DB.ConnectionString = Program.LocalSettings.ConnectionString;
-                session = DB.CreateSession();
+                EventsDB.DbType = DBType.MySql;
+                EventsDB.ConnectionString = Program.LocalSettings.ConnectionString;
+                session = EventsDB.CreateSession();
                 subscribers = session.QueryOver<Subscriber>().List();
                 unreadEventsRadioButton.Checked = true;
             }
@@ -210,8 +211,8 @@ namespace EventViewer
             {
                 lvi.UseItemStyleForSubItems = false;
                 lvi.SubItems.Add(evnt.Severity.ToString());
-                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[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.Add(evnt.Message);
             eventsListView.Items.Add(lvi);
@@ -252,7 +253,7 @@ namespace EventViewer
         private void eventsListView_MouseDoubleClick(object sender, MouseEventArgs e)
         {
             if (eventsListView.SelectedIndices.Count != 1) return;
-            Event evnt = eventsListView.SelectedItems[0].Tag as Events.Entities.Event;
+            Event evnt = eventsListView.SelectedItems[0].Tag as Event;
             if (evnt == null) return;
             bool enableConfirmReadButton = (session != null) && (eViewerOption == EViewerOption.UnreadEvents) && !string.IsNullOrEmpty(currentUser);
 
@@ -275,8 +276,8 @@ namespace EventViewer
 
         private void settingsButton_Click(object sender, EventArgs e)
         {
-            //Users.Entities.GID[] groupsWithAccess = new Users.Entities.GID[] { Users.Entities.GID.Administrators };
-            Users.Forms.LoginDlg dlg = new Users.Forms.LoginDlg(true);
+            //Common.GID[] groupsWithAccess = new Common.GID[] { Common.GID.Administrators };
+            SharedDatabase.Forms.LoginDlg dlg = new SharedDatabase.Forms.LoginDlg(true);
             if (dlg.ShowDialog() == DialogResult.OK)
             {
                 if ((new Forms.SettingsDlg()).ShowDialog() == DialogResult.OK)
@@ -290,8 +291,8 @@ namespace EventViewer
         {
             try
             {
-                Users.GlobalData.RemoteUsersDB = new Users.DBSettings(Users.Entities.DBType.MySql, Program.LocalSettings.UsersDBConnString);
-                Users.Forms.LoginDlg dlg = new Users.Forms.LoginDlg();
+                GlobalData.RemoteUsersDB = new DBSettings(DBType.MySql, Program.LocalSettings.UsersDBConnString);
+                SharedDatabase.Forms.LoginDlg dlg = new SharedDatabase.Forms.LoginDlg();
                 if (dlg.ShowDialog() == DialogResult.OK)
                 {
                     loginUserName = dlg.UserName;

EventViewer/Forms/EventDetailsDlg.cs

@@ -3,13 +3,14 @@
 ///
 using System;
 using System.Windows.Forms;
+using SharedDatabase.Entities;
 using EventViewer.Resources;
 
 namespace EventViewer.Forms
 {
     public partial class EventDetailsDlg : Form
     {
-        Events.Entities.Event evnt;
+        Event evnt;
 
         public EventDetailsDlg()
         {
@@ -17,7 +18,7 @@ namespace EventViewer.Forms
             Localize();
         }
 
-        public EventDetailsDlg(Events.Entities.Event evnt, bool enableConfirmReadButton)
+        public EventDetailsDlg(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.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;";
+            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;";
 #endif
             RecentTimeDays = 7;
             Language = "sk";
@@ -147,7 +147,7 @@ namespace EventViewer
                     }
                 }
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 //log.ErrorFormat("Failed to load from '{0}': {1}", fileName, e.Message);
                 return null;
@@ -203,7 +203,7 @@ namespace EventViewer
                 }
 #endif
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 //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 e)
+            catch (Exception)
             {
                 //LogException(log, "Exception in Application.Run(new ResultsBrowserWnd(args))", e);
             }

Events/DB.cs

@@ -1,219 +0,0 @@
-///
-/// 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();
-        }
-    }
-}

Events/Entities/Enums.cs

@@ -1,58 +0,0 @@
-///
-/// Copyright (c) 2020 Sensus Slovensko a.s.
-///
-namespace Events.Entities
-{
-    /// <summary>
-    /// Identifies the type of a database
-    /// </summary>
-    public enum DBType
-    {
-        None,               /// Database disabled
-        MySql,              /// MySQL database
-        SQLite,             /// SQLite
-        Count
-    }
-
-
-    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,
-    }
-}

Events/Entities/Event.cs

@@ -1,51 +0,0 @@
-///
-/// Copyright (c) 2020 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-
-namespace Events.Entities
-{
-    public class Event
-    {
-        public virtual int Id { get; protected set; }
-        public virtual DateTime TimeStamp { get; set; }
-        public virtual string Bench { get; set; }
-        public virtual string Source { get; set; }
-        public virtual EventClass EventClass { get; set; }
-        public virtual Severity Severity { get; set; }
-        public virtual string Message { get; set; }
-        public virtual string MoreInfo { get; set; }
-        public virtual IList<Subscriber> Subscribers { get; set; }
-
-        public virtual SubscriberGroup SubscriberGroups { get; set; }   /// Not mapped to DB, intermediate inforamtion
-
-        public Event()
-        {
-            Subscribers = new List<Subscriber>();
-        }
-
-        public Event(string bench, string source, EventClass eventClass, Severity severity, string message, string moreInfo, IList<Subscriber> subscribers, SubscriberGroup subscriberGroups = 0)
-            : this()
-        {
-            TimeStamp = DateTime.Now;
-            Bench = bench;
-            Source = source;
-            EventClass = eventClass;
-            Severity = severity;
-            Message = message;
-            MoreInfo = moreInfo;
-            if (subscribers != null)
-            {
-                foreach (var s in subscribers) Subscribers.Add(s);
-            }
-
-            SubscriberGroups = subscriberGroups;
-        }
-
-        public override string ToString()
-        {
-            return string.Format("{0:yyMMdd}_{0:HHmm} {1} {2} {3} {4} {5}", TimeStamp, Bench, Source, EventClass, Severity, Message);
-        }        
-    }
-}

Events/Events.csproj

@@ -55,18 +55,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DB.cs" />
-    <Compile Include="Entities\Enums.cs" />
-    <Compile Include="Entities\Event.cs" />
-    <Compile Include="Entities\Subscriber.cs" />
-    <Compile Include="Utils.cs" />
-    <Compile Include="Mappings\EventMap.cs" />
-    <Compile Include="Mappings\SubscriberMap.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="DeliveryServices\" />
-  </ItemGroup>
+  <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.

Events/Utils.cs

@@ -1,24 +0,0 @@
-///
-/// Copyright (c) 2020 Sensus Slovensko a.s.
-///
-using System;
-using System.Drawing;
-using Events.Entities;
-
-namespace Events
-{
-    public class Utils
-    {
-        public static Color GetSeverityColor(Severity severity, bool foreColor = false)
-        {
-            switch (severity)
-            {
-                case Severity.Notification: return foreColor ? Color.White : Color.SteelBlue;
-                case Severity.Warning:      return foreColor ? Color.Black : Color.Orange;
-                case Severity.Error:        return foreColor ? Color.White : Color.Red;
-                case Severity.FatalError:   return foreColor ? Color.White : Color.Purple;
-                default:                    return foreColor ? Color.Black : Color.White;
-            }
-        }
-    }
-}

FeatureVectorCalculator/App.config

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

FeatureVectorCalculator/CalculatorWnd.Designer.cs

@@ -0,0 +1,97 @@
+namespace FeatureVectorCalculator
+{
+    partial class CalculatorWnd
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.rawFileComboBox = new System.Windows.Forms.ComboBox();
+            this.browseButton = new System.Windows.Forms.Button();
+            this.processButton = new System.Windows.Forms.Button();
+            this.resultsTextBox = new System.Windows.Forms.TextBox();
+            this.SuspendLayout();
+            // 
+            // rawFileComboBox
+            // 
+            this.rawFileComboBox.FormattingEnabled = true;
+            this.rawFileComboBox.Location = new System.Drawing.Point(29, 28);
+            this.rawFileComboBox.Name = "rawFileComboBox";
+            this.rawFileComboBox.Size = new System.Drawing.Size(715, 21);
+            this.rawFileComboBox.TabIndex = 0;
+            // 
+            // browseButton
+            // 
+            this.browseButton.Location = new System.Drawing.Point(769, 19);
+            this.browseButton.Name = "browseButton";
+            this.browseButton.Size = new System.Drawing.Size(66, 37);
+            this.browseButton.TabIndex = 1;
+            this.browseButton.Text = "Browse";
+            this.browseButton.UseVisualStyleBackColor = true;
+            this.browseButton.Click += new System.EventHandler(this.browseButton_Click);
+            // 
+            // processButton
+            // 
+            this.processButton.Location = new System.Drawing.Point(29, 66);
+            this.processButton.Name = "processButton";
+            this.processButton.Size = new System.Drawing.Size(91, 46);
+            this.processButton.TabIndex = 2;
+            this.processButton.Text = "Process";
+            this.processButton.UseVisualStyleBackColor = true;
+            this.processButton.Click += new System.EventHandler(this.processButton_Click);
+            // 
+            // resultsTextBox
+            // 
+            this.resultsTextBox.Location = new System.Drawing.Point(29, 131);
+            this.resultsTextBox.Multiline = true;
+            this.resultsTextBox.Name = "resultsTextBox";
+            this.resultsTextBox.Size = new System.Drawing.Size(715, 181);
+            this.resultsTextBox.TabIndex = 3;
+            // 
+            // CalculatorWnd
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(859, 335);
+            this.Controls.Add(this.resultsTextBox);
+            this.Controls.Add(this.processButton);
+            this.Controls.Add(this.browseButton);
+            this.Controls.Add(this.rawFileComboBox);
+            this.Name = "CalculatorWnd";
+            this.Text = "Feature vector calculator";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.ComboBox rawFileComboBox;
+        private System.Windows.Forms.Button browseButton;
+        private System.Windows.Forms.Button processButton;
+        private System.Windows.Forms.TextBox resultsTextBox;
+    }
+}
+

FeatureVectorCalculator/CalculatorWnd.cs

@@ -0,0 +1,89 @@
+///
+/// Copyright (c) 2021 Sensus Slovensko a.s.
+///
+using System;
+using System.IO;
+using System.Windows.Forms;
+using Common.Iperl;
+
+namespace FeatureVectorCalculator
+{
+    public partial class CalculatorWnd : Form
+    {
+        public const int MaxOptoDataCount = 40000;
+        OptoTelegramRaw[] optoData;
+        Int64 volumeRawExtLast;
+        Int64 timestampExtLast;
+
+
+        public CalculatorWnd()
+        {
+            InitializeComponent();
+
+            optoData = new OptoTelegramRaw[MaxOptoDataCount];
+            for (int i = 0; i < MaxOptoDataCount; i++)
+            {
+                optoData[i] = new OptoTelegramRaw();
+            }
+        }
+
+        private void browseButton_Click(object sender, EventArgs e)
+        {
+            OpenFileDialog ofd = new OpenFileDialog();
+            var dr = ofd.ShowDialog();
+            rawFileComboBox.Text = ofd.FileName;
+        }
+
+        private void processButton_Click(object sender, EventArgs e)
+        {
+            if (optoData == null) return;
+
+            int counter = 0;
+            int startIx = -1;
+            int endIx = -1;
+
+            using (StreamReader reader = new StreamReader(rawFileComboBox.Text))
+            {
+                string line;
+                while ((line = reader.ReadLine()) != null && counter < MaxOptoDataCount)
+                {
+                    int ix = line.IndexOf(" :\t");
+                    
+                    if (ix >= 0)
+                    {
+                        if (optoData[counter].UpdateFromString(line.Substring(ix + 3), counter, 0, ref volumeRawExtLast, ref timestampExtLast, true))
+                        {
+                            if (line.EndsWith("####  start test  ####"))
+                            {
+                                startIx = counter;
+                                optoData[counter].Flags = OptoTelegramFlags.OK_TestStart;
+                            }
+                            else if (line.EndsWith("####  end of test  ####"))
+                            {
+                                endIx = counter;
+                                optoData[counter].Flags = OptoTelegramFlags.OK_TestEnd;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        optoData[counter].Flags = OptoTelegramFlags.InvalidTelegram;
+                    }
+
+                    counter++;
+                }
+
+                reader.Close();
+            }
+
+            float[] featureVector = new float[9];
+            Common.Utils.CalculateFeatureVector(optoData, counter, startIx, endIx, ref featureVector);
+
+            resultsTextBox.Clear();
+            for (int i = 0; i < 9; i++)
+            {
+                resultsTextBox.Text += string.Format("X{0} = {1}\r\n", i + 1, featureVector[i]);
+            }
+        }
+    }
+}

FeatureVectorCalculator/FeatureVectorCalculator.csproj

@@ -0,0 +1,98 @@
+<?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>{6280F3F9-139A-48E3-8C88-25EB4124E982}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>FeatureVectorCalculator</RootNamespace>
+    <AssemblyName>FeatureVectorCalculator</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>FeatureVectorCalculator.Program</StartupObject>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CalculatorWnd.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="CalculatorWnd.Designer.cs">
+      <DependentUpon>CalculatorWnd.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="CalculatorWnd.resx">
+      <DependentUpon>CalculatorWnd.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Common\Common.csproj">
+      <Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
+      <Name>Common</Name>
+    </ProjectReference>
+  </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>

FeatureVectorCalculator/Program.cs

@@ -0,0 +1,25 @@
+///
+/// Copyright (c) 2021 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace FeatureVectorCalculator
+{
+    static class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main()
+        {
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+            Application.Run(new CalculatorWnd());
+        }
+    }
+}

FeatureVectorCalculator/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("FeatureVectorCalculator")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("FeatureVectorCalculator")]
+[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("4d3a6fe2-3153-4581-8ec7-e5a386b50177")]
+
+// 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")]

FeatureVectorCalculator/Properties/Resources.Designer.cs

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

FeatureVectorCalculator/Properties/Resources.resx

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

FeatureVectorCalculator/Properties/Settings.Designer.cs

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

FeatureVectorCalculator/Properties/Settings.settings

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

GraphLib/DataSource.cs

@@ -193,7 +193,7 @@ namespace GraphLib
 				Samples = newSamples;
 				return samplesCount;
 			}
-			catch (Exception exc)
+			catch (Exception)
 			{
 				return 0;
 			}

MergeResultsDBs/App.config

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

MergeResultsDBs/MergeResultsDBs.csproj

@@ -0,0 +1,84 @@
+<?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>{9786D0A8-BA9A-41F6-9E61-C7B2B76D4C08}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MergeResultsDBs</RootNamespace>
+    <AssemblyName>MergeResultsDBs</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="FluentNHibernate">
+      <HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="Iesi.Collections">
+      <HintPath>..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net">
+      <HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="MySql.Data">
+      <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate">
+      <HintPath>..\packages\NHibernate.4.0.4.4000\lib\net40\NHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Config\Config.csproj">
+      <Project>{743df7db-c7b6-42eb-986d-0f485e5588e4}</Project>
+      <Name>Config</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Results\Results.csproj">
+      <Project>{9d0dcc88-dc81-47eb-9fdd-4c3907871bfb}</Project>
+      <Name>Results</Name>
+    </ProjectReference>
+  </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>

MergeResultsDBs/Program.cs

@@ -0,0 +1,190 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using log4net;
+using NHibernate;
+using FluentNHibernate;
+using Results;
+using Results.Entities;
+
+namespace MergeResultsDBs
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            Console.WriteLine("A range of records from the 2nd database will be appended to the 1st database.");
+            Console.WriteLine("Enter the 1st (target) database name:");
+            string firstDB = Console.ReadLine();
+            Console.WriteLine("Enter the 2nd database name:");
+            string secondDB = Console.ReadLine();
+            Console.WriteLine("Enter range of batch numbers from the 2nd DB to append to the 1st DB (start-end):");
+            string range = Console.ReadLine();
+
+            ISession session1;
+            IList<Components> componentsList;
+            int componentsListInitialCount;
+            IList<TestData> testDataList;
+            int testDataListInitialCount;
+            IList<WaterMeterData> waterMeterDataList;
+            int waterMeterDataListInitialCount;
+            try
+            {
+                DB.ConnectionString = string.Format("SERVER=localhost; DATABASE={0}; UID=root; PASSWORD=kraken; CHARSET=utf8;", firstDB);
+                session1 = DB.CreateSession();
+
+                componentsList = session1.QueryOver<Components>().List();
+                componentsListInitialCount = componentsList.Count;
+
+                testDataList = session1.QueryOver<TestData>().List();
+                testDataListInitialCount = testDataList.Count();
+
+                waterMeterDataList = session1.QueryOver<WaterMeterData>().List();
+                waterMeterDataListInitialCount = waterMeterDataList.Count();
+            }
+            catch (Exception exc)
+            {
+                MessageBox.Show(string.Format("Cannot open the 1st database:\r\n{0}", exc.Message));
+                return;
+            }
+
+            ISession session2;
+            IList<Components> oriComponentsList;
+            IList<TestData> oriTestDataList;
+            IList<WaterMeterData> oriWMDataList;
+            try
+            {
+                DB.ConnectionString = string.Format("SERVER=localhost; DATABASE={0}; UID=root; PASSWORD=kraken; CHARSET=utf8;", secondDB);
+                session2 = DB.CreateSession();
+
+                oriComponentsList = session2.QueryOver<Components>().List();
+                oriTestDataList = session2.QueryOver<TestData>().List();
+                oriWMDataList = session2.QueryOver<WaterMeterData>().List();
+            }
+            catch (Exception exc)
+            {
+                MessageBox.Show(string.Format("Cannot open the 2nd database:\r\n{0}", exc.Message));
+                return;
+            }
+
+            int batchNrStart;
+            int batchNrEnd;
+            string[] fields = range.Split(new char[] { '-' });
+            if (fields.Length != 2 ||
+                !int.TryParse(fields[0], out batchNrStart) ||
+                !int.TryParse(fields[1], out batchNrEnd) ||
+                batchNrEnd < batchNrStart)
+            {
+                MessageBox.Show("Invalid range of batch numbers");
+                return;
+            }
+
+            Console.WriteLine(string.Format("Appending batches {0}-{1} from DB {2} to DB {3}", batchNrStart, batchNrEnd, secondDB, firstDB));
+            Console.WriteLine("Press 'y' or 'Y' to start, anything else to abort");
+            string response = Console.ReadLine();
+            if (response != "y" && response != "Y")
+            {
+                return;
+            }
+
+            Console.WriteLine("PROCESSING DATABASES ...");
+
+            for (int batchNr = batchNrStart; batchNr <= batchNrEnd; batchNr++)
+            {
+                Console.Write(string.Format("{0} ", batchNr));
+
+                /// Copy one batch from the 2nd to the 1st database
+                var oriBatches = session2.QueryOver<Batch>()
+                                         .Where(x => (x.BatchNr == batchNr))
+                                         .List();
+                if (oriBatches.Count != 1) continue;
+
+                ///---------------------------------------------------------------
+                Batch oriBatch = oriBatches[0];
+
+                var transaction = session1.BeginTransaction();
+                try
+                {
+                    Batch batch = new Batch(oriBatch);
+
+                    oriBatch.TestRslts = session2.QueryOver<TestRslt>()
+                                                 .Where(x => (x.Batch.Id == oriBatch.Id))
+                                                 .List();
+                    foreach (var oriTR in oriBatch.TestRslts)
+                    {
+                        /// Find appropriate Components
+                        Components components = oriTR.Components == null
+                                              ? null
+                                              : Components.UpdateList(componentsList, new Components(oriTR.Components));
+                        if (components != null) session1.SaveOrUpdate(components);
+
+                        /// Find appropriate TestData
+                        TestData testData = TestData.UpdateList(testDataList, new TestData(oriTR.TestData));
+                        session1.SaveOrUpdate(testData);
+
+                        TestRslt tr = new TestRslt();
+                        tr.CopyContentFrom(oriTR);
+                        tr.Batch = batch;
+                        tr.Components = components;
+                        tr.TestData = testData;
+
+                        batch.TestRslts.Add(tr);
+                        session1.SaveOrUpdate(tr);
+                    }
+
+                    oriBatch.WaterMeters = session2.QueryOver<WaterMeter>()
+                                                   .Where(x => (x.Batch.Id == oriBatch.Id))
+                                                   .List();
+                    foreach (var oriWM in oriBatch.WaterMeters)
+                    {
+                        /// Find appropriate WaterMeterData
+                        WaterMeterData wmData = WaterMeterData.UpdateList(waterMeterDataList, new WaterMeterData(oriWM.WaterMeterData));
+                        session1.SaveOrUpdate(wmData);
+
+                        WaterMeter wm = new WaterMeter();
+                        wm.CopyContentFrom(oriWM);
+                        wm.Batch = batch;
+                        wm.WaterMeterData = wmData;
+
+                        foreach (var oriMTR in oriWM.MeterTestRslts)
+                        {
+                            MeterTestRslt mtr = new MeterTestRslt(oriMTR);
+                            mtr.WaterMeter = wm;
+                            mtr.TestRslt = batch.TestRslts.FirstOrDefault<TestRslt>(x => (x.Name() == oriMTR.TestRslt.Name() &&
+                                                                                          x.Part == oriMTR.TestRslt.Part &&
+                                                                                          x.RepetitionNr == oriMTR.TestRslt.RepetitionNr));
+                            if (mtr.TestRslt == null)
+                            {
+                                throw new Exception("Something strange happened");
+                            }
+
+                            wm.MeterTestRslts.Add(mtr);
+                            session1.SaveOrUpdate(mtr);
+                        }
+
+                        batch.WaterMeters.Add(wm);
+                        session1.SaveOrUpdate(wm);
+                    }
+
+                    session1.SaveOrUpdate(batch);
+                    transaction.Commit();
+                }
+                catch
+                {
+                    transaction.Rollback();
+                    throw new Exception("Commit failed - transaction reverted");
+                }
+            }
+            Console.WriteLine();
+
+            session1.Flush();
+            session1.Close();
+            session2.Close();
+            Console.WriteLine("Successfully completed");
+            Console.ReadLine();
+        }
+    }
+}

MergeResultsDBs/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("MergeResultsDBs")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("MergeResultsDBs")]
+[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("f7543f83-5414-4010-ac3f-3af4b6864812")]
+
+// 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")]

ResetBatchNr/App.config

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

ResetBatchNr/Program.cs

@@ -0,0 +1,46 @@
+using System;
+using System.IO;
+using TBF;
+
+namespace ResetBatchNr
+{
+    class Program
+    {
+        static LocalSettings ls; 
+
+        static void Main(string[] args)
+        {
+            if (!Directory.Exists(TBF.Program.ConfigDir)) return;
+
+            Environment.CurrentDirectory = TBF.Program.ConfigDir;
+			ls = LocalSettings.Load(TBF.Program.LocalSettingsFileName);
+            if (ls == null || ls.TestBenches == null)
+            {
+                /// Loading local seetings from regular config file failed. Use the backup
+                ls = LocalSettings.Load(TBF.Program.LocalSettingsBackupName);
+                if (ls == null || ls.TestBenches == null)
+                {
+                    /// Neither config.xml, nor config.backup.xml could be loaded
+                    Console.WriteLine(string.Format("Could not load file {0}, nor {1}.", TBF.Program.LocalSettingsFileName, TBF.Program.LocalSettingsBackupName));
+                    Console.ReadLine();
+                    return;
+                }
+            }
+            else
+            {
+                /// Loading local seetings from the regular config file was successful. Update the backup
+                File.Copy(TBF.Program.LocalSettingsFileName, TBF.Program.LocalSettingsBackupName, true);
+            }
+
+            /// 
+            /// Process local settings so that windows are shifted to the 1st monitor
+            ///
+            ls.BatchNr = 1;
+            ls.Save();
+
+            Console.WriteLine("BatchNr was reset to 1");
+            Console.ReadLine();
+            return;
+        }
+    }
+}

ResetBatchNr/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("ResetBatchNr")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ResetBatchNr")]
+[assembly: AssemblyCopyright("Copyright ©  2020")]
+[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("de8130eb-2f43-46a6-9f5b-bf96432a0c7c")]
+
+// 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")]