Reconfigured for MILWAUKEE, Platform target = AnyCPU

.gitignore

@@ -40,6 +40,8 @@ Results/bin/
 Results/obj/
 ResultsBrowser/bin/
 ResultsBrowser/obj/
+ResultsParser/bin/
+ResultsParser/obj/
 Statistics/bin/
 Statistics/obj/
 TBF/bin/

Common/Common.csproj

@@ -20,6 +20,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -28,6 +29,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -42,26 +44,55 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BackgroundBeep.cs" />
+    <Compile Include="DatabaseSettings.cs" />
+    <Compile Include="DBSettings.cs" />
     <Compile Include="Enums.cs" />
+    <Compile Include="Forms\ListViewEx.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Forms\ListViewExtensions.cs" />
+    <Compile Include="Forms\LviDateTimeColumnComparer.cs" />
+    <Compile Include="Forms\LviIntColumnComparer.cs" />
+    <Compile Include="Forms\LviNameSurnameColumnComparer.cs" />
+    <Compile Include="Forms\LviTextColumnComparer.cs" />
+    <Compile Include="Forms\MessageEventArgs.cs" />
+    <Compile Include="Forms\ModelessForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\ModelessForm.designer.cs">
+      <DependentUpon>ModelessForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="IMeasurementCorrection.cs" />
+    <Compile Include="IOrderInfo.cs" />
+    <Compile Include="IParamsProvider.cs" />
+    <Compile Include="IUncertainty.cs" />
+    <Compile Include="IUser.cs" />
+    <Compile Include="Printers\PrintersCommon.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="QuitAppException.cs" />
     <Compile Include="StatisticalMetrics.cs" />
     <Compile Include="Iperl\OptoTelegramRaw.cs" />
     <Compile Include="SerializableDictionary.cs" />
+    <Compile Include="Telegram.cs" />
     <Compile Include="UIControls\CoolButtonCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="UIControls\CoolButtonCtrl.Designer.cs">
       <DependentUpon>CoolButtonCtrl.cs</DependentUpon>
     </Compile>
-    <Compile Include="UIControls\LviDateTimeColumnComparer.cs" />
     <Compile Include="UIControls\RoundedRectangle.cs" />
+    <Compile Include="Units.cs" />
     <Compile Include="Utils.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UIControls\ListViewEx.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UIControls\ListViewExtensions.cs" />
-    <Compile Include="UIControls\LviIntColumnComparer.cs" />
-    <Compile Include="UIControls\LviTextColumnComparer.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Forms\ListViewEx.resx">
+      <DependentUpon>ListViewEx.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\ModelessForm.resx">
+      <DependentUpon>ModelessForm.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

Common/DBSettings.cs

@@ -1,10 +1,9 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2021 Sensus Slovensko a.s.
 ///
 using System;
-using Common;
 
-namespace Users
+namespace Common
 {
 	/// <summary>
 	/// Database settings required to make a connection

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

@@ -70,8 +70,8 @@ namespace Common
         [Description("None")]                           None,
         [Description("Local procedures")]               FromLocalDB,
         [Description("Shared procedures")]              FromSharedDB,
-        [Description("Orders from Oracle DB")]          OrderNrFromOracleDB,
-        [Description("Orders from Tracing DB")]         OrderNrFromTracingDB,
+        [Description("Orders from Oracle DB")]          OrderFromOracleDB,
+        [Description("Orders from Tracing DB")]         OrderFromTracingDB,
 #endif
         Count
     }

Common/Forms/ListViewEx.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2022 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 Common.UIControls
+namespace Common.Forms
 {
 	/// <summary>
 	/// Event Handler for SubItem events
@@ -61,6 +61,9 @@ namespace Common.UIControls
 		private const int HDN_ITEMCHANGINGW = (HDN_FIRST-20);
 		#endregion
 
+        public MySortOrder SortOrder = MySortOrder.None;
+        public int SortColumn = -1;
+
 		///	<summary>
 		///	Required designer variable.
 		///	</summary>
@@ -424,12 +427,18 @@ namespace Common.UIControls
 
 			OnSubItemEndEditing(e);
 
-			_editItem.SubItems[_editSubItem].Text = e.DisplayText;
+            if (_editSubItem >= 0 && _editSubItem < _editItem.SubItems.Count)
+            {
+                _editItem.SubItems[_editSubItem].Text = e.DisplayText;
+            }
 
-			_editingControl.Leave -= new EventHandler(_editControl_Leave);
-			_editingControl.KeyPress -= new KeyPressEventHandler(_editControl_KeyPress);
+            if (_editingControl != null)
+            {
+                _editingControl.Leave -= new EventHandler(_editControl_Leave);
+                _editingControl.KeyPress -= new KeyPressEventHandler(_editControl_KeyPress);
 
-			_editingControl.Visible = false;
+                _editingControl.Visible = false;
+            }
 
 			_editingControl = null;
 			_editItem = null;

Common/Forms/ListViewExtensions.cs

@@ -1,10 +1,12 @@
-using System;
+///
+/// Copyright (c) 2019-2020 Sensus Slovensko a.s.
+///
+using System;
 using System.ComponentModel;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
-using Common;
 
-namespace Users.Forms
+namespace Common.Forms
 {
     [EditorBrowsable(EditorBrowsableState.Never)]
     public static class ListViewExtensions
@@ -56,7 +58,7 @@ namespace Users.Forms
         [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 ListView listViewControl, int columnIndex, MySortOrder order)
+        public static void SetSortIcon(this ListViewEx listViewControl, int columnIndex, MySortOrder order)
         {
             IntPtr columnHeader = SendMessage(listViewControl.Handle, LVM_GETHEADER, IntPtr.Zero, IntPtr.Zero);
             for (int columnNumber = 0; columnNumber <= listViewControl.Columns.Count - 1; columnNumber++)
@@ -87,6 +89,9 @@ namespace Users.Forms
                             item.fmt &= ~HDITEM.Format.SortUp;
                             item.fmt |= HDITEM.Format.SortDown;
                             break;
+
+                        default:
+                            break;
                     }
                 }
                 else

Common/Forms/LviDateTimeColumnComparer.cs

@@ -1,24 +1,24 @@
 ///
-/// Copyright (c) 2019-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2019-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections;
 using System.Windows.Forms;
 
-namespace Common.UIControls
+namespace Common.Forms
 {
     public class LviDateTimeColumnComparer : IComparer
     {
         int column;
-        SortOrder order;
+        MySortOrder order;
 
         public LviDateTimeColumnComparer()
         {
             column = 0;
-            order = SortOrder.Ascending;
+            order = MySortOrder.Ascending;
         }
 
-        public LviDateTimeColumnComparer(int column, SortOrder order)
+        public LviDateTimeColumnComparer(int column, MySortOrder order)
         {
             this.column = column;
             this.order = order;
@@ -33,13 +33,13 @@ namespace Common.UIControls
             {
                 return 0;
             }
-            else if (order == SortOrder.Ascending)
+            else if ((order == MySortOrder.Descending || order == MySortOrder.Descending2))
             {
-                return (valX > valY) ? 1 : -1;
+                return (valY > valX) ? 1 : -1;
             }
             else
             {
-                return (valY > valX) ? 1 : -1;
+                return (valX > valY) ? 1 : -1;
             }
         }
     }

Common/Forms/LviIntColumnComparer.cs

@@ -1,11 +1,13 @@
-using System;
+///
+/// Copyright (c) 2019-2021 Sensus Slovensko a.s.
+///
+using System;
 using System.Collections;
 using System.Windows.Forms;
-using Common;
 
-namespace Users.Forms
+namespace Common.Forms
 {
-    class LviIntColumnComparer : IComparer
+    public class LviIntColumnComparer : IComparer
     {
         int column;
         MySortOrder order;

Common/Forms/LviNameSurnameColumnComparer.cs

@@ -1,11 +1,10 @@
 using System;
 using System.Collections;
 using System.Windows.Forms;
-using Common;
 
-namespace Users.Forms
+namespace Common.Forms
 {
-    class LviNameSurnameColumnComparer : IComparer
+    public class LviNameSurnameColumnComparer : IComparer
     {
         private int column;
         MySortOrder order;

Common/Forms/LviTextColumnComparer.cs

@@ -1,11 +1,13 @@
-using System;
+///
+/// Copyright (c) 2019-2021 Sensus Slovensko a.s.
+///
+using System;
 using System.Collections;
 using System.Windows.Forms;
-using Common;
 
-namespace Users.Forms
+namespace Common.Forms
 {
-    class LviTextColumnComparer : IComparer
+    public class LviTextColumnComparer : IComparer
     {
         private int column;
         MySortOrder order;

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

@@ -0,0 +1,63 @@
+namespace Common.Forms
+{
+    partial class ModelessForm
+    {
+        /// <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.label1 = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(47, 29);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(35, 13);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "label1";
+            // 
+            // ModelessForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(191, 56);
+            this.Controls.Add(this.label1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.Name = "ModelessForm";
+            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "ModelessForm";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label label1;
+    }
+}

Common/Forms/ModelessForm.cs

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

Common/Formulas.cs

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

Common/IMeasurementCorrection.cs

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

Common/IOrderInfo.cs

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

Common/IParamsProvider.cs

@@ -1,12 +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;
-using Common;
 
-namespace Config.Entities
+namespace Common
 {
 	public interface IParamsProvider
 	{

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/Printers/PrintersCommon.cs

@@ -2,9 +2,8 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Printing;
-using Common;
 
-namespace Results.Output.Printers
+namespace Common.Printers
 {
     public class PrintersCommon : PrintDocument
     {

Common/QuitAppException.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace TracingDB
+namespace Common
 {
     public class QuitAppException : Exception
     {

Common/Telegram.cs

@@ -1,12 +1,12 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Metering Systems
+/// Copyright (c) 2013-2021 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
 
-namespace TBF.Rig
+namespace Common
 {
-	public class Telegram
+	public static class Telegram
 	{
 		const UInt16 crcSeed = 0xFFFF;		// Initial crc value
 		const UInt16 crcGP = 0xA001;		// Generating polynomial
@@ -39,13 +39,29 @@ namespace TBF.Rig
 		/// </summary>
 		/// <param name="data">Data telegram</param>
 		/// <returns>Calculated CRC</returns>
-		public static UInt16 ClaculateTelegramCRC(byte[] data)
+		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 < data.Length - 2; i++) UpdateCRC(data[i], ref crc);
+            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.
@@ -58,7 +74,7 @@ namespace TBF.Rig
 			int len = data.Length;
 			if (len < 2) return;
 
-			UInt16 crc = ClaculateTelegramCRC(data);
+			UInt16 crc = CalculateTelegramCRC(data);
 
 			data[len - 2] = (byte)(crc & 0xFF);
 			data[len - 1] = (byte)(crc >> 8);
@@ -72,16 +88,38 @@ namespace TBF.Rig
 		/// </summary>
 		/// <param name="data">Data telegram</param>
 		/// <returns>true if the CRC in the telegram is correct</returns>
-		public static bool VerifyTelegramCRC(byte[] data)
+		public static bool VerifyTelegramCRC(byte[] data, int enforcedLen = 0)
 		{
-			int len = data.Length;
+            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 = ClaculateTelegramCRC(data);
+			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>
@@ -91,7 +129,7 @@ namespace TBF.Rig
 		/// </summary>
 		/// <param name="data">Data telegram</param>
 		/// <returns>Calculated checksum</returns>
-		public static byte ClaculateTelegramChecksum(byte[] data)
+		public static byte CalculateTelegramChecksum(byte[] data)
 		{
 			byte checksum = 0;
 			for (int i = 0; i < data.Length - 1; i++) checksum = (byte)(checksum ^ data[i]);
@@ -106,7 +144,7 @@ namespace TBF.Rig
 		/// <param name="hartPreambLen">Length of HART telegram preamble (FF bytes)</param>
 		/// <param name="data">Data telegram</param>
 		/// <returns>Calculated checksum</returns>
-		public static byte ClaculateTelegramChecksum(int hartPreambLen, byte[] data)
+		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]);
@@ -124,7 +162,7 @@ namespace TBF.Rig
 		{
 			int len = data.Length;
 			if (len < 1) return;
-			data[len - 1] = ClaculateTelegramChecksum(data);
+			data[len - 1] = CalculateTelegramChecksum(data);
 		}
 
 		/// <summary>
@@ -139,7 +177,7 @@ namespace TBF.Rig
 		public static void UpdateTelegramChecksum(int hartPreambLen, byte[] data)
 		{
 			if (data.Length - hartPreambLen < 1) return;
-			data[data.Length - 1] = ClaculateTelegramChecksum(hartPreambLen, data);
+			data[data.Length - 1] = CalculateTelegramChecksum(hartPreambLen, data);
 		}
 
 		/// <summary>
@@ -154,7 +192,7 @@ namespace TBF.Rig
 		{
 			int len = data.Length;
 			if (len < 1) return false;
-			return (data[len - 1] == ClaculateTelegramChecksum(data));
+			return (data[len - 1] == CalculateTelegramChecksum(data));
 		}
 
 		/// <summary>
@@ -169,11 +207,10 @@ namespace TBF.Rig
 		public static bool VerifyTelegramChecksum(int hartPreambLen, byte[] data)
 		{
 			if (data.Length - hartPreambLen < 1) return false;
-			return (data[data.Length - 1] == ClaculateTelegramChecksum(hartPreambLen, data));
+			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);
@@ -194,6 +231,7 @@ namespace TBF.Rig
 			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);
@@ -215,7 +253,6 @@ namespace TBF.Rig
         }
 
 
-
 		public static string LogTelegram(string intro, string data)
 		{
 			System.Text.StringBuilder sb = new System.Text.StringBuilder(80);

Common/UIControls/ListViewExtensions.cs

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

Common/UIControls/LviIntColumnComparer.cs

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

Common/UIControls/LviTextColumnComparer.cs

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

Common/Units.cs

@@ -2,11 +2,8 @@
 /// Copyright (c) 2016-2021 Sensus Slovensko a.s.
 ///
 using System;
-using System.Reflection;
-using Common;
-using Config.Entities;
 
-namespace Config
+namespace Common
 {
     public enum Unit
     {
@@ -360,21 +357,21 @@ namespace Config
             }
 		}
 
-		public static bool IsVolume(Unit unit)       { return IsQuantity(unit, Config.Quantity.Volume); }
-		public static bool IsFlow(Unit unit)         { return IsQuantity(unit, Config.Quantity.Flow); }
-        public static bool IsMass(Unit unit)         { return IsQuantity(unit, Config.Quantity.Mass); }
-        public static bool IsTime(Unit unit)         { return IsQuantity(unit, Config.Quantity.Time); }
-        public static bool IsTemperature(Unit unit)  { return IsQuantity(unit, Config.Quantity.Temperature); }
-		public static bool IsPressure(Unit unit)     { return IsQuantity(unit, Config.Quantity.Pressure); }
-        public static bool IsHumidity(Unit unit)     { return IsQuantity(unit, Config.Quantity.Humidity); }
-        public static bool IsError(Unit unit)        { return IsQuantity(unit, Config.Quantity.Error); }
-		public static bool IsLength(Unit unit)       { return IsQuantity(unit, Config.Quantity.Length); }
-		public static bool IsDensity(Unit unit)      { return IsQuantity(unit, Config.Quantity.Density); }
-		public static bool IsEnergy(Unit unit)       { return IsQuantity(unit, Config.Quantity.Energy); }
-        public static bool IsPulses(Unit unit)       { return IsQuantity(unit, Config.Quantity.Pulses); }
-        public static bool IsPulsePerLtr(Unit unit)  { return IsQuantity(unit, Config.Quantity.PulsePerLtr); }
-        public static bool IsPulsePerKWh(Unit unit)  { return IsQuantity(unit, Config.Quantity.PulsePerKWh); }
-        public static bool IsConductivity(Unit unit) { return IsQuantity(unit, Config.Quantity.Conductivity); }
+		public static bool IsVolume(Unit unit)       { return IsQuantity(unit, Quantity.Volume); }
+		public static bool IsFlow(Unit unit)         { return IsQuantity(unit, Quantity.Flow); }
+        public static bool IsMass(Unit unit)         { return IsQuantity(unit, Quantity.Mass); }
+        public static bool IsTime(Unit unit)         { return IsQuantity(unit, Quantity.Time); }
+        public static bool IsTemperature(Unit unit)  { return IsQuantity(unit, Quantity.Temperature); }
+		public static bool IsPressure(Unit unit)     { return IsQuantity(unit, Quantity.Pressure); }
+        public static bool IsHumidity(Unit unit)     { return IsQuantity(unit, Quantity.Humidity); }
+        public static bool IsError(Unit unit)        { return IsQuantity(unit, Quantity.Error); }
+		public static bool IsLength(Unit unit)       { return IsQuantity(unit, Quantity.Length); }
+		public static bool IsDensity(Unit unit)      { return IsQuantity(unit, Quantity.Density); }
+		public static bool IsEnergy(Unit unit)       { return IsQuantity(unit, Quantity.Energy); }
+        public static bool IsPulses(Unit unit)       { return IsQuantity(unit, Quantity.Pulses); }
+        public static bool IsPulsePerLtr(Unit unit)  { return IsQuantity(unit, Quantity.PulsePerLtr); }
+        public static bool IsPulsePerKWh(Unit unit)  { return IsQuantity(unit, Quantity.PulsePerKWh); }
+        public static bool IsConductivity(Unit unit) { return IsQuantity(unit, Quantity.Conductivity); }
 
 
 

Common/Utils.cs

@@ -1,8 +1,7 @@
 ///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
+/// Copyright (c) 2021-2022 Sensus Slovensko a.s.
 ///
 using System;
-using System.IO.Ports;
 
 namespace Common
 {
@@ -15,32 +14,83 @@ namespace Common
             return string.Format("{0} ({1}/{2})", name, repetitionNr, repeats);
         }
 
-        public static Parity GetParity(string str, Parity defaultParity = Parity.None)
+        public static string ToNiceString(double value, int sigDigits)
         {
-            if (str.Equals(Parity.None.ToString())) return Parity.None;
-            if (str.Equals(Parity.Even.ToString())) return Parity.Even;
-            if (str.Equals(Parity.Odd.ToString())) return Parity.Odd;
-            if (str.Equals(Parity.Mark.ToString())) return Parity.Mark;
-            if (str.Equals(Parity.Space.ToString())) return Parity.Space;
-            return defaultParity;
+            string format = SignificantDigitsToFmt(value, sigDigits);
+            return (format == "F0") ? value.ToString("F0") : value.ToString(format).TrimEnd(new char[] { '0' });
         }
 
-        public static StopBits GetStopBits(string str, StopBits defaultStopBits = StopBits.One)
+        public static string SignificantDigitsToFmt(double value, int sigDigits)
         {
-            if (str.Equals(StopBits.None.ToString())) return StopBits.None;
-            if (str.Equals(StopBits.One.ToString())) return StopBits.One;
-            if (str.Equals(StopBits.OnePointFive.ToString())) return StopBits.OnePointFive;
-            if (str.Equals(StopBits.Two.ToString())) return StopBits.Two;
-            return defaultStopBits;
-        }
-
-        public static Handshake GetHandshake(string str, Handshake defaultHandshake = Handshake.None)
-        {
-            if (str.Equals(Handshake.None.ToString())) return Handshake.None;
-            if (str.Equals(Handshake.RequestToSend.ToString())) return Handshake.RequestToSend;
-            if (str.Equals(Handshake.XOnXOff.ToString())) return Handshake.XOnXOff;
-            if (str.Equals(Handshake.RequestToSendXOnXOff.ToString())) return Handshake.RequestToSendXOnXOff;
-            return defaultHandshake;
+            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";
+            }
         }
     }
 }

Config/Config.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;MILWAUKEE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -30,10 +30,11 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;MILWAUKEE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FluentNHibernate">
@@ -69,7 +70,6 @@
   <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" />
@@ -81,7 +81,6 @@
     <Compile Include="Entities\IHasItemNr.cs" />
     <Compile Include="Entities\IHasName.cs" />
     <Compile Include="Entities\IHasValves.cs" />
-    <Compile Include="Entities\IParamsProvider.cs" />
     <Compile Include="Entities\MeasurementCorrection.cs" />
     <Compile Include="Entities\MetersPath.cs" />
     <Compile Include="Entities\OutputPath.cs" />
@@ -124,7 +123,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Strings.resx</DependentUpon>
     </Compile>
-    <Compile Include="Units.cs" />
     <Compile Include="Utils.cs" />
   </ItemGroup>
   <ItemGroup>

Config/Data.cs

@@ -2,7 +2,7 @@
 
 namespace Config
 {
-	public class Data : Users.GlobalData
+	public class Data : Users.CurrentUser
 	{
 		public const string AdminUsername = "admin";
 		public const string AdminPassword = "staratura";

Config/DatabaseSettings.cs

@@ -1,64 +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, IComparable
-    {
-        // 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(Common.DBType.MySql, string.Empty);
-			WaterMetersDBSettings = new Users.DBSettings(Common.DBType.MySql, string.Empty);
-            EventsDBSettings = new Users.DBSettings(Common.DBType.MySql, string.Empty);
-			UsersDBSettings = new Users.DBSettings(Common.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 int CompareTo(object dbs2)
-        {
-            if (!(dbs2 is DatabaseSettings)) return 0;
-            return String.Compare(BenchName, (dbs2 as DatabaseSettings).BenchName);
-        }
-
-		public override string ToString()
-		{
-            return string.Format("{0} config={1} results={2} events={3} users={4}",
-                                 BenchName,
-                                 ProceduresDBSettings.ConnectionString,
-                                 WaterMetersDBSettings.ConnectionString,
-                                 EventsDBSettings.ConnectionString,
-                                 UsersDBSettings.ConnectionString);
-		}
-    }
-}

Config/Entities/BenchPath.cs

@@ -1,8 +1,9 @@
 ///
-/// Copyright (c) 2013-2017 Sensus Metering Systems
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 
 namespace Config.Entities
 {
@@ -14,6 +15,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 Unit   FlowUnit { get; set; }        /// Not mapped to database, used in UI
         public virtual string Selector { get; set; }
         public virtual string TempMtrUp { get; set; }
         public virtual string TempMtrDown { get; set; }
@@ -26,13 +28,16 @@ namespace Config.Entities
 		public virtual string ValvesOpen { get; set; }
 		public virtual string ValvesClose { get; set; }
 
+        public virtual bool QfromTextChngd { get; set; }    /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
+        public virtual bool QtoTextChngd { get; set; }      /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
+
         /// ------------- Additional stuff not mapped into the database -------------
 
 		public BenchPath()
         {
 			ValvesOpen  = string.Empty;
 			ValvesClose = string.Empty;
-		}
+        }
 
 		public BenchPath(string name, int itemNr)
 			: this()
@@ -47,6 +52,7 @@ namespace Config.Entities
 
 			result.Qfrom         = Qfrom;
             result.Qto           = Qto;
+            result.FlowUnit      = FlowUnit;
             result.Selector      = Selector;
             result.TempMtrUp     = TempMtrUp;
 			result.TempMtrDown   = TempMtrDown;

Config/Entities/ComponentProcedure.cs

@@ -3,6 +3,7 @@
 ///
 using System;
 using System.IO;
+using Common;
 
 namespace Config.Entities
 {

Config/Entities/ComponentTest.cs

@@ -3,6 +3,7 @@
 ///
 using System;
 using System.IO;
+using Common;
 
 namespace Config.Entities
 {

Config/Entities/FeedingPath.cs

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

Config/Entities/MeasurementCorrection.cs

@@ -1,16 +1,17 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
+using System.Collections.Generic;
 
 namespace Config.Entities
 {
-	public class MeasurementCorrection
+	public class MeasurementCorrection : Common.IMeasurementCorrection, IComparable<MeasurementCorrection>
 	{
 		public virtual int Id { get; protected set; }
         public virtual int RangeIx { get; set; }        /// 0..5
-		public virtual float Measurement { get; set; }
-		public virtual float Correction { get; set; }
+		public virtual double Measurement { get; set; }
+		public virtual double Correction { get; set; }
 
         public MeasurementCorrection()
         {
@@ -21,5 +22,68 @@ namespace Config.Entities
         {
             RangeIx = rangeIx; 
         }
-	}
+
+        public virtual int CompareTo(MeasurementCorrection other)
+        {
+            return (Measurement > other.Measurement) ? 1 : ((Measurement == other.Measurement) ? 0 : -1);
+        }
+
+        /// <summary>
+        /// Calculates corrected value from a list of corrections by interpolation.
+        /// It is assumed that values in the list 'corrections' are sorted.
+        /// </summary>
+        /// <param name="rawMeasurement">Raw uncorrected value</param>
+        /// <param name="corrections">Sorted (value, correction) pairs</param>
+        /// <returns>Corrected value</returns>
+        public static double CorrectedValue(double rawValue, IList<MeasurementCorrection> corrections)
+        {
+            return rawValue + GetCorrection(rawValue, corrections);
+        }
+
+        /// <summary>
+        /// Get a correction from a list of corrections by interpolation.
+        /// It is assumed that values in the list 'corrections' are sorted.
+        /// </summary>
+        /// <param name="rawMeasurement">Raw uncorrected value</param>
+        /// <param name="corrections">Sorted (value, correction) pairs</param>
+        /// <returns>Corrected value</returns>
+        public static double GetCorrection(double rawValue, IList<MeasurementCorrection> corrections)
+        {
+            if ((corrections == null) || (corrections.Count == 0)) return 0;    /// No correction
+
+            if (rawValue < corrections[0].Measurement)
+            {
+                /// rawValue is below the lowest value in the correction table
+                return corrections[0].Correction;
+            }
+
+            for (int i = 1; i < corrections.Count; i++)
+            {
+                if (rawValue < corrections[i].Measurement)
+                {
+                    double d1 = rawValue - corrections[i - 1].Measurement;
+                    double d2 = corrections[i].Measurement - rawValue;
+
+                    if (d1 + d2 <= float.Epsilon)
+                    {
+                        /// Neigboring values in the corection table are close to each other -> calculate the average
+                        return (corrections[i - 1].Correction + corrections[i].Correction) / 2.0;
+                    }
+                    else
+                    {
+                        /// Interpolate the correction from neigboring values in the corection table
+                        return (corrections[i - 1].Correction * d2 + corrections[i].Correction * d1) / (d1 + d2);
+                    }
+                }
+            }
+
+            /// rawValue is above the highest value in the correction table
+            return corrections[corrections.Count - 1].Correction;
+        }
+
+        public override string ToString()
+        {
+            return string.Format("{0} {1} ({2})", Measurement, Correction, RangeIx);
+        }
+    }
 }

Config/Entities/OutputPath.cs

@@ -1,23 +1,25 @@
 ///
-/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 
 namespace Config.Entities
 {
 	public class OutputPath : IHasName, IHasItemNr, IHasValves
     {
-        public virtual int Id { get; protected set; }
-		public virtual int ItemNr { get; set; }
+        public virtual int    Id { get; protected set; }
+		public virtual int    ItemNr { get; set; }
 		public virtual string Name { get; set; }
         public virtual string OriName { get; set; }         /// Not mapped to database
-        public virtual float Qfrom { get; set; }			/// Water flow in [m3/h]
-        public virtual float Qto { get; set; }				/// Water flow in [m3/h]
+        public virtual float  Qfrom { get; set; }			/// Water flow in [m3/h]
+        public virtual float  Qto { get; set; }				/// Water flow in [m3/h]
+        public virtual Unit   FlowUnit { get; set; }        /// Not mapped to database, used in UI
         public virtual string Selector { get; set; }
         public virtual string RegulValve { get; set; }
 		public virtual string FlowMeter { get; set; }
-		public virtual float PidCoef { get; set; }			/// PID coefficient for the regulation path
+		public virtual float  PidCoef { get; set; }			/// PID coefficient for the regulation path
         public virtual string StartValve { get; set; }
         public virtual string Diverter { get; set; }
 		public virtual string TempDiv { get; set; }
@@ -28,13 +30,16 @@ namespace Config.Entities
 		public virtual string ValvesOpen { get; set; }
 		public virtual string ValvesClose { get; set; }
 
+        public virtual bool QfromTextChngd { get; set; }    /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
+        public virtual bool QtoTextChngd { get; set; }      /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
+
         /// ------------- Additional stuff not mapped into the database -------------
 
 		public OutputPath()
         {
 			ValvesOpen = string.Empty;
 			ValvesClose = string.Empty;
-		}
+        }
 
 		public OutputPath(string name, int itemNr)
 			: this()
@@ -47,20 +52,21 @@ namespace Config.Entities
         {
 			OutputPath result = new OutputPath(name, itemNr);
 
-			result.Name        = Name;
-			result.Qfrom       = Qfrom;
-            result.Qto         = Qto;
-            result.Selector    = Selector;
-			result.RegulValve  = RegulValve;
-			result.FlowMeter   = FlowMeter;
-			result.PidCoef     = PidCoef;
-            result.StartValve  = StartValve;
-			result.Diverter    = Diverter;
-			result.TempDiv     = TempDiv;
-			result.Scale       = Scale;
+			result.Name           = Name;
+			result.Qfrom          = Qfrom;
+            result.Qto            = Qto;
+            result.FlowUnit       = FlowUnit;
+            result.Selector       = Selector;
+			result.RegulValve     = RegulValve;
+			result.FlowMeter      = FlowMeter;
+			result.PidCoef        = PidCoef;
+            result.StartValve     = StartValve;
+			result.Diverter       = Diverter;
+			result.TempDiv        = TempDiv;
+			result.Scale          = Scale;
             result.RegulValvesPct = RegulValvesPct;
-			result.ValvesOpen  = ValvesOpen;
-			result.ValvesClose = ValvesClose;
+			result.ValvesOpen     = ValvesOpen;
+			result.ValvesClose    = ValvesClose;
 
             return result;
         }

Config/Entities/Procedure.cs

@@ -75,7 +75,7 @@ namespace Config.Entities
 			///
 			/// Default values
 			/// 
-			CreationUser = (Users.GlobalData.CurrentUser != null) ? Users.GlobalData.CurrentUser.UserName : null;
+			CreationUser = Users.CurrentUser.UserName();
 			CreationTime = DateTime.Now;
 			LastChgUser = CreationUser;
 			LastChgTime = CreationTime;

Config/Entities/Profile.cs

@@ -36,7 +36,7 @@ namespace Config.Entities
 			///
 			/// Default values
 			/// 
-			CreationUser = (Users.GlobalData.CurrentUser != null) ? Users.GlobalData.CurrentUser.UserName : null;
+            CreationUser = Users.CurrentUser.UserName();
 			CreationTime = DateTime.Now;
 			LastChgUser = CreationUser;
 			LastChgTime = CreationTime;

Config/Entities/Test.cs

@@ -34,10 +34,10 @@ namespace Config.Entities
         public virtual int Repeats { get; set; }
         public virtual bool DoDraining { get; set; }
         public virtual bool DoDrainingAfter { get; set; }
-		public virtual bool DoControlWaterTemp { get; set; }
 		public virtual float TempLimLo { get; set; }		/// Lower limit for the controlled temperature
 		public virtual float TempLimHi { get; set; }		/// Upper limit for the controlled temperature
-		public virtual float PumpPower { get; set; }		/// Power of the pump in [%] in the range 0 .. 100.0f, use values 0% and 100% for non-FM pumps
+        public virtual string TempControl { get; set; }     /// Water temperature controller, null or empty = Do not control water temp
+        public virtual float PumpPower { get; set; }		/// Power of the pump in [%] in the range 0 .. 100.0f, use values 0% and 100% for non-FM pumps
         public virtual int MassRepeats { get; set; }		/// Number of mass. measurements at the beginning/end of test, 0 = default (=5)
         public virtual float MassSpread { get; set; }		/// Max spread of mass. measurements at the beginning/end of test, 0 = default
 		public virtual MassMethod MassMethod { get; set; }	/// method of mass. measurement at the beginning/end of test: false=slow (precise), true=using immediate mass measurement and evaluation
@@ -91,25 +91,25 @@ namespace Config.Entities
             Profile = TestProfile.UserDefined;
             Publish = (sbyte)Common.Publish.Always;
 			DoEvaluate = true;
-			Repeats = 1;
+            ErrLimLo = -2.0f;				/// [%] lower error limit
+            ErrLimHi = 2.0f;				/// [%] upper error limit
+            Uncertainty = 0;
+            Repeats = 1;
 			DoDraining = false;
 			DoDrainingAfter = false;
-			DoControlWaterTemp = false;
 			TempLimLo = 15.0f;
 			TempLimHi = 25.0f;
-			ErrLimLo = -2.0f;				/// [%] lower error limit
-			ErrLimHi = 2.0f;				/// [%] upper error limit
-			Uncertainty = 0;
+            TempControl = string.Empty;
             PumpPower = 60.0f;				/// [%]
             MassRepeats = 0;				/// default
             MassSpread = 0;					/// default
-            MassMethod = MassMethod.Scale;     /// default
+            MassMethod = MassMethod.Scale;  /// default
             TimeBeforeFlow = 10;			/// [s] time before the start of flow control in [s]
             TimeFlow2Mass = 5;				/// [s] time from the flow stable to the 1st mass measurement in [s]
             TimePump2StartV = 1;			/// [s] time from the 1st mass measurement to the test start in [s]
             TimeStop2Mass = 5;				/// [s] between the test end and the final mass measurement
-            ShortPulses = 0;					/// = Filter parameter
-			TransBefore  = string.Empty;
+            ShortPulses = 0;				/// Short pulses parameter (0 or 1)
+			TransBefore = string.Empty;
 			TransBetween = string.Empty;
 			TransAfter = string.Empty;
 		}
@@ -169,10 +169,10 @@ namespace Config.Entities
 			result.Repeats = Repeats;
             result.DoDraining = DoDraining;
             result.DoDrainingAfter = DoDrainingAfter;
-			result.DoControlWaterTemp = DoControlWaterTemp;
 			result.TempLimLo = TempLimLo;
 			result.TempLimHi = TempLimHi;
-			result.PumpPower = PumpPower;
+            result.TempControl = TempControl;
+            result.PumpPower = PumpPower;
             result.MassRepeats = MassRepeats;
             result.MassSpread = MassSpread;
             result.MassMethod = MassMethod;
@@ -223,10 +223,10 @@ namespace Config.Entities
             output.WriteLine(Repeats.ToString(ci));
             output.WriteLine(DoDraining.ToString());
             output.WriteLine(DoDrainingAfter.ToString());
-			output.WriteLine(DoControlWaterTemp.ToString());
 			output.WriteLine(TempLimLo.ToString(ci));
 			output.WriteLine(TempLimHi.ToString(ci));
-			output.WriteLine(PumpPower.ToString(ci));
+            output.WriteLine((TempControl != null) ? TempControl : string.Empty);
+            output.WriteLine(PumpPower.ToString(ci));
             output.WriteLine(MassRepeats.ToString(ci));
             output.WriteLine(MassSpread.ToString(ci));
 			output.WriteLine(((byte)MassMethod).ToString(ci));
@@ -274,10 +274,10 @@ namespace Config.Entities
 			tst.Repeats = int.Parse(input.ReadLine(), ci);
             tst.DoDraining = bool.Parse(input.ReadLine());
 			tst.DoDrainingAfter = bool.Parse(input.ReadLine());
-			tst.DoControlWaterTemp = bool.Parse(input.ReadLine());
 			tst.TempLimLo = float.Parse(input.ReadLine(), ci);
 			tst.TempLimHi = float.Parse(input.ReadLine(), ci);
-			tst.PumpPower = float.Parse(input.ReadLine(), ci);
+            tst.TempControl = input.ReadLine();
+            tst.PumpPower = float.Parse(input.ReadLine(), ci);
 			tst.MassRepeats = int.Parse(input.ReadLine(), ci);
 			tst.MassSpread = float.Parse(input.ReadLine(), ci);
 			tst.MassMethod = (MassMethod)byte.Parse(input.ReadLine(), ci);
@@ -336,9 +336,9 @@ namespace Config.Entities
             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 != DoControlWaterTemp.ToString())   { diff.AppendFormat(fmt, "DoControlWaterTemp", DoControlWaterTemp.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != TempLimLo.ToString(ci))          { diff.AppendFormat(fmt, "TempLimLo", TempLimLo.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != TempLimHi.ToString(ci))          { diff.AppendFormat(fmt, "TempLimHi", TempLimHi.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != TempControl)                     { diff.AppendFormat(fmt, "TempController", TempControl, ln); };
             ln = inp.ReadLine(); if (ln != PumpPower.ToString(ci))          { diff.AppendFormat(fmt, "PumpPower", PumpPower.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != MassRepeats.ToString(ci))        { diff.AppendFormat(fmt, "MassRepeats", MassRepeats.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != MassSpread.ToString(ci))         { diff.AppendFormat(fmt, "MassSpread", MassSpread.ToString(ci), ln); };

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/FluentCommon.cs

@@ -27,11 +27,11 @@ namespace Config
                 switch (dbType)
 				{
 					default:
-                    case Common.DBType.SQLite:
-						cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
-                        break;
                     case Common.DBType.MySql:
                         cfg = cfg.Database(MySQLConfiguration.Standard.ConnectionString(connectionString));
+                        break;
+                    case Common.DBType.SQLite:
+						cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
                         break;
 				}
 

Config/Formulas.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 
 namespace Config
 {
@@ -182,7 +183,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 * Units.ConvertTo(Unit.Pa, pressure));
         }
 
 
@@ -238,7 +239,7 @@ namespace Config
         /// <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)
+        public static double CorrectedValue(double rawValue, IList<IMeasurementCorrection> corrections)
         {
             return rawValue + GetCorrection(rawValue, corrections);
         }
@@ -250,7 +251,7 @@ namespace Config
         /// <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)
+        public static double GetCorrection(double rawValue, IList<IMeasurementCorrection> corrections)
         {
             if ((corrections == null) || (corrections.Count == 0)) return 0;    /// No correction
 
@@ -316,11 +317,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 = Units.ConvertTo(Unit.K, T_in);
+            double T_out_K = Units.ConvertTo(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 = Units.ConvertTo(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;

Config/Mappings/TestMap.cs

@@ -29,10 +29,10 @@ namespace Config.Mappings
 				.Column("Emptying");
             Map(x => x.DoDrainingAfter)
 				.Column("Zeroing");
-            Map(x => x.DoControlWaterTemp);
             Map(x => x.TempLimLo);
 			Map(x => x.TempLimHi);
-			Map(x => x.PumpPower);
+            Map(x => x.TempControl);
+            Map(x => x.PumpPower);
             Map(x => x.MassRepeats);
             Map(x => x.MassSpread);
 			Map(x => x.MassMethod)

Config/Utils.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2017-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2017-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -11,80 +11,6 @@ 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>

DataStreamInterface/DataStreamInterface.csproj

@@ -22,6 +22,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,6 +32,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

DataStreamMeter/DataStreamMeter.csproj

@@ -20,6 +20,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -28,6 +29,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

DeviceTest/DeviceTestDlg.cs

@@ -422,7 +422,7 @@ namespace DeviceTest
 			{
 				parentCfg = parentFactory.DefaultConfig();
 			}
-            ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+            ComponentParametersDlg cfgForm = new ComponentParametersDlg(this);
             cfgForm.CmpntEntities = new List<Config.Entities.Component>();
 
             IComponentCfgCtrl cfgControl = parentCfg.GetControl(cfgForm.CmpntEntities);
@@ -451,7 +451,7 @@ namespace DeviceTest
 			{
 				component1Cfg = component1Factory.DefaultConfig();
 			}
-			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+			ComponentParametersDlg cfgForm = new ComponentParametersDlg(this);
 			///
 			var compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
@@ -485,7 +485,7 @@ namespace DeviceTest
 			{
 				component2Cfg = component2Factory.DefaultConfig();
 			}
-			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+			ComponentParametersDlg cfgForm = new ComponentParametersDlg(this);
 			///
 			var compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
@@ -520,7 +520,7 @@ namespace DeviceTest
 			{
 				component3Cfg = component3Factory.DefaultConfig();
 			}
-			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+			ComponentParametersDlg cfgForm = new ComponentParametersDlg(this);
 			///
 			var compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
@@ -677,10 +677,10 @@ namespace DeviceTest
 			{
 				operation1 = (tbfComponent1forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent1forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
+			else if (tbfComponent1forOp is TBF.Rig.Modbus.TempControl.Easytherm.Easytherm)
 			{
-				operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.TempControl.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.TempControl.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
             else if (tbfComponent1forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
@@ -716,10 +716,10 @@ namespace DeviceTest
 			{
 				operation21 = (tbfComponent2forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent2forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
+			else if (tbfComponent2forOp is TBF.Rig.Modbus.TempControl.Easytherm.Easytherm)
 			{
-				operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.TempControl.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.TempControl.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
             else if (tbfComponent2forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
@@ -755,10 +755,10 @@ namespace DeviceTest
 			{
 				operation31 = (tbfComponent3forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent3forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
+			else if (tbfComponent3forOp is TBF.Rig.Modbus.TempControl.Easytherm.Easytherm)
 			{
-				operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.TempControl.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.TempControl.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
             else if (tbfComponent3forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
             {

Dirichlet.Numerics/Dirichlet.Numerics.csproj

@@ -24,6 +24,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -33,6 +34,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

EventViewer/EventViewerWnd.Designer.cs

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

EventViewer/EventViewerWnd.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Windows.Forms;
 using NHibernate;
 using Common;
-using Common.UIControls;
+using Common.Forms;
 using Events;
 using Events.Entities;
 using EventViewer.Resources;
@@ -33,7 +33,7 @@ namespace EventViewer
         ISession session;
         IList<Subscriber> subscribers;
         IList<Event> events;
-        SortOrder sortOrder = SortOrder.Ascending;
+        MySortOrder sortOrder = MySortOrder.Ascending;
         int sortColumn = -1;                        /// 0-based index of column to be used for sorting
 
         EViewerOption eViewerOption;
@@ -222,13 +222,13 @@ namespace EventViewer
         {
             if (e.Column == sortColumn)
             {
-                sortOrder = (sortOrder == SortOrder.Ascending) ? SortOrder.Descending : SortOrder.Ascending;
+                sortOrder = (sortOrder == MySortOrder.Ascending) ? MySortOrder.Descending : MySortOrder.Ascending;
             }
             else
             {
                 /// Clicked on another column header => set sortOrder to SortOrder.Ascending
                 sortColumn = e.Column;
-                sortOrder = SortOrder.Ascending;
+                sortOrder = MySortOrder.Ascending;
             }
 
             switch ((Column)sortColumn)
@@ -291,7 +291,7 @@ namespace EventViewer
         {
             try
             {
-                Users.GlobalData.RemoteUsersDB = new Users.DBSettings(Common.DBType.MySql, Program.LocalSettings.UsersDBConnString);
+                Users.CurrentUser.RemoteUsersDB = new Common.DBSettings(Common.DBType.MySql, Program.LocalSettings.UsersDBConnString);
                 Users.Forms.LoginDlg dlg = new Users.Forms.LoginDlg();
                 if (dlg.ShowDialog() == DialogResult.OK)
                 {

Events/DB.cs

@@ -64,12 +64,12 @@ namespace Events
 			switch (dbType)
 			{
 				default:
-				case DBType.SQLite:
-					cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
-                    break;
-				case DBType.MySql:
+                case DBType.MySql:
                     cfg = cfg.Database(MySQLConfiguration.Standard.ConnectionString(connectionString));
                     break;
+                case DBType.SQLite:
+					cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
+                    break;
 			}
 
             cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<Entities.Event>());

Events/Events.csproj

@@ -22,6 +22,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,6 +32,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FluentNHibernate">

FeatureVectorCalculator/SignalChart.cs

@@ -55,12 +55,42 @@ namespace FeatureVectorCalculator
             //     cl.ToPosition = Math.Log10(xs[j] / spacer);
             //     chArea.AxisX.CustomLabels.Add(cl);
             // }
+
             chArea.AxisY.Title = captionY;
             chArea.AxisY.IsLogarithmic = false;
             chArea.AxisY.IsLabelAutoFit = true;
-            chArea.AxisY.IsStartedFromZero = fromZero;
-            chArea.AxisY.Minimum = chArea.AxisY.IsStartedFromZero ? 0 : minY;
-            chArea.AxisY.Maximum = 1.1 * maxY;
+            
+            if (!fromZero)
+            {
+                /// fromZero = false
+                chArea.AxisY.IsStartedFromZero = false;
+                float diff = maxY - minY;
+                chArea.AxisY.Minimum = minY - 0.05 * diff;
+                chArea.AxisY.Maximum = maxY + 0.05 * diff;
+            }
+            else if (minY >= 0)
+            {
+                /// fromZero = true, All points are above zero
+                chArea.AxisY.IsStartedFromZero = true;
+                chArea.AxisY.Minimum = 0;
+                chArea.AxisY.Maximum = 1.05 * maxY;
+            }
+            else if (maxY <= 0)
+            {
+                /// fromZero = true, All points are below zero
+                chArea.AxisY.IsStartedFromZero = true;
+                chArea.AxisY.Minimum = 1.05 * minY;
+                chArea.AxisY.Maximum = 0;
+            }
+            else
+            {
+                /// Points are both below and above zero
+                chArea.AxisY.IsStartedFromZero = false;
+                float diff = maxY - minY;
+                chArea.AxisY.Minimum = minY - 0.05 * diff;
+                chArea.AxisY.Maximum = maxY + 0.05 * diff;
+            }
+            
             if (chArea.AxisY.Maximum == chArea.AxisY.Minimum)
             {
                 chArea.AxisY.Maximum = chArea.AxisY.Maximum + 1;

GenCode128/GenCode128.csproj

@@ -76,6 +76,7 @@
     <WarningLevel>4</WarningLevel>
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -99,6 +100,7 @@
     <WarningLevel>4</WarningLevel>
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System">

GraphLib/GraphLib.csproj

@@ -27,6 +27,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -36,6 +37,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

ResetBatchNr/ResetBatchNr.csproj

@@ -48,9 +48,9 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Config\Config.csproj">
-      <Project>{743df7db-c7b6-42eb-986d-0f485e5588e4}</Project>
-      <Name>Config</Name>
+    <ProjectReference Include="..\Common\Common.csproj">
+      <Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
+      <Name>Common</Name>
     </ProjectReference>
     <ProjectReference Include="..\TBF\TBF.csproj">
       <Project>{8648fd92-cda1-4c3a-b5f9-fe547ce1fa48}</Project>

Results/Entities/Batch.cs

@@ -207,7 +207,7 @@ namespace Results.Entities
 
             foreach (var tr in TestRslts)
             {
-                if (tr.TestDone)
+                if (tr.TestDone && tr.AmbTempMean != 0)
                 {
                     double duration = (tr.EndTime - tr.StartTime).TotalSeconds;
                     timeSum += duration;
@@ -225,7 +225,7 @@ namespace Results.Entities
 
             foreach (var tr in TestRslts)
             {
-                if (tr.TestDone)
+                if (tr.TestDone && tr.AmbPressMean != 0)
                 {
                     double duration = (tr.EndTime - tr.StartTime).TotalSeconds;
                     timeSum += duration;
@@ -243,7 +243,7 @@ namespace Results.Entities
             
             foreach (var tr in TestRslts)
             {
-                if (tr.TestDone)
+                if (tr.TestDone && tr.AmbHumiMean != 0)
                 {
                     double duration = (tr.EndTime - tr.StartTime).TotalSeconds;
                     timeSum += duration;
@@ -258,7 +258,7 @@ namespace Results.Entities
         {
             for (int i = 0; i < TestRslts.Count; i++)
             {
-                if (TestRslts[i].Publish() == Publish.Always)
+                if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbTempStart != 0)
                     return TestRslts[i].AmbTempStart;
             }
             return 0;
@@ -267,7 +267,7 @@ namespace Results.Entities
         {
             for (int i = 0; i < TestRslts.Count; i++)
             {
-                if (TestRslts[i].Publish() == Publish.Always)
+                if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbPressStart != 0)
                     return TestRslts[i].AmbPressStart;
             }
             return 0;
@@ -276,7 +276,7 @@ namespace Results.Entities
         {
             for (int i = 0; i < TestRslts.Count; i++)
             {
-                if (TestRslts[i].Publish() == Publish.Always)
+                if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbHumiStart != 0)
                     return TestRslts[i].AmbHumiStart;
             }
             return 0;
@@ -284,27 +284,27 @@ namespace Results.Entities
 
         public virtual double AmbTempEnd()
         {
-            for (int i = TestRslts.Count - 1; i >= 0; i++)
+            for (int i = TestRslts.Count - 1; i >= 0; i--)
             {
-                if (TestRslts[i].Publish() == Publish.Always)
+                if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbTempEnd != 0)
                     return TestRslts[i].AmbTempEnd;
             }
             return 0;
         }
         public virtual double AmbPressEnd()
         {
-            for (int i = TestRslts.Count - 1; i >= 0; i++)
+            for (int i = TestRslts.Count - 1; i >= 0; i--)
             {
-                if (TestRslts[i].Publish() == Publish.Always)
+                if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbPressEnd != 0)
                     return TestRslts[i].AmbPressEnd;
             }
             return 0;
         }
         public virtual double AmbHumiEnd()
         {
-            for (int i = TestRslts.Count - 1; i >= 0; i++)
+            for (int i = TestRslts.Count - 1; i >= 0; i--)
             {
-                if (TestRslts[i].Publish() == Publish.Always)
+                if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbHumiEnd != 0)
                     return TestRslts[i].AmbHumiEnd;
             }
             return 0;

Results/Entities/TestData.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2016-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -26,10 +26,10 @@ namespace Results.Entities
         public virtual double ErrLimLo              { get; set; }	/// [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
         public virtual double ErrLimHi              { get; set; }	/// [%] usually > 0, in case of heat meters: -Qn in m3/h
         public virtual double ErrLimMargin          { get; set; }	///	[%] makes error limits tighter: 0 <= ErrLimMargin <= abs(ErrLimXx)
-		public virtual bool   DoControlWaterTemp	{ get; set; }
 		public virtual float  TempLimLo				{ get; set; }
 		public virtual float  TempLimHi				{ get; set; }
-		public virtual sbyte  Publish				{ get; set; }   /// 0=no, 1=in all protocols, 2=on screen, 3=internal
+        public virtual string TempControl           { get; set; }
+        public virtual sbyte  Publish               { get; set; }   /// 0=no, 1=in all protocols, 2=on screen, 3=internal
 		public virtual bool   Evaluate				{ get; set; }
 
 
@@ -45,22 +45,22 @@ namespace Results.Entities
 		public TestData(Test test)
 			: this()
 		{
-			Name               =         test.Name;
-			Repeats            =         test.Repeats;
-            Qtg                = (double)test.Qtg;
-            Qfrom              = (double)test.Qfrom;
-			Qto                = (double)test.Qto;
-			TargetVolume       = (double)test.Volume;
-			TargetTime         = (double)test.TestTime;
-			Method             =         test.Method;
-			ErrLimLo           = (double)test.ErrLimLo;
-			ErrLimHi           = (double)test.ErrLimHi;
-			ErrLimMargin       = (double)test.Uncertainty;
-			DoControlWaterTemp =         test.DoControlWaterTemp;
-			TempLimLo          =         test.TempLimLo;
-			TempLimHi          =         test.TempLimHi;
-			Publish            =         test.Publish;
-			Evaluate           =         test.DoEvaluate;
+			Name           = test.Name;
+			Repeats        = test.Repeats;
+            Qtg            = test.Qtg;
+            Qfrom          = test.Qfrom;
+			Qto            = test.Qto;
+			TargetVolume   = test.Volume;
+			TargetTime     = test.TestTime;
+			Method         = test.Method;
+			ErrLimLo       = test.ErrLimLo;
+			ErrLimHi       = test.ErrLimHi;
+			ErrLimMargin   = test.Uncertainty;
+			TempLimLo      = test.TempLimLo;
+			TempLimHi      = test.TempLimHi;
+            TempControl    = test.TempControl;
+            Publish        = test.Publish;
+			Evaluate       = test.DoEvaluate;
 		}
 
         /// <summary>
@@ -68,22 +68,22 @@ namespace Results.Entities
         /// </summary>
         public TestData(TestData oriTestData)
         {
-            Name			   = oriTestData.Name;
-            Repeats			   = oriTestData.Repeats;
-            Qtg                = oriTestData.Qtg;
-            Qfrom              = oriTestData.Qfrom;
-            Qto				   = oriTestData.Qto;
-            TargetVolume	   = oriTestData.TargetVolume;
-            TargetTime		   = oriTestData.TargetTime;
-            Method			   = oriTestData.Method;
-            ErrLimLo           = oriTestData.ErrLimLo;
-            ErrLimHi           = oriTestData.ErrLimHi;
-            ErrLimMargin       = oriTestData.ErrLimMargin;
-            DoControlWaterTemp = oriTestData.DoControlWaterTemp;
-            TempLimLo		   = oriTestData.TempLimLo;
-            TempLimHi		   = oriTestData.TempLimHi;
-            Publish			   = oriTestData.Publish;
-            Evaluate           = oriTestData.Evaluate;
+            Name			= oriTestData.Name;
+            Repeats			= oriTestData.Repeats;
+            Qtg             = oriTestData.Qtg;
+            Qfrom           = oriTestData.Qfrom;
+            Qto				= oriTestData.Qto;
+            TargetVolume	= oriTestData.TargetVolume;
+            TargetTime		= oriTestData.TargetTime;
+            Method			= oriTestData.Method;
+            ErrLimLo        = oriTestData.ErrLimLo;
+            ErrLimHi        = oriTestData.ErrLimHi;
+            ErrLimMargin    = oriTestData.ErrLimMargin;
+            TempLimLo		= oriTestData.TempLimLo;
+            TempLimHi		= oriTestData.TempLimHi;
+            TempControl     = oriTestData.TempControl;
+            Publish			= oriTestData.Publish;
+            Evaluate        = oriTestData.Evaluate;
         }
 
 
@@ -105,13 +105,10 @@ namespace Results.Entities
 			if (ErrLimLo != td.ErrLimLo) return false;
 			if (ErrLimHi != td.ErrLimHi) return false;
 			if (ErrLimMargin != td.ErrLimMargin) return false;
-			if (DoControlWaterTemp != td.DoControlWaterTemp) return false;
-			if (DoControlWaterTemp)
-			{
-				if (TempLimLo != td.TempLimLo) return false;
-				if (TempLimHi != td.TempLimHi) return false;
-			}
-			if (Publish != td.Publish) return false;
+			if (TempLimLo != td.TempLimLo) return false;
+			if (TempLimHi != td.TempLimHi) return false;
+            if (TempControl != td.TempControl) return false;
+            if (Publish != td.Publish) return false;
 			if (Evaluate != td.Evaluate) return false;
 
 			return true;
@@ -150,9 +147,9 @@ namespace Results.Entities
             writer.Write(ErrLimLo);
             writer.Write(ErrLimHi);
             writer.Write(ErrLimMargin);
-            writer.Write(DoControlWaterTemp);
             writer.Write(TempLimLo);
             writer.Write(TempLimHi);
+            writer.Write((TempControl != null) ? TempControl : string.Empty);
             writer.Write(Publish);
             writer.Write(Evaluate);
         }
@@ -171,9 +168,9 @@ namespace Results.Entities
             ErrLimLo = reader.ReadDouble();
             ErrLimHi = reader.ReadDouble();
             ErrLimMargin = reader.ReadDouble();
-            DoControlWaterTemp = reader.ReadBoolean();
             TempLimLo = reader.ReadSingle();
             TempLimHi = reader.ReadSingle();
+            TempControl = reader.ReadString();
             Publish = reader.ReadSByte();
             Evaluate = reader.ReadBoolean();
         }

Results/Entities/WaterMeter.cs

@@ -95,7 +95,7 @@ namespace Results.Entities
         public virtual string CompleteSerialNr  { get; set; }
         public virtual string OriRadioAddress   { get; set; }   /// Original radio address of a 640 water meter (AlbatrosID)
         public virtual int    WMTypeRevision    { get; set; }
-        public virtual int    Pruefindex        { get; set; }	/// >= 1 ... pruefindex
+        public virtual int    Pruefindex        { get; set; }	/// >=1 ... pruefindex, 0 ... unknown (no reading from DB yet)
 		public virtual int	  HydrPruefung		{ get; set; }
         public virtual object RawTestInfos      { get; set; }	/// Not mapped to DB !!!   IList<SensusTestInfo> fetched from Oracle at the beginning of the cycle, not mapped to DB !!!
         public virtual object CompleteTestInfos { get; set; }	/// Not mapped to DB !!!   SensusTestInfo[] obtained as a best match at the beginning of the cycle, not mapped to DB !!!
@@ -444,7 +444,7 @@ namespace Results.Entities
             CompleteSerialNr = string.Empty;
             OriRadioAddress = string.Empty;
             WMTypeRevision = 0;
-            Pruefindex = 1;
+            Pruefindex = 0;
             HydrPruefung = 0;
             RawTestInfos = null;
             CompleteTestInfos = null;

Results/Forms/ListViewEx.cs

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

Results/Forms/ListViewEx.resx

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<root>
-	<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="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" />
-							<xsd:attribute name="type" type="xsd:string" />
-							<xsd:attribute name="mimetype" type="xsd:string" />
-						</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>1.0.0.0</value>
-	</resheader>
-	<resheader name="Reader">
-		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-	<resheader name="Writer">
-		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-</root>

Results/Forms/ListViewExtensions.cs

@@ -1,104 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Runtime.InteropServices;
-using System.Windows.Forms;
-
-namespace Results.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();
-                }
-            }
-        }
-    }
-}

Results/Forms/LviIntColumnComparer.cs

@@ -1,31 +0,0 @@
-using System;
-using System.Collections;
-using System.Windows.Forms;
-
-namespace Results.Forms
-{
-    public class LviIntColumnComparer : IComparer
-    {
-        int column;
-        SortOrder order;
-
-        public LviIntColumnComparer()
-        {
-            column = 0;
-            order = SortOrder.Ascending;
-        }
-
-        public LviIntColumnComparer(int column, SortOrder order)
-        {
-            this.column = column;
-            this.order = order;
-        }
-
-        public int Compare(object x, object y)
-        {
-            int valX = int.Parse(((ListViewItem)x).SubItems[column].Text);
-            int valY = int.Parse(((ListViewItem)y).SubItems[column].Text);
-            return (order == SortOrder.Descending) ? (valY - valX) : (valX - valY);
-        }
-    }
-}

Results/Forms/LviTextColumnComparer.cs

@@ -1,31 +0,0 @@
-using System;
-using System.Collections;
-using System.Windows.Forms;
-
-namespace Results.Forms
-{
-    public class LviTextColumnComparer : IComparer
-    {
-        private int column;
-        SortOrder order;
-
-        public LviTextColumnComparer()
-        {
-            column = 0;
-            order = SortOrder.Ascending;
-        }
-
-        public LviTextColumnComparer(int column, SortOrder order)
-        {
-            this.column = column;
-            this.order = order;
-        }
-
-        public int Compare(object x, object y)
-        {
-            string txtX = ((ListViewItem)x).SubItems[column].Text;
-            string txtY = ((ListViewItem)y).SubItems[column].Text;
-            return (order == SortOrder.Descending) ? String.Compare(txtY, txtX) : String.Compare(txtX, txtY);
-        }
-    }
-}

Results/Forms/ManualEntryConfigCtrl.Designer.cs

@@ -37,7 +37,7 @@
             this.availableAlphabeticTreeView = new System.Windows.Forms.TreeView();
             this.downButton = new System.Windows.Forms.Button();
             this.upButton = new System.Windows.Forms.Button();
-            this.selectedResultsListViewEx = new Results.Forms.ListViewEx();
+            this.selectedResultsListViewEx = new Common.Forms.ListViewEx();
             this.removeAllButton = new System.Windows.Forms.Button();
             this.removeButton = new System.Windows.Forms.Button();
             this.addButton = new System.Windows.Forms.Button();
@@ -247,7 +247,7 @@
         private System.Windows.Forms.TreeView availableAlphabeticTreeView;
         private System.Windows.Forms.Button downButton;
         private System.Windows.Forms.Button upButton;
-        private ListViewEx selectedResultsListViewEx;
+        private Common.Forms.ListViewEx selectedResultsListViewEx;
         private System.Windows.Forms.Button removeAllButton;
         private System.Windows.Forms.Button removeButton;
         private System.Windows.Forms.Button addButton;

Results/Forms/ManualEntryConfigCtrl.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using Common;
+using Common.Forms;
 using Config.Entities;
 using Results.Resources;
 
@@ -114,12 +115,12 @@ namespace Results.Forms
         {
 			if (e.SubItem == (int)Column.Units)
 			{
-                Config.Quantity quantity = (e.Item.Tag as ManualEntryItemSpec).Quantity;
+                Quantity quantity = (e.Item.Tag as ManualEntryItemSpec).Quantity;
 				unitsCB.Items.Clear();
-				unitsCB.Items.Add(Config.Unit.None.ToDescription());				/// "---"
-				for (Config.Unit u = (Config.Unit)1; u < Config.Unit.Count; u++)
+				unitsCB.Items.Add(Unit.None.ToDescription());				/// "---"
+				for (Unit u = (Unit)1; u < Unit.Count; u++)
 				{
-					if (Config.Units.IsQuantity(u, quantity))  unitsCB.Items.Add(u.ToDescription());
+					if (Units.IsQuantity(u, quantity))  unitsCB.Items.Add(u.ToDescription());
 				}
 				selectedResultsListViewEx.StartEditing(unitsCB, e.Item, e.SubItem);
 			}
@@ -138,7 +139,7 @@ namespace Results.Forms
             {
                 case Column.Caption:    item.Caption = e.DisplayText;   return;
                 case Column.Units:
-                    for (Config.Unit u = 0; u < Config.Unit.Count; u++)
+                    for (Unit u = 0; u < Unit.Count; u++)
                     {
 						if (u.ToDescription().Equals(unitsCB.Text))
                         {
@@ -189,10 +190,10 @@ namespace Results.Forms
 		{
 			treeView.Nodes.Clear();
 
-			IList<Config.Quantity> quantities = new List<Config.Quantity>();
-			for (Config.Quantity q = 0; q < Config.Quantity.Count; q++) quantities.Add(q);
+			IList<Quantity> quantities = new List<Quantity>();
+			for (Quantity q = 0; q < Quantity.Count; q++) quantities.Add(q);
 
-			IList<Config.Quantity> sortedQuantities = quantities.OrderBy(x => x.ToDescription()).ToList();
+			IList<Quantity> sortedQuantities = quantities.OrderBy(x => x.ToDescription()).ToList();
 
 			foreach (var q in sortedQuantities)
 			{

Results/Forms/OneWMResultsColumnsCtrl.Designer.cs

@@ -41,6 +41,7 @@
             // 
             this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+            this.splitContainer1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.splitContainer1.Location = new System.Drawing.Point(0, 0);
             this.splitContainer1.Name = "splitContainer1";
             this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
@@ -48,12 +49,13 @@
             // splitContainer1.Panel1
             // 
             this.splitContainer1.Panel1.Controls.Add(this.tBox);
+            this.splitContainer1.Panel1MinSize = 26;
             // 
             // splitContainer1.Panel2
             // 
             this.splitContainer1.Panel2.Controls.Add(this.lView);
             this.splitContainer1.Size = new System.Drawing.Size(352, 318);
-            this.splitContainer1.SplitterDistance = 25;
+            this.splitContainer1.SplitterDistance = 26;
             this.splitContainer1.SplitterWidth = 1;
             this.splitContainer1.TabIndex = 0;
             // 
@@ -62,7 +64,7 @@
             this.tBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tBox.Location = new System.Drawing.Point(0, 0);
             this.tBox.Name = "tBox";
-            this.tBox.Size = new System.Drawing.Size(352, 20);
+            this.tBox.Size = new System.Drawing.Size(352, 26);
             this.tBox.TabIndex = 0;
             this.tBox.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.tBox_MouseDoubleClick);
             // 
@@ -73,17 +75,17 @@
             this.lView.GridLines = true;
             this.lView.Location = new System.Drawing.Point(0, 0);
             this.lView.Name = "lView";
-            this.lView.Size = new System.Drawing.Size(352, 292);
+            this.lView.Size = new System.Drawing.Size(352, 291);
             this.lView.TabIndex = 0;
             this.lView.UseCompatibleStateImageBehavior = false;
             this.lView.View = System.Windows.Forms.View.Details;
             // 
-            // OneWMResultsCtrl
+            // OneWMResultsColumnsCtrl
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.splitContainer1);
-            this.Name = "OneWMResultsCtrl";
+            this.Name = "OneWMResultsColumnsCtrl";
             this.Size = new System.Drawing.Size(352, 318);
             this.splitContainer1.Panel1.ResumeLayout(false);
             this.splitContainer1.Panel1.PerformLayout();

Results/Forms/OneWMResultsColumnsCtrl.cs

@@ -85,7 +85,11 @@ namespace Results.Forms
 
             /// Update caption
 #if ORACLE_DB
-            tBox.Text = caption = string.Format("{0} ({1}) {2}", (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr), (wMtr.Pruefindex % 100), message);
+            tBox.Text = caption = string.Format("{0} ({1}) {2} {3}",
+                                                wMtr.WMPosition,
+                                                wMtr.Pruefindex == 0 ? "?" : string.Format("{0}x", wMtr.Pruefindex % 100),
+                                                (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr),
+                                                message);
 #else
             tBox.Text = caption = string.Format("s/n = {0}", string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr);
 #endif

Results/Forms/OneWMResultsRowsCtrl.Designer.cs

@@ -48,21 +48,23 @@
             // splitContainer1.Panel1
             // 
             this.splitContainer1.Panel1.Controls.Add(this.tBox);
+            this.splitContainer1.Panel1MinSize = 26;
             // 
             // splitContainer1.Panel2
             // 
             this.splitContainer1.Panel2.Controls.Add(this.lView);
             this.splitContainer1.Size = new System.Drawing.Size(352, 318);
-            this.splitContainer1.SplitterDistance = 25;
+            this.splitContainer1.SplitterDistance = 26;
             this.splitContainer1.SplitterWidth = 1;
             this.splitContainer1.TabIndex = 0;
             // 
             // tBox
             // 
             this.tBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.tBox.Location = new System.Drawing.Point(0, 0);
             this.tBox.Name = "tBox";
-            this.tBox.Size = new System.Drawing.Size(352, 20);
+            this.tBox.Size = new System.Drawing.Size(352, 26);
             this.tBox.TabIndex = 0;
             this.tBox.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.tBox_MouseDoubleClick);
             // 
@@ -73,17 +75,17 @@
             this.lView.GridLines = true;
             this.lView.Location = new System.Drawing.Point(0, 0);
             this.lView.Name = "lView";
-            this.lView.Size = new System.Drawing.Size(352, 292);
+            this.lView.Size = new System.Drawing.Size(352, 291);
             this.lView.TabIndex = 0;
             this.lView.UseCompatibleStateImageBehavior = false;
             this.lView.View = System.Windows.Forms.View.Details;
             // 
-            // OneWMResultsCtrl
+            // OneWMResultsRowsCtrl
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.splitContainer1);
-            this.Name = "OneWMResultsCtrl";
+            this.Name = "OneWMResultsRowsCtrl";
             this.Size = new System.Drawing.Size(352, 318);
             this.splitContainer1.Panel1.ResumeLayout(false);
             this.splitContainer1.Panel1.PerformLayout();

Results/Forms/OneWMResultsRowsCtrl.cs

@@ -97,7 +97,11 @@ namespace Results.Forms
 
             /// Update caption
 #if ORACLE_DB
-            tBox.Text = caption = string.Format("{0} ({1}) {2}", (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr), (wMtr.Pruefindex % 100), message);
+            tBox.Text = caption = string.Format("{0} ({1}) {2} {3}",
+                                                wMtr.WMPosition,
+                                                wMtr.Pruefindex == 0 ? "?" : string.Format("{0}x", wMtr.Pruefindex % 100),
+                                                (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr),
+                                                message);
 #else
             tBox.Text = caption = string.Format("s/n = {0}", string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr);
 #endif

Results/Forms/ResultsConfigCtrl.Designer.cs

@@ -37,7 +37,7 @@
             this.availableAlphabeticTreeView = new System.Windows.Forms.TreeView();
             this.downButton = new System.Windows.Forms.Button();
             this.upButton = new System.Windows.Forms.Button();
-            this.selectedResultsListViewEx = new Results.Forms.ListViewEx();
+            this.selectedResultsListViewEx = new Common.Forms.ListViewEx();
             this.removeAllButton = new System.Windows.Forms.Button();
             this.removeButton = new System.Windows.Forms.Button();
             this.addButton = new System.Windows.Forms.Button();
@@ -247,7 +247,7 @@
         private System.Windows.Forms.TreeView availableAlphabeticTreeView;
         private System.Windows.Forms.Button downButton;
         private System.Windows.Forms.Button upButton;
-        private ListViewEx selectedResultsListViewEx;
+        private Common.Forms.ListViewEx selectedResultsListViewEx;
         private System.Windows.Forms.Button removeAllButton;
         private System.Windows.Forms.Button removeButton;
         private System.Windows.Forms.Button addButton;

Results/Forms/ResultsConfigCtrl.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using Common;
+using Common.Forms;
 using Results.Resources;
 
 namespace Results.Forms
@@ -139,12 +140,12 @@ namespace Results.Forms
         {
 			if (e.SubItem == (int)Column.Units)
 			{
-				Config.Quantity quantity = (e.Item.Tag as WMeterRsltItemSpec).Quantity;
+				Quantity quantity = (e.Item.Tag as WMeterRsltItemSpec).Quantity;
 				unitsCB.Items.Clear();
-				unitsCB.Items.Add(Config.Unit.None.ToDescription());				/// "---"
-				for (Config.Unit u = (Config.Unit)1; u < Config.Unit.Count; u++)
+				unitsCB.Items.Add(Unit.None.ToDescription());				/// "---"
+				for (Unit u = (Unit)1; u < Unit.Count; u++)
 				{
-					if (Config.Units.IsQuantity(u, quantity))  unitsCB.Items.Add(u.ToDescription());
+					if (Units.IsQuantity(u, quantity))  unitsCB.Items.Add(u.ToDescription());
 				}
 				selectedResultsListViewEx.StartEditing(unitsCB, e.Item, e.SubItem);
 			}
@@ -163,7 +164,7 @@ namespace Results.Forms
             {
                 case Column.Caption:    item.Caption = e.DisplayText;   return;
                 case Column.Units:
-                    for (Config.Unit u = 0; u < Config.Unit.Count; u++)
+                    for (Unit u = 0; u < Unit.Count; u++)
                     {
 						if (u.ToDescription().Equals(unitsCB.Text))
                         {
@@ -240,10 +241,10 @@ namespace Results.Forms
 		{
 			treeView.Nodes.Clear();
 
-			IList<Config.Quantity> quantities = new List<Config.Quantity>();
-			for (Config.Quantity q = 0; q < Config.Quantity.Count; q++) quantities.Add(q);
+			IList<Quantity> quantities = new List<Quantity>();
+			for (Quantity q = 0; q < Quantity.Count; q++) quantities.Add(q);
 
-			IList<Config.Quantity> sortedQuantities = quantities.OrderBy(x => x.ToDescription()).ToList();
+			IList<Quantity> sortedQuantities = quantities.OrderBy(x => x.ToDescription()).ToList();
 
 			foreach (var q in sortedQuantities)
 			{

Results/ManualEntryItemSpec.cs

@@ -22,7 +22,7 @@ namespace Results
         public readonly Quantity Quantity;				/// Quantity
         public readonly ItemCategory Category;			/// 
         public string Caption;		                    /// Specifies item description to be printed as a caption (in the header, etc.)
-        public Config.Unit Units;	                    /// Specifies units for the output
+        public Unit Units;	                    /// Specifies units for the output
 
 
         public ManualEntryItemSpec Clone()
@@ -198,7 +198,7 @@ namespace Results
                             /// 
                             item.Caption = field[1].Replace("\n", "~");
                             item.Units = 0;
-                            for (Config.Unit u = 0; u < Config.Unit.Count; u++)
+                            for (Unit u = 0; u < Unit.Count; u++)
                             {
                                 if (u.ToString().Equals(field[2])) { item.Units = u; break; }
                             }

Results/Output/Printers/Label/LabelPrintDocument.cs

@@ -14,7 +14,7 @@ using GenCode128;
 
 namespace Results.Output.Printers.Label
 {
-	public class LabelPrintDocument : PrintersCommon
+    public class LabelPrintDocument : Common.Printers.PrintersCommon
 	{
         static QrEncoder encoder = new QrEncoder();
 

Results/Output/Printers/MultiLabel/MultiLabelPrintDocument.cs

@@ -14,7 +14,7 @@ using GenCode128;
 
 namespace Results.Output.Printers.MultiLabel
 {
-	public class MultiLabelPrintDocument : PrintersCommon
+    public class MultiLabelPrintDocument : Common.Printers.PrintersCommon
 	{
         static QrEncoder encoder = new QrEncoder();
 

Results/Output/Printers/Munich/MunichPrintDocument.cs

@@ -393,7 +393,7 @@ namespace Results.Output.Printers.Munich
                             Results.Entities.MeterTestRslt auxMtr = wm.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundAux);
 
                             table.AddRow(new string[] { mtr.Name(),
-                                                    Config.Units.ConvertTo(Config.Unit.lph, flow_ctv).ToString("F1"),
+                                                    Units.ConvertTo(Unit.lph, flow_ctv).ToString("F1"),
 					                                mtr.TestRslt.VolumeCTV.ToString("F2"),
 						                            mainMtr.VolumeMeter.ToString("F2"),
 						                            auxMtr.VolumeMeter.ToString("F2"),
@@ -405,7 +405,7 @@ namespace Results.Output.Printers.Munich
                         else
                         {
                             table.AddRow(new string[] { mtr.Name(),
-                                                    Config.Units.ConvertTo(Config.Unit.lph, flow_ctv).ToString("F1"),
+                                                    Units.ConvertTo(Unit.lph, flow_ctv).ToString("F1"),
 					                                mtr.TestRslt.VolumeCTV.ToString("F2"),
                                                     mtr.VolumeMeter.ToString("F2"),
 						                            "-",
@@ -456,12 +456,12 @@ namespace Results.Output.Printers.Munich
                         double flow_ctv = (mtr.TestRslt.TestTime != 0) ? (3.6 * mtr.TestRslt.VolumeCTV / mtr.TestRslt.TestTime) : 0;
 
                         table.AddRow(new string[] { mtr.Name(),
-                                                Config.Units.ConvertTo(Config.Unit.lph, flow_ctv).ToString("F1"),
+                                                Units.ConvertTo(Unit.lph, flow_ctv).ToString("F1"),
                                                 mtr.TestRslt.TempDownMean.ToString("F2"),
 					                            mtr.TestRslt.DensityDiv.ToString("F2"),
 					                            mtr.TestTime.ToString("F1"),
-					                            Config.Units.ConvertTo(Config.Unit.bar, mtr.TestRslt.PressUpMean).ToString("F3"),
-					                            Config.Units.ConvertTo(Config.Unit.bar, mtr.TestRslt.PressDownMean).ToString("F3") },
+					                            Units.ConvertTo(Unit.bar, mtr.TestRslt.PressUpMean).ToString("F3"),
+					                            Units.ConvertTo(Unit.bar, mtr.TestRslt.PressDownMean).ToString("F3") },
                                      horizontalAlignment,
                                      verticalAlignment);
                     }
@@ -592,7 +592,7 @@ namespace Results.Output.Printers.Munich
             iTop += SpacingOne;
             
             PrintAt(e, Tab1, iTop, "Luftdruck");
-            PrintAt(e, Tab2, iTop, Config.Units.ConvertTo(Config.Unit.mbar, wm.Batch.AmbPressMean()).ToString("F0") + " mbar");
+            PrintAt(e, Tab2, iTop, Units.ConvertTo(Unit.mbar, wm.Batch.AmbPressMean()).ToString("F0") + " mbar");
 
             iTop += SpacingOne;
 

Results/Output/Printers/OnePerBatch/OnePerBatchPrintDocument.cs

@@ -11,7 +11,7 @@ using Results.Resources;
 
 namespace Results.Output.Printers.OnePerBatch
 {
-	public class OnePerBatchPrintDocument : PrintersCommon
+    public class OnePerBatchPrintDocument : Common.Printers.PrintersCommon
 	{
         const float GapBetweenTableColumns = 10;
         const float GapBetweenCommonColumns = 10;

Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs

@@ -14,7 +14,7 @@ using Results.Resources;
 
 namespace Results.Output.Printers.OnePerMeter
 {
-	public class OnePerMeterPrintDocument : PrintersCommon
+    public class OnePerMeterPrintDocument : Common.Printers.PrintersCommon
 	{
         const float GapBetweenTableColumns = 10;
         const float GapBetweenCommonColumns = 10;

Results/Output/SensusTestInfo.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2018-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2018-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -15,6 +15,7 @@ namespace Results.Output
         Just_Q3Q2adjQ1_Alt,     /// pNrs = -1,5,2,1
         JustA0A4_Q3Q2adjQ1,     /// pNrs = -2,-1,3,2,1 (Australia 169 MHz, raw data pNrs: -2,-1,4,3,2,1)
         JustA0A4_Q3Q2Q1,        /// pNrs = -2,-1,3,2,1 (Australia 169 MHz smart, raw data pNrs: -2,-1,3,2,1)
+        JustA0_Q3Q2Q1,          /// pNrs = -1,3,2,1    (Australia 169 MHz smart, raw data pNrs: -1,3,2,1)
         DEWA,           	    /// Q4, Q3, Q2adj, Q2, Q1
         DEWA_wo_Q2,             /// Q4, Q3, Q2adj, Q1
         Suez,           	    /// Two directions, with Q2 and Q2ac
@@ -101,7 +102,8 @@ namespace Results.Output
         }
 
         /// <summary>
-        /// Determines whether test infos are compatible with procedure tests.
+        /// Determines whether test infos are compatible with procedure tests:
+        ///   For each 'cti'in candidate SensusTestInfo array there must exist a string 'cti.TestName' in testNames.
         /// </summary>
         /// <returns>true when compatible</returns>
         public static bool AreCompatible(SensusTestInfo[] completeTestInfo, IList<string> testNames)
@@ -126,11 +128,15 @@ namespace Results.Output
 
 
         /// <summary>
-        /// Determines whether Oracle and complete test infos are compatible.
+        /// Determines whether Oracle and complete test infos are compatible:
+        ///   For each 'oti' in OracleTestInfo there must exist a compatible ...
+        ///   ... cti.PruefungsNrDB + cti.QBezeichnungDB pair in candidate SensusTestInfo.
         /// </summary>
         /// <returns>true when compatible</returns>
         public static bool AreCompatible(IList<SensusTestInfo> oracleTestInfo, SensusTestInfo[] completeTestInfo)
         {
+            if (oracleTestInfo == null) return false;
+
             /// All tests in oracleTestInfo must exist in completeTestInfo
             foreach (var oti in oracleTestInfo)
             {
@@ -176,7 +182,7 @@ namespace Results.Output
                 SensusTestInfo[] candidateTinfo = SensusTestInfo.GetTestInfos(lt);
 
                 if (AreCompatible(candidateTinfo, testNames) && AreCompatible(oracleTestInfo, candidateTinfo) &&
-                    ((bestMatch == null) || (candidateTinfo.Length > bestMatchLen)))
+                    ((bestMatch == null) || (candidateTinfo.Length < bestMatchLen)))
                 {
                     bestLT = lt;
                     bestMatch = candidateTinfo;
@@ -290,6 +296,16 @@ namespace Results.Output
                         new SensusTestInfo("Q2",           2,   "Q2",   2, "02",   2,   "Q2", Range.R100_110),
                         new SensusTestInfo("Q1",           1,   "Q1",   1, "01",   1,   "Q1", Range.R100_110),
                     };
+
+                case LogType.JustA0_Q3Q2Q1:      /// Australia 169 MHz with default Q2 corrections and conditional update at the end of cycle
+                    return new SensusTestInfo[]
+                    {
+                        ///                TBF            Oracle DB    Opto RAW   LU logfiles 
+                        new SensusTestInfo("Qjust_A0",    -1, "Just",  -1, "-1",  -1,  "Q-1", Range.R95_105),
+                        new SensusTestInfo("Q3",           3,   "Q3",   3, "03",   3,   "Q3", Range.R90_100),
+                        new SensusTestInfo("Q2",           2,   "Q2",   2, "02",   2,   "Q2", Range.R100_110),
+                        new SensusTestInfo("Q1",           1,   "Q1",   1, "01",   1,   "Q1", Range.R100_110),
+                    };
                 
                 case LogType.DEWA:                  /// DEWA (with Q4 and Q2 after correction)
                     return new SensusTestInfo[]
@@ -447,7 +463,7 @@ namespace Results.Output
                     return new SensusTestInfo[]
                     {
                         ///                TBF           Oracle DB    Opto RAW   LU logfiles 
-                        new SensusTestInfo("Q3",          3,    "Q3",   3, "04",   3,   "Q3", Range.R90_100),
+                        new SensusTestInfo("Q3",          3,    "Q3",   3, "03",   3,   "Q3", Range.R90_100),
                         new SensusTestInfo("Q2",          2,    "Q2",   2, "02",   2,   "Q2", Range.R100_110),
                         new SensusTestInfo("Q1",          1,    "Q1",   1, "01",   1,   "Q1", Range.R100_110),
                     };
@@ -456,7 +472,7 @@ namespace Results.Output
                     return new SensusTestInfo[]
                     {
                         ///                TBF           Oracle DB    Opto RAW   LU logfiles 
-                        new SensusTestInfo("Q3",          5,    "Q3",   5, "04",   5,   "Q3", Range.R90_100),
+                        new SensusTestInfo("Q3",          5,    "Q3",   5, "05",   5,   "Q3", Range.R90_100),
                         new SensusTestInfo("Q2",          2,    "Q2",   2, "02",   2,   "Q2", Range.R100_110),
                         new SensusTestInfo("Q1",          1,    "Q1",   1, "01",   1,   "Q1", Range.R100_110),
                     };
@@ -465,7 +481,7 @@ namespace Results.Output
                     return new SensusTestInfo[]
                     {
                         ///                TBF           Oracle DB    Opto RAW   LU logfiles 
-                        new SensusTestInfo("Q4",          5,    "Q4",   5, "04",   5,   "Q4", Range.R90_100),
+                        new SensusTestInfo("Q4",          5,    "Q4",   5, "05",   5,   "Q4", Range.R90_100),
                         new SensusTestInfo("Q2",          2,    "Q2",   2, "02",   2,   "Q2", Range.R100_110),
                         new SensusTestInfo("Q1",          1,    "Q1",   1, "01",   1,   "Q1", Range.R100_110),
                     };

Results/Output/Table.cs

@@ -96,7 +96,7 @@ namespace Results.Output
                     else
                     {
                         bool isHeader = (colIx < Style.LeftHeadersCount) || (rowIx < Style.TopHeadersCount);
-                        SizeF size = Printers.PrintersCommon.Measure(e, Rows[rowIx][colIx], isHeader ? Style.HeaderFont : Style.Font);
+                        SizeF size = Common.Printers.PrintersCommon.Measure(e, Rows[rowIx][colIx], isHeader ? Style.HeaderFont : Style.Font);
                         if (size.Width > columnWidth[colIx]) columnWidth[colIx] = size.Width;
                         if (size.Height > rowHeight[rowIx]) rowHeight[rowIx] = size.Height;
                     }
@@ -159,7 +159,7 @@ namespace Results.Output
                     {
                         /// In not a separator line
                         bool isHeader = (colIx < Style.LeftHeadersCount) || (rowIx < Style.TopHeadersCount);
-                        SizeF size = Printers.PrintersCommon.Measure(e, Rows[rowIx][colIx], isHeader ? Style.HeaderFont : Style.Font);
+                        SizeF size = Common.Printers.PrintersCommon.Measure(e, Rows[rowIx][colIx], isHeader ? Style.HeaderFont : Style.Font);
                         if ((Style.ColumnWidths != null) && (Style.ColumnWidths.Length > colIx))
                         {
                             size.Width = Style.ColumnWidths[colIx]; /// Override measurement if column width is defined
@@ -246,7 +246,7 @@ namespace Results.Output
                     for (int colIndex = 0; colIndex < tblColumnsCount; colIndex++)
                     {
                         bool isHeader = (colIndex < Style.LeftHeadersCount) || (rowIndex < Style.TopHeadersCount);
-                        Printers.PrintersCommon.PrintAt(e, oneTableRow[colIndex],
+                        Common.Printers.PrintersCommon.PrintAt(e, oneTableRow[colIndex],
                                                            isHeader ? Style.HeaderFont : Style.Font,
                                                            columnPos[colIndex],
                                                            rowPos[rowIndex],

Results/Output/WMChart.cs

@@ -1,4 +1,7 @@
-using System;
+///
+/// Copyright (c) 2019-2022 Sensus Metering Systems
+///
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
@@ -13,34 +16,28 @@ namespace Results.Output
     {
         public static Chart GetChart(WaterMeter wm, bool isPrinter)
         {
-			return GetChart(wm, isPrinter, Config.Unit.lph);
+			return GetChart(wm, isPrinter, Unit.lph);
         }
 
-		public static Chart GetChart(WaterMeter wm, bool isPrinter, Config.Unit flowUnit)
+		public static Chart GetChart(WaterMeter wm, bool isPrinter, Unit flowUnit)
         {
-            double maxFlow_m3h = 0;
+            double maxFlow = 0;
             IList<PointF> unsortedPoints = new List<PointF>();
             foreach (var mtr in wm.RegularMeterTestRslts())
             {
-                if (mtr.IsPilotRslt() && mtr.TestRslt.TestData.Evaluate && (mtr.TestRslt.TestTime > 0) && (mtr.TestRslt.PulsesMaster > 0))
+                double flow = mtr.TestRslt.FlowVolume;
+                var td = mtr.TestRslt.TestData;
+
+                if (mtr.IsPilotRslt() && flow > 0 && td.Evaluate &&
+                    (td.Publish == (sbyte)Publish.Always || (!isPrinter && td.Publish == (sbyte)Publish.OnScreen)))
                 {
-                    double flow_m3h = (mtr.TestTime != 0)
-                                ? (3.6 * mtr.TestRslt.VolumeCTV / mtr.TestTime * mtr.PulsesMaster / mtr.TestRslt.PulsesMaster)
-                                : (3.6 * mtr.TestRslt.VolumeCTV / mtr.TestRslt.TestTime);
-
-                    if (flow_m3h > maxFlow_m3h) maxFlow_m3h = flow_m3h;
-
-                    double flow = Config.Units.ConvertTo(flowUnit, flow_m3h);      /// Convert to specified units
-
-                    if (flow > 0)
-                    {
-                        unsortedPoints.Add(new PointF((float)flow, (float)mtr.Error));
-                    }
+                    if (flow > maxFlow) maxFlow = flow;
+                    unsortedPoints.Add(new PointF((float)Units.ConvertTo(flowUnit, flow), (float)mtr.Error));
                 }
             }
             IEnumerable<PointF> sortedPoints = unsortedPoints.OrderBy(x => x.X);
 
-            bool isQ4 = (maxFlow_m3h > 1.1 * wm.WaterMeterData.Q3_Qn);
+            bool isQ4 = (maxFlow > 1.1 * wm.WaterMeterData.Q3_Qn);
 
             Chart chart = new Chart
             {
@@ -71,8 +68,8 @@ namespace Results.Output
                                                    1000000, 2000000, 5000000,
                                                    10000000 };
             double spacer = 0.8;
-            double from = Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q1_Qmin);
-            double to = Config.Units.ConvertTo(flowUnit, isQ4 ? wm.WaterMeterData.Q4_Qmax : wm.WaterMeterData.Q3_Qn);
+            double from = Units.ConvertTo(flowUnit, wm.WaterMeterData.Q1_Qmin);
+            double to = Units.ConvertTo(flowUnit, isQ4 ? wm.WaterMeterData.Q4_Qmax : wm.WaterMeterData.Q3_Qn);
             bool inRange = false;
             for (int i = 0; i < xs.Count - 3; i += 3)
             {
@@ -115,18 +112,18 @@ namespace Results.Output
             Legend legend1 = new Legend { Name = "Legend1" };
 
             Series upperLimit = new Series { Name = Strings.Upper_limit, ChartArea = "ChartArea1", ChartType = SeriesChartType.Line, Color = Color.Red };
-            upperLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q1_Qmin), 5);
-            upperLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), 5);
-            upperLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), 2);
-            upperLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q3_Qn), 2);
-            if (isQ4) upperLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q4_Qmax), 2);
+            upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q1_Qmin), 5);
+            upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), 5);
+            upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), 2);
+            upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q3_Qn), 2);
+            if (isQ4) upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q4_Qmax), 2);
 
             Series lowerLimit = new Series { Name = Strings.Lower_limit, ChartArea = "ChartArea1", ChartType = SeriesChartType.Line, Color = Color.Red };
-            lowerLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q1_Qmin), -5);
-            lowerLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), -5);
-            lowerLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), -2);
-            lowerLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q3_Qn), -2);
-            if (isQ4) lowerLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q4_Qmax), -2);
+            lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q1_Qmin), -5);
+            lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), -5);
+            lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), -2);
+            lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q3_Qn), -2);
+            if (isQ4) lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q4_Qmax), -2);
 
             Series line = new Series { Name = Strings.Relative_error, ChartArea = "ChartArea1", ChartType = SeriesChartType.Line, Color = Color.DeepSkyBlue };
             Series dots = new Series { Name = Strings.Relative_error + " ", ChartArea = "ChartArea1", ChartType = SeriesChartType.Point, Color = Color.RoyalBlue };

Results/Properties/AssemblyInfo.cs

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

Results/Results.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -29,7 +29,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -82,12 +82,6 @@
       <DependentUpon>BatchResultsDlg.cs</DependentUpon>
     </Compile>
     <Compile Include="Forms\IOneWMResultsCtrl.cs" />
-    <Compile Include="Forms\ListViewEx.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Forms\ListViewExtensions.cs" />
-    <Compile Include="Forms\LviIntColumnComparer.cs" />
-    <Compile Include="Forms\LviTextColumnComparer.cs" />
     <Compile Include="Forms\ManualEntryConfigCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -163,9 +157,6 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Output\Printers\OnePerBatch\OnePerBatchPrinterCfg.cs" />
-    <Compile Include="Output\Printers\PrintersCommon.cs">
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="Output\Printers\Munich\MunichPrintDocument.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -225,9 +216,6 @@
     <EmbeddedResource Include="Forms\BatchResultsDlg.resx">
       <DependentUpon>BatchResultsDlg.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\ListViewEx.resx">
-      <DependentUpon>ListViewEx.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Forms\ManualEntryConfigCtrl.resx">
       <DependentUpon>ManualEntryConfigCtrl.cs</DependentUpon>
     </EmbeddedResource>

Results/WMeterRsltItemSpec.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -665,9 +665,9 @@ namespace Results
             return FormatDbl(units, format, precisionOrEmpty, dfltPrecision, v, CultureInfo.CurrentCulture);
         }
         /// 
-        public static string FormatDbl(Config.Unit units, string format, string precisionOrEmpty, string dfltPrecision, double v, CultureInfo ci)
+        public static string FormatDbl(Unit units, string format, string precisionOrEmpty, string dfltPrecision, double v, CultureInfo ci)
         {
-            double val = Config.Units.ConvertTo(units, v);
+            double val = Common.Units.ConvertTo(units, v);
 
             string precision = string.IsNullOrEmpty(precisionOrEmpty) ? dfltPrecision : precisionOrEmpty;
 
@@ -677,7 +677,7 @@ namespace Results
                 int significantDigits;
                 if (int.TryParse(precision.Substring(1), out significantDigits))
                 {
-                    precision = Config.Utils.SignificantDigitsToFmt(val, significantDigits);
+                    precision = Common.Utils.SignificantDigitsToFmt(val, significantDigits);
                 }
             }
 
@@ -704,8 +704,8 @@ namespace Results
         /// 
         public static string FormatDbl(Unit units, string format, string precisionOrEmpty, string dfltPrecision, double v1, double v2, CultureInfo ci)
         {
-            double val1 = Config.Units.ConvertTo(units, v1);
-            double val2 = Config.Units.ConvertTo(units, v2);
+            double val1 = Common.Units.ConvertTo(units, v1);
+            double val2 = Common.Units.ConvertTo(units, v2);
 
             string precision = string.IsNullOrEmpty(precisionOrEmpty) ? dfltPrecision : precisionOrEmpty;
 
@@ -715,7 +715,7 @@ namespace Results
                 int significantDigits;
                 if (int.TryParse(precision.Substring(1), out significantDigits))
                 {
-                    precision = Config.Utils.SignificantDigitsToFmt(val1, significantDigits);
+                    precision = Common.Utils.SignificantDigitsToFmt(val1, significantDigits);
                 }
             }
 
@@ -819,7 +819,7 @@ namespace Results
                             item.Caption = field[1].Replace("\n", "~");
 							item.TestID = field[2];
 							item.Units = 0;
-							for (Config.Unit u = 0; u < Config.Unit.Count; u++)
+							for (Unit u = 0; u < Unit.Count; u++)
 							{
 								if (u.ToString().Equals(field[3])) { item.Units = u; break; }
 							}

ResultsBrowser/Forms/PrinterConfigDlg.Designer.cs

@@ -107,6 +107,7 @@
             this.Controls.Add(this.printerClassComboBox);
             this.Name = "PrinterConfigDlg";
             this.Text = "Printer configuration";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.PrinterConfigDlg_FormClosing);
             this.Load += new System.EventHandler(this.PrinterClassDlg_Load);
             this.ResumeLayout(false);
             this.PerformLayout();

ResultsBrowser/Forms/PrinterConfigDlg.cs

@@ -88,7 +88,7 @@ namespace ResultsBrowser.Forms
 				printerCfg = printerFactory.CmpntCfgFromCmpntEntity(cmpnt);
 			}
 
-            ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+            ComponentParametersDlg cfgForm = new ComponentParametersDlg(this);
             cfgForm.CmpntEntities = new List<Component>();
 
             IComponentCfgCtrl cfgControl = printerCfg.GetControl(cfgForm.CmpntEntities);
@@ -167,5 +167,10 @@ namespace ResultsBrowser.Forms
 
             return null;
         }
+
+        private void PrinterConfigDlg_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            Users.CurrentUser.Restore(this);
+        }
     }
 }

ResultsBrowser/ResultsBrowser.csproj

@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -32,7 +32,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>

ResultsParser/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>

ResultsParser/Program.cs

@@ -0,0 +1,123 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using FluentNHibernate.Cfg;
+using FluentNHibernate.Cfg.Db;
+using NHibernate;
+using NHibernate.Cfg;
+using Results;
+using Results.Entities;
+using System.IO;
+
+namespace ResultsParser
+{
+    class Program
+    {
+        static ISessionFactory sessionFactory;
+
+        static void Main(string[] args)
+        {
+            Console.WriteLine("Bench: [WR15]");
+            string bench = Console.ReadLine();
+            if (bench == string.Empty) bench = "WR15";
+
+            string connStr = GetConnectionString(bench);
+
+            IList<WaterMeter> strangeWMs = new List<WaterMeter>();
+
+            try
+            {
+                var session = Fluently.Configure()
+                                      .Database(MySQLConfiguration.Standard.ConnectionString(connStr))
+                                      .Mappings(m => m.FluentMappings.AddFromAssemblyOf<WaterMeterData>())
+                                      .ExposeConfiguration(BuildSchema)
+                                      .BuildSessionFactory()
+                                      .OpenSession();
+
+                var mtrs1 = session.QueryOver<MeterTestRslt>()
+                                   .Where(mtr => mtr.Error < -2)
+                                   .And(mtr => mtr.Passed == true)
+                                   .List();
+
+                var mtrs2 = session.QueryOver<MeterTestRslt>()
+                                   .Where(mtr => mtr.Error > 2)
+                                   .And(mtr => mtr.Passed == true)
+                                   .List();
+
+                foreach (var lst in new IList<MeterTestRslt>[] { mtrs1, mtrs2 })
+                {
+                    foreach (var mtr in lst)
+                    {
+                        if (mtr.TestRslt.Name() == "Q2" &&
+                            mtr.WaterMeter.Passed &&
+                            !string.IsNullOrEmpty(mtr.WaterMeter.SerialNr) &&
+                            mtr.WaterMeter.WaterMeterData.MetrologicalClass == "R800")
+                        {
+                            strangeWMs.Add(mtr.WaterMeter);
+                        }
+                    }
+                }
+
+                using (TextWriter writer = new StreamWriter(string.Format("strangeWMs-{0}.csv", bench)))
+                {
+                    foreach (var wm in strangeWMs)
+                    {
+                        writer.WriteLine(string.Format("'{0};{1};{2};{3};{4:dd.MM.yyyy HH:mm};{5:dd.MM.yyyy HH:mm};v.{6};{7}",
+                                         wm.SerialNr, bench, wm.WMPosition, wm.Batch.BatchNr, wm.Batch.StartTime, wm.Batch.EndTime, wm.Batch.ProgramVersion, wm.Batch.ProcedureName));
+                    }
+                }
+
+                session.Close();
+            }
+            catch (Exception exc)
+            {
+                Console.WriteLine("Exception occured:");
+                Console.WriteLine(exc.Message);
+                if (exc.InnerException != null)
+                {
+                    Console.WriteLine("Inner exception:");
+                    Console.WriteLine(exc.InnerException.Message);
+                }
+
+                Console.ReadLine();
+                Console.WriteLine(exc.StackTrace);
+            }
+
+            Console.WriteLine(string.Format("{0} strange water meters found", strangeWMs.Count));
+            Console.WriteLine("Press ENTER to close");
+            Console.ReadLine();
+        }
+
+        static string GetConnectionString(string bench = "WR15")
+        {
+            Console.WriteLine("Server: [localhost]");
+            var server = Console.ReadLine();
+            if (server == string.Empty) server = "localhost";
+
+
+            Console.WriteLine(string.Format("Database: [st-{0}-r]", bench.ToLower()));
+            var db = Console.ReadLine();
+            if (db == string.Empty) db = string.Format("st-{0}-r", bench.ToLower());
+
+            Console.WriteLine("User: [root]");
+            var uid = Console.ReadLine();
+            if (uid == string.Empty) uid = "root";
+
+            Console.WriteLine("Password:");
+            var pw = Console.ReadLine();
+
+            var connStr = string.Format("SERVER={0}; DATABASE={1}; UID={2}; PASSWORD={3}; CHARSET=utf8;", server, db, uid, pw);
+            Console.WriteLine("Connection string is\r\n {0}", connStr);
+            Console.WriteLine();
+            return connStr;
+        }
+
+        static void BuildSchema(Configuration config)
+        {
+            /// This NHibernate tool takes a configuration with mapping info and exports a database schema
+            new NHibernate.Tool.hbm2ddl.SchemaExport(config).SetOutputFile("db_schema");
+        }
+    }
+}

ResultsParser/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("ResultsParser")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ResultsParser")]
+[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("90a47d44-c3ab-4528-b19b-0440a521b9af")]
+
+// 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")]

ResultsParser/ResultsParser.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>{2E08C19B-C0A9-4056-8564-E5B74477959D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ResultsParser</RootNamespace>
+    <AssemblyName>ResultsParser</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>..\..\Production-Monitoring\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="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.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="..\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="..\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>

TBF.sln

@@ -83,6 +83,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MergeResultsDBs", "MergeRes
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FeatureVectorCalculator", "FeatureVectorCalculator\FeatureVectorCalculator.csproj", "{6280F3F9-139A-48E3-8C88-25EB4124E982}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResultsParser", "ResultsParser\ResultsParser.csproj", "{2E08C19B-C0A9-4056-8564-E5B74477959D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -367,6 +369,16 @@ Global
 		{6280F3F9-139A-48E3-8C88-25EB4124E982}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6280F3F9-139A-48E3-8C88-25EB4124E982}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6280F3F9-139A-48E3-8C88-25EB4124E982}.Release|x86.ActiveCfg = Release|Any CPU
+		{2E08C19B-C0A9-4056-8564-E5B74477959D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E08C19B-C0A9-4056-8564-E5B74477959D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E08C19B-C0A9-4056-8564-E5B74477959D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2E08C19B-C0A9-4056-8564-E5B74477959D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2E08C19B-C0A9-4056-8564-E5B74477959D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2E08C19B-C0A9-4056-8564-E5B74477959D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E08C19B-C0A9-4056-8564-E5B74477959D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E08C19B-C0A9-4056-8564-E5B74477959D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2E08C19B-C0A9-4056-8564-E5B74477959D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2E08C19B-C0A9-4056-8564-E5B74477959D}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

TBF/BenchControl/StateMachine.cs

@@ -1,857 +0,0 @@
-///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
-///
-using System;
-using System.Text;
-using System.Threading;
-using System.Collections.Generic;
-using log4net;
-using NHibernate;
-using Common;
-using Config.Entities;
-using TBF.BenchControl.Generic;
-using TBF.BenchControl.GenericDevices;
-using TBF.BenchControl.Sequences;
-using Dirichlet.Numerics;
-using TBF.Resources;
-
-namespace TBF.BenchControl
-{
-    public enum MachineState
-    {
-        Undefined = 0,
-        Disabled,
-        StartingUp,     /// Start-up: Initialize() of all devices + start of the worker thread
-        FailedToStart,  /// Most likely Initialize() of any device thrown an exception
-        Running,        /// RunDeviceBefore() and RunDeviceAfter() of all devices, Start()/Run()/Stop() of operations
-        ShuttingDown,   /// Shutdown: StopDevice() and StopDevice2() of all devices
-        Off,            /// Off after the shutdown
-    }
-
-
-    /// <summary>
-    /// This class controls real test bench behavior.
-    /// It is based on a state machine
-    /// </summary>
-    public static class StateMachine
-    {
-		private static readonly ILog log = LogManager.GetLogger(typeof(StateMachine));
-		private static readonly ILog wlog = LogManager.GetLogger(typeof(StateMachine));
-
-		/// Private devices and components
-		static IList<IComponent> components;		/// list of all components
-		static IList<IDevice> devices;				/// list of devices
-													/// 
-		/// Bench paths
-		static IList<Config.Entities.FeedingPath> feedingPaths;
-		static IList<Config.Entities.BenchPath> benchPaths;
-		static IList<Config.Entities.OutputPath> outputPaths;
-		static IList<Config.Entities.MetersPath> metersPaths;
-        static IList<Config.Entities.HeatMetersPath> heatMetersPaths;
-        public static IList<Config.Entities.TransitionSequence> TransitionSequences;
-        public static IList<Config.Entities.TransitionStep> TransitionSteps;
-
-		/// Public components
-		public static Elde.ControlBoardDev ControlBoard;
-		public static GenericDevices.IAmbient Ambient;
-        public static IOperation BenchWaitingOp;
-        public static IOperation BenchErrorOp;
-        public static GenericDevices.IScaleOrTank Tank1;
-		public static GenericDevices.IScaleOrTank Tank2;
-		public static GenericDevices.IScaleOrTank Tank3;
-        public static GenericDevices.IValve DrainValve1;
-		public static GenericDevices.IValve DrainValve2;
-        public static GenericDevices.IValve DrainValve3;
-        public static IList<IValve> MasterValves;				/// list of directly controlled valves
-		public static IList<IValve> CoupledValves;				/// list of coupled valves
-		public static IList<Elde.ValveEx.Valve> ExtendedValves;	/// list of extended valves
-
-        public static IList<string> LoopStartNames;
-        public static IList<string> LoopEndNames;
-
-        /// Time and synchronization
-#if TURA_IPERL || TURA_IPERL_NEW
-		public const int Period = 2;				/// State machine period in sec.
-#else
-        public const int Period = 1;				/// State machine period in sec.
-#endif
-
-		static DateTime startDateTime;				/// DateTime of time instance when the state machine worker thread starts
-        static int currentTimeSec;					/// Time from the start of the state machine in seconds
-
-        public static MachineState MachineState;    /// see enum MachineState for explanation
-
-		/// Worker thread and database session
-        static Thread workerThread;
-
-		static IList<State> states;					/// list of states
-
-		public static DateTime CycleStartTimeStamp;
-
-		public static IList<IValve> DefaultValvesOpen
-		{
-			get
-			{
-				return GenericDevices.ValveBase.Merge(
-					Utils.ValvesOpen((feedingPaths != null && feedingPaths.Count > 0) ? feedingPaths[0] : null),
-					Utils.ValvesOpen((benchPaths   != null && benchPaths.Count > 0)   ? benchPaths[0]   : null),
-					Utils.ValvesOpen((outputPaths  != null && outputPaths.Count > 0)  ? outputPaths[0]  : null)
-					);
-			}
-		}
-
-		public static IList<IValve> DefaultValvesClose
-		{
-			get
-			{
-                return GenericDevices.ValveBase.Merge(
-					Utils.ValvesClose((feedingPaths != null && feedingPaths.Count > 0) ? feedingPaths[0] : null),
-					Utils.ValvesClose((benchPaths   != null && benchPaths.Count > 0)   ? benchPaths[0]   : null),
-					Utils.ValvesClose((outputPaths  != null && outputPaths.Count > 0)  ? outputPaths[0]  : null)
-					);
-			}
-		}
-
-		/// <summary>
-		/// Loaded by LoadProcedure() or IOperation LoadProcedureOp(...)
-		/// </summary>
-		public static Procedure Procedure;				/// Procedure
-        public static TestInstance[] TestInstances;		/// Tests
-        public static bool IsRemoteProcedure;                                                            
-
-
-		/// Hardware devices connected to the PC controlling the bench.
-		public static IList<IComponent> Components { get { return components; } }
-		public static IList<IDevice> Devices { get { return devices; } }
-
-        /// <summary>
-        /// DateTime of time instance when the state machine worker thread starts
-        /// </summary>
-        public static DateTime StartDateTime { get { return startDateTime; } }
-
-        /// <summary>
-        /// Current state name
-        /// </summary>
-        public static int Time
-        {
-            get { return currentTimeSec; }
-            set { currentTimeSec = value; }
-        }
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        static StateMachine()
-        {
-            devices = new List<IDevice>();
-			states = new List<State>();
-            currentTimeSec = 0;
-        }
-
-		/// <summary>
-		/// Add a device to the state machine.
-		/// </summary>
-		/// <param name="obj">Device</param>
-		public static void AddDevice(IDevice device)
-		{
-			if (device != null && !devices.Contains(device)) devices.Add(device);
-		}
-
-        /// <summary>
-        /// Add a state to the state machine.
-		/// In this way a sequence can be created programtically.
-        /// </summary>
-        /// <param name="obj">State</param>
-		public static void AddState(State state)
-		{
-			if (state != null && !states.Contains(state)) states.Add(state);
-		}
-
-        /// <summary>
-        /// Remove the state from the state machine.
-        /// </summary>
-		/// <param name="obj">State</param>
-		public static void RemoveState(State state)
-        {
-			if (state != null && state != State.CurrentState && states.Contains(state)) states.Remove(state);
-        }
-
-        /// <summary>
-        /// Get a state from a label
-        /// </summary>
-        /// <param name="label"></param>
-        /// <returns>The matching state or null</returns>
-        static State GetStateFromLabel(string label)
-        {
-			if (label == null) return null;
-
-            foreach (State state in states)
-            {
-                if (state.Label != null && state.Label.Equals(label)) return state;
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// Start the state machine in the state 'label' in a desired mode of operation.
-        /// This method is called in the UI thread and creates a new state machine thread. 
-        /// This method call should be embedded in: try { StateMachine.Start(...); } catch { }
-        /// to handle configuration problems. Calls CreateDevices(mode) and CreateStates(). 
-        /// </summary>
-        /// <param name="mode">Mode of operation</param>
-        /// <param name="benchData">A copy of bench data used by the state machine</param>
-        /// <param name="label">Identifies the initial state</param>
-#if DN100
-		public static void InitializeBoardEtc(ControlCom2VB.ControlCom2panel ctrlBrdComponent)
-#elif FUZHOU_150 || MUNICH
-		public static void InitializeBoardEtc(ControlComponent3Munich.UserControl1 ctrlBrdComponent)
-#elif FUZHOU_300
-        public static void InitializeBoardEtc(ControlComponent3F300.UserControl1 ctrlBrdComponent)
-#elif BERLIN || GELSENWASSER || GENESIS || IZRAEL_200 || PETERSBURG_200 || PUCHONG_200 || SLM_150
-		public static void InitializeBoardEtc(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent)
-#else /// all newer benches
-        public static void InitializeBoardEtc(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)
-#endif
-        {
-            /// Load the list of components (entities) from the database.
-			/// Then create the components (derived from IComponent).
-			components = BenchControl.TbfComponents.LoadComponentsFromDB(TBF.DB.CreateSession(Common.DBKind.Config));
-			MasterValves = GenericDevices.ValveBase.MasterValves(components);
-			CoupledValves = GenericDevices.ValveBase.CoupledValves(components);
-			ExtendedValves = GenericDevices.ValveBase.ExtendedValves(components);
-
-			/// Find all balances (to initialize tank capacities in the control board)
-			/// Find the control board
-			IList<IScaleOrTank> tanks = new List<IScaleOrTank>();
-            ProcessData.IperlHeads = new List<TestMethods.iPerlCommunication.iPerlHead.IperlHead>();
-            SequenceBase.FlowMeters = new List<IFlowMeter>();
-            SequenceBase.RegulValves = new List<IRegValve>();
-            SequenceBase.FeedingRegulValves = new List<IRegValve>();
-            SequenceBase.OutputRegulValves = new List<IRegValve>();
-            SequenceBase.PumpsWithFM = new List<IPumpFM>();
-			SequenceBase.WaterMeters = new List<IWaterMeter>();
-			SequenceBase.Cameras = new List<ICamera>();
-            LoopStartNames = new List<string>();
-            LoopEndNames = new List<string>();
-            UInt128 valvesToInvert = 0;
-			foreach (var cmpnt in components)
-			{
-                if (cmpnt is Elde.ControlBoardDev) ControlBoard = cmpnt as Elde.ControlBoardDev;
-                if (cmpnt is IBenchInfo) ProcessData.BenchInfo = cmpnt as IBenchInfo;
-				if (cmpnt is IErrorFlags) ProcessData.ErrorFlagsComp = cmpnt as IErrorFlags;
-                if (cmpnt is IStatisticsMonitoring) ProcessData.StatisticsMonitoringComp = cmpnt as IStatisticsMonitoring;
-
-                if ((cmpnt is Output.DB.SensusOracle.Database) && (ProcessData.OracleDB == null))
-                {
-                    /// The 1st Oracle database component found --> store the reference
-                    ProcessData.OracleDB = cmpnt as Output.DB.SensusOracle.Database;
-                }
-                if ((cmpnt is Output.DB.ProductionTracing.Tracing) && (ProcessData.TracingDB == null))
-                {
-                    /// The 1st production tracing database component found --> store the reference
-                    ProcessData.TracingDB = cmpnt as Output.DB.ProductionTracing.Tracing;
-                }
-
-                if (cmpnt is TestMethods.iPerlCommunication.iPerlHead.IperlHead)
-                {
-                    ProcessData.IperlHeads.Add(cmpnt as TestMethods.iPerlCommunication.iPerlHead.IperlHead);
-                }
-                if (cmpnt is IFlowMeter) SequenceBase.FlowMeters.Add(cmpnt as IFlowMeter);
-				if ((cmpnt is IRegValve) && !(cmpnt is BenchControl.Elde.RegulValveTandem.RegulValveTandem))
-				{
-                    IRegValve rv = cmpnt as IRegValve;
-					SequenceBase.RegulValves.Add(rv);
-                    if (rv.Category == ValveCategory.Feeding) SequenceBase.FeedingRegulValves.Add(rv);
-                    if (rv.Category == ValveCategory.Output)  SequenceBase.OutputRegulValves.Add(rv);
-				}
-                if (cmpnt is IPumpFM && !(cmpnt is Elde.PumpTandem.Pump))
-                {
-                    SequenceBase.PumpsWithFM.Add(cmpnt as IPumpFM);
-                }
-                if (cmpnt is IWaterMeter) SequenceBase.WaterMeters.Add(cmpnt as IWaterMeter);
-				if (cmpnt is ICamera) SequenceBase.Cameras.Add(cmpnt as ICamera);
-				if (cmpnt is GenericDevices.IAmbient) Ambient = cmpnt as GenericDevices.IAmbient;
-
-                if (cmpnt is GenericDevices.IParallelOutput && cmpnt.Name.ToLower().Contains("tower"))
-                {
-                    BenchWaitingOp = (cmpnt as GenericDevices.IParallelOutput).ShowBenchWaitingOp();
-                    BenchErrorOp = (cmpnt as GenericDevices.IParallelOutput).ShowBenchErrorOp();
-                }
-
-                if (cmpnt is ITestMethod && cmpnt.ClassName == "TestMethods.OuterLoop.Start") LoopStartNames.Add(cmpnt.Name);
-                if (cmpnt is ITestMethod && cmpnt.ClassName == "TestMethods.OuterLoop.End") LoopEndNames.Add(cmpnt.Name);
-
-				if (cmpnt is IScaleOrTank)
-				{
-					IScaleOrTank tank = cmpnt as IScaleOrTank;
-                    tanks.Add(tank);
-					if      (Tank1 == null) Tank1 = tank;
-					else if (Tank2 == null) Tank2 = tank;
-					else if (Tank3 == null) Tank3 = tank;
-                }
-
-                Elde.Valve.Valve eldeValve = (cmpnt as Elde.Valve.Valve);
-                if ((eldeValve != null) && eldeValve.Inverted) valvesToInvert |= eldeValve.Mask;
-			}
-
-			/// Pre-initialize the control board (= buffer the arguments ctrlBrdComponent, tankCapacities)
-            if (ControlBoard != null)
-			{
-                /// Create an array with tank capacities from 'tanks' list
-                double[] tankCapacities = new double[tanks.Count];
-                for (int i = 0; i < tankCapacities.Length; i++) tankCapacities[i] = tanks[i].Capacity;
-
-                ControlBoard.InitializeEldeComponent(ctrlBrdComponent, valvesToInvert, tankCapacities);
-			}
-			else
-			{
-				throw new Exception("Control board component is missing");
-			}
-		}
-
-
-        public static string CurrentlyInitializedComponentName;
-        /// 
-        public static string InitializeComponents()
-        {
-            CurrentlyInitializedComponentName = "-";
-
-            bool anyComponentIsInSimulMode = false;
-			StringBuilder inSimulMode = new StringBuilder();
-
-			/// Add all devices to the state machine and initialize them
-			foreach (var cmpnt in components)
-			{
-				if (cmpnt.DebugLevel == DebugMode.Simulate)
-				{
-					inSimulMode.AppendFormat("{0}{1}", anyComponentIsInSimulMode ? ", " : "", cmpnt.Name);
-					anyComponentIsInSimulMode = true;
-				}
-
-                if (cmpnt is IDevice)
-                {
-                    devices.Add(cmpnt as IDevice);		            /// Only components that were initialized are added
-                    UiBridge.Bridge.OnActivity(null, cmpnt.Name);	/// Info
-                }
-
-                CurrentlyInitializedComponentName = cmpnt.Name;
-                cmpnt.Initialize();
-                cmpnt.StartChangeHandler();		/// Start handling parameter change events
-            }
-            
-            CurrentlyInitializedComponentName = "---";
-
-			///
-			/// (1) Propagate debug levels from parents to children when necessary
-			/// (2) Set drain valves DrainValve1, DrainValve2 and DrainValve3
-			///
-			foreach (var cmpnt in components)
-			{
-				if (cmpnt.Cfg is IChildComponentCfg && !string.IsNullOrEmpty(cmpnt.Cfg.ParentName) &&
-					(cmpnt.Cfg.DebugLevel == DebugMode.Inherit || cmpnt.Cfg.DebugLevel == DebugMode.AutoDetect))
-				{
-					foreach (var par in components)
-					{
-						if (par.Cfg.Name.Equals(cmpnt.Cfg.ParentName)) { cmpnt.Cfg.DebugLevel = par.Cfg.DebugLevel; break; }
-					}
-				}
-
-				if (cmpnt is IScaleOrTank)
-				{
-					IScaleOrTank tank = cmpnt as IScaleOrTank;
-
-                    if (tank == Tank1 && DrainValve1 == null)
-					{
-						DrainValve1 = tank.DrainValve;
-						log.WarnFormat("InitializeComponents() ... Scale1={0} DrainValve1={1}",
-										tank.Name, (DrainValve1 != null) ? DrainValve1.Name : "---");
-					}
-                    else if (tank == Tank2 && DrainValve2 == null)
-					{
-						DrainValve2 = tank.DrainValve;
-						log.WarnFormat("InitializeComponents() ... Scale2={0} DrainValve2={1}",
-										tank.Name, (DrainValve2 != null) ? DrainValve2.Name : "---");
-					}
-                    else if (tank == Tank3 && DrainValve3 == null)
-					{
-						DrainValve3 = tank.DrainValve;
-						log.WarnFormat("InitializeComponents() ... Scale3={0} DrainValve3={1}",
-										tank.Name, (DrainValve3 != null) ? DrainValve3.Name : "---");
-					}
-				}
-			}
-
-			if (anyComponentIsInSimulMode)
-				return inSimulMode.ToString();
-			else
-				return null;
-        }
-
-		/// <summary>
-		/// Stop devices that were started by InitializeDevices().
-		/// Works correctly also after exeption from InitializeDevices() as only ...
-		/// ... correctly started devices were added in 'devices' list.
-		/// </summary>
-		public static void StopDevices()
-		{
-            for (int i = devices.Count - 1; i >= 0; i--)
-            {
-                var dev = devices[i];
-                UiBridge.Bridge.OnActivity(null, string.Format("1. {0}", dev.Name));	/// Info
-                dev.StopDevice();
-            }
-		}
-
-		/// <summary>
-		/// Stop devices that were started by InitializeDevices().
-		/// Works correctly also after exeption from InitializeDevices() as only ...
-		/// ... correctly started devices were added in 'devices' list.
-		/// </summary>
-		public static void StopDevices2()
-		{
-            for (int i = devices.Count - 1; i >= 0; i--)
-            {
-                var dev = devices[i];
-                UiBridge.Bridge.OnActivity(null, string.Format("2. {0}", dev.Name));	/// Info
-                dev.StopDevice2();
-            }
-		}
-
-        /// <summary>
-        /// Checks remote and local configuration DB paths and transitions for compatibility
-        /// </summary>
-        /// <returns>true when DB-s are compatible</returns>
-        public static bool IsRemoteDBCompatible(out string message)
-        {
-            IList<Config.Entities.FeedingPath> remoteFeedingPaths;
-            IList<Config.Entities.BenchPath> remoteBenchPaths;
-            IList<Config.Entities.OutputPath> remoteOutputPaths;
-            IList<Config.Entities.MetersPath> remoteMetersPaths;
-            IList<Config.Entities.TransitionSequence> remoteTransitions;
-            
-            try
-            {
-                ISession remoteSession = TBF.DB.CreateSession(Common.DBKind.RemoteConfig);
-                remoteFeedingPaths = remoteSession.QueryOver<Config.Entities.FeedingPath>().List();
-                remoteBenchPaths = remoteSession.QueryOver<Config.Entities.BenchPath>().List();
-                remoteOutputPaths = remoteSession.QueryOver<Config.Entities.OutputPath>().List();
-                remoteMetersPaths = remoteSession.QueryOver<Config.Entities.MetersPath>().List();
-                remoteTransitions = remoteSession.QueryOver<Config.Entities.TransitionSequence>().List();
-            }
-            catch (Exception)
-            {
-                message = "Cannot open remote database";
-                return false;
-            }
-
-            ISession localSession = TBF.DB.CreateSession(Common.DBKind.Config);
-            var localFeedingPaths = localSession.QueryOver<Config.Entities.FeedingPath>().List();
-            var localBenchPaths = localSession.QueryOver<Config.Entities.BenchPath>().List();
-            var localOutputPaths = localSession.QueryOver<Config.Entities.OutputPath>().List();
-            var localMetersPaths = localSession.QueryOver<Config.Entities.MetersPath>().List();
-            var localTransitions = localSession.QueryOver<Config.Entities.TransitionSequence>().List();
-
-            string subMsg;
-            if (!IsCompatible(localFeedingPaths, remoteFeedingPaths, out subMsg))
-            {
-                message = string.Format("Feeding: {0}", subMsg);
-                return false;
-            }
-
-            if (!IsCompatible(localBenchPaths, remoteBenchPaths, out subMsg))
-            {
-                message = string.Format("Bench: {0}", subMsg);
-                return false;
-            }
-
-            if (!IsCompatible(localOutputPaths, remoteOutputPaths, out subMsg))
-            {
-                message = string.Format("Output: {0}", subMsg);
-                return false;
-            }
-
-            if (!IsCompatible(localMetersPaths, remoteMetersPaths, out subMsg))
-            {
-                message = string.Format("Sensors: {0}", subMsg);
-                return false;
-            }
-
-            if (!IsCompatible(localTransitions, remoteTransitions, out subMsg))
-            {
-                message = string.Format("Transitions: {0}", subMsg);
-                return false;
-            }
-
-            message = string.Empty;
-            return true;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <typeparam name="T">FeedingPath, BenchPath, OutputPath, MetersPath or TransitionSequence</typeparam>
-        /// <param name="localList">Local list of paths or transitions</param>
-        /// <param name="remoteList">Remote list of paths or transitions</param>
-        /// <param name="message">Message specifying a cause of incompatibility</param>
-        /// <returns>true when lists are compatible, otherwise false</returns>
-        private static bool IsCompatible<T>(IList<T> localList, IList<T> remoteList, out string message)
-        {
-            message = "Local list is empty";
-            if ((localList == null) || (localList.Count == 0) || !(localList[0] is IHasName)) return false;
-
-            message = "Remote list is empty";
-            if ((remoteList == null) || (remoteList.Count == 0) || !(remoteList[0] is IHasName)) return false;
-
-            ///
-            /// Each path or transition on a remote list must exist on a local list
-            ///
-            foreach (var rItem in remoteList)
-            {
-                bool exists = false;
-                foreach (var lItem in localList)
-                {
-                    if ((rItem as IHasName).Name == (lItem as IHasName).Name)
-                    {
-                        exists = true;
-                        break;
-                    }
-                }
-
-                if (!exists)
-                {
-                    message = string.Format("Remote item {0} does not exist on a local list", (rItem as IHasName).Name);
-                    return false;
-                }
-            }
-
-            message = string.Empty;
-            return true;
-        }
-
-
-		/// <summary>
-		/// Start the state machine 
-		/// </summary>
-		public static void Start()
-		{
-            if (MachineState != MachineState.StartingUp)
-            {
-                /// Unexpected MachineState (not MachineState.StartingUp) --> prevent worker thread from starting
-                ///
-                MachineState = MachineState.FailedToStart;
-                return;
-            }
-
-            workerThread = new Thread(Worker);
-			workerThread.CurrentCulture = Thread.CurrentThread.CurrentCulture;
-			workerThread.CurrentUICulture = Thread.CurrentThread.CurrentUICulture;
-			workerThread.Start();
-        }
-
-        /// <summary>
-        /// Loads all paths and transitions from the DB.
-        /// Updates StatMachine.feedingPaths ... StatMachine.meterPaths, StatMachine.TransitionSequences
-        /// </summary>
-        public static void LoadPathsAndTransitions(ISession session)
-		{
-			feedingPaths = session.QueryOver<Config.Entities.FeedingPath>().OrderBy(x => x.ItemNr).Asc.List();
-            benchPaths   = session.QueryOver<Config.Entities.BenchPath>().OrderBy(x => x.ItemNr).Asc.List();
-            outputPaths  = session.QueryOver<Config.Entities.OutputPath>().OrderBy(x => x.ItemNr).Asc.List();
-            metersPaths  = session.QueryOver<Config.Entities.MetersPath>().OrderBy(x => x.ItemNr).Asc.List();
-            TransitionSequences = session.QueryOver<TransitionSequence>().OrderBy(x => x.ItemNr).Asc.List();
-            TransitionSteps = session.QueryOver<TransitionStep>().OrderBy(x => x.ItemNr).Asc.List();
-#if HEAT_METERS
-            heatMetersPaths = session.QueryOver<Config.Entities.HeatMetersPath>().OrderBy(x => x.ItemNr).Asc.List();
-#endif
-		}
-
-        /// <summary>
-        /// Loads selected procedure from the DB.
-        /// Updates StateMachine.Procedure and StateMachine.Tests
-        /// </summary>
-        public static bool LoadProcedure(ISession session, string procedureName, bool isRemote, IList<string> autoTests = null)
-        {
-            Procedure = null;
-
-            IList<Procedure> selectedProcs = session.QueryOver<Procedure>()
-                                                    .Where(x => (x.ProcedureState == Common.ProcedureState.Active))
-                                                    .And(x => (x.Name == procedureName))
-                                                    .List();
-            if (selectedProcs.Count == 1)
-            {
-                IsRemoteProcedure = isRemote;
-                Procedure = selectedProcs[0];
-                TestInstances = selectedProcs[0].UpdateTestInstances(LoopStartNames, LoopEndNames, autoTests);
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-		public static void LoadProcedureParams(Procedure procedure)
-		{
-			foreach (var cmpnt in components)
-			{
-                cmpnt.Cfg.LoadProcedureParamsFromDB(procedure);
-			}
-		}
-
-		public static void LoadTestParams(Test test)
-		{
-			foreach (var cmpnt in components)
-			{
-				cmpnt.Cfg.LoadTestParamsFromDB(test);
-			}
-		}
-
-		/// <summary>
-		/// Called from the sequence to update paths based on the selected test
-		/// </summary>
-		/// <param name="test">Selected test</param>
-		/// <param name="pfeed"></param>
-		/// <param name="pben"></param>
-		/// <param name="pout"></param>
-		/// <param name="pmtrs"></param>
-		/// <param name="transitionBefore">Transition sequence entity</param>
-		/// <param name="transitionAfter">Transition sequence entity</param>
-		/// <param name="errorMsg">Error message in case of incorrect configuration</param>
-		/// <returns>true when loaded configuration is correct (all four paths are defined !=null, etc.)</returns>
-		public static bool GetPaths(Test test,
-                                    bool heatMetersPathRequired,
-									out FeedingPath pfeed,
-                                    out BenchPath pben,
-                                    out OutputPath pout,
-                                    out MetersPath pmtrs,
-                                    out HeatMetersPath phmtrs,
-                                    out TransitionSequence transitionBefore,
-                                    out TransitionSequence transitionBetween,
-                                    out TransitionSequence transitionAfter,
-                                    out string errorMsg)
-		{
-            ITestMethod tm = TbfComponents.FindComponent(test.Method) as ITestMethod;
-            bool isHydroTest = (tm != null) ? tm.DoTransitions() : false;
-
-			pfeed = null;
-			pben = null;
-			pout = null;
-            phmtrs = null;
-			transitionBefore = null;
-            transitionBetween = null;
-            transitionAfter = null;
-
-			foreach (var path in feedingPaths)
-			{
-				if (test.FeedingPath == path.Name) { pfeed = new FeedingPath(path, components); break; }
-			}
-
-			foreach (var path in benchPaths)
-			{
-				if (test.BenchPath == path.Name) { pben = new BenchPath(path, components); break; }
-			}
-
-			foreach (var path in outputPaths)
-			{
-				if (test.OutputPath == path.Name) { pout = new OutputPath(path, components); break; }
-			}
-
-			pmtrs = GetMetersPath(test);
-
-            if (isHydroTest && (pfeed == null)) errorMsg = Strings.Cannot_load_feeding_path;
-            else if (isHydroTest && (pben == null)) errorMsg = Strings.Cannot_load_bench_path;
-            else if (isHydroTest && (pout == null)) errorMsg = Strings.Cannot_load_output_path;
-            else if (pmtrs == null) errorMsg = Strings.Cannot_load_sensor_path;
-            else errorMsg = string.Empty;
-            if ((isHydroTest && (pfeed == null || pben == null || pout == null)) || (pmtrs == null))
-            {
-                log.ErrorFormat("GetPaths({0},...) returns false, wrong configuration", test.Name);
-                return false;
-            }
-
-#if HEAT_METERS
-            foreach (var path in heatMetersPaths)
-            {
-                if (test.HeatMetersPath == path.Name) { phmtrs = new HeatMetersPath(path, components); break; }
-            }
-#endif
-            if (heatMetersPathRequired && phmtrs == null)
-            {
-                log.ErrorFormat("GetPaths({0},...) returns false, missing heat meters sensors", test.Name);
-                errorMsg = "Cannot load heat meters sensors";
-                return false;
-            }
-
-            foreach (var tr in TransitionSequences)
-			{
-				if (tr.Name == test.TransBefore) transitionBefore = tr;
-                if (tr.Name == test.TransBetween) transitionBetween = tr;
-                if (tr.Name == test.TransAfter) transitionAfter = tr;
-			}
-
-            if (isHydroTest && pout.Scale == null)
-            {
-                log.ErrorFormat("GetPaths({0},...) returns false, missing scales in output path {1}", test.Name, test.OutputPath);
-                errorMsg = string.Format("No balance specified in path {0}", test.OutputPath);
-                return false;
-            }
-
-            if (Config.Formulas.RealDensity() < 500.0f || Config.Formulas.RealDensity() > 2000.0f)
-			{
-                log.ErrorFormat("GetPaths({0},...) returns false, density was not specified", test.Name);
-                errorMsg = string.Format("Density was not specified");
-				return false;
-			}
-
-            log.WarnFormat("GetPaths({0},...) returns true, paths loaded OK, isHydroTest={1}", test.Name, isHydroTest);
-            errorMsg = string.Empty;
-            return true;
-		}
-
-
-		/// <summary>
-		/// Updates paths based on the selected test
-		/// </summary>
-		public static MetersPath GetMetersPath(Test test)
-		{
-			MetersPath pmtrs = null;
-			foreach (var path in metersPaths)
-			{
-				if (test.MetersPath == path.Name) { pmtrs = new MetersPath(path, components); break; }
-			}
-			if (pmtrs != null)
-			{
-                int count = Math.Min(TBF.Data.WMsCount, pmtrs.RegisterReaders.Length);
-				for (int i = 0; i < count; i++)
-				{
-					if ((pmtrs.RegisterReaders[i] != null) &&
-						(pmtrs.RegisterReaders[i].Cfg.DebugLevel == DebugMode.DetectedOff))
-					{
-						pmtrs.RegisterReaders[i] = null;
-					}
-				}
-			}
-			return pmtrs;
-		}
-
-
-        /*
-         * This is and example sequence of RunDeviceBefore() / RunOperations() / RunDeviceAfter() calls
-         * as they are executed during normal run from the progran start to the end.
-         * 
-        foreach (var device in devices) device.RunDeviceBefore();  . . . . . .  in StateMachine.Worker()
-        State.Create(...).AddOperation(...).AddOperation(...).EnterState() . .  in the sequence in Execute(...)
-
-        foreach (var device in devices) device.RunDeviceAfter(); . . . . . . .  in WaitRunDevsRunOps()
-        WaitNextTick()  (may throw QuitStateMachineException)  . . . . . . . .  in WaitRunDevsRunOps()
-        foreach (var device in devices) device.RunDeviceBefore();  . . . . . .  in WaitRunDevsRunOps()
-        IList<Event> events = State.RunOperations(); . . . . . . . . . . . . .  in WaitRunDevsRunOps()
-
-        foreach (var device in devices) device.RunDeviceAfter(); . . . . . . .  in WaitRunDevsRunOps()
-        WaitNextTick()  (may throw QuitStateMachineException)  . . . . . . . .  in WaitRunDevsRunOps()
-        foreach (var device in devices) device.RunDeviceBefore();  . . . . . .  in WaitRunDevsRunOps()
-        IList<Event> events = State.RunOperations(); . . . . . . . . . . . . .  in WaitRunDevsRunOps()
-
-        State.Create(...).AddOperation(...).AddOperation(...).EnterState() . .  in the sequence in Execute(...)
-
-        foreach (var device in devices) device.RunDeviceAfter(); . . . . . . .  in WaitRunDevsRunOps()
-        WaitNextTick()  (may throw QuitStateMachineException)  . . . . . . . .  in WaitRunDevsRunOps()
-        foreach (var device in devices) device.RunDeviceBefore();  . . . . . .  in WaitRunDevsRunOps()
-        IList<Event> events = State.RunOperations(); . . . . . . . . . . . . .  in WaitRunDevsRunOps()
-
-        foreach (var device in devices) device.RunDeviceAfter(); . . . . . . .  in WaitRunDevsRunOps()
-        WaitNextTick()  (assume QuitStateMachineException thrown)  . . . . . .  in WaitRunDevsRunOps()
-        State.StopOperations();  . . . . . . . . . . . . . . . . . . . . . . .  in StateMachine.Worker() catch()
-        foreach (var device in devices) device.StopDevice(); . . . . . . . . .  in StateMachine.Worker() catch()
-        */
-
-        /// <summary>
-        /// Worker thread: calls Start(), Run() and Stop() methods of operations.
-        /// It uses 'currentState', 'nextState' and 'quitStateMachine' static fields.
-        /// </summary>
-        static void Worker()
-        {
-            MachineState = MachineState.Running;
-            startDateTime = DateTime.Now;
-            CycleStartTimeStamp = startDateTime;	/// Do not leave CycleStartTimeStamp uninitialized
-			wlog.InfoFormat("   currentTime = {0}s   startDateTime = {1}", currentTimeSec.ToString(), startDateTime.ToString());
-
-            /// Run all devices for the first time
-            foreach (var device in devices) device.RunDeviceBefore();
-
-            SequenceBase.ReferenceFlowmetersCount = SequenceBase.FlowMeters.Count;
-            SequenceBase.CalibratedLtrPerRefPulse = new double[SequenceBase.ReferenceFlowmetersCount];
-            foreach (var flowmtr in SequenceBase.FlowMeters)
-            {
-                int ix = flowmtr.Idx1;
-                if (ix > 0 && ix <= SequenceBase.ReferenceFlowmetersCount)
-                {
-                    SequenceBase.CalibratedLtrPerRefPulse[ix - 1] = flowmtr.NominalFlow / 7200.0;
-                }
-            }
-
-            ///
-            /// Run the main sequence
-            ///
-			(new Sequences.MainSeq()).Execute();
-
-            StateMachine.MachineState = MachineState.Off;                   /// Update StateMachine.MachineState
-            TBF.UiBridge.Bridge.Bench2UI(TBF.UiBridge.ButtonsEtc.Shutdown); /// Let UI know the state machine is shut down now
-        }
-
-
-        /// <summary>
-        /// Do stuff that is repeated in the state execution loops most often
-        /// </summary>
-        /// <returns>List of Event-s returned from the state operations, null == quit</returns>
-        public static IList<Event> WaitRunDevsRunOps(bool lastTime = false)
-        {
-            Thread.Sleep(100);      /// Insert 1/10 sec.delay between RunOperations() and RunDeviceAfter()
-
-            for (int i = devices.Count - 1; i >= 0; i-- )
-            {
-                devices[i].RunDeviceAfter();
-            }
-			
-            WaitNextTick();
-
-            if (lastTime)
-            {
-                ///
-                /// Executed when the state machine is being stopped
-                ///
-                State.StopOperations();
-				return null;
-            }
-
-            foreach (var device in devices)
-            {
-                device.RunDeviceBefore();
-            }
-
-            Thread.Sleep(100);              /// Insert 1/10 sec.delay between RunDeviceBefore() and RunOperations()
-
-            return State.RunOperations();   /// Returns events from all running operations
-                                            /// This is followed by a state change in the sequence
-        }
-
-
-        /// <summary>
-        /// Wait time period - synchronize
-        /// </summary>
-        /// <returns>true when interrupted by 'quitStateMachine', otherwise false</returns>
-        public static void WaitNextTick()
-        {
-            int currentTimeSecFromClock = Convert.ToInt32(Math.Round((DateTime.Now - startDateTime).TotalSeconds - 0.2));
-
-            currentTimeSec = Math.Max(currentTimeSec, currentTimeSecFromClock) + Period;
-
-            DateTime nextTickDateTime = startDateTime + TimeSpan.FromSeconds(currentTimeSec);
-
-            while (DateTime.Now < nextTickDateTime)
-            {
-				Thread.Sleep(100);	
-            }
-        }
-    }
-}

TBF/LocalSettings.cs

@@ -41,7 +41,7 @@ namespace TBF
         /// Names and database settings of test benches.
         /// </summary>
         [XmlArrayAttribute("TestBenches")]
-        public Config.DatabaseSettings[] TestBenches;
+        public DatabaseSettings[] TestBenches;
 
         [XmlIgnore]
         public int BenchesCount { get { return (TestBenches != null) ? TestBenches.GetLength(0) : 0; } }

TBF/Program.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.IO;
@@ -11,6 +11,7 @@ using Config.Entities;
 using Users;
 using Users.Entities;
 using TBF.Resources;
+using TBF.Rig.Sequences;
 using TBF.UI.Shared;
 using NHibernate;
 
@@ -40,6 +41,8 @@ namespace TBF
 		public const string LocalSettingsBackupName = "config.backup.xml";
 
 		public static System.Globalization.CultureInfo AltCulture;
+        
+        static IList<Procedure> listOfProcedures;
 		
 		/// <summary>
         /// Selected procedure data
@@ -52,12 +55,12 @@ namespace TBF
         ///    of procedure data and uses them for the test. Changes of 'SelectedProcedure'
         ///    done during the test do not have any influence on the currently running test.
         /// </summary>
-        public static Config.Entities.Procedure SelectedProcedure = null;
+        public static Procedure SelectedProcedure = null;
 
         /// <summary>
         /// Main window object.
         /// </summary>
-        public static UI.MainWnd MainWnd;
+        public static TBF.UI.MainWnd MainWnd;
 
 
         /// <summary>
@@ -152,12 +155,6 @@ namespace TBF
 			log = LogManager.GetLogger(typeof(Program));
 			log.Fatal("--------------------------------------------------------------------------------");
 			log.Fatal(string.Format("TBF ver.{0}", Version));
-            log.Debug("List of component classes:");
-            int count = 0;
-            foreach (var factory in TBF.Rig.TbfComponents.Factories)
-            {
-                log.DebugFormat("  {0:D3} {1}", ++count, factory.ClassName);
-            }
 
 			///
             /// Load the local settings
@@ -256,8 +253,8 @@ namespace TBF
                         {
 							log.FatalFormat("Test bench name: {0}", loginDlgBench.BenchName);
 
-							GlobalData.RemoteUsersDB = LocalSettings.TestBenches[i].UsersDBSettings;
-							GlobalData.LocalUsersDB = LocalSettings.TestBenches[i].ProceduresDBSettings;
+							Users.CurrentUser.RemoteUsersDB = LocalSettings.TestBenches[i].UsersDBSettings;
+							Users.CurrentUser.LocalUsersDB = LocalSettings.TestBenches[i].ProceduresDBSettings;
 
                             Users.Entities.User loadedUser = null;
                             try
@@ -273,10 +270,10 @@ namespace TBF
 								if (Users.Entities.User.IsPowerUser(loginDlgBench.Alias, loginDlgBench.Password))
 								{
 									loadedUser = new Users.Entities.User(loginDlgBench.Alias, 6, true);
-                                    authorized = loadedUser.Authorize(loginDlgBench.Alias, loginDlgBench.Password, reqGrpMembership);
+                                    authorized = loadedUser.Authorize(loginDlgBench.Alias, loginDlgBench.Password, reqGrpMembership, null);
                                     if (authorized)
                                     {
-                                        GlobalData.AuthorizedAs = Common.AuthorizedAs.PowerUser;
+                                        Users.CurrentUser.AuthorizedAs = Common.AuthorizedAs.PowerUser;
                                     }
 								}
 
@@ -285,7 +282,7 @@ namespace TBF
                                 ///
 								if (!authorized)
 								{
-									DBSettings[] dbs = new DBSettings[] { GlobalData.RemoteUsersDB, GlobalData.LocalUsersDB };
+									DBSettings[] dbs = new DBSettings[] { Users.CurrentUser.RemoteUsersDB, Users.CurrentUser.LocalUsersDB };
 
 									authorizedAs = Common.AuthorizedAs.RemoteUser;		/// Try remote DB first
 
@@ -297,7 +294,7 @@ namespace TBF
                                             if (loginDlgBench.Password == LoginDlgWithBenchSelection.UseTheTagPassword)
                                             {
                                                 loadedUser = Users.Entities.User.LoadUserByTag(loginDlgBench.Alias, db);
-                                                if (loadedUser != null) authorized = loadedUser.AuthorizeTag(loginDlgBench.Alias, reqGrpMembership);
+                                                if (loadedUser != null) authorized = loadedUser.AuthorizeTag(loginDlgBench.Alias, reqGrpMembership, null);
                                             }
                                             else
                                             {
@@ -306,17 +303,17 @@ namespace TBF
                                                     default:
                                                     case Common.LoginMethod.UserName:
                                                         loadedUser = Users.Entities.User.LoadUserByName(loginDlgBench.Alias, db);
-                                                        if (loadedUser != null) authorized = loadedUser.Authorize(loginDlgBench.Alias, loginDlgBench.Password, reqGrpMembership);
+                                                        if (loadedUser != null) authorized = loadedUser.Authorize(loginDlgBench.Alias, loginDlgBench.Password, reqGrpMembership, null);
                                                         break;
                                                     case Common.LoginMethod.FullName:
                                                         loadedUser = Users.Entities.User.LoadUserByFullName(loginDlgBench.Alias, db);
-                                                        if (loadedUser != null) authorized = loadedUser.AuthorizeFullName(loginDlgBench.Alias, loginDlgBench.Password, reqGrpMembership);
+                                                        if (loadedUser != null) authorized = loadedUser.AuthorizeFullName(loginDlgBench.Alias, loginDlgBench.Password, reqGrpMembership, null);
                                                         break;
                                                     case Common.LoginMethod.Number:
                                                         int number;
                                                         if (!int.TryParse(loginDlgBench.Alias, out number)) break;
                                                         loadedUser = Users.Entities.User.LoadUserByNumber(number, db);
-                                                        if (loadedUser != null) authorized = loadedUser.AuthorizeNumber(number, loginDlgBench.Password, reqGrpMembership);
+                                                        if (loadedUser != null) authorized = loadedUser.AuthorizeNumber(number, loginDlgBench.Password, reqGrpMembership, null);
                                                         break;
                                                 }
                                             }
@@ -335,7 +332,7 @@ namespace TBF
 								if (authorized)
                                 {
                                     loadedUser.SetLegalizator(loginDlgBench.Legalizator);
-                                    Users.GlobalData.AuthorizedAs = authorizedAs;
+                                    Users.CurrentUser.AuthorizedAs = authorizedAs;
 									
 									LocalSettings.LoginMethod = loginDlgBench.Method;   /// Save the login method actually used
 
@@ -356,7 +353,7 @@ namespace TBF
                                     /// Copy the selected bench settings to CurrentBench.
                                     /// Clone() guarantees that current bench settings wont be modified
                                     /// when user modifies the database settings in DatabaseSettingsDlg.
-									TBF.DB.CurrentBench = (Config.DatabaseSettings)LocalSettings.TestBenches[i].Clone();
+									TBF.DB.CurrentBench = (DatabaseSettings)LocalSettings.TestBenches[i].Clone();
                                     Results.DB.DbType = TBF.DB.CurrentBench.WaterMetersDBSettings.DbType;
                                     Results.DB.ConnectionString = TBF.DB.CurrentBench.WaterMetersDBSettings.ConnectionString;
 
@@ -366,12 +363,44 @@ namespace TBF
                                     ///
                                     /// Connect to Config database.
                                     /// This triggers an exception in case user is a power user and there is no Config database.
-                                    /// 
-                                    IList<Procedure> listOfProcedures = TBF.DB.CreateSession(Common.DBKind.Config)
-                                                                                           .QueryOver<Procedure>()
-                                                                                           .Where(x => (x.ProcedureState == Common.ProcedureState.Active))
-                                                                                           .And(x => (x.Name == LocalSettings.LastProcedureName))
-                                                                                           .List();
+                                    ///
+                                    ISession session = TBF.DB.CreateSession(DBKind.Config);
+
+                                    if (!string.IsNullOrEmpty(LocalSettings.LastProcedureName))
+                                    {
+                                        listOfProcedures = session.QueryOver<Procedure>()
+                                                                  .Where(x => (x.ProcedureState == ProcedureState.Active))
+                                                                  .And(x => (x.Name == LocalSettings.LastProcedureName))
+                                                                  .List();
+                                    }
+
+                                    /// Search for 'BenchInfo' component
+                                    var components = session.QueryOver<Config.Entities.Component>()
+                                                            .Where(x => x.ClassName == "BenchInfoEx")
+                                                            .List();
+                                    if (components.Count > 0)
+                                    {
+                                        var factory =           new TBF.Rig.DataContainers.BenchInfo.Extended.ComponentFactory();
+                                        var cfg = factory.CmpntCfgFromCmpntEntity(components[0])
+                                                                 as TBF.Rig.DataContainers.BenchInfo.Extended.ComponentCfg;
+                                        ProcessData.BenchInfo = new TBF.Rig.DataContainers.BenchInfo.Extended.Component(cfg);
+                                    }
+                                    else
+                                    {
+                                        /// Search for 'iPerlBenchInfo' component
+                                        components = session.QueryOver<Config.Entities.Component>()
+                                                            .Where(x => x.ClassName == "BenchInfo.iPerl")
+                                                            .List();
+                                        if (components.Count > 0)
+                                        {
+                                            var factory =           new TBF.Rig.DataContainers.BenchInfo.iPerl.ComponentFactory();
+                                            var cfg = factory.CmpntCfgFromCmpntEntity(components[0])
+                                                                     as TBF.Rig.DataContainers.BenchInfo.iPerl.ComponentCfg;
+                                            ProcessData.BenchInfo = new TBF.Rig.DataContainers.BenchInfo.iPerl.Component(cfg);
+                                        }
+                                    }
+
+                                    session.Close();
 
                                     ///
                                     /// Connect to Results database and determine the last saved batch number.
@@ -454,10 +483,10 @@ namespace TBF
             if (LocalSettings.LastProcedureName != null)
             {
                 IList<Procedure> listOfProcedures = TBF.DB.CreateSession(Common.DBKind.Config)
-					                                                   .QueryOver<Procedure>()
-                                                                       .Where(x => (x.ProcedureState == Common.ProcedureState.Active))
-                                                                       .And(x => (x.Name == LocalSettings.LastProcedureName))
-					                                                   .List();
+					                                      .QueryOver<Procedure>()
+                                                          .Where(x => (x.ProcedureState == Common.ProcedureState.Active))
+                                                          .And(x => (x.Name == LocalSettings.LastProcedureName))
+					                                      .List();
 
                 if (listOfProcedures.Count == 1)
                 {

TBF/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Sensus")]
 [assembly: AssemblyProduct("TestBenchFramework")]
-[assembly: AssemblyCopyright("Copyright © 2013 - 2021 Sensus Slovensko, a.s.")]
+[assembly: AssemblyCopyright("Copyright © 2013 - 2022 Sensus Slovensko, a.s.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.27.1812.0")]
-[assembly: AssemblyFileVersion("2.27.1812.0")]
+[assembly: AssemblyVersion("2.29.1927.0")]
+[assembly: AssemblyFileVersion("2.29.1927.0")]

TBF/Resources/Strings.Designer.cs

@@ -1275,6 +1275,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Delay.
+        /// </summary>
+        internal static string Delay {
+            get {
+                return ResourceManager.GetString("Delay", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Density.
         /// </summary>
@@ -3930,6 +3939,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Processing statistics.
+        /// </summary>
+        internal static string Processing_statistics {
+            get {
+                return ResourceManager.GetString("Processing_statistics", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Producer.
         /// </summary>