Version increment to 3.9.2146.4

# Conflicts:
#	TBF/Rig/Sequences/ProcessData.cs
#	TBF/Rig/TestMethods/PMaxTest/PMaxTestSeq.cs

.gitignore

@@ -16,8 +16,6 @@ Encrypt/bin/
 Encrypt/obj/
 EventViewer/bin/
 EventViewer/obj/
-Events/bin/
-Events/obj/
 FeatureVectorCalculator/bin/
 FeatureVectorCalculator/obj/
 GemCard/bin/
@@ -28,6 +26,8 @@ GenericTest/bin/
 GenericTest/obj/
 GraphLib/bin/
 GraphLib/obj/
+LabelPrinting/bin/
+LabelPrinting/obj/
 MergeResultsDBs/bin/
 MergeResultsDBs/obj/
 OrderManagement/bin/
@@ -46,6 +46,8 @@ ResultsBrowser/bin/
 ResultsBrowser/obj/
 ResultsParser/bin/
 ResultsParser/obj/
+S640TestApp/bin/
+S640TestApp/obj/
 SharedDatabase/bin
 SharedDatabase/obj
 SchematicDrawing/bin
@@ -58,14 +60,23 @@ ToFirstMonitor/bin/
 ToFirstMonitor/obj/
 ToSecondMonitor/bin/
 ToSecondMonitor/obj/
-Users/bin/
-Users/obj/
 UserManagement/bin/
 UserManagement/obj/
 WorkflowConfigurator/bin/
 WorkflowConfigurator/obj/
 Workplace/bin/
 Workplace/obj/
+DataStreamInterfaceTest/bin/
+DataStreamInterfaceTest/obj/
+DataStreamMeter/bin/
+DataStreamMeter/obj/
+Events/bin/
+Events/obj/
+TracingDB/bin/
+TracingDB/obj/
+Users/bin/
+Users/obj/
 .vs/
+.idea/
 *.suo
 *.bak

AppDiagnostic/App.config

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    </startup>
+	<log4net>
+		<appender name="LogCacheAppender" type="Namespace.LogCacheAppender, AssemblyName">
+			<param name="Cache" value="YourCacheInstance" />
+			<layout type="log4net.Layout.PatternLayout">
+				<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n" />
+			</layout>
+		</appender>
+
+		<root>
+			<level value="DEBUG" />
+			<appender-ref ref="LogCacheAppender" />
+		</root>
+	</log4net>
+</configuration>

AppDiagnostic/AppDiagnostic.csproj

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" 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>{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>AppDiagnostic</RootNamespace>
+    <AssemblyName>AppDiagnostic</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+  </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="log4net, Version=3.0.3.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.3.0.3\lib\net462\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Web" />
+    <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.Net.Http" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BufferedListView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="DiagApi.cs" />
+    <Compile Include="LogAdapter.cs" />
+    <Compile Include="LogFilter.cs" />
+    <Compile Include="MainForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MainForm.Designer.cs">
+      <DependentUpon>MainForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="MainForm.resx">
+      <DependentUpon>MainForm.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="packages.config" />
+    <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="..\SharedComponents\SharedComponents.csproj">
+      <Project>{8f942729-f454-4c99-ba6c-746962065ae3}</Project>
+      <Name>SharedComponents</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

AppDiagnostic/BufferedListView.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+public class BufferedListView : ListView
+{
+    public BufferedListView()
+    {
+        // Zapne dvojité bufferovanie pre ListView
+        this.SetStyle(ControlStyles.OptimizedDoubleBuffer | ControlStyles.AllPaintingInWmPaint, true);
+        this.UpdateStyles();
+    }
+}           

AppDiagnostic/DiagApi.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace AppDiagnostic
+{
+    public class DiagApi
+    {
+        private static MainForm diagWindow; // Udržiava referenciu na existujúce okno
+
+        public DiagApi()
+        {
+            if (diagWindow == null || diagWindow.IsDisposed) // Ak okno neexistuje, vytvoríme ho
+            {
+                diagWindow = new MainForm();
+                diagWindow.FormClosing += (s, e) =>
+                {
+                    diagWindow = null; // Keď sa zavrie, vyčistíme referenciu
+                };
+                diagWindow.Show();
+            }
+            else
+            {
+                diagWindow.BringToFront(); // Ak už beží, len ho presunieme na vrch
+                diagWindow.WindowState = FormWindowState.Normal; // Ak je minimalizované, obnovíme ho
+            }
+        }
+    }
+}

AppDiagnostic/LogAdapter.cs

@@ -0,0 +1,174 @@
+using SharedComponents;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace AppDiagnostic
+{
+    public class LogAdapter
+    {
+        private ListView _listView;
+        public string _filterText = string.Empty;
+        private bool _isUserScrolling = false; // Indikátor, že používateľ manuálne scrolluje
+        private bool _autoScrollEnabled = true; // Indikátor, že automatické scrollovanie je povolené
+        private Timer _refreshTimer;
+        private const int RefreshInterval = 1000;
+
+        public LogAdapter(ListView listView)
+        {
+            _listView = listView;
+
+            // Nastavenie ListView
+            _listView.View = View.Details;
+            _listView.Columns.Clear();
+            _listView.Columns.Add("Logs");
+
+            _listView.Scrollable = true;
+
+            // Nastavenie šírky stĺpca na celú šírku ListView
+            AdjustColumnWidth();
+
+            // Udalosť pre dynamickú zmenu veľkosti stĺpca pri zmene veľkosti ListView
+            _listView.Resize += (sender, args) => AdjustColumnWidth();
+
+            // Pridanie udalosti pre manuálne skrolovanie
+            _listView.MouseWheel += ListView_MouseWheel;
+
+            // Inicializácia časovača na pravidelný refresh
+            _refreshTimer = new Timer { Interval = RefreshInterval };
+            _refreshTimer.Tick += (sender, args) => RefreshListView();
+            _refreshTimer.Start();
+        }
+
+        private void ListView_MouseWheel(object sender, MouseEventArgs e)
+        {
+            _isUserScrolling = true;
+
+            // Ak sa manuálnym scrollovaním používateľ dostane na koniec, obnovíme automatické scrollovanie
+            if (IsOnLastItem())
+            {
+                _isUserScrolling = false;
+                _autoScrollEnabled = true;
+            }
+            else
+            {
+                _autoScrollEnabled = false;
+            }
+        }
+
+        public void RefreshListView()
+        {
+            //LiveLogCache.Instance.AddLog(string.Format("-------------------------------RunDeviceAfter()-------------------------------"));
+
+            if (_listView.InvokeRequired)
+            {
+                _listView.Invoke(new Action(RefreshListView));
+                return;
+            }
+
+            _listView.BeginUpdate();
+            try
+            {
+                // Získanie pozície prvého viditeľného prvku pre stabilizáciu scrollovania
+                int topIndexBeforeRefresh = _listView.TopItem?.Index ?? 0;
+
+                // Pred pridaním nových položiek si pamätáme, či bol používateľ na poslednej položke
+                bool wasOnLastItem = IsOnLastItem();
+
+                // Uchovanie aktuálne označených položiek (indexov)
+                var selectedIndices = _listView.SelectedIndices.Cast<int>().ToList();
+
+                // Načítanie logov
+                var logs = LiveLogCache.Instance.GetLogs(0, LiveLogCache.Instance.GetCount())
+                    .Where(log => string.IsNullOrEmpty(_filterText) ||
+                                  log.IndexOf(_filterText, StringComparison.OrdinalIgnoreCase) >= 0)
+                    .ToList();
+
+                // Vymazanie existujúcich položiek a pridanie nových
+                _listView.Items.Clear();
+
+                foreach (var log in logs)
+                {
+                    var item = new ListViewItem(log)
+                    {
+                        BackColor = _listView.Items.Count % 2 == 0 ? Color.White : Color.FromArgb(240, 240, 240)
+                    };
+                    _listView.Items.Add(item);
+                }
+
+                // Obnovenie označených položiek
+                foreach (var index in selectedIndices)
+                {
+                    if (index < _listView.Items.Count)
+                    {
+                        _listView.Items[index].Selected = true;
+                    }
+                }
+
+                // Ak bol používateľ na poslednom prvku, nastavíme focus a scroll na posledný prvok
+                if (_autoScrollEnabled && wasOnLastItem && _listView.Items.Count > 0)
+                {
+                    var lastItemIndex = _listView.Items.Count - 1;
+                    _listView.EnsureVisible(lastItemIndex);
+                    _listView.Items[lastItemIndex].Focused = true;
+                }
+                else
+                {
+                    // Ak používateľ nebol na spodku, vrátime sa na predchádzajúcu pozíciu scrollu
+                    if (topIndexBeforeRefresh < _listView.Items.Count)
+                    {
+                        _listView.TopItem = _listView.Items[topIndexBeforeRefresh];
+                    }
+                }
+            }
+            finally
+            {
+                _listView.EndUpdate();
+            }
+        }
+
+
+
+        public void ApplyFilter(string filterText)
+        {
+            _filterText = filterText?.Trim() ?? string.Empty;
+            RefreshListView();
+        }
+
+        private bool IsOnLastItem()
+        {
+            if (_listView.Items.Count == 0)
+                return false;
+
+            // Získame poslednú položku
+            int lastItemIndex = _listView.Items.Count - 1;
+            var lastItem = _listView.Items[lastItemIndex];
+
+            // Overíme, či je posledná položka úplne viditeľná
+            return lastItem.Bounds.Bottom <= _listView.ClientRectangle.Bottom;
+        }
+
+        public void EnableAutoScroll()
+        {
+            _autoScrollEnabled = true;
+        }
+
+        public void DisableAutoScroll()
+        {
+            _autoScrollEnabled = false;
+        }
+
+        private void AdjustColumnWidth()
+        {
+            if (_listView.Columns.Count > 0)
+            {
+                _listView.Columns[0].Width = _listView.ClientSize.Width;
+            }
+        }
+    }
+
+}

AppDiagnostic/LogFilter.cs

@@ -0,0 +1,91 @@
+using SharedComponents;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace AppDiagnostic
+{
+    public class LogFilter
+    {
+        private ListView _listView;
+        private string _filterText = string.Empty;  // Pre uloženie aktuálneho filtrovaného reťazca
+
+        // Konstruktor
+        public LogFilter(ListView listView)
+        {
+            _listView = listView;
+        }
+
+        // Metóda na aplikovanie filtra na ListView
+        public void ApplyFilter(string filterText)
+        {
+            _filterText = filterText.ToLower();  // Ukladáme text filtra bez ohľadu na veľkosť písmen
+
+            // Po aplikovaní filtra obnovíme zobrazenie
+            RefreshListView();
+        }
+
+        public void RefreshListView()
+        {
+            try
+            {
+                // Skontrolujeme, či sme na hlavnom vlákne a v prípade potreby použijeme Invoke
+                if (_listView.InvokeRequired)
+                {
+                    // Použijeme Invoke, ak nie sme na hlavnom vlákne
+                    _listView.Invoke(new Action(RefreshListView));
+                }
+                else
+                {
+                    // Vymazanie existujúcich položiek
+                    _listView.Items.Clear();
+
+                    // Načítame všetky logy (ideálne z cache alebo databázy)
+                    var logs = LiveLogCache.Instance.GetLogs(0, LiveLogCache.Instance.Logs.Count);
+
+                    // Pridáme len tie logy, ktoré spĺňajú filter
+                    foreach (var log in logs)
+                    {
+                        if (log.ToLower().Contains(_filterText))  // Kontrola, či log obsahuje filter text
+                        {
+                            var listViewItem = new ListViewItem(log);
+
+                            // Striedanie farieb riadkov
+                            if (_listView.Items.Count % 2 == 0) // Párny index => biela
+                            {
+                                listViewItem.BackColor = Color.White;
+                            }
+                            else // Nepárny index => svetlá sivá
+                            {
+                                listViewItem.BackColor = Color.FromArgb(240, 240, 240);  // Veľmi svetlá sivá
+                            }
+
+                            // Pridanie efektu pre novú položku
+                            ApplyNewItemEffect(listViewItem);
+
+                            // Pridanie položky do ListView
+                            _listView.Items.Add(listViewItem);
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                // Zachytíme výnimku, ak sa niečo pokazí, a zobrazíme ju užívateľovi
+                MessageBox.Show($"An error occurred while refreshing the log view: {ex.Message}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        // Môžete pridať ďalšie metódy na zobrazenie alebo efekt pre nové položky, ak je to potrebné
+        private void ApplyNewItemEffect(ListViewItem item)
+        {
+            // Prípadný efekt pre nový pridaný log
+            // Môžete pridať animáciu alebo zmenu farby atď.
+            item.ForeColor = Color.Green;  // Napríklad zmeníme farbu písma na zelenú
+        }
+    }
+}

AppDiagnostic/MainForm.Designer.cs

@@ -0,0 +1,278 @@
+using System.Windows.Forms;
+
+namespace AppDiagnostic
+{
+    partial class MainForm
+    {
+        /// <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
+        //private BufferedListView memoListView;
+        private System.Windows.Forms.ColumnHeader columnHeaderTime;
+        private System.Windows.Forms.ColumnHeader columnHeaderMessage;
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.columnHeaderTime = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.columnHeaderMessage = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.refreshMemoButton = new System.Windows.Forms.Button();
+            this.button6 = new System.Windows.Forms.Button();
+            this.button7 = new System.Windows.Forms.Button();
+            this.filterManagementPanel = new System.Windows.Forms.Panel();
+            this.button5 = new System.Windows.Forms.Button();
+            this.filterButton = new System.Windows.Forms.Button();
+            this.filterTextBox = new System.Windows.Forms.TextBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.wndControlPanel = new System.Windows.Forms.Panel();
+            this.button2 = new System.Windows.Forms.Button();
+            this.flowControlsPanel = new System.Windows.Forms.Panel();
+            this.runButton = new System.Windows.Forms.Button();
+            this.stopButton = new System.Windows.Forms.Button();
+            this.label1 = new System.Windows.Forms.Label();
+            this.memoListView = new BufferedListView();
+            this.panel1.SuspendLayout();
+            this.filterManagementPanel.SuspendLayout();
+            this.wndControlPanel.SuspendLayout();
+            this.flowControlsPanel.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // columnHeaderTime
+            // 
+            this.columnHeaderTime.Text = "Time";
+            this.columnHeaderTime.Width = 150;
+            // 
+            // columnHeaderMessage
+            // 
+            this.columnHeaderMessage.Text = "Message";
+            this.columnHeaderMessage.Width = 350;
+            // 
+            // panel1
+            // 
+            this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.panel1.Controls.Add(this.refreshMemoButton);
+            this.panel1.Controls.Add(this.button6);
+            this.panel1.Controls.Add(this.button7);
+            this.panel1.Location = new System.Drawing.Point(189, 356);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(283, 26);
+            this.panel1.TabIndex = 16;
+            // 
+            // refreshMemoButton
+            // 
+            this.refreshMemoButton.Location = new System.Drawing.Point(108, 0);
+            this.refreshMemoButton.Name = "refreshMemoButton";
+            this.refreshMemoButton.Size = new System.Drawing.Size(84, 26);
+            this.refreshMemoButton.TabIndex = 17;
+            this.refreshMemoButton.Text = "Refresh memo";
+            this.refreshMemoButton.UseVisualStyleBackColor = true;
+            this.refreshMemoButton.Click += new System.EventHandler(this.refreshMemoButton_Click);
+            // 
+            // button6
+            // 
+            this.button6.Location = new System.Drawing.Point(0, 0);
+            this.button6.Name = "button6";
+            this.button6.Size = new System.Drawing.Size(102, 26);
+            this.button6.TabIndex = 4;
+            this.button6.Text = "Clean diag cache";
+            this.button6.UseVisualStyleBackColor = true;
+            this.button6.Click += new System.EventHandler(this.button6_Click);
+            // 
+            // button7
+            // 
+            this.button7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.button7.Location = new System.Drawing.Point(198, 0);
+            this.button7.Name = "button7";
+            this.button7.Size = new System.Drawing.Size(72, 26);
+            this.button7.TabIndex = 5;
+            this.button7.Text = "Save logs";
+            this.button7.UseVisualStyleBackColor = true;
+            this.button7.Click += new System.EventHandler(this.button7_Click);
+            // 
+            // filterManagementPanel
+            // 
+            this.filterManagementPanel.Controls.Add(this.button5);
+            this.filterManagementPanel.Controls.Add(this.filterButton);
+            this.filterManagementPanel.Controls.Add(this.filterTextBox);
+            this.filterManagementPanel.Controls.Add(this.label2);
+            this.filterManagementPanel.Location = new System.Drawing.Point(127, 6);
+            this.filterManagementPanel.Name = "filterManagementPanel";
+            this.filterManagementPanel.Size = new System.Drawing.Size(393, 26);
+            this.filterManagementPanel.TabIndex = 15;
+            // 
+            // button5
+            // 
+            this.button5.Enabled = false;
+            this.button5.Location = new System.Drawing.Point(294, 4);
+            this.button5.Name = "button5";
+            this.button5.Size = new System.Drawing.Size(81, 20);
+            this.button5.TabIndex = 11;
+            this.button5.Text = "Add new filter";
+            this.button5.UseVisualStyleBackColor = true;
+            // 
+            // filterButton
+            // 
+            this.filterButton.Location = new System.Drawing.Point(225, 4);
+            this.filterButton.Name = "filterButton";
+            this.filterButton.Size = new System.Drawing.Size(64, 20);
+            this.filterButton.TabIndex = 10;
+            this.filterButton.Text = "Set filter";
+            this.filterButton.UseVisualStyleBackColor = true;
+            this.filterButton.Click += new System.EventHandler(this.filterButton_Click_1);
+            // 
+            // filterTextBox
+            // 
+            this.filterTextBox.Location = new System.Drawing.Point(33, 4);
+            this.filterTextBox.Name = "filterTextBox";
+            this.filterTextBox.Size = new System.Drawing.Size(187, 20);
+            this.filterTextBox.TabIndex = 7;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(3, 8);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(29, 13);
+            this.label2.TabIndex = 6;
+            this.label2.Text = "Filter";
+            // 
+            // wndControlPanel
+            // 
+            this.wndControlPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.wndControlPanel.Controls.Add(this.button2);
+            this.wndControlPanel.Location = new System.Drawing.Point(831, 356);
+            this.wndControlPanel.Name = "wndControlPanel";
+            this.wndControlPanel.Size = new System.Drawing.Size(70, 26);
+            this.wndControlPanel.TabIndex = 14;
+            // 
+            // button2
+            // 
+            this.button2.Location = new System.Drawing.Point(3, 0);
+            this.button2.Name = "button2";
+            this.button2.Size = new System.Drawing.Size(64, 26);
+            this.button2.TabIndex = 2;
+            this.button2.Text = "Close";
+            this.button2.UseVisualStyleBackColor = true;
+            this.button2.Click += new System.EventHandler(this.button2_Click);
+            // 
+            // flowControlsPanel
+            // 
+            this.flowControlsPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.flowControlsPanel.Controls.Add(this.runButton);
+            this.flowControlsPanel.Controls.Add(this.stopButton);
+            this.flowControlsPanel.Location = new System.Drawing.Point(12, 356);
+            this.flowControlsPanel.Name = "flowControlsPanel";
+            this.flowControlsPanel.Size = new System.Drawing.Size(133, 26);
+            this.flowControlsPanel.TabIndex = 13;
+            // 
+            // runButton
+            // 
+            this.runButton.Enabled = false;
+            this.runButton.Location = new System.Drawing.Point(0, 0);
+            this.runButton.Name = "runButton";
+            this.runButton.Size = new System.Drawing.Size(64, 26);
+            this.runButton.TabIndex = 4;
+            this.runButton.Text = "Run";
+            this.runButton.UseVisualStyleBackColor = true;
+            this.runButton.Click += new System.EventHandler(this.runButton_Click);
+            // 
+            // stopButton
+            // 
+            this.stopButton.Location = new System.Drawing.Point(69, 0);
+            this.stopButton.Name = "stopButton";
+            this.stopButton.Size = new System.Drawing.Size(64, 26);
+            this.stopButton.TabIndex = 5;
+            this.stopButton.Text = "Stop";
+            this.stopButton.UseVisualStyleBackColor = true;
+            this.stopButton.Click += new System.EventHandler(this.stopButton_Click);
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(12, 19);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(76, 13);
+            this.label1.TabIndex = 12;
+            this.label1.Text = "Flow of events";
+            // 
+            // memoListView
+            // 
+            this.memoListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.memoListView.FullRowSelect = true;
+            this.memoListView.GridLines = true;
+            this.memoListView.HideSelection = false;
+            this.memoListView.Location = new System.Drawing.Point(12, 38);
+            this.memoListView.Name = "memoListView";
+            this.memoListView.Size = new System.Drawing.Size(889, 312);
+            this.memoListView.TabIndex = 0;
+            this.memoListView.UseCompatibleStateImageBehavior = false;
+            this.memoListView.View = System.Windows.Forms.View.Details;
+
+            this.memoListView.DoubleClick += new System.EventHandler(this.MemoListView_DoubleClick);
+            // 
+            // MainForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(913, 388);
+            this.Controls.Add(this.memoListView);
+            this.Controls.Add(this.panel1);
+            this.Controls.Add(this.filterManagementPanel);
+            this.Controls.Add(this.wndControlPanel);
+            this.Controls.Add(this.flowControlsPanel);
+            this.Controls.Add(this.label1);
+            this.Name = "MainForm";
+            this.Text = "Application live diagnostic";
+            this.panel1.ResumeLayout(false);
+            this.filterManagementPanel.ResumeLayout(false);
+            this.filterManagementPanel.PerformLayout();
+            this.wndControlPanel.ResumeLayout(false);
+            this.flowControlsPanel.ResumeLayout(false);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.Button button6;
+        private System.Windows.Forms.Button button7;
+        private System.Windows.Forms.Panel filterManagementPanel;
+        private System.Windows.Forms.Button button5;
+        private System.Windows.Forms.Button filterButton;
+        private System.Windows.Forms.TextBox filterTextBox;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Panel wndControlPanel;
+        private System.Windows.Forms.Button button2;
+        private System.Windows.Forms.Panel flowControlsPanel;
+        private System.Windows.Forms.Button runButton;
+        private System.Windows.Forms.Button stopButton;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Button refreshMemoButton;
+        private BufferedListView memoListView;
+    }
+}
+

AppDiagnostic/MainForm.cs

@@ -0,0 +1,266 @@
+using log4net.Config;
+using log4net;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using log4net.Appender;
+using SharedComponents;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement;
+using System.IO; // Pre File.WriteAllLines a prácu so súbormi
+using System.Linq;
+
+namespace AppDiagnostic
+{
+    public partial class MainForm : Form
+    {
+        private bool stopUpdate = false;  // Premenná na zastavenie aktualizácie
+        private int lastDisplayedLogIndex = 0;
+        private bool autoScrollEnabled = true; // Automatický posun, predvolene povolený
+        private MainForm appDiagnosticForm;
+        private Timer refreshTimer;
+        private LogAdapter _logAdapter;  // Pre LogAdapter
+        private LogFilter _logFilter;   // LogFilter objekt pre filtráciu
+
+        public MainForm()
+        {
+            InitializeComponent();
+
+            // Inicializujeme LogAdapter a priradíme ho k memoListView
+            _logAdapter = new LogAdapter(memoListView);
+
+            RefreshLogView();
+
+            // Pripojenie na udalosť pri pridaní nového logu    
+            // nakoľko sa memo refreshuje cyklicky, tak refresh na udalosť nepotrebujem 
+            //LiveLogCache.Instance.LogAdded += OnLogAdded;
+
+            // Vytvoríme LogFilter objekt
+            //_logFilter = new LogFilter(memoListView);
+        }
+
+        private void OnLogAdded(string log)
+        {
+            try
+            {
+                RefreshLogView();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"Error in OnLogAdded: {ex.Message}");
+                throw;
+            }
+        }
+
+        private void RefreshLogView()
+        {
+            // Skontrolujte, či voláme z iného vlákna
+            if (InvokeRequired)
+            {
+                Invoke((Action)RefreshLogView);
+                return;
+            }
+
+            memoListView.BeginUpdate(); // Zabraňuje vizuálnym aktualizáciám počas vykresľovania
+
+            try
+            {
+                // Skontrolujte, či je užívateľ na poslednom viditeľnom zázname
+                if (memoListView.Items.Count > 0)
+                {
+                    var lastVisibleIndex = memoListView.TopItem.Index + memoListView.ClientRectangle.Height / memoListView.Items[0].Bounds.Height;
+                    autoScrollEnabled = lastVisibleIndex >= memoListView.Items.Count - 1;
+                }
+
+                // Získajte nové logy od posledného indexu
+                var logs = LiveLogCache.Instance.GetLogs(lastDisplayedLogIndex, LiveLogCache.Instance.Logs.Count - lastDisplayedLogIndex);
+
+                // Pridajte len nové logy
+                foreach (var log in logs)
+                {
+                    memoListView.Items.Add(new ListViewItem(log));
+                }
+
+                // Aktualizujte posledný zobrazený index
+                lastDisplayedLogIndex = LiveLogCache.Instance.Logs.Count;
+
+                // Ak je autoScrollEnabled, posuňte sa na posledný záznam
+                if (autoScrollEnabled && memoListView.Items.Count > 0)
+                {
+                    memoListView.EnsureVisible(memoListView.Items.Count - 1);
+                }
+            }
+            finally
+            {
+                memoListView.EndUpdate(); // Umožní vizuálne aktualizácie
+            }
+        }
+
+        // Táto metóda sa spustí pri scrollovaní v memoListView (tzn. ak sa používateľ dostane na spodok listu)
+        private void memoListView_Scroll(object sender, EventArgs e)
+        {
+            // Skontrolujte, či používateľ dosiahol spodok ListView
+            if (memoListView.Items.Count > 0 &&
+                memoListView.Items[memoListView.Items.Count - 1].Bounds.Bottom <= memoListView.ClientSize.Height)
+            {
+                // Ak áno, načítame ďalšie logy
+                RefreshLogView();
+            }
+        }
+
+        private void button6_Click(object sender, EventArgs e)
+        {
+            //LiveLogCache.Instance.AddLog("Nový log z hlavnej aplikácie");
+
+            LiveLogCache.Instance.ClearLogs();
+            ClearListView();
+        }
+
+        private void runButton_Click(object sender, EventArgs e)
+        {
+            if (stopUpdate)  // Ak je časovač zastavený, spustíme ho
+            {
+                stopUpdate = false;  // Zastav aktualizáciu
+                runButton.Enabled = false; // Zakážeme tlačidlo Start počas behu
+                stopButton.Enabled = true;  // Povolenie tlačidla Stop
+                refreshTimer.Start();
+            }
+        }
+
+        private void stopButton_Click(object sender, EventArgs e)
+        {
+            if (!stopUpdate)  // Ak časovač beží, môžeme ho zastaviť
+            {
+                stopUpdate = true;  // Spusti aktualizáciu
+                runButton.Enabled = true; // Povolenie tlačidla Start
+                stopButton.Enabled = false; // Zakážeme tlačidlo Stop
+                refreshTimer.Stop();
+            }
+        }
+
+        private void ClearListView()
+        {
+            if (InvokeRequired)
+            {
+                Invoke(new Action(ClearListView));
+                return;
+            }
+
+            memoListView.Items.Clear();
+        }
+
+        private void refreshMemoButton_Click(object sender, EventArgs e)
+        {
+            
+        }
+
+        private void button7_Click(object sender, EventArgs e)
+        {
+            SaveLogsToFile();
+            //LiveLogCache.Instance.AddLog("Toto je nový log.");
+        }
+
+        protected override void OnFormClosing(FormClosingEventArgs e)
+        {
+            // Odpojenie udalosti, keď sa okno zatvára, inak môže po opätovnom spustení okna a pridaní nového itemu do listu zhhodiť program
+            // nakoľko sa memo refreshuje cyklicky, tak refresh na udalosť nepotrebujem 
+            //LiveLogCache.Instance.LogAdded -= OnLogAdded;
+
+            _logAdapter = null;
+
+            base.OnFormClosing(e);
+        }
+
+        private void filterButton_Click_1(object sender, EventArgs e)
+        {
+            // Aplikujeme filter na základe textu z filterTextBox
+            string filterText = filterTextBox.Text;
+            //_logFilter.ApplyFilter(filterText);  // Aplikovanie filtra
+            _logAdapter.ApplyFilter(filterText);
+        }
+        private void SubForm_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            try
+            {
+                // Vaša logika pri uzatváraní formy
+                // this.Hide(); // Podforma sa len skryje
+            }
+            catch (Exception ex)
+            {
+                // Ošetrenie výnimky
+                MessageBox.Show("Chyba pri zatváraní pod-aplikácie: " + ex.Message);
+            }
+        }
+
+        private void SaveLogsToFile()
+        {
+            using (SaveFileDialog saveFileDialog = new SaveFileDialog())
+            {
+                saveFileDialog.Filter = "Text Files (*.txt)|*.txt|All Files (*.*)|*.*";
+                saveFileDialog.Title = "Save TBF live logs";
+                saveFileDialog.DefaultExt = "txt";
+                saveFileDialog.FileName = "TBFLiveLogs.txt";
+
+                if (saveFileDialog.ShowDialog() == DialogResult.OK)
+                {
+                    try
+                    {
+                        // Načítanie všetkých logov z LiveLogCache
+                        var logs = LiveLogCache.Instance.GetLogs(0, LiveLogCache.Instance.GetCount());
+
+                        // Uloženie logov do vybraného súboru
+                        File.WriteAllLines(saveFileDialog.FileName, logs);
+
+                        MessageBox.Show("Logs saved successfully.", "Save TBF live logs", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    }
+                    catch (Exception ex)
+                    {
+                        MessageBox.Show($"An error occurred while saving TBF live logs: {ex.Message}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    }
+                }
+            }
+        }
+
+        private void button2_Click(object sender, EventArgs e)
+        {
+            this.Close();
+            //this.Hide(); // Podforma sa len skryje
+        }
+
+        private void MemoListView_DoubleClick(object sender, EventArgs e)
+        {
+            if (memoListView.SelectedItems.Count > 0)
+            {
+                var selectedItem = memoListView.SelectedItems[0];
+                int selectedIndex = memoListView.Items.IndexOf(selectedItem);
+
+                if (selectedIndex >= 0)
+                {
+                    // Zrušenie filtra
+                    _logAdapter._filterText = string.Empty;
+
+                    // Načítanie logov od indexu vybraného riadku
+                    var logs = LiveLogCache.Instance.GetLogs(selectedIndex, LiveLogCache.Instance.GetCount() - selectedIndex);
+
+                    // Obnovenie ListView s novými údajmi
+                    memoListView.BeginUpdate();
+                    memoListView.Items.Clear();
+                    foreach (var log in logs)
+                    {
+                        var item = new ListViewItem(log)
+                        {
+                            BackColor = memoListView.Items.Count % 2 == 0 ? Color.White : Color.FromArgb(240, 240, 240)
+                        };
+                        memoListView.Items.Add(item);
+                    }
+                    memoListView.EndUpdate();
+                }
+            }
+        }
+    }
+}

AppDiagnostic/MainForm.resx

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

AppDiagnostic/Program.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace AppDiagnostic
+{
+    internal static class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main()
+        {
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+            Application.Run(new MainForm());
+        }
+    }
+}

AppDiagnostic/Properties/AssemblyInfo.cs

@@ -0,0 +1,33 @@
+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("AppDiagnostic")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("AppDiagnostic")]
+[assembly: AssemblyCopyright("Copyright ©  2024")]
+[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("fa9abad1-7184-4295-ade8-d44f2e3de6b2")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

AppDiagnostic/Properties/Resources.Designer.cs

@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <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 AppDiagnostic.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("AppDiagnostic.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;
+            }
+        }
+    }
+}

AppDiagnostic/Properties/Resources.resx

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

AppDiagnostic/Properties/Settings.Designer.cs

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

AppDiagnostic/Properties/Settings.settings

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

AppDiagnostic/packages.config

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

Common/Common.csproj

@@ -17,7 +17,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -30,8 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net">
-      <HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -64,6 +64,7 @@
       <DependentUpon>ModelessForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Formulas.cs" />
+    <Compile Include="CurrentUser.cs" />
     <Compile Include="GlobalData.cs" />
     <Compile Include="IMeasurementCorrection.cs" />
     <Compile Include="IOrderInfo.cs" />
@@ -76,6 +77,7 @@
     </Compile>
     <Compile Include="QuitAppException.cs" />
     <Compile Include="SerializableDictionary.cs" />
+    <Compile Include="StatisticalMetrics.cs" />
     <Compile Include="Telegram.cs" />
     <Compile Include="UIControls\CoolButtonCtrl.cs">
       <SubType>UserControl</SubType>

Common/CurrentUser.cs

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

Common/DBSettings.cs

@@ -10,14 +10,14 @@ namespace Common
 	/// </summary>
 	public class DBSettings : ICloneable
 	{
-		public Common.DBType DbType;
+		public DBType DbType;
 		public string ConnectionString;
 
 		public DBSettings()
 		{
 		}
 
-		public DBSettings(Common.DBType dbType, string connectionString)
+		public DBSettings(DBType dbType, string connectionString)
 		{
 			this.DbType = dbType;
 			this.ConnectionString = connectionString;

Common/Enums.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -185,16 +185,70 @@ namespace Common
 		Count,
 	}
 
+    public enum FlowNames
+    {
+        QnQtQmin = 0,
+        Q3Q2Q1 = 1,
+        QpQi = 2,
+        Count,
+    }
+
     public enum ProfileType
     {
         Q3R,
         QnClassColdWater,
         QnClassHotWater,
         QpQi,
+        CompoundQ3RQ3R,
+        CompoundQnClassQnClass,
+        CompoundQ3RQnClass,
+        CompoundQnClassQ3R,
+        CompoundQpQiQpQi,
         Manual,
         Count,
     }
 
+    public enum FlowId
+    {
+        Any,
+        Q4,
+        Q3,
+        Q2,
+        Q1,
+        Q4Main,
+        Q3Main,
+        Q2Main,
+        Q1Main,
+        Q4Aux,
+        Q3Aux,
+        Q2Aux,
+        Q1Aux,
+        Qmax,
+        Qn,
+        Qt,
+        Qmin,
+        QmaxMain,
+        QnMain,
+        QtMain,
+        QminMain,
+        QmaxAux,
+        QnAux,
+        QtAux,
+        QminAux,
+        Qp,
+        Qp10,
+        Qi,
+        QpMain,
+        Qp10Main,
+        QiMain,
+        QpAux,
+        Qp10Aux,
+        QiAux,
+        Qdetected,
+        Qfall,
+        Qrise,
+    }
+
     public enum ErrorLimitType
     {
         Manual,
@@ -266,11 +320,13 @@ 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")]      H,         /// horizontal
+        [Description("V")]      V,         /// vertical
+        [Description("S")]      S,         /// steig
+        [Description("F")]      F,         /// fall
+        [Description("H/V")]    HV,        /// horizontal / vertical
 #endif
 		Count
     }
@@ -464,8 +520,10 @@ namespace Common
     public enum TestProfile
     {
         UserDefined,
+        UserDefinedCompound,
         UserDefinedHeatMeter,
         Protected,                  /// The first protected one
+        ProtectedCompound,
         ProtectedHeatMeter,
     }
 
@@ -640,7 +698,16 @@ namespace Common
         Count,
     }
 
-	public enum ImageRotation
+    public enum DivResolution : int
+    {
+        [Description("1 ms (0.25 s)")]  _1ms = 0,
+        [Description("2 ms (0.5 s)")]   _2ms = 1,
+        [Description("4 ms (1 s)")]     _4ms = 2,
+        [Description("8 ms (2 s)")]     _8ms = 3,
+        Count,
+    }
+
+    public enum ImageRotation
 	{
 		[Description("0 deg")]		None,
 		[Description("90 deg")]		Deg90,

Common/Forms/MessageEventArgs.cs

@@ -1,4 +1,7 @@
-using System;
+///
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
+///
+using System;
 
 namespace Common.Forms
 {

Common/Forms/ModelessForm.cs

@@ -1,4 +1,7 @@
-using System;
+///
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
+///
+using System;
 using System.Drawing;
 using System.Windows.Forms;
 
@@ -53,20 +56,20 @@ namespace Common.Forms
         public event EventHandler<MessageEventArgs> UpdateMessageHandler;
         void OnUpdateMessage(object sender, MessageEventArgs args)
         {
-            if (args.Message != null) label1.Text = args.Message;
+            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 static void CloseForm()
+        public void CloseForm()
         {
             if (CloseFormHandler == null) return;
             try { CloseFormHandler(null, null); }
             catch (Exception) { }
         }
-        static public event EventHandler<EventArgs> CloseFormHandler;
+        public event EventHandler<EventArgs> CloseFormHandler;
         void OnCloseForm(object sender, EventArgs args)
         {
             DialogResult = DialogResult.Cancel;

Common/Formulas.cs

@@ -213,9 +213,9 @@ namespace Common
 		/// </summary>
 		public static double ErrorFromVolumes(double measuredVolume, double trueVolume)
 		{
-			if (trueVolume <= float.Epsilon)
+			if (Math.Abs(trueVolume) <= float.Epsilon)
 			{
-				if (measuredVolume <= float.Epsilon)
+				if (Math.Abs(measuredVolume) <= float.Epsilon)
 				{
 					log.WarnFormat("ErrorFromVolumes({0},{1}) returns {2}", measuredVolume, trueVolume, -100.0);
 					return -100.0;

Common/GlobalData.cs

@@ -5,38 +5,10 @@ using System;
 
 namespace Common
 {
-    public class GlobalData
+    public static class GlobalData
     {
         public static double SampleDensity = 0; /// sample water density measured in an accredited labo [kg/m3]
         public static double SampleTemp = 0;    /// sample temperature when density measured in an accredited labo [°C]
         public static double Buoyancy = 0;
-
-        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 IUser CurrentUser2;
-        public static IUser CurrentUser3;
-        
-        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()
-        {
-            if (CurrentUser == null || CurrentUser.UserName == null)
-                return string.Empty;
-            else if (CurrentUser2 == null || CurrentUser2.UserName == null)
-                return CurrentUser.UserName;
-            else if (CurrentUser3 == null || CurrentUser3.UserName == null)
-                return string.Format("{0},{1}", CurrentUser.UserName, CurrentUser2.UserName);
-            else
-                return string.Format("{0},{1},{2}", CurrentUser.UserName, CurrentUser2.UserName, CurrentUser3.UserName);
-        }
     }
 }

Common/IMeasurementCorrection.cs

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

Common/IUser.cs

@@ -10,6 +10,7 @@ namespace Common
         int Number { get; }
 
         /// Access rights
+        bool IsPowerUser();
         bool IsMemberOf(GID group);
         bool IsMemberOf(GID[] groups);
         bool IsCorrectPassword(string password);

Common/Iperl/OptoTelegramRaw.cs

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

Common/StatisticalMetrics.cs

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

@@ -2,7 +2,6 @@
 /// Copyright (c) 2016-2021 Sensus Slovensko a.s.
 ///
 using System;
-using System.Reflection;
 
 namespace Common
 {
@@ -106,6 +105,14 @@ namespace Common
         /// 
         [Description("pulse/kWh")]  ppkWh,		/// * 1 pulse/kWh
         [Description("kWh/pulse")]  kWhpp,		///   1 kWh/pulse
+        
+        ///
+        [Description("A")]  A, /// *1 A
+	    [Description("mA")] mA, /// 1 mA = 0.001 A
+        ///
+        [Description("V")]  V, /// *1 V
+        [Description("mV")] mV, /// 1 mV = 0.001 V                     
+                               
                                                 
         Count
     }
@@ -136,6 +143,8 @@ namespace Common
         [Description("Boolean")]			Boolean,
         [Description("Datum und Uhrzeit")]  DateTime,
         [Description("Aufgezählt")]         Enumerated,
+        [Description("Strom")]              Current,
+		[Description("Spannung")]           Voltage,
 #elif LANG_PL
         [Description("Objętość")]			Volume,
 		[Description("Przepływ")]           Flow,
@@ -159,6 +168,8 @@ namespace Common
         [Description("Boolean")]			Boolean,
         [Description("Data i czas")]		DateTime,
         [Description("Wyliczone")]          Enumerated,
+        [Description("Prąd")]               Current,
+        [Description("Napięcie")]            Voltage,
 #elif LANG_CS
 		[Description("Objem")]				Volume,
 		[Description("Průtok")]				Flow,
@@ -182,6 +193,8 @@ namespace Common
         [Description("Boolean")]			Boolean,
         [Description("Datum a čas")]		DateTime,
         [Description("Vyjmenované")]        Enumerated,
+		[Description("Proud")]				Current,
+		[Description("Napětí")]            Voltage,
 #elif LANG_IT
 		[Description("Volume")]				Volume,
 		[Description("Flusso")]				Flow,
@@ -205,6 +218,8 @@ namespace Common
         [Description("Boolean")]			Boolean,
         [Description("Data e ora")]		    DateTime,
         [Description("Enumerato")]          Enumerated,
+		[Description("Corrente")]            Current,
+		[Description("Voltaggio")]            Voltage,
 #else
         [Description("Volume")]				Volume,
 		[Description("Flow")]				Flow,
@@ -228,6 +243,8 @@ namespace Common
         [Description("Boolean")]			Boolean,
         [Description("Date and time")]		DateTime,
         [Description("Enumerated")]         Enumerated,
+		[Description("Current")]            Current,
+		[Description("Voltage")]            Voltage,
 #endif
         Count,
 	}
@@ -243,7 +260,8 @@ namespace Common
         {
             return unit == Unit.l || unit == Unit.m3ph || unit == Unit.kg || unit == Unit.s || unit == Unit.C ||
                    unit == Unit.bar || unit == Unit.RPct || unit == Unit.Pct || unit == Unit.mm || unit == Unit.kgpm3 ||
-                   unit == Unit.J || unit == Unit.uSpcm || unit == Unit.ppl || unit == Unit.ppkWh;
+                   unit == Unit.J || unit == Unit.uSpcm || unit == Unit.ppl || unit == Unit.ppkWh || unit == Unit.A || 
+                   unit == Unit.V;
         }
 
         public static bool IsQuantity(Unit unit, Quantity quantity)
@@ -352,27 +370,37 @@ namespace Common
                 case Unit.ppkWh:
                 case Unit.kWhpp:
                     return Quantity.PulsePerKWh;
+                
+                case Unit.A:
+                case Unit.mA:
+		                return Quantity.Current;
+                
+                case Unit.V:
+                case Unit.mV:
+	                return Quantity.Voltage;
 
                 default:
 					return Quantity.Number;
             }
 		}
 
-		public static bool IsVolume(Unit 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 bool IsVolume(Unit unit)       { return IsQuantity(unit, Quantity.Volume); }
+		public static bool IsFlow(Unit unit)         { return IsQuantity(unit, Quantity.Flow); }
+        public static bool IsMass(Unit unit)         { return IsQuantity(unit, Quantity.Mass); }
+        public static bool IsTime(Unit unit)         { return IsQuantity(unit, Quantity.Time); }
+        public static bool IsTemperature(Unit unit)  { return IsQuantity(unit, Quantity.Temperature); }
+		public static bool IsPressure(Unit unit)     { return IsQuantity(unit, Quantity.Pressure); }
+        public static bool IsHumidity(Unit unit)     { return IsQuantity(unit, Quantity.Humidity); }
+        public static bool IsError(Unit unit)        { return IsQuantity(unit, Quantity.Error); }
+		public static bool IsLength(Unit unit)       { return IsQuantity(unit, Quantity.Length); }
+		public static bool IsDensity(Unit unit)      { return IsQuantity(unit, Quantity.Density); }
+		public static bool IsEnergy(Unit unit)       { return IsQuantity(unit, Quantity.Energy); }
+        public static bool IsPulses(Unit unit)       { return IsQuantity(unit, Quantity.Pulses); }
+        public static bool IsPulsePerLtr(Unit unit)  { return IsQuantity(unit, Quantity.PulsePerLtr); }
+        public static bool IsPulsePerKWh(Unit unit)  { return IsQuantity(unit, Quantity.PulsePerKWh); }
+        public static bool IsConductivity(Unit unit) { return IsQuantity(unit, Quantity.Conductivity); }
+        public static bool IsCurrent(Unit unit) { return IsQuantity(unit, Quantity.Current); }
+        public static bool IsVoltage(Unit unit) { return IsQuantity(unit, Quantity.Voltage); }
 
 
 
@@ -456,6 +484,13 @@ namespace Common
                 case Unit.dm3pp:
                 case Unit.lpdeg:
                 case Unit.dm3pdeg:  return (v <= float.Epsilon) ? 0 : 1/v;
+                
+                /// Current: internal representation in A
+                case Unit.mA:       return 1000 * v;           /// 1000 mA = 1 A
+                                                                
+                /// Voltage: internal representation in V
+                case Unit.mV:     return 1000 * v;				/// 1000 mV = 1 V
+
 
                 default:            return v;                   /// Do not convert
             }
@@ -535,6 +570,12 @@ namespace Common
 
                 /// Electrical conductivity
                 case Unit.mSpm:     return 10 * v;
+                
+                /// Current: internal representation in A
+                case Unit.mA:       return 0.001 * v;           /// 1 mA = 0.001 A
+                                                                
+                /// Voltage: internal representation in V
+                case Unit.mV:     return 0.001 * v;				/// 1 mV = 0.001 V
 
                 /// Invert
                 case Unit.kWhpp:

Common/Utils.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
 ///
 using System;
 
@@ -14,6 +14,35 @@ 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, bool isAux = false)
+        {
+            switch (pt)
+            {
+                case ProfileType.Q3R:
+                case ProfileType.CompoundQ3RQ3R:
+                    return FlowNames.Q3Q2Q1;
+                case ProfileType.CompoundQ3RQnClass:
+                    return isAux ? FlowNames.QnQtQmin : FlowNames.Q3Q2Q1;
+                case ProfileType.QnClassColdWater:
+                case ProfileType.QnClassHotWater:
+                case ProfileType.CompoundQnClassQnClass:
+                    return FlowNames.QnQtQmin;
+                case ProfileType.CompoundQnClassQ3R:
+                    return isAux ? FlowNames.Q3Q2Q1 : FlowNames.QnQtQmin;
+                case ProfileType.QpQi:
+                case ProfileType.CompoundQpQiQpQi:
+                    return FlowNames.QpQi;
+                default:
+                    return FlowNames.Q3Q2Q1;
+            }
+        }
+
         public static string SignificantDigitsToFmt(double value, int sigDigits)
         {
             if (sigDigits == 6)
@@ -212,9 +241,9 @@ namespace Common
             int length = string.IsNullOrEmpty(password) ? 0 : password.Length;
 
             /// Password length must be at least 6
-            if (length < GlobalData.MinPasswdLength)
+            if (length < CurrentUser.MinPasswdLength)
             {
-                explanation = string.Format("Password must have at least {0} characters", GlobalData.MinPasswdLength);
+                explanation = string.Format("Password must have at least {0} characters", CurrentUser.MinPasswdLength);
                 return false;
             }
             else
@@ -272,14 +301,13 @@ namespace Common
             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")) ||
+            return (userName.Equals("milan") && password.Equals("kraken")) ||
                    (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("Michal") && password.Equals("Plok789456123")) ||
                    (userName.Equals("martin") && password.Equals("vaclavek84")) ||
                    (userName.Equals("pakan") && password.Equals("kuriatko")) ||
-                   (userName.Equals("augustin") && password.Equals("jaugust")) ||
+                   (userName.Equals("jan") && password.Equals("jaugust")) ||
                    (userName.Equals("JCermak") && password.Equals("Zt6911")) ||
                    (userName.Equals("gilles") && password.Equals("alibaba")) ||
                    (userName.Equals(passwordOfDay) && password.Equals(passwordOfDay));

Common/packages.config

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

Config/Config.csproj

@@ -43,7 +43,7 @@
       <HintPath>..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
     </Reference>
     <Reference Include="log4net">
-      <HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
+      <HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="MySql.Data">
       <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
@@ -68,6 +68,7 @@
   </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" />
@@ -95,6 +96,7 @@
     <Compile Include="Entities\VirtualBenchStep.cs" />
     <Compile Include="CalendarEvent\Utils.cs" />
     <Compile Include="FluentCommon.cs" />
+    <Compile Include="Formulas.cs" />
     <Compile Include="Mappings\BenchPathMap.cs" />
     <Compile Include="Mappings\ComponentMap.cs" />
     <Compile Include="Mappings\ComponentProcedureMap.cs" />
@@ -115,6 +117,7 @@
     <Compile Include="Mappings\UncertaintyMap.cs" />
     <Compile Include="Mappings\UserMap.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="PurchaseResources.cs" />
     <Compile Include="Resources\Strings.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>

Config/Data.cs

@@ -0,0 +1,103 @@
+using System;
+
+//formulas.cs has been added cause iPerl from master-2 ...MF
+
+namespace Config
+{
+	public class Data
+	{
+		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,8 +1,9 @@
 ///
-/// Copyright (c) 2013-2017 Sensus Metering Systems
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 
 namespace Config.Entities
 {
@@ -12,27 +13,34 @@ namespace Config.Entities
 		public virtual int    ItemNr { get; set; }
 		public virtual string Name { get; set; }
         public virtual string OriName { get; set; }         /// Not mapped to database
-        public virtual float  Qfrom { get; set; }           /// Water flow in [m3/h]
-        public virtual float  Qto { get; set; }             /// Water flow in [m3/h]
+        public virtual double Qfrom { get; set; }           /// Water flow in [m3/h]
+        public virtual double Qto { get; set; }             /// Water flow in [m3/h]
+        public virtual Unit   FlowUnit { get; set; }        /// Not mapped to database, used in UI
         public virtual string Selector { get; set; }
         public virtual string TempMtrUp { get; set; }
         public virtual string TempMtrDown { get; set; }
         public virtual string PressMtrUp { get; set; }
         public virtual string PressMtrDown { get; set; }
 		public virtual string PressMtrDelta { get; set; }
+		public virtual string ElectricMtrUp { get; set; }
+		public virtual string ElectricMtrDown { get; set; }
+		public virtual string ElectricMtrDelta { get; set; }
 		public virtual string StopBFValve { get; set; }
 
         /// Valves		
 		public virtual string ValvesOpen { get; set; }
 		public virtual string ValvesClose { get; set; }
 
+        public virtual bool QfromTextChngd { get; set; }    /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
+        public virtual bool QtoTextChngd { get; set; }      /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
+
         /// ------------- Additional stuff not mapped into the database -------------
 
 		public BenchPath()
         {
 			ValvesOpen  = string.Empty;
 			ValvesClose = string.Empty;
-		}
+        }
 
 		public BenchPath(string name, int itemNr)
 			: this()
@@ -47,12 +55,16 @@ namespace Config.Entities
 
 			result.Qfrom         = Qfrom;
             result.Qto           = Qto;
+            result.FlowUnit      = FlowUnit;
             result.Selector      = Selector;
             result.TempMtrUp     = TempMtrUp;
 			result.TempMtrDown   = TempMtrDown;
 			result.PressMtrUp    = PressMtrUp;
 			result.PressMtrDown  = PressMtrDown;
 			result.PressMtrDelta = PressMtrDelta;
+			result.ElectricMtrUp    = ElectricMtrUp;
+			result.ElectricMtrDown  = ElectricMtrDown;
+			result.ElectricMtrDelta = ElectricMtrDelta;
 			result.StopBFValve   = StopBFValve;
 			result.ValvesOpen    = ValvesOpen;
 			result.ValvesClose   = ValvesClose;

Config/Entities/FeedingPath.cs

@@ -1,27 +1,32 @@
 ///
-/// Copyright (c) 2013-2017 Sensus Metering Systems
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 
 namespace Config.Entities
 {
 	public class FeedingPath : IHasName, IHasItemNr, IHasValves
     {
-        public virtual int Id { get; protected set; }
-		public virtual int ItemNr { get; set; }
+        public virtual int    Id { get; protected set; }
+		public virtual int    ItemNr { get; set; }
 		public virtual string Name { get; set; }
         public virtual string OriName { get; set; }         /// Not mapped to database
-        public virtual float Qfrom { get; set; }            /// Water flow in [m3/h]
-        public virtual float Qto { get; set; }              /// Water flow in [m3/h]
+        public virtual double Qfrom { get; set; }           /// Water flow in [m3/h]
+        public virtual double Qto { get; set; }             /// Water flow in [m3/h]
+        public virtual Unit   FlowUnit { get; set; }        /// Not mapped to database, used in UI
         public virtual string Selector { get; set; }
 		public virtual string Pump { get; set; }
-        public virtual string RegVPositions { get; set; }	/// Positions of regulation valves in % separated by ';'
+        public virtual string RegVPositions { get; set; }	/// Positions of regulation valves in Category.Feeding 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()
@@ -43,6 +48,7 @@ namespace Config.Entities
 
 			result.Qfrom         = Qfrom;
             result.Qto           = Qto;
+            result.FlowUnit      = FlowUnit;
             result.Selector      = Selector;
 			result.Pump          = Pump;
             result.RegVPositions = RegVPositions;

Config/Entities/MeasurementCorrection.cs

@@ -1,17 +1,17 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 
 namespace Config.Entities
 {
-	public class MeasurementCorrection : Common.IMeasurementCorrection
+    public class MeasurementCorrection : Common.IMeasurementCorrection, IComparable<MeasurementCorrection>
 	{
 		public virtual int Id { get; protected set; }
         public virtual int RangeIx { get; set; }        /// 0..5
-		public virtual float Measurement { get; set; }
-		public virtual float Correction { get; set; }
+		public virtual double Measurement { get; set; }
+		public virtual double Correction { get; set; }
 
         public MeasurementCorrection()
         {
@@ -23,6 +23,11 @@ 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.
@@ -76,5 +81,10 @@ 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);
+        }
     }
 }

Config/Entities/OutputPath.cs

@@ -1,46 +1,56 @@
 ///
-/// Copyright (c) 2013-2017 Sensus Metering Systems
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 
 namespace Config.Entities
 {
 	public class 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 double Qfrom { get; set; }			/// Water flow in [m3/h]
+        public virtual double Qto { get; set; }				/// Water flow in [m3/h]
+        public virtual Unit   FlowUnit { get; set; }        /// Not mapped to database, used in UI
         public virtual string Selector { get; set; }
         public virtual string RegValve { get; set; }
-		public virtual string FlowMeter { get; set; }
-		public virtual float PidCoef { get; set; }			/// PID coefficient for the regulation path
+        public virtual int RegulMinStep { get; set; }
+        public virtual string FlowMeter { get; set; }
+        public virtual float  PidCoef { get; set; }			/// PID coefficient for the regulation path
         public virtual string StartValve { get; set; }
         public virtual string Diverter { get; set; }
 		public virtual string TempMtrDiv { get; set; }
 		public virtual string Scale { get; set; }
+        public virtual string RegVPositions { get; set; }	/// Positions of regulation valves in Category.Output 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;
-		}
+            RegulMinStep = 0;
+        }
 
 		public OutputPath(string name, int itemNr)
 			: this()
 		{
 			Name = name;
 			ItemNr = itemNr;
-		}
+            RegulMinStep = 0;
+
+        }
 
 		public virtual OutputPath Clone(string name, int itemNr)
         {
@@ -49,14 +59,17 @@ namespace Config.Entities
 			result.Name        = Name;
 			result.Qfrom       = Qfrom;
             result.Qto         = Qto;
+            result.FlowUnit    = FlowUnit;
             result.Selector    = Selector;
             result.RegValve    = RegValve;
-			result.FlowMeter   = FlowMeter;
+            result.RegulMinStep = RegulMinStep;
+            result.FlowMeter   = FlowMeter;
 			result.PidCoef     = PidCoef;
             result.StartValve  = StartValve;
 			result.Diverter    = Diverter;
 			result.TempMtrDiv  = TempMtrDiv;
 			result.Scale       = Scale;
+            result.RegVPositions= RegVPositions;
 			result.ValvesOpen  = ValvesOpen;
 			result.ValvesClose = ValvesClose;
 

Config/Entities/PTest.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
+/// Copyright (c) 2019-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Globalization;
@@ -16,7 +16,9 @@ namespace Config.Entities
         public virtual int Id { get; protected set; }
         public virtual int ItemNr { get; set; }
         public virtual string Name { get; set; }
-        public virtual int Part { get; set; }				    /// Part=0 ... test of all WM-s                                                               /// Part>0 ... part of a set of tests with the same Name: subset of WM-s is given by MetersPath
+        public virtual int Part { get; set; }                   /// Part=0 ... test of all WM-s    
+                                                                /// Part>0 ... part of a set of tests with the same Name: subset of WM-s is given by MetersPath
+        public virtual FlowId FlowId { get; set; }
         public virtual double CoefQfrom { get; set; }           /// Water flow low limit in [m3/h]
         public virtual double CoefQto { get; set; }				/// Water flow high limit in [m3/h]
         public virtual double ErrLimLo { get; set; }			/// in [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
@@ -27,6 +29,7 @@ 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; }                   ///
@@ -81,6 +84,7 @@ 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;
@@ -140,6 +144,7 @@ namespace Config.Entities
             result.PressLimHi = PressLimHi;
             result.Publish = Publish;
             result.Evaluate = Evaluate;
+            result.Method = Method;
 
             result.E1 = E1;
             result.E2 = E2;
@@ -183,6 +188,7 @@ namespace Config.Entities
 
             output.WriteLine(Name);
             output.WriteLine(Part);
+            output.WriteLine(((ushort)FlowId).ToString(ci));
             output.WriteLine(CoefQfrom.ToString(ci));
             output.WriteLine(CoefQto.ToString(ci));
             output.WriteLine(ErrLimLo.ToString(ci));
@@ -193,6 +199,7 @@ 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());
@@ -241,16 +248,36 @@ namespace Config.Entities
 
             tst.Name = firstLine;
             tst.Part = int.Parse(input.ReadLine());
+            tst.FlowId = (FlowId)ushort.Parse(input.ReadLine(), ci);
             tst.CoefQfrom = double.Parse(input.ReadLine(), ci);
 			tst.CoefQto = double.Parse(input.ReadLine(), ci);
 			tst.ErrLimLo = double.Parse(input.ReadLine(), ci);
 			tst.ErrLimHi = double.Parse(input.ReadLine(), ci);
 			tst.TempLimLo = double.Parse(input.ReadLine(), ci);
 			tst.TempLimHi = double.Parse(input.ReadLine(), ci);
-            tst.Publish = sbyte.Parse(input.ReadLine());
+            tst.PressLimLo = double.Parse(input.ReadLine(), ci);
+            tst.PressLimHi = double.Parse(input.ReadLine(), ci);
+            tst.Publish = sbyte.Parse(input.ReadLine(), ci);
             tst.Evaluate = bool.Parse(input.ReadLine());
+            tst.Method = input.ReadLine();
 
-            /// TODO (E1 .. E21)
+            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);
 
             tst.Delta_Q_pct = double.Parse(input.ReadLine(), ci);
             tst.Delta_T = double.Parse(input.ReadLine(), ci);
@@ -283,6 +310,7 @@ namespace Config.Entities
 
                                  if (Name != firstLine)               { diff.AppendFormat(fmt, "Name", Name, firstLine); };
             ln = inp.ReadLine(); if (ln != Part.ToString())           { diff.AppendFormat(fmt, "Part", Part.ToString(), ln); };
+            ln = inp.ReadLine(); if (ln != ((ushort)FlowId).ToString()){diff.AppendFormat(fmt, "FlowId", ((ushort)FlowId).ToString(), ln); };
             ln = inp.ReadLine(); if (ln != CoefQfrom.ToString(ci))    { diff.AppendFormat(fmt, "CoefQfrom", CoefQfrom.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != CoefQto.ToString(ci))      { diff.AppendFormat(fmt, "CoefQto", CoefQto.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != ErrLimLo.ToString(ci))     { diff.AppendFormat(fmt, "ErrLimLo", ErrLimLo.ToString(ci), ln); };
@@ -293,6 +321,7 @@ namespace Config.Entities
             ln = inp.ReadLine(); if (ln != PressLimHi.ToString(ci))   { diff.AppendFormat(fmt, "Pressure_max", PressLimHi.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Publish.ToString())        { diff.AppendFormat(fmt, "Publish", Publish.ToString(), ln); };
             ln = inp.ReadLine(); if (ln != Evaluate.ToString())       { diff.AppendFormat(fmt, "Evaluate", Evaluate.ToString(), ln); };
+            ln = inp.ReadLine(); if (ln != Method)                    { diff.AppendFormat(fmt, "Method", Method, ln); };
 
             ln = inp.ReadLine(); if (ln != E1.ToString()) { diff.AppendFormat(fmt, "E1", E1.ToString(), ln); };
             ln = inp.ReadLine(); if (ln != E2.ToString()) { diff.AppendFormat(fmt, "E2", E2.ToString(), ln); };

Config/Entities/Procedure.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -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 float Qn { get; set; }                   ///   - ' ' -
+        public virtual double 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 = Common.GlobalData.GetCurrentUserName();
+            CreationUser = Common.CurrentUser.UserName();
 			CreationTime = DateTime.Now;
 			LastChgUser = CreationUser;
 			LastChgTime = CreationTime;

Config/Entities/Profile.cs

@@ -36,7 +36,7 @@ namespace Config.Entities
 			///
 			/// Default values
 			/// 
-            CreationUser = GlobalData.GetCurrentUserName();
+            CreationUser = CurrentUser.UserName();
 			CreationTime = DateTime.Now;
 			LastChgUser = CreationUser;
 			LastChgTime = CreationTime;
@@ -78,6 +78,8 @@ 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();
@@ -96,7 +98,8 @@ namespace Config.Entities
 			result.CreationTime = DateTime.Parse(input.ReadLine(), CultureInfo.InvariantCulture);
             result.LastChgUser = input.ReadLine();
 			result.LastChgTime = DateTime.Parse(input.ReadLine(), CultureInfo.InvariantCulture);
-            string line = input.ReadLine();
+            result.ProfileType = (ProfileType)sbyte.Parse(input.ReadLine());
+            result.ErrorLimitType = (ErrorLimitType)sbyte.Parse(input.ReadLine());
 
             while (true)
             {

Config/Entities/Test.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -19,14 +19,15 @@ namespace Config.Entities
         public virtual string Name { get; set; }	
 		public virtual int Part { get; set; }				/// Part=0 ... test of all WM-s
 															/// Part>0 ... part of a set of tests with the same Name: subset of WM-s is given by MetersPath
-        public virtual TestProfile Profile { get; set; }    /// UserDefined, Protected, UserDefinedHeatMeter, ProtectedHeatMeter
+        public virtual TestProfile Profile { get; set; }    /// UserDefined, UserDefinedCompound, UserDefinedHeatMeter, Protected, ProtectedCompound, 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 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 double Qtg { get; set; }             /// When == -1 => Qtg is determined by the test method, otherwise Qtg is in [m3/h], 
+        public virtual double Qfrom { get; set; }			/// Water flow low limit in [m3/h] or in [%] of Qtg
+        public virtual double Qto { get; set; }				/// Water flow high limit in [m3/h] or in [%] of Qtg
+        public virtual bool IsFromToInPct { get; set; }     /// true: Qfrom and Qto are in % of Qtg, false: Qfrom and Qto are in [m3/h]
+		public virtual double Volume { get; set; }			/// Test volume (target) in [l]
+        public virtual double TestTime { get; set; }	    /// Test time (estimate) in [s]
         public virtual 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 +35,10 @@ namespace Config.Entities
         public virtual int Repeats { get; set; }
         public virtual bool DoDraining { get; set; }
         public virtual bool DoDrainingAfter { get; set; }
-		public virtual bool DoControlWaterTemp { get; set; }
 		public virtual float TempLimLo { get; set; }		/// Lower limit for the controlled temperature
 		public virtual float TempLimHi { get; set; }		/// Upper limit for the controlled temperature
-		public virtual float PumpPower { get; set; }		/// Power of the pump in [%] in the range 0 .. 100.0f, use values 0% and 100% for non-FM pumps
+        public virtual string TempControl { get; set; }     /// Water temperature controller, null or empty = Do not control water temp
+        public virtual float PumpPower { get; set; }		/// Power of the pump in [%] in the range 0 .. 100.0f, use values 0% and 100% for non-FM pumps
         public virtual int MassRepeats { get; set; }		/// Number of mass. measurements at the beginning/end of test, 0 = default (=5)
         public virtual float MassSpread { get; set; }		/// Max spread of mass. measurements at the beginning/end of test, 0 = default
 		public virtual MassMethod MassMethod { get; set; }	/// method of mass. measurement at the beginning/end of test: false=slow (precise), true=using immediate mass measurement and evaluation
@@ -57,6 +58,11 @@ namespace Config.Entities
 		public virtual string TransBetween { get; set; }
 		public virtual string TransAfter { get; set; }
 
+        public virtual IList<ComponentTest> MoreParams { get; set; }
+
+        public virtual Procedure Procedure { get; set; }
+
+        /// Additional stuff not mapped into the database
         public virtual bool IsOuterLoopStart { get; set; }   /// Not mapped to database
         public virtual bool IsOuterLoopEnd { get; set; }     /// Not mapped to database
 
@@ -72,12 +78,17 @@ namespace Config.Entities
         public virtual Unit TempUnit { get; set; }           /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
         public virtual Unit PressUnit { get; set; }          /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
         public virtual Unit LengthUnit { get; set; }         /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
+	    public virtual Unit ElectricUnit { get; set; }         /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
 
-		public virtual IList<ComponentTest> MoreParams { get; set; }
-
-		public virtual Procedure Procedure { get; set; }
-
-        /// ------------- Additional stuff not mapped into the database -------------
+        /// Wrappers        
+        public virtual double QfromM3ph()
+        {
+            return !IsFromToInPct ? Qfrom : Qtg >= 0 ? Qtg * Qfrom / 100 : 0;
+        }
+        public virtual double QtoM3ph()
+        {
+            return !IsFromToInPct ? Qto : Qtg >= 0 ? Qtg * Qto / 100 : 0;
+        }
 
         public Test()
         {
@@ -90,15 +101,16 @@ namespace Config.Entities
             Profile = TestProfile.UserDefined;
             Publish = (sbyte)Common.Publish.Always;
 			DoEvaluate = true;
-			Repeats = 1;
+            IsFromToInPct = false;
+            ErrLimLo = -2.0f;				/// [%] lower error limit
+            ErrLimHi = 2.0f;				/// [%] upper error limit
+            Uncertainty = 0;
+            Repeats = 1;
 			DoDraining = false;
 			DoDrainingAfter = false;
-			DoControlWaterTemp = false;
 			TempLimLo = 15.0f;
 			TempLimHi = 25.0f;
-			ErrLimLo = -2.0f;				/// [%] lower error limit
-			ErrLimHi = 2.0f;				/// [%] upper error limit
-			Uncertainty = 0;
+            TempControl = string.Empty;
             PumpPower = 60.0f;				/// [%]
             MassRepeats = 0;				/// default
             MassSpread = 0;					/// default
@@ -159,7 +171,8 @@ namespace Config.Entities
             result.Qtg = Qtg;
 			result.Qfrom = Qfrom;
             result.Qto = Qto;
-			result.Volume = Volume;
+            result.IsFromToInPct = IsFromToInPct;
+            result.Volume = Volume;
 			result.TestTime = TestTime;
 			result.Method = Method;
 			result.ErrLimLo = ErrLimLo;
@@ -168,10 +181,10 @@ namespace Config.Entities
 			result.Repeats = Repeats;
             result.DoDraining = DoDraining;
             result.DoDrainingAfter = DoDrainingAfter;
-			result.DoControlWaterTemp = DoControlWaterTemp;
 			result.TempLimLo = TempLimLo;
 			result.TempLimHi = TempLimHi;
-			result.PumpPower = PumpPower;
+            result.TempControl = TempControl;
+            result.PumpPower = PumpPower;
             result.MassRepeats = MassRepeats;
             result.MassSpread = MassSpread;
             result.MassMethod = MassMethod;
@@ -192,10 +205,12 @@ namespace Config.Entities
 			result.TransAfter = TransAfter;
             result.VolumeUnit = VolumeUnit;
             result.FlowUnit = FlowUnit;
+            result.FlowUnit = FlowUnit;
             result.MassUnit = MassUnit;
             result.TempUnit = TempUnit;
             result.PressUnit = PressUnit;
             result.LengthUnit = LengthUnit;
+            result.ElectricUnit = ElectricUnit;
             foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone()); }
 
             return result;
@@ -212,6 +227,7 @@ namespace Config.Entities
             output.WriteLine(Qtg.ToString(ci));
             output.WriteLine(Qfrom.ToString(ci));
             output.WriteLine(Qto.ToString(ci));
+            output.WriteLine(IsFromToInPct.ToString());
             output.WriteLine(Volume.ToString(ci));
             output.WriteLine(TestTime.ToString(ci));
             output.WriteLine(Method);
@@ -221,10 +237,10 @@ namespace Config.Entities
             output.WriteLine(Repeats.ToString(ci));
             output.WriteLine(DoDraining.ToString());
             output.WriteLine(DoDrainingAfter.ToString());
-			output.WriteLine(DoControlWaterTemp.ToString());
 			output.WriteLine(TempLimLo.ToString(ci));
 			output.WriteLine(TempLimHi.ToString(ci));
-			output.WriteLine(PumpPower.ToString(ci));
+            output.WriteLine((TempControl != null) ? TempControl : string.Empty);
+            output.WriteLine(PumpPower.ToString(ci));
             output.WriteLine(MassRepeats.ToString(ci));
             output.WriteLine(MassSpread.ToString(ci));
 			output.WriteLine(((byte)MassMethod).ToString(ci));
@@ -261,11 +277,12 @@ 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 = 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.Qtg = double.Parse(input.ReadLine(), ci);
+            tst.Qfrom = double.Parse(input.ReadLine(), ci);
+            tst.Qto = double.Parse(input.ReadLine(), ci);
+            tst.IsFromToInPct = bool.Parse(input.ReadLine());
+            tst.Volume = double.Parse(input.ReadLine(), ci);
+            tst.TestTime = double.Parse(input.ReadLine(), ci);
             tst.Method = input.ReadLine();
 			tst.ErrLimLo = float.Parse(input.ReadLine(), ci);
 			tst.ErrLimHi = float.Parse(input.ReadLine(), ci);
@@ -273,10 +290,10 @@ namespace Config.Entities
 			tst.Repeats = int.Parse(input.ReadLine(), ci);
             tst.DoDraining = bool.Parse(input.ReadLine());
 			tst.DoDrainingAfter = bool.Parse(input.ReadLine());
-			tst.DoControlWaterTemp = bool.Parse(input.ReadLine());
 			tst.TempLimLo = float.Parse(input.ReadLine(), ci);
 			tst.TempLimHi = float.Parse(input.ReadLine(), ci);
-			tst.PumpPower = float.Parse(input.ReadLine(), ci);
+            tst.TempControl = input.ReadLine();
+            tst.PumpPower = float.Parse(input.ReadLine(), ci);
 			tst.MassRepeats = int.Parse(input.ReadLine(), ci);
 			tst.MassSpread = float.Parse(input.ReadLine(), ci);
 			tst.MassMethod = (MassMethod)byte.Parse(input.ReadLine(), ci);
@@ -293,8 +310,11 @@ namespace Config.Entities
             tst.TransBetween = input.ReadLine();
             string line = input.ReadLine();
             tst.Profile = line.Equals(TestProfile.ProtectedHeatMeter.ToString()) ? TestProfile.ProtectedHeatMeter
-                          : line.Equals(TestProfile.UserDefinedHeatMeter.ToString()) ? TestProfile.UserDefinedHeatMeter
-                          : line.Equals(TestProfile.Protected.ToString()) ? TestProfile.Protected : TestProfile.UserDefined;  /// UserDefined is the default
+                        : line.Equals(TestProfile.ProtectedCompound.ToString()) ? TestProfile.ProtectedCompound
+                        : line.Equals(TestProfile.Protected.ToString()) ? TestProfile.Protected
+                        : line.Equals(TestProfile.UserDefinedHeatMeter.ToString()) ? TestProfile.UserDefinedHeatMeter
+                        : line.Equals(TestProfile.UserDefinedCompound.ToString()) ? TestProfile.UserDefinedCompound
+                        : TestProfile.UserDefined;  /// UserDefined is the default
             tst.TransAfter = input.ReadLine();
 
             while (true)
@@ -327,6 +347,7 @@ namespace Config.Entities
             ln = inp.ReadLine(); if (ln != Qtg.ToString(ci))                { diff.AppendFormat(fmt, "Qtg", Qtg.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Qfrom.ToString(ci))              { diff.AppendFormat(fmt, "Qfrom", Qfrom.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Qto.ToString(ci))                { diff.AppendFormat(fmt, "Qto", Qto.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != IsFromToInPct.ToString())        { diff.AppendFormat(fmt, "IsFromToInPct", IsFromToInPct.ToString(), ln); };
             ln = inp.ReadLine(); if (ln != Volume.ToString(ci))             { diff.AppendFormat(fmt, "Volume", Volume.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != TestTime.ToString(ci))           { diff.AppendFormat(fmt, "TstTime", TestTime.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Method)                          { diff.AppendFormat(fmt, "Method", Method, ln); };
@@ -334,11 +355,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, "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 != DoDraining.ToString())           { diff.AppendFormat(fmt, "DoDraining", DoDraining.ToString(), ln); };
+            ln = inp.ReadLine(); if (ln != DoDrainingAfter.ToString())      { diff.AppendFormat(fmt, "DoDrainingAfter", DoDrainingAfter.ToString(), ln); };
             ln = inp.ReadLine(); if (ln != TempLimLo.ToString(ci))          { diff.AppendFormat(fmt, "TempLimLo", TempLimLo.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != TempLimHi.ToString(ci))          { diff.AppendFormat(fmt, "TempLimHi", TempLimHi.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != TempControl)                     { diff.AppendFormat(fmt, "TempController", TempControl, ln); };
             ln = inp.ReadLine(); if (ln != PumpPower.ToString(ci))          { diff.AppendFormat(fmt, "PumpPower", PumpPower.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != MassRepeats.ToString(ci))        { diff.AppendFormat(fmt, "MassRepeats", MassRepeats.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != MassSpread.ToString(ci))         { diff.AppendFormat(fmt, "MassSpread", MassSpread.ToString(ci), ln); };

Config/Entities/User.cs

@@ -157,14 +157,14 @@ namespace Config.Entities
         /// <returns></ returns>
         public virtual bool IsPasswordExpired()
         {
-            if (IsPowerUser() || IsMemberOf(GID.Administrators) || GlobalData.PasswdExpirationPeriodDays == 0)
+            if (IsPowerUser() || IsMemberOf(GID.Administrators) || CurrentUser.PasswdExpirationPeriodDays == 0)
             {
                 /// Password cannot expirate for this user or this feature is disabled in Backup and Security options
                 return false;
             }
 
             /// Password expiration time is 3 months
-            return (DateTime.Now - LastPwChange > new TimeSpan(GlobalData.PasswdExpirationPeriodDays, 0, 0, 0));
+            return (DateTime.Now - LastPwChange > new TimeSpan(CurrentUser.PasswdExpirationPeriodDays, 0, 0, 0));
         }
 
         /// <summary>

Config/FluentCommon.cs

@@ -28,13 +28,13 @@ namespace Config
                 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;
-				}
+                    case DBType.SQLite:
+                        cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
+                        break;
+                }
 
                 switch (database)
                 {
@@ -105,11 +105,11 @@ namespace Config
                     ///
                     var admin = new Config.Entities.User
                     {
-						UserName = GlobalData.AdminUsername,
+						UserName = CurrentUser.AdminUsername,
                         FullName = Strings.Administrator,
                         LastPwChange = DateTime.Now
                     };
-					admin.SetPassword(GlobalData.AdminPassword);
+					admin.SetPassword(CurrentUser.AdminPassword);
 
                     ///
                     /// Prepare all groups, add some of them to admin
@@ -128,10 +128,11 @@ namespace Config
                             case GID.Administrators:
 #if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
                             case GID.TraceabilityManagement:
-#elif KEMPNO_50 || KRAKOW_50 || TORUN_50 || WARSAW_END
+//#elif LANG_PL
+#endif
                             case GID.MetrologicalAuthority:
                             case GID.WaterMeterAuthority:
-#endif
+
                                 admin.AddGroup(group);
                                 session.SaveOrUpdate(group);    /// Save this group
                                 break;

Config/Formulas.cs

@@ -0,0 +1,410 @@
+///
+/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using log4net;
+using Common;
+
+//formulas.cs has been added cause iPerl from master-2 ...MF
+
+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

@@ -21,6 +21,9 @@ namespace Config.Mappings
 			Map(x => x.PressMtrUp);
 			Map(x => x.PressMtrDown);
 			Map(x => x.PressMtrDelta);
+			//Map(x => x.ElectricMtrUp);
+			//Map(x => x.ElectricMtrDown);
+			//Map(x => x.ElectricMtrDelta);
 			Map(x => x.StopBFValve);
 			Map(x => x.ValvesOpen)
 				.CustomType("StringClob")

Config/Mappings/ComponentMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Config.Entities;
@@ -19,7 +19,7 @@ namespace Config.Mappings
 			Map(x => x.LogLevel);
 			Map(x => x.Parameters)
 				.CustomType("StringClob")
-				.CustomSqlType("varchar(8000)");
+				.CustomSqlType("varchar(12000)");
 			HasMany(x => x.Corrections)
 				.OrderBy("Measurement")
 				.Cascade.All();

Config/Mappings/OutputPathMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Config.Entities;
@@ -17,12 +17,14 @@ namespace Config.Mappings
 			Map(x => x.Qto);
             Map(x => x.Selector);
             Map(x => x.RegValve);
-			Map(x => x.FlowMeter);
+			Map(x => x.RegulMinStep).Nullable();//older databases may not have this column
+            Map(x => x.FlowMeter);
 			Map(x => x.PidCoef);
             Map(x => x.StartValve);
             Map(x => x.Diverter);
 			Map(x => x.TempMtrDiv);
 			Map(x => x.Scale);
+            Map(x => x.RegVPositions);
 			Map(x => x.ValvesOpen)
 				.CustomType("StringClob")
 				.CustomSqlType("varchar(8000)");

Config/Mappings/PTestMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
+/// Copyright (c) 2019-2023 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Config.Entities;
@@ -14,6 +14,7 @@ namespace Config.Mappings
             Map(x => x.ItemNr);
 			Map(x => x.Name);
             Map(x => x.Part);
+            Map(x => x.FlowId);
             Map(x => x.CoefQfrom);
 			Map(x => x.CoefQto);
             Map(x => x.ErrLimLo);
@@ -24,6 +25,7 @@ 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-2017 Sensus Metering Systems
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Config.Entities;
@@ -20,15 +20,16 @@ namespace Config.Mappings
             Map(x => x.Qtg);
             Map(x => x.Qfrom);
 			Map(x => x.Qto);
-			Map(x => x.Volume);
+            Map(x => x.IsFromToInPct);
+            Map(x => x.Volume);
 			Map(x => x.TestTime);
 			Map(x => x.Repeats);
             Map(x => x.DoDraining);
             Map(x => x.DoDrainingAfter);
-            Map(x => x.DoControlWaterTemp);
             Map(x => x.TempLimLo);
 			Map(x => x.TempLimHi);
-			Map(x => x.PumpPower);
+            Map(x => x.TempControl);
+            Map(x => x.PumpPower);
             Map(x => x.MassRepeats);
             Map(x => x.MassSpread);
 			Map(x => x.MassMethod)

Config/PurchaseResources.cs

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

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

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

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

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

DeviceTest/DeviceTest.csproj

@@ -40,9 +40,8 @@
     <StartupObject>DeviceTest.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

DeviceTest/DeviceTestDlg.cs

@@ -423,7 +423,7 @@ namespace DeviceTest
 			{
 				parentCfg = parentFactory.DefaultConfig();
 			}
-            ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+            ComponentParametersDlg cfgForm = new ComponentParametersDlg(this);
             cfgForm.CmpntEntities = new List<Config.Entities.Component>();
 
             IComponentCfgCtrl cfgControl = parentCfg.GetControl(cfgForm.CmpntEntities);
@@ -452,7 +452,7 @@ namespace DeviceTest
 			{
 				component1Cfg = component1Factory.DefaultConfig();
 			}
-			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+			ComponentParametersDlg cfgForm = new ComponentParametersDlg(this);
 			///
 			var compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
@@ -486,7 +486,7 @@ namespace DeviceTest
 			{
 				component2Cfg = component2Factory.DefaultConfig();
 			}
-			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+			ComponentParametersDlg cfgForm = new ComponentParametersDlg(this);
 			///
 			var compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
@@ -521,7 +521,7 @@ namespace DeviceTest
 			{
 				component3Cfg = component3Factory.DefaultConfig();
 			}
-			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+			ComponentParametersDlg cfgForm = new ComponentParametersDlg(this);
 			///
 			var compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
@@ -678,11 +678,16 @@ namespace DeviceTest
 			{
 				operation1 = (tbfComponent1forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent1forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
+			else if (tbfComponent1forOp is TBF.Rig.Modbus.TempControl.Easytherm.TControl)
 			{
-				operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.TempControl.Easytherm.TControl).SetTemperatureSetpointOp(10);
+                operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.TempControl.Easytherm.TControl).SetTemperatureSetpointOp(20);
 			}
+            else if (tbfComponent1forOp is TBF.Rig.Modbus.TempControl.Novus.TControl)
+            {
+                operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.TempControl.Novus.TControl).SetTemperatureSetpointOp(10);
+                operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.TempControl.Novus.TControl).SetTemperatureSetpointOp(20);
+            }
             else if (tbfComponent1forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
                 operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
@@ -717,11 +722,16 @@ namespace DeviceTest
 			{
 				operation21 = (tbfComponent2forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent2forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
+            else if (tbfComponent2forOp is TBF.Rig.Modbus.TempControl.Easytherm.TControl)
 			{
-				operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+                operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.TempControl.Easytherm.TControl).SetTemperatureSetpointOp(10);
+                operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.TempControl.Easytherm.TControl).SetTemperatureSetpointOp(20);
 			}
+            else if (tbfComponent2forOp is TBF.Rig.Modbus.TempControl.Novus.TControl)
+            {
+                operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.TempControl.Novus.TControl).SetTemperatureSetpointOp(10);
+                operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.TempControl.Novus.TControl).SetTemperatureSetpointOp(20);
+            }
             else if (tbfComponent2forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
                 operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
@@ -756,11 +766,16 @@ namespace DeviceTest
 			{
 				operation31 = (tbfComponent3forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent3forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
-			{
-				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.TempControl.Easytherm.TControl)
+            {
+                operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.TempControl.Easytherm.TControl).SetTemperatureSetpointOp(10);
+                operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.TempControl.Easytherm.TControl).SetTemperatureSetpointOp(20);
+            }
+            else if (tbfComponent3forOp is TBF.Rig.Modbus.TempControl.Novus.TControl)
+            {
+                operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.TempControl.Novus.TControl).SetTemperatureSetpointOp(10);
+                operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.TempControl.Novus.TControl).SetTemperatureSetpointOp(20);
+            }
             else if (tbfComponent3forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
                 operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
@@ -884,6 +899,8 @@ namespace DeviceTest
 		{
 			Cursor = Cursors.WaitCursor;
 
+            CurrentUser.Restore(this);
+
 			if (workerThread != null)
 			{
 				workerThreadRunning = false;

DeviceTest/packages.config

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

EventViewer/EventViewerWnd.cs

@@ -291,7 +291,7 @@ namespace EventViewer
         {
             try
             {
-                GlobalData.RemoteUsersDB = new DBSettings(DBType.MySql, Program.LocalSettings.UsersDBConnString);
+                CurrentUser.RemoteUsersDB = new DBSettings(DBType.MySql, Program.LocalSettings.UsersDBConnString);
                 SharedDatabase.Forms.LoginDlg dlg = new SharedDatabase.Forms.LoginDlg();
                 if (dlg.ShowDialog() == DialogResult.OK)
                 {

Events/Events.csproj

@@ -1,69 +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>{5D9B49E3-CDF9-4A27-80B4-58141D0EB0E0}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Events</RootNamespace>
-    <AssemblyName>Events</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </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>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FluentNHibernate">
-      <HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="Iesi.Collections">
-      <HintPath>..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="MySql.Data">
-      <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate">
-      <HintPath>..\packages\NHibernate.4.0.4.4000\lib\net40\NHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <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="Properties\AssemblyInfo.cs" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

Events/bin/Debug/Iesi.Collections.xml

@@ -0,0 +1,541 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>Iesi.Collections</name>
+    </assembly>
+    <members>
+        <member name="T:Iesi.Collections.Generic.LinkedHashSet`1">
+            <summary>
+            Implementation of ISet that also maintains a linked list over all elements.
+            Enumeration of this set is guaranteed to return the elements in the order
+            they were added.
+            </summary>
+        </member>
+        <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.System#Collections#Generic#IEnumerable{T}#GetEnumerator">
+            <summary>
+            Returns an enumerator that iterates through the collection.
+            </summary>
+            <returns>
+            A <see cref="T:System.Collections.Generic.IEnumerator`1"/> that can be used to iterate through the collection.
+            </returns>
+            <filterpriority>1</filterpriority>
+        </member>
+        <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.System#Collections#IEnumerable#GetEnumerator">
+            <summary>
+            Returns an enumerator that iterates through a collection.
+            </summary>
+            <returns>
+            An <see cref="T:System.Collections.IEnumerator"/> object that can be used to iterate through the collection.
+            </returns>
+            <filterpriority>2</filterpriority>
+        </member>
+        <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.System#Collections#Generic#ICollection{T}#Add(`0)">
+            <summary>
+            Adds an item to the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </summary>
+            <param name="item">The object to add to the <see cref="T:System.Collections.Generic.ICollection`1"/>.</param><exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.Clear">
+            <summary>
+            Removes all items from the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </summary>
+            <exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only. </exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.Contains(`0)">
+            <summary>
+            Determines whether the <see cref="T:System.Collections.Generic.ICollection`1"/> contains a specific value.
+            </summary>
+            <returns>
+            true if <paramref name="item"/> is found in the <see cref="T:System.Collections.Generic.ICollection`1"/>; otherwise, false.
+            </returns>
+            <param name="item">The object to locate in the <see cref="T:System.Collections.Generic.ICollection`1"/>.</param>
+        </member>
+        <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.CopyTo(`0[],System.Int32)">
+            <summary>
+            Copies the elements of the <see cref="T:System.Collections.Generic.ICollection`1"/> to an <see cref="T:System.Array"/>, starting at a particular <see cref="T:System.Array"/> index.
+            </summary>
+            <param name="array">The one-dimensional <see cref="T:System.Array"/> that is the destination of the elements copied from <see cref="T:System.Collections.Generic.ICollection`1"/>. The <see cref="T:System.Array"/> must have zero-based indexing.</param><param name="arrayIndex">The zero-based index in <paramref name="array"/> at which copying begins.</param><exception cref="T:System.ArgumentNullException"><paramref name="array"/> is null.</exception><exception cref="T:System.ArgumentOutOfRangeException"><paramref name="arrayIndex"/> is less than 0.</exception><exception cref="T:System.ArgumentException"><paramref name="array"/> is multidimensional.-or-The number of elements in the source <see cref="T:System.Collections.Generic.ICollection`1"/> is greater than the available space from <paramref name="arrayIndex"/> to the end of the destination <paramref name="array"/>.-or-Type <paramref name="T"/> cannot be cast automatically to the type of the destination <paramref name="array"/>.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.Remove(`0)">
+            <summary>
+            Removes the first occurrence of a specific object from the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </summary>
+            <returns>
+            true if <paramref name="item"/> was successfully removed from the <see cref="T:System.Collections.Generic.ICollection`1"/>; otherwise, false. This method also returns false if <paramref name="item"/> is not found in the original <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </returns>
+            <param name="item">The object to remove from the <see cref="T:System.Collections.Generic.ICollection`1"/>.</param><exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.UnionWith(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Modifies the current set so that it contains all elements that are present in either the current set or the specified collection.
+            </summary>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.IntersectWith(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Modifies the current set so that it contains only elements that are also in a specified collection.
+            </summary>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.ExceptWith(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Removes all elements in the specified collection from the current set.
+            </summary>
+            <param name="other">The collection of items to remove from the set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.SymmetricExceptWith(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Modifies the current set so that it contains only elements that are present either in the current set or in the specified collection, but not both. 
+            </summary>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.IsSubsetOf(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Determines whether a set is a subset of a specified collection.
+            </summary>
+            <returns>
+            true if the current set is a subset of <paramref name="other"/>; otherwise, false.
+            </returns>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.IsSupersetOf(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Determines whether the current set is a superset of a specified collection.
+            </summary>
+            <returns>
+            true if the current set is a superset of <paramref name="other"/>; otherwise, false.
+            </returns>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.IsProperSupersetOf(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Determines whether the current set is a correct superset of a specified collection.
+            </summary>
+            <returns>
+            true if the <see cref="T:System.Collections.Generic.ISet`1"/> object is a correct superset of <paramref name="other"/>; otherwise, false.
+            </returns>
+            <param name="other">The collection to compare to the current set. </param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.IsProperSubsetOf(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Determines whether the current set is a proper (strict) subset of a specified collection.
+            </summary>
+            <returns>
+            true if the current set is a correct subset of <paramref name="other"/>; otherwise, false.
+            </returns>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.Overlaps(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Determines whether the current set overlaps with the specified collection.
+            </summary>
+            <returns>
+            true if the current set and <paramref name="other"/> share at least one common element; otherwise, false.
+            </returns>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.SetEquals(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Determines whether the current set and the specified collection contain the same elements.
+            </summary>
+            <returns>
+            true if the current set is equal to <paramref name="other"/>; otherwise, false.
+            </returns>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.Add(`0)">
+            <summary>
+            Adds an element to the current set and returns a value to indicate if the element was successfully added. 
+            </summary>
+            <returns>
+            true if the element is added to the set; false if the element is already in the set.
+            </returns>
+            <param name="item">The element to add to the set.</param>
+        </member>
+        <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.CountOthers(System.Collections.Generic.IEnumerable{`0},System.Int32@)">
+            <summary>
+            Count the elements in the given collection and determine both the total
+            count and how many of the elements that are present in the current set.
+            </summary>
+        </member>
+        <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.AsSet(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Cast the given collection to an ISet&lt;T&gt; if possible. If not,
+            return a new set containing the items.
+            </summary>
+        </member>
+        <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.Unlink(Iesi.Collections.Generic.LinkedHashSet{`0}.LinkedHashNode{`0})">
+            <summary>
+            Unlink a node from the linked list by updating the node pointers in
+            its preceeding and subsequent node. Also update the _first and _last
+            pointers if necessary.
+            </summary>
+        </member>
+        <member name="P:Iesi.Collections.Generic.LinkedHashSet`1.Count">
+            <summary>
+            Gets the number of elements contained in the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </summary>
+            <returns>
+            The number of elements contained in the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </returns>
+        </member>
+        <member name="P:Iesi.Collections.Generic.LinkedHashSet`1.System#Collections#Generic#ICollection{T}#IsReadOnly">
+            <summary>
+            Gets a value indicating whether the <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only.
+            </summary>
+            <returns>
+            true if the <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only; otherwise, false.
+            </returns>
+        </member>
+        <member name="T:Iesi.Collections.Generic.ReadOnlySet`1">
+            <summary>
+            <p>Implements a read-only <c>Set</c> wrapper.</p> 
+            <p>Although this is advertised as immutable, it really isn't.  Anyone with access to the
+            wrapped set can still change the set.</p>
+            </summary>
+        </member>
+        <member name="M:Iesi.Collections.Generic.ReadOnlySet`1.#ctor(System.Collections.Generic.ISet{`0})">
+            <summary>
+            Constructs an immutable (read-only) <c>Set</c> wrapper.
+            </summary>
+            <param name="basisSet">The <c>Set</c> that is wrapped.</param>
+        </member>
+        <member name="M:Iesi.Collections.Generic.ReadOnlySet`1.System#Collections#IEnumerable#GetEnumerator">
+            <summary>
+            Returns an enumerator that iterates through a collection.
+            </summary>
+            <returns>
+            An <see cref="T:System.Collections.IEnumerator"/> object that can be used to iterate through the collection.
+            </returns>
+            <filterpriority>2</filterpriority>
+        </member>
+        <member name="M:Iesi.Collections.Generic.ReadOnlySet`1.GetEnumerator">
+            <summary>
+            Returns an enumerator that iterates through the collection.
+            </summary>
+            <returns>
+            A <see cref="T:System.Collections.Generic.IEnumerator`1"/> that can be used to iterate through the collection.
+            </returns>
+            <filterpriority>1</filterpriority>
+        </member>
+        <member name="M:Iesi.Collections.Generic.ReadOnlySet`1.System#Collections#Generic#ICollection{T}#Add(`0)">
+            <summary>
+            Adds an item to the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </summary>
+            <param name="item">The object to add to the <see cref="T:System.Collections.Generic.ICollection`1"/>.</param>
+            <exception cref="T:System.NotSupportedException"> is always thrown</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.ReadOnlySet`1.System#Collections#Generic#ICollection{T}#Clear">
+            <summary>
+            Removes all items from the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </summary>
+            <exception cref="T:System.NotSupportedException"> is always thrown</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.ReadOnlySet`1.Contains(`0)">
+            <summary>
+            Determines whether the <see cref="T:System.Collections.Generic.ICollection`1"/> contains a specific value.
+            </summary>
+            <returns>
+            true if <paramref name="item"/> is found in the <see cref="T:System.Collections.Generic.ICollection`1"/>; otherwise, false.
+            </returns>
+            <param name="item">The object to locate in the <see cref="T:System.Collections.Generic.ICollection`1"/>.</param>
+        </member>
+        <member name="M:Iesi.Collections.Generic.ReadOnlySet`1.CopyTo(`0[],System.Int32)">
+            <summary>
+            Copies the elements of the <see cref="T:System.Collections.Generic.ICollection`1"/> to an <see cref="T:System.Array"/>, starting at a particular <see cref="T:System.Array"/> index.
+            </summary>
+            <param name="array">The one-dimensional <see cref="T:System.Array"/> that is the destination of the elements copied from <see cref="T:System.Collections.Generic.ICollection`1"/>. The <see cref="T:System.Array"/> must have zero-based indexing.</param><param name="arrayIndex">The zero-based index in <paramref name="array"/> at which copying begins.</param><exception cref="T:System.ArgumentNullException"><paramref name="array"/> is null.</exception><exception cref="T:System.ArgumentOutOfRangeException"><paramref name="arrayIndex"/> is less than 0.</exception><exception cref="T:System.ArgumentException"><paramref name="array"/> is multidimensional.-or-The number of elements in the source <see cref="T:System.Collections.Generic.ICollection`1"/> is greater than the available space from <paramref name="arrayIndex"/> to the end of the destination <paramref name="array"/>.-or-Type <paramref name="T"/> cannot be cast automatically to the type of the destination <paramref name="array"/>.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.ReadOnlySet`1.System#Collections#Generic#ICollection{T}#Remove(`0)">
+            <summary>
+            Removes the first occurrence of a specific object from the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </summary>
+            <returns>
+            true if <paramref name="item"/> was successfully removed from the <see cref="T:System.Collections.Generic.ICollection`1"/>; otherwise, false. This method also returns false if <paramref name="item"/> is not found in the original <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </returns>
+            <param name="item">The object to remove from the <see cref="T:System.Collections.Generic.ICollection`1"/>.</param>
+            <exception cref="T:System.NotSupportedException"> is always thrown</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.ReadOnlySet`1.System#Collections#Generic#ISet{T}#Add(`0)">
+            <summary>
+            Adds an element to the current set and returns a value to indicate if the element was successfully added. 
+            </summary>
+            <returns>
+            true if the element is added to the set; false if the element is already in the set.
+            </returns>
+            <param name="item">The element to add to the set.</param>
+            <exception cref="T:System.NotSupportedException"> is always thrown</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.ReadOnlySet`1.System#Collections#Generic#ISet{T}#UnionWith(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Modifies the current set so that it contains all elements that are present in both the current set and in the specified collection.
+            </summary>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+            <exception cref="T:System.NotSupportedException"> is always thrown</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.ReadOnlySet`1.System#Collections#Generic#ISet{T}#IntersectWith(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Modifies the current set so that it contains only elements that are also in a specified collection.
+            </summary>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+            <exception cref="T:System.NotSupportedException"> is always thrown</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.ReadOnlySet`1.System#Collections#Generic#ISet{T}#ExceptWith(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Removes all elements in the specified collection from the current set.
+            </summary>
+            <param name="other">The collection of items to remove from the set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+            <exception cref="T:System.NotSupportedException"> is always thrown</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.ReadOnlySet`1.System#Collections#Generic#ISet{T}#SymmetricExceptWith(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Modifies the current set so that it contains only elements that are present either in the current set or in the specified collection, but not both. 
+            </summary>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+            <exception cref="T:System.NotSupportedException"> is always thrown</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.ReadOnlySet`1.IsSubsetOf(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Determines whether a set is a subset of a specified collection.
+            </summary>
+            <returns>
+            true if the current set is a subset of <paramref name="other"/>; otherwise, false.
+            </returns>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.ReadOnlySet`1.IsSupersetOf(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Determines whether the current set is a superset of a specified collection.
+            </summary>
+            <returns>
+            true if the current set is a superset of <paramref name="other"/>; otherwise, false.
+            </returns>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.ReadOnlySet`1.IsProperSupersetOf(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Determines whether the current set is a correct superset of a specified collection.
+            </summary>
+            <returns>
+            true if the <see cref="T:System.Collections.Generic.ISet`1"/> object is a correct superset of <paramref name="other"/>; otherwise, false.
+            </returns>
+            <param name="other">The collection to compare to the current set. </param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.ReadOnlySet`1.IsProperSubsetOf(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Determines whether the current set is a property (strict) subset of a specified collection.
+            </summary>
+            <returns>
+            true if the current set is a correct subset of <paramref name="other"/>; otherwise, false.
+            </returns>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.ReadOnlySet`1.Overlaps(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Determines whether the current set overlaps with the specified collection.
+            </summary>
+            <returns>
+            true if the current set and <paramref name="other"/> share at least one common element; otherwise, false.
+            </returns>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.ReadOnlySet`1.SetEquals(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Determines whether the current set and the specified collection contain the same elements.
+            </summary>
+            <returns>
+            true if the current set is equal to <paramref name="other"/>; otherwise, false.
+            </returns>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="P:Iesi.Collections.Generic.ReadOnlySet`1.Count">
+            <summary>
+            Gets the number of elements contained in the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </summary>
+            <returns>
+            The number of elements contained in the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </returns>
+        </member>
+        <member name="P:Iesi.Collections.Generic.ReadOnlySet`1.IsReadOnly">
+            <summary>
+            Gets a value indicating whether the <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only.
+            </summary>
+            <returns>
+            True.
+            </returns>
+        </member>
+        <member name="T:Iesi.Collections.Generic.SynchronizedSet`1">
+            <summary>
+            <p>Implements a thread-safe <c>Set</c> wrapper.  The implementation is extremely conservative, 
+            serializing critical sections to prevent possible deadlocks, and locking on everything.
+            The one exception is for enumeration, which is inherently not thread-safe.  For this, you
+            have to <c>lock</c> the <c>SyncRoot</c> object for the duration of the enumeration.</p>
+            </summary>
+        </member>
+        <member name="M:Iesi.Collections.Generic.SynchronizedSet`1.#ctor(System.Collections.Generic.ISet{`0})">
+            <summary>
+            Constructs a thread-safe <c>ISet</c> wrapper.
+            </summary>
+            <param name="basisSet">The <c>Set</c> object that this object will wrap.</param>
+        </member>
+        <member name="M:Iesi.Collections.Generic.SynchronizedSet`1.System#Collections#Generic#ICollection{T}#Add(`0)">
+            <summary>
+            Adds an item to the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </summary>
+            <param name="item">The object to add to the <see cref="T:System.Collections.Generic.ICollection`1"/>.</param><exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.SynchronizedSet`1.Clear">
+            <summary>
+            Removes all items from the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </summary>
+            <exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only. </exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.SynchronizedSet`1.Contains(`0)">
+            <summary>
+            Determines whether the <see cref="T:System.Collections.Generic.ICollection`1"/> contains a specific value.
+            </summary>
+            <returns>
+            true if <paramref name="item"/> is found in the <see cref="T:System.Collections.Generic.ICollection`1"/>; otherwise, false.
+            </returns>
+            <param name="item">The object to locate in the <see cref="T:System.Collections.Generic.ICollection`1"/>.</param>
+        </member>
+        <member name="M:Iesi.Collections.Generic.SynchronizedSet`1.CopyTo(`0[],System.Int32)">
+            <summary>
+            Copies the elements of the <see cref="T:System.Collections.Generic.ICollection`1"/> to an <see cref="T:System.Array"/>, starting at a particular <see cref="T:System.Array"/> index.
+            </summary>
+            <param name="array">The one-dimensional <see cref="T:System.Array"/> that is the destination of the elements copied from <see cref="T:System.Collections.Generic.ICollection`1"/>. The <see cref="T:System.Array"/> must have zero-based indexing.</param><param name="arrayIndex">The zero-based index in <paramref name="array"/> at which copying begins.</param><exception cref="T:System.ArgumentNullException"><paramref name="array"/> is null.</exception><exception cref="T:System.ArgumentOutOfRangeException"><paramref name="arrayIndex"/> is less than 0.</exception><exception cref="T:System.ArgumentException"><paramref name="array"/> is multidimensional.-or-The number of elements in the source <see cref="T:System.Collections.Generic.ICollection`1"/> is greater than the available space from <paramref name="arrayIndex"/> to the end of the destination <paramref name="array"/>.-or-Type <paramref name="T"/> cannot be cast automatically to the type of the destination <paramref name="array"/>.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.SynchronizedSet`1.Remove(`0)">
+            <summary>
+            Removes the first occurrence of a specific object from the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </summary>
+            <returns>
+            true if <paramref name="item"/> was successfully removed from the <see cref="T:System.Collections.Generic.ICollection`1"/>; otherwise, false. This method also returns false if <paramref name="item"/> is not found in the original <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </returns>
+            <param name="item">The object to remove from the <see cref="T:System.Collections.Generic.ICollection`1"/>.</param><exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.SynchronizedSet`1.UnionWith(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Modifies the current set so that it contains all elements that are present in either the current set or in the specified collection.
+            </summary>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.SynchronizedSet`1.IntersectWith(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Modifies the current set so that it contains only elements that are also in a specified collection.
+            </summary>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.SynchronizedSet`1.ExceptWith(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Removes all elements in the specified collection from the current set.
+            </summary>
+            <param name="other">The collection of items to remove from the set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.SynchronizedSet`1.SymmetricExceptWith(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Modifies the current set so that it contains only elements that are present either in the current set or in the specified collection, but not both. 
+            </summary>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.SynchronizedSet`1.IsSubsetOf(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Determines whether a set is a subset of a specified collection.
+            </summary>
+            <returns>
+            true if the current set is a subset of <paramref name="other"/>; otherwise, false.
+            </returns>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.SynchronizedSet`1.IsSupersetOf(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Determines whether the current set is a superset of a specified collection.
+            </summary>
+            <returns>
+            true if the current set is a superset of <paramref name="other"/>; otherwise, false.
+            </returns>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.SynchronizedSet`1.IsProperSupersetOf(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Determines whether the current set is a correct superset of a specified collection.
+            </summary>
+            <returns>
+            true if the <see cref="T:System.Collections.Generic.ISet`1"/> object is a correct superset of <paramref name="other"/>; otherwise, false.
+            </returns>
+            <param name="other">The collection to compare to the current set. </param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.SynchronizedSet`1.IsProperSubsetOf(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Determines whether the current set is a property (strict) subset of a specified collection.
+            </summary>
+            <returns>
+            true if the current set is a correct subset of <paramref name="other"/>; otherwise, false.
+            </returns>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.SynchronizedSet`1.Overlaps(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Determines whether the current set overlaps with the specified collection.
+            </summary>
+            <returns>
+            true if the current set and <paramref name="other"/> share at least one common element; otherwise, false.
+            </returns>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.SynchronizedSet`1.SetEquals(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Determines whether the current set and the specified collection contain the same elements.
+            </summary>
+            <returns>
+            true if the current set is equal to <paramref name="other"/>; otherwise, false.
+            </returns>
+            <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
+        </member>
+        <member name="M:Iesi.Collections.Generic.SynchronizedSet`1.Add(`0)">
+            <summary>
+            Adds an element to the current set and returns a value to indicate if the element was successfully added. 
+            </summary>
+            <returns>
+            true if the element is added to the set; false if the element is already in the set.
+            </returns>
+            <param name="item">The element to add to the set.</param>
+        </member>
+        <member name="M:Iesi.Collections.Generic.SynchronizedSet`1.System#Collections#IEnumerable#GetEnumerator">
+            <summary>
+            Returns an enumerator that iterates through a collection. Enumeration is inherently not
+            thread-safe. Use a <c>lock</c> on the <c>SyncRoot</c> to synchronize the entire enumeration process.
+            </summary>
+            <returns>
+            An <see cref="T:System.Collections.IEnumerator"/> object that can be used to iterate through the collection.
+            </returns>
+            <filterpriority>2</filterpriority>
+        </member>
+        <member name="M:Iesi.Collections.Generic.SynchronizedSet`1.GetEnumerator">
+            <summary>
+            Returns an enumerator that iterates through the collection. Enumeration is inherently not
+            thread-safe. Use a <c>lock</c> on the <c>SyncRoot</c> to synchronize the entire enumeration process.
+            </summary>
+            <returns>
+            A <see cref="T:System.Collections.Generic.IEnumerator`1"/> that can be used to iterate through the collection.
+            </returns>
+            <filterpriority>1</filterpriority>
+        </member>
+        <member name="P:Iesi.Collections.Generic.SynchronizedSet`1.Count">
+            <summary>
+            Gets the number of elements contained in the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </summary>
+            <returns>
+            The number of elements contained in the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </returns>
+        </member>
+        <member name="P:Iesi.Collections.Generic.SynchronizedSet`1.IsReadOnly">
+            <summary>
+            Gets a value indicating whether the <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only.
+            </summary>
+            <returns>
+            true if the <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only; otherwise, false.
+            </returns>
+        </member>
+    </members>
+</doc>

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

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

Events/obj/Debug/Events.csproj.CoreCompileInputs.cache

@@ -0,0 +1 @@
+e4ab36b7b0030299e8d3f9c15f8edfab217c00c33b5d908f61099287ac9a64d6

Events/obj/Debug/Events.csproj.FileListAbsolute.txt

@@ -0,0 +1,17 @@
+C:\Users\micha\git\tbf\Events\bin\Debug\Events.dll
+C:\Users\micha\git\tbf\Events\bin\Debug\Events.pdb
+C:\Users\micha\git\tbf\Events\bin\Debug\Common.dll
+C:\Users\micha\git\tbf\Events\bin\Debug\FluentNHibernate.dll
+C:\Users\micha\git\tbf\Events\bin\Debug\Iesi.Collections.dll
+C:\Users\micha\git\tbf\Events\bin\Debug\MySql.Data.dll
+C:\Users\micha\git\tbf\Events\bin\Debug\NHibernate.dll
+C:\Users\micha\git\tbf\Events\bin\Debug\Common.pdb
+C:\Users\micha\git\tbf\Events\bin\Debug\FluentNHibernate.pdb
+C:\Users\micha\git\tbf\Events\bin\Debug\FluentNHibernate.xml
+C:\Users\micha\git\tbf\Events\bin\Debug\Iesi.Collections.xml
+C:\Users\micha\git\tbf\Events\bin\Debug\NHibernate.xml
+C:\Users\micha\git\tbf\Events\obj\Debug\Events.csproj.AssemblyReference.cache
+C:\Users\micha\git\tbf\Events\obj\Debug\Events.csproj.CoreCompileInputs.cache
+C:\Users\micha\git\tbf\Events\obj\Debug\Events.csproj.Up2Date
+C:\Users\micha\git\tbf\Events\obj\Debug\Events.dll
+C:\Users\micha\git\tbf\Events\obj\Debug\Events.pdb

FeatureVectorCalculator/CalculatorWnd.Designer.cs

@@ -30,21 +30,46 @@
         {
             this.rawFileComboBox = new System.Windows.Forms.ComboBox();
             this.browseButton = new System.Windows.Forms.Button();
-            this.processButton = new System.Windows.Forms.Button();
             this.resultsTextBox = new System.Windows.Forms.TextBox();
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
+            this.splitContainer3 = new System.Windows.Forms.SplitContainer();
+            this.tabControl1 = new System.Windows.Forms.TabControl();
+            this.tabPage1 = new System.Windows.Forms.TabPage();
+            this.tabPage2 = new System.Windows.Forms.TabPage();
+            this.tabPage3 = new System.Windows.Forms.TabPage();
+            this.tabPage4 = new System.Windows.Forms.TabPage();
+            this.tabPage5 = new System.Windows.Forms.TabPage();
+            this.tabPage6 = new System.Windows.Forms.TabPage();
+            this.tabPage7 = new System.Windows.Forms.TabPage();
+            this.tabPage8 = 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();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit();
+            this.splitContainer3.Panel1.SuspendLayout();
+            this.splitContainer3.Panel2.SuspendLayout();
+            this.splitContainer3.SuspendLayout();
+            this.tabControl1.SuspendLayout();
             this.SuspendLayout();
             // 
             // rawFileComboBox
             // 
+            this.rawFileComboBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.rawFileComboBox.FormattingEnabled = true;
-            this.rawFileComboBox.Location = new System.Drawing.Point(29, 28);
+            this.rawFileComboBox.Location = new System.Drawing.Point(0, 0);
             this.rawFileComboBox.Name = "rawFileComboBox";
-            this.rawFileComboBox.Size = new System.Drawing.Size(715, 21);
+            this.rawFileComboBox.Size = new System.Drawing.Size(1040, 21);
             this.rawFileComboBox.TabIndex = 0;
             // 
             // browseButton
             // 
-            this.browseButton.Location = new System.Drawing.Point(769, 19);
+            this.browseButton.Location = new System.Drawing.Point(7, 0);
             this.browseButton.Name = "browseButton";
             this.browseButton.Size = new System.Drawing.Size(66, 37);
             this.browseButton.TabIndex = 1;
@@ -52,37 +77,184 @@
             this.browseButton.UseVisualStyleBackColor = true;
             this.browseButton.Click += new System.EventHandler(this.browseButton_Click);
             // 
-            // processButton
-            // 
-            this.processButton.Location = new System.Drawing.Point(29, 66);
-            this.processButton.Name = "processButton";
-            this.processButton.Size = new System.Drawing.Size(91, 46);
-            this.processButton.TabIndex = 2;
-            this.processButton.Text = "Process";
-            this.processButton.UseVisualStyleBackColor = true;
-            this.processButton.Click += new System.EventHandler(this.processButton_Click);
-            // 
             // resultsTextBox
             // 
-            this.resultsTextBox.Location = new System.Drawing.Point(29, 131);
+            this.resultsTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.resultsTextBox.Location = new System.Drawing.Point(0, 0);
             this.resultsTextBox.Multiline = true;
             this.resultsTextBox.Name = "resultsTextBox";
-            this.resultsTextBox.Size = new System.Drawing.Size(715, 181);
+            this.resultsTextBox.Size = new System.Drawing.Size(1127, 156);
             this.resultsTextBox.TabIndex = 3;
             // 
+            // splitContainer1
+            // 
+            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer1.Name = "splitContainer1";
+            this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer1.Panel1
+            // 
+            this.splitContainer1.Panel1.Controls.Add(this.splitContainer2);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Controls.Add(this.tabControl1);
+            this.splitContainer1.Size = new System.Drawing.Size(1127, 733);
+            this.splitContainer1.SplitterDistance = 200;
+            this.splitContainer1.TabIndex = 4;
+            // 
+            // splitContainer2
+            // 
+            this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+            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.splitContainer3);
+            // 
+            // splitContainer2.Panel2
+            // 
+            this.splitContainer2.Panel2.Controls.Add(this.resultsTextBox);
+            this.splitContainer2.Size = new System.Drawing.Size(1127, 200);
+            this.splitContainer2.SplitterDistance = 40;
+            this.splitContainer2.TabIndex = 3;
+            // 
+            // splitContainer3
+            // 
+            this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+            this.splitContainer3.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer3.Name = "splitContainer3";
+            // 
+            // splitContainer3.Panel1
+            // 
+            this.splitContainer3.Panel1.Controls.Add(this.rawFileComboBox);
+            // 
+            // splitContainer3.Panel2
+            // 
+            this.splitContainer3.Panel2.Controls.Add(this.browseButton);
+            this.splitContainer3.Size = new System.Drawing.Size(1127, 40);
+            this.splitContainer3.SplitterDistance = 1040;
+            this.splitContainer3.TabIndex = 0;
+            // 
+            // tabControl1
+            // 
+            this.tabControl1.Controls.Add(this.tabPage1);
+            this.tabControl1.Controls.Add(this.tabPage2);
+            this.tabControl1.Controls.Add(this.tabPage3);
+            this.tabControl1.Controls.Add(this.tabPage4);
+            this.tabControl1.Controls.Add(this.tabPage5);
+            this.tabControl1.Controls.Add(this.tabPage6);
+            this.tabControl1.Controls.Add(this.tabPage7);
+            this.tabControl1.Controls.Add(this.tabPage8);
+            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabControl1.Location = new System.Drawing.Point(0, 0);
+            this.tabControl1.Name = "tabControl1";
+            this.tabControl1.SelectedIndex = 0;
+            this.tabControl1.Size = new System.Drawing.Size(1127, 529);
+            this.tabControl1.TabIndex = 0;
+            // 
+            // tabPage1
+            // 
+            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(1119, 503);
+            this.tabPage1.TabIndex = 0;
+            this.tabPage1.Text = "OffsetV";
+            this.tabPage1.UseVisualStyleBackColor = true;
+            // 
+            // 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(1119, 503);
+            this.tabPage2.TabIndex = 1;
+            this.tabPage2.Text = "KOhmsR";
+            this.tabPage2.UseVisualStyleBackColor = true;
+            // 
+            // tabPage3
+            // 
+            this.tabPage3.Location = new System.Drawing.Point(4, 22);
+            this.tabPage3.Name = "tabPage3";
+            this.tabPage3.Size = new System.Drawing.Size(1119, 503);
+            this.tabPage3.TabIndex = 2;
+            this.tabPage3.Text = "KOhmsC";
+            this.tabPage3.UseVisualStyleBackColor = true;
+            // 
+            // tabPage4
+            // 
+            this.tabPage4.Location = new System.Drawing.Point(4, 22);
+            this.tabPage4.Name = "tabPage4";
+            this.tabPage4.Size = new System.Drawing.Size(1119, 503);
+            this.tabPage4.TabIndex = 3;
+            this.tabPage4.Text = "DutFlowLph";
+            this.tabPage4.UseVisualStyleBackColor = true;
+            // 
+            // tabPage5
+            // 
+            this.tabPage5.Location = new System.Drawing.Point(4, 22);
+            this.tabPage5.Name = "tabPage5";
+            this.tabPage5.Size = new System.Drawing.Size(1119, 503);
+            this.tabPage5.TabIndex = 4;
+            this.tabPage5.Text = "RefFlowLph";
+            this.tabPage5.UseVisualStyleBackColor = true;
+            // 
+            // tabPage6
+            // 
+            this.tabPage6.Location = new System.Drawing.Point(4, 22);
+            this.tabPage6.Name = "tabPage6";
+            this.tabPage6.Size = new System.Drawing.Size(1119, 503);
+            this.tabPage6.TabIndex = 5;
+            this.tabPage6.Text = "FlowRatio";
+            this.tabPage6.UseVisualStyleBackColor = true;
+            // 
+            // tabPage7
+            // 
+            this.tabPage7.Location = new System.Drawing.Point(4, 22);
+            this.tabPage7.Name = "tabPage7";
+            this.tabPage7.Size = new System.Drawing.Size(1119, 503);
+            this.tabPage7.TabIndex = 6;
+            this.tabPage7.Text = "MagField";
+            this.tabPage7.UseVisualStyleBackColor = true;
+            // 
+            // tabPage8
+            // 
+            this.tabPage8.Location = new System.Drawing.Point(4, 22);
+            this.tabPage8.Name = "tabPage8";
+            this.tabPage8.Size = new System.Drawing.Size(1119, 503);
+            this.tabPage8.TabIndex = 7;
+            this.tabPage8.Text = "EmfV";
+            this.tabPage8.UseVisualStyleBackColor = true;
+            // 
             // CalculatorWnd
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(859, 335);
-            this.Controls.Add(this.resultsTextBox);
-            this.Controls.Add(this.processButton);
-            this.Controls.Add(this.browseButton);
-            this.Controls.Add(this.rawFileComboBox);
+            this.ClientSize = new System.Drawing.Size(1127, 733);
+            this.Controls.Add(this.splitContainer1);
             this.Name = "CalculatorWnd";
             this.Text = "Feature vector calculator";
+            this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+            this.splitContainer1.ResumeLayout(false);
+            this.splitContainer2.Panel1.ResumeLayout(false);
+            this.splitContainer2.Panel2.ResumeLayout(false);
+            this.splitContainer2.Panel2.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
+            this.splitContainer2.ResumeLayout(false);
+            this.splitContainer3.Panel1.ResumeLayout(false);
+            this.splitContainer3.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();
+            this.splitContainer3.ResumeLayout(false);
+            this.tabControl1.ResumeLayout(false);
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
@@ -90,8 +262,19 @@
 
         private System.Windows.Forms.ComboBox rawFileComboBox;
         private System.Windows.Forms.Button browseButton;
-        private System.Windows.Forms.Button processButton;
         private System.Windows.Forms.TextBox resultsTextBox;
+        private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.SplitContainer splitContainer2;
+        private System.Windows.Forms.SplitContainer splitContainer3;
+        private System.Windows.Forms.TabControl tabControl1;
+        private System.Windows.Forms.TabPage tabPage1;
+        private System.Windows.Forms.TabPage tabPage2;
+        private System.Windows.Forms.TabPage tabPage3;
+        private System.Windows.Forms.TabPage tabPage4;
+        private System.Windows.Forms.TabPage tabPage5;
+        private System.Windows.Forms.TabPage tabPage6;
+        private System.Windows.Forms.TabPage tabPage7;
+        private System.Windows.Forms.TabPage tabPage8;
     }
 }
 

FeatureVectorCalculator/CalculatorWnd.cs

@@ -4,13 +4,20 @@
 using System;
 using System.IO;
 using System.Windows.Forms;
+using System.Windows.Forms.DataVisualization.Charting;
 using Common.Iperl;
+using System.Globalization;
+using System.Drawing;
 
 namespace FeatureVectorCalculator
 {
     public partial class CalculatorWnd : Form
     {
         public const int MaxOptoDataCount = 40000;
+        public const bool Downsample = true;
+        public const bool Extend = true;
+
+
         OptoTelegramRaw[] optoData;
         Int64 volumeRawExtLast;
         Int64 timestampExtLast;
@@ -27,63 +34,115 @@ namespace FeatureVectorCalculator
             }
         }
 
+        void ClearOutput()
+        {
+            resultsTextBox.Clear();
+            tabControl1.TabPages[0].Controls.Clear();
+            tabControl1.TabPages[1].Controls.Clear();
+            tabControl1.TabPages[2].Controls.Clear();
+            tabControl1.TabPages[3].Controls.Clear();
+            tabControl1.TabPages[4].Controls.Clear();
+            tabControl1.TabPages[5].Controls.Clear();
+            tabControl1.TabPages[6].Controls.Clear();
+            tabControl1.TabPages[7].Controls.Clear();
+        }
+
         private void browseButton_Click(object sender, EventArgs e)
         {
             OpenFileDialog ofd = new OpenFileDialog();
-            var dr = ofd.ShowDialog();
-            rawFileComboBox.Text = ofd.FileName;
+
+            if (ofd.ShowDialog() == DialogResult.OK)
+            {
+                rawFileComboBox.Text = ofd.FileName;
+                ProcessRawDataFile(ofd.FileName);
+            }
         }
 
-        private void processButton_Click(object sender, EventArgs e)
+        void ProcessRawDataFile(string fileName)
         {
-            if (optoData == null) return;
-
             int counter = 0;
             int startIx = -1;
             int endIx = -1;
 
-            using (StreamReader reader = new StreamReader(rawFileComboBox.Text))
+            ClearOutput();
+
+            resultsTextBox.Text = string.Format("File name: {0}{1}", fileName, Environment.NewLine);
+
+            try
             {
-                string line;
-                while ((line = reader.ReadLine()) != null && counter < MaxOptoDataCount)
+                using (StreamReader reader = new StreamReader(fileName))
                 {
-                    int ix = line.IndexOf(" :\t");
-                    
-                    if (ix >= 0)
+                    string line;
+                    while ((line = reader.ReadLine()) != null && counter < MaxOptoDataCount)
                     {
-                        if (optoData[counter].UpdateFromString(line.Substring(ix + 3), counter, 0, ref volumeRawExtLast, ref timestampExtLast, true))
+                        int ix = line.IndexOf(" :\t");
+                        string[] items = line.Split('\t');
+
+                        if (items.Length > 18)
                         {
-                            if (line.EndsWith("####  start test  ####"))
+                            string telegram = string.Format("{0}\t{1}\t{2}\t{3}\t{4}\t{5}\t{6}\r\n",
+                                                            items[2], items[3], items[4], items[5], items[6], items[7], items[8]);
+
+                            if (optoData[counter].UpdateFromString(telegram, counter, 0, ref volumeRawExtLast, ref timestampExtLast))
                             {
-                                startIx = counter;
-                                optoData[counter].Flags = OptoTelegramFlags.OK_TestStart;
-                            }
-                            else if (line.EndsWith("####  end of test  ####"))
-                            {
-                                endIx = counter;
-                                optoData[counter].Flags = OptoTelegramFlags.OK_TestEnd;
+                                if (line.EndsWith("####  start test  ####"))
+                                {
+                                    startIx = counter;
+                                    optoData[counter].Flags = OptoTelegramFlags.OK_TestStart;
+                                }
+                                else if (line.EndsWith("####  end of test  ####"))
+                                {
+                                    endIx = counter;
+                                    optoData[counter].Flags = OptoTelegramFlags.OK_TestEnd;
+                                }
+                                else
+                                {
+                                    optoData[counter].Flags = OptoTelegramFlags.OK;
+                                }
                             }
+
+                            optoData[counter].RefFlow = float.Parse(items[15].Replace(',', '.'), CultureInfo.InvariantCulture);
                         }
-                    }
-                    else
-                    {
-                        optoData[counter].Flags = OptoTelegramFlags.InvalidTelegram;
+                        else
+                        {
+                            optoData[counter].Flags = OptoTelegramFlags.InvalidTelegram;
+                        }
+
+                        counter++;
                     }
 
-                    counter++;
+                    reader.Close();
                 }
-
-                reader.Close();
             }
-
-            float[] featureVector = new float[9];
-            Common.Utils.CalculateFeatureVector(optoData, counter, startIx, endIx, ref featureVector);
-
-            resultsTextBox.Clear();
-            for (int i = 0; i < 9; i++)
+            catch (Exception exc)
             {
-                resultsTextBox.Text += string.Format("X{0} = {1}\r\n", i + 1, featureVector[i]);
+                MessageBox.Show(string.Format("Exception: {0}", exc.Message));
+                return;
             }
+
+            int start = Extend ? 0 : startIx;
+            int end = Extend ? (counter - 1) : endIx;
+            float[] offsetV, kOhmsR, kOhmsC, dutFlow, refFlow, flowRatio, magField, emfV;
+            PointF[] outliers, extendedOutliers;
+            float[] featureVector = Common.StatisticalMetrics.Calculate(optoData, counter, start, end, Downsample,
+                                                                        out offsetV, out kOhmsR, out kOhmsC, out dutFlow,
+                                                                        out refFlow, out flowRatio, out magField, out emfV,
+                                                                        out outliers, out extendedOutliers);
+
+            for (int i = 0; i < Math.Min(9, featureVector.Length); i++)
+            {
+                resultsTextBox.Text += string.Format("X{0} = {1}{2}", i + 1, featureVector[i], Environment.NewLine);
+            }
+
+            float period = Downsample ? 0.5F : 0.125F;
+            if (offsetV != null)   tabControl1.TabPages[0].Controls.Add(SignalChart.GetChart(offsetV,   period, "OffsetV",   "OffsetV [μV]"));
+            if (kOhmsR != null)    tabControl1.TabPages[1].Controls.Add(SignalChart.GetChart(kOhmsR,    period, "kOhmsR",    "kΩ"));
+            if (kOhmsC != null)    tabControl1.TabPages[2].Controls.Add(SignalChart.GetChart(kOhmsC,    period, "kOhmsC",    "kΩ"));
+            if (dutFlow != null)   tabControl1.TabPages[3].Controls.Add(SignalChart.GetChart(dutFlow,   period, "dutFlow",   "L/h"));
+            if (refFlow != null)   tabControl1.TabPages[4].Controls.Add(SignalChart.GetChart(refFlow,   period, "refFlow",   "L/h"));
+            if (flowRatio != null) tabControl1.TabPages[5].Controls.Add(SignalChart.GetChart(flowRatio, period, "flowRatio", "", true, extendedOutliers, outliers));
+            if (magField != null)  tabControl1.TabPages[6].Controls.Add(SignalChart.GetChart(magField,  period, "magField",  "μV", false));
+            if (emfV != null)      tabControl1.TabPages[7].Controls.Add(SignalChart.GetChart(emfV,      period, "emfV",      "μV"));
         }
     }
 }

FeatureVectorCalculator/FeatureVectorCalculator.csproj

@@ -37,6 +37,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Forms.DataVisualization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -55,6 +56,7 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SignalChart.cs" />
     <EmbeddedResource Include="CalculatorWnd.resx">
       <DependentUpon>CalculatorWnd.cs</DependentUpon>
     </EmbeddedResource>

FeatureVectorCalculator/SignalChart.cs

@@ -0,0 +1,108 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Windows.Forms.DataVisualization.Charting;
+
+namespace FeatureVectorCalculator
+{
+    public class SignalChart
+    {
+        public static Chart GetChart(float[] data, float period, string caption, string captionY, bool fromZero = true,
+                                     PointF[] extendedOutliers = null, PointF[] outliers = null)
+        {
+            Series series1 = null, series2 = null, series3 = null;
+
+            series1 = new Series { Name = caption, ChartArea = "area1", ChartType = SeriesChartType.Line, Color = Color.DeepSkyBlue };
+            float minY = float.MaxValue;
+            float maxY = float.MinValue;
+            for (int x = 0; x < data.Length; x++)
+            {
+                float y = data[x];
+                if (minY > y) minY = y;
+                if (maxY < y) maxY = y;
+                series1.Points.AddXY(x * period, y);
+            }
+
+            if (extendedOutliers != null)
+            {
+                series2 = new Series { Name = "extended outliers", ChartArea = "area1", ChartType = SeriesChartType.Point, Color = Color.Yellow };
+                for (int i = 0; i < extendedOutliers.Length; i++)
+                {
+                    series2.Points.AddXY(extendedOutliers[i].X * period, extendedOutliers[i].Y);
+                }
+            }
+
+            if (outliers != null)
+            {
+                series3 = new Series { Name = "outliers", ChartArea = "area1", ChartType = SeriesChartType.Point, Color = Color.DarkRed };
+                for (int i = 0; i < outliers.Length; i++)
+                {
+                    series3.Points.AddXY(outliers[i].X * period, outliers[i].Y);
+                }
+            }
+
+            ChartArea chArea = new ChartArea { Name = "area1" };            
+            chArea.AxisX.Title = "Time [s]";
+            chArea.AxisX.IsLogarithmic = false;
+            chArea.AxisX.IsLabelAutoFit = true;
+            chArea.AxisX.Minimum = 0;
+            chArea.AxisX.Maximum = (data.Length - 1) * period;
+            // for (int j = i; j < i + 3; j++)
+            // {
+            //     CustomLabel cl = new CustomLabel();
+            //     cl.Text = string.Format("{0} {1}", xs[j], flowUnit.ToDescription());
+            //     cl.FromPosition = Math.Log10(xs[j] * spacer);
+            //     cl.ToPosition = Math.Log10(xs[j] / spacer);
+            //     chArea.AxisX.CustomLabels.Add(cl);
+            // }
+
+            chArea.AxisY.Title = captionY;
+            chArea.AxisY.IsLogarithmic = false;
+            chArea.AxisY.IsLabelAutoFit = true;
+            
+            if (!fromZero)
+            {
+                /// fromZero = false
+                chArea.AxisY.IsStartedFromZero = false;
+                float diff = maxY - minY;
+                chArea.AxisY.Minimum = minY - 0.05 * diff;
+                chArea.AxisY.Maximum = maxY + 0.05 * diff;
+            }
+            else if (minY >= 0)
+            {
+                /// fromZero = true, All points are above zero
+                chArea.AxisY.IsStartedFromZero = true;
+                chArea.AxisY.Minimum = 0;
+                chArea.AxisY.Maximum = 1.05 * maxY;
+            }
+            else if (maxY <= 0)
+            {
+                /// fromZero = true, All points are below zero
+                chArea.AxisY.IsStartedFromZero = true;
+                chArea.AxisY.Minimum = 1.05 * minY;
+                chArea.AxisY.Maximum = 0;
+            }
+            else
+            {
+                /// Points are both below and above zero
+                chArea.AxisY.IsStartedFromZero = false;
+                float diff = maxY - minY;
+                chArea.AxisY.Minimum = minY - 0.05 * diff;
+                chArea.AxisY.Maximum = maxY + 0.05 * diff;
+            }
+            
+            if (chArea.AxisY.Maximum == chArea.AxisY.Minimum)
+            {
+                chArea.AxisY.Maximum = chArea.AxisY.Maximum + 1;
+            }
+
+            Chart chart = new Chart { Text = caption, Dock = DockStyle.Fill };
+            chart.ChartAreas.Add(chArea);
+            chart.Series.Add(series1);
+            if (series2 != null) chart.Series.Add(series2);
+            if (series3 != null) chart.Series.Add(series3);
+
+            return chart;
+        }
+    }
+}

GenCode128/GenCode128.csproj

@@ -35,7 +35,7 @@
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
@@ -76,6 +76,7 @@
     <WarningLevel>4</WarningLevel>
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -99,6 +100,7 @@
     <WarningLevel>4</WarningLevel>
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System">

GenericTest/GenericTest.csproj

@@ -49,7 +49,7 @@
       <HintPath>..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
     </Reference>
     <Reference Include="log4net">
-      <HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
+      <HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="MySql.Data">
       <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>

GenericTest/GenericTestDlg.Designer.cs

@@ -130,7 +130,7 @@
             this.vertSplitContainer.Panel2.Controls.Add(this.startButton);
             this.vertSplitContainer.Panel2.Controls.Add(this.stopButton);
             this.vertSplitContainer.Size = new System.Drawing.Size(1033, 151);
-            this.vertSplitContainer.SplitterDistance = 942;
+            this.vertSplitContainer.SplitterDistance = 945;
             this.vertSplitContainer.SplitterWidth = 1;
             this.vertSplitContainer.TabIndex = 2;
             // 
@@ -140,7 +140,7 @@
             this.resultsGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.resultsGroupBox.Location = new System.Drawing.Point(0, 0);
             this.resultsGroupBox.Name = "resultsGroupBox";
-            this.resultsGroupBox.Size = new System.Drawing.Size(942, 151);
+            this.resultsGroupBox.Size = new System.Drawing.Size(945, 151);
             this.resultsGroupBox.TabIndex = 1;
             this.resultsGroupBox.TabStop = false;
             this.resultsGroupBox.Text = "Aktivita";
@@ -152,7 +152,7 @@
             this.activityListView.Location = new System.Drawing.Point(3, 16);
             this.activityListView.Name = "activityListView";
             this.activityListView.Scrollable = false;
-            this.activityListView.Size = new System.Drawing.Size(936, 132);
+            this.activityListView.Size = new System.Drawing.Size(939, 132);
             this.activityListView.TabIndex = 0;
             this.activityListView.UseCompatibleStateImageBehavior = false;
             this.activityListView.View = System.Windows.Forms.View.Details;
@@ -239,7 +239,6 @@
             this.ClientSize = new System.Drawing.Size(1164, 207);
             this.Controls.Add(this.splitContainer1);
             this.MaximizeBox = false;
-            this.MinimizeBox = false;
             this.Name = "GenericTestDlg";
             this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
             this.Text = "RF Power New / Oracle / Printing";

GenericTest/GenericTestDlg.cs

@@ -65,7 +65,8 @@ namespace GenericTest
         const int ActivityMsgsCount = 7;
         ActivityEventArgs[] activityEvents;         /// Activity messages displayed in the main window
 
-		
+        Common.Forms.ModelessForm modelessForm;
+
         NHibernate.ISession dbSession;              /// MySQL database session
         static OracleConnection oracleConn;         /// Oracle database connection (server is in Stara Tura)
 #if RF_TEST_400_900
@@ -115,7 +116,8 @@ namespace GenericTest
             UpdateTitle();
 
             /// Open a modeless form that is closed after initialization and loading the main window
-            new Thread(() => Application.Run(new Common.Forms.ModelessForm("Loading workflows from a database"))).Start();
+            modelessForm = new Common.Forms.ModelessForm("Loading workflows from a database");
+            new Thread(() => Application.Run(modelessForm)).Start();
 
 
             activityEvents = new ActivityEventArgs[ActivityMsgsCount];
@@ -159,7 +161,7 @@ namespace GenericTest
                 StarSensorReading();
             }
 
-            Common.Forms.ModelessForm.CloseForm();   /// Close the modeless information form
+            if (modelessForm != null) modelessForm.CloseForm();   /// Close the modeless information form
         }
 
         private void startButton_Click(object sender, EventArgs e)
@@ -176,13 +178,11 @@ namespace GenericTest
 
         private void settingsButton_Click(object sender, EventArgs e)
         {
-            IUser oriUser = GlobalData.CurrentUser;     /// Save the original user (= tester)
-
-            if (new LoginDlg(Program.SettingsAccessLevel).ShowDialog() == DialogResult.OK)
+            if (new LoginDlg(Program.SettingsAccessLevel, this).ShowDialog() == DialogResult.OK)
             {
                 /// Logged in at 'TraceabilityManagement' level
 
-                GlobalData.CurrentUser = oriUser;                     /// Restore the original user (= tester)
+                CurrentUser.Restore(this);                     /// Restore the original user (= tester)
 
                 string oriWorkplace = Program.LocalSettings.Workplace;
                 ///
@@ -195,7 +195,7 @@ namespace GenericTest
                         TracingDB.UnregisterWorkplaceObsolete(dbSession, oriWorkplace);
                         TracingDB.RegisterWorkplaceObsolete(dbSession,
                                                             Program.LocalSettings.Workplace,
-                                                            GlobalData.GetCurrentUserName(),
+                                                            CurrentUser.UserName(),
                                                             "1.2.3.4",
                                                             "<multiple>",
                                                             WorkflowStep,
@@ -714,14 +714,14 @@ namespace GenericTest
 
             if (!string.IsNullOrEmpty(Program.LocalSettings.UsersDBConnString))
             {
-                GlobalData.LocalUsersDB = new DBSettings(DBType.MySql, Program.LocalSettings.UsersDBConnString);
+                CurrentUser.LocalUsersDB = new DBSettings(DBType.MySql, Program.LocalSettings.UsersDBConnString);
             }
 
             UpdateTitle();
 
             TracingDB.RegisterWorkplaceObsolete(dbSession,
                                                 Program.LocalSettings.Workplace,
-                                                GlobalData.GetCurrentUserName(),
+                                                CurrentUser.UserName(),
                                                 "1.2.3.4",
                                                 "<multiple>",
                                                 WorkflowStep,
@@ -1037,7 +1037,7 @@ namespace GenericTest
 
         void UpdateTitle()
         {
-            Text = string.Format("{0} v.{1} ({2}, {3})", DfltWorkplaceName, Program.Version, Program.LocalSettings.Workplace, GlobalData.GetCurrentUserName());
+            Text = string.Format("{0} v.{1} ({2}, {3})", DfltWorkplaceName, Program.Version, Program.LocalSettings.Workplace, CurrentUser.UserName());
         }
     }
 }

GenericTest/Program.cs

@@ -153,7 +153,7 @@ namespace GenericTest
             {
                 try
                 {
-                    GlobalData.LocalUsersDB = new DBSettings(DBType.MySql, LocalSettings.UsersDBConnString);
+                    CurrentUser.LocalUsersDB = new DBSettings(DBType.MySql, LocalSettings.UsersDBConnString);
 
                     if (new SharedDatabase.Forms.LoginDlg().ShowDialog() != DialogResult.OK) return;
                 }
@@ -174,7 +174,7 @@ namespace GenericTest
 			{
                 if (exc is QuitAppException)
                 {
-                    Common.Forms.ModelessForm.CloseForm();
+                    //Common.Forms.ModelessForm.CloseForm();
                     log.FatalFormat(Strings.Program_was_not_started_0, exc.Message);
                     MessageBox.Show(exc.Message,
                                     Strings.Warning,

GenericTest/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("GenericTest")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyCopyright("Copyright ©  2022")]
 [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("3.0.1")]
-[assembly: AssemblyFileVersion("3.0.1")]
+[assembly: AssemblyVersion("3.0.2")]
+[assembly: AssemblyFileVersion("3.0.2")]

LabelPrinting/App.config

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

LabelPrinting/Cnst.cs

@@ -0,0 +1,7 @@
+namespace LabelPrinting
+{
+    public class Cnst
+    {
+        public const int ExtraPieces = 10;
+    }
+}

LabelPrinting/LabelPrinting.csproj

@@ -0,0 +1,177 @@
+<?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>{E4531D13-317C-4D9F-809F-5533B5C3C8BF}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>LabelPrinting</RootNamespace>
+    <AssemblyName>LabelPrinting</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>LabelPrinting.Program</StartupObject>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="FluentNHibernate, Version=2.0.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="Gma.QrCodeNet.Encoding">
+      <HintPath>..\packages\QrCode.Net.0.4.0.0\net40\Gma.QrCodeNet.Encoding.dll</HintPath>
+    </Reference>
+    <Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="MySql.Data">
+      <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\NHibernate.4.0.4.4000\lib\net40\NHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Cnst.cs" />
+    <Compile Include="LocalSettings.cs" />
+    <Compile Include="MainWnd.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MainWnd.Designer.cs">
+      <DependentUpon>MainWnd.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Printers\DataMatrixAndTextPrintDoc.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Resources\Strings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Strings.resx</DependentUpon>
+    </Compile>
+    <Compile Include="SettingsDlg.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SettingsDlg.Designer.cs">
+      <DependentUpon>SettingsDlg.cs</DependentUpon>
+    </Compile>
+    <EmbeddedResource Include="MainWnd.resx">
+      <DependentUpon>MainWnd.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>
+    <EmbeddedResource Include="Resources\Strings.cs.resx" />
+    <EmbeddedResource Include="Resources\Strings.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Strings.sk.resx" />
+    <EmbeddedResource Include="SettingsDlg.resx">
+      <DependentUpon>SettingsDlg.cs</DependentUpon>
+    </EmbeddedResource>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Common\Common.csproj">
+      <Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
+      <Name>Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Config\Config.csproj">
+      <Project>{743df7db-c7b6-42eb-986d-0f485e5588e4}</Project>
+      <Name>Config</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\DataMatrix4Net\DataMatrix4Net.csproj">
+      <Project>{7cd2b5b4-3304-4151-b8b4-76a8b8af9b06}</Project>
+      <Name>DataMatrix4Net</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\GenCode128\GenCode128.csproj">
+      <Project>{32817bf9-e380-4467-9c7f-936f4b122bc7}</Project>
+      <Name>GenCode128</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Results\Results.csproj">
+      <Project>{9d0dcc88-dc81-47eb-9fdd-4c3907871bfb}</Project>
+      <Name>Results</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\SharedDatabase\SharedDatabase.csproj">
+      <Project>{211b5e3f-9996-48a7-abde-c878dd2d71c2}</Project>
+      <Name>SharedDatabase</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\TBF\TBF.csproj">
+      <Project>{8648fd92-cda1-4c3a-b5f9-fe547ce1fa48}</Project>
+      <Name>TBF</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Users\Users.csproj">
+      <Project>{6e5cb0e9-e1b6-4e5d-ac6e-b1049e180f2b}</Project>
+      <Name>Users</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <Content Include="SampleConfig\log4netConfig.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </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>

LabelPrinting/LocalSettings.cs

@@ -0,0 +1,245 @@
+///
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
+///
+using System;
+using System.IO;
+using System.Security.Cryptography;
+using System.Text;
+using System.Xml.Serialization;
+
+namespace LabelPrinting
+{
+    /// <summary>
+    /// Class to be serialized to an XML file...
+    /// </summary>
+    [XmlRootAttribute("SNPrinting")]
+    public class LocalSettings
+    {
+        static XmlSerializer serializer = XmlSerializer.FromTypes(new[] { typeof(LocalSettings) })[0];
+
+        /// Configuration file ecryption/decryption key and initialization vector
+        static byte[] key = new byte[] { 83, 254, 105, 64, 184, 201, 195, 127, 52, 99, 77, 45, 252, 132, 163, 156 };
+        static byte[] IV = new byte[] { 189, 23, 137, 56, 204, 241, 242, 118, 28, 89, 9, 198, 224, 111, 186, 125 };
+
+        public Mode Mode;
+        public string Language;             /// User interface language used as CultureInfo(..) constructor argument
+        public int DelayBetweenLabels;      /// Delay between printing two consecutive labels in ms
+        public bool IsUserLoginRequired;    /// true = require user login on program start-up
+        public string LabelPrinterCfg;
+        public string TracingDBConnString;  /// Connection string to MySQL database with production tracing records
+        public string UsersDBConnString;    /// Connection string to MySQL database with authorized users
+        public string[] SapNumberHistory;   /// SAP number history
+        public string[] SeparatorHistory;   /// Separator history
+        public int CurrentSNTrail;          /// Serial number trail to be printed now
+        public int RemainingSNsCount;       /// Remaining count of serial numbers to be printed in this session
+
+
+        /// Parameterless constructor required by serialization
+        public LocalSettings() { }
+
+        public LocalSettings(bool createNew)
+        {
+            if (createNew)
+            {
+                Mode = Mode.TbfLabelPrinter;
+                Language = "EN";
+                DelayBetweenLabels = 1000;
+                IsUserLoginRequired = false;
+                LabelPrinterCfg = new TBF.Rig.Output.Printers.Label.Factory().DefaultConfig().CreateDbEntity().Parameters;
+                TracingDBConnString = string.Empty;
+                UsersDBConnString = string.Empty;
+                SapNumberHistory = new string[] { };
+                SeparatorHistory = new string[] { "4VQ" };
+                CurrentSNTrail = 1;
+                RemainingSNsCount = 1;
+            }
+        }
+
+        /// <summary>
+        /// Load public fields of this class from the XML file.
+        /// </summary>
+		/// <returns>LocalSettings object or null when Load() fails</returns>
+		public static LocalSettings Load(string fileName)
+        {
+            try
+            {
+                bool isEncrypted = true;
+                using (StreamReader reader = new StreamReader(fileName))
+                {
+                    isEncrypted = !reader.ReadLine().StartsWith("<?xml version=");
+                    reader.Close();
+                }
+
+                if (isEncrypted)
+                {
+                    /// Write settings to a string
+                    StringBuilder plain = new StringBuilder();
+
+                    using (RijndaelManaged aes = new RijndaelManaged { Padding = PaddingMode.Zeros })
+                    {
+                        using (FileStream fsCrypt = new FileStream(fileName, FileMode.Open))
+                        {
+                            using (ICryptoTransform decryptor = aes.CreateDecryptor(key, IV))
+                            {
+                                using (CryptoStream cs = new CryptoStream(fsCrypt, decryptor, CryptoStreamMode.Read))
+                                {
+                                    using (MemoryStream mStream = new MemoryStream())
+                                    {
+                                        using (var writer = new BinaryWriter(mStream))
+                                        {
+                                            int data;
+                                            while ((data = cs.ReadByte()) != -1)
+                                            {
+                                                if (data != 0) writer.Write((byte)data);
+                                            }
+                                            writer.Flush();
+                                            mStream.Position = 0;
+
+                                            using (var reader = new StreamReader(mStream))
+                                            {
+                                                return serializer.Deserialize(reader) as LocalSettings;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    using (StreamReader reader = new StreamReader(fileName))
+                    {
+                        return serializer.Deserialize(reader) as LocalSettings;
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                string msg = e.Message;
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Save public fields of this class to the XML file.
+        /// </summary>
+        public void Save()
+        {
+            try
+            {
+                /// Encrypt and write to file 'Program.LocalSettingsFileName'
+                using (RijndaelManaged aes = new RijndaelManaged { Padding = PaddingMode.Zeros })
+                {
+                    using (FileStream fsCrypt = new FileStream(Program.LocalSettingsFileName, FileMode.Create))
+                    {
+                        using (ICryptoTransform encryptor = aes.CreateEncryptor(key, IV))
+                        {
+                            using (CryptoStream cs = new CryptoStream(fsCrypt, encryptor, CryptoStreamMode.Write))
+                            {
+                                using (MemoryStream mStream = new MemoryStream())
+                                {
+                                    using (var writer = new StreamWriter(mStream))
+                                    {
+                                        /// Serialize and write settings to a memory stream
+                                        serializer.Serialize(writer, this);
+                                        writer.Flush();
+                                        mStream.Position = 0;
+
+                                        using (var reader = new StreamReader(mStream))
+                                        {
+                                            /// Encrypt and write to file 'Program.LocalSettingsFileName'
+                                            int data;
+                                            while ((data = mStream.ReadByte()) != -1) cs.WriteByte((byte)data);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                string msg = e.Message;
+            }
+        }
+
+		/// <summary>
+		/// Updates history stored in a string array by a new latest string.
+		/// </summary>
+		/// <param name="lastStrValue">Last entered string</param>
+		/// <returns>true = history updated</returns>
+		public static bool UpdateHistory(string lastStrValue, ref string[] history)
+		{
+			const int MaxHistoryLen = 10;
+
+			if (string.IsNullOrEmpty(lastStrValue)) return false;
+
+			int currentHistoryLength = (history != null) ? history.Length : 0;
+
+			int match = -1;
+			for (int i = 0; i < currentHistoryLength; i++)
+			{
+				if (history[i] == lastStrValue)
+				{
+					match = i;
+					break;
+				}
+			}
+
+			if (match >= 0 || currentHistoryLength >= MaxHistoryLen)
+			{
+				/// History does not have to be extended (because of a match) or should not be extended (because of the lenght)
+				if (match < 0) match = currentHistoryLength - 1;
+
+				for (int j = match; j > 0; j--)
+				{
+					history[j] = history[j - 1];
+				}
+				history[0] = lastStrValue;
+			}
+			else
+			{
+				/// History wiil be extended, new item inserted at the beginning
+				string[] newHistory = new string[currentHistoryLength + 1];
+				newHistory[0] = lastStrValue;
+				for (int j = 1; j <= currentHistoryLength; j++)
+				{
+					newHistory[j] = history[j - 1];
+				}
+				history = newHistory;
+			}
+
+            return true;
+		}
+
+        /// <summary>
+        /// Load Purchase order combo box items from the LocalSettings PurchaseOrderHistory array
+        /// </summary>
+        /// <param name="comboBox">Puchase order ComboBox</param>
+        public static void PrepareCombo(string[] history, System.Windows.Forms.ComboBox comboBox)
+        {
+            if (history != null)
+            {
+                for (int i = 0; i < history.Length; i++)
+                {
+                    comboBox.Items.Add(history[i]);
+                }
+            }
+
+            if (comboBox.Items.Count > 0)
+            {
+                comboBox.Text = comboBox.Items[0].ToString();
+            }
+        }
+    }
+
+
+    public enum Mode
+    {
+        TbfLabelPrinter,
+        Standalone,
+        WithDatabase,
+    }
+}

LabelPrinting/MainWnd.Designer.cs

@@ -0,0 +1,197 @@
+namespace LabelPrinting
+{
+    partial class MainWnd
+    {
+        /// <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.snTrailTextBox = new System.Windows.Forms.TextBox();
+            this.countTextBox = new System.Windows.Forms.TextBox();
+            this.snTrailLabel = new System.Windows.Forms.Label();
+            this.countLabel = new System.Windows.Forms.Label();
+            this.sapNumberLabel = new System.Windows.Forms.Label();
+            this.separatorLabel = new System.Windows.Forms.Label();
+            this.startButton = new System.Windows.Forms.Button();
+            this.sapNumberComboBox = new System.Windows.Forms.ComboBox();
+            this.separatorComboBox = new System.Windows.Forms.ComboBox();
+            this.interruptButton = new System.Windows.Forms.Button();
+            this.mainMenuStrip = new System.Windows.Forms.MenuStrip();
+            this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.mainMenuStrip.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // snTrailTextBox
+            // 
+            this.snTrailTextBox.Location = new System.Drawing.Point(230, 97);
+            this.snTrailTextBox.Name = "snTrailTextBox";
+            this.snTrailTextBox.Size = new System.Drawing.Size(121, 20);
+            this.snTrailTextBox.TabIndex = 8;
+            // 
+            // countTextBox
+            // 
+            this.countTextBox.Location = new System.Drawing.Point(230, 123);
+            this.countTextBox.Name = "countTextBox";
+            this.countTextBox.Size = new System.Drawing.Size(72, 20);
+            this.countTextBox.TabIndex = 1;
+            // 
+            // snTrailLabel
+            // 
+            this.snTrailLabel.AutoSize = true;
+            this.snTrailLabel.Location = new System.Drawing.Point(35, 100);
+            this.snTrailLabel.Name = "snTrailLabel";
+            this.snTrailLabel.Size = new System.Drawing.Size(110, 13);
+            this.snTrailLabel.TabIndex = 7;
+            this.snTrailLabel.Text = "First S/N trail (9 digits)";
+            // 
+            // countLabel
+            // 
+            this.countLabel.AutoSize = true;
+            this.countLabel.Location = new System.Drawing.Point(35, 126);
+            this.countLabel.Name = "countLabel";
+            this.countLabel.Size = new System.Drawing.Size(65, 13);
+            this.countLabel.TabIndex = 0;
+            this.countLabel.Text = "S/N-s count";
+            // 
+            // sapNumberLabel
+            // 
+            this.sapNumberLabel.AutoSize = true;
+            this.sapNumberLabel.Location = new System.Drawing.Point(35, 48);
+            this.sapNumberLabel.Name = "sapNumberLabel";
+            this.sapNumberLabel.Size = new System.Drawing.Size(111, 13);
+            this.sapNumberLabel.TabIndex = 3;
+            this.sapNumberLabel.Text = "SAP number ( 8 digits)";
+            // 
+            // separatorLabel
+            // 
+            this.separatorLabel.AutoSize = true;
+            this.separatorLabel.Location = new System.Drawing.Point(35, 74);
+            this.separatorLabel.Name = "separatorLabel";
+            this.separatorLabel.Size = new System.Drawing.Size(124, 13);
+            this.separatorLabel.TabIndex = 5;
+            this.separatorLabel.Text = "Separator ( 3 characters)";
+            // 
+            // startButton
+            // 
+            this.startButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.startButton.Location = new System.Drawing.Point(439, 63);
+            this.startButton.Name = "startButton";
+            this.startButton.Size = new System.Drawing.Size(117, 54);
+            this.startButton.TabIndex = 2;
+            this.startButton.Text = "Start printing";
+            this.startButton.UseVisualStyleBackColor = true;
+            this.startButton.Click += new System.EventHandler(this.startButton_Click);
+            // 
+            // sapNumberComboBox
+            // 
+            this.sapNumberComboBox.FormattingEnabled = true;
+            this.sapNumberComboBox.Location = new System.Drawing.Point(230, 45);
+            this.sapNumberComboBox.Name = "sapNumberComboBox";
+            this.sapNumberComboBox.Size = new System.Drawing.Size(121, 21);
+            this.sapNumberComboBox.TabIndex = 9;
+            // 
+            // separatorComboBox
+            // 
+            this.separatorComboBox.FormattingEnabled = true;
+            this.separatorComboBox.Location = new System.Drawing.Point(230, 71);
+            this.separatorComboBox.Name = "separatorComboBox";
+            this.separatorComboBox.Size = new System.Drawing.Size(72, 21);
+            this.separatorComboBox.TabIndex = 10;
+            // 
+            // interruptButton
+            // 
+            this.interruptButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.interruptButton.Enabled = false;
+            this.interruptButton.Location = new System.Drawing.Point(590, 63);
+            this.interruptButton.Name = "interruptButton";
+            this.interruptButton.Size = new System.Drawing.Size(117, 54);
+            this.interruptButton.TabIndex = 11;
+            this.interruptButton.Text = "Interrupt";
+            this.interruptButton.UseVisualStyleBackColor = true;
+            this.interruptButton.Click += new System.EventHandler(this.interruptButton_Click);
+            // 
+            // mainMenuStrip
+            // 
+            this.mainMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.settingsToolStripMenuItem});
+            this.mainMenuStrip.Location = new System.Drawing.Point(0, 0);
+            this.mainMenuStrip.Name = "mainMenuStrip";
+            this.mainMenuStrip.Size = new System.Drawing.Size(742, 24);
+            this.mainMenuStrip.TabIndex = 12;
+            this.mainMenuStrip.Text = "mainMenuStrip";
+            // 
+            // settingsToolStripMenuItem
+            // 
+            this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
+            this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
+            this.settingsToolStripMenuItem.Text = "Settings";
+            this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click);
+            // 
+            // MainWnd
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(742, 168);
+            this.Controls.Add(this.interruptButton);
+            this.Controls.Add(this.separatorComboBox);
+            this.Controls.Add(this.sapNumberComboBox);
+            this.Controls.Add(this.startButton);
+            this.Controls.Add(this.separatorLabel);
+            this.Controls.Add(this.sapNumberLabel);
+            this.Controls.Add(this.countLabel);
+            this.Controls.Add(this.snTrailLabel);
+            this.Controls.Add(this.countTextBox);
+            this.Controls.Add(this.snTrailTextBox);
+            this.Controls.Add(this.mainMenuStrip);
+            this.MainMenuStrip = this.mainMenuStrip;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "MainWnd";
+            this.Text = "S/N Printing";
+            this.Load += new System.EventHandler(this.MainWnd_Load);
+            this.mainMenuStrip.ResumeLayout(false);
+            this.mainMenuStrip.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox snTrailTextBox;
+        private System.Windows.Forms.TextBox countTextBox;
+        private System.Windows.Forms.Label snTrailLabel;
+        private System.Windows.Forms.Label countLabel;
+        private System.Windows.Forms.Label sapNumberLabel;
+        private System.Windows.Forms.Label separatorLabel;
+        private System.Windows.Forms.Button startButton;
+        private System.Windows.Forms.ComboBox sapNumberComboBox;
+        private System.Windows.Forms.ComboBox separatorComboBox;
+        private System.Windows.Forms.Button interruptButton;
+        private System.Windows.Forms.MenuStrip mainMenuStrip;
+        private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem;
+    }
+}
+

LabelPrinting/MainWnd.cs

@@ -0,0 +1,480 @@
+///
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using log4net;
+using DataMatrix4Net;
+using SharedDatabase.Entities;
+using LabelPrinting.Resources;
+using TBF.Rig.Output.Printers.Label;
+using NHibernate;
+using Common;
+using Results.Entities;
+
+namespace LabelPrinting
+{
+    public partial class MainWnd : Form
+    {
+        private static readonly ILog log = LogManager.GetLogger(typeof(MainWnd));
+
+        private readonly Factory factory;
+        private readonly Printer printer;
+
+        string programNameAndVer;
+        string prefix;                  /// S/N prefix after parsing/verification by the UI
+        string separator;               /// Separator after parsing/verification by the UI
+        int currentSNTrail;             /// Current S/N trai (1st S/N trail after parsing/verification by the UI)
+        int totalCount;                 /// Total S/N count after parsing/verification by the UI
+        int remainingCount;             /// Remaining S/N-s count
+        IList<OrderInfo> orderInfos;    /// null in Standalone mode
+        Timer timer;
+        bool interrupt;
+
+        public MainWnd()
+        {
+            InitializeComponent();
+            Text = programNameAndVer = string.Format("{0} v.{1}", Program.ProgramName, Program.Version); ;
+            factory = new Factory();
+        }
+
+        public MainWnd(IList<OrderInfo> orderInfos)
+            : this()
+        {
+            this.orderInfos = orderInfos;
+
+            if (Program.LocalSettings.Mode == Mode.TbfLabelPrinter)
+            {
+                try
+                {
+                    var cmpntEntity = Config.Entities.Component.CreateFromCfg("Printer", factory.ClassName, string.Empty, 1,
+                                                                          DebugMode.Normal, LogLevel.Off,
+                                                                          Program.LocalSettings.LabelPrinterCfg);
+                    printer = factory.GetComponent(factory.CmpntCfgFromCmpntEntity(cmpntEntity), null) as Printer;
+                    printer.Initialize();
+                }
+                catch (Exception)
+                {
+                    MessageBox.Show("Cannot create or initialize a printer",
+                                    "Warning", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
+                }
+            }
+
+            try
+            {
+                string culture = Program.LocalSettings.Language.Replace('_', '-');
+                System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo(culture);
+            }
+            catch (Exception)
+            {
+                MessageBox.Show("Selected language is not supported.\nUsing English.",
+                                "Warning", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
+                System.Threading.Thread.CurrentThread.CurrentUICulture =
+                    new System.Globalization.CultureInfo("en");
+            }
+
+            timer = new Timer();
+            timer.Interval = Program.LocalSettings.DelayBetweenLabels;  /// [ms] default = 1000
+            timer.Tick += new EventHandler(timer_Tick);
+        }
+
+        void Localize()
+        {
+            startButton.Text = Strings.Start_printing;
+            interruptButton.Text = Strings.Interrupt;
+            settingsToolStripMenuItem.Text = Strings.Settings;
+
+            if (Program.LocalSettings.Mode == Mode.TbfLabelPrinter)
+            {
+                sapNumberLabel.Text = Strings.Order;
+                separatorLabel.Text = string.Empty;
+                separatorComboBox.Visible = false;
+                snTrailLabel.Text = Strings.Serial_number;
+            }
+            else
+            {
+                sapNumberLabel.Text = Strings.SAP_number_8_digits;
+                separatorLabel.Text = Strings.Separator_3_characters;
+                snTrailLabel.Text = Strings.First_SN_trail_9_digits;
+            }
+            
+            countLabel.Text = Strings.Labels_count;
+        }
+
+        private void MainWnd_Load(object sender, EventArgs e)
+        {
+            Localize();
+
+            LocalSettings.PrepareCombo(Program.LocalSettings.SapNumberHistory, sapNumberComboBox);
+            LocalSettings.PrepareCombo(Program.LocalSettings.SeparatorHistory, separatorComboBox);
+
+            if (Program.LocalSettings.Mode == Mode.TbfLabelPrinter)
+            {
+                snTrailTextBox.Text = string.Empty;
+                countTextBox.Text = Math.Max(Program.LocalSettings.RemainingSNsCount, 1).ToString();
+
+                snTrailLabel.Top -= 26;
+                snTrailTextBox.Top -= 26;
+                countLabel.Top -= 26;
+                countTextBox.Top -= 26;
+
+                this.ActiveControl = snTrailTextBox;
+            }
+            else if (Program.LocalSettings.Mode == Mode.Standalone)
+            {
+                snTrailTextBox.Text = Program.LocalSettings.CurrentSNTrail.ToString("D9");
+                countTextBox.Text = Math.Max(Program.LocalSettings.RemainingSNsCount, 1).ToString();
+            }
+            else
+            {
+                if (orderInfos == null) throw new Exception("Missing OrderInfo-s from production tracing database");
+
+                currentSNTrail = 0;
+                foreach (var oi in orderInfos)
+                {
+                    if (oi.BaseNr1 + oi.PiecesCount + Cnst.ExtraPieces > currentSNTrail)
+                    {
+                        currentSNTrail = oi.BaseNr1 + oi.PiecesCount + Cnst.ExtraPieces;
+                    }
+                }
+
+                snTrailTextBox.Text = currentSNTrail.ToString("D9");
+                snTrailTextBox.Enabled = false;
+            }
+        }
+
+        /// <summary>
+        /// Start printing labels
+        /// </summary>
+        private void startButton_Click(object sender, EventArgs e)
+        {
+            if (!int.TryParse(countTextBox.Text, out totalCount) || totalCount <= 0)
+            {
+                MessageBox.Show(Strings.Invalid_SNs_count);
+                return;
+            }
+            remainingCount = totalCount;
+
+            if (Program.LocalSettings.Mode == Mode.TbfLabelPrinter)
+            {
+                var wm = new Results.Entities.WaterMeter();
+                wm.PurchaseOrder = string.IsNullOrEmpty(sapNumberComboBox.Text) ? string.Empty : sapNumberComboBox.Text;
+                wm.SerialNr = string.IsNullOrEmpty(snTrailTextBox.Text) ? string.Empty : snTrailTextBox.Text;
+
+                LocalSettings.UpdateHistory(sapNumberComboBox.Text, ref Program.LocalSettings.SapNumberHistory);
+                //Program.LocalSettings.CurrentSNTrail = snTrailTextBox.Text;
+                Program.LocalSettings.RemainingSNsCount = remainingCount;
+                Program.LocalSettings.Save();
+
+                startButton.Enabled = false;
+                interruptButton.Enabled = true;
+                interrupt = false;
+
+                printer.PrintResults(wm, "document name");
+
+                remainingCount--;
+                IncrementSN(snTrailTextBox);
+            }
+            else
+            {
+                /// Program.LocalSettings.Mode == Mode.Standalone || Program.LocalSettings.Mode == Mode.WithDatabase
+
+                int sapNumber;
+                if (sapNumberComboBox.Text.Length != 8 || !int.TryParse(sapNumberComboBox.Text, out sapNumber) || sapNumber <= 0 || sapNumber > 99999999)
+                {
+                    MessageBox.Show(Strings.Invalid_SAP_number);
+                    return;
+                }
+
+                if (separatorComboBox.Text.Length != 3)
+                {
+                    MessageBox.Show(Strings.Invalid_separator);
+                    return;
+                }
+
+                if (snTrailTextBox.Text.Length != 9 || !int.TryParse(snTrailTextBox.Text, out currentSNTrail))
+                {
+                    MessageBox.Show(Strings.Invalid_first_SN_trail);
+                    return;
+                }
+                else if (Program.LocalSettings.Mode == Mode.Standalone && currentSNTrail < Program.LocalSettings.CurrentSNTrail)
+                {
+                    MessageBox.Show(string.Format("{0}, {1} {2:D9}", Strings.Invalid_first_SN_trail, Strings.min, Program.LocalSettings.CurrentSNTrail));
+                    return;
+                }
+
+                if (Program.LocalSettings.Mode == Mode.Standalone && currentSNTrail > Program.LocalSettings.CurrentSNTrail)
+                {
+                    if (MessageBox.Show(string.Format("{0} {1:D9}{2}{3}{4}",
+                                                      Strings.You_are_skipping,
+                                                      Program.LocalSettings.CurrentSNTrail,
+                                                      (currentSNTrail == Program.LocalSettings.CurrentSNTrail + 1) ? "" : string.Format(" ... {0:D9}", currentSNTrail - 1),
+                                                      Environment.NewLine,
+                                                      Strings.Are_you_sure),
+                                        string.Empty,
+                                        MessageBoxButtons.YesNo,
+                                        MessageBoxIcon.Question) == DialogResult.No)
+                    {
+                        return;
+                    }
+                }
+
+                if (Program.LocalSettings.Mode == Mode.WithDatabase)
+                {
+                    SaveNewOrderInfo(ref currentSNTrail, totalCount);
+                }
+
+                prefix = sapNumberComboBox.Text;
+                separator = separatorComboBox.Text;
+
+                sapNumberComboBox.Enabled = false;
+                separatorComboBox.Enabled = false;
+                snTrailTextBox.Enabled = false;
+                countTextBox.Enabled = false;
+
+                LocalSettings.UpdateHistory(sapNumberComboBox.Text, ref Program.LocalSettings.SapNumberHistory);
+                LocalSettings.UpdateHistory(separatorComboBox.Text, ref Program.LocalSettings.SeparatorHistory);
+
+                Program.LocalSettings.CurrentSNTrail = currentSNTrail;
+                Program.LocalSettings.RemainingSNsCount = remainingCount;
+                Program.LocalSettings.Save();
+
+                startButton.Enabled = false;
+                interruptButton.Enabled = true;
+                interrupt = false;
+
+                PrintOneLabel();
+            }
+
+            if (remainingCount > 0)
+            {
+                timer.Start();
+            }
+            else
+            {
+                Text = string.Format("{0} ... {1}", programNameAndVer, Strings.completed);
+                MessageBox.Show(string.Format(Strings.x_labels_printed, totalCount));
+                SaveSettingsUpdateAndEnableUI();
+            }
+        }
+
+        /// <summary>
+        /// Save a record tp OrderInfo table that coresponds to printed labels
+        /// </summary>
+        /// <param name="currentSNTrail">Start S/N trail number</param>
+        /// <param name="totalCount">Printed labels count</param>
+        /// <returns>true when successful</returns>
+        bool SaveNewOrderInfo(ref int currentSNTrail, int totalCount)
+        {
+            ISession session = SharedDatabase.TracingDB.CreateSession(Program.LocalSettings.TracingDBConnString);
+            ITransaction transaction = session.BeginTransaction();
+            OrderInfo oi = new OrderInfo();
+            bool successfullySaved = false;
+            try
+            {
+                var orders = session.QueryOver<OrderInfo>().List();
+
+                /// Determine current S/N trail once again
+                int snTrail = 0;
+                foreach (var o in orders)
+                {
+                    if (o.BaseNr1 + o.PiecesCount + Cnst.ExtraPieces > snTrail)
+                    {
+                        snTrail = o.BaseNr1 + o.PiecesCount + Cnst.ExtraPieces;
+                    }
+                }
+
+                /// Compare current S/N trail with the newly obtained one, update if necessary
+                if (snTrail > currentSNTrail) currentSNTrail = snTrail;
+
+                oi.POName = "0000000";
+                oi.PiecesCount = totalCount;
+                oi.TestProcedure = string.Empty;
+                oi.BaseNr1 = currentSNTrail;
+                oi.BaseNr2 = 0;
+                oi.BaseNr3 = 0;
+                oi.BaseNr4 = 0;
+                oi.BaseNr5 = 0;
+                oi.Remark = "Manual S/N printing";
+                oi.Workflow = null;
+                orders.Add(oi);
+                session.SaveOrUpdate(oi);
+                transaction.Commit();
+                successfullySaved = true;
+            }
+            catch (Exception exc)
+            {
+                log.ErrorFormat("MySQL database transaction rolled back, data not comitted: {0}", exc.Message);
+                transaction.Rollback();
+            }
+
+            return successfullySaved;
+        }
+
+
+        void timer_Tick(object sender, EventArgs args)
+        {
+            timer.Stop();
+
+            if (interrupt)
+            {
+                Text = string.Format("{0} ... {1}", programNameAndVer, Strings.interrupted);
+                MessageBox.Show(string.Format(Strings.x_labels_printed, totalCount - remainingCount));
+                SaveSettingsUpdateAndEnableUI();
+            }
+            else if (Program.LocalSettings.Mode == Mode.TbfLabelPrinter)
+            {
+                var wm = new Results.Entities.WaterMeter();
+                wm.PurchaseOrder = string.IsNullOrEmpty(sapNumberComboBox.Text) ? string.Empty : sapNumberComboBox.Text;
+                wm.SerialNr = string.IsNullOrEmpty(snTrailTextBox.Text) ? string.Empty : snTrailTextBox.Text;
+
+                printer.PrintResults(wm, "document name");
+
+                remainingCount--;
+                IncrementSN(snTrailTextBox);
+
+                if (remainingCount > 0)
+                {
+                    timer.Enabled = true;
+                }
+                else
+                {
+                    Text = string.Format("{0} ... {1}", programNameAndVer, Strings.completed);
+                    MessageBox.Show(string.Format(Strings.x_labels_printed, totalCount));
+                    SaveSettingsUpdateAndEnableUI();
+                }
+            }
+            else
+            {
+                /// Program.LocalSettings.Mode == Mode.Standalone || Program.LocalSettings.Mode == Mode.WithDatabase
+
+                PrintOneLabel();
+
+                if (remainingCount > 0)
+                {
+                    timer.Enabled = true;
+                }
+                else
+                {
+                    Text = string.Format("{0} ... {1}", programNameAndVer, Strings.completed);
+                    MessageBox.Show(string.Format(Strings.x_labels_printed, totalCount));
+                    SaveSettingsUpdateAndEnableUI();
+                }
+            }
+        }
+
+        char[] digits = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+        /// 
+        void IncrementSN(TextBox tb)
+        {
+            if (tb != null)
+            {
+                string currentSN = tb.Text;
+
+                int currentSnNr;
+                int startIx = currentSN.IndexOfAny(digits);
+                if (startIx >= 0)
+                {
+                    int lastDigitPosPlus1 = startIx + 1;
+                    var listOfDigits = new List<char>(digits);
+                    while (lastDigitPosPlus1 < currentSN.Length && listOfDigits.Contains(currentSN[lastDigitPosPlus1]))
+                    {
+                        lastDigitPosPlus1++;
+                    }
+                    int digitsCount = lastDigitPosPlus1 - startIx;
+
+                    if (int.TryParse(currentSN.Substring(startIx, digitsCount), out currentSnNr) && currentSnNr >= 0)
+                    {
+                        currentSnNr++;
+                        string newSN = currentSnNr.ToString();
+                        int len = newSN.Length;
+                        if (len <= digitsCount)
+                        {
+                            tb.Text = currentSN.Substring(0, startIx + digitsCount - len) + newSN + currentSN.Substring(startIx + digitsCount);
+                        }
+                        else
+                        {
+                            tb.Text = currentSN.Substring(0, startIx) + newSN + currentSN.Substring(startIx + digitsCount); ;
+                        }
+                    }
+                }
+
+            }
+        }
+
+        void PrintOneLabel()
+        {
+            if (remainingCount > 0)
+            {
+                string code = string.Format("{0}{1}{2:D9}", prefix, separator, currentSNTrail);
+                Text = string.Format("{0} ... {1} ... {2} / {3}", programNameAndVer, code, totalCount - remainingCount + 1, totalCount);
+                DataMatrix matrix = new DataMatrix(code, SymbolSize.SquareAuto);
+                new Printers.DataMatrixAndTextPrintDoc(matrix.Matrix, code.Replace(separator.Substring(0, 2), "\n")).Print();
+                currentSNTrail++;
+                remainingCount--;
+            }
+        }
+
+        void SaveSettingsUpdateAndEnableUI()
+        {
+            if (Program.LocalSettings.Mode != Mode.TbfLabelPrinter) snTrailTextBox.Text = currentSNTrail.ToString("D9");
+            countTextBox.Text = remainingCount.ToString();
+
+            Program.LocalSettings.CurrentSNTrail = currentSNTrail;
+            Program.LocalSettings.RemainingSNsCount = remainingCount;
+            Program.LocalSettings.Save();
+
+            sapNumberComboBox.Enabled = true;
+            separatorComboBox.Enabled = true;
+            snTrailTextBox.Enabled = (Program.LocalSettings.Mode == Mode.TbfLabelPrinter || Program.LocalSettings.Mode == Mode.Standalone);
+            countTextBox.Enabled = true;
+
+            startButton.Enabled = true;
+            interruptButton.Enabled = false;
+        }
+
+        private void interruptButton_Click(object sender, EventArgs e)
+        {
+            interrupt = true;
+        }
+
+        private void settingsToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            /// Connect to the database of users and log in a user
+            try
+            {
+                SharedDatabase.UsersDB.ConnectionString = Program.LocalSettings.UsersDBConnString;
+                SharedDatabase.UsersDB.DbType = Common.DBType.MySql;
+
+                DialogResult dr = new SharedDatabase.Forms.LoginDlg().ShowDialog();
+                if (dr != DialogResult.OK) return;
+            }
+            catch (Exception exc)
+            {
+                string msg = string.Format("Failed to connect to the database of users:{0}{1}", Environment.NewLine, exc.Message);
+                log.Error(msg);
+                MessageBox.Show(msg);
+                return;
+            }
+
+            /// Modify program settings
+            try
+            {
+                DialogResult dr = new SettingsDlg(Program.LocalSettings).ShowDialog();
+                if (dr == DialogResult.OK)
+                {
+                    Program.LocalSettings.Save();
+                    MessageBox.Show(Strings.Program_restart_is_required);
+                    Close();
+                }
+            }
+            catch (Exception exc)
+            {
+                string msg = string.Format("Error occurred, settings were not modified:{0}{1}", Environment.NewLine, exc.Message);
+                log.Error(msg);
+                MessageBox.Show(msg);
+            }
+        }
+    }
+}

LabelPrinting/MainWnd.resx

@@ -117,25 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="administrator" xml:space="preserve">
-    <value>Amministratore</value>
-  </data>
-  <data name="calibration_specialist" xml:space="preserve">
-    <value>esperto in calibrazione</value>
-  </data>
-  <data name="head_of_lab" xml:space="preserve">
-    <value>capo di laboratorio</value>
-  </data>
-  <data name="maintenance" xml:space="preserve">
-    <value>esperto di manutenzione</value>
-  </data>
-  <data name="metrologist" xml:space="preserve">
-    <value>metrologo</value>
-  </data>
-  <data name="specialist" xml:space="preserve">
-    <value>esperto di prove</value>
-  </data>
-  <data name="tester" xml:space="preserve">
-    <value>tester</value>
-  </data>
+  <metadata name="mainMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>

LabelPrinting/Printers/DataMatrixAndTextPrintDoc.cs

@@ -0,0 +1,120 @@
+///
+/// Copyright (c) 2021 Sensus Slovensko a.s.
+///
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Printing;
+using Gma.QrCodeNet.Encoding;
+using DataMatrix4Net;
+
+namespace LabelPrinting.Printers
+{
+	public class DataMatrixAndTextPrintDoc : PrintDocument
+	{
+        const float mm = 1 / 0.254F;     /// 1 mm expressed in 1/100 inch
+
+        int printWidth;
+        int printHeight;
+        int leftMargin;
+        int topMargin;
+
+
+        BitMatrix bitMatrix;
+        string text;
+
+
+        /// <summary>
+		/// Constructor
+		/// </summary>
+        /// <param name="bitmap">Bitmap to be printed</param>
+        /// <param name="paperWidth">Label width</param>
+        /// <param name="paperHeight">Label height</param>
+        /// <param name="landscape">true = landscape</param>
+        public DataMatrixAndTextPrintDoc(BitMatrix bitMatrix, string text, bool landscape = false)
+		{
+            this.bitMatrix = bitMatrix;
+            this.text = text;
+
+            DefaultPageSettings.Landscape = landscape;
+
+			/// Set print area size and margins (in dots using 80 dpi)
+            if (landscape)
+            {
+                printWidth = base.DefaultPageSettings.PaperSize.Height - base.DefaultPageSettings.Margins.Top - base.DefaultPageSettings.Margins.Bottom;
+                printHeight = base.DefaultPageSettings.PaperSize.Width - base.DefaultPageSettings.Margins.Left - base.DefaultPageSettings.Margins.Right;
+                leftMargin = base.DefaultPageSettings.Margins.Top;	    /// X
+                topMargin = base.DefaultPageSettings.Margins.Left;		/// Y
+            }
+            else
+            {
+                printHeight = base.DefaultPageSettings.PaperSize.Height - base.DefaultPageSettings.Margins.Top - base.DefaultPageSettings.Margins.Bottom;
+                printWidth = base.DefaultPageSettings.PaperSize.Width - base.DefaultPageSettings.Margins.Left - base.DefaultPageSettings.Margins.Right;
+                leftMargin = base.DefaultPageSettings.Margins.Left;	    /// X
+                topMargin = base.DefaultPageSettings.Margins.Top;		/// Y
+            }
+		}
+
+		protected override void OnBeginPrint(System.Drawing.Printing.PrintEventArgs e)
+		{
+            base.OnBeginPrint(e);   /// Run base code
+		}
+
+		protected override void OnPrintPage(System.Drawing.Printing.PrintPageEventArgs e)
+		{
+            base.OnPrintPage(e);    /// Run base code
+            DrawLabel(e.Graphics, bitMatrix, text);
+			e.HasMorePages = false;
+		}
+
+        public static void DrawLabel(Graphics g, BitMatrix bitMatrix, string text)
+        {
+            string[] lines = text.Split(new char[] { '\n' }); 
+
+            /// Assuming 100 dpi (printer), drawing size: 2 inch (width) x 1 inch (height)
+            const float W = 18 * mm;
+            const float H = 10 * mm;
+            
+            const float L1 = 7.0f * mm;
+            const float L2 = 7.0f * mm;
+            const float T1 = 3.5f * mm;
+            const float T2 = 5.5f * mm;
+
+            const float QRL = 1.0f * mm;
+            const float QRT = 2.5f * mm;
+            const float QrSize = 5.5f * mm;
+
+            string fontFamily = "Arial";
+            Font font = new Font(fontFamily, 4.5f, FontStyle.Bold);
+
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+            g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+            g.PixelOffsetMode = PixelOffsetMode.HighQuality;
+
+            g.Clear(Color.White);
+
+            if (lines.Length > 0)
+            {
+                g.DrawString(lines[0], font, Brushes.Black, new RectangleF(L1, T1, W - L1, H - T1));
+            }
+
+            if (lines.Length > 1)
+            {
+                g.DrawString(lines[1], font, Brushes.Black, new RectangleF(L2, T2, W - L2, H - T2));
+            }
+
+            g.Flush();
+
+            float QrPixSize = QrSize / bitMatrix.Width;
+            for (int i = 0; i < bitMatrix.Height; i++)
+            {
+                for (int j = 0; j < bitMatrix.Width; j++)
+                {
+                    if (bitMatrix[j, i])
+                    {
+                        g.FillRectangle(Brushes.Black, new RectangleF(QRL + QrPixSize * j, QRT + QrPixSize * i, QrPixSize, QrPixSize));
+                    }
+                }
+            }
+        }
+    }
+}

LabelPrinting/Program.cs

@@ -0,0 +1,251 @@
+///
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using System.Windows.Forms;
+using log4net;
+using NHibernate;
+using Common;
+using SharedDatabase;
+using SharedDatabase.Entities;
+using LabelPrinting.Resources;
+
+namespace LabelPrinting
+{
+	static class Program
+	{
+        /// Constants
+        public static GID[] SettingsAccessLevel = new GID[] { GID.TraceabilityManagement };    /// Group membership to access settings
+        public const string ProgramName = "LabelPrinting";
+        public const string ConfigFName = "config.xml";
+        public const string BackupConfigFName = "config.backup.xml";
+        public const string Log4NetConfigFName = "log4netConfig.xml";
+
+        /// Program information
+        public static readonly string Version;	        /// version string
+        public static readonly DateTime BuildDateTime;	/// date and time of program build
+        public static readonly string ExeDirectory;
+        public static readonly string ConfigDirectory;
+        public static readonly string LogDirectory;
+        public static readonly string LocalSettingsFileName;
+        public static readonly string LocalSettingsBackupName;
+
+        /// Local settings
+        public static LocalSettings LocalSettings;
+
+        /// log4net
+        static ILog log;
+
+
+        static Program()
+        {
+            /// Program version string
+            Assembly thisAssembly = Assembly.GetExecutingAssembly();
+            Version ver = thisAssembly.GetName().Version;
+            Version = string.Format("{0}.{1}.{2}", ver.Major, ver.Minor, ver.Build);
+            BuildDateTime = new FileInfo(thisAssembly.Location).LastWriteTime;
+
+            /// Local program configuration directory including the trailing backslash
+            ExeDirectory = Path.GetDirectoryName(thisAssembly.Location);
+            ConfigDirectory = Path.Combine(ExeDirectory, "..\\Cfg");
+            LogDirectory = Path.Combine(ExeDirectory, "..", "Logs");
+            LocalSettingsFileName = Path.Combine(ConfigDirectory, ConfigFName);
+            LocalSettingsBackupName = Path.Combine(ConfigDirectory, BackupConfigFName);
+        }
+
+
+        /// <summary>
+		/// The main entry point for the application.
+		/// </summary>
+		[STAThread]
+		static void Main()
+		{
+            ///
+            /// Check if another instance is running
+            ///
+            Assembly thisAssembly = Assembly.GetExecutingAssembly();
+            string processName = Path.GetFileNameWithoutExtension(thisAssembly.Location);
+            if (System.Diagnostics.Process.GetProcessesByName(processName).Length > 1)
+            {
+                MessageBox.Show(string.Format("{0}{1}{2}", string.Format(Strings.Program_0_is_running_already, ProgramName),
+                                                           Environment.NewLine,
+                                                           Strings.Close_it_please),
+                                Strings.Error,
+                                MessageBoxButtons.OK,
+                                MessageBoxIcon.Asterisk);
+                return;
+            }
+
+            AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(MyHandler);
+
+            bool configDirectoryCreated = false;
+            if (!Directory.Exists(ConfigDirectory) || new DirectoryInfo(ConfigDirectory).GetFileSystemInfos().Length == 0)
+            {
+                MessageBox.Show(string.Format("{0}{1}{2}", Strings.Program_is_running_for_the_1st_time_on_this_PC,
+                                                           Environment.NewLine,
+                                                           Strings.Default_settings_are_used),
+                                Strings.Warning,
+                                MessageBoxButtons.OK,
+                                MessageBoxIcon.Exclamation);
+                ///
+                /// Create a new config subdirectory
+                ///
+                Directory.CreateDirectory(ConfigDirectory);
+                configDirectoryCreated = true;
+
+                LocalSettings = new LocalSettings(true);
+                LocalSettings.Save();
+
+                if (File.Exists(Path.Combine(ExeDirectory, "SampleConfig", Log4NetConfigFName)))
+                {
+                    File.Copy(Path.Combine(ExeDirectory, "SampleConfig", Log4NetConfigFName),
+                              Path.Combine(ConfigDirectory, Log4NetConfigFName));
+                }
+
+                File.SetAttributes(Path.Combine(ConfigDirectory, Log4NetConfigFName), FileAttributes.Normal);
+            }
+
+            ///
+            /// Configue and start logging
+            ///
+            log4net.Config.XmlConfigurator.Configure(new FileInfo(Path.Combine(ConfigDirectory, Log4NetConfigFName)));
+            log = LogManager.GetLogger(typeof(Program));
+            log.Fatal("--------------------------------------------------------------------------------");
+            log.FatalFormat("{0} ver.{1}", ProgramName, Version);
+            log.FatalFormat("Executable directory is {0}", ExeDirectory);
+            if (configDirectoryCreated)
+            {
+                log.Fatal("A new config directory and configuration files created !");
+            }
+
+            ///
+            /// Load the local settings
+            ///
+            LocalSettings = LocalSettings.Load(LocalSettingsFileName);
+            if (LocalSettings == null)
+            {
+                /// Loading local seetings from regular config file failed. Use the backup
+                LocalSettings = LocalSettings.Load(LocalSettingsBackupName);
+                if (LocalSettings == null)
+                {
+                    log.FatalFormat("Local settings: Could not load file {0}, nor {1}.", ConfigFName, BackupConfigFName);
+                    log.Fatal("Application terminated.");
+                    MessageBox.Show(string.Format("Could not load file {0}, nor {1}.", ConfigFName, BackupConfigFName), "Fatal error");
+                    return;					/// Fatal error
+                }
+                else
+                {
+                    LocalSettings.Save();	/// Save the settings to overwrite the wrong file
+                    log.FatalFormat("Local settings: Could not load file {0}, successfully loaded {1}", ConfigFName, BackupConfigFName);
+                }
+            }
+            else
+            {
+                /// Loading local seetings from the regular config file was successful. Update the backup
+                File.Copy(LocalSettingsFileName, LocalSettingsBackupName, true);
+            }
+
+            Application.EnableVisualStyles();
+			Application.SetCompatibleTextRenderingDefault(false);
+
+            ///
+            /// User login
+            ///
+            if (LocalSettings.IsUserLoginRequired && !string.IsNullOrEmpty(LocalSettings.UsersDBConnString))
+            {
+                try
+                {
+                    UsersDB.ConnectionString = LocalSettings.UsersDBConnString;
+                    UsersDB.DbType = DBType.MySql;
+
+                    DialogResult dr = new SharedDatabase.Forms.LoginDlg().ShowDialog();
+                    if (dr != DialogResult.OK) return;
+                }
+                catch (Exception exc)
+                {
+                    log.ErrorFormat("Failed to connect to database of users: {0}", exc.Message);
+                }
+            }
+
+            IList<OrderInfo> orderInfos = null;
+            while (LocalSettings.Mode == Mode.WithDatabase)
+            {
+                try
+                {
+                    ISession session = TracingDB.CreateSession(LocalSettings.TracingDBConnString);
+                    orderInfos = session.QueryOver<OrderInfo>().List();
+                    break;
+                }
+                catch (Exception exc)
+                {
+                    log.FatalFormat("Failed to connect to production tracing database: {0}", exc.Message);
+                    if (exc.InnerException != null)
+                    {
+                        log.FatalFormat("InnerException: {0}", exc.InnerException.Message);
+                    }
+
+                    MessageBox.Show(string.Format("Failed to connect to production tracing database:{0}{1}", Environment.NewLine, exc.Message));
+
+                    if (new SettingsDlg(LocalSettings).ShowDialog() == DialogResult.OK)
+                    {
+                        LocalSettings.Save();
+                    }
+                    else
+                    {
+                        return;
+                    }
+                }
+            }
+
+            try
+            {
+                MainWnd dlg = new MainWnd(orderInfos);
+                Application.Run(dlg);
+            }
+            catch (Exception e)
+            {
+                LogException(log, "Exception in Application.Run(MainWnd)", e);
+
+                MessageBox.Show("Program crashed:" +
+                                Environment.NewLine + Environment.NewLine + e.Message +
+                                ((e.InnerException == null) ? string.Empty : (Environment.NewLine + e.InnerException.Message)) +
+                                Environment.NewLine + e.StackTrace,
+                                "Fatal error",
+                                MessageBoxButtons.OK,
+                                MessageBoxIcon.Exclamation);
+            }
+		}
+
+
+        static void MyHandler(object sender, UnhandledExceptionEventArgs args)
+        {
+            Exception e = args.ExceptionObject as Exception;
+            if (e == null) return;
+
+            LogException(log, "Unhandled exception", e);
+
+            MessageBox.Show("Program crashed:" +
+                            Environment.NewLine + Environment.NewLine + e.Message +
+                            ((e.InnerException == null) ? string.Empty : (Environment.NewLine + e.InnerException.Message)) +
+                            Environment.NewLine + e.StackTrace,
+                            "Fatal error",
+                            MessageBoxButtons.OK,
+                            MessageBoxIcon.Exclamation);
+        }
+
+        static void LogException(ILog log, string description, Exception e)
+        {
+            log.FatalFormat("---------------( {0} )---------------", description);
+            log.FatalFormat("Message      : {0}", e.Message);
+            if (e.InnerException != null)
+            {
+                log.FatalFormat("InnerMessage : {0}", e.InnerException.Message);
+            }
+            log.FatalFormat("StackTrace   : {0}{1}", Environment.NewLine, e.StackTrace);
+            log.Fatal("--------------------------------------");
+        }
+    }
+}

LabelPrinting/Properties/AssemblyInfo.cs

@@ -0,0 +1,35 @@
+using System.Reflection;
+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("LabelPrinting")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("LabelPrinting")]
+[assembly: AssemblyCopyright("Copyright ©  2023")]
+[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("270db60d-5938-40be-b15c-e2bc3c7ddb86")]
+
+// 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.6.0")]
+[assembly: AssemblyFileVersion("1.0.6.0")]

LabelPrinting/Properties/Resources.Designer.cs

@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <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 LabelPrinting.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("SNPrinting.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;
+            }
+        }
+    }
+}