Reconfigured for Nanjing: ORACLE_DB, MANAGED, TURA_IPERL defined

.gitignore

@@ -4,10 +4,6 @@ Config/bin/
 Config/obj/
 DataStreamInterface/bin/
 DataStreamInterface/obj/
-DataStreamInterfaceTest/bin/
-DataStreamInterfaceTest/obj/
-DataStreamMeter/bin/
-DataStreamMeter/obj/
 Decrypt/bin/
 Decrypt/obj/
 DeviceTest/bin/
@@ -40,8 +36,10 @@ Results/bin/
 Results/obj/
 ResultsBrowser/bin/
 ResultsBrowser/obj/
-ResultsParser/bin/
-ResultsParser/obj/
+SharedDatabase/bin
+SharedDatabase/obj
+SchematicDrawing/bin
+SchematicDrawing/obj
 Statistics/bin/
 Statistics/obj/
 TBF/bin/

Common/Common.csproj

@@ -30,6 +30,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="log4net">
+      <HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -42,7 +45,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BackgroundBeep.cs" />
-    <Compile Include="Const.cs" />
     <Compile Include="DatabaseSettings.cs" />
     <Compile Include="DBSettings.cs" />
     <Compile Include="Enums.cs" />
@@ -50,7 +52,6 @@
       <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" />
@@ -61,17 +62,14 @@
     <Compile Include="Forms\ModelessForm.designer.cs">
       <DependentUpon>ModelessForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="Formulas.cs" />
+    <Compile Include="GlobalData.cs" />
     <Compile Include="IMeasurementCorrection.cs" />
-    <Compile Include="IOrderInfo.cs" />
     <Compile Include="IParamsProvider.cs" />
+    <Compile Include="Iperl\OptoTelegramRaw.cs" />
     <Compile Include="IUncertainty.cs" />
     <Compile Include="IUser.cs" />
-    <Compile Include="Printers\PrintersCommon.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="QuitAppException.cs" />
-    <Compile Include="StatisticalMetrics.cs" />
-    <Compile Include="Iperl\OptoTelegramRaw.cs" />
+    <Compile Include="ProcedureInfo.cs" />
     <Compile Include="SerializableDictionary.cs" />
     <Compile Include="Telegram.cs" />
     <Compile Include="UIControls\CoolButtonCtrl.cs">
@@ -80,11 +78,19 @@
     <Compile Include="UIControls\CoolButtonCtrl.Designer.cs">
       <DependentUpon>CoolButtonCtrl.cs</DependentUpon>
     </Compile>
+    <Compile Include="UIControls\LviDateTimeColumnComparer.cs" />
     <Compile Include="UIControls\RoundedRectangle.cs" />
     <Compile Include="Units.cs" />
     <Compile Include="Utils.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UIControls\ListViewEx.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="UIControls\ListViewExtensions.cs" />
+    <Compile Include="UIControls\LviIntColumnComparer.cs" />
+    <Compile Include="UIControls\LviTextColumnComparer.cs" />
   </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <EmbeddedResource Include="Forms\ListViewEx.resx">
       <DependentUpon>ListViewEx.cs</DependentUpon>
@@ -93,7 +99,6 @@
       <DependentUpon>ModelessForm.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Common/Const.cs

@@ -1,12 +0,0 @@
-///
-/// Copyright (c) 2023 Sensus Slovensko a.s.
-///
-using System;
-
-namespace Common
-{
-    public static class Const
-    {
-        public const string MySqlConnectTimeoutSec = "120";
-    }
-}

Common/DBSettings.cs

@@ -10,15 +10,14 @@ namespace Common
 	/// </summary>
 	public class DBSettings : ICloneable
 	{
-		public DBType DbType;
+		public Common.DBType DbType;
 		public string ConnectionString;
-        public bool IsValid { get { return (DbType != DBType.None) && !string.IsNullOrEmpty(ConnectionString); } }
 
 		public DBSettings()
 		{
 		}
 
-		public DBSettings(DBType dbType, string connectionString)
+		public DBSettings(Common.DBType dbType, string connectionString)
 		{
 			this.DbType = dbType;
 			this.ConnectionString = connectionString;

Common/DatabaseSettings.cs

@@ -15,10 +15,10 @@ namespace Common
         // Public fields
         public string BenchName;
         public bool IsRealBench;
-        public DBSettings ProceduresDBSettings;	    /// Configuration database settings
+        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
+        public DBSettings EventsDBSettings;	    /// Events database settings
+        public DBSettings UsersDBSettings;		/// Shared configuration database settings
 
         // Constructor
         public DatabaseSettings()

Common/Enums.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -49,6 +49,15 @@ namespace Common
         Count
     }
 
+    /// <summary> Identifies the database based on the content </summary>
+    public enum DBKind
+    {
+        Config,
+        Results,
+        RemoteConfig,
+        Count
+    }
+
     public enum ProcedureSelection
     {
 #if LANG_CS
@@ -61,50 +70,12 @@ namespace Common
         [Description("None")]                           None,
         [Description("Local procedures")]               FromLocalDB,
         [Description("Shared procedures")]              FromSharedDB,
-        [Description("Orders from Oracle DB")]          OrderFromOracleDB,
-        [Description("Orders from Tracing DB")]         OrderFromTracingDB,
+        [Description("Orders from Oracle DB")]          OrderNrFromOracleDB,
+        [Description("Orders from Tracing DB")]         OrderNrFromTracingDB,
 #endif
         Count
     }
 
-    /// <summary>
-    /// Obsolete - replaced by enum ProcedureSelection (above) in 3.1 and newer
-    /// </summary>
-    public enum RemoteDBUse
-    {
-        [Description("Local DB only")]          LocalDBOnly,
-        [Description("Remote DB only")]         RemoteDBOnly,
-        [Description("Both DB-s, local 1st")]   BothDBsLocalFirst,
-        [Description("Both DB-s, remote 1st")]  BothDBsRemoteFirst,
-        Count
-    }
-
-    /// <summary>
-    /// Obsolete - Contains a procedure name and a database specification (local/remote).
-    /// </summary>
-    public class ProcedureInfo
-    {
-        public readonly string Name;
-        public readonly bool IsRemote;
-
-        public ProcedureInfo(string name, bool isRemote)
-        {
-            Name = name;
-            IsRemote = isRemote;
-        }
-    }
-
-    /// <summary>
-    /// Test designation mode for IperlLogger and IperlHead opto data files 
-    /// </summary>
-    public enum DesigMode
-    {
-        Auto,
-        Based_on_procedure,
-        As_specified,
-        Count
-    }
-
     public enum LoginMethod
     {
         UserName,		/// = alias, abbreviation
@@ -214,14 +185,6 @@ namespace Common
 		Count,
 	}
 
-    public enum FlowNames
-    {
-        QnQtQmin = 0,
-        Q3Q2Q1 = 1,
-        QpQi = 2,
-        Count,
-    }
-
     public enum ProfileType
     {
         Q3R,
@@ -303,13 +266,11 @@ namespace Common
         [Description("V")]      V,         /// vertical
         [Description("STR")]    S,         /// standrohre
         [Description("F")]      F,         /// fall
-        [Description("H/V")]    HV,        /// horizontal / vertical
 #else
-        [Description("H")]      H,         /// horizontal
-        [Description("V")]      V,         /// vertical
-        [Description("S")]      S,         /// steig
-        [Description("F")]      F,         /// fall
-        [Description("H/V")]    HV,        /// horizontal / vertical
+        [Description("H")] H,              /// horizontal
+        [Description("V")] V,              /// vertical
+        [Description("S")] S,              /// steig
+        [Description("F")] F,              /// fall
 #endif
 		Count
     }
@@ -341,7 +302,6 @@ namespace Common
         [Description("")]   NotSpecified,
         [Description("U0")] U0,              /// ?
         [Description("D0")] D0,              /// ?
-        /// 
         Count
     }
 
@@ -390,17 +350,6 @@ namespace Common
 		Count
 	}
 
-    /// <summary>
-    /// State of water filled in the test bench.
-    /// </summary>
-    public enum FillState
-    {
-        Unknown,            /// Test bench fill state is unknown
-        Empty,              /// Test bench is empty, no water
-        Full,               /// Test bench is full of water
-        Count
-    }
-
     public enum MeretProtocol
     {
         [Description("<undefined>")]        Undefined,
@@ -810,8 +759,10 @@ namespace Common
         [Description("Levá")]   Left,
         [Description("Pravá")]  Right,
 #else
-        [Description("Left")]   Left,
-        [Description("Right")]  Right,
+        [Description("Left")]
+        Left,
+        [Description("Right")]
+        Right,
 #endif
         Count
     }

Common/Forms/ListViewEx.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2016-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections;
@@ -61,7 +61,8 @@ namespace Common.Forms
 		private const int HDN_ITEMCHANGINGW = (HDN_FIRST-20);
 		#endregion
 
-        public MySortOrder SortOrder = MySortOrder.None;
+
+        public SortOrder SortOrder = SortOrder.None;
         public int SortColumn = -1;
 
 		///	<summary>
@@ -70,8 +71,7 @@ namespace Common.Forms
 		private	System.ComponentModel.Container	components = null;
 
 		public event SubItemEventHandler SubItemClicked;
-        public event SubItemEventHandler SubItemRightClicked;
-        public event SubItemEventHandler SubItemBeginEditing;
+		public event SubItemEventHandler SubItemBeginEditing;
 		public event SubItemEndEditingEventHandler SubItemEndEditing;
 
 		public ListViewEx()
@@ -241,22 +241,12 @@ namespace Common.Forms
 		{
 			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;
-                }
+			if (DoubleClickActivation)
+			{
+				return;
+			} 
 
-                EditSubitemAt(new Point(e.X, e.Y));
-            }
+			EditSubitemAt(new Point(e.X, e.Y));
 		}
 		
 		protected override void OnDoubleClick(EventArgs e)
@@ -287,20 +277,6 @@ namespace Common.Forms
 			}
 		}
 
-        ///<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
@@ -326,11 +302,6 @@ namespace Common.Forms
 			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

Common/Forms/ListViewExtensions.cs

@@ -1,7 +1,4 @@
-///
-/// Copyright (c) 2019-2020 Sensus Slovensko a.s.
-///
-using System;
+using System;
 using System.ComponentModel;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
@@ -58,7 +55,7 @@ namespace Common.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 ListViewEx listViewControl, int columnIndex, MySortOrder order)
+        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++)
@@ -74,18 +71,16 @@ namespace Common.Forms
                     throw new Win32Exception();
                 }
 
-                if (order != MySortOrder.None && columnNumber == columnIndex)
+                if (order != SortOrder.None && columnNumber == columnIndex)
                 {
                     switch (order)
                     {
-                        case MySortOrder.Ascending:
-                        case MySortOrder.Ascending2:
+                        case SortOrder.Ascending:
                             item.fmt &= ~HDITEM.Format.SortDown;
                             item.fmt |= HDITEM.Format.SortUp;
                             break;
 
-                        case MySortOrder.Descending:
-                        case MySortOrder.Descending2:
+                        case SortOrder.Descending:
                             item.fmt &= ~HDITEM.Format.SortUp;
                             item.fmt |= HDITEM.Format.SortDown;
                             break;

Common/Forms/LviIntColumnComparer.cs

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

Common/Forms/LviNameSurnameColumnComparer.cs

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

Common/Forms/LviTextColumnComparer.cs

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

Common/Forms/ModelessForm.Designer.cs

@@ -51,6 +51,7 @@
             this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "ModelessForm";
+            this.Load += new System.EventHandler(this.ModelessForm_Load);
             this.ResumeLayout(false);
             this.PerformLayout();
 

Common/Forms/ModelessForm.cs

@@ -1,7 +1,4 @@
-///
-/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
-///
-using System;
+using System;
 using System.Drawing;
 using System.Windows.Forms;
 
@@ -9,27 +6,62 @@ namespace Common.Forms
 {
     public partial class ModelessForm : Form
     {
+        /// <summary>
+        /// Called from the state machine when an operation forces a modeless dialog close.
+        /// </summary>
+        public static void UpdateMessage(MessageEventArgs args)
+        {
+            if (UpdateMessageHandler == null) return;
+            try { UpdateMessageHandler(null, args); }
+            catch (Exception) { }
+        }
+        public static event EventHandler<MessageEventArgs> UpdateMessageHandler;
+
+        void OnUpdateMessage(object sender, MessageEventArgs args)
+        {
+            Message = args.Message;
+            if (Message != null) label1.Text = Message;
+        }
+
+
+        /// <summary>
+        /// Called from the state machine when an operation forces a modeless dialog close.
+        /// </summary>
+        public static void CloseForm()
+        {
+            if (CloseFormHandler == null) return;
+            try { CloseFormHandler(null, null); }
+            catch (Exception) { }
+        }
+        public static event EventHandler<EventArgs> CloseFormHandler;
+
+        void OnCloseForm(object sender, EventArgs args)
+        {
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+
+
+        public string Title;
+        public string Message;
+        public Color BackgroundColor;
+        public Color TextColor;
+        public Font TextFont;
+        public string FontFamily;
+        public int FontSize;
+        public FontStyle FontStyle;
+
+
         /// <summary>
         /// Constructor to be used by the application
         /// </summary>
         /// <param name="title">Window title</param>
         /// <param name="message">Displayed message</param>
-        public ModelessForm(string message, int backArgb = 0, int textArgb = 0, Font textFont = null, string title = null)
+        public ModelessForm()
         {
             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); }
@@ -43,37 +75,18 @@ namespace Common.Forms
             };
         }
 
+        private void ModelessForm_Load(object sender, EventArgs e)
+        {
+            if (Title != null) Text = Title;
+            if (Message != null) label1.Text = Message;
+            if (BackgroundColor != null) BackColor = BackgroundColor;
+            if (TextColor != null) ForeColor = TextColor;
+            if (FontFamily != null) label1.Font = new Font(FontFamily, FontSize, FontStyle);
 
-        /// <summary>
-        /// Called from the state machine when an operation forces a modeless dialog close.
-        /// </summary>
-        public void UpdateMessage(MessageEventArgs args)
-        {
-            if (UpdateMessageHandler == null) return;
-            try { UpdateMessageHandler(null, args); }
-            catch (Exception) { }
-        }
-        public event EventHandler<MessageEventArgs> UpdateMessageHandler;
-        void OnUpdateMessage(object sender, MessageEventArgs args)
-        {
-            if (args != null && args.Message != null) label1.Text = args.Message;
-        }
-
-
-        /// <summary>
-        /// Called from the state machine when an operation forces a modeless dialog close.
-        /// </summary>
-        public void CloseForm()
-        {
-            if (CloseFormHandler == null) return;
-            try { CloseFormHandler(null, null); }
-            catch (Exception) { }
-        }
-        public event EventHandler<EventArgs> CloseFormHandler;
-        void OnCloseForm(object sender, EventArgs args)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
+            float textWidth = Graphics.FromImage(new Bitmap(1, 1)).MeasureString(label1.Text, label1.Font).Width;
+            float textHeight = Graphics.FromImage(new Bitmap(1, 1)).MeasureString(label1.Text, label1.Font).Height;
+            Width = (int)textWidth + 120;		/// Form width calculated from the text width
+            Height += (int)textHeight;		    /// Form height calculated from the text height
         }
     }
 }

Common/GlobalData.cs

@@ -0,0 +1,32 @@
+///
+/// Copyright (c) 2021 Sensus Slovensko a.s.
+///
+using System;
+
+namespace Common
+{
+    public class GlobalData
+    {
+        public static double SampleDensity = 0; /// sample water density measured in an accredited labo [kg/m3]
+        public static double SampleTemp = 0;    /// sample temperature when density measured in an accredited labo [°C]
+        public static double Buoyancy = 0;
+
+        public const string AdminUsername = "admin";
+        public const string AdminPassword = "staratura";
+
+        public static DBSettings RemoteUsersDB = null;
+		public static DBSettings LocalUsersDB = null;
+
+        public static IUser CurrentUser;
+		public static Common.AuthorizedAs AuthorizedAs;
+		public static DateTime LastAuthorization = DateTime.Now;
+
+        public static int MinPasswdLength = 0;
+        public static int PasswdExpirationPeriodDays = 0; 
+
+        public static string GetCurrentUserName()
+        {
+            return (CurrentUser != null && CurrentUser.UserName != null) ? CurrentUser.UserName : string.Empty;
+        }
+    }
+}

Common/IMeasurementCorrection.cs

@@ -5,7 +5,7 @@ namespace Common
     public interface IMeasurementCorrection
     {
         int RangeIx { get; set; }
-        double Measurement { get; set; }
-        double Correction { get; set; }
+        float Measurement { get; set; }
+        float Correction { get; set; }
     }
 }

Common/IOrderInfo.cs

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

Common/Iperl/OptoTelegramRaw.cs

@@ -35,7 +35,7 @@ namespace Common.Iperl
 		public float RefFlow;			/// [m3/h]
 		public int Counter;				
 
-		public Int32 EmfRaw;			/// Signed EMF from iPerl opto data
+		public UInt32 EmfRaw;			/// From iPerl opto data
 		public Int16 MagneticFieldRaw;
 		public Int16 FlowRaw;
 		public UInt32 VolumeRaw;
@@ -50,7 +50,8 @@ namespace Common.Iperl
 		///
 		public double EMF()
 		{
-            return 0.000000333 * (double)EmfRaw;
+			Int32 signedEmf = (EmfRaw > 0x7FFFFF) ? ((int)EmfRaw - 0x1000000) : (int)EmfRaw;
+			return 0.000000333 * (double)signedEmf;
 		}
 		public double MagneticField() { return (double)MagneticFieldRaw; }
 		public double Flow(double scalingFactor) { return 0.225 * scalingFactor * (double)FlowRaw; }
@@ -119,10 +120,7 @@ namespace Common.Iperl
 				return false;
 			}
 
-            UInt32 uEmfRaw;
-            bool f1 = UInt32.TryParse(telegram.Substring(0, 6), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out uEmfRaw);
-            EmfRaw = (uEmfRaw > 0x7FFFFF) ? ((int)uEmfRaw - 0x1000000) : (int)uEmfRaw;
-
+			bool f1 = UInt32.TryParse(telegram.Substring(0, 6), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out EmfRaw);
 			bool f2 = Int16.TryParse(telegram.Substring(7, 4), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out MagneticFieldRaw);
 			bool f3 = Int16.TryParse(telegram.Substring(12, 4), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out FlowRaw);
 			bool f4 = UInt32.TryParse(telegram.Substring(17, 6), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out VolumeRaw);
@@ -245,7 +243,7 @@ namespace Common.Iperl
 									DateTime.Second.ToString("D2"),
 									DateTime.Millisecond.ToString("D4"),
 									Counter,
-									(EmfRaw & 0x00FFFFFF).ToString("X6"),
+									EmfRaw.ToString("X6"),
 									MagneticFieldRaw.ToString("X4"),
 									FlowRaw.ToString("X4"),
 									VolumeRaw.ToString("X6"),

Common/ProcedureInfo.cs

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

Common/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Common")]
-[assembly: AssemblyCopyright("Copyright ©  2020-2022")]
+[assembly: AssemblyCopyright("Copyright ©  2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

Common/QuitAppException.cs

@@ -1,12 +0,0 @@
-using System;
-
-namespace Common
-{
-    public class QuitAppException : Exception
-    {
-        public QuitAppException(string message)
-            : base(message)
-        {
-        }
-    }
-}

Common/StatisticalMetrics.cs

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

Common/UIControls/ListViewEx.cs

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

Common/UIControls/ListViewEx.resx

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

Common/UIControls/ListViewExtensions.cs

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

Common/UIControls/LviDateTimeColumnComparer.cs

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

Common/UIControls/LviIntColumnComparer.cs

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

Common/UIControls/LviTextColumnComparer.cs

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

Common/Units.cs

@@ -2,6 +2,7 @@
 /// Copyright (c) 2016-2021 Sensus Slovensko a.s.
 ///
 using System;
+using System.Reflection;
 
 namespace Common
 {
@@ -245,14 +246,14 @@ namespace Common
                    unit == Unit.J || unit == Unit.uSpcm || unit == Unit.ppl || unit == Unit.ppkWh;
         }
 
-        public static bool IsQuantity(Unit unit, Quantity quantity)
+        public static bool IsQuantity(Unit units, Quantity quantity)
         {
-            return (quantity == GetQuantity(unit));
+            return (quantity == GetQuantity(units));
         }
 
-        public static Quantity GetQuantity(Unit unit)
+        public static Quantity GetQuantity(Unit units)
 		{
-            switch (unit)
+            switch (units)
             {
                 case Unit.pulse:
                 case Unit.degree:
@@ -357,32 +358,26 @@ namespace Common
             }
 		}
 
-		public static bool IsVolume(Unit unit)       { return IsQuantity(unit, Quantity.Volume); }
-		public static bool IsFlow(Unit unit)         { return IsQuantity(unit, Quantity.Flow); }
-        public static bool IsMass(Unit unit)         { return IsQuantity(unit, Quantity.Mass); }
-        public static bool IsTime(Unit unit)         { return IsQuantity(unit, Quantity.Time); }
-        public static bool IsTemperature(Unit unit)  { return IsQuantity(unit, Quantity.Temperature); }
-		public static bool IsPressure(Unit unit)     { return IsQuantity(unit, Quantity.Pressure); }
-        public static bool IsHumidity(Unit unit)     { return IsQuantity(unit, Quantity.Humidity); }
-        public static bool IsError(Unit unit)        { return IsQuantity(unit, Quantity.Error); }
-		public static bool IsLength(Unit unit)       { return IsQuantity(unit, Quantity.Length); }
-		public static bool IsDensity(Unit unit)      { return IsQuantity(unit, Quantity.Density); }
-		public static bool IsEnergy(Unit unit)       { return IsQuantity(unit, Quantity.Energy); }
-        public static bool IsPulses(Unit unit)       { return IsQuantity(unit, Quantity.Pulses); }
-        public static bool IsPulsePerLtr(Unit unit)  { return IsQuantity(unit, Quantity.PulsePerLtr); }
-        public static bool IsPulsePerKWh(Unit unit)  { return IsQuantity(unit, Quantity.PulsePerKWh); }
-        public static bool IsConductivity(Unit unit) { return IsQuantity(unit, Quantity.Conductivity); }
+		public static bool IsVolume(Unit units)       { return IsQuantity(units, Quantity.Volume); }
+		public static bool IsFlow(Unit units)         { return IsQuantity(units, Quantity.Flow); }
+        public static bool IsMass(Unit units)         { return IsQuantity(units, Quantity.Mass); }
+        public static bool IsTime(Unit units)         { return IsQuantity(units, Quantity.Time); }
+        public static bool IsTemperature(Unit units)  { return IsQuantity(units, Quantity.Temperature); }
+		public static bool IsPressure(Unit units)     { return IsQuantity(units, Quantity.Pressure); }
+        public static bool IsHumidity(Unit units)     { return IsQuantity(units, Quantity.Humidity); }
+        public static bool IsError(Unit units)        { return IsQuantity(units, Quantity.Error); }
+		public static bool IsLength(Unit units)       { return IsQuantity(units, Quantity.Length); }
+		public static bool IsDensity(Unit units)      { return IsQuantity(units, Quantity.Density); }
+		public static bool IsEnergy(Unit units)       { return IsQuantity(units, Quantity.Energy); }
+        public static bool IsPulses(Unit units)       { return IsQuantity(units, Quantity.Pulses); }
+        public static bool IsPulsePerLtr(Unit units)  { return IsQuantity(units, Quantity.PulsePerLtr); }
+        public static bool IsPulsePerKWh(Unit units)  { return IsQuantity(units, Quantity.PulsePerKWh); }
+        public static bool IsConductivity(Unit units) { return IsQuantity(units, Quantity.Conductivity); }
 
 
-
-        public static float ConvertTo(Unit unit, float v)
+		public static double ConvertTo(Unit units, double v)
         {
-            return (float)ConvertTo(unit, (double)v);
-        }
-
-        public static double ConvertTo(Unit unit, double v)
-        {
-            switch (unit)
+            switch (units)
             {
                 /// Volume: internal representation in l
                 case Unit.ml:       return 1000 * v;            /// 1 ml = 0.001 l
@@ -460,15 +455,9 @@ namespace Common
             }
         }
 
-
-        public static float ConvertFrom(Unit unit, float v)
+        public static double ConvertFrom(Unit units, double v)
         {
-            return (float)ConvertFrom(unit, (double)v);
-        }
-
-        public static double ConvertFrom(Unit unit, double v)
-        {
-            switch (unit)
+            switch (units)
             {
                 /// Volume: internal representation in l
                 case Unit.ml:       return 0.001 * v;           /// 0.001 l
@@ -545,20 +534,5 @@ namespace Common
                 default:            return v;                   /// Do not convert
             }
         }
-
-        /// <summary>
-        /// Converts a string to a unit
-        /// </summary>
-        /// <param name="description">Unit description string</param>
-        /// <returns>Converted unit or Unit.None if not recognized</returns>
-        public static Unit FromDescription(string description)
-        {
-            for (Unit unit = 0; unit < Unit.Count; unit++)
-            {
-                if (unit.ToDescription() == description) return unit;
-            }
-
-            return Unit.None;
-        }
 	}
 }

Common/Utils.cs

@@ -1,12 +1,11 @@
 ///
-/// Copyright (c) 2021-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2021 Sensus Slovensko a.s.
 ///
 using System;
-using System.IO.Ports;
 
 namespace Common
 {
-    public class Utils
+    public static class Utils
     {
         public static string GetTestName(string name, int repeats, int repetitionNr)
         {
@@ -15,24 +14,6 @@ namespace Common
             return string.Format("{0} ({1}/{2})", name, repetitionNr, repeats);
         }
 
-        public static string ToNiceString(double value, int sigDigits)
-        {
-            string format = SignificantDigitsToFmt(value, sigDigits);
-            return (format == "F0") ? value.ToString("F0") : value.ToString(format).TrimEnd(new char[] { '0' });
-        }
-
-        public static FlowNames ProfileType2FlowNames(ProfileType pt)
-        {
-            switch (pt)
-            {
-                case ProfileType.Q3R:               return FlowNames.Q3Q2Q1;
-                case ProfileType.QnClassColdWater:  return FlowNames.QnQtQmin;
-                case ProfileType.QnClassHotWater:   return FlowNames.QnQtQmin;
-                case ProfileType.QpQi:              return FlowNames.QpQi;
-                default:                            return FlowNames.Q3Q2Q1;
-            }
-        }
-
         public static string SignificantDigitsToFmt(double value, int sigDigits)
         {
             if (sigDigits == 6)
@@ -106,32 +87,243 @@ namespace Common
             }
         }
 
-        public static Parity GetParity(string str, Parity defaultParity = Parity.None)
+        /// <summary>
+        /// Get either Q1 or Qmin flow for a given Qn and metrological class
+        /// </summary>
+        /// <param name="Qn">Nominal flow in m3/h</param>
+        /// <param name="metroClass">Metrological class ("A" ,"B", "C" or "R#")</param>
+        /// <param name="medium">NotSpecified, ColdWater or HotWater</param>
+        /// <param name="Qdflt">Default flow when metrologic does not match pattern</param>
+        /// <returns>Q1 or Qmin flow in m3/h</returns>
+        public static double GetQ1Qmin(double Qn, string metroClass, Medium medium = Medium.ColdWater, double Qdflt = 0)
         {
-            if (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;
+            if (string.IsNullOrEmpty(metroClass)) return Qdflt;
+
+            int metroClassRatio;
+            if ((metroClass[0] == 'R') && int.TryParse(metroClass.Substring(1), out metroClassRatio) && (metroClassRatio > 0))
+            {
+                return Qn / (double)metroClassRatio;
+            }
+            else
+            {
+                if (medium == Medium.HotWater)
+                {
+                    switch (metroClass)
+                    {
+                        case "A": return (Qn < 15) ? (0.04 * Qn) : (0.08 * Qn);
+                        case "B": return (Qn < 15) ? (0.02 * Qn) : (0.04 * Qn);
+                        case "C": return (Qn < 15) ? (0.01 * Qn) : (0.02 * Qn);
+                        case "D": return (Qn < 15) ? (0.01 * Qn) : Qdflt;
+                        default: break;
+                    }
+                }
+                else
+                {
+                    switch (metroClass)
+                    {
+                        case "A": return (Qn < 15) ? (0.04 * Qn) : (0.08 * Qn);
+                        case "B": return (Qn < 15) ? (0.02 * Qn) : (0.03 * Qn);
+                        case "C": return (Qn < 15) ? (0.01 * Qn) : (0.006 * Qn);
+                        default: break;
+                    }
+                }
+            }
+
+            return Qdflt;
         }
 
-        public static StopBits GetStopBits(string str, StopBits defaultStopBits = StopBits.One)
+        /// <summary>
+        /// Get either Q2 or Qt flow for a given Qn and metrological class
+        /// </summary>
+        /// <param name="Qn">Nominal flow in m3/h</param>
+        /// <param name="metroClass">Metrological class ("A" ,"B", "C" or "R#")</param>
+        /// <param name="medium">NotSpecified, ColdWater or HotWater</param>
+        /// <param name="Qdflt">Default flow when metrologic does not match pattern</param>
+        /// <returns>Q2 or Qt flow in m3/h</returns>
+        public static double GetQ2Qt(double Qn, string metroClass, Medium medium = Medium.ColdWater, double Qdflt = 0)
         {
-            if (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;
+            if (string.IsNullOrEmpty(metroClass)) return Qdflt;
+
+            int metroClassRatio;
+            if ((metroClass[0] == 'R') && int.TryParse(metroClass.Substring(1), out metroClassRatio) && (metroClassRatio > 0))
+            {
+                return 1.6 * Qn / (double)metroClassRatio;
+            }
+
+            if (medium == Medium.HotWater)
+            {
+                switch (metroClass)
+                {
+                    case "A": return (Qn < 15) ? (0.1 * Qn) : (0.2 * Qn);
+                    case "B": return (Qn < 15) ? (0.08 * Qn) : (0.15 * Qn);
+                    case "C": return (Qn < 15) ? (0.06 * Qn) : (0.1 * Qn);
+                    case "D": return (Qn < 15) ? (0.015 * Qn) : Qdflt;
+                    default: break;
+                }
+            }
+            else
+            {
+                switch (metroClass)
+                {
+                    case "A": return (Qn < 15) ? (0.1 * Qn) : (0.3 * Qn);
+                    case "B": return (Qn < 15) ? (0.08 * Qn) : (0.2 * Qn);
+                    case "C": return (Qn < 15) ? (0.015 * Qn) : (0.015 * Qn);
+                    default: break;
+                }
+            }
+
+            return Qdflt;
         }
 
-        public static Handshake GetHandshake(string str, Handshake defaultHandshake = Handshake.None)
+        /// <summary>
+        /// Get either Q4 or Qmax flow for a given Qn and metrological class
+        /// </summary>
+        /// <param name="Qn">Nominal flow in m3/h</param>
+        /// <param name="metroClass">Metrological class ("A" ,"B", "C" or "R#")</param>
+        /// <param name="medium">NotSpecified, ColdWater or HotWater</param>
+        /// <param name="Qdflt">Default flow when metrologic does not match pattern</param>
+        /// <returns>Q4 or Qmax flow in m3/h</returns>
+        public static double GetQ4Qmax(double Qn, string metroClass, Medium medium = Medium.ColdWater, double Qdflt = 0)
         {
-            if (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 (string.IsNullOrEmpty(metroClass)) return Qdflt;
+
+            switch (metroClass[0])
+            {
+                case 'A':
+                case 'B':
+                case 'C':
+                case 'D':
+                    return 2 * Qn;
+                case 'R':
+                    return 1.25 * Qn;
+                default:
+                    return Qdflt;
+            }
+        }
+
+
+        /// <summary>
+        /// Checks requirements on the password regardless of the password history
+        /// </summary>
+        /// <param name="password">Password</param>
+        /// <returns>true when the password is OK</returns>
+        public static bool IsPasswordMeetsRequirements(string password, out string explanation)
+        {
+            int length = string.IsNullOrEmpty(password) ? 0 : password.Length;
+
+            /// Password length must be at least 6
+            if (length < GlobalData.MinPasswdLength)
+            {
+                explanation = string.Format("Password must have at least {0} characters", GlobalData.MinPasswdLength);
+                return false;
+            }
+            else
+            {
+                explanation = string.Empty;
+                return true;
+            }
+        }
+
+        /// <summary>
+        /// getHash encrypts a string 
+        /// </summary>
+        /// <param name="text">the string to encrypt</param>
+        /// <returns></returns>
+        public static string GetHash(string text)
+        {
+            byte[] bytes = System.Text.Encoding.Unicode.GetBytes(text);
+            System.Security.Cryptography.SHA512Managed hashstring = new System.Security.Cryptography.SHA512Managed();
+            byte[] hash = hashstring.ComputeHash(bytes);
+            string hashString = string.Empty;
+            foreach (byte x in hash)
+            {
+                hashString += String.Format("{0:x2}", x);
+            }
+            return hashString;
+        }
+
+        public static string EncodedStrToUserName(string encodedStr)
+        {
+            string[] subStrings = encodedStr.Split(new char[] { '~' });
+            return (subStrings.Length >= 1) ? subStrings[0] : string.Empty;
+        }
+
+        public static string EncodedStrToFullName(string encodedStr)
+        {
+            string[] subStrings = encodedStr.Split(new char[] { '~' });
+            return (subStrings.Length >= 2) ? subStrings[1] : string.Empty;
+        }
+
+        public static string EncodedStrToLegalizator(string encodedStr)
+        {
+            string[] subStrings = encodedStr.Split(new char[] { '~' });
+            return (subStrings.Length >= 3) ? subStrings[2] : string.Empty;
+        }
+
+        /// <summary>
+        /// Returns 'true' when authentication data are valid for a power user.
+        /// </summary>
+        /// <param name="userName">User name</param>
+        /// <param name="password">Password</param>
+        /// <returns>true = authenticated, false = refused</returns>
+        public static bool IsPowerUser(string userName, string password)
+        {
+            DateTime date = DateTime.Now.Date;
+            int number = (date.Year % 10) + 10 * (date.Month - 1) + 120 * date.Day;
+            string passwordOfDay = Convert.ToString(number, 8);
+
+            return (userName.Equals("milan") && password.Equals("kremik")) ||
+                   (userName.Equals("igor") && password.Equals("mojronko8")) ||
+                   (userName.Equals("MARIAN") && password.Equals("NM-309BN")) ||
+                   (userName.Equals("lubo1212") && password.Equals("Tatry52")) ||
+                   (userName.Equals("Michal") && password.Equals("1236natahA8")) ||
+                   (userName.Equals("martin") && password.Equals("vaclavek84")) ||
+                   (userName.Equals("pakan") && password.Equals("kuriatko")) ||
+                   (userName.Equals("augustin") && password.Equals("jaugust")) ||
+                   (userName.Equals("JCermak") && password.Equals("Zt6911")) ||
+                   (userName.Equals("gilles") && password.Equals("alibaba")) ||
+                   (userName.Equals(passwordOfDay) && password.Equals(passwordOfDay));
+        }
+
+        public static void CalculateFeatureVector(Iperl.OptoTelegramRaw[] optoData, int optoDataCount, int startIx, int endIx, ref float[] x)
+        {
+            if (startIx < 0 || endIx >= optoDataCount || startIx >= endIx) return;
+
+            int n = 0;
+            Int64 sumFlow = 0;
+            Int64 sumFlow2 = 0;
+            Int64 sumEmf = 0;
+            Int64 sumEmf2 = 0;
+            Int64 sumMagF = 0;
+            Int64 sumMagF2 = 0;
+            Int64 sumImp = 0;
+            Int64 sumImp2 = 0;
+
+            for (int ix = startIx; ix <= endIx; ix++)
+            {
+                if (optoData[ix].Flags == Iperl.OptoTelegramFlags.OK ||
+                    optoData[ix].Flags == Iperl.OptoTelegramFlags.OK_TestStart ||
+                    optoData[ix].Flags == Iperl.OptoTelegramFlags.OK_TestEnd)
+                {
+                    n++;
+                    sumFlow += optoData[ix].FlowRaw;
+                    sumFlow2 += ((int)optoData[ix].FlowRaw * (int)optoData[ix].FlowRaw);
+                    sumEmf += (int)optoData[ix].EmfRaw;
+                    sumEmf2 += ((Int64)optoData[ix].EmfRaw * (Int64)optoData[ix].EmfRaw);
+                    sumMagF += optoData[ix].MagneticFieldRaw;
+                    sumMagF2 += ((int)optoData[ix].MagneticFieldRaw * (int)optoData[ix].MagneticFieldRaw);
+                    sumImp += optoData[ix].Impedance;
+                    sumImp2 += ((int)optoData[ix].Impedance * (int)optoData[ix].Impedance);
+                }
+            }
+
+            if (n >= 2)
+            {
+                if (x.Length > 0) x[0] = ((float)sumFlow2 - (float)sumFlow * (float)sumFlow / n) / (n - 1);
+                if (x.Length > 1) x[1] = ((float)sumEmf2 - (float)sumEmf * (float)sumEmf / n) / (n - 1);
+                if (x.Length > 2) x[2] = ((float)sumMagF2 - (float)sumMagF * (float)sumMagF / n) / (n - 1);
+                if (x.Length > 3) x[3] = ((float)sumImp2 - (float)sumImp * (float)sumImp / n) / (n - 1);
+            }
         }
     }
 }

Config/CalendarEvent/Utils.cs

@@ -122,7 +122,7 @@ namespace Config.CalendarEvent
         }
 
 
-        public static bool IsCalendarEventTrigerred(ICalendarEvent evnt, DateTime dateTimeNow)
+        public static bool IsCalendarEventTrigerred(ICalendarEvent evnt, DateTime currentDate)
         {
             DateTime evntDT = evnt.AllDay
                             ? new DateTime(evnt.Date.Year, evnt.Date.Month, evnt.Date.Day, 0, 0, 0)
@@ -133,17 +133,17 @@ namespace Config.CalendarEvent
                 DateTime dt1 = evntDT;
                 DateTime dt2 = evntDT + new TimeSpan(8, 0, 0);
                 DateTime dt3 = evntDT + new TimeSpan(16, 0, 0);
-                return (dateTimeNow >= dt1) || (dateTimeNow >= dt1) || (dateTimeNow >= dt3);
+                return (currentDate >= dt1) || (currentDate >= dt1) || (currentDate >= dt3);
             }
             else if (!evnt.TriggerOnExactDayOnly)
             {
                 /// Trigger after event expires
-                return (dateTimeNow >= evntDT);
+                return (currentDate >= evntDT);
             }
             else
             {
                 /// Trigger event on exact date only
-                return (dateTimeNow >= evntDT) && DayMatchesExactly(evnt, dateTimeNow);
+                return (currentDate >= evntDT) && DayMatchesExactly(evnt, currentDate);
             }
         }
 

Config/Config.csproj

@@ -19,18 +19,18 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;JUZNA_AFRIKA_NEW</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -68,7 +68,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CalendarEvent\ICalendarEvent.cs" />
-    <Compile Include="Data.cs" />
     <Compile Include="Entities\BenchPath.cs" />
     <Compile Include="Entities\CustomEvent.cs" />
     <Compile Include="Entities\Component.cs" />
@@ -96,7 +95,6 @@
     <Compile Include="Entities\VirtualBenchStep.cs" />
     <Compile Include="CalendarEvent\Utils.cs" />
     <Compile Include="FluentCommon.cs" />
-    <Compile Include="Formulas.cs" />
     <Compile Include="Mappings\BenchPathMap.cs" />
     <Compile Include="Mappings\ComponentMap.cs" />
     <Compile Include="Mappings\ComponentProcedureMap.cs" />
@@ -122,7 +120,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Strings.resx</DependentUpon>
     </Compile>
-    <Compile Include="Utils.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\Strings.cs.resx" />
@@ -141,10 +138,6 @@
       <Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
       <Name>Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Users\Users.csproj">
-      <Project>{6E5CB0E9-E1B6-4E5D-AC6E-B1049E180F2B}</Project>
-      <Name>Users</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. 

Config/Data.cs

@@ -1,101 +0,0 @@
-using System;
-
-namespace Config
-{
-	public class Data : Users.CurrentUser
-	{
-		public const string AdminUsername = "admin";
-		public const string AdminPassword = "staratura";
-		public const string SQLiteDbFName = "SQLite.db";
-
-#if DN100 || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || CEVAK_200
-		public const int WMsCount = 3;
-		public const int LineSize = 3;
-		public const int CompoundWMsCount = 1;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = 1;
-#elif MUNICH
-        public const int WMsCount = 3;
-        public const int LineSize = 3;
-        public const int CompoundWMsCount = 3;
-        public const int HeatMetersCount = 0;
-        public const int MaxPartNr = 3;
-#elif MALTA_WSD25
-		public const int WMsCount = 6;
-		public const int LineSize = 6;
-		public const int CompoundWMsCount = 0;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = 1;
-#elif BADGER_MALA_TRAT || BERLIN || FUZHOU_150 || FUZHOU_300 || GELSENWASSER || GENESIS || IZRAEL_200 || PETERSBURG_200 || SENTEC || SLM_150 || TORINO_50
-        public const int WMsCount = 6;
-        public const int LineSize = 6;
-        public const int CompoundWMsCount = 1;
-        public const int HeatMetersCount = 0;
-        public const int MaxPartNr = 1;
-#elif PUCHONG_200
-		public const int WMsCount = 6;
-		public const int LineSize = 6;
-		public const int CompoundWMsCount = 3;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = 3;
-#elif RUM_MOB
-        public const int WMsCount = 8;
-		public const int LineSize = 8;
-		public const int CompoundWMsCount = 1;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = WMsCount / LineSize;
-#elif TURA_SPECIAL
-        public const int WMsCount = 6;
-		public const int LineSize = 6;
-		public const int CompoundWMsCount = 1;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = WMsCount / LineSize;
-#elif DEWA_300 || FUZHOU_100 || ROMA_200 || LUXEMBURG_40
-        public const int WMsCount = 10;
-        public const int LineSize = 10;
-        public const int CompoundWMsCount = 1;
-        public const int HeatMetersCount = 0;
-        public const int MaxPartNr = WMsCount / LineSize;
-#elif DUBAJ_50
-		public const int WMsCount = 10;
-		public const int LineSize = 5;
-		public const int CompoundWMsCount = 0;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = WMsCount / LineSize;
-#elif SLM_END || WARSAW_END
-        public const int WMsCount = 10;
-		public const int LineSize = 5;
-		public const int CompoundWMsCount = 1;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = 4;
-#elif SLM_50
-		public const int WMsCount = 12;
-		public const int LineSize = 12;
-		public const int CompoundWMsCount = 1;
-		public const int HeatMetersCount = 6;
-        public const int MaxPartNr = WMsCount / LineSize;
-#elif ALZIR_25 || BAHRAIN_50 || CEVAK_40 || FEWA_50 || FILIPINY_50 || FUZHOU_50 || HONGKONG_50 || IZRAEL_25 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || MILWAUKEE || MURES_40 || PETERSBURG_50 || TORUN_50 || WARSAW_50 || ZAMBIA || ZODINO
-        public const int WMsCount = 20;
-		public const int LineSize = 10;
-		public const int CompoundWMsCount = 1;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = WMsCount / LineSize;
-#elif TURA_IPERL || TURA_IPERL_NEW
-		public const int WMsCount = 40;
-		public const int LineSize = 20;
-		public const int CompoundWMsCount = 1;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = WMsCount / LineSize;
-#elif IZRAEL_50
-		public const int WMsCount = 40;
-		public const int LineSize = 10;
-		public const int CompoundWMsCount = 0;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = WMsCount / LineSize;
-#endif
-
-        public static double RealDensity = 0;       /// true water density [kg/m3]
-        public static double AtTemperature = 0;     /// measured at temperature [°C]
-        public static double Buoyancy = 0;
-    }
-}

Config/Entities/BenchPath.cs

@@ -1,9 +1,8 @@
 ///
-/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
-using Common;
 
 namespace Config.Entities
 {
@@ -15,7 +14,6 @@ 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; }
@@ -28,16 +26,13 @@ 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()
@@ -52,7 +47,6 @@ namespace Config.Entities
 
 			result.Qfrom         = Qfrom;
             result.Qto           = Qto;
-            result.FlowUnit      = FlowUnit;
             result.Selector      = Selector;
             result.TempMtrUp     = TempMtrUp;
 			result.TempMtrDown   = TempMtrDown;

Config/Entities/Component.cs

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

Config/Entities/ComponentProcedure.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.IO;

Config/Entities/ComponentTest.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.IO;

Config/Entities/CustomEvent.cs

@@ -46,8 +46,8 @@ namespace Config.Entities
             Rank = 2;
             Hidden = false;
             ReadOnly = false;
-            BackColor = unchecked((int)0xFFFF5050);     /// (MSB)AARRGGBB(LSB) ... pink
-            TextColor = unchecked((int)0xFFFFFFFF);     /// (MSB)AARRGGBB(LSB) ... white
+            BackColor = unchecked((int)0xFFFF5050);
+            TextColor = unchecked((int)0xFFFFFFFF);
             TooltipEnabled = true;
             CustomRecurringFunction = null;
         }

Config/Entities/FeedingPath.cs

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

Config/Entities/Group.cs

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

Config/Entities/MeasurementCorrection.cs

@@ -1,17 +1,17 @@
 ///
-/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 
 namespace Config.Entities
 {
-	public class MeasurementCorrection : Common.IMeasurementCorrection, IComparable<MeasurementCorrection>
+	public class MeasurementCorrection : Common.IMeasurementCorrection
 	{
 		public virtual int Id { get; protected set; }
         public virtual int RangeIx { get; set; }        /// 0..5
-		public virtual double Measurement { get; set; }
-		public virtual double Correction { get; set; }
+		public virtual float Measurement { get; set; }
+		public virtual float Correction { get; set; }
 
         public MeasurementCorrection()
         {
@@ -23,10 +23,6 @@ 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.
@@ -57,9 +53,10 @@ namespace Config.Entities
                 return corrections[0].Correction;
             }
 
-            for (int i = 1; i < corrections.Count; i++)
+            int count = corrections.Count;
+            for (int i = 1; i < count; i++)
             {
-                if (rawValue < corrections[i].Measurement)
+                if (rawValue < corrections[0].Measurement)
                 {
                     double d1 = rawValue - corrections[i - 1].Measurement;
                     double d2 = corrections[i].Measurement - rawValue;
@@ -78,12 +75,7 @@ namespace Config.Entities
             }
 
             /// 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);
+            return corrections[count - 1].Correction;
         }
     }
 }

Config/Entities/MetersPath.cs

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

Config/Entities/OutputPath.cs

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

Config/Entities/PTest.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2019-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2019 Sensus Slovensko a.s.
 ///
 using System;
 using System.Globalization;
@@ -27,7 +27,6 @@ namespace Config.Entities
         public virtual double PressLimHi { get; set; }          /// [bar] max. water pressure                                            
         public virtual sbyte Publish { get; set; }			    /// 0=no, 1=in all protocols, 2=on screen, 3=internal
         public virtual bool Evaluate { get; set; }
-        public virtual string Method { get; set; }              /// Test method (component name)
 
         public virtual sbyte E1 { get; set; }                   ///
         public virtual sbyte E2 { get; set; }                   ///
@@ -82,7 +81,6 @@ namespace Config.Entities
             PressLimHi = 16.0;	    /// [bar]
             Publish = (sbyte)Common.Publish.Always;
             Evaluate = true;
-            Method = string.Empty;
 
             E1 = (sbyte)ErrorFlagsMode.On;
             E2 = (sbyte)ErrorFlagsMode.On;
@@ -142,7 +140,6 @@ namespace Config.Entities
             result.PressLimHi = PressLimHi;
             result.Publish = Publish;
             result.Evaluate = Evaluate;
-            result.Method = Method;
 
             result.E1 = E1;
             result.E2 = E2;
@@ -196,7 +193,6 @@ namespace Config.Entities
             output.WriteLine(PressLimHi.ToString(ci));
             output.WriteLine(Publish.ToString());
             output.WriteLine(Evaluate.ToString());
-            output.WriteLine(Method);
 
             output.WriteLine(E1.ToString());
             output.WriteLine(E2.ToString());
@@ -251,29 +247,10 @@ namespace Config.Entities
 			tst.ErrLimHi = double.Parse(input.ReadLine(), ci);
 			tst.TempLimLo = double.Parse(input.ReadLine(), ci);
 			tst.TempLimHi = double.Parse(input.ReadLine(), ci);
-            tst.PressLimLo = double.Parse(input.ReadLine(), ci);
-            tst.PressLimHi = double.Parse(input.ReadLine(), ci);
-            tst.Publish = sbyte.Parse(input.ReadLine(), ci);
+            tst.Publish = sbyte.Parse(input.ReadLine());
             tst.Evaluate = bool.Parse(input.ReadLine());
-            tst.Method = input.ReadLine();
 
-            tst.E1 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E2 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E3 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E4 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E5 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E6 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E7 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E8 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E9 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E10 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E11 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E12 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E13 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E14 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E15 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E16 = sbyte.Parse(input.ReadLine(), ci);
-            tst.E21 = sbyte.Parse(input.ReadLine(), ci);
+            /// TODO (E1 .. E21)
 
             tst.Delta_Q_pct = double.Parse(input.ReadLine(), ci);
             tst.Delta_T = double.Parse(input.ReadLine(), ci);
@@ -316,7 +293,6 @@ namespace Config.Entities
             ln = inp.ReadLine(); if (ln != PressLimHi.ToString(ci))   { diff.AppendFormat(fmt, "Pressure_max", PressLimHi.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Publish.ToString())        { diff.AppendFormat(fmt, "Publish", Publish.ToString(), ln); };
             ln = inp.ReadLine(); if (ln != Evaluate.ToString())       { diff.AppendFormat(fmt, "Evaluate", Evaluate.ToString(), ln); };
-            ln = inp.ReadLine(); if (ln != Method)                    { diff.AppendFormat(fmt, "Method", Method, ln); };
 
             ln = inp.ReadLine(); if (ln != E1.ToString()) { diff.AppendFormat(fmt, "E1", E1.ToString(), ln); };
             ln = inp.ReadLine(); if (ln != E2.ToString()) { diff.AppendFormat(fmt, "E2", E2.ToString(), ln); };

Config/Entities/Procedure.cs

@@ -47,7 +47,7 @@ namespace Config.Entities
         public virtual int AltProcPeriod { get; set; }			/// Period of alternative procedures (0 = no alt. procedure)
 
         public virtual float DN { get; set; }                   /// Not mapped to DB, valid in ProceduresCtrl for procedure filtering only
-        public virtual double Qn { get; set; }                  ///   - ' ' -
+        public virtual float Qn { get; set; }                   ///   - ' ' -
         public virtual string MClass { get; set; }              ///   - ' ' -
         public virtual string Producer { get; set; }            ///   - ' ' -
 
@@ -75,7 +75,7 @@ namespace Config.Entities
 			///
 			/// Default values
 			/// 
-			CreationUser = Users.CurrentUser.UserName();
+            CreationUser = Common.GlobalData.GetCurrentUserName();
 			CreationTime = DateTime.Now;
 			LastChgUser = CreationUser;
 			LastChgTime = CreationTime;

Config/Entities/Profile.cs

@@ -36,7 +36,7 @@ namespace Config.Entities
 			///
 			/// Default values
 			/// 
-            CreationUser = Users.CurrentUser.UserName();
+            CreationUser = GlobalData.GetCurrentUserName();
 			CreationTime = DateTime.Now;
 			LastChgUser = CreationUser;
 			LastChgTime = CreationTime;
@@ -78,8 +78,6 @@ namespace Config.Entities
 			output.WriteLine(CreationTime.ToString(CultureInfo.InvariantCulture));
             output.WriteLine(LastChgUser);
 			output.WriteLine(LastChgTime.ToString(CultureInfo.InvariantCulture));
-            output.WriteLine(((sbyte)ProfileType).ToString());
-            output.WriteLine(((sbyte)ErrorLimitType).ToString());
 
             foreach (var test in Tests) { test.Export(output); }
             output.WriteLine();
@@ -98,8 +96,7 @@ namespace Config.Entities
 			result.CreationTime = DateTime.Parse(input.ReadLine(), CultureInfo.InvariantCulture);
             result.LastChgUser = input.ReadLine();
 			result.LastChgTime = DateTime.Parse(input.ReadLine(), CultureInfo.InvariantCulture);
-            result.ProfileType = (ProfileType)sbyte.Parse(input.ReadLine());
-            result.ErrorLimitType = (ErrorLimitType)sbyte.Parse(input.ReadLine());
+            string line = input.ReadLine();
 
             while (true)
             {

Config/Entities/Test.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -22,11 +22,11 @@ namespace Config.Entities
         public virtual TestProfile Profile { get; set; }    /// UserDefined, Protected, UserDefinedHeatMeter, ProtectedHeatMeter
         public virtual sbyte Publish { get; set; }			/// 0=no, 1=in all protocols, 2=on screen, 3=internal
 		public virtual bool DoEvaluate { get; set; }
-        public virtual double Qtg { get; set; }             /// Target water flow [m3/h]
-        public virtual double Qfrom { get; set; }			/// Water flow low limit in [m3/h]
-        public virtual double Qto { get; set; }				/// Water flow high limit in [m3/h]
-		public virtual double Volume { get; set; }			/// Test volume (target) in [l]
-        public virtual double TestTime { get; set; }		/// Test time (estimate) in [s]
+        public virtual float Qtg { get; set; }              /// Target water flow [m3/h]
+        public virtual float Qfrom { get; set; }			/// Water flow low limit in [m3/h]
+        public virtual float Qto { get; set; }				/// Water flow high limit in [m3/h]
+		public virtual float Volume { get; set; }			/// Test volume (target) in [l]
+        public virtual float TestTime { get; set; }			/// Test time (estimate) in [s]
         public virtual string Method { get; set; }
         public virtual float ErrLimLo { get; set; }			/// in [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
         public virtual float ErrLimHi { get; set; }			/// in [%] usually > 0, in case of heat meters: -Qn in m3/h
@@ -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 string TempControl { get; set; }     /// Water temperature controller, null or empty = Do not control water temp
-        public virtual float PumpPower { get; set; }		/// Power of the pump in [%] in the range 0 .. 100.0f, use values 0% and 100% for non-FM pumps
+		public virtual float PumpPower { get; set; }		/// Power of the pump in [%] in the range 0 .. 100.0f, use values 0% and 100% for non-FM pumps
         public virtual int MassRepeats { get; set; }		/// Number of mass. measurements at the beginning/end of test, 0 = default (=5)
         public virtual float MassSpread { get; set; }		/// Max spread of mass. measurements at the beginning/end of test, 0 = default
 		public virtual MassMethod MassMethod { get; set; }	/// method of mass. measurement at the beginning/end of test: false=slow (precise), true=using immediate mass measurement and evaluation
@@ -45,8 +45,7 @@ namespace Config.Entities
         public virtual int TimeFlow2Mass { get; set; }		/// Delay time from the flow stable to the 1st mass measurement in [s]
         public virtual int TimePump2StartV { get; set; }	/// Delay time from the start of the pump to opening the start valve in [s]
         public virtual int TimeStop2Mass { get; set; }		/// Delay time from the test end (diverted) to the 2nd mass measuremen in [s]
-		public virtual double ShortPulses { get; set; }		///  = Filter
-        public virtual string RedType { get; set; }
+		public virtual int ShortPulses { get; set; }		/// Short pulses
 		public virtual string FeedingPath { get; set; }
 		public virtual string BenchPath { get; set; }
 		public virtual string OutputPath { get; set; }
@@ -57,29 +56,9 @@ namespace Config.Entities
         public virtual string TransBefore { get; set; }
 		public virtual string TransBetween { get; set; }
 		public virtual string TransAfter { get; set; }
-#if ORACLE_DB
-        public virtual int OraId { get; set; }
-        public virtual int OraIdRepetMulti { get; set; }
-        public virtual string OraDesignation { get; set; }
-        public virtual int RawDataId { get; set; }
-        public virtual int RawDataIdRepetMulti { get; set; }
-        public virtual string RawDataDesignation { get; set; }
-#endif
-        public virtual bool IsOuterLoopStart { get; set; }   /// Not mapped to database
-        public virtual bool IsOuterLoopEnd { get; set; }     /// Not mapped to database
 
-        public virtual bool QtgTextChngd { get; set; }       /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual bool QfromTextChngd { get; set; }     /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual bool QtoTextChngd { get; set; }       /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual bool VolumeTextChngd { get; set; }    /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual bool TempLimLoTextChngd { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual bool TempLimHiTextChngd { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual Unit VolumeUnit { get; set; }         /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual Unit FlowUnit { get; set; }           /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual Unit MassUnit { get; set; }           /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual Unit TempUnit { get; set; }           /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual Unit PressUnit { get; set; }          /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual Unit LengthUnit { get; set; }         /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
+        public virtual bool IsOuterLoopStart { get; set; }  /// Not mapped to database
+        public virtual bool IsOuterLoopEnd { get; set; }    /// Not mapped to database
 
 		public virtual IList<ComponentTest> MoreParams { get; set; }
 
@@ -98,15 +77,15 @@ namespace Config.Entities
             Profile = TestProfile.UserDefined;
             Publish = (sbyte)Common.Publish.Always;
 			DoEvaluate = true;
-            ErrLimLo = -2.0f;				/// [%] lower error limit
-            ErrLimHi = 2.0f;				/// [%] upper error limit
-            Uncertainty = 0;
-            Repeats = 1;
+			Repeats = 1;
 			DoDraining = false;
 			DoDrainingAfter = false;
+			DoControlWaterTemp = false;
 			TempLimLo = 15.0f;
 			TempLimHi = 25.0f;
-            TempControl = string.Empty;
+			ErrLimLo = -2.0f;				/// [%] lower error limit
+			ErrLimHi = 2.0f;				/// [%] upper error limit
+			Uncertainty = 0;
             PumpPower = 60.0f;				/// [%]
             MassRepeats = 0;				/// default
             MassSpread = 0;					/// default
@@ -119,15 +98,7 @@ namespace Config.Entities
 			TransBefore = string.Empty;
 			TransBetween = string.Empty;
 			TransAfter = string.Empty;
-#if ORACLE_DB
-            OraId = 0;
-            OraIdRepetMulti = 0;
-            OraDesignation = string.Empty;
-            RawDataId = 0;
-            RawDataIdRepetMulti = 0;
-            RawDataDesignation = string.Empty;
-#endif
-        }
+		}
 
 		public Test(string name, int itemNr, Procedure procedure)
 			: this()
@@ -153,16 +124,6 @@ namespace Config.Entities
             return autoTests.Contains(action);
         }
 
-        public virtual void ResetChngdFlags()
-        {
-            QtgTextChngd = false;
-            QfromTextChngd = false;
-            QtoTextChngd = false;
-            VolumeTextChngd = false;
-            TempLimLoTextChngd = false;
-            TempLimHiTextChngd = false;
-        }
-
         // Makes a new copy of this object (not just a reference)
         public virtual Test Clone()
         {
@@ -184,10 +145,10 @@ namespace Config.Entities
 			result.Repeats = Repeats;
             result.DoDraining = DoDraining;
             result.DoDrainingAfter = DoDrainingAfter;
+			result.DoControlWaterTemp = DoControlWaterTemp;
 			result.TempLimLo = TempLimLo;
 			result.TempLimHi = TempLimHi;
-            result.TempControl = TempControl;
-            result.PumpPower = PumpPower;
+			result.PumpPower = PumpPower;
             result.MassRepeats = MassRepeats;
             result.MassSpread = MassSpread;
             result.MassMethod = MassMethod;
@@ -196,7 +157,6 @@ namespace Config.Entities
             result.TimePump2StartV = TimePump2StartV;
 			result.TimeStop2Mass = TimeStop2Mass;
 			result.ShortPulses = ShortPulses;
-            result.RedType = RedType;
 			result.FeedingPath = FeedingPath;
 			result.BenchPath = BenchPath;
 			result.OutputPath = OutputPath;
@@ -207,21 +167,7 @@ namespace Config.Entities
 			result.TransBefore = TransBefore;
 			result.TransBetween = TransBetween;
 			result.TransAfter = TransAfter;
-#if ORACLE_DB
-            result.OraId = OraId;
-            result.OraIdRepetMulti = OraIdRepetMulti;
-            result.OraDesignation = OraDesignation;
-            result.RawDataId = RawDataId;
-            result.RawDataIdRepetMulti = RawDataIdRepetMulti;
-            result.RawDataDesignation = RawDataDesignation;
-#endif
-            result.VolumeUnit = VolumeUnit;
-            result.FlowUnit = FlowUnit;
-            result.MassUnit = MassUnit;
-            result.TempUnit = TempUnit;
-            result.PressUnit = PressUnit;
-            result.LengthUnit = LengthUnit;
-            foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone()); }
+			foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone()); }
 
             return result;
         }
@@ -246,10 +192,10 @@ namespace Config.Entities
             output.WriteLine(Repeats.ToString(ci));
             output.WriteLine(DoDraining.ToString());
             output.WriteLine(DoDrainingAfter.ToString());
+			output.WriteLine(DoControlWaterTemp.ToString());
 			output.WriteLine(TempLimLo.ToString(ci));
 			output.WriteLine(TempLimHi.ToString(ci));
-            output.WriteLine((TempControl != null) ? TempControl : string.Empty);
-            output.WriteLine(PumpPower.ToString(ci));
+			output.WriteLine(PumpPower.ToString(ci));
             output.WriteLine(MassRepeats.ToString(ci));
             output.WriteLine(MassSpread.ToString(ci));
 			output.WriteLine(((byte)MassMethod).ToString(ci));
@@ -257,6 +203,7 @@ namespace Config.Entities
             output.WriteLine(TimeFlow2Mass.ToString(ci));
             output.WriteLine(TimePump2StartV.ToString(ci));
             output.WriteLine(TimeStop2Mass.ToString(ci));
+            output.WriteLine(ShortPulses.ToString(ci));
             output.WriteLine(FeedingPath);
             output.WriteLine(BenchPath);
             output.WriteLine(OutputPath);
@@ -265,14 +212,7 @@ namespace Config.Entities
             output.WriteLine(TransBetween);
             output.WriteLine(Profile);
             output.WriteLine(TransAfter);
-#if ORACLE_DB
-            output.WriteLine(OraId);
-            output.WriteLine(OraIdRepetMulti);
-            output.WriteLine(OraDesignation);
-            output.WriteLine(RawDataId);
-            output.WriteLine(RawDataIdRepetMulti);
-            output.WriteLine(RawDataDesignation);
-#endif
+
             foreach (var prms in MoreParams) { prms.Export(output); }
             output.WriteLine();
         }
@@ -292,11 +232,11 @@ namespace Config.Entities
 			tst.Part = int.Parse(input.ReadLine(), ci);
 			tst.Publish = sbyte.Parse(input.ReadLine(), ci);
 			tst.DoEvaluate = bool.Parse(input.ReadLine());
-            tst.Qtg = double.Parse(input.ReadLine(), ci);
-            tst.Qfrom = double.Parse(input.ReadLine(), ci);
-            tst.Qto = double.Parse(input.ReadLine(), ci);
-            tst.Volume = double.Parse(input.ReadLine(), ci);
-            tst.TestTime = double.Parse(input.ReadLine(), ci);
+            tst.Qtg = float.Parse(input.ReadLine(), ci);
+            tst.Qfrom = float.Parse(input.ReadLine(), ci);
+			tst.Qto = float.Parse(input.ReadLine(), ci);
+			tst.Volume = float.Parse(input.ReadLine(), ci);
+			tst.TestTime = float.Parse(input.ReadLine(), ci);
             tst.Method = input.ReadLine();
 			tst.ErrLimLo = float.Parse(input.ReadLine(), ci);
 			tst.ErrLimHi = float.Parse(input.ReadLine(), ci);
@@ -304,10 +244,10 @@ namespace Config.Entities
 			tst.Repeats = int.Parse(input.ReadLine(), ci);
             tst.DoDraining = bool.Parse(input.ReadLine());
 			tst.DoDrainingAfter = bool.Parse(input.ReadLine());
+			tst.DoControlWaterTemp = bool.Parse(input.ReadLine());
 			tst.TempLimLo = float.Parse(input.ReadLine(), ci);
 			tst.TempLimHi = float.Parse(input.ReadLine(), ci);
-            tst.TempControl = input.ReadLine();
-            tst.PumpPower = float.Parse(input.ReadLine(), ci);
+			tst.PumpPower = float.Parse(input.ReadLine(), ci);
 			tst.MassRepeats = int.Parse(input.ReadLine(), ci);
 			tst.MassSpread = float.Parse(input.ReadLine(), ci);
 			tst.MassMethod = (MassMethod)byte.Parse(input.ReadLine(), ci);
@@ -315,6 +255,7 @@ namespace Config.Entities
 			tst.TimeFlow2Mass = int.Parse(input.ReadLine(), ci);
 			tst.TimePump2StartV = int.Parse(input.ReadLine(), ci);
 			tst.TimeStop2Mass = int.Parse(input.ReadLine(), ci);
+            tst.ShortPulses = int.Parse(input.ReadLine(), ci);
             tst.FeedingPath = input.ReadLine();
             tst.BenchPath = input.ReadLine();
             tst.OutputPath = input.ReadLine();
@@ -326,14 +267,6 @@ namespace Config.Entities
                           : line.Equals(TestProfile.UserDefinedHeatMeter.ToString()) ? TestProfile.UserDefinedHeatMeter
                           : line.Equals(TestProfile.Protected.ToString()) ? TestProfile.Protected : TestProfile.UserDefined;  /// UserDefined is the default
             tst.TransAfter = input.ReadLine();
-#if ORACLE_DB
-            tst.OraId = int.Parse(input.ReadLine(), ci);
-            tst.OraIdRepetMulti = int.Parse(input.ReadLine(), ci);
-            tst.OraDesignation = input.ReadLine();
-            tst.RawDataId = int.Parse(input.ReadLine(), ci);
-            tst.RawDataIdRepetMulti = int.Parse(input.ReadLine(), ci);
-            tst.RawDataDesignation = input.ReadLine();
-#endif
 
             while (true)
             {
@@ -372,11 +305,11 @@ namespace Config.Entities
             ln = inp.ReadLine(); if (ln != ErrLimHi.ToString(ci))           { diff.AppendFormat(fmt, "ErrLimHi", ErrLimHi.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Uncertainty.ToString(ci))        { diff.AppendFormat(fmt, "Uncertainty", Uncertainty.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Repeats.ToString(ci))            { diff.AppendFormat(fmt, "Repeats", Repeats.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != DoDraining.ToString(ci))         { diff.AppendFormat(fmt, "Draining", DoDraining.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != DoDrainingAfter.ToString(ci))    { diff.AppendFormat(fmt, "Zeroing", DoDrainingAfter.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != DoDraining.ToString(ci))         { diff.AppendFormat(fmt, "DoDraining", DoDraining.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != DoDrainingAfter.ToString(ci))    { diff.AppendFormat(fmt, "DoDrainingAfter", DoDrainingAfter.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != DoControlWaterTemp.ToString())   { diff.AppendFormat(fmt, "DoControlWaterTemp", DoControlWaterTemp.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != TempLimLo.ToString(ci))          { diff.AppendFormat(fmt, "TempLimLo", TempLimLo.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != TempLimHi.ToString(ci))          { diff.AppendFormat(fmt, "TempLimHi", TempLimHi.ToString(ci), ln); };
-            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); };
@@ -389,18 +322,11 @@ namespace Config.Entities
             ln = inp.ReadLine(); if (ln != BenchPath)                       { diff.AppendFormat(fmt, "BenchPath", BenchPath, ln); };
             ln = inp.ReadLine(); if (ln != OutputPath)                      { diff.AppendFormat(fmt, "OutputPath", OutputPath, ln); };
             ln = inp.ReadLine(); if (ln != MetersPath)                      { diff.AppendFormat(fmt, "MetersPath", MetersPath, ln); };
-            ln = inp.ReadLine(); if (ln != TransBefore)                     { diff.AppendFormat(fmt, "RelTransBefore", TransBefore, ln); };
-            ln = inp.ReadLine(); if (ln != TransBetween)                    { diff.AppendFormat(fmt, "RelTransBetween", TransBetween, ln); };
-            ln = inp.ReadLine(); if (ln != Profile.ToString())              { diff.AppendFormat(fmt, "RelTransAfter", Profile, ln); };
-            ln = inp.ReadLine(); if (ln != TransAfter)                      { diff.AppendFormat(fmt, "TransitionAfter", TransAfter, ln); };
-#if ORACLE_DB
-            ln = inp.ReadLine(); if (ln != OraId.ToString(ci))              { diff.AppendFormat(fmt, "OraId", OraId.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != OraIdRepetMulti.ToString(ci))    { diff.AppendFormat(fmt, "OraIdRepetMulti", OraIdRepetMulti.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != OraDesignation)                  { diff.AppendFormat(fmt, "OraDesignation", OraDesignation, ln); };
-            ln = inp.ReadLine(); if (ln != RawDataId.ToString(ci))          { diff.AppendFormat(fmt, "RawDataId", RawDataId.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != RawDataIdRepetMulti.ToString(ci)){ diff.AppendFormat(fmt, "RawDataIdRepetMulti", RawDataIdRepetMulti.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != RawDataDesignation)              { diff.AppendFormat(fmt, "RawDataDesignation", RawDataDesignation, ln); };
-#endif
+            ln = inp.ReadLine(); if (ln != TransBefore)                     { diff.AppendFormat(fmt, "TransBefore", TransBefore, ln); };
+            ln = inp.ReadLine(); if (ln != TransBetween)                    { diff.AppendFormat(fmt, "TransBetween", TransBetween, ln); };
+            ln = inp.ReadLine(); if (ln != Profile.ToString())              { diff.AppendFormat(fmt, "Profile", Profile, ln); };
+            ln = inp.ReadLine(); if (ln != TransAfter)                      { diff.AppendFormat(fmt, "TransAfter", TransAfter, ln); };
+
             return diff.ToString();
         }
 

Config/Entities/User.cs

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

Config/FluentCommon.cs

@@ -1,10 +1,149 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
 ///
+using System;
+using System.Windows.Forms;
+using FluentNHibernate.Cfg;
+using FluentNHibernate.Cfg.Db;
+using NHibernate;
+using NHibernate.Cfg;
+using NHibernate.Tool.hbm2ddl;
+using Common;
+using Config.Resources;
 
 namespace Config
 {
-    public static class FluentCommon
+    public class FluentCommon
     {
+        /// <summary>
+        /// NHibernate session factory (to create the database session 'SessionFactory')
+        /// </summary>
+        /// <returns>A database session</returns>
+		public static ISessionFactory CreateSessionFactory(DBKind database, DBType dbType, string connectionString, bool createDB)
+        {
+			try
+			{
+                FluentConfiguration cfg = Fluently.Configure();
+
+                switch (dbType)
+				{
+					default:
+                    case DBType.SQLite:
+						cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
+                        break;
+                    case DBType.MySql:
+                        cfg = cfg.Database(MySQLConfiguration.Standard.ConnectionString(connectionString));
+                        break;
+				}
+
+                switch (database)
+                {
+                    default:
+					case DBKind.Config:
+                    case DBKind.RemoteConfig:
+                        cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<FluentCommon>());
+                        break;
+                    case DBKind.Results:
+                        cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<FluentCommon>());
+                        break;
+                }
+
+                if (createDB)
+                {
+                    return cfg.ExposeConfiguration(BuildSchemaCreate).BuildSessionFactory();
+                }
+                else
+                {
+                    return cfg.ExposeConfiguration(BuildSchema).BuildSessionFactory();
+                }
+			}
+			catch (Exception exc)
+			{
+				MessageBox.Show(string.Format(Strings.Cannot_open_DB_Cause_0, exc.Message),
+								Strings.Error,
+								MessageBoxButtons.OK,
+								MessageBoxIcon.Error);
+				return null;
+			}
+        }
+
+        public delegate void BuildSchemaDlgt(Configuration config);
+
+        static void BuildSchema(Configuration config)
+        {
+            /// This NHibernate tool takes a configuration (with mapping info in)
+            /// and exports a database schema from it
+            new SchemaExport(config).SetOutputFile("db_schema");
+        }
+
+        static void BuildSchemaCreate(Configuration config)
+        {
+            /// This NHibernate tool takes a configuration (with mapping info in)
+            /// and exports a database schema from it
+            new SchemaExport(config).Create(true, true);
+        }
+
+        /// <summary>
+        /// Create an empty users database.
+		/// Database contains only the user 'admin' and the control board component 'CB'.
+        /// </summary>
+        /// <param name="dbType">DBType.SQLite or DBType.MySql</param>
+        /// <param name="connectionString">Connection string</param>
+        /// <returns>true=success, false=error</returns>
+		public static bool CreateEmptyConfigDB(DBType dbType, string connectionString)
+		{
+			ISessionFactory sessionFactory = CreateSessionFactory(DBKind.Config, dbType, connectionString, true);
+			if (sessionFactory == null) return false;
+
+            /// Populate the database
+            using (var session = sessionFactory.OpenSession())
+            {
+                using (var transaction = session.BeginTransaction())
+                {
+                    ///
+					/// Create user 'admin'
+                    ///
+                    var admin = new Config.Entities.User
+                    {
+						UserName = GlobalData.AdminUsername,
+                        FullName = Strings.Administrator,
+                        LastPwChange = DateTime.Now
+                    };
+					admin.SetPassword(GlobalData.AdminPassword);
+
+                    ///
+                    /// Prepare all groups, add some of them to admin
+                    ///
+                    for (GID gid = 0; gid < GID.NrOfGroups; gid++)
+                    {
+                        Config.Entities.Group group = new Config.Entities.Group(gid);
+                        switch (gid)
+                        {
+                            case GID.Testers:
+                            case GID.TestingSpecialists:
+                            case GID.HeadOfLab:
+                            case GID.MaintenanceSpecialists:
+                            case GID.Metrologists:
+                            case GID.CalibrationSpecialists:
+                            case GID.Administrators:
+#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
+                            case GID.TraceabilityManagement:
+#elif KEMPNO_50 || KRAKOW_50 || TORUN_50 || WARSAW_END
+                            case GID.MetrologicalAuthority:
+                            case GID.WaterMeterAuthority:
+#endif
+                                admin.AddGroup(group);
+                                session.SaveOrUpdate(group);    /// Save this group
+                                break;
+                        }
+                    }
+
+                    session.SaveOrUpdate(admin);                /// Save user 'admin'
+                    transaction.Commit();
+                }
+            }
+
+            return true;
+        }
     }
 }

Config/Formulas.cs

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

Config/Mappings/BenchPathMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
 using FluentNHibernate.Mapping;
 using Config.Entities;
@@ -16,10 +16,10 @@ namespace Config.Mappings
 			Map(x => x.Qfrom);
 			Map(x => x.Qto);
             Map(x => x.Selector);
-            Map(x => x.TempMtrUp).Column("TempIn");
-			Map(x => x.TempMtrDown).Column("TempOut");
-			Map(x => x.PressMtrUp).Column("PressIn");
-			Map(x => x.PressMtrDown).Column("PressOut");
+            Map(x => x.TempMtrUp);
+			Map(x => x.TempMtrDown);
+			Map(x => x.PressMtrUp);
+			Map(x => x.PressMtrDown);
 			Map(x => x.PressMtrDelta);
 			Map(x => x.StopBFValve);
 			Map(x => x.ValvesOpen)

Config/Mappings/ComponentMap.cs

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

Config/Mappings/FeedingPathMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
 using FluentNHibernate.Mapping;
 using Config.Entities;
@@ -16,8 +16,8 @@ namespace Config.Mappings
 			Map(x => x.Qfrom);
 			Map(x => x.Qto);
             Map(x => x.Selector);
-            Map(x => x.Pump);
-            Map(x => x.RegulValvesPct);
+			Map(x => x.Pump);
+            Map(x => x.RegVPositions);
 			Map(x => x.ValvesOpen)
 				.CustomType("StringClob")
 				.CustomSqlType("varchar(8000)");

Config/Mappings/MeasurementCorrectionMap.cs

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

Config/Mappings/MetersPathMap.cs

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

Config/Mappings/OutputPathMap.cs

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

Config/Mappings/PTestMap.cs

@@ -24,7 +24,6 @@ namespace Config.Mappings
             Map(x => x.PressLimHi);
             Map(x => x.Publish);
             Map(x => x.Evaluate);
-            Map(x => x.Method);
             Map(x => x.E1);
             Map(x => x.E2);
             Map(x => x.E3);

Config/Mappings/TestMap.cs

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

Config/Mappings/UserMap.cs

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

Config/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Sensus")]
 [assembly: AssemblyProduct("Config")]
-[assembly: AssemblyCopyright("Copyright ©  2013 - 2022 Sensus Slovensko a.s.")]
+[assembly: AssemblyCopyright("Copyright ©  2013 - 2018 Sensus Slovensko a.s.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.31.1990.0")]
-[assembly: AssemblyFileVersion("2.31.1990.0")]
+[assembly: AssemblyVersion("3.1.1464.0")]
+[assembly: AssemblyFileVersion("3.1.1464.0")]

Config/Resources/Strings.resx

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

Config/Utils.cs

@@ -1,68 +0,0 @@
-///
-/// Copyright (c) 2017-2022 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Config
-{
-    public static class Utils
-    {
-        /// <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;
-        }
-    }
-}

DataStreamInterfaceTest/ActivityLog.cs

@@ -1,36 +0,0 @@
-using System;
-using System.Text;
-using System.Windows.Forms;
-
-namespace DataStreamInterfaceTest
-{
-    public class ActivityLog
-    {
-        const int LinesCount = 50;
-
-        TextBox textBox;
-        string[] lines;
-        string activity;
-
-        public ActivityLog(TextBox textBox)
-        {
-            this.textBox = textBox;
-            lines = new string[LinesCount];
-            for (int i = 0; i < LinesCount; i++) lines[i] = string.Empty;
-        }
-
-        public void Print(string log)
-        {
-            for (int i = LinesCount - 1; i > 0; i--) lines[i] = lines[i - 1];
-            lines[0] = log;
-            DisplayLines();
-        }
-
-        private void DisplayLines()
-        {
-            StringBuilder sb = new StringBuilder();
-            foreach (var line in lines) sb.AppendLine(line);
-            textBox.Text = sb.ToString();
-        }
-    }
-}

DataStreamInterfaceTest/App.config

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

DataStreamInterfaceTest/DataStreamInterfaceTest.csproj

@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{1D1EEF9C-7F41-43D3-BD09-5054D00F7A23}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DataStreamInterfaceTest</RootNamespace>
-    <AssemblyName>DataStreamInterfaceTest</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="System" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ActivityLog.cs" />
-    <Compile Include="DemoMainWnd.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="DemoMainWnd.Designer.cs">
-      <DependentUpon>DemoMainWnd.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GetDblValueDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GetDblValueDlg.designer.cs">
-      <DependentUpon>GetDblValueDlg.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GetFrameBoundariesDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GetFrameBoundariesDlg.designer.cs">
-      <DependentUpon>GetFrameBoundariesDlg.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GetIntegerNumberDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GetIntegerNumberDlg.Designer.cs">
-      <DependentUpon>GetIntegerNumberDlg.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GetStateDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GetStateDlg.designer.cs">
-      <DependentUpon>GetStateDlg.cs</DependentUpon>
-    </Compile>
-    <Compile Include="LviIDComparer.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="DemoMainWnd.resx">
-      <DependentUpon>DemoMainWnd.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GetDblValueDlg.resx">
-      <DependentUpon>GetDblValueDlg.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GetFrameBoundariesDlg.resx">
-      <DependentUpon>GetFrameBoundariesDlg.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GetIntegerNumberDlg.resx">
-      <DependentUpon>GetIntegerNumberDlg.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GetStateDlg.resx">
-      <DependentUpon>GetStateDlg.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\DataStreamInterface\DataStreamInterface.csproj">
-      <Project>{7ebeea14-91c4-48d7-af0a-7a4bc3ff9a28}</Project>
-      <Name>DataStreamInterface</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>

DataStreamInterfaceTest/DemoMainWnd.Designer.cs

@@ -1,380 +0,0 @@
-namespace DataStreamInterfaceTest
-{
-    partial class DemoMainWnd
-    {
-        /// <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.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.getIDButton = new System.Windows.Forms.Button();
-            this.getFramesButton = new System.Windows.Forms.Button();
-            this.measurementLabel = new System.Windows.Forms.Label();
-            this.stateLabel = new System.Windows.Forms.Label();
-            this.capabilitiesLabel = new System.Windows.Forms.Label();
-            this.getQuantityUnitsButton = new System.Windows.Forms.Button();
-            this.getQuantityCaptionButton = new System.Windows.Forms.Button();
-            this.getQuantitiesCountButton = new System.Windows.Forms.Button();
-            this.getVolumeUnitsButton = new System.Windows.Forms.Button();
-            this.getTimeUnitsButton = new System.Windows.Forms.Button();
-            this.setStateButton = new System.Windows.Forms.Button();
-            this.getStateButton = new System.Windows.Forms.Button();
-            this.stopMeasurementButton = new System.Windows.Forms.Button();
-            this.startMeasurementButton = new System.Windows.Forms.Button();
-            this.closeConnectionButton = new System.Windows.Forms.Button();
-            this.openConnectionButton = new System.Windows.Forms.Button();
-            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
-            this.logsTextBox = new System.Windows.Forms.TextBox();
-            this.dataTabControl = new System.Windows.Forms.TabControl();
-            this.tabPage1 = new System.Windows.Forms.TabPage();
-            this.framesListView = new System.Windows.Forms.ListView();
-            this.tabPage2 = new System.Windows.Forms.TabPage();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
-            this.splitContainer1.Panel1.SuspendLayout();
-            this.splitContainer1.Panel2.SuspendLayout();
-            this.splitContainer1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
-            this.splitContainer2.Panel1.SuspendLayout();
-            this.splitContainer2.Panel2.SuspendLayout();
-            this.splitContainer2.SuspendLayout();
-            this.dataTabControl.SuspendLayout();
-            this.tabPage1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // splitContainer1
-            // 
-            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
-            this.splitContainer1.IsSplitterFixed = true;
-            this.splitContainer1.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer1.Name = "splitContainer1";
-            // 
-            // splitContainer1.Panel1
-            // 
-            this.splitContainer1.Panel1.Controls.Add(this.getIDButton);
-            this.splitContainer1.Panel1.Controls.Add(this.getFramesButton);
-            this.splitContainer1.Panel1.Controls.Add(this.measurementLabel);
-            this.splitContainer1.Panel1.Controls.Add(this.stateLabel);
-            this.splitContainer1.Panel1.Controls.Add(this.capabilitiesLabel);
-            this.splitContainer1.Panel1.Controls.Add(this.getQuantityUnitsButton);
-            this.splitContainer1.Panel1.Controls.Add(this.getQuantityCaptionButton);
-            this.splitContainer1.Panel1.Controls.Add(this.getQuantitiesCountButton);
-            this.splitContainer1.Panel1.Controls.Add(this.getVolumeUnitsButton);
-            this.splitContainer1.Panel1.Controls.Add(this.getTimeUnitsButton);
-            this.splitContainer1.Panel1.Controls.Add(this.setStateButton);
-            this.splitContainer1.Panel1.Controls.Add(this.getStateButton);
-            this.splitContainer1.Panel1.Controls.Add(this.stopMeasurementButton);
-            this.splitContainer1.Panel1.Controls.Add(this.startMeasurementButton);
-            this.splitContainer1.Panel1.Controls.Add(this.closeConnectionButton);
-            this.splitContainer1.Panel1.Controls.Add(this.openConnectionButton);
-            // 
-            // splitContainer1.Panel2
-            // 
-            this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
-            this.splitContainer1.Size = new System.Drawing.Size(826, 583);
-            this.splitContainer1.SplitterDistance = 150;
-            this.splitContainer1.TabIndex = 0;
-            // 
-            // getIDButton
-            // 
-            this.getIDButton.Location = new System.Drawing.Point(12, 480);
-            this.getIDButton.Name = "getIDButton";
-            this.getIDButton.Size = new System.Drawing.Size(128, 24);
-            this.getIDButton.TabIndex = 12;
-            this.getIDButton.Text = "Get ID";
-            this.getIDButton.UseVisualStyleBackColor = true;
-            this.getIDButton.Click += new System.EventHandler(this.getIDButton_Click);
-            // 
-            // getFramesButton
-            // 
-            this.getFramesButton.Location = new System.Drawing.Point(12, 450);
-            this.getFramesButton.Name = "getFramesButton";
-            this.getFramesButton.Size = new System.Drawing.Size(128, 24);
-            this.getFramesButton.TabIndex = 11;
-            this.getFramesButton.Text = "Get frames";
-            this.getFramesButton.UseVisualStyleBackColor = true;
-            this.getFramesButton.Click += new System.EventHandler(this.getFramesButton_Click);
-            // 
-            // measurementLabel
-            // 
-            this.measurementLabel.AutoSize = true;
-            this.measurementLabel.Location = new System.Drawing.Point(12, 374);
-            this.measurementLabel.Name = "measurementLabel";
-            this.measurementLabel.Size = new System.Drawing.Size(74, 13);
-            this.measurementLabel.TabIndex = 15;
-            this.measurementLabel.Text = "Measurement:";
-            // 
-            // stateLabel
-            // 
-            this.stateLabel.AutoSize = true;
-            this.stateLabel.Location = new System.Drawing.Point(12, 194);
-            this.stateLabel.Name = "stateLabel";
-            this.stateLabel.Size = new System.Drawing.Size(112, 13);
-            this.stateLabel.TabIndex = 14;
-            this.stateLabel.Text = "State and connection:";
-            // 
-            // capabilitiesLabel
-            // 
-            this.capabilitiesLabel.AutoSize = true;
-            this.capabilitiesLabel.Location = new System.Drawing.Point(12, 9);
-            this.capabilitiesLabel.Name = "capabilitiesLabel";
-            this.capabilitiesLabel.Size = new System.Drawing.Size(63, 13);
-            this.capabilitiesLabel.TabIndex = 13;
-            this.capabilitiesLabel.Text = "Capabilities:";
-            // 
-            // getQuantityUnitsButton
-            // 
-            this.getQuantityUnitsButton.Location = new System.Drawing.Point(12, 145);
-            this.getQuantityUnitsButton.Name = "getQuantityUnitsButton";
-            this.getQuantityUnitsButton.Size = new System.Drawing.Size(128, 24);
-            this.getQuantityUnitsButton.TabIndex = 4;
-            this.getQuantityUnitsButton.Text = "Get quantity units";
-            this.getQuantityUnitsButton.UseVisualStyleBackColor = true;
-            this.getQuantityUnitsButton.Click += new System.EventHandler(this.getQuantityUnitsButton_Click);
-            // 
-            // getQuantityCaptionButton
-            // 
-            this.getQuantityCaptionButton.Location = new System.Drawing.Point(12, 115);
-            this.getQuantityCaptionButton.Name = "getQuantityCaptionButton";
-            this.getQuantityCaptionButton.Size = new System.Drawing.Size(128, 24);
-            this.getQuantityCaptionButton.TabIndex = 3;
-            this.getQuantityCaptionButton.Text = "Get quantity caption";
-            this.getQuantityCaptionButton.UseVisualStyleBackColor = true;
-            this.getQuantityCaptionButton.Click += new System.EventHandler(this.getQuantityCaptionButton_Click);
-            // 
-            // getQuantitiesCountButton
-            // 
-            this.getQuantitiesCountButton.Location = new System.Drawing.Point(12, 85);
-            this.getQuantitiesCountButton.Name = "getQuantitiesCountButton";
-            this.getQuantitiesCountButton.Size = new System.Drawing.Size(128, 24);
-            this.getQuantitiesCountButton.TabIndex = 2;
-            this.getQuantitiesCountButton.Text = "Get quantities count";
-            this.getQuantitiesCountButton.UseVisualStyleBackColor = true;
-            this.getQuantitiesCountButton.Click += new System.EventHandler(this.getQuantitiesCountButton_Click);
-            // 
-            // getVolumeUnitsButton
-            // 
-            this.getVolumeUnitsButton.Location = new System.Drawing.Point(12, 55);
-            this.getVolumeUnitsButton.Name = "getVolumeUnitsButton";
-            this.getVolumeUnitsButton.Size = new System.Drawing.Size(128, 24);
-            this.getVolumeUnitsButton.TabIndex = 1;
-            this.getVolumeUnitsButton.Text = "Get volume units";
-            this.getVolumeUnitsButton.UseVisualStyleBackColor = true;
-            this.getVolumeUnitsButton.Click += new System.EventHandler(this.getVolumeUnitsButton_Click);
-            // 
-            // getTimeUnitsButton
-            // 
-            this.getTimeUnitsButton.Location = new System.Drawing.Point(12, 25);
-            this.getTimeUnitsButton.Name = "getTimeUnitsButton";
-            this.getTimeUnitsButton.Size = new System.Drawing.Size(128, 24);
-            this.getTimeUnitsButton.TabIndex = 0;
-            this.getTimeUnitsButton.Text = "Get time units";
-            this.getTimeUnitsButton.UseVisualStyleBackColor = true;
-            this.getTimeUnitsButton.Click += new System.EventHandler(this.getTimeUnitsButton_Click);
-            // 
-            // setStateButton
-            // 
-            this.setStateButton.Location = new System.Drawing.Point(12, 315);
-            this.setStateButton.Name = "setStateButton";
-            this.setStateButton.Size = new System.Drawing.Size(128, 24);
-            this.setStateButton.TabIndex = 8;
-            this.setStateButton.Text = "Set state";
-            this.setStateButton.UseVisualStyleBackColor = true;
-            this.setStateButton.Click += new System.EventHandler(this.setStateButton_Click);
-            // 
-            // getStateButton
-            // 
-            this.getStateButton.Location = new System.Drawing.Point(12, 285);
-            this.getStateButton.Name = "getStateButton";
-            this.getStateButton.Size = new System.Drawing.Size(128, 24);
-            this.getStateButton.TabIndex = 7;
-            this.getStateButton.Text = "Get state";
-            this.getStateButton.UseVisualStyleBackColor = true;
-            this.getStateButton.Click += new System.EventHandler(this.getStateButton_Click);
-            // 
-            // stopMeasurementButton
-            // 
-            this.stopMeasurementButton.Location = new System.Drawing.Point(12, 420);
-            this.stopMeasurementButton.Name = "stopMeasurementButton";
-            this.stopMeasurementButton.Size = new System.Drawing.Size(128, 24);
-            this.stopMeasurementButton.TabIndex = 10;
-            this.stopMeasurementButton.Text = "Stop measurement";
-            this.stopMeasurementButton.UseVisualStyleBackColor = true;
-            this.stopMeasurementButton.Click += new System.EventHandler(this.stopMeasurementButton_Click);
-            // 
-            // startMeasurementButton
-            // 
-            this.startMeasurementButton.Location = new System.Drawing.Point(12, 390);
-            this.startMeasurementButton.Name = "startMeasurementButton";
-            this.startMeasurementButton.Size = new System.Drawing.Size(128, 24);
-            this.startMeasurementButton.TabIndex = 9;
-            this.startMeasurementButton.Text = "Start measurement";
-            this.startMeasurementButton.UseVisualStyleBackColor = true;
-            this.startMeasurementButton.Click += new System.EventHandler(this.startMeasurementButton_Click);
-            // 
-            // closeConnectionButton
-            // 
-            this.closeConnectionButton.Location = new System.Drawing.Point(12, 240);
-            this.closeConnectionButton.Name = "closeConnectionButton";
-            this.closeConnectionButton.Size = new System.Drawing.Size(128, 24);
-            this.closeConnectionButton.TabIndex = 6;
-            this.closeConnectionButton.Text = "Close connection";
-            this.closeConnectionButton.UseVisualStyleBackColor = true;
-            this.closeConnectionButton.Click += new System.EventHandler(this.closeConnectionButton_Click);
-            // 
-            // openConnectionButton
-            // 
-            this.openConnectionButton.Location = new System.Drawing.Point(12, 210);
-            this.openConnectionButton.Name = "openConnectionButton";
-            this.openConnectionButton.Size = new System.Drawing.Size(128, 24);
-            this.openConnectionButton.TabIndex = 5;
-            this.openConnectionButton.Text = "Open connection";
-            this.openConnectionButton.UseVisualStyleBackColor = true;
-            this.openConnectionButton.Click += new System.EventHandler(this.openConnectionButton_Click);
-            // 
-            // splitContainer2
-            // 
-            this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer2.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer2.Name = "splitContainer2";
-            this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
-            // 
-            // splitContainer2.Panel1
-            // 
-            this.splitContainer2.Panel1.Controls.Add(this.logsTextBox);
-            // 
-            // splitContainer2.Panel2
-            // 
-            this.splitContainer2.Panel2.Controls.Add(this.dataTabControl);
-            this.splitContainer2.Size = new System.Drawing.Size(672, 583);
-            this.splitContainer2.SplitterDistance = 222;
-            this.splitContainer2.TabIndex = 0;
-            // 
-            // logsTextBox
-            // 
-            this.logsTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.logsTextBox.Location = new System.Drawing.Point(0, 0);
-            this.logsTextBox.Multiline = true;
-            this.logsTextBox.Name = "logsTextBox";
-            this.logsTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-            this.logsTextBox.Size = new System.Drawing.Size(672, 222);
-            this.logsTextBox.TabIndex = 0;
-            // 
-            // dataTabControl
-            // 
-            this.dataTabControl.Controls.Add(this.tabPage1);
-            this.dataTabControl.Controls.Add(this.tabPage2);
-            this.dataTabControl.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dataTabControl.Location = new System.Drawing.Point(0, 0);
-            this.dataTabControl.Name = "dataTabControl";
-            this.dataTabControl.SelectedIndex = 0;
-            this.dataTabControl.Size = new System.Drawing.Size(672, 357);
-            this.dataTabControl.TabIndex = 0;
-            // 
-            // tabPage1
-            // 
-            this.tabPage1.Controls.Add(this.framesListView);
-            this.tabPage1.Location = new System.Drawing.Point(4, 22);
-            this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(664, 331);
-            this.tabPage1.TabIndex = 0;
-            this.tabPage1.Text = "Transferred frames";
-            this.tabPage1.UseVisualStyleBackColor = true;
-            // 
-            // framesListView
-            // 
-            this.framesListView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.framesListView.GridLines = true;
-            this.framesListView.Location = new System.Drawing.Point(3, 3);
-            this.framesListView.Name = "framesListView";
-            this.framesListView.Size = new System.Drawing.Size(658, 325);
-            this.framesListView.TabIndex = 0;
-            this.framesListView.UseCompatibleStateImageBehavior = false;
-            this.framesListView.View = System.Windows.Forms.View.Details;
-            // 
-            // tabPage2
-            // 
-            this.tabPage2.Location = new System.Drawing.Point(4, 22);
-            this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage2.Size = new System.Drawing.Size(664, 331);
-            this.tabPage2.TabIndex = 1;
-            this.tabPage2.Text = "Graph";
-            this.tabPage2.UseVisualStyleBackColor = true;
-            // 
-            // DemoMainWnd
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(826, 583);
-            this.Controls.Add(this.splitContainer1);
-            this.Name = "DemoMainWnd";
-            this.Text = "Datastream interface test";
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.DemoMainWnd_FormClosing);
-            this.splitContainer1.Panel1.ResumeLayout(false);
-            this.splitContainer1.Panel1.PerformLayout();
-            this.splitContainer1.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
-            this.splitContainer1.ResumeLayout(false);
-            this.splitContainer2.Panel1.ResumeLayout(false);
-            this.splitContainer2.Panel1.PerformLayout();
-            this.splitContainer2.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
-            this.splitContainer2.ResumeLayout(false);
-            this.dataTabControl.ResumeLayout(false);
-            this.tabPage1.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.SplitContainer splitContainer1;
-        private System.Windows.Forms.Button openConnectionButton;
-        private System.Windows.Forms.Button closeConnectionButton;
-        private System.Windows.Forms.Button stopMeasurementButton;
-        private System.Windows.Forms.Button startMeasurementButton;
-        private System.Windows.Forms.Button setStateButton;
-        private System.Windows.Forms.Button getStateButton;
-        private System.Windows.Forms.Button getQuantityUnitsButton;
-        private System.Windows.Forms.Button getQuantityCaptionButton;
-        private System.Windows.Forms.Button getQuantitiesCountButton;
-        private System.Windows.Forms.Button getVolumeUnitsButton;
-        private System.Windows.Forms.Button getTimeUnitsButton;
-        private System.Windows.Forms.Label measurementLabel;
-        private System.Windows.Forms.Label stateLabel;
-        private System.Windows.Forms.Label capabilitiesLabel;
-        private System.Windows.Forms.Button getIDButton;
-        private System.Windows.Forms.Button getFramesButton;
-        private System.Windows.Forms.SplitContainer splitContainer2;
-        private System.Windows.Forms.TextBox logsTextBox;
-        private System.Windows.Forms.TabControl dataTabControl;
-        private System.Windows.Forms.TabPage tabPage1;
-        private System.Windows.Forms.ListView framesListView;
-        private System.Windows.Forms.TabPage tabPage2;
-    }
-}
-

DataStreamInterfaceTest/DemoMainWnd.cs

@@ -1,292 +0,0 @@
-using System;
-using System.Text;
-using System.Windows.Forms;
-using DataStreamInterface;
-
-namespace DataStreamInterfaceTest
-{
-    public partial class DemoMainWnd : Form
-    {
-        IDataStreamMeter dataStreamMeter;
-
-        ActivityLog activityLog;
-
-        Unit timeUnits;
-        Unit volumeUnits;
-        int quantitiesCount;
-        string[] quantityCaption;
-        Unit[] quantityUnit;
-
-        Int64 storedFramesCount;
-        DataFrame[] transferredFrames;
-
-        public DemoMainWnd() : this(null) { }
-
-        public DemoMainWnd(IDataStreamMeter dataStreamMeter)
-        {
-            InitializeComponent();
-            this.dataStreamMeter = dataStreamMeter;
-            activityLog = new ActivityLog(logsTextBox);
-
-            framesListView.Columns.Add("ID", 100);
-            framesListView.Columns.Add("Time", 100);
-            framesListView.Columns.Add("Volume", 100);
-            framesListView.Columns.Add("Additional quantities", 300);
-            framesListView.ListViewItemSorter = new LviIDComparer();
-        }
-
-        void ShowNoMeterInterfaceMessage()
-        {
-            MessageBox.Show("No datastream meter interface");
-        }
-
-        private void getTimeUnitsButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                timeUnits = dataStreamMeter.GetTimeUnits();
-                activityLog.Print(string.Format("Time units are {0}", timeUnits));
-            }
-        }
-
-        private void getVolumeUnitsButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                volumeUnits = dataStreamMeter.GetVolumeUnits();
-                activityLog.Print(string.Format("Volume units are {0}", volumeUnits));
-            }
-        }
-
-        private void getQuantitiesCountButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                int quantitesCountOri = quantitiesCount;
-                quantitiesCount = dataStreamMeter.GetQuantitiesCount();
-                activityLog.Print(string.Format("There are {0} additional quantites", quantitiesCount));
-
-                if (quantitesCountOri == 0)
-                {
-                    quantityUnit = new Unit[quantitiesCount];
-                    quantityCaption = new string[quantitiesCount];
-                    for (int i = 0; i < quantitiesCount; i++) quantityCaption[i] = string.Empty;
-                }
-                else if (quantitiesCount != quantitesCountOri)
-                {
-                    quantityUnit = new Unit[quantitiesCount];
-                    quantityCaption = new string[quantitiesCount];
-                    for (int i = 0; i < quantitiesCount; i++) quantityCaption[i] = string.Empty;
-
-                    activityLog.Print(string.Format("Quantities count changed during operation"));
-                    MessageBox.Show("Quantities count changed during operation", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-                }
-            }
-        }
-
-        private void getQuantityCaptionButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                GetIntegerNumberDlg dlg = new GetIntegerNumberDlg(string.Format("Enter index {0} .. {1}", 0, quantitiesCount - 1), 0, quantitiesCount - 1);
-                if (dlg.ShowDialog() == DialogResult.OK)
-                {
-                    quantityCaption[dlg.Number] = dataStreamMeter.GetQuantityCaption(dlg.Number);
-                    activityLog.Print(string.Format("Caption of quantity #{0} is {1}", dlg.Number, quantityCaption[dlg.Number]));
-                }
-            }
-        }
-
-        private void getQuantityUnitsButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                GetIntegerNumberDlg dlg = new GetIntegerNumberDlg(string.Format("Enter index {0} .. {1}", 0, quantitiesCount - 1), 0, quantitiesCount - 1);
-                if (dlg.ShowDialog() == DialogResult.OK)
-                {
-                    quantityUnit[dlg.Number] = dataStreamMeter.GetQuantityUnits(dlg.Number);
-                    activityLog.Print(string.Format("Units of quantity #{0} are {1}", dlg.Number, quantityUnit[dlg.Number]));
-                }
-            }
-        }
-
-        private void openConnectionButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                string meterId;
-                if (dataStreamMeter.OpenConnection(0, "no connection parameters", out meterId))
-                {
-                    activityLog.Print(string.Format("Connection established, meter ID is {0}", meterId));
-                }
-                else
-                {
-                    activityLog.Print("Failed to establish a connection");
-                }
-            }
-        }
-
-        private void closeConnectionButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                if (dataStreamMeter.CloseConnection(0))
-                {
-                    framesListView.Items.Clear();
-                    activityLog.Print("Connection closed");
-                }
-                else
-                {
-                    activityLog.Print("Failed to close the connection");
-                }
-            }
-        }
-
-        private void DemoMainWnd_FormClosing(object sender, FormClosingEventArgs e)
-        {
-            if (dataStreamMeter == null)
-            {
-                dataStreamMeter.Shutdown();
-            }
-        }
-
-        private void getStateButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                int state;
-                string parameter;
-                if (dataStreamMeter.GetState(0, out state, out parameter))
-                {
-                    activityLog.Print(string.Format("Water meter state is {0} / {1}", state, parameter));
-                }
-                else
-                {
-                    activityLog.Print("Failed to obtain the water meter state");
-                }
-            }
-        }
-
-        private void setStateButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                GetStateDlg dlg = new GetStateDlg();
-                if (dlg.ShowDialog() == DialogResult.OK)
-                {
-                    if (dataStreamMeter.SetState(0, dlg.State, dlg.Parameter))
-                    {
-                        activityLog.Print(string.Format("Water meter state set to {0} / {1}", dlg.State, dlg.Parameter));
-                    }
-                    else
-                    {
-                        activityLog.Print(string.Format("Failed to set the water meter state to {0} / {1}", dlg.State, dlg.Parameter));
-                    }
-                }
-            }
-        }
-
-        private void startMeasurementButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                if (dataStreamMeter.StartMeasurement(0))
-                {
-                    framesListView.Items.Clear();
-                    activityLog.Print(string.Format("Measurement started"));
-                }
-                else
-                {
-                    activityLog.Print("Failed to start a measurement");
-                }
-            }
-        }
-
-        private void stopMeasurementButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                if (dataStreamMeter.StopMeasurement(0, out storedFramesCount))
-                {
-                    framesListView.Items.Clear();
-                    activityLog.Print(string.Format("Measurement sopped, {0} frames acquired", storedFramesCount));
-                }
-                else
-                {
-                    activityLog.Print("Failed to stop the measurement");
-                }
-            }
-        }
-
-        private void getFramesButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                GetFrameBoundariesDlg dlg = new GetFrameBoundariesDlg("Enter frames range boundaries", 0, storedFramesCount - 1);
-                if (dlg.ShowDialog() != DialogResult.OK) return;
-                DataFrame[] frames = dataStreamMeter.GetFrames(0, dlg.From, Convert.ToInt32(dlg.To - dlg.From + 1));
-                {
-                    foreach (var frame in frames)
-                    {
-                        if (frame != null) framesListView.Items.Add(GetListViewItem(frame));
-                    }
-                }
-            }
-        }
-
-        private void getIDButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                GetDblValueDlg dlg = new GetDblValueDlg("Enter time in seconds");
-                if (dlg.ShowDialog() == DialogResult.OK)
-                {
-                    Int64 id = dataStreamMeter.GetID(0, dlg.DblValue);
-                    activityLog.Print(string.Format("GetID({0}) returned {1}", dlg.DblValue, id));
-                }
-            }
-        }
-
-        ListViewItem GetListViewItem(DataFrame frame)
-        {
-            ListViewItem lvi = new ListViewItem(frame.ID.ToString());
-            lvi.SubItems.Add(frame.Time.ToString());
-            lvi.SubItems.Add(frame.Volume.ToString());
-            StringBuilder sb = new StringBuilder();
-            foreach (var quantity in frame.Quantity)
-            {
-                sb.Append(quantity.ToString());
-                sb.Append("  ");
-            }
-            lvi.SubItems.Add(sb.ToString());
-            lvi.Tag = frame;
-            return lvi;
-        }
-    }
-}

DataStreamInterfaceTest/GetDblValueDlg.Designer.cs

@@ -1,88 +0,0 @@
-namespace DataStreamInterfaceTest
-{
-    partial class GetDblValueDlg
-    {
-        /// <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.valueTextBox = new System.Windows.Forms.TextBox();
-            this.okButton = new System.Windows.Forms.Button();
-            this.cancelButton = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // valueTextBox
-            // 
-            this.valueTextBox.Location = new System.Drawing.Point(35, 20);
-            this.valueTextBox.Name = "valueTextBox";
-            this.valueTextBox.Size = new System.Drawing.Size(94, 20);
-            this.valueTextBox.TabIndex = 0;
-            // 
-            // okButton
-            // 
-            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.okButton.Location = new System.Drawing.Point(216, 16);
-            this.okButton.Name = "okButton";
-            this.okButton.Size = new System.Drawing.Size(75, 29);
-            this.okButton.TabIndex = 1;
-            this.okButton.Text = "OK";
-            this.okButton.UseVisualStyleBackColor = true;
-            this.okButton.Click += new System.EventHandler(this.okButton_Click);
-            // 
-            // cancelButton
-            // 
-            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.cancelButton.Location = new System.Drawing.Point(306, 16);
-            this.cancelButton.Name = "cancelButton";
-            this.cancelButton.Size = new System.Drawing.Size(75, 29);
-            this.cancelButton.TabIndex = 2;
-            this.cancelButton.Text = "Cancel";
-            this.cancelButton.UseVisualStyleBackColor = true;
-            // 
-            // GetFlowDlg
-            // 
-            this.AcceptButton = this.okButton;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.CancelButton = this.cancelButton;
-            this.ClientSize = new System.Drawing.Size(396, 58);
-            this.Controls.Add(this.cancelButton);
-            this.Controls.Add(this.okButton);
-            this.Controls.Add(this.valueTextBox);
-            this.Name = "GetFlowDlg";
-            this.Text = "Enter flow";
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TextBox valueTextBox;
-        private System.Windows.Forms.Button okButton;
-        private System.Windows.Forms.Button cancelButton;
-    }
-}

DataStreamInterfaceTest/GetDblValueDlg.cs

@@ -1,59 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows.Forms;
-
-namespace DataStreamInterfaceTest
-{
-    public partial class GetDblValueDlg : Form
-    {
-        public double DblValue;
-
-        double lowerLimit;
-        double upperLimit;
-
-
-        public GetDblValueDlg()
-            : this("Enter flow in [m3/h] please")
-        {
-        }
-
-        public GetDblValueDlg(string title)
-            : this(title, 0, 100.0)
-        {
-        }
-
-        public GetDblValueDlg(string title, double lowerLimit, double upperLimit)
-        {
-            InitializeComponent();
-            this.Text = title;
-            this.lowerLimit = lowerLimit;
-            this.upperLimit = upperLimit;
-        }
-
-
-        private void okButton_Click(object sender, EventArgs e)
-        {
-            double val;
-            if (TryParseUDouble(valueTextBox.Text, out val))
-            {
-                DblValue = val;
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            else
-            {
-                MessageBox.Show("Invalid value");
-                DialogResult = DialogResult.None;
-            }
-        }
-
-        /// <summary>
-        /// Parse an unsigned double number
-        /// </summary>
-        bool TryParseUDouble(string text, out double result)
-        {
-            return double.TryParse(text, NumberStyles.AllowDecimalPoint, CultureInfo.CurrentCulture, out result) ||
-                   double.TryParse(text, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out result);
-        }
-    }
-}

DataStreamInterfaceTest/GetFrameBoundariesDlg.Designer.cs

@@ -1,126 +0,0 @@
-namespace DataStreamInterfaceTest
-{
-    partial class GetFrameBoundariesDlg
-    {
-        /// <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.fromTextBox = new System.Windows.Forms.TextBox();
-            this.okButton = new System.Windows.Forms.Button();
-            this.cancelButton = new System.Windows.Forms.Button();
-            this.toTextBox = new System.Windows.Forms.TextBox();
-            this.fromLabel = new System.Windows.Forms.Label();
-            this.toLabel = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // fromTextBox
-            // 
-            this.fromTextBox.Location = new System.Drawing.Point(89, 16);
-            this.fromTextBox.Name = "fromTextBox";
-            this.fromTextBox.Size = new System.Drawing.Size(100, 20);
-            this.fromTextBox.TabIndex = 0;
-            // 
-            // okButton
-            // 
-            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.okButton.Location = new System.Drawing.Point(225, 24);
-            this.okButton.Name = "okButton";
-            this.okButton.Size = new System.Drawing.Size(75, 36);
-            this.okButton.TabIndex = 1;
-            this.okButton.Text = "OK";
-            this.okButton.UseVisualStyleBackColor = true;
-            this.okButton.Click += new System.EventHandler(this.okButton_Click);
-            // 
-            // cancelButton
-            // 
-            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.cancelButton.Location = new System.Drawing.Point(316, 24);
-            this.cancelButton.Name = "cancelButton";
-            this.cancelButton.Size = new System.Drawing.Size(75, 36);
-            this.cancelButton.TabIndex = 2;
-            this.cancelButton.Text = "Cancel";
-            this.cancelButton.UseVisualStyleBackColor = true;
-            // 
-            // toTextBox
-            // 
-            this.toTextBox.Location = new System.Drawing.Point(89, 46);
-            this.toTextBox.Name = "toTextBox";
-            this.toTextBox.Size = new System.Drawing.Size(100, 20);
-            this.toTextBox.TabIndex = 3;
-            // 
-            // fromLabel
-            // 
-            this.fromLabel.AutoSize = true;
-            this.fromLabel.Location = new System.Drawing.Point(12, 19);
-            this.fromLabel.Name = "fromLabel";
-            this.fromLabel.Size = new System.Drawing.Size(30, 13);
-            this.fromLabel.TabIndex = 4;
-            this.fromLabel.Text = "From";
-            // 
-            // toLabel
-            // 
-            this.toLabel.AutoSize = true;
-            this.toLabel.Location = new System.Drawing.Point(12, 49);
-            this.toLabel.Name = "toLabel";
-            this.toLabel.Size = new System.Drawing.Size(20, 13);
-            this.toLabel.TabIndex = 5;
-            this.toLabel.Text = "To";
-            // 
-            // GetFrameBoundariesDlg
-            // 
-            this.AcceptButton = this.okButton;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.AutoSize = true;
-            this.CancelButton = this.cancelButton;
-            this.ClientSize = new System.Drawing.Size(419, 79);
-            this.ControlBox = false;
-            this.Controls.Add(this.toLabel);
-            this.Controls.Add(this.fromLabel);
-            this.Controls.Add(this.toTextBox);
-            this.Controls.Add(this.cancelButton);
-            this.Controls.Add(this.okButton);
-            this.Controls.Add(this.fromTextBox);
-            this.Name = "GetFrameBoundariesDlg";
-            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "Enter frames range boundaries";
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TextBox fromTextBox;
-        private System.Windows.Forms.Button okButton;
-        private System.Windows.Forms.Button cancelButton;
-        private System.Windows.Forms.TextBox toTextBox;
-        private System.Windows.Forms.Label fromLabel;
-        private System.Windows.Forms.Label toLabel;
-    }
-}

DataStreamInterfaceTest/GetFrameBoundariesDlg.cs

@@ -1,88 +0,0 @@
-using System;
-using System.Windows.Forms;
-
-namespace DataStreamInterfaceTest
-{
-    public partial class GetFrameBoundariesDlg : Form
-    {
-        /// <summary>
-        /// Integer number entered in this form
-        /// </summary>
-        public Int64 From;
-        public Int64 To;
-
-        Int64 lowerLimit;
-        Int64 upperLimit;
-
-
-        /// <summary>
-        /// Default constructor
-        /// </summary>
-        public GetFrameBoundariesDlg()
-            : this("Enter state please")
-        {
-        }
-
-        /// <summary>
-        /// Constructor with a custom window title.
-        /// </summary>
-        /// <param name="title">Window title</param>
-        public GetFrameBoundariesDlg(string title)
-            : this(title, Int64.MinValue, Int64.MaxValue)
-        {
-        }
-
-        /// <summary>
-        /// Constructor with a custom window title, limits and non-empty initial value.
-        /// </summary>
-        /// <param name="title">Window title</param>
-        /// <param name="lowerLimit">Lower limit</param>
-        /// <param name="upperLimit">Upper limit</param>
-        /// <param name="initialValue">Initial value</param>
-        public GetFrameBoundariesDlg(string title, Int64 lowerLimit, Int64 upperLimit, int initialValue)
-            : this(title, lowerLimit, upperLimit)
-        {
-            fromTextBox.Text = initialValue.ToString();
-        }
-
-        /// <summary>
-        /// Constructor with a custom window title and lower/upper limits.
-        /// </summary>
-        /// <param name="title">Window title</param>
-        /// <param name="lowerLimit">Lower limit</param>
-        /// <param name="upperLimit">Upper limit</param>
-        public GetFrameBoundariesDlg(string title, Int64 lowerLimit, Int64 upperLimit)
-        {
-            InitializeComponent();
-            this.Text = title;
-            this.lowerLimit = lowerLimit;
-            this.upperLimit = upperLimit;
-        }
-
-
-        /// <summary>
-        /// OK button handler that verifies validity of the entered value.
-        /// </summary>
-        private void okButton_Click(object sender, EventArgs e)
-        {
-            Int64 from;
-            Int64 to;
-            if (Int64.TryParse(fromTextBox.Text, out from) && from >= lowerLimit && from <= upperLimit &&
-                Int64.TryParse(toTextBox.Text, out to) && to >= lowerLimit && to <= upperLimit &&
-                to >= from && to < from + Int32.MaxValue)
-            {
-                From = from;
-                To = to;
-                DialogResult = DialogResult.OK;
-            }
-            else
-            {
-                string message = (lowerLimit != 0 || upperLimit != Int32.MaxValue)
-                               ? string.Format("Invalid boundaries ({0}..{1})", lowerLimit, upperLimit)
-                               : "Invalid boundaries";
-                MessageBox.Show(message);
-                DialogResult = DialogResult.None;   /// Prevent closing this window
-            }
-        }
-    }
-}

DataStreamInterfaceTest/GetIntegerNumberDlg.Designer.cs

@@ -1,90 +0,0 @@
-namespace DataStreamInterfaceTest
-{
-    partial class GetIntegerNumberDlg
-    {
-        /// <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.numberTextBox = new System.Windows.Forms.TextBox();
-            this.okButton = new System.Windows.Forms.Button();
-            this.cancelButton = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // numberTextBox
-            // 
-            this.numberTextBox.Location = new System.Drawing.Point(36, 16);
-            this.numberTextBox.Name = "numberTextBox";
-            this.numberTextBox.Size = new System.Drawing.Size(100, 20);
-            this.numberTextBox.TabIndex = 0;
-            // 
-            // okButton
-            // 
-            this.okButton.Location = new System.Drawing.Point(174, 7);
-            this.okButton.Name = "okButton";
-            this.okButton.Size = new System.Drawing.Size(75, 36);
-            this.okButton.TabIndex = 1;
-            this.okButton.Text = "OK";
-            this.okButton.UseVisualStyleBackColor = true;
-            this.okButton.Click += new System.EventHandler(this.okButton_Click);
-            // 
-            // cancelButton
-            // 
-            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.cancelButton.Location = new System.Drawing.Point(265, 7);
-            this.cancelButton.Name = "cancelButton";
-            this.cancelButton.Size = new System.Drawing.Size(75, 36);
-            this.cancelButton.TabIndex = 2;
-            this.cancelButton.Text = "Cancel";
-            this.cancelButton.UseVisualStyleBackColor = true;
-            // 
-            // GetIntegerNumberDlg
-            // 
-            this.AcceptButton = this.okButton;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.AutoSize = true;
-            this.CancelButton = this.cancelButton;
-            this.ClientSize = new System.Drawing.Size(363, 50);
-            this.ControlBox = false;
-            this.Controls.Add(this.cancelButton);
-            this.Controls.Add(this.okButton);
-            this.Controls.Add(this.numberTextBox);
-            this.Name = "GetIntegerNumberDlg";
-            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "Enter integer number please";
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TextBox numberTextBox;
-        private System.Windows.Forms.Button okButton;
-        private System.Windows.Forms.Button cancelButton;
-    }
-}

DataStreamInterfaceTest/GetIntegerNumberDlg.cs

@@ -1,83 +0,0 @@
-using System;
-using System.Windows.Forms;
-
-namespace DataStreamInterfaceTest
-{
-    public partial class GetIntegerNumberDlg : Form
-    {
-        /// <summary>
-        /// Integer number entered in this form
-        /// </summary>
-        public int Number;
-        
-        int lowerLimit;
-        int upperLimit;
-
-
-        /// <summary>
-        /// Default constructor
-        /// </summary>
-        public GetIntegerNumberDlg()
-            : this("Enter integer number please")
-        {
-        }
-
-        /// <summary>
-        /// Constructor with a custom window title.
-        /// </summary>
-        /// <param name="title">Window title</param>
-        public GetIntegerNumberDlg(string title)
-            : this(title, Int32.MinValue, Int32.MaxValue)
-        {
-        }
-
-        /// <summary>
-        /// Constructor with a custom window title, limits and non-empty initial value.
-        /// </summary>
-        /// <param name="title">Window title</param>
-        /// <param name="lowerLimit">Lower limit</param>
-        /// <param name="upperLimit">Upper limit</param>
-        /// <param name="initialValue">Initial value</param>
-        public GetIntegerNumberDlg(string title, int lowerLimit, int upperLimit, int initialValue)
-            : this(title, lowerLimit, upperLimit)
-        {
-            numberTextBox.Text = initialValue.ToString();
-        }
-
-        /// <summary>
-        /// Constructor with a custom window title and lower/upper limits.
-        /// </summary>
-        /// <param name="title">Window title</param>
-        /// <param name="lowerLimit">Lower limit</param>
-        /// <param name="upperLimit">Upper limit</param>
-        public GetIntegerNumberDlg(string title, int lowerLimit, int upperLimit)
-        {
-            InitializeComponent();
-            this.Text = title;
-            this.lowerLimit = lowerLimit;
-            this.upperLimit = upperLimit;
-        }
-
-
-        /// <summary>
-        /// OK button handler that verifies validity of the entered value.
-        /// </summary>
-        private void okButton_Click(object sender, EventArgs e)
-        {
-            int number;
-            if (int.TryParse(numberTextBox.Text, out number) && number >= lowerLimit && number <= upperLimit)
-            {
-                Number = number;
-                DialogResult = DialogResult.OK;
-            }
-            else
-            {
-                string message = (lowerLimit != Int32.MinValue || upperLimit != Int32.MaxValue)
-                               ? string.Format("Invalid integer number ({0}..{1})", lowerLimit, upperLimit)
-                               : "Invalid integer number";
-                MessageBox.Show(message);
-                DialogResult = DialogResult.None;   /// Prevent closing this window
-            }
-        }
-    }
-}

DataStreamInterfaceTest/GetStateDlg.Designer.cs

@@ -1,126 +0,0 @@
-namespace DataStreamInterfaceTest
-{
-    partial class GetStateDlg
-    {
-        /// <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.stateTextBox = new System.Windows.Forms.TextBox();
-            this.okButton = new System.Windows.Forms.Button();
-            this.cancelButton = new System.Windows.Forms.Button();
-            this.parameterTextBox = new System.Windows.Forms.TextBox();
-            this.stateLabel = new System.Windows.Forms.Label();
-            this.parameterLabel = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // stateTextBox
-            // 
-            this.stateTextBox.Location = new System.Drawing.Point(89, 16);
-            this.stateTextBox.Name = "stateTextBox";
-            this.stateTextBox.Size = new System.Drawing.Size(100, 20);
-            this.stateTextBox.TabIndex = 0;
-            // 
-            // okButton
-            // 
-            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.okButton.Location = new System.Drawing.Point(225, 24);
-            this.okButton.Name = "okButton";
-            this.okButton.Size = new System.Drawing.Size(75, 36);
-            this.okButton.TabIndex = 1;
-            this.okButton.Text = "OK";
-            this.okButton.UseVisualStyleBackColor = true;
-            this.okButton.Click += new System.EventHandler(this.okButton_Click);
-            // 
-            // cancelButton
-            // 
-            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.cancelButton.Location = new System.Drawing.Point(316, 24);
-            this.cancelButton.Name = "cancelButton";
-            this.cancelButton.Size = new System.Drawing.Size(75, 36);
-            this.cancelButton.TabIndex = 2;
-            this.cancelButton.Text = "Cancel";
-            this.cancelButton.UseVisualStyleBackColor = true;
-            // 
-            // parameterTextBox
-            // 
-            this.parameterTextBox.Location = new System.Drawing.Point(89, 46);
-            this.parameterTextBox.Name = "parameterTextBox";
-            this.parameterTextBox.Size = new System.Drawing.Size(100, 20);
-            this.parameterTextBox.TabIndex = 3;
-            // 
-            // stateLabel
-            // 
-            this.stateLabel.AutoSize = true;
-            this.stateLabel.Location = new System.Drawing.Point(12, 19);
-            this.stateLabel.Name = "stateLabel";
-            this.stateLabel.Size = new System.Drawing.Size(32, 13);
-            this.stateLabel.TabIndex = 4;
-            this.stateLabel.Text = "State";
-            // 
-            // parameterLabel
-            // 
-            this.parameterLabel.AutoSize = true;
-            this.parameterLabel.Location = new System.Drawing.Point(12, 49);
-            this.parameterLabel.Name = "parameterLabel";
-            this.parameterLabel.Size = new System.Drawing.Size(55, 13);
-            this.parameterLabel.TabIndex = 5;
-            this.parameterLabel.Text = "Parameter";
-            // 
-            // GetStateDlg
-            // 
-            this.AcceptButton = this.okButton;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.AutoSize = true;
-            this.CancelButton = this.cancelButton;
-            this.ClientSize = new System.Drawing.Size(419, 79);
-            this.ControlBox = false;
-            this.Controls.Add(this.parameterLabel);
-            this.Controls.Add(this.stateLabel);
-            this.Controls.Add(this.parameterTextBox);
-            this.Controls.Add(this.cancelButton);
-            this.Controls.Add(this.okButton);
-            this.Controls.Add(this.stateTextBox);
-            this.Name = "GetStateDlg";
-            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "Enter state please";
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TextBox stateTextBox;
-        private System.Windows.Forms.Button okButton;
-        private System.Windows.Forms.Button cancelButton;
-        private System.Windows.Forms.TextBox parameterTextBox;
-        private System.Windows.Forms.Label stateLabel;
-        private System.Windows.Forms.Label parameterLabel;
-    }
-}

DataStreamInterfaceTest/GetStateDlg.cs

@@ -1,85 +0,0 @@
-using System;
-using System.Windows.Forms;
-
-namespace DataStreamInterfaceTest
-{
-    public partial class GetStateDlg : Form
-    {
-        /// <summary>
-        /// Integer number entered in this form
-        /// </summary>
-        public int State;
-        public string Parameter;
-        
-        int lowerLimit;
-        int upperLimit;
-
-
-        /// <summary>
-        /// Default constructor
-        /// </summary>
-        public GetStateDlg()
-            : this("Enter state please")
-        {
-        }
-
-        /// <summary>
-        /// Constructor with a custom window title.
-        /// </summary>
-        /// <param name="title">Window title</param>
-        public GetStateDlg(string title)
-            : this(title, Int32.MinValue, Int32.MaxValue)
-        {
-        }
-
-        /// <summary>
-        /// Constructor with a custom window title, limits and non-empty initial value.
-        /// </summary>
-        /// <param name="title">Window title</param>
-        /// <param name="lowerLimit">Lower limit</param>
-        /// <param name="upperLimit">Upper limit</param>
-        /// <param name="initialValue">Initial value</param>
-        public GetStateDlg(string title, int lowerLimit, int upperLimit, int initialValue)
-            : this(title, lowerLimit, upperLimit)
-        {
-            stateTextBox.Text = initialValue.ToString();
-        }
-
-        /// <summary>
-        /// Constructor with a custom window title and lower/upper limits.
-        /// </summary>
-        /// <param name="title">Window title</param>
-        /// <param name="lowerLimit">Lower limit</param>
-        /// <param name="upperLimit">Upper limit</param>
-        public GetStateDlg(string title, int lowerLimit, int upperLimit)
-        {
-            InitializeComponent();
-            this.Text = title;
-            this.lowerLimit = lowerLimit;
-            this.upperLimit = upperLimit;
-        }
-
-
-        /// <summary>
-        /// OK button handler that verifies validity of the entered value.
-        /// </summary>
-        private void okButton_Click(object sender, EventArgs e)
-        {
-            int number;
-            if (int.TryParse(stateTextBox.Text, out number) && number >= lowerLimit && number <= upperLimit)
-            {
-                State = number;
-                Parameter = parameterTextBox.Text;
-                DialogResult = DialogResult.OK;
-            }
-            else
-            {
-                string message = (lowerLimit != Int32.MinValue || upperLimit != Int32.MaxValue)
-                               ? string.Format("Invalid state ({0}..{1})", lowerLimit, upperLimit)
-                               : "Invalid state";
-                MessageBox.Show(message);
-                DialogResult = DialogResult.None;   /// Prevent closing this window
-            }
-        }
-    }
-}

DataStreamInterfaceTest/LviIDComparer.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Collections;
-using System.Windows.Forms;
-
-namespace DataStreamInterfaceTest
-{
-    public class LviIDComparer : IComparer
-    {
-        int column;
-        SortOrder order;
-
-        public LviIDComparer()
-        {
-            column = 0;
-            order = SortOrder.Ascending;
-        }
-
-        public LviIDComparer(int column, SortOrder order)
-        {
-            this.column = column;
-            this.order = order;
-        }
-
-        public int Compare(object x, object y)
-        {
-            Int64 valX = Int64.Parse(((ListViewItem)x).SubItems[column].Text);
-            Int64 valY = Int64.Parse(((ListViewItem)y).SubItems[column].Text);
-
-            if (order == SortOrder.Ascending)
-            {
-                return valX > valY ? 1 : valX == valY ? 0 : -1;
-            }
-            else
-            {
-                return valX < valY ? 1 : valX == valY ? 0 : -1;
-            }
-        }
-    }
-}

DataStreamInterfaceTest/Program.cs

@@ -1,55 +0,0 @@
-using System;
-using System.IO;
-using System.ComponentModel.Composition;
-using System.ComponentModel.Composition.Hosting;
-using System.Windows.Forms;
-using DataStreamInterface;
-
-namespace DataStreamInterfaceTest
-{
-    class Program
-    {
-#if DEBUG
-        const string CatalogDir = "..\\..\\..\\DataStreamMeter\\bin\\Debug";
-#else
-        const string CatalogDir = "..\\..\\..\\DataStreamMeter\\bin\\Release";
-#endif
-
-        [Import(typeof(IDataStreamMeter))]
-        IDataStreamMeter dataStreamMeter;
-
-        private Program()
-        {
-            Console.WriteLine("Components found:");
-            foreach (var file in Directory.EnumerateFiles(CatalogDir))
-            {
-                Console.WriteLine(file);
-            }
-
-            try
-            {
-                var catalog = new AggregateCatalog();
-                catalog.Catalogs.Add(new AssemblyCatalog(typeof(DataStreamInterface.IDataStreamMeter).Assembly));
-                catalog.Catalogs.Add(new DirectoryCatalog(CatalogDir));
-                (new CompositionContainer(catalog)).ComposeParts(this);
-            }
-            catch (CompositionException compositionException)
-            {
-                Console.WriteLine(compositionException.ToString());
-            }
-        }
-
-        /// <summary>
-        /// The main entry point for the application.
-        /// </summary>
-        [STAThread]
-        static void Main()
-        {
-            Program p = new Program();
-
-            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new DemoMainWnd(p.dataStreamMeter));
-        }
-    }
-}

DataStreamInterfaceTest/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("DataStreamInterfaceTest")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("DataStreamInterfaceTest")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("429fdea9-ec3a-47d8-88b3-5df11de8b4c8")]
-
-// 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")]

DataStreamInterfaceTest/Properties/Resources.Designer.cs

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

DataStreamInterfaceTest/Properties/Resources.resx

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

DataStreamInterfaceTest/Properties/Settings.Designer.cs

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

DataStreamInterfaceTest/Properties/Settings.settings

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

DataStreamMeter/DataStreamMeter.csproj

@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{E6925701-57A6-4167-B5C4-BF670F1DE310}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DataStreamMeter</RootNamespace>
-    <AssemblyName>DataStreamMeter</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="GetDblValueDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GetDblValueDlg.Designer.cs">
-      <DependentUpon>GetDblValueDlg.cs</DependentUpon>
-    </Compile>
-    <Compile Include="MeterDataEventArgs.cs" />
-    <Compile Include="MeterSimulationDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MeterSimulationDlg.Designer.cs">
-      <DependentUpon>MeterSimulationDlg.cs</DependentUpon>
-    </Compile>
-    <Compile Include="MeterSimulation.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Sample.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\DataStreamInterface\DataStreamInterface.csproj">
-      <Project>{7ebeea14-91c4-48d7-af0a-7a4bc3ff9a28}</Project>
-      <Name>DataStreamInterface</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="GetDblValueDlg.resx">
-      <DependentUpon>GetDblValueDlg.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MeterSimulationDlg.resx">
-      <DependentUpon>MeterSimulationDlg.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

DataStreamMeter/GetDblValueDlg.Designer.cs

@@ -1,88 +0,0 @@
-namespace DataStreamMeter
-{
-    partial class GetDblValueDlg
-    {
-        /// <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.valueTextBox = new System.Windows.Forms.TextBox();
-            this.okButton = new System.Windows.Forms.Button();
-            this.cancelButton = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // valueTextBox
-            // 
-            this.valueTextBox.Location = new System.Drawing.Point(35, 20);
-            this.valueTextBox.Name = "valueTextBox";
-            this.valueTextBox.Size = new System.Drawing.Size(94, 20);
-            this.valueTextBox.TabIndex = 0;
-            // 
-            // okButton
-            // 
-            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.okButton.Location = new System.Drawing.Point(216, 16);
-            this.okButton.Name = "okButton";
-            this.okButton.Size = new System.Drawing.Size(75, 29);
-            this.okButton.TabIndex = 1;
-            this.okButton.Text = "OK";
-            this.okButton.UseVisualStyleBackColor = true;
-            this.okButton.Click += new System.EventHandler(this.okButton_Click);
-            // 
-            // cancelButton
-            // 
-            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.cancelButton.Location = new System.Drawing.Point(306, 16);
-            this.cancelButton.Name = "cancelButton";
-            this.cancelButton.Size = new System.Drawing.Size(75, 29);
-            this.cancelButton.TabIndex = 2;
-            this.cancelButton.Text = "Cancel";
-            this.cancelButton.UseVisualStyleBackColor = true;
-            // 
-            // GetFlowDlg
-            // 
-            this.AcceptButton = this.okButton;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.CancelButton = this.cancelButton;
-            this.ClientSize = new System.Drawing.Size(396, 58);
-            this.Controls.Add(this.cancelButton);
-            this.Controls.Add(this.okButton);
-            this.Controls.Add(this.valueTextBox);
-            this.Name = "GetFlowDlg";
-            this.Text = "Enter flow";
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TextBox valueTextBox;
-        private System.Windows.Forms.Button okButton;
-        private System.Windows.Forms.Button cancelButton;
-    }
-}

DataStreamMeter/GetDblValueDlg.cs

@@ -1,59 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows.Forms;
-
-namespace DataStreamMeter
-{
-    public partial class GetDblValueDlg : Form
-    {
-        public double DblValue;
-
-        double lowerLimit;
-        double upperLimit;
-
-
-        public GetDblValueDlg()
-            : this("Enter flow in [m3/h] please")
-        {
-        }
-
-        public GetDblValueDlg(string title)
-            : this(title, 0, 100.0)
-        {
-        }
-
-        public GetDblValueDlg(string title, double lowerLimit, double upperLimit)
-        {
-            InitializeComponent();
-            this.Text = title;
-            this.lowerLimit = lowerLimit;
-            this.upperLimit = upperLimit;
-        }
-
-
-        private void okButton_Click(object sender, EventArgs e)
-        {
-            double val;
-            if (TryParseUDouble(valueTextBox.Text, out val))
-            {
-                DblValue = val;
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            else
-            {
-                MessageBox.Show("Invalid value");
-                DialogResult = DialogResult.None;
-            }
-        }
-
-        /// <summary>
-        /// Parse an unsigned double number
-        /// </summary>
-        bool TryParseUDouble(string text, out double result)
-        {
-            return double.TryParse(text, NumberStyles.AllowDecimalPoint, CultureInfo.CurrentCulture, out result) ||
-                   double.TryParse(text, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out result);
-        }
-    }
-}

DataStreamMeter/MeterDataEventArgs.cs

@@ -1,20 +0,0 @@
-using System;
-
-namespace DataStreamMeter
-{
-    public class MeterDataEventArgs : EventArgs
-    {
-        public State State;
-        public double Time;
-        public double Volume;
-        public double Flow;
-
-        public MeterDataEventArgs(State state, double time, double volume, double flow)
-        {
-            State = state;
-            Time = time;
-            Volume = volume;
-            Flow = flow;
-        }
-    }
-}

DataStreamMeter/MeterSimulation.cs

@@ -1,351 +0,0 @@
-using System;
-using System.ComponentModel.Composition;
-using DataStreamInterface;
-
-namespace DataStreamMeter
-{
-    [Export(typeof(IDataStreamMeter))]
-    public class MeterSimulation : IDataStreamMeter
-    {
-        MeterSimulationDlg modelessDlg;
-
-        /// Water meter specification
-        public readonly string MeterID = "3141592653";
-        public const Unit TimeUnits = Unit.s;           /// Unit.s, Unit.ms, ...
-        public const Unit VolumeUnits = Unit.l;         /// Unit.l, Unit.USgal, ...
-        public const Unit FlowUnits = Unit.m3ph;        /// Unit.m3ph, Unit.USgalps, Unit.cfs, ...
-        public const double SamplingPeriodSec = 0.125;  /// Sampling period in seconds (here 125 ms, 8 Hz)
-        public readonly double SamplingPeriod;
-
-
-        public const Int64 MaxSamplesCount = 40000;    /// Maximal test time is SamplingPeriod * MaxSamplesCount
-        Sample[] samples = new Sample[MaxSamplesCount];
-        Int64 storedSamplesCount;
-
-
-        readonly object stateChangeAndTimerTickLock = new object();
-        public State State;
-        string connectionParameters;
-
-        /// initialTime is time when simulation started 
-        /// (lastSampleTime - initialTime).TotalSeconds is multiple of Sampling Period
-        DateTime initialTime;
-
-        /// Last user interface tick info
-        bool lastTickValid;
-        State lastTickState;
-
-        /// Values incrementally updated on each timer tick
-        double currentTime;
-        double currentVolume;
-        double currentFlow;
-        double currentFlow_m3ph;
-
-        DateTime startTimeStamp;        /// Measurement start DateTime
-        double startTime;               /// Measurement start time in seconds
-        DateTime stopTimeStamp;         /// Measurement end DateTime
-        double stopTime;                /// Measurement end time in seconds
-
-
-        public MeterSimulation()
-        {
-            modelessDlg = null;
-            State = State.Disconnected;
-            SamplingPeriod = DataStreamInterface.Units.ConvertTo(TimeUnits, SamplingPeriodSec);
-            lastTickValid = false;
-            initialTime = DateTime.Now.Date;    /// An arbitrary initial time (in this case the last midnight)
-        }
-
-        public Unit GetTimeUnits()
-        {
-            return TimeUnits;
-        }
-
-        public Unit GetVolumeUnits()
-        {
-            return VolumeUnits;
-        }
-
-        public int GetQuantitiesCount()
-        {
-            return 1;
-        }
-
-        public string GetQuantityCaption(int quantityNr)
-        {
-            if (quantityNr == 0) return "Flow";
-            return string.Empty;
-        }
-
-        public Unit GetQuantityUnits(int quantityNr)
-        {
-            if (quantityNr == 0) return FlowUnits;
-            return Unit.None;
-        }
-
-
-        public int GetMetersCount()
-        {
-            return 20;
-        }
-
-        public bool OpenConnection(int meterIx, string connectionParameters, out string meterID)
-        {
-            lock (stateChangeAndTimerTickLock)
-            {
-                if (State != State.Disconnected)
-                {
-                    /// Meter is already connected
-                    meterID = MeterID;
-                    return true;
-                }
-
-                /// Connect the meter
-                meterID = MeterID;
-                this.connectionParameters = connectionParameters;
-                lastTickValid = false;
-                State = State.Connected;
-            }
-
-            /// Open modeless form
-            modelessDlg = new MeterSimulationDlg(this, MeterID);
-            modelessDlg.Show();
-            return true;
-        }
-
-        public bool CloseConnection(int meterIx)
-        {
-            bool closeModelessDlg = false;
-
-            lock (stateChangeAndTimerTickLock)
-            {
-                if (State != State.Disconnected)
-                {
-                    State = State.Disconnected;
-                    storedSamplesCount = 0;
-                    closeModelessDlg = true;
-                }
-            }
-
-            if (closeModelessDlg)
-            {
-                if (modelessDlg != null) modelessDlg.Close();
-                modelessDlg = null;
-            }
-            return true;
-        }
-
-        public bool CloseConnectionAll()
-        {
-            return CloseConnection(0);
-        }
-
-        public bool Shutdown()
-        {
-            return true;
-        }
-
-        public bool GetState(int meterIx, out int state, out string parameter)
-        {
-            state = (int)this.State;
-            parameter = this.connectionParameters;
-            return true;
-        }
-
-        public bool SetState(int meterIx, int state, string parameter)
-        {
-            /// It's not allowed to change the satate in this demo
-            return false;
-        }
-
-        public bool SetStateAll(int state, string parameter)
-        {
-            return SetState(0, state, parameter);
-        }
-
-        public bool StartMeasurement(int meterIx = 0)
-        {
-            lock (stateChangeAndTimerTickLock)
-            {
-                if (State == State.Connected)
-                {
-                    startTimeStamp = DateTime.Now;
-                    startTime = TimeInSecondsFromDateTime(startTimeStamp, initialTime, SamplingPeriodSec);
-                    storedSamplesCount = 0;
-                    State = State.MeasurementInProgress;
-                    return true;
-                }
-                else
-                {
-                    return false;
-                }
-            }
-        }
-
-        public bool StartMeasurementAll()
-        {
-            return StartMeasurement(0);
-        }
-
-        public bool StopMeasurement(int meterIx, out Int64 storedFramesCount)
-        {
-            lock (stateChangeAndTimerTickLock)
-            {
-                if (State == State.MeasurementInProgress)
-                {
-                    stopTimeStamp = DateTime.Now;
-                    stopTime = TimeInSecondsFromDateTime(stopTimeStamp, initialTime, SamplingPeriodSec);
-
-                    int newSamplesCount = Convert.ToInt32(Math.Round((stopTime - currentTime) / SamplingPeriodSec));
-                    double time = Units.ConvertTo(TimeUnits, currentTime);
-                    double volume = currentVolume;
-                    double volumeIncrement = Units.ConvertTo(VolumeUnits, currentFlow_m3ph * (SamplingPeriodSec / 3.6));
-                    for (int i = 0; i < newSamplesCount; i++)
-                    {
-                        time += SamplingPeriod;
-                        volume += volumeIncrement;
-                        if (storedSamplesCount < MaxSamplesCount)
-                        {
-                            samples[storedSamplesCount++] = new Sample(time, volume, currentFlow);
-                        }
-                    }
-
-                    State = State.Connected;
-                    storedFramesCount = storedSamplesCount;
-                    return true;
-                }
-                else
-                {
-                    storedFramesCount = 0;
-                    return false;
-                }
-            }
-        }
-
-        public bool StopMeasurementAll(out Int64[] storedFramesCount)
-        {
-            storedFramesCount = new Int64[1];
-            return StopMeasurement(0, out storedFramesCount[0]);
-        }
-
-        public void TimerTick(double flow_m3ph)
-        {
-            lock (stateChangeAndTimerTickLock)
-            {
-                double lastSampleTime = TimeInSecondsFromDateTime(DateTime.Now, initialTime, SamplingPeriodSec);
-                currentFlow_m3ph = flow_m3ph;
-                currentFlow = Units.ConvertTo(FlowUnits, flow_m3ph);
-
-                if (!lastTickValid)
-                {
-                    currentTime = lastSampleTime;
-                    currentVolume = 0;
-                    lastTickValid = true;
-                    lastTickState = State;
-                    return;
-                }
-                else
-                {
-                    int newSamplesCount = Convert.ToInt32(Math.Round((lastSampleTime - currentTime) / SamplingPeriodSec));
-                    double volumeIncrement = Units.ConvertTo(VolumeUnits, currentFlow_m3ph * (SamplingPeriodSec / 3.6));
-                    for (int i = 0; i < newSamplesCount; i++)
-                    {
-                        currentTime += SamplingPeriodSec;
-                        currentVolume += volumeIncrement;
-
-                        if (State == State.MeasurementInProgress && currentTime > startTime && storedSamplesCount < MaxSamplesCount)
-                        {
-                            samples[storedSamplesCount++] = new Sample(Units.ConvertTo(TimeUnits, currentTime), currentVolume, currentFlow);
-                        }
-                    }
-                    currentTime = lastSampleTime;   /// Rectify, prevent error propagation
-                    lastTickState = State;
-                }
-            }
-
-            modelessDlg.OnMeterdata(new MeterDataEventArgs(State, currentTime, currentVolume, currentFlow));
-        }
-
-        
-        /// <summary>
-        /// Obtain the last time instance before 'DateTime time' which is multiple of samplingPeriod-s after 'DateTime initialTime'.
-        /// </summary>
-        /// <param name="time">Time to be converted to seconds and rounded to samplingPeriod-s</param>
-        /// <param name="startTime">Initial time</param>
-        /// <param name="samplePeriod">Sampling period in seconds</param>
-        /// <returns></returns>
-        double TimeInSecondsFromDateTime(DateTime time, DateTime initialTime, double samplingPeriod)
-        {
-            TimeSpan span = time - initialTime;
-            return samplingPeriod * Math.Floor(span.TotalSeconds / samplingPeriod);
-        }
-
-
-        ///---------------------------
-        /// Datastream data exchange
-        ///---------------------------
-
-        /// <summary>
-        /// Retuns 'count' data frames starting with data frame with ID = 'id' 
-        /// </summary>
-        /// <param name="id">First frame ID</param>
-        /// <param name="count">Frames count</param>
-        /// <returns>Selected data frames</returns>
-        public DataFrame[] GetFrames(int meterIx, Int64 startID, int count)
-        {
-            DataFrame[] frames = new DataFrame[count];
-
-            if (State != State.MeasurementInProgress)
-            {
-                for (int j = 0; j < count; j++)
-                {
-                    Int64 id = startID + j;
-                    if (id < storedSamplesCount)
-                    {
-                        frames[j] = new DataFrame(id, samples[id].Time, samples[id].Volume, new double[1] { samples[id].Flow });
-                    }
-                }
-            }
-
-            return frames;
-        }
-
-        /// <summary>
-        /// Returns ID of the data frame where time equals or exceeds the specified time.
-        /// When time of the first frame (ID=0) is larger then specified time, function returns 0.
-        /// </summary>
-        /// <param name="time">Time</param>
-        /// <returns>ID of the data frame at or after the pecified time</returns>
-        public Int64 GetID(int meterIx, double time)
-        {
-            if (storedSamplesCount == 0) return -1;
-
-            Int64 lo = 0;
-            Int64 hi = storedSamplesCount - 1;
-
-            if (samples[hi].Time < time) return -1;
-
-            while (lo < hi)
-            {
-                Int64 mid = (lo + hi) / 2;
-                if (samples[mid].Time < time)
-                {
-                    lo = mid + 1;
-                }
-                else
-                {
-                    hi = mid;
-                }
-            }
-
-            return lo;
-        }
-    }
-
-    public enum State
-    {
-        Disconnected = 0,
-        Connected = 1,
-        MeasurementInProgress = 2,
-    }
-}

DataStreamMeter/MeterSimulationDlg.Designer.cs

@@ -1,323 +0,0 @@
-namespace DataStreamMeter
-{
-    partial class MeterSimulationDlg
-    {
-        /// <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.components = new System.ComponentModel.Container();
-            this.meterIDGroupBox = new System.Windows.Forms.GroupBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.volumeUnitsTextBox = new System.Windows.Forms.TextBox();
-            this.timeUnitsTextBox = new System.Windows.Forms.TextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.meterIDTextBox = new System.Windows.Forms.TextBox();
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.setFlowButton = new System.Windows.Forms.Button();
-            this.flowm3phTextBox = new System.Windows.Forms.TextBox();
-            this.flowTrackBar = new System.Windows.Forms.TrackBar();
-            this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.flowTextBox = new System.Windows.Forms.TextBox();
-            this.volumeTextBox = new System.Windows.Forms.TextBox();
-            this.timeTextBox = new System.Windows.Forms.TextBox();
-            this.stateTextBox = new System.Windows.Forms.TextBox();
-            this.label8 = new System.Windows.Forms.Label();
-            this.label7 = new System.Windows.Forms.Label();
-            this.label6 = new System.Windows.Forms.Label();
-            this.label5 = new System.Windows.Forms.Label();
-            this.lastUITickTextBox = new System.Windows.Forms.TextBox();
-            this.label4 = new System.Windows.Forms.Label();
-            this.timer1 = new System.Windows.Forms.Timer(this.components);
-            this.meterIDGroupBox.SuspendLayout();
-            this.groupBox1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.flowTrackBar)).BeginInit();
-            this.groupBox2.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // meterIDGroupBox
-            // 
-            this.meterIDGroupBox.Controls.Add(this.label3);
-            this.meterIDGroupBox.Controls.Add(this.label2);
-            this.meterIDGroupBox.Controls.Add(this.volumeUnitsTextBox);
-            this.meterIDGroupBox.Controls.Add(this.timeUnitsTextBox);
-            this.meterIDGroupBox.Controls.Add(this.label1);
-            this.meterIDGroupBox.Controls.Add(this.meterIDTextBox);
-            this.meterIDGroupBox.Location = new System.Drawing.Point(12, 12);
-            this.meterIDGroupBox.Name = "meterIDGroupBox";
-            this.meterIDGroupBox.Size = new System.Drawing.Size(453, 105);
-            this.meterIDGroupBox.TabIndex = 0;
-            this.meterIDGroupBox.TabStop = false;
-            this.meterIDGroupBox.Text = "Water meter info";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(18, 76);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(67, 13);
-            this.label3.TabIndex = 5;
-            this.label3.Text = "Volume units";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(18, 50);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(55, 13);
-            this.label2.TabIndex = 4;
-            this.label2.Text = "Time units";
-            // 
-            // volumeUnitsTextBox
-            // 
-            this.volumeUnitsTextBox.Enabled = false;
-            this.volumeUnitsTextBox.Location = new System.Drawing.Point(122, 73);
-            this.volumeUnitsTextBox.Name = "volumeUnitsTextBox";
-            this.volumeUnitsTextBox.Size = new System.Drawing.Size(52, 20);
-            this.volumeUnitsTextBox.TabIndex = 3;
-            // 
-            // timeUnitsTextBox
-            // 
-            this.timeUnitsTextBox.Enabled = false;
-            this.timeUnitsTextBox.Location = new System.Drawing.Point(122, 47);
-            this.timeUnitsTextBox.Name = "timeUnitsTextBox";
-            this.timeUnitsTextBox.Size = new System.Drawing.Size(52, 20);
-            this.timeUnitsTextBox.TabIndex = 2;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(18, 24);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(73, 13);
-            this.label1.TabIndex = 1;
-            this.label1.Text = "Meter ID (s/n)";
-            // 
-            // meterIDTextBox
-            // 
-            this.meterIDTextBox.Enabled = false;
-            this.meterIDTextBox.Location = new System.Drawing.Point(122, 21);
-            this.meterIDTextBox.Name = "meterIDTextBox";
-            this.meterIDTextBox.Size = new System.Drawing.Size(145, 20);
-            this.meterIDTextBox.TabIndex = 0;
-            // 
-            // groupBox1
-            // 
-            this.groupBox1.Controls.Add(this.setFlowButton);
-            this.groupBox1.Controls.Add(this.flowm3phTextBox);
-            this.groupBox1.Controls.Add(this.flowTrackBar);
-            this.groupBox1.Location = new System.Drawing.Point(12, 123);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(453, 96);
-            this.groupBox1.TabIndex = 1;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "Flow";
-            // 
-            // setFlowButton
-            // 
-            this.setFlowButton.Location = new System.Drawing.Point(289, 17);
-            this.setFlowButton.Name = "setFlowButton";
-            this.setFlowButton.Size = new System.Drawing.Size(75, 23);
-            this.setFlowButton.TabIndex = 4;
-            this.setFlowButton.Text = "Set value";
-            this.setFlowButton.UseVisualStyleBackColor = true;
-            this.setFlowButton.Click += new System.EventHandler(this.setFlowButton_Click);
-            // 
-            // flowm3phTextBox
-            // 
-            this.flowm3phTextBox.Enabled = false;
-            this.flowm3phTextBox.Location = new System.Drawing.Point(122, 19);
-            this.flowm3phTextBox.Name = "flowm3phTextBox";
-            this.flowm3phTextBox.Size = new System.Drawing.Size(145, 20);
-            this.flowm3phTextBox.TabIndex = 3;
-            // 
-            // flowTrackBar
-            // 
-            this.flowTrackBar.LargeChange = 1;
-            this.flowTrackBar.Location = new System.Drawing.Point(0, 43);
-            this.flowTrackBar.Maximum = 25;
-            this.flowTrackBar.Name = "flowTrackBar";
-            this.flowTrackBar.Size = new System.Drawing.Size(447, 45);
-            this.flowTrackBar.TabIndex = 2;
-            this.flowTrackBar.Scroll += new System.EventHandler(this.flowTrackBar_Scroll);
-            // 
-            // groupBox2
-            // 
-            this.groupBox2.Controls.Add(this.flowTextBox);
-            this.groupBox2.Controls.Add(this.volumeTextBox);
-            this.groupBox2.Controls.Add(this.timeTextBox);
-            this.groupBox2.Controls.Add(this.stateTextBox);
-            this.groupBox2.Controls.Add(this.label8);
-            this.groupBox2.Controls.Add(this.label7);
-            this.groupBox2.Controls.Add(this.label6);
-            this.groupBox2.Controls.Add(this.label5);
-            this.groupBox2.Controls.Add(this.lastUITickTextBox);
-            this.groupBox2.Controls.Add(this.label4);
-            this.groupBox2.Location = new System.Drawing.Point(12, 225);
-            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(453, 150);
-            this.groupBox2.TabIndex = 2;
-            this.groupBox2.TabStop = false;
-            this.groupBox2.Text = "State";
-            // 
-            // flowTextBox
-            // 
-            this.flowTextBox.Enabled = false;
-            this.flowTextBox.Location = new System.Drawing.Point(122, 121);
-            this.flowTextBox.Name = "flowTextBox";
-            this.flowTextBox.Size = new System.Drawing.Size(99, 20);
-            this.flowTextBox.TabIndex = 9;
-            // 
-            // volumeTextBox
-            // 
-            this.volumeTextBox.Enabled = false;
-            this.volumeTextBox.Location = new System.Drawing.Point(122, 95);
-            this.volumeTextBox.Name = "volumeTextBox";
-            this.volumeTextBox.Size = new System.Drawing.Size(99, 20);
-            this.volumeTextBox.TabIndex = 8;
-            // 
-            // timeTextBox
-            // 
-            this.timeTextBox.Enabled = false;
-            this.timeTextBox.Location = new System.Drawing.Point(122, 68);
-            this.timeTextBox.Name = "timeTextBox";
-            this.timeTextBox.Size = new System.Drawing.Size(99, 20);
-            this.timeTextBox.TabIndex = 7;
-            // 
-            // stateTextBox
-            // 
-            this.stateTextBox.Enabled = false;
-            this.stateTextBox.Location = new System.Drawing.Point(122, 42);
-            this.stateTextBox.Name = "stateTextBox";
-            this.stateTextBox.Size = new System.Drawing.Size(99, 20);
-            this.stateTextBox.TabIndex = 6;
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(18, 124);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(29, 13);
-            this.label8.TabIndex = 5;
-            this.label8.Text = "Flow";
-            // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(18, 98);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(42, 13);
-            this.label7.TabIndex = 4;
-            this.label7.Text = "Volume";
-            // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(18, 71);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(30, 13);
-            this.label6.TabIndex = 3;
-            this.label6.Text = "Time";
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(18, 45);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(32, 13);
-            this.label5.TabIndex = 2;
-            this.label5.Text = "State";
-            // 
-            // lastUITickTextBox
-            // 
-            this.lastUITickTextBox.Enabled = false;
-            this.lastUITickTextBox.Location = new System.Drawing.Point(122, 13);
-            this.lastUITickTextBox.Name = "lastUITickTextBox";
-            this.lastUITickTextBox.Size = new System.Drawing.Size(145, 20);
-            this.lastUITickTextBox.TabIndex = 1;
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(18, 16);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(61, 13);
-            this.label4.TabIndex = 0;
-            this.label4.Text = "Last UI tick";
-            // 
-            // timer1
-            // 
-            this.timer1.Interval = 1000;
-            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
-            // 
-            // MeterSimulationDlg
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(477, 387);
-            this.Controls.Add(this.groupBox2);
-            this.Controls.Add(this.groupBox1);
-            this.Controls.Add(this.meterIDGroupBox);
-            this.Name = "MeterSimulationDlg";
-            this.Text = "MeterDialog";
-            this.meterIDGroupBox.ResumeLayout(false);
-            this.meterIDGroupBox.PerformLayout();
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.flowTrackBar)).EndInit();
-            this.groupBox2.ResumeLayout(false);
-            this.groupBox2.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.GroupBox meterIDGroupBox;
-        private System.Windows.Forms.TextBox meterIDTextBox;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.TextBox volumeUnitsTextBox;
-        private System.Windows.Forms.TextBox timeUnitsTextBox;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.GroupBox groupBox1;
-        private System.Windows.Forms.TextBox flowm3phTextBox;
-        private System.Windows.Forms.TrackBar flowTrackBar;
-        private System.Windows.Forms.GroupBox groupBox2;
-        private System.Windows.Forms.Button setFlowButton;
-        private System.Windows.Forms.Timer timer1;
-        private System.Windows.Forms.TextBox lastUITickTextBox;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.TextBox flowTextBox;
-        private System.Windows.Forms.TextBox volumeTextBox;
-        private System.Windows.Forms.TextBox timeTextBox;
-        private System.Windows.Forms.TextBox stateTextBox;
-        private System.Windows.Forms.Label label8;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.Label label5;
-    }
-}

DataStreamMeter/MeterSimulationDlg.cs

@@ -1,91 +0,0 @@
-using System;
-using System.Windows.Forms;
-
-namespace DataStreamMeter
-{
-    public partial class MeterSimulationDlg : Form
-    {
-        MeterSimulation meterSimulation;
-        double currentFlow;
-
-
-        public string MeterID;
-
-
-        public void OnMeterdata(MeterDataEventArgs args)
-        {
-            if (MeterDataHandler == null) return;
-            MeterDataHandler(null, args);
-        }
-        public event EventHandler<MeterDataEventArgs> MeterDataHandler;
-
-
-        /// <summary>
-        /// Default constructor with no meter
-        /// </summary>
-        public MeterSimulationDlg()
-            : this(null, string.Empty)
-        {
-        }
-
-        public MeterSimulationDlg(MeterSimulation meterSimulation, string meterID)
-        {
-            InitializeComponent();
-            this.meterSimulation = meterSimulation;
-            meterIDTextBox.Text = meterID;
-
-            currentFlow = 0;
-            flowm3phTextBox.Text = currentFlow.ToString();
-            flowTrackBar.Value = Convert.ToInt32(currentFlow);
-
-            MeterDataHandler += delegate(object sender, MeterDataEventArgs args)
-            {
-                if (InvokeRequired)
-                {
-                    Invoke(new EventHandler<MeterDataEventArgs>(DisplayMeterData), sender, args);
-                }
-                else
-                {
-                    DisplayMeterData(sender, args);
-                }
-            };
-
-            if (meterSimulation != null)
-            {
-                timer1.Enabled = true;
-                timer1.Start();
-            }
-        }
-
-        private void flowTrackBar_Scroll(object sender, EventArgs e)
-        {
-            currentFlow = flowTrackBar.Value;
-            flowm3phTextBox.Text = currentFlow.ToString("F2");
-        }
-
-        private void setFlowButton_Click(object sender, EventArgs e)
-        {
-            GetDblValueDlg dlg = new GetDblValueDlg("Enter flow in [m3/h] please", 0, 25.0);
-            if (dlg.ShowDialog() == DialogResult.OK)
-            {
-                currentFlow = dlg.DblValue;
-                flowm3phTextBox.Text = currentFlow.ToString();
-                flowTrackBar.Value = Convert.ToInt32(currentFlow);
-            }
-        }
-
-        private void timer1_Tick(object sender, EventArgs e)
-        {
-            lastUITickTextBox.Text = DateTime.Now.ToString("HH:mm:ss fff");
-            meterSimulation.TimerTick(currentFlow);
-        }
-
-        void DisplayMeterData(object sender, MeterDataEventArgs args)
-        {
-            stateTextBox.Text = args.State.ToString();
-            timeTextBox.Text = args.Time.ToString();
-            volumeTextBox.Text = args.Volume.ToString();
-            flowTextBox.Text = args.Flow.ToString();
-        }
-    }
-}

DataStreamMeter/MeterSimulationDlg.resx

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

DataStreamMeter/Sample.cs

@@ -1,23 +0,0 @@
-using System;
-
-namespace DataStreamMeter
-{
-    public class Sample
-    {
-        public readonly double Time;        /// In water meter time units
-        public readonly double Volume;      /// In water meter colume units
-        public readonly double Flow;        /// In water meter flow units
-
-        public Sample(double time, double volume, double flow)
-        {
-            Time = time;
-            Volume = volume;
-            Flow = flow;
-        }
-
-        public override string ToString()
-        {
-            return string.Format("time={0} volume={1} flow={2}", Time, Volume, Flow);
-        }
-    }
-}

Decrypt/Decrypt.csproj

@@ -16,7 +16,7 @@
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -27,7 +27,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>

DeviceTest/DeviceTest.csproj

@@ -16,7 +16,7 @@
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -27,7 +27,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
@@ -98,6 +98,10 @@
       <Project>{743DF7DB-C7B6-42EB-986D-0F485E5588E4}</Project>
       <Name>Config</Name>
     </ProjectReference>
+    <ProjectReference Include="..\SchematicDrawing\SchematicDrawing.csproj">
+      <Project>{0f79ca69-9dbc-41f3-a6fc-5a2937365343}</Project>
+      <Name>SchematicDrawing</Name>
+    </ProjectReference>
     <ProjectReference Include="..\TBF\TBF.csproj">
       <Project>{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}</Project>
       <Name>TBF</Name>

DeviceTest/DeviceTestDlg.cs

@@ -2,9 +2,10 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Text;
 using System.Threading;
-using System.Xml.Serialization;
 using System.Windows.Forms;
+using System.Xml.Serialization;
 using Common;
 using TBF.Rig;
 using TBF.Rig.Generic;
@@ -384,7 +385,7 @@ namespace DeviceTest
 		/// <returns>true when factory changed</returns>
 		bool FactoryFromClassName(string className, ref IComponentFactory factory)
 		{
-            foreach (var fac in TbfComponents.Factories)
+			foreach (var fac in TbfComponents.Factories)
 			{
 				if (className == fac.ClassName)
 				{
@@ -422,7 +423,7 @@ namespace DeviceTest
 			{
 				parentCfg = parentFactory.DefaultConfig();
 			}
-            ComponentParametersDlg cfgForm = new ComponentParametersDlg(this);
+            ComponentParametersDlg cfgForm = new ComponentParametersDlg();
             cfgForm.CmpntEntities = new List<Config.Entities.Component>();
 
             IComponentCfgCtrl cfgControl = parentCfg.GetControl(cfgForm.CmpntEntities);
@@ -451,7 +452,7 @@ namespace DeviceTest
 			{
 				component1Cfg = component1Factory.DefaultConfig();
 			}
-			ComponentParametersDlg cfgForm = new ComponentParametersDlg(this);
+			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
 			///
 			var compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
@@ -485,7 +486,7 @@ namespace DeviceTest
 			{
 				component2Cfg = component2Factory.DefaultConfig();
 			}
-			ComponentParametersDlg cfgForm = new ComponentParametersDlg(this);
+			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
 			///
 			var compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
@@ -520,7 +521,7 @@ namespace DeviceTest
 			{
 				component3Cfg = component3Factory.DefaultConfig();
 			}
-			ComponentParametersDlg cfgForm = new ComponentParametersDlg(this);
+			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
 			///
 			var compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
@@ -647,7 +648,7 @@ namespace DeviceTest
 
 				foreach (var dev in tbfDevices) dev.StopDevice();
                 foreach (var dev in tbfDevices) dev.StopDevice2();
-                tbfDevices.Clear();
+				tbfDevices.Clear();
 
 				startButton.Enabled = true;
 				stopButton.Enabled = false;
@@ -664,9 +665,9 @@ namespace DeviceTest
 			int previousOperation = 0;
 
 
-			if (tbfComponent1forOp is TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter)
+            if (tbfComponent1forOp is TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter)
 			{
-				operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
+                operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref dblBox1);
 			}
 			else if (tbfComponent1forOp is TBF.Rig.Network.Camera.CLP1611.Camera)
 			{
@@ -677,10 +678,10 @@ namespace DeviceTest
 			{
 				operation1 = (tbfComponent1forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent1forOp is TBF.Rig.Modbus.TempControl.Easytherm.Easytherm)
+			else if (tbfComponent1forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
 			{
-				operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.TempControl.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.TempControl.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
             else if (tbfComponent1forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
@@ -703,9 +704,9 @@ namespace DeviceTest
             }
 
 
-			if (tbfComponent2forOp is TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter)
+            if (tbfComponent2forOp is TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter)
 			{
-				operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
+                operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref dblBox2);
 			}
 			else if (tbfComponent2forOp is TBF.Rig.Network.Camera.CLP1611.Camera)
 			{
@@ -716,10 +717,10 @@ namespace DeviceTest
 			{
 				operation21 = (tbfComponent2forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent2forOp is TBF.Rig.Modbus.TempControl.Easytherm.Easytherm)
+			else if (tbfComponent2forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
 			{
-				operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.TempControl.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.TempControl.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
             else if (tbfComponent2forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
@@ -742,9 +743,9 @@ namespace DeviceTest
             }
 
 
-			if (tbfComponent3forOp is TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter)
+            if (tbfComponent3forOp is TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter)
 			{
-				operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
+                operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref dblBox3);
 			}
 			else if (tbfComponent3forOp is TBF.Rig.Network.Camera.CLP1611.Camera)
 			{
@@ -755,10 +756,10 @@ namespace DeviceTest
 			{
 				operation31 = (tbfComponent3forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent3forOp is TBF.Rig.Modbus.TempControl.Easytherm.Easytherm)
+			else if (tbfComponent3forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
 			{
-				operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.TempControl.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.TempControl.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
             else if (tbfComponent3forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
@@ -859,7 +860,7 @@ namespace DeviceTest
 
 			foreach (var d in tbfDevices) d.StopDevice();
             foreach (var d in tbfDevices) d.StopDevice2();
-        }
+		}
 
 		private void stopButton_Click(object sender, EventArgs e)
 		{

Dirichlet.Numerics/UInt128.cs

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

Encrypt/Encrypt.csproj

@@ -16,7 +16,7 @@
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -27,7 +27,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>

EventViewer/EViewerDB.cs

@@ -1,143 +0,0 @@
-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 NHibernate.Tool.hbm2ddl;
-using Common;
-using Events;
-
-namespace EventViewer
-{
-    public static class EViewerDB
-    {
-        /// <summary> Session factory for all regular sessions, not for CreateEmptyResultsDB(). </summary>
-        public static ISessionFactory SessionFactory;
-
-        /// <summary> Connection string for all sessions </summary>
-        static string connectionString;
-        /// 
-        public static string ConnectionString
-        {
-            get { return connectionString; }
-            set
-            {
-                if (value != connectionString)
-                {
-                    connectionString = value;
-                    SessionFactory = null;          /// Clear SessionFactory on connection string change
-                }
-            }
-        }
-
-        /// <summary> Database type (MySQL or SQLite) for all sessions </summary>
-        private static DBType dbType;
-        /// 
-        public static DBType DbType
-        {
-            get { return dbType; }
-            set { dbType = value; SessionFactory = null; }
-        }
-
-        /// <summary>
-        /// NHibernate session factory (to create the database session 'SessionFactory')
-        /// </summary>
-        /// <returns>A database session</returns>
-        static ISessionFactory CreateSessionFactory()
-        {
-            return CreateSessionFactory(false);
-        }
-
-        /// <summary>
-        /// NHibernate session factory (to create the database session 'SessionFactory')
-        /// </summary>
-        /// <param name="createDB">true = Create a new DB, false = Regular DB</param>
-        /// <returns>A database session</returns>
-        public static ISessionFactory CreateSessionFactory(bool createDB)
-        {
-            FluentConfiguration cfg = Fluently.Configure();
-
-            switch (dbType)
-            {
-                default:
-                case 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<global::Events.Entities.Event>());
-
-            if (createDB)
-            {
-                return cfg.ExposeConfiguration(BuildSchemaCreate)
-                          .BuildConfiguration()
-                          .SetProperty("hibernate.connection.connect_timeout", Const.MySqlConnectTimeoutSec)
-                          .BuildSessionFactory();
-            }
-            else
-            {
-                return cfg.ExposeConfiguration(BuildSchema)
-                          .BuildConfiguration()
-                          .SetProperty("hibernate.connection.connect_timeout", Const.MySqlConnectTimeoutSec)
-                          .BuildSessionFactory();
-            }
-        }
-
-        static void BuildSchema(Configuration config)
-        {
-            /// This NHibernate tool takes a configuration with mapping info and exports a database schema
-            new SchemaExport(config).SetOutputFile("db_schema");
-        }
-
-        static void BuildSchemaCreate(Configuration config)
-        {
-            /// This NHibernate tool takes a configuration with mapping info and exports a database schema
-            new SchemaExport(config).Create(true, true);
-        }
-
-        /// Create a NHibernate session for the given database
-        public static ISession CreateSession()
-        {
-            if (string.IsNullOrEmpty(connectionString))
-            {
-                throw new Exception("Connection string was not specified");
-            }
-
-            if (SessionFactory == null) SessionFactory = CreateSessionFactory();
-
-            return SessionFactory.OpenSession();
-        }
-
-
-        /// <summary>
-        /// Create an empty users database.
-        /// Database contains only the user 'admin' and the control board component 'CB'.
-        /// </summary>
-        /// <param name="dbType">DBType.SQLite or DBType.MySql</param>
-        /// <param name="connectionString">Connection string</param>
-        /// <returns>true=success, false=error</returns>
-        public static bool CreateEmptyDB()
-        {
-            ISessionFactory sessionFactory = CreateSessionFactory(true);
-            if (sessionFactory == null) return false;
-
-            /// Populate the database
-            using (var session = sessionFactory.OpenSession())
-            {
-                using (var transaction = session.BeginTransaction())
-                {
-                    transaction.Commit();
-                }
-            }
-
-            return true;
-        }
-    }
-}

EventViewer/EventViewer.csproj

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

EventViewer/EventViewerWnd.Designer.cs

@@ -35,7 +35,7 @@
             this.unreadEventsRadioButton = new System.Windows.Forms.RadioButton();
             this.allEventsRadioButton = new System.Windows.Forms.RadioButton();
             this.settingsButton = new System.Windows.Forms.Button();
-            this.eventsListView = new Common.Forms.ListViewEx();
+            this.eventsListView = new Common.UIControls.ListViewEx();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
             this.splitContainer1.Panel2.SuspendLayout();
@@ -138,7 +138,6 @@
             // eventsListView
             // 
             this.eventsListView.AllowColumnReorder = true;
-            this.eventsListView.CheckBoxes = true;
             this.eventsListView.Dock = System.Windows.Forms.DockStyle.Fill;
             this.eventsListView.DoubleClickActivation = false;
             this.eventsListView.FullRowSelect = true;
@@ -176,7 +175,7 @@
 
         private System.Windows.Forms.SplitContainer splitContainer1;
         private System.Windows.Forms.Button settingsButton;
-        private Common.Forms.ListViewEx eventsListView;
+        private Common.UIControls.ListViewEx eventsListView;
         private System.Windows.Forms.GroupBox eventsSelectionGroupBox;
         private System.Windows.Forms.RadioButton unreadEventsRadioButton;
         private System.Windows.Forms.RadioButton allEventsRadioButton;

EventViewer/EventViewerWnd.cs

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

EventViewer/Forms/EventDetailsDlg.cs

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