Version increment to 3.9.2146.4

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

.gitignore

@@ -2,6 +2,8 @@ Common/bin/
 Common/obj/
 Config/bin/
 Config/obj/
+DataMatrix4Net/bin/
+DataMatrix4Net/obj/
 DataStreamInterface/bin/
 DataStreamInterface/obj/
 Decrypt/bin/
@@ -14,30 +16,38 @@ Encrypt/bin/
 Encrypt/obj/
 EventViewer/bin/
 EventViewer/obj/
-Events/bin/
-Events/obj/
 FeatureVectorCalculator/bin/
 FeatureVectorCalculator/obj/
-GemCard/bin
-GemCard/obj
-GenCode128/bin
-GenCode128/obj
-GraphLib/bin
-GraphLib/obj
-MergeResultsDBs/bin
-MergeResultsDBs/obj
-OrderManagement/bin
-OrderManagement/obj
-TracingDB/bin
-TracingDB/obj
-ResetBatchNr/bin
-ResetBatchNr/obj
-RestClient/bin
-RestClient/obj
+GemCard/bin/
+GemCard/obj/
+GenCode128/bin/
+GenCode128/obj/
+GenericTest/bin/
+GenericTest/obj/
+GraphLib/bin/
+GraphLib/obj/
+LabelPrinting/bin/
+LabelPrinting/obj/
+MergeResultsDBs/bin/
+MergeResultsDBs/obj/
+OrderManagement/bin/
+OrderManagement/obj/
+ProductionTracing/bin/
+ProductionTracing/obj/
+RecordProcessing/bin/
+RecordProcessing/obj/
+ResetBatchNr/bin/
+ResetBatchNr/obj/
+RestClient/bin/
+RestClient/obj/
 Results/bin/
 Results/obj/
 ResultsBrowser/bin/
 ResultsBrowser/obj/
+ResultsParser/bin/
+ResultsParser/obj/
+S640TestApp/bin/
+S640TestApp/obj/
 SharedDatabase/bin
 SharedDatabase/obj
 SchematicDrawing/bin
@@ -50,10 +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" />
@@ -52,6 +52,7 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Forms\ListViewExtensions.cs" />
+    <Compile Include="Forms\LviDateTimeColumnComparer.cs" />
     <Compile Include="Forms\LviIntColumnComparer.cs" />
     <Compile Include="Forms\LviNameSurnameColumnComparer.cs" />
     <Compile Include="Forms\LviTextColumnComparer.cs" />
@@ -63,8 +64,10 @@
       <DependentUpon>ModelessForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Formulas.cs" />
+    <Compile Include="CurrentUser.cs" />
     <Compile Include="GlobalData.cs" />
     <Compile Include="IMeasurementCorrection.cs" />
+    <Compile Include="IOrderInfo.cs" />
     <Compile Include="IParamsProvider.cs" />
     <Compile Include="Iperl\OptoTelegramRaw.cs" />
     <Compile Include="IUncertainty.cs" />
@@ -72,8 +75,9 @@
     <Compile Include="Printers\PrintersCommon.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="ProcedureInfo.cs" />
+    <Compile Include="QuitAppException.cs" />
     <Compile Include="SerializableDictionary.cs" />
+    <Compile Include="StatisticalMetrics.cs" />
     <Compile Include="Telegram.cs" />
     <Compile Include="UIControls\CoolButtonCtrl.cs">
       <SubType>UserControl</SubType>
@@ -81,17 +85,10 @@
     <Compile Include="UIControls\CoolButtonCtrl.Designer.cs">
       <DependentUpon>CoolButtonCtrl.cs</DependentUpon>
     </Compile>
-    <Compile Include="UIControls\LviDateTimeColumnComparer.cs" />
     <Compile Include="UIControls\RoundedRectangle.cs" />
     <Compile Include="Units.cs" />
     <Compile Include="Utils.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UIControls\ListViewEx.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UIControls\ListViewExtensions.cs" />
-    <Compile Include="UIControls\LviIntColumnComparer.cs" />
-    <Compile Include="UIControls\LviTextColumnComparer.cs" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>

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
     }
@@ -350,6 +406,17 @@ namespace Common
 		Count
 	}
 
+    /// <summary>
+    /// State of water filled in the test bench.
+    /// </summary>
+    public enum FillState
+    {
+        Unknown,            /// Test bench fill state is unknown
+        Empty,              /// Test bench is empty, no water
+        Full,               /// Test bench is full of water
+        Count
+    }
+
     public enum MeretProtocol
     {
         [Description("<undefined>")]        Undefined,
@@ -453,8 +520,10 @@ namespace Common
     public enum TestProfile
     {
         UserDefined,
+        UserDefinedCompound,
         UserDefinedHeatMeter,
         Protected,                  /// The first protected one
+        ProtectedCompound,
         ProtectedHeatMeter,
     }
 
@@ -629,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,
@@ -759,10 +837,8 @@ namespace Common
         [Description("Levá")]   Left,
         [Description("Pravá")]  Right,
 #else
-        [Description("Left")]
-        Left,
-        [Description("Right")]
-        Right,
+        [Description("Left")]   Left,
+        [Description("Right")]  Right,
 #endif
         Count
     }

Common/Forms/ListViewEx.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections;
@@ -61,8 +61,7 @@ namespace Common.Forms
 		private const int HDN_ITEMCHANGINGW = (HDN_FIRST-20);
 		#endregion
 
-
-        public SortOrder SortOrder = SortOrder.None;
+        public MySortOrder SortOrder = MySortOrder.None;
         public int SortColumn = -1;
 
 		///	<summary>
@@ -71,7 +70,8 @@ namespace Common.Forms
 		private	System.ComponentModel.Container	components = null;
 
 		public event SubItemEventHandler SubItemClicked;
-		public event SubItemEventHandler SubItemBeginEditing;
+        public event SubItemEventHandler SubItemRightClicked;
+        public event SubItemEventHandler SubItemBeginEditing;
 		public event SubItemEndEditingEventHandler SubItemEndEditing;
 
 		public ListViewEx()
@@ -241,12 +241,22 @@ namespace Common.Forms
 		{
 			base.OnMouseUp(e);
 
-			if (DoubleClickActivation)
-			{
-				return;
-			} 
+            MouseEventArgs me = (MouseEventArgs)e;
+            if (me.Button == MouseButtons.Right)
+            {
+                /// Right mouse button click function
+                RightClickFunctionSubitemAt(new Point(e.X, e.Y));
+            }
+            else
+            {
+                /// Normal function (=edit item)
+                if (DoubleClickActivation)
+                {
+                    return;
+                }
 
-			EditSubitemAt(new Point(e.X, e.Y));
+                EditSubitemAt(new Point(e.X, e.Y));
+            }
 		}
 		
 		protected override void OnDoubleClick(EventArgs e)
@@ -277,6 +287,20 @@ namespace Common.Forms
 			}
 		}
 
+        ///<summary>
+        /// Fire SubItemRightClicked
+        ///</summary>
+        ///<param name="p">Point of click/doubleclick</param>
+        private void RightClickFunctionSubitemAt(Point p)
+        {
+            ListViewItem item;
+            int idx = GetSubItemAt(p.X, p.Y, out item);
+            if (idx >= 0)
+            {
+                OnSubItemRightClicked(new SubItemEventArgs(item, idx));
+            }
+        }
+
 		#endregion
 
 		#region In-place editing functions
@@ -302,6 +326,11 @@ namespace Common.Forms
 			if (SubItemClicked != null) SubItemClicked(this, e);
 		}
 
+        protected void OnSubItemRightClicked(SubItemEventArgs e)
+        {
+            if (SubItemRightClicked != null) SubItemRightClicked(this, e);
+        }
+
 
 		/// <summary>
 		/// Begin in-place editing of given cell

Common/Forms/ListViewExtensions.cs

@@ -1,4 +1,7 @@
-using System;
+///
+/// Copyright (c) 2019-2020 Sensus Slovensko a.s.
+///
+using System;
 using System.ComponentModel;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;

Common/Forms/LviDateTimeColumnComparer.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections;
 using System.Windows.Forms;
 
-namespace Common.UIControls
+namespace Common.Forms
 {
     public class LviDateTimeColumnComparer : IComparer
     {

Common/Forms/LviIntColumnComparer.cs

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

Common/Forms/LviNameSurnameColumnComparer.cs

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

Common/Forms/LviTextColumnComparer.cs

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

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.Designer.cs

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

Common/Forms/ModelessForm.cs

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

Common/Formulas.cs

@@ -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,28 +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 Common.AuthorizedAs AuthorizedAs;
-		public static DateTime LastAuthorization = DateTime.Now;
-
-        public static int MinPasswdLength = 0;
-        public static int PasswdExpirationPeriodDays = 0; 
-
-        public static string GetCurrentUserName()
-        {
-            return (CurrentUser != null && CurrentUser.UserName != null) ? CurrentUser.UserName : string.Empty;
-        }
     }
 }

Common/IMeasurementCorrection.cs

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

Common/IOrderInfo.cs

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

Common/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/QuitAppException.cs

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

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/UIControls/ListViewEx.cs

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

Common/UIControls/ListViewEx.resx

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<root>
-	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-		<xsd:element name="root" msdata:IsDataSet="true">
-			<xsd:complexType>
-				<xsd:choice maxOccurs="unbounded">
-					<xsd:element name="data">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" />
-							<xsd:attribute name="type" type="xsd:string" />
-							<xsd:attribute name="mimetype" type="xsd:string" />
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="resheader">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" use="required" />
-						</xsd:complexType>
-					</xsd:element>
-				</xsd:choice>
-			</xsd:complexType>
-		</xsd:element>
-	</xsd:schema>
-	<resheader name="ResMimeType">
-		<value>text/microsoft-resx</value>
-	</resheader>
-	<resheader name="Version">
-		<value>1.0.0.0</value>
-	</resheader>
-	<resheader name="Reader">
-		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-	<resheader name="Writer">
-		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-</root>

Common/UIControls/ListViewExtensions.cs

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

Common/UIControls/LviIntColumnComparer.cs

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

Common/UIControls/LviTextColumnComparer.cs

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

Common/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.
@@ -53,10 +58,9 @@ namespace Config.Entities
                 return corrections[0].Correction;
             }
 
-            int count = corrections.Count;
-            for (int i = 1; i < count; i++)
+            for (int i = 1; i < corrections.Count; i++)
             {
-                if (rawValue < corrections[0].Measurement)
+                if (rawValue < corrections[i].Measurement)
                 {
                     double d1 = rawValue - corrections[i - 1].Measurement;
                     double d2 = corrections[i].Measurement - rawValue;
@@ -75,7 +79,12 @@ namespace Config.Entities
             }
 
             /// rawValue is above the highest value in the correction table
-            return corrections[count - 1].Correction;
+            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
+    {
+        
+    }
+}

DataMatrix4Net/DataMatrix.cs

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

DataMatrix4Net/DataMatrix4Net.csproj

@@ -4,11 +4,11 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{5D9B49E3-CDF9-4A27-80B4-58141D0EB0E0}</ProjectGuid>
+    <ProjectGuid>{7CD2B5B4-3304-4151-B8B4-76A8B8AF9B06}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Events</RootNamespace>
-    <AssemblyName>Events</AssemblyName>
+    <RootNamespace>DataMatrix4Net</RootNamespace>
+    <AssemblyName>DataMatrix4Net</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -21,7 +21,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -30,24 +29,13 @@
     <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 Include="Gma.QrCodeNet.Encoding">
+      <HintPath>..\packages\QrCode.Net.0.4.0.0\net40\Gma.QrCodeNet.Encoding.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -55,9 +43,13 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="DataMatrix.cs" />
+    <Compile Include="MyBitMatrix.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ReedSolomon.cs" />
+    <Compile Include="Symbol.cs" />
+    <Compile Include="Utils.cs" />
   </ItemGroup>
-  <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.

DataMatrix4Net/MyBitMatrix.cs

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

DataMatrix4Net/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("DataMatrix4Net")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("DataMatrix4Net")]
+[assembly: AssemblyCopyright("Copyright ©  2021")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("efc81899-2be9-4a5c-a120-667d20c5265f")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

DataMatrix4Net/ReedSolomon.cs

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

DataMatrix4Net/Symbol.cs

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

DataMatrix4Net/Utils.cs

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

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.Designer.cs

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

EventViewer/EventViewerWnd.cs

@@ -7,7 +7,7 @@ using System.Drawing;
 using System.Windows.Forms;
 using NHibernate;
 using Common;
-using Common.UIControls;
+using Common.Forms;
 using SharedDatabase;
 using SharedDatabase.Entities;
 using EventViewer.Resources;
@@ -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/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