Version increment to 3.9.2146.4

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

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>TRACE;DEBUG;LANG_PL</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -25,7 +25,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;LANG_PL</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

Config/Config.csproj

@@ -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" />

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

@@ -18,8 +18,9 @@ namespace Config.Entities
         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; }
@@ -39,6 +40,7 @@ namespace Config.Entities
         {
 			ValvesOpen = string.Empty;
 			ValvesClose = string.Empty;
+            RegulMinStep = 0;
         }
 
 		public OutputPath(string name, int itemNr)
@@ -46,7 +48,9 @@ namespace Config.Entities
 		{
 			Name = name;
 			ItemNr = itemNr;
-		}
+            RegulMinStep = 0;
+
+        }
 
 		public virtual OutputPath Clone(string name, int itemNr)
         {
@@ -58,7 +62,8 @@ namespace Config.Entities
             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;

Config/FluentCommon.cs

@@ -128,10 +128,11 @@ namespace Config
                             case GID.Administrators:
 #if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
                             case GID.TraceabilityManagement:
-#elif LANG_PL
+//#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/OutputPathMap.cs

@@ -17,7 +17,8 @@ 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);

Results/Entities/MeterTestRslt.cs

@@ -29,8 +29,12 @@ namespace Results.Entities
         public virtual long   ErrorIndicators { get; set; }		/// Not mapped to DB !!!, bit24=E25, bit25=E26, bit26=E27, bit27=E28 (error flags)
         public virtual long   InfoIndicators  { get; set; }		/// Not mapped to DB !!!, bit24=E25, bit25=E26, bit26=E27, bit27=E28 (info flags)
 		public virtual bool   TestDone		  { get; set; }		/// true = test was completed
-		public virtual bool   Passed		  { get; set; }		/// true = test passed, water meter is OK
+		public virtual bool   Passed		  { get; set; }     /// true = test passed, water meter is OK
 #if IPERL
+        public virtual int CalibFactor { get; set; }
+        public virtual int CalibFactorLNA { get; set; }
+        public virtual int Q2CorrRL { get; set; }
+        public virtual int Q2CorrLR { get; set; }
         public virtual string ExtraDataPath   { get; set; }     /// Relative path to a file with opto-data/raw-data
         public virtual float  X1              { get; set; }
         public virtual float  X2              { get; set; }
@@ -166,6 +170,10 @@ namespace Results.Entities
 		    TestDone        = src.TestDone;
             Passed          = src.Passed;
 #if IPERL
+            CalibFactor = src.CalibFactor;
+            CalibFactorLNA = src.CalibFactorLNA;
+            Q2CorrRL = src.Q2CorrRL;
+            Q2CorrLR = src.Q2CorrLR;
             ExtraDataPath = src.ExtraDataPath;
             X1 = src.X1;
             X2 = src.X2;
@@ -209,6 +217,10 @@ namespace Results.Entities
             writer.Write(TestDone);
             writer.Write(Passed);
 #if IPERL
+            writer.Write(CalibFactor);
+            writer.Write(CalibFactorLNA);
+            writer.Write(Q2CorrRL);
+            writer.Write(Q2CorrLR);
             writer.Write((ExtraDataPath != null) ? ExtraDataPath : string.Empty);
             writer.Write(X1);
             writer.Write(X2);
@@ -249,6 +261,10 @@ namespace Results.Entities
             TestDone = reader.ReadBoolean();
             Passed = reader.ReadBoolean();
 #if IPERL
+            CalibFactor = reader.ReadInt32();
+            CalibFactorLNA = reader.ReadInt32();
+            Q2CorrRL = reader.ReadInt32();
+            Q2CorrLR = reader.ReadInt32();
             ExtraDataPath = reader.ReadString();
             X1 = reader.ReadSingle();
             X2 = reader.ReadSingle();

Results/Results.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;LANG_PL</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;IPERL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -29,7 +29,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;LANG_PL</DefineConstants>
+    <DefineConstants>TRACE;IPERL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -241,7 +241,9 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\Strings.fr.resx" />
     <EmbeddedResource Include="Resources\Strings.it.resx" />
-    <EmbeddedResource Include="Resources\Strings.pl.resx" />
+    <EmbeddedResource Include="Resources\Strings.pl.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Resources\Strings.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Strings.Designer.cs</LastGenOutput>

SchematicDrawing/DrawingShape.cs

@@ -378,6 +378,40 @@ namespace SchematicDrawing
                                                                   Properties.Resources.Valve_XL_closed,
                                                                   Properties.Resources.Valve_XL_vacuum,
                                                                   Properties.Resources.Valve_XL_open_dry);
+            /// ValveSw
+            Shapes[DrShIx(Shape.ValveSw, Sz.S)] = new DrawingShape(Shape.ValveSw, Sz.S, 2, 2,
+                                                                 new Node[] { new Node(0, 1, Orient.L), new Node(2, 1, Orient.R) },
+                                                                 new Edge[] { new Edge(0, 1, 20, RouteCouple.OpenWhen1), new Edge(1, 0, 20, RouteCouple.OpenWhen1) },
+                                                                 0, 0, 20, 20,
+                                                                 Properties.Resources.ValveSw_S_open,
+                                                                 Properties.Resources.ValveSw_S_closed,
+                                                                 Properties.Resources.ValveSw_S_vacuum,
+                                                                 Properties.Resources.ValveSw_S_open_dry);
+            Shapes[DrShIx(Shape.ValveSw, Sz.M)] = new DrawingShape(Shape.ValveSw, Sz.M, 3, 4,
+                                                                 new Node[] { new Node(0, 2, Orient.L), new Node(3, 2, Orient.R) },
+                                                                 new Edge[] { new Edge(0, 1, 30, RouteCouple.OpenWhen1), new Edge(1, 0, 30, RouteCouple.OpenWhen1) },
+                                                                 0, 5, 30, 30,
+                                                                 Properties.Resources.ValveSw_M_open,
+                                                                 Properties.Resources.ValveSw_M_closed,
+                                                                 Properties.Resources.ValveSw_M_vacuum,
+                                                                 Properties.Resources.ValveSw_M_open_dry);
+            Shapes[DrShIx(Shape.ValveSw, Sz.L)] = new DrawingShape(Shape.ValveSw, Sz.L, 4, 4,
+                                                                 new Node[] { new Node(0, 2, Orient.L), new Node(4, 2, Orient.R) },
+                                                                 new Edge[] { new Edge(0, 1, 40, RouteCouple.OpenWhen1), new Edge(1, 0, 40, RouteCouple.OpenWhen1) },
+                                                                 0, 0, 40, 40,
+                                                                 Properties.Resources.ValveSw_L_open,
+                                                                 Properties.Resources.ValveSw_L_closed,
+                                                                 Properties.Resources.ValveSw_L_vacuum,
+                                                                 Properties.Resources.ValveSw_L_open_dry);
+            Shapes[DrShIx(Shape.ValveSw, Sz.XL)] = new DrawingShape(Shape.ValveSw, Sz.XL, 5, 6,
+                                                                  new Node[] { new Node(0, 3, Orient.L), new Node(5, 3, Orient.R) },
+                                                                  new Edge[] { new Edge(0, 1, 50, RouteCouple.OpenWhen1), new Edge(1, 0, 50, RouteCouple.OpenWhen1) },
+                                                                  0, 5, 50, 50,
+                                                                  Properties.Resources.ValveSw_XL_open,
+                                                                  Properties.Resources.ValveSw_XL_closed,
+                                                                  Properties.Resources.ValveSw_XL_vacuum,
+                                                                  Properties.Resources.ValveSw_XL_open_dry);
+
             /// Diverter
             Shapes[DrShIx(Shape.Div, Sz.S)] = new DrawingShape(Shape.Div, Sz.S, 2, 2,
                                                                new Node[] { new Node(2, 0, Orient.Up), new Node(1, 2, Orient.Dn), new Node(3, 2, Orient.Dn) },
@@ -523,12 +557,18 @@ namespace SchematicDrawing
             Shapes[DrShIx(Shape.Scale, Sz.L)] = new DrawingShape(Shape.Scale, Sz.L, 12, 11, new Node[] { new Node(6, 11, Orient.Dn) }, null, 0, 0, 120, 110, Properties.Resources.Scale_L);
             Shapes[DrShIx(Shape.Scale, Sz.XL)] = new DrawingShape(Shape.Scale, Sz.XL, 16, 13, new Node[] { new Node(8, 13, Orient.Dn) }, null, 0, 0, 160, 130, Properties.Resources.Scale_XL);
 
-            /// Tank
+            /// Tank uni
             Shapes[DrShIx(Shape.Tank, Sz.S)] = new DrawingShape(Shape.Tank, Sz.S, 10, 8, new Node[] { new Node(0, 6, Orient.L) }, null, 0, 0, 100, 80, Properties.Resources.Tank_S);
             Shapes[DrShIx(Shape.Tank, Sz.M)] = new DrawingShape(Shape.Tank, Sz.M, 12, 9, new Node[] { new Node(0, 7, Orient.L) }, null, 0, 0, 120, 90, Properties.Resources.Tank_M);
             Shapes[DrShIx(Shape.Tank, Sz.L)] = new DrawingShape(Shape.Tank, Sz.L, 15, 11, new Node[] { new Node(0, 9, Orient.L) }, null, 0, 0, 150, 110, Properties.Resources.Tank_L);
             Shapes[DrShIx(Shape.Tank, Sz.XL)] = new DrawingShape(Shape.Tank, Sz.XL, 20, 13, new Node[] { new Node(0, 11, Orient.L) }, null, 0, 0, 200, 130, Properties.Resources.Tank_XL);
 
+            /// Tank hot
+            Shapes[DrShIx(Shape.TankHot, Sz.S)] = new DrawingShape(Shape.TankHot, Sz.S, 10, 8, new Node[] { new Node(0, 6, Orient.L) }, null, 0, 0, 100, 80, Properties.Resources.Tank_S_hot);
+            Shapes[DrShIx(Shape.TankHot, Sz.M)] = new DrawingShape(Shape.TankHot, Sz.M, 12, 9, new Node[] { new Node(0, 7, Orient.L) }, null, 0, 0, 120, 90, Properties.Resources.Tank_M_hot);
+            Shapes[DrShIx(Shape.TankHot, Sz.L)] = new DrawingShape(Shape.TankHot, Sz.L, 15, 11, new Node[] { new Node(0, 9, Orient.L) }, null, 0, 0, 150, 110, Properties.Resources.Tank_L_hot);
+            Shapes[DrShIx(Shape.TankHot, Sz.XL)] = new DrawingShape(Shape.TankHot, Sz.XL, 20, 13, new Node[] { new Node(0, 11, Orient.L) }, null, 0, 0, 200, 130, Properties.Resources.Tank_XL_hot);
+
             /// Junction
             Shapes[DrShIx(Shape.Junction, Sz.None)]  = new DrawingShape(Shape.Junction, Sz.None, 0, 0, new Node[] { new Node(0, 0, Orient.R) });
             Shapes[DrShIx(Shape.Junction, Sz.S)] = new DrawingShape(Shape.Junction, Sz.S, 2, 2,

SchematicDrawing/Enums.cs

@@ -45,11 +45,13 @@ namespace SchematicDrawing
         Scale,
         Sink,
         Tank,
+        TankHot,
         Tee,
         TempM,
         UniCB,
         Vacuum,
         Valve,
+        ValveSw,
         WaterM,
         ElectricM,
 

SchematicDrawing/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace SchematicDrawing.Properties {
     // 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.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -730,6 +730,16 @@ namespace SchematicDrawing.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Tank_L_hot {
+            get {
+                object obj = ResourceManager.GetObject("Tank_L_hot", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -740,6 +750,16 @@ namespace SchematicDrawing.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Tank_M_hot {
+            get {
+                object obj = ResourceManager.GetObject("Tank_M_hot", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -750,6 +770,16 @@ namespace SchematicDrawing.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Tank_S_hot {
+            get {
+                object obj = ResourceManager.GetObject("Tank_S_hot", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -760,6 +790,16 @@ namespace SchematicDrawing.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Tank_XL_hot {
+            get {
+                object obj = ResourceManager.GetObject("Tank_XL_hot", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -970,6 +1010,166 @@ namespace SchematicDrawing.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_L_closed {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_L_closed", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_L_open {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_L_open", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_L_open_dry {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_L_open_dry", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_L_vacuum {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_L_vacuum", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_M_closed {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_M_closed", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_M_open {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_M_open", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_M_open_dry {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_M_open_dry", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_M_vacuum {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_M_vacuum", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_S_closed {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_S_closed", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_S_open {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_S_open", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_S_open_dry {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_S_open_dry", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_S_vacuum {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_S_vacuum", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_XL_closed {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_XL_closed", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_XL_open {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_XL_open", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_XL_open_dry {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_XL_open_dry", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_XL_vacuum {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_XL_vacuum", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

SchematicDrawing/Properties/Resources.resx

@@ -319,6 +319,18 @@
   <data name="Tank_XL" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Pictures\Tank-XL.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+	<data name="Tank_L_hot" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\Tank-L-hot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="Tank_M_hot" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\Tank-M-hot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="Tank_S_hot" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\Tank-S-hot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="Tank_XL_hot" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\Tank-XL-hot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
   <data name="Vacuum_L_dry" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Pictures\Vacuum-L-dry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -373,7 +385,66 @@
   <data name="Valve_XL_vacuum" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Pictures\Valve-XL-vacuum.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="WaterM_L" type="System.Resources.ResXFileRef, System.Windows.Forms">
+
+
+
+
+
+	<data name="ValveSw_L_closed" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-L-closed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_L_open" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-L-open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_L_open_dry" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-L-open-dry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_L_vacuum" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-L-vacuum.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_M_closed" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-M-closed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_M_open" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-M-open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_M_open_dry" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-M-open-dry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_M_vacuum" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-M-vacuum.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_S_closed" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-S-closed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_S_open" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-S-open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_S_open_dry" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-S-open-dry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_S_vacuum" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-S-vacuum.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_XL_closed" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-XL-closed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_XL_open" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-XL-open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_XL_open_dry" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-XL-open-dry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_XL_vacuum" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-XL-vacuum.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+
+
+
+
+
+
+	<data name="WaterM_L" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Pictures\WaterM-L.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="EmergencyStop_XL_off" type="System.Resources.ResXFileRef, System.Windows.Forms">

SchematicDrawing/SchematicDrawing.csproj

@@ -98,6 +98,16 @@
   <ItemGroup>
     <Content Include="Pictures\Clamping-XL-off.png" />
     <Content Include="Pictures\Clamping-XL-on.png" />
+    <Content Include="Pictures\ValveSw-L-open-dry.png" />
+    <Content Include="Pictures\ValveSw-L-vacuum.png" />
+    <Content Include="Pictures\ValveSw-M-open-dry.png" />
+    <Content Include="Pictures\ValveSw-M-vacuum.png" />
+    <Content Include="Pictures\ValveSw-S-open-dry.png" />
+    <Content Include="Pictures\ValveSw-S-vacuum.png" />
+    <Content Include="Pictures\ValveSw-XL-closed.png" />
+    <Content Include="Pictures\ValveSw-XL-open-dry.png" />
+    <Content Include="Pictures\ValveSw-XL-open.png" />
+    <Content Include="Pictures\ValveSw-XL-vacuum.png" />
     <None Include="Pictures\Cover-XL-off.png" />
     <None Include="Pictures\Cover-XL-on.png" />
     <Content Include="Pictures\Div-L-sink-dry.png" />
@@ -118,6 +128,10 @@
     <Content Include="Pictures\Div-XL-tank-wet.png" />
     <Content Include="Pictures\EmergencyStop-XL-off.png" />
     <Content Include="Pictures\EmergencyStop-XL-on.png" />
+    <Content Include="Pictures\Tank-L-hot.png" />
+    <Content Include="Pictures\Tank-M-hot.png" />
+    <Content Include="Pictures\Tank-S-hot.png" />
+    <Content Include="Pictures\Tank-XL-hot.png" />
     <Content Include="Pictures\UniCB-M-error.png" />
     <Content Include="Pictures\UniCB-M-off.png" />
     <Content Include="Pictures\UniCB-M-on.png" />
@@ -187,6 +201,12 @@
     <Content Include="Pictures\Valve-XL-closed.png" />
     <Content Include="Pictures\Valve-XL-open-dry.png" />
     <Content Include="Pictures\Valve-XL-open.png" />
+    <None Include="Pictures\ValveSw-L-closed.png" />
+    <None Include="Pictures\ValveSw-L-open.png" />
+    <None Include="Pictures\ValveSw-M-closed.png" />
+    <None Include="Pictures\ValveSw-M-open.png" />
+    <None Include="Pictures\ValveSw-S-closed.png" />
+    <None Include="Pictures\ValveSw-S-open.png" />
     <None Include="Pictures\WaterM-L.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

SchematicDrawing/SchematicDrawingCtrl.cs

@@ -365,7 +365,7 @@ namespace SchematicDrawing
                     {
                         GNode gnode = new GNode(item, nid);
                         item.GNodes.Add(gnode);
-                        graph.AddNode(gnode, dshape.Shape == Shape.Tank, dshape.Shape == Shape.Scale);
+                        graph.AddNode(gnode, dshape.Shape == Shape.Tank || dshape.Shape == Shape.TankHot, dshape.Shape == Shape.Scale);
                     }
 
                     foreach (var edge in dshape.Edges)
@@ -864,7 +864,7 @@ namespace SchematicDrawing
             /// Draw the component image
             Rectangle rect = dsh.GetRotatedFlippedImageRectangle(item);
 
-            if (item is IRouteBasedDrawingItem && routeBit == false                     /// closed
+            if (item is IRouteBasedDrawingItem && routeBit == false                /// closed
                  && item.GNodes.Count > 0 && item.GNodes[0].Dist < Const.Vacuum         /// wet
                  && dsh.HasClosedWet)                                                   /// has appropriate image
             {

SharedComponents/LiveLogCache.cs

@@ -0,0 +1,234 @@
+using System.IO.MemoryMappedFiles;
+using System.Text;
+
+namespace SharedComponents
+{
+    public class LiveLogCache
+    {
+        /*// Staticka instancia pre singleton
+        private static readonly LiveLogCache _instance = new LiveLogCache();
+
+        // Uzamykaci objekt pre bezpecny pristup z viacerych vlakien
+        private static readonly object _lock = new object();
+
+        // Zoznam na ukladanie logov
+        private readonly List<string> _logs = new List<string>();
+
+        // Udalost pre notifikaciu pri zmene logov
+        public event Action<string> LogAdded;
+
+        // Sukromny konstruktor (singleton pattern)
+        private LiveLogCache() { }
+
+        // Metoda na ziskanie poctu logov
+        public int GetCount()
+        {
+            return _logs.Count;
+        }
+
+        // Staticka metoda na ziskanie instancie
+        public static LiveLogCache Instance
+        {
+            get
+            {
+                lock (_lock)
+                {
+                    return _instance;
+                }
+            }
+        }
+
+        // Verejna vlastnost na ziskanie logov
+        public IReadOnlyList<string> Logs
+        {
+            get
+            {
+                lock (_lock)
+                {
+                    return _logs.AsReadOnly();
+                }
+            }
+        }
+
+        // Metoda na pridanie logu
+        public void AddLog(string log)
+        {
+            // Ziskanie aktualneho casu v pozadovanom formate
+            string timeStamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:");
+
+            // Vytvorenie noveho logu s casovou peciatkou na zaciatku
+            string logWithTimeStamp = $"{timeStamp} {log}";
+
+            // Pridanie logu do zoznamu
+            lock (_lock)
+            {
+                _logs.Add(logWithTimeStamp);
+            }
+
+            // Spustenie udalosti pre notifikaciu
+            LogAdded?.Invoke(logWithTimeStamp);
+        }
+
+        // Metoda na vycistenie logov
+        public void ClearLogs()
+        {
+            lock (_lock)
+            {
+                _logs.Clear();
+            }
+
+            // Volitelne: Spusti udalost, ak by sme chceli notifikovat aj o vymazani logov
+            LogAdded?.Invoke("Logs were cleared.");
+        }
+
+        // Ziskanie vsetkych logov
+        public List<string> GetAllLogs()
+        {
+            return new List<string>(_logs);  // Vratime kopiu logov
+        }
+
+        // Ziskanie logov medzi urcitou poziciou (s upravenym indexovanim)
+        public List<string> GetLogs(int startIndex, int count)
+        {
+            // Zabezpeci, ze indexy nebudu mimo rozsahu
+            return _logs.Skip(startIndex).Take(count).ToList();
+        }*/
+
+        // Zlepseny kod, ktory umoznuje pracu s MemoryMappedFile, namiesto len priestoru vo virtualnej pamati, navyse je tento subor velkostne obmedzeny na 1MB
+
+        // Staticka instancia pre singleton
+        private static readonly LiveLogCache _instance = new LiveLogCache(true);
+
+        // Uzamykaci objekt pre bezpecny pristup z viacerych vlakien
+        private static readonly object _lock = new object();
+
+        // Zoznam na ukladanie logov
+        private readonly List<string> _logs = new List<string>();
+
+        // Udalost pre notifikaciu pri zmene logov
+        public event Action<string> LogAdded;
+
+        // Memory-mapped file
+        private MemoryMappedFile _mmf;
+        private MemoryMappedViewAccessor _accessor;
+        private const int MaxLogSize = 1024 * 1024; // 1MB
+
+        // Sukromny konstruktor (singleton pattern)
+        private LiveLogCache(bool itsLogsCreator)
+        {
+            if (itsLogsCreator == true)
+            {
+                _mmf = MemoryMappedFile.CreateOrOpen("LiveLogCacheMMF", MaxLogSize);
+            }
+            else
+            {
+                _mmf = MemoryMappedFile.OpenExisting("LiveLogCacheMMF");
+            }
+
+            _accessor = _mmf.CreateViewAccessor();
+        }
+
+        // Metoda na ziskanie poctu logov
+        public int GetCount()
+        {
+            return _logs.Count;
+        }
+
+        // Staticka metoda na ziskanie instancie
+        public static LiveLogCache Instance
+        {
+            get
+            {
+                lock (_lock)
+                {
+                    return _instance;
+                }
+            }
+        }
+
+        // Verejna vlastnost na ziskanie logov
+        public IReadOnlyList<string> Logs
+        {
+            get
+            {
+                lock (_lock)
+                {
+                    return _logs.AsReadOnly();
+                }
+            }
+        }
+
+        // Metoda na pridanie logu
+        public void AddLog(string log)
+        {
+            // Ziskanie aktualneho casu v pozadovanom formate
+            string timeStamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:");
+
+            // Vytvorenie noveho logu s casovou peciatkou na zaciatku
+            string logWithTimeStamp = $"{timeStamp} {log}";
+
+            // Pridanie logu do zoznamu
+            lock (_lock)
+            {
+                _logs.Add(logWithTimeStamp);
+                WriteLogToMemoryMappedFile(logWithTimeStamp);
+            }
+
+            // Spustenie udalosti pre notifikaciu
+            LogAdded?.Invoke(logWithTimeStamp);
+        }
+
+        // Metoda na vycistenie logov
+        public void ClearLogs()
+        {
+            lock (_lock)
+            {
+                _logs.Clear();
+                ClearMemoryMappedFile();
+            }
+
+            // Volitelne: Spusti udalost, ak by sme chceli notifikovat aj o vymazani logov
+            LogAdded?.Invoke("Logs were cleared.");
+        }
+
+        // Ziskanie vsetkych logov
+        public List<string> GetAllLogs()
+        {
+            return new List<string>(_logs);  // Vratime kopiu logov
+        }
+
+        // Ziskanie logov medzi urcitou poziciou (s upravenym indexovanim)
+        public List<string> GetLogs(int startIndex, int count)
+        {
+            // Zabezpeci, ze indexy nebudu mimo rozsahu
+            return _logs.Skip(startIndex).Take(count).ToList();
+        }
+
+        // Metoda na naplnenie ListView
+        /*public void PopulateListView(ListView listView)
+        {
+            listView.Items.Clear();
+            lock (_lock)
+            {
+                foreach (var log in _logs)
+                {
+                    listView.Items.Add(new ListView Item(log));
+                }
+            }
+        }*/
+
+        // Write log to memory-mapped file
+        private void WriteLogToMemoryMappedFile(string log)
+        {
+            byte[] logBytes = Encoding.UTF8.GetBytes(log + Environment.NewLine);
+            _accessor.WriteArray(0, logBytes, 0, logBytes.Length);
+        }
+
+        // Clear memory-mapped file
+        private void ClearMemoryMappedFile()
+        {
+            byte[] emptyBytes = new byte[MaxLogSize];
+            _accessor.WriteArray(0, emptyBytes, 0, emptyBytes.Length);
+        }
+    }
+}

SharedComponents/SharedComponents.csproj

@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+	 <LangVersion>10.0</LangVersion>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

SharedComponents/obj/Debug/net472/SharedComponents.GeneratedMSBuildEditorConfig.editorconfig

@@ -0,0 +1,5 @@
+is_global = true
+build_property.RootNamespace = SharedComponents
+build_property.ProjectDir = C:\Users\micha\git\tbf\SharedComponents\
+build_property.EnableComHosting = 
+build_property.EnableGeneratedComInterfaceComImportInterop = 

SharedComponents/obj/Debug/net472/SharedComponents.GlobalUsings.g.cs

@@ -0,0 +1,7 @@
+// <auto-generated/>
+global using global::System;
+global using global::System.Collections.Generic;
+global using global::System.IO;
+global using global::System.Linq;
+global using global::System.Threading;
+global using global::System.Threading.Tasks;

SharedComponents/obj/SharedComponents.csproj.nuget.g.props

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
+    <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
+    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
+    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\micha\.nuget\packages\</NuGetPackageFolders>
+    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.14.0</NuGetToolVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <SourceRoot Include="C:\Users\micha\.nuget\packages\" />
+  </ItemGroup>
+</Project>

SharedComponents/obj/SharedComponents.csproj.nuget.g.targets

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />

SharedDatabase/SharedDatabase.csproj

@@ -25,7 +25,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;LANG_PL</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

TBF.sln

@@ -5,16 +5,18 @@ VisualStudioVersion = 17.8.34330.188
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TBF", "TBF\TBF.csproj", "{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}"
 	ProjectSection(ProjectDependencies) = postProject
-		{7EBEEA14-91C4-48D7-AF0A-7A4BC3FF9A28} = {7EBEEA14-91C4-48D7-AF0A-7A4BC3FF9A28}
-		{C8939821-BA5C-4988-A3D0-BF53B74865C7} = {C8939821-BA5C-4988-A3D0-BF53B74865C7}
-		{211B5E3F-9996-48A7-ABDE-C878DD2D71C2} = {211B5E3F-9996-48A7-ABDE-C878DD2D71C2}
 		{0C0A1F4D-1363-4544-A7C5-196C76D26CCA} = {0C0A1F4D-1363-4544-A7C5-196C76D26CCA}
 		{0F79CA69-9DBC-41F3-A6FC-5A2937365343} = {0F79CA69-9DBC-41F3-A6FC-5A2937365343}
-		{439D0878-C76E-452B-B17D-209A89E91D36} = {439D0878-C76E-452B-B17D-209A89E91D36}
-		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB} = {9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}
-		{743DF7DB-C7B6-42EB-986D-0F485E5588E4} = {743DF7DB-C7B6-42EB-986D-0F485E5588E4}
-		{46E3B0E1-209F-4550-B0DD-D7E2C039B3CE} = {46E3B0E1-209F-4550-B0DD-D7E2C039B3CE}
+		{211B5E3F-9996-48A7-ABDE-C878DD2D71C2} = {211B5E3F-9996-48A7-ABDE-C878DD2D71C2}
 		{32817BF9-E380-4467-9C7F-936F4B122BC7} = {32817BF9-E380-4467-9C7F-936F4B122BC7}
+		{439D0878-C76E-452B-B17D-209A89E91D36} = {439D0878-C76E-452B-B17D-209A89E91D36}
+		{46E3B0E1-209F-4550-B0DD-D7E2C039B3CE} = {46E3B0E1-209F-4550-B0DD-D7E2C039B3CE}
+		{743DF7DB-C7B6-42EB-986D-0F485E5588E4} = {743DF7DB-C7B6-42EB-986D-0F485E5588E4}
+		{7EBEEA14-91C4-48D7-AF0A-7A4BC3FF9A28} = {7EBEEA14-91C4-48D7-AF0A-7A4BC3FF9A28}
+		{8F942729-F454-4C99-BA6C-746962065AE3} = {8F942729-F454-4C99-BA6C-746962065AE3}
+		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB} = {9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}
+		{C8939821-BA5C-4988-A3D0-BF53B74865C7} = {C8939821-BA5C-4988-A3D0-BF53B74865C7}
+		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2} = {FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Results", "Results\Results.csproj", "{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}"
@@ -26,8 +28,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Config", "Config\Config.csp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResultsBrowser", "ResultsBrowser\ResultsBrowser.csproj", "{07BA543A-54CA-4A59-9AD9-DDE7038E1BF9}"
 	ProjectSection(ProjectDependencies) = postProject
-		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB} = {9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}
 		{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48} = {8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}
+		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB} = {9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeviceTest", "DeviceTest\DeviceTest.csproj", "{6D3384DC-4638-4A92-91A8-F39D900377C6}"
@@ -104,6 +106,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LabelPrinting", "LabelPrint
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TBFTests", "TBFTests\TBFTests.csproj", "{77EB589F-C670-4489-AAD6-2A3C02061FD1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppDiagnostic", "AppDiagnostic\AppDiagnostic.csproj", "{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}"
+	ProjectSection(ProjectDependencies) = postProject
+		{8F942729-F454-4C99-BA6C-746962065AE3} = {8F942729-F454-4C99-BA6C-746962065AE3}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedComponents", "SharedComponents\SharedComponents.csproj", "{8F942729-F454-4C99-BA6C-746962065AE3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sensus.iPerl.RfidCom", "..\iPerlHead\Sensus.iPerl.RfidCom\Sensus.iPerl.RfidCom.csproj", "{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sensus.iPerl.TestConsole", "..\iPerlHead\Sensus.iPerl.TestConsole\Sensus.iPerl.TestConsole.csproj", "{5025ED8B-A94F-4E58-8BE0-68481B061609}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NfcS5_DLL", "..\NfcS5_DLL\NfcS5_DLL.csproj", "{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -127,15 +142,15 @@ Global
 		{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}.Release|x86.ActiveCfg = Release|x86
 		{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}.Release|x86.Build.0 = Release|x86
 		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Release|x86.ActiveCfg = Release|Any CPU
-		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{743DF7DB-C7B6-42EB-986D-0F485E5588E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{743DF7DB-C7B6-42EB-986D-0F485E5588E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{743DF7DB-C7B6-42EB-986D-0F485E5588E4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -464,6 +479,66 @@ Global
 		{77EB589F-C670-4489-AAD6-2A3C02061FD1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{77EB589F-C670-4489-AAD6-2A3C02061FD1}.Release|x86.ActiveCfg = Release|Any CPU
 		{77EB589F-C670-4489-AAD6-2A3C02061FD1}.Release|x86.Build.0 = Release|Any CPU
+		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Debug|x86.Build.0 = Debug|Any CPU
+		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Release|x86.ActiveCfg = Release|Any CPU
+		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Release|x86.Build.0 = Release|Any CPU
+		{8F942729-F454-4C99-BA6C-746962065AE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F942729-F454-4C99-BA6C-746962065AE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F942729-F454-4C99-BA6C-746962065AE3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8F942729-F454-4C99-BA6C-746962065AE3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8F942729-F454-4C99-BA6C-746962065AE3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8F942729-F454-4C99-BA6C-746962065AE3}.Debug|x86.Build.0 = Debug|Any CPU
+		{8F942729-F454-4C99-BA6C-746962065AE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F942729-F454-4C99-BA6C-746962065AE3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F942729-F454-4C99-BA6C-746962065AE3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{8F942729-F454-4C99-BA6C-746962065AE3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{8F942729-F454-4C99-BA6C-746962065AE3}.Release|x86.ActiveCfg = Release|Any CPU
+		{8F942729-F454-4C99-BA6C-746962065AE3}.Release|x86.Build.0 = Release|Any CPU
+		{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|x86.Build.0 = Debug|Any CPU
+		{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Release|x86.ActiveCfg = Release|Any CPU
+		{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Release|x86.Build.0 = Release|Any CPU
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Debug|x86.ActiveCfg = Debug|x86
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Debug|x86.Build.0 = Debug|x86
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Release|Mixed Platforms.Build.0 = Release|x86
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Release|x86.ActiveCfg = Release|x86
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Release|x86.Build.0 = Release|x86
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Debug|x86.Build.0 = Debug|Any CPU
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Release|x86.ActiveCfg = Release|Any CPU
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

TBF/Boxes/DoubleBox.cs

@@ -76,7 +76,7 @@ namespace TBF.Boxes
 			}
 			else
 			{
-                return string.Format(Format, Val * Factor);
+                return string.Format(string.Format("{{0:{0}}}", Format), Val * Factor);
 			}
         }
 

TBF/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.9.2143.1")]
-[assembly: AssemblyFileVersion("3.9.2143.1")]
+[assembly: AssemblyVersion("3.9.2146.4")]
+[assembly: AssemblyFileVersion("3.9.2146.4")]

TBF/Resources/Strings.Designer.cs

@@ -401,6 +401,24 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Application diagnostic.
+        /// </summary>
+        internal static string AppDiagnostic {
+            get {
+                return ResourceManager.GetString("AppDiagnostic", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Application diagnostic.
+        /// </summary>
+        internal static string Application_Diagnostic {
+            get {
+                return ResourceManager.GetString("Application_Diagnostic", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Approval.
         /// </summary>
@@ -4775,6 +4793,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Reg. min step.
+        /// </summary>
+        internal static string RegulMinStep {
+            get {
+                return ResourceManager.GetString("RegulMinStep", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Relative Q from.
         /// </summary>

TBF/Resources/Strings.resx

@@ -197,6 +197,12 @@
   </data>
   <data name="Reg_valve" xml:space="preserve">
     <value>Reg. valve</value>
+  </data>
+	<data name="RegulMinStep" xml:space="preserve">
+    <value>Reg. min step</value>
+  </data>
+	<data name="Application_Diagnostic" xml:space="preserve">
+    <value>Application diagnostic</value>
   </data>
   <data name="Balance" xml:space="preserve">
     <value>Scale</value>
@@ -2442,6 +2448,9 @@
   </data>
   <data name="Upgrade_DB" xml:space="preserve">
     <value>Upgrade database</value>
+  </data>
+	<data name="AppDiagnostic" xml:space="preserve">
+    <value>Application diagnostic</value>
   </data>
   <data name="About" xml:space="preserve">
     <value>About</value>

TBF/Rig/BuiltIn/SetValvesOp.cs

@@ -3,11 +3,13 @@
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 using log4net;
 using Dirichlet.Numerics;
 using TBF.Boxes;
 using TBF.Rig.ControlBoard;
 using TBF.Rig.GenericDevices;
+using System.Windows.Forms;
 
 namespace TBF.Rig.BuiltIn
 {
@@ -194,71 +196,89 @@ namespace TBF.Rig.BuiltIn
         /// <remarks>Only Elde.Valve valves are used, other valves on the lists are ignored</remarks>
         public SetValvesOp(IControlBoard cb, bool open, OutputPath outPath, DateTimeBox timeStamp, FloatBox switchTime)
         {
-            this.cb = cb;
-            if (this.cb == null) throw new ArgumentNullException("ctrlBoard");
-
-            this.timeStamp = timeStamp;
-            this.switchTime = switchTime;
-            this.startStopValveBitNr = outPath.StartValve1 is Valve.Valve ? (outPath.StartValve1 as Valve.Valve).BitPosition : 0;
-
-            IList<IValve> none = new List<IValve>();        /// An empty list of valves
-            switchPointsRaw = new List<SwitchPoint>();
-
-            if (open)
+            try
             {
-                if (outPath.InvertSV1)
-                    AddSwitchPoints(switchPointsRaw, none, ValveBase.MakeList(outPath.StartValve1), 0);     /// close SV1
+                this.cb = cb;
+                if (this.cb == null) throw new ArgumentNullException("ctrlBoard");
+
+                this.timeStamp = timeStamp;
+                this.switchTime = switchTime;
+                this.startStopValveBitNr = outPath.StartValve1 is Valve.Valve ? (outPath.StartValve1 as Valve.Valve).BitPosition : 0;
+
+                IList<IValve> none = new List<IValve>();        /// An empty list of valves
+                switchPointsRaw = new List<SwitchPoint>();
+
+                if (open)
+                {
+                    if (outPath.InvertSV1)
+                        AddSwitchPoints(switchPointsRaw, none, ValveBase.MakeList(outPath.StartValve1), 0);     /// close SV1
+                    else
+                        AddSwitchPoints(switchPointsRaw, ValveBase.MakeList(outPath.StartValve1), none, 0);     /// open SV1
+
+                    if (outPath.StartValve2 != null)
+                    {
+                        if (outPath.InvertSV2)
+                            AddSwitchPoints(switchPointsRaw, none, ValveBase.MakeList(outPath.StartValve2), -outPath.LagSV2);   /// close SV2 after lag
+                        else
+                            AddSwitchPoints(switchPointsRaw, ValveBase.MakeList(outPath.StartValve2), none, -outPath.LagSV2);   /// open SV2 after lag
+                    }
+
+                    if (outPath.StartValve3 != null)
+                    {
+                        if (outPath.InvertSV3)
+                            AddSwitchPoints(switchPointsRaw, none, ValveBase.MakeList(outPath.StartValve3), -outPath.LagSV3);   /// close SV3 after lag
+                        else
+                            AddSwitchPoints(switchPointsRaw, ValveBase.MakeList(outPath.StartValve3), none, -outPath.LagSV3);   /// open SV3 after lag
+                    }
+                }
                 else
-                    AddSwitchPoints(switchPointsRaw, ValveBase.MakeList(outPath.StartValve1), none, 0);     /// open SV1
-
-                if (outPath.StartValve2 != null)
                 {
-                    if (outPath.InvertSV2)
-                        AddSwitchPoints(switchPointsRaw, none, ValveBase.MakeList(outPath.StartValve2), -outPath.LagSV2);   /// close SV2 after lag
+                    if (outPath.InvertSV1)
+                        AddSwitchPoints(switchPointsRaw, ValveBase.MakeList(outPath.StartValve1), none, 0);     /// open SV1
                     else
-                        AddSwitchPoints(switchPointsRaw, ValveBase.MakeList(outPath.StartValve2), none, -outPath.LagSV2);   /// open SV2 after lag
+                        AddSwitchPoints(switchPointsRaw, none, ValveBase.MakeList(outPath.StartValve1), 0);     /// close SV1
+
+                    if (outPath.StartValve2 != null)
+                    {
+                        if (outPath.InvertSV2)
+                            AddSwitchPoints(switchPointsRaw, ValveBase.MakeList(outPath.StartValve2), none, outPath.LagSV2);    /// open SV2 after lag
+                        else
+                            AddSwitchPoints(switchPointsRaw, none, ValveBase.MakeList(outPath.StartValve2), outPath.LagSV2);    /// close SV2 after lag
+                    }
+
+                    if (outPath.StartValve3 != null)
+                    {
+                        if (outPath.InvertSV3)
+                            AddSwitchPoints(switchPointsRaw, ValveBase.MakeList(outPath.StartValve3), none, outPath.LagSV3);    /// open SV3 after lag
+                        else
+                            AddSwitchPoints(switchPointsRaw, none, ValveBase.MakeList(outPath.StartValve3), outPath.LagSV3);    /// close SV3 after lag
+                    }
                 }
 
-                if (outPath.StartValve3 != null)
-                {
-                    if (outPath.InvertSV3)
-                        AddSwitchPoints(switchPointsRaw, none, ValveBase.MakeList(outPath.StartValve3), -outPath.LagSV3);   /// close SV3 after lag
-                    else
-                        AddSwitchPoints(switchPointsRaw, ValveBase.MakeList(outPath.StartValve3), none, -outPath.LagSV3);   /// open SV3 after lag
-                }
+                switchPoints = SortAndMergeSwitchPoints(switchPointsRaw);
+                timeShift = -switchPoints[0].TimeSec;
+                MakeMasks(switchPoints, timeShift);
             }
-            else
+            catch (Exception ex)
             {
-                if (outPath.InvertSV1)
-                    AddSwitchPoints(switchPointsRaw, ValveBase.MakeList(outPath.StartValve1), none, 0);     /// open SV1
-                else
-                    AddSwitchPoints(switchPointsRaw, none, ValveBase.MakeList(outPath.StartValve1), 0);     /// close SV1
-
-                if (outPath.StartValve2 != null)
-                {
-                    if (outPath.InvertSV2)
-                        AddSwitchPoints(switchPointsRaw, ValveBase.MakeList(outPath.StartValve2), none, outPath.LagSV2);    /// open SV2 after lag
-                    else
-                        AddSwitchPoints(switchPointsRaw, none, ValveBase.MakeList(outPath.StartValve2), outPath.LagSV2);    /// close SV2 after lag
-                }
-
-                if (outPath.StartValve3 != null)
-                {
-                    if (outPath.InvertSV3)
-                        AddSwitchPoints(switchPointsRaw, ValveBase.MakeList(outPath.StartValve3), none, outPath.LagSV3);    /// open SV3 after lag
-                    else
-                        AddSwitchPoints(switchPointsRaw, none, ValveBase.MakeList(outPath.StartValve3), outPath.LagSV3);    /// close SV3 after lag
-                }
+                MessageBox.Show(
+                    $"Chyba počas zastavenia regulácie prietoku, v ramci SetValvesOp():\n{ex.Message}\n\nStack trace:\n{ex.StackTrace}",
+                    "Chyba",
+                    MessageBoxButtons.OK,
+                    MessageBoxIcon.Error
+                );
+                throw;
             }
-
-			switchPoints = SortAndMergeSwitchPoints(switchPointsRaw);
-			timeShift = -switchPoints[0].TimeSec;
-			MakeMasks(switchPoints, timeShift);
         }
 
 		/// <summary>Start this operation</summary>
 		public void Start()
         {
+	        if (cb.DebugLevel == DebugMode.Simulate)
+	        {
+		        return ;
+	        }
+	        
 			UInt128 changed = cb.SetValves(switchPoints[0].MasksOpen, switchPoints[0].MasksClose, StateMachine.LogicalFnValves);
 
             if (timeStamp != null && switchPoints[0].TimeSec == timeShift)
@@ -277,7 +297,12 @@ namespace TBF.Rig.BuiltIn
 		/// </returns>
 		public Event Run()
 		{
-            if (nextIx >= switchPoints.Count)
+			if (cb.DebugLevel == DebugMode.Simulate)
+			{
+				return Event.ValvesSet;
+			}
+
+			if (nextIx >= switchPoints.Count)
             {
                 return (StateMachine.Time >= swStartTime + maxDelayTime + waitOnCBDelay) ? Event.ValvesSet : Event.ValvesBusy;
             }
@@ -306,6 +331,11 @@ namespace TBF.Rig.BuiltIn
         /// <summary>Start this operation</summary>
         public void Stop()
 		{
+			if (cb.DebugLevel == DebugMode.Simulate)
+			{
+				return;
+			}
+			
             if (switchTime != null && startStopValveBitNr >= 16 && startStopValveBitNr <= 23 && cb is ControlBoard.Uni.UniCB)
             {
                 switchTime.Val = (cb as ControlBoard.Uni.UniCB).Data.ValveSwitchTime[startStopValveBitNr - 16];

TBF/Rig/CfgChangeArgs.cs

@@ -13,7 +13,7 @@ namespace TBF.Rig
 		public CfgChangeArgs(CfgChangeCmd command, Generic.IComponentCfg cfg)
         {
 			Command = command;
-			Cfg = cfg; 
+			Cfg = cfg;
         }
 	}
 }

TBF/Rig/ControlBoard/IControlBoard.cs

@@ -93,7 +93,7 @@ namespace TBF.Rig.ControlBoard
         /// <returns>Operation</returns>
         IOperation QueryMeasurementEndOp();
 
-        void StopFlowControl(bool isFromUI, int regVId);
+        void StopFlowControl(bool isFromUI, int regVId, int regulationMinStep = 0);
 
         void StopAll(bool isFromUI);
     }

TBF/Rig/ControlBoard/Papouch/PapouchCB.cs

@@ -492,7 +492,7 @@ namespace TBF.Rig.ControlBoard.Papouch
             return null;
         }
 
-        public void StopFlowControl(bool isFromUI, int rvId)
+        public void StopFlowControl(bool isFromUI, int rvId, int regulationMinStep = 0)
         {
         }
 

TBF/Rig/ControlBoard/Uni/Action.cs

@@ -55,6 +55,9 @@ namespace TBF.Rig.ControlBoard.Uni
         public int StabTime { get; set; }           /// SetFlow
         public int InitDacVal { get; set; }         /// SetFlow
         public int DivThreshold { get; set; }       /// StartTest argument
+        public int RegulationMinStep { get; 
+            set; 
+        }  
 
 
         public Action()
@@ -78,6 +81,7 @@ namespace TBF.Rig.ControlBoard.Uni
             RVMovePar1 = 0;
             RVMovePar2 = 0;
             InitDacVal = 0;
+            RegulationMinStep = 0;
         }
 
 
@@ -123,7 +127,7 @@ namespace TBF.Rig.ControlBoard.Uni
         }
 
         ///----------------------------------------------------------------------------------------------
-        public static Action MeasureFlow(bool isFromUI, int flowMeterId)
+        public static Action MeasureFlow(bool isFromUI, int flowMeterId, int regulationMinStep = 0)
         {
             return new Action
             {
@@ -163,7 +167,7 @@ namespace TBF.Rig.ControlBoard.Uni
 
         ///----------------------------------------------------------------------------------------------
         public static Action SetFlow(bool isFromUI, int regValveId, double freqLo, double freqHi,
-                                     int pid, int stabTime_ms)
+                                     int pid, int stabTime_ms, int regulationMinStep = 0)
         {
             int rvMovePar1 = Convert.ToInt32(Math.Round(13.1072 * freqLo));
             int rvMovePar2 = Convert.ToInt32(Math.Round(13.1072 * freqHi));
@@ -178,6 +182,7 @@ namespace TBF.Rig.ControlBoard.Uni
                 RegVMode = RegValveMode.TargetFrequency,
                 RVMovePar1 = rvMovePar1,
                 RVMovePar2 = rvMovePar2,
+                //RegulationMinStep = regulationMinStep,
                 PID = pid,
                 TolerRV = (regValveId == TBF.Rig.Uni.RegValveAnalog.RegValve.RVAnalogIdx)
                     ? Convert.ToInt32(Math.Round(13.1072 * 0.015 * freqLo)) : 0,
@@ -207,7 +212,7 @@ namespace TBF.Rig.ControlBoard.Uni
         ///----------------------------------------------------------------------------------------------
         public static Action StartTest(bool isFromUI, int flowMId, int divId, int divThreshold,
                                        bool isSyncMethod, bool isDivUsed, bool isDelayedStart, bool isStartStop,
-                                       bool isProlonged, int totalPulsesCount, int massPulsesCount = 0)
+                                       bool isProlonged, int totalPulsesCount, int massPulsesCount = 0, int regulationMinStep = 0)
         {
             return new Action
             {
@@ -225,6 +230,7 @@ namespace TBF.Rig.ControlBoard.Uni
                 TotalPulsesCount = totalPulsesCount,
                 MassPulsesCount = (massPulsesCount <= 0) ? totalPulsesCount : massPulsesCount,
                 StartStop = Command.Start,
+                //RegulationMinStep = regulationMinStep,
             };
         }
         void SetStartTestArgs(Action action)
@@ -272,7 +278,7 @@ namespace TBF.Rig.ControlBoard.Uni
         }
 
         ///----------------------------------------------------------------------------------------------
-        public static Action RegVlvIncrMove(bool isFromUI, int regValveId, double timeSec)
+        public static Action RegVlvIncrMove(bool isFromUI, int regValveId, double timeSec, int regulationMinStep = 0)
         {
             int rvMovePar = Math.Abs(Convert.ToInt32(Math.Round(timeSec / 0.050)));     /// Step is 50 ms
 
@@ -285,6 +291,7 @@ namespace TBF.Rig.ControlBoard.Uni
                 RegVMode = (timeSec >= 0) ? RegValveMode.PulseWidth : (RegValveMode.PulseWidth | RegValveMode.NegPulseWidth),
                 RVMovePar1 = rvMovePar,
                 RVMovePar2 = rvMovePar,
+                //RegulationMinStep = regulationMinStep,
             };
         }
         void SetRegVlvIncrMoveArgs(Action action)
@@ -293,6 +300,7 @@ namespace TBF.Rig.ControlBoard.Uni
             RegVMode   = action.RegVMode;
             RVMovePar1 = action.RVMovePar1;
             RVMovePar2 = action.RVMovePar2;
+            //RegulationMinStep = action.RegulationMinStep;
         }
         /// Check whether new action arguments are compatible with alredy collected arguments (true = yes)
         bool CheckSharedRegVlvIncrMoveArgs(Action newAction)
@@ -302,7 +310,7 @@ namespace TBF.Rig.ControlBoard.Uni
         }
 
         ///----------------------------------------------------------------------------------------------
-        public static Action RegVlvMoveToPos(bool isFromUI, int regValveId, int adcValLo, int adcValHi = -1)
+        public static Action RegVlvMoveToPos(bool isFromUI, int regValveId, int adcValLo, int adcValHi = -1, int regulationMinStep = 0)
         {
             int rvMovePar1, rvMovePar2;
 
@@ -318,7 +326,7 @@ namespace TBF.Rig.ControlBoard.Uni
                 rvMovePar1 = Math.Max(adcValLo - 5, 0);
                 rvMovePar2 = Math.Min(adcValLo + 5, 1023);
             }
-                                        
+
             return new Action
             {
                 ActionId = ActionID.RegVlvMoveToPos,
@@ -328,6 +336,7 @@ namespace TBF.Rig.ControlBoard.Uni
                 RegVMode = RegValveMode.TargetPosition,
                 RVMovePar1 = rvMovePar1,
                 RVMovePar2 = rvMovePar2,
+                //RegulationMinStep = regulationMinStep,
             };
         }
         void SetRegVlvMoveToPosArgs(Action action)
@@ -336,6 +345,7 @@ namespace TBF.Rig.ControlBoard.Uni
             RegVMode   = action.RegVMode;
             RVMovePar1 = action.RVMovePar1;
             RVMovePar2 = action.RVMovePar2;
+            //RegulationMinStep = action.RegulationMinStep;
         }
         /// Check whether new action arguments are compatible with alredy collected arguments (true = yes)
         bool CheckSharedRegVlvMoveToPosArgs(Action newAction)
@@ -345,7 +355,7 @@ namespace TBF.Rig.ControlBoard.Uni
         }
 
         ///----------------------------------------------------------------------------------------------
-        public static Action RegVlvStop(bool isFromUI, int regValveId)
+        public static Action RegVlvStop(bool isFromUI, int regValveId, int RegulationMinStep = 0)
         {
             return new Action
             {
@@ -356,6 +366,7 @@ namespace TBF.Rig.ControlBoard.Uni
                 RegVMode = RegValveMode.Stop,
                 RVMovePar1 = 0,
                 RVMovePar2 = 0,
+                //RegulationMinStep = RegulationMinStep
             };
         }
         void SetRegVlvStopArgs(Action action)
@@ -364,6 +375,7 @@ namespace TBF.Rig.ControlBoard.Uni
             RegVMode   = action.RegVMode;
             RVMovePar1 = action.RVMovePar1;
             RVMovePar2 = action.RVMovePar2;
+            //RegulationMinStep = action.RegulationMinStep;
         }
         /// Check whether new action arguments are compatible with alredy collected arguments (true = yes)
         bool CheckSharedRegVlvStopArgs(Action newAction)
@@ -604,7 +616,8 @@ namespace TBF.Rig.ControlBoard.Uni
                             combinedAction.TolerRV,
                             combinedAction.StabTime,
                             combinedAction.InitDacVal,
-                            combinedAction.DivThreshold);
+                            combinedAction.DivThreshold,
+                            combinedAction.RegulationMinStep);
 
             return combinedAction;
         }

TBF/Rig/ControlBoard/Uni/OutputMessage.cs

@@ -5,6 +5,8 @@ using System;
 using System.Diagnostics;
 using log4net;
 using Dirichlet.Numerics;
+using Common;
+using System.Web.Routing;
 
 namespace TBF.Rig.ControlBoard.Uni
 {
@@ -88,7 +90,7 @@ namespace TBF.Rig.ControlBoard.Uni
             message[30] = (byte)(action.RVMovePar2 & 0xFF);
             message[31] = (byte)((action.RVMovePar2 >> 8) & 0xFF);
             message[32] = GetRVStopParam(action);
-            
+
             /// DA1
             message[33] = (byte)(arguments.InitDacVal & 0xFF);
             message[34] = (byte)((arguments.InitDacVal >> 8) & 0xFF);
@@ -98,8 +100,21 @@ namespace TBF.Rig.ControlBoard.Uni
             message[37] = (byte)Math.Max(0, Math.Min(255, arguments.StabTime));     /// StabRV
             message[38] = (byte)((arguments.DivThreshold >> 2) & 0xFF);
 
-            message[39] = 0;
-            message[40] = 0;
+            //---
+            message[39] = (byte)((action.RegulationMinStep << 4) & 0xFF); // ak 0 = koli kompatibilite, 1-6 = hodnoty prislusne pre spodnu saturaciu vypinacej periody casu
+            message[40] = (byte)((action.RegulationMinStep << 4) & 0xFF);
+            //---
+            /*int x = 0;
+            if (action.RegVId == 1 || action.RegVId == 2) x = 3;
+            else if (action.RegVId == 3 || action.RegVId == 4) x = 5;
+            else if (action.RegVId == 5 || action.RegVId == 5) x = 3;
+            message[39] = (byte)((x << 4) & 0xFF);
+            message[40] = (byte)((x << 4) & 0xFF);*/
+            /*//---
+            message[39] = 0x50; // ak 0 = koli kompatibilite, 1-6 = hodnoty prislusne pre spodnu saturaciu vypinacej periody casu
+            message[40] = 0x50;
+            //---*/
+
             Debug.Assert(40 == PayloadLen + 2);
 
             /// Checksum (2 bytes)
@@ -108,6 +123,8 @@ namespace TBF.Rig.ControlBoard.Uni
             message[PayloadLen + 3] = (byte)(checksum & 0xFF);
             message[PayloadLen + 4] = (byte)((checksum >> 8) & 0xFF);
 
+            log.Info("");
+
             return message;
         }
 
@@ -151,11 +168,16 @@ namespace TBF.Rig.ControlBoard.Uni
                 return (byte)0x20;
             }
 
-            if ((a.ActionId & ActionID.SetFlow) != 0 && a.RegVId == TBF.Rig.Uni.RegValveAnalog.RegValve.RVAnalogIdx)
+            else if ((a.ActionId & ActionID.SetFlow) != 0 && a.RegVId == TBF.Rig.Uni.RegValveAnalog.RegValve.RVAnalogIdx)
             {
                 return (byte)0x42;
             }
 
+            /*else
+            {
+                return (a.RegulationMinStep >= 0 || a.RegulationMinStep <= 6)?(byte)(a.RegulationMinStep << 4):(byte)(7<<4);
+            }*/
+
             return 0;
         }
     }

TBF/Rig/ControlBoard/Uni/StandingStartStopTestOp.cs

@@ -2,6 +2,9 @@
 /// Copyright (c) 2021 Sensus Slovensko a.s.
 ///
 using System;
+using System.Reflection;
+using System.Text;
+using System.Windows.Forms;
 using log4net;
 using TBF.Rig.GenericDevices;
 
@@ -16,7 +19,8 @@ namespace TBF.Rig.ControlBoard.Uni
         /// Set by the constructor
         ///
         readonly UniCB uniCB;
-        readonly TBF.Rig.Uni.FlowMeter.FlowMeter flowMeter;
+        readonly object flowMeter;
+        readonly TBF.Rig.Uni.FlowMetersInParallel.FlowMeter flowMeterInParallel;
         readonly TBF.Rig.Uni.Diverter.Diverter diverter;
 		readonly int pulsesCount;               /// Number of reference pulses for a complete test
         readonly bool withDiverter;             /// Test with diverter (and scale)
@@ -50,36 +54,119 @@ namespace TBF.Rig.ControlBoard.Uni
         public StandingStartStopTestOp(UniCB cb, OutputPath devices, int pulsesCount, bool withDiverter)
         {
             this.uniCB = cb;
+            try
+            {
+                flowMeter = devices.FlowMeter as TBF.Rig.Uni.FlowMeter.FlowMeter;
+                if(flowMeter == null) flowMeter = devices.FlowMeter as TBF.Rig.Uni.FlowMetersInParallel.FlowMeter;
 
-			flowMeter = devices.FlowMeter as TBF.Rig.Uni.FlowMeter.FlowMeter;
-            if (flowMeter == null) throw new ArgumentNullException("Invalid flow meter");
+                if (flowMeter == null) throw new ArgumentNullException("Invalid flow meter");
+            }
+            catch (Exception ex)
+            {
+                string deviceInfo = GetAllDevicesInfo(devices);
+                string flowMeterStatus = devices.FlowMeter == null
+                ? "devices.FlowMeter je NULL"
+                : $"devices.FlowMeter je typu: {devices.FlowMeter.GetType().FullName}";
+
+                MessageBox.Show(
+                    $"Chyba počas zastavenia regulácie prietoku, v ramci StandingStartStopTestOp() pre flowMeter:\n" +
+                    $"{ex.Message}\n\n" +
+                    $"Diagnostika:\n{flowMeterStatus}\n\n" +
+                    $"{deviceInfo}\n\n" +
+                    $"Stack trace:\n{ex.StackTrace}",
+                    "Chyba",
+                    MessageBoxButtons.OK,
+                    MessageBoxIcon.Error
+                );
+
+                throw;
+            }
 
             this.pulsesCount = pulsesCount;
             this.withDiverter = withDiverter;
 
             if (withDiverter)
             {
-                diverter = devices.Diverter as TBF.Rig.Uni.Diverter.Diverter;
-                if (diverter == null) throw new ArgumentNullException("Invalid diverter");
+                try
+                {
+                    diverter = devices.Diverter as TBF.Rig.Uni.Diverter.Diverter;
+                    if (diverter == null) throw new ArgumentNullException("Invalid diverter");
+                }
+                catch (Exception ex)
+                {
+                    string deviceInfo = GetAllDevicesInfo(devices);
+
+                    MessageBox.Show(
+                        $"Chyba počas zastavenia regulácie prietoku, v ramci StandingStartStopTestOp() pre diverter:\n" +
+                        $"{ex.Message}\n\n{deviceInfo}\n\nStack trace:\n{ex.StackTrace}",
+                        "Chyba",
+                        MessageBoxButtons.OK,
+                        MessageBoxIcon.Error
+                    );
+
+                    throw;
+                }
             }
 
 			log.Debug(this.ToString());
         }
 
-		/// <summary>
+        string GetAllDevicesInfo(object obj)
+        {
+            if (obj == null) return "devices objekt je null.";
+
+            StringBuilder sb = new StringBuilder();
+            sb.AppendLine("Zoznam zariadení v devices:");
+
+            var props = obj.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance);
+            foreach (var prop in props)
+            {
+                try
+                {
+                    object value = prop.GetValue(obj);
+                    string valueStr = value != null ? value.ToString() : "null";
+                    sb.AppendLine($"{prop.Name}: {valueStr}");
+                }
+                catch (Exception ex)
+                {
+                    sb.AppendLine($"{prop.Name}: [Chyba pri načítaní - {ex.Message}]");
+                }
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
         /// Start this operation
         /// </summary>
-		public void Start()
+        public void Start()
         {
-            log.InfoFormat("Start() Et#={0} pulses={1} withDiverter={2}", flowMeter.Idx1, pulsesCount, withDiverter);
+            if (flowMeter is TBF.Rig.Uni.FlowMeter.FlowMeter)
+            {
+                log.InfoFormat("Start() Et#={0} pulses={1} withDiverter={2}", ((TBF.Rig.Uni.FlowMeter.FlowMeter)flowMeter).Idx1, pulsesCount, withDiverter);
 
-            /// Start the test (and the flow measurement)
-            if (withDiverter) { uniCB.DivResolution = diverter.Resolution; }
-            uniCB.SetActivity(Activity.StandingStartStopTest);
-            uniCB.StartTest(false, flowMeter.Idx1, (withDiverter ? diverter.DiverterNr : 0), 0,
-                            false, withDiverter, false, true, false, pulsesCount);
+                /// Start the test (and the flow measurement)
+                if (withDiverter) { uniCB.DivResolution = diverter.Resolution; }
+                uniCB.SetActivity(Activity.StandingStartStopTest);
+                uniCB.StartTest(false, ((TBF.Rig.Uni.FlowMeter.FlowMeter)flowMeter).Idx1, (withDiverter ? diverter.DiverterNr : 0), 0,
+                                false, withDiverter, false, true, false, pulsesCount);
 
-            opState = OpState.StartingTest;
+                opState = OpState.StartingTest;
+            }
+            else if (flowMeter is TBF.Rig.Uni.FlowMetersInParallel.FlowMeter)
+            {
+                log.InfoFormat("Start() Et#={0} pulses={1} withDiverter={2}", ((TBF.Rig.Uni.FlowMetersInParallel.FlowMeter)flowMeter).Idx1, pulsesCount, withDiverter);
+
+                /// Start the test (and the flow measurement)
+                if (withDiverter) { uniCB.DivResolution = diverter.Resolution; }
+                uniCB.SetActivity(Activity.StandingStartStopTest);
+                uniCB.StartTest(false, ((TBF.Rig.Uni.FlowMetersInParallel.FlowMeter)flowMeter).Idx1, (withDiverter ? diverter.DiverterNr : 0), 0,
+                                false, withDiverter, false, true, false, pulsesCount);
+
+                opState = OpState.StartingTest;
+            }
+
+           
         }
 
         /// <summary>

TBF/Rig/ControlBoard/Uni/UniCB.cs

@@ -17,6 +17,8 @@ using TBF.Boxes;
 using TBF.Rig.GenericDevices;
 using TBF.Rig.Sequences;
 using TBF.UiBridge;
+using AppDiagnostic;
+using SharedComponents;
 
 namespace TBF.Rig.ControlBoard.Uni
 {
@@ -547,7 +549,7 @@ namespace TBF.Rig.ControlBoard.Uni
 
             if (!outputsInitialized || (outputLatch & routeMask) != (route & routeMask)) /// || (StateMachine.Time - lastStateMachineTime) >= 15)
             {
-                var actionsToModify = actionQueue.Where(x => (x.ActionId == ActionID.ChangeRoute));            
+                var actionsToModify = actionQueue.Where(x => (x.ActionId == ActionID.ChangeRoute));
                 bool oneModified = false;
                 foreach (var a in actionsToModify)
                 {
@@ -573,7 +575,11 @@ namespace TBF.Rig.ControlBoard.Uni
 
 
             var combinedAction = Action.FetchNonConflictingActions(actionQueue);    /// Default action is RequestDataOnly
+
+            combinedAction.RegulationMinStep = devices.RegulMinStep;
+
             byte[] outData = OutputMessage.GetMessage(combinedAction, config, (ulong)valvesToInvert);
+
             if (outData != null && outData.Length > 0)
             {
                 if ((combinedAction.ActionId & ActionID.ChangeRoute) != 0)
@@ -595,7 +601,7 @@ namespace TBF.Rig.ControlBoard.Uni
                 {
                     serialPort.Write(outData, 0, outData.Length);
                     lastSentTime = DateTime.Now;
-                }
+                } 
 
                 log.Debug("                        " + OutputMessage.Caption());
                 log.Debug(Telegram.LogTelegram(string.Format("Sent {0}: ", lastSentTime.ToString("HH:mm:ss")), outData));
@@ -615,7 +621,7 @@ namespace TBF.Rig.ControlBoard.Uni
         {
         }
 
-        #endregion
+#endregion
 
         #region IControlBoard interface
 
@@ -781,12 +787,13 @@ namespace TBF.Rig.ControlBoard.Uni
 
         #endregion
 
-        public void MeasureFlow(bool isFromUI, int flowMeterId)
+        public void MeasureFlow(bool isFromUI, int flowMeterId, int regulationMinStep = 0)
         {
             if (IsUIBlocked && isFromUI) return;
 
-            actionQueue.Enqueue(Action.MeasureFlow(isFromUI, flowMeterId));
+            actionQueue.Enqueue(Action.MeasureFlow(isFromUI, flowMeterId, regulationMinStep));
             log.InfoFormat("Enqueue( MeasureFlow(fm={0}) )", flowMeterId);
+
             foreach (var a in actionQueue) log.DebugFormat("   {0}", a);
         }
 
@@ -794,12 +801,13 @@ namespace TBF.Rig.ControlBoard.Uni
         /// To be used with a regulation valve controlled by incremental pulses.
         /// Stability time is fixed: 200 ms
         /// </summary>
-        public void SetFlow(bool isFromUI, int regVId, double freqLo, double freqHi)
+        public void SetFlow(bool isFromUI, int regVId, double freqLo, double freqHi, int regulationMinStep = 0)
         {
             if (IsUIBlocked && isFromUI) return;
 
-            actionQueue.Enqueue(Action.SetFlow(isFromUI, regVId, freqLo, freqHi, Convert.ToInt32(Math.Round(Devices.PidCoef)), 200));
+            actionQueue.Enqueue(Action.SetFlow(isFromUI, regVId, freqLo, freqHi, Convert.ToInt32(Math.Round(Devices.PidCoef)), 200, regulationMinStep));
             log.InfoFormat("Enqueue( SetFlow(rv={0}, fLo={1}, fHi={2}, pid={3}) )", regVId, freqLo, freqHi, Convert.ToInt32(Math.Round(Devices.PidCoef)));
+
             foreach (var a in actionQueue) log.DebugFormat("   {0}", a);
         }
 
@@ -814,22 +822,23 @@ namespace TBF.Rig.ControlBoard.Uni
                                                  totalPulsesCount, massPulsesCount));
             log.InfoFormat("Enqueue( StartTest(fm={0}, div={1}, Sync={2}, withDiv={3}, s/s={4}, prolonged={5} pulsesCount={6} massPulsesCount={7}) )",
                            flowMId, divId, isSyncMethod, isDivUsed, isStartStop, isProlonged, totalPulsesCount, massPulsesCount);
+
             foreach (var a in actionQueue) log.DebugFormat("   {0}", a);
         }
 
-        public void StopFlowControl(bool isFromUI, int regVId)
+        public void StopFlowControl(bool isFromUI, int regVId, int regulationMinStep = 0)
         {
             if (IsUIBlocked && isFromUI) return;
 
             if (regVId < TBF.Rig.Uni.RegValveAnalog.RegValve.RVAnalogIdx)
             {
-                actionQueue.Enqueue(Action.RegVlvStop(isFromUI, regVId));
+                actionQueue.Enqueue(Action.RegVlvStop(isFromUI, regVId, regulationMinStep));
                 log.InfoFormat("Enqueue( RegVlvStop(rv={0}) )", regVId);
             }
             else if (regVId == TBF.Rig.Uni.RegValveAnalog.RegValve.RVAnalogIdx)
             {
                 int dacVal = Data.StavDA[0];
-                actionQueue.Enqueue(Action.RegVlvMoveToPos(isFromUI, regVId, dacVal));
+                actionQueue.Enqueue(Action.RegVlvMoveToPos(isFromUI, regVId, dacVal, regulationMinStep));
                 log.InfoFormat("Enqueue( RegVlvMoveToPos(rv={0}, positionLo={1}) )", regVId, dacVal);
             }
             foreach (var a in actionQueue) log.DebugFormat("   {0}", a);
@@ -841,6 +850,7 @@ namespace TBF.Rig.ControlBoard.Uni
 
             actionQueue.Enqueue(Action.Stop(isFromUI));
             log.InfoFormat("Enqueue( Stop() )");
+
             foreach (var a in actionQueue) log.DebugFormat("   {0}", a);
         }
 
@@ -849,11 +859,11 @@ namespace TBF.Rig.ControlBoard.Uni
         /// </summary>
         /// <param name="rvId">Reg. valve ID</param>
         /// <param name="time">Time in seconds, positive value opens the reg. valve</param>
-        public void RegVlvIncrMove(bool isFromUI, int regVId, double time)
+        public void RegVlvIncrMove(bool isFromUI, int regVId, double time, int regulationMinStep = 0)
         {
             if (IsUIBlocked && isFromUI || regVId >= TBF.Rig.Uni.RegValveAnalog.RegValve.RVAnalogIdx) return;
             
-            var newAction = Action.RegVlvIncrMove(isFromUI, regVId, time);
+            var newAction = Action.RegVlvIncrMove(isFromUI, regVId, time, regulationMinStep);
             
             var actionsToModify = actionQueue.Where(x => (x.ActionId == ActionID.RegVlvIncrMove && x.RegVId == newAction.RegVId));            
             bool oneModified = false;
@@ -870,7 +880,7 @@ namespace TBF.Rig.ControlBoard.Uni
                 oneModified = true;
                 log.InfoFormat("RegVlvIncrMove(UI={0}, RV={1}, time={2})  ...  an action in the queue modified", isFromUI, regVId, time);
             }
-            
+
             if (!oneModified)
             {
                 actionQueue.Enqueue(newAction);
@@ -885,12 +895,13 @@ namespace TBF.Rig.ControlBoard.Uni
         /// </summary>
         /// <param name="rvId">Reg. valve ID</param>
         /// <param name="position">Reg. valve position (0 .. 1.0)</param>
-        public void RegVlvMoveToPos(bool isFromUI, int regVId, int adcValLo, int adcValHi = -1)
+        public void RegVlvMoveToPos(bool isFromUI, int regVId, int adcValLo, int adcValHi = -1, int regulationMinStep = 0)
         {
             if (IsUIBlocked && isFromUI || regVId > TBF.Rig.Uni.RegValveAnalog.RegValve.RVAnalogIdx) return;
 
-            actionQueue.Enqueue(Action.RegVlvMoveToPos(isFromUI, regVId, adcValLo, adcValHi));
+            actionQueue.Enqueue(Action.RegVlvMoveToPos(isFromUI, regVId, adcValLo, adcValHi, regulationMinStep));
             log.InfoFormat("Enqueue( RegVlvMoveToPos(rv={0}, positionLo={1}, positionHi={2}) )", regVId, adcValLo, adcValHi);
+
             foreach (var a in actionQueue) log.DebugFormat("   {0}", a);
         }
 
@@ -907,6 +918,7 @@ namespace TBF.Rig.ControlBoard.Uni
                 actionQueue.Enqueue(Action.Stop(isFromUI));
             }
             log.InfoFormat("Enqueue( SwitchDiverter(div#={0}, toTank={1}) )", divNr1, toTank);
+
             foreach (var a in actionQueue) log.DebugFormat("   {0}", a);
         }
 
@@ -916,6 +928,7 @@ namespace TBF.Rig.ControlBoard.Uni
 
             actionQueue.Enqueue(Action.DelayStartOrStop(isFromUI));
             log.InfoFormat("Enqueue( DelayStartOrStop() )");
+
             foreach (var a in actionQueue) log.DebugFormat("   {0}", a);
         }
 
@@ -930,6 +943,7 @@ namespace TBF.Rig.ControlBoard.Uni
             DivTransitionData.DiverterAssociationValidUntil = StateMachine.Time + 5;
             actionQueue.Enqueue(Action.GetDiverterTransitionData(isFromUI));
             log.InfoFormat("Enqueue( GetDiverterTransitionData(div#={0}, toTank={1}) )", diverter.DiverterNr, toTank);
+
             foreach (var a in actionQueue) log.DebugFormat("   {0}", a);
         }
 
@@ -939,6 +953,7 @@ namespace TBF.Rig.ControlBoard.Uni
 
             actionQueue.Enqueue(Action.GetScopeAnalyzerData(isFromUI));
             log.InfoFormat("Enqueue( GetScopeAnalyzerData() )");
+
             foreach (var a in actionQueue) log.DebugFormat("   {0}", a);
         }
 
@@ -948,6 +963,7 @@ namespace TBF.Rig.ControlBoard.Uni
 
             actionQueue.Enqueue(Action.ResetScopeAnalyzer(isFromUI));
             log.InfoFormat("Enqueue( ResetScopeAnalyzer() )");
+
             foreach (var a in actionQueue) log.DebugFormat("   {0}", a);
         }
 
@@ -957,6 +973,7 @@ namespace TBF.Rig.ControlBoard.Uni
 
             actionQueue.Enqueue(Action.GetSwitchCounterData(isFromUI));
             log.InfoFormat("Enqueue( GetSwitchCounterData() )");
+
             foreach (var a in actionQueue) log.DebugFormat("   {0}", a);
         }
 

TBF/Rig/DataEntry/Combined/EntryForm.cs

@@ -81,7 +81,7 @@ namespace TBF.Rig.DataEntry.Combined
 
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowCycleBeginFormOp()
+		public IOperation ShowCycleBeginFormOp( IRegReader[] regReadersOptional = null)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.ShowFormAtCycleBeginning;

TBF/Rig/DataEntry/HeatMeters12/EntryForm.cs

@@ -96,7 +96,7 @@ namespace TBF.Rig.DataEntry.HeatMeters12
 
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowCycleBeginFormOp()
+		public IOperation ShowCycleBeginFormOp( IRegReader[] regReadersOptional = null)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.ShowFormAtCycleBeginning;

TBF/Rig/DataEntry/HeatMeters6/EntryForm.cs

@@ -95,7 +95,7 @@ namespace TBF.Rig.DataEntry.HeatMeters6
         }
 
         /// <returns>Reference to the operation</returns>
-        public IOperation ShowCycleBeginFormOp()
+        public IOperation ShowCycleBeginFormOp( IRegReader[] regReadersOptional = null)
         {
             if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
             currentOp = CurrentOp.ShowFormAtCycleBeginning;

TBF/Rig/DataEntry/PoseidonCmd/CycleBeginningForm.cs

@@ -0,0 +1,290 @@
+///
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
+using log4net;
+using Common;
+using TBF.Rig.Sequences;
+using TBF.Rig.Output.DB.SensusOracle;
+using TBF.Resources;
+using System.Drawing;
+using NHibernate;
+
+namespace TBF.Rig.DataEntry.PoseidonCmd
+{
+	public partial class CycleBeginningForm : Form, GenericDevices.IHasCompleted
+    {
+		private static readonly ILog log = LogManager.GetLogger(typeof(CycleBeginningForm));
+
+		/// <summary> Number of water meters </summary>
+        public readonly int WaterMetersCount;
+        readonly EntryFormCfg cfg;
+
+        /// Loaded from database beforethe form is open
+        IList<IOrderInfo> listOfOrders;
+        string preselectedOrder;
+
+		/// To be retrieved after the form is closed
+		public string PurchaseOrder;
+		public string[] SNText;
+		public bool[] Disabled;
+
+		/// Set to 'true' when the form closes
+        public bool Completed { get { return completed; } }
+		bool completed;
+
+
+		/// <summary> Parameterless constructor for common functionality </summary>
+		public CycleBeginningForm()
+		{
+			InitializeComponent();
+			ControlBox = false;
+            preselectedOrder = null;
+
+			completed = false;
+			StartForceCloseHandler();
+		}
+
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
+        public CycleBeginningForm(int waterMetersCount, EntryFormCfg cfg, string preselectedOrder = null)
+			: this()
+        {
+            this.WaterMetersCount = waterMetersCount;
+            this.cfg = cfg;
+            this.preselectedOrder = preselectedOrder;
+			SNText = null;
+			Disabled = null;
+        }
+
+
+        private void CycleBeginningForm_Load(object sender, EventArgs e)
+        {
+			Text = Strings.Data;
+			orderGroupBox.Text = Strings.Purchase_order;
+			okButton.Text = Strings.OkBtnText;
+
+            listOfOrders = new List<IOrderInfo>();
+            
+            if ((cfg.Orders == Orders.FromOracle || cfg.Orders == Orders.CombinedAndFromOracle)
+                 && ProcessData.OracleDB != null)
+            {
+                foreach (var o in ProcessData.OracleDB.ReadOrders())
+                {
+                    listOfOrders.Add(o);
+                }
+            }
+
+            if ((cfg.Orders == Orders.FromTracingDB || cfg.Orders == Orders.CombinedAndFromTracingDB)
+                 && ProcessData.TracingDB != null
+                 && ProcessData.TracingDB.DebugLevel == DebugMode.Normal)
+            {
+                foreach (var o in ProcessData.TracingDB.ReadOrders())
+                {
+                    listOfOrders.Add(o);
+                }
+            }
+
+            string insertFirst = null;
+            if (!string.IsNullOrEmpty(preselectedOrder))
+            {
+                insertFirst = preselectedOrder;
+            }
+            else
+            {
+                if (Program.LocalSettings.PurchaseOrderHistoryCount > 0)
+                {
+                    foreach (var o in listOfOrders)
+                    {
+                        if (o.POName == Program.LocalSettings.PurchaseOrderHistory[0])
+                        {
+                            insertFirst = o.POName;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            switch (cfg.Orders)
+            {
+                case Orders.Arbitrary:
+                    PrepareOrderCombo(orderComboBox);
+                    break;
+
+                case Orders.FromOracle:
+                case Orders.FromTracingDB:
+                    if (insertFirst != null)
+                    {
+                        orderComboBox.Items.Add(insertFirst);
+                        orderComboBox.Text = insertFirst;
+                    }
+
+                    foreach (var o in listOfOrders)
+                        if (o.POName != insertFirst)
+                            orderComboBox.Items.Add(o.POName);
+                    break;
+
+                case Orders.CombinedAndFromOracle:
+                case Orders.CombinedAndFromTracingDB:
+                    if (insertFirst != null)
+                    {
+                        orderComboBox.Items.Add(insertFirst);
+                        orderComboBox.Text = insertFirst;
+                    }
+                    orderComboBox.Items.Add("BBAAMMXX");
+                    orderComboBox.Items.Add("BBAAOMXX");
+                    orderComboBox.Items.Add("BBAAQMXX");
+                    orderComboBox.Items.Add("BBAATMFR");
+                    orderComboBox.Items.Add("BBAATMXX");
+                    orderComboBox.Items.Add("CCAAMMXX");
+                    orderComboBox.Items.Add("CCAAOMXX");
+                    orderComboBox.Items.Add("CCAAQMXX");
+                    orderComboBox.Items.Add("CCAATMFR");
+                    orderComboBox.Items.Add("CCAATMXX");
+                    orderComboBox.Items.Add("DDAAMMXX");
+                    orderComboBox.Items.Add("DDAAOMXX");
+                    orderComboBox.Items.Add("DDAAQMXX");
+                    orderComboBox.Items.Add("DDAATMXX");
+                    orderComboBox.Items.Add("DEAAMMXX");
+                    orderComboBox.Items.Add("DEAAOMXX");
+                    orderComboBox.Items.Add("DEAAQMXX");
+                    orderComboBox.Items.Add("DEAATMXX");
+                    orderComboBox.Items.Add("EEAAMMXX");
+                    orderComboBox.Items.Add("EEAAOMXX");
+                    orderComboBox.Items.Add("EEAAQMXX");
+                    orderComboBox.Items.Add("EEAATMFR");
+                    orderComboBox.Items.Add("EEAATMXX");
+                    orderComboBox.Items.Add("FFAAMMXX");
+                    orderComboBox.Items.Add("FFAAOMXX");
+                    orderComboBox.Items.Add("FFAAQMXX");
+                    orderComboBox.Items.Add("FFAATMFR");
+                    orderComboBox.Items.Add("FFAATMXX");
+                    orderComboBox.Items.Add("GFAAMMXX");
+                    orderComboBox.Items.Add("GFAAOMXX");
+                    orderComboBox.Items.Add("GFAAQMXX");
+                    orderComboBox.Items.Add("GFAATMXX");
+
+                    foreach (var o in listOfOrders)
+                        if (o.POName != insertFirst)
+                            orderComboBox.Items.Add(o.POName);
+                    break;
+            }
+
+            ///
+            /// Draw an appropriate test bench picture
+            ///
+            Side side = (TBF.Rig.Sequences.ProcessData.BenchInfo is DataContainer.iPerlBenchInfo.Component)
+                                      ? (TBF.Rig.Sequences.ProcessData.BenchInfo as DataContainer.iPerlBenchInfo.Component).Side
+                                      : Side.Left;
+            if ((cfg.Direction == Direction.Reversed_LR) && (side == Side.Left))
+            {
+                /// direction L->R (reversed), left side
+                pictureBox.Image = Image.FromFile(string.Format("{0}\\Pictures\\reversed_dir_left.jpg", Program.ExecutableDir, true));
+            }
+            else if ((cfg.Direction == Direction.Reversed_LR) && (side == Side.Right))
+            {
+                /// direction L->R (reversed), right side
+                pictureBox.Image = Image.FromFile(string.Format("{0}\\Pictures\\reversed_dir_right.jpg", Program.ExecutableDir, true));
+            }
+            else if (side == Side.Right)
+            {
+                /// direction R->L (forward), right side
+                pictureBox.Image = Image.FromFile(string.Format("{0}\\Pictures\\forward_dir_right.jpg", Program.ExecutableDir, true));
+            }
+            else
+            {
+                /// direction R->L (forward), left side
+                pictureBox.Image = Image.FromFile(string.Format("{0}\\Pictures\\forward_dir_left.jpg", Program.ExecutableDir, true));
+            }
+		}
+
+		/// <summary>
+		/// Load Purchase order combo box items from the LocalSettings PurchaseOrderHistory array
+		/// </summary>
+		/// <param name="orderComboBox">Puchase order ComboBox</param>
+		void PrepareOrderCombo(ComboBox orderComboBox)
+		{
+			for (int i = 0; i < Program.LocalSettings.PurchaseOrderHistoryCount; i++)
+			{
+				orderComboBox.Items.Add(Program.LocalSettings.PurchaseOrderHistory[i]);
+			}
+
+			if (orderComboBox.Items.Count > 0)
+			{
+				orderComboBox.Text = orderComboBox.Items[0].ToString();
+			}
+		}
+
+		private void okButton_Click(object sender, EventArgs e)
+        {
+            if (orderComboBox.Text.Length > 8 ||
+                (cfg.Orders != Orders.Arbitrary && !orderComboBox.Items.Contains(orderComboBox.Text)))
+            {
+                MessageBox.Show(Strings.Invalid_order_number, Strings.Error, MessageBoxButtons.OK,
+                                MessageBoxIcon.Exclamation);
+                return;
+            }
+
+            IOrderInfo oInfo = (listOfOrders == null) ? null : listOfOrders.FirstOrDefault<IOrderInfo>(x => x.POName == orderComboBox.Text);
+            ///
+            if (oInfo is Output.DB.SensusOracle.OrderDetails)
+            {
+                ProcessData.OrderInfo = oInfo;
+            }
+            else if (oInfo is SharedDatabase.Entities.OrderInfo && ProcessData.TracingDB != null)
+            {
+                try
+                {
+                    using (var session = ProcessData.TracingDB.SessionFactory.OpenSession())
+                    {
+                        var list = session.QueryOver<SharedDatabase.Entities.OrderInfo>()
+                                          .Where(x => (x.POName == Program.MainWnd.SelectedProcedure.OrderInfo.POName))
+                                          .List();
+                        ProcessData.OrderInfo = (list.Count == 1) ? list[0] : null;
+                        string workflow = (list.Count == 1) ? list[0].Workflow : null;
+                        ProcessData.WorkflowSummary = SharedDatabase.WorkflowSummary.ReadFromDB(workflow, "test", session);
+                        session.Close();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    log.ErrorFormat("Unable to load an order, workflow or workstep: {0}", ex);
+                    ProcessData.OrderInfo = null;
+                    ProcessData.WorkflowSummary = null;
+                }
+            }
+
+            PurchaseOrder = orderComboBox.Text;
+            Program.LocalSettings.UpdateHistory(orderComboBox.Text, ref Program.LocalSettings.PurchaseOrderHistory);
+
+            completed = true;
+            Close();
+        }
+
+
+		#region Forced close handling
+
+		public void StartForceCloseHandler()
+		{
+			UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args)
+			{
+				if (InvokeRequired) { Invoke(new EventHandler<EventArgs>(OnForceClose), sender, args); }
+				else OnForceClose(sender, args);
+			};
+		}
+
+		private void OnForceClose(object sender, EventArgs args)
+		{
+			DialogResult = DialogResult.Cancel;
+			Close();
+		}
+
+		#endregion
+   }
+}

TBF/Rig/DataEntry/PoseidonCmd/CycleBeginningForm.designer.cs

@@ -0,0 +1,97 @@
+///
+/// Copyright (c) 2015 Sensus Metering Systems
+///
+namespace TBF.Rig.DataEntry.PoseidonCmd
+{
+    partial class CycleBeginningForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CycleBeginningForm));
+            this.okButton = new System.Windows.Forms.Button();
+            this.orderGroupBox = new System.Windows.Forms.GroupBox();
+            this.orderComboBox = new System.Windows.Forms.ComboBox();
+            this.pictureBox = new System.Windows.Forms.PictureBox();
+            this.orderGroupBox.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // okButton
+            // 
+            resources.ApplyResources(this.okButton, "okButton");
+            this.okButton.ForeColor = System.Drawing.Color.Black;
+            this.okButton.Name = "okButton";
+            this.okButton.UseVisualStyleBackColor = true;
+            this.okButton.Click += new System.EventHandler(this.okButton_Click);
+            // 
+            // orderGroupBox
+            // 
+            this.orderGroupBox.Controls.Add(this.orderComboBox);
+            resources.ApplyResources(this.orderGroupBox, "orderGroupBox");
+            this.orderGroupBox.ForeColor = System.Drawing.Color.Black;
+            this.orderGroupBox.Name = "orderGroupBox";
+            this.orderGroupBox.TabStop = false;
+            // 
+            // orderComboBox
+            // 
+            this.orderComboBox.FormattingEnabled = true;
+            resources.ApplyResources(this.orderComboBox, "orderComboBox");
+            this.orderComboBox.Name = "orderComboBox";
+            // 
+            // pictureBox
+            // 
+            resources.ApplyResources(this.pictureBox, "pictureBox");
+            this.pictureBox.Name = "pictureBox";
+            this.pictureBox.TabStop = false;
+            // 
+            // CycleBeginningForm
+            // 
+            resources.ApplyResources(this, "$this");
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.DarkGray;
+            this.Controls.Add(this.pictureBox);
+            this.Controls.Add(this.orderGroupBox);
+            this.Controls.Add(this.okButton);
+            this.ForeColor = System.Drawing.Color.Black;
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+            this.Name = "CycleBeginningForm";
+            this.TopMost = true;
+            this.Load += new System.EventHandler(this.CycleBeginningForm_Load);
+            this.orderGroupBox.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+		private System.Windows.Forms.Button okButton;
+		private System.Windows.Forms.GroupBox orderGroupBox;
+		private System.Windows.Forms.ComboBox orderComboBox;
+        private System.Windows.Forms.PictureBox pictureBox;
+    }
+}

TBF/Rig/DataEntry/PoseidonCmd/CycleBeginningForm.resx

@@ -0,0 +1,239 @@
+<?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>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="okButton.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Verdana, 14.25pt</value>
+  </data>
+  <data name="okButton.Location" type="System.Drawing.Point, System.Drawing">
+    <value>627, 26</value>
+  </data>
+  <data name="okButton.Size" type="System.Drawing.Size, System.Drawing">
+    <value>112, 63</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="okButton.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="okButton.Text" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="&gt;&gt;okButton.Name" xml:space="preserve">
+    <value>okButton</value>
+  </data>
+  <data name="&gt;&gt;okButton.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;okButton.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;okButton.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="orderComboBox.Location" type="System.Drawing.Point, System.Drawing">
+    <value>90, 32</value>
+  </data>
+  <data name="orderComboBox.Size" type="System.Drawing.Size, System.Drawing">
+    <value>432, 31</value>
+  </data>
+  <data name="orderComboBox.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;orderComboBox.Name" xml:space="preserve">
+    <value>orderComboBox</value>
+  </data>
+  <data name="&gt;&gt;orderComboBox.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;orderComboBox.Parent" xml:space="preserve">
+    <value>orderGroupBox</value>
+  </data>
+  <data name="&gt;&gt;orderComboBox.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="orderGroupBox.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Verdana, 14.25pt</value>
+  </data>
+  <data name="orderGroupBox.Location" type="System.Drawing.Point, System.Drawing">
+    <value>28, 12</value>
+  </data>
+  <data name="orderGroupBox.Size" type="System.Drawing.Size, System.Drawing">
+    <value>565, 82</value>
+  </data>
+  <data name="orderGroupBox.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="orderGroupBox.Text" xml:space="preserve">
+    <value>Order</value>
+  </data>
+  <data name="&gt;&gt;orderGroupBox.Name" xml:space="preserve">
+    <value>orderGroupBox</value>
+  </data>
+  <data name="&gt;&gt;orderGroupBox.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;orderGroupBox.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;orderGroupBox.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="pictureBox.Location" type="System.Drawing.Point, System.Drawing">
+    <value>28, 118</value>
+  </data>
+  <data name="pictureBox.Size" type="System.Drawing.Size, System.Drawing">
+    <value>711, 497</value>
+  </data>
+  <data name="pictureBox.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="&gt;&gt;pictureBox.Name" xml:space="preserve">
+    <value>pictureBox</value>
+  </data>
+  <data name="&gt;&gt;pictureBox.Type" xml:space="preserve">
+    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;pictureBox.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;pictureBox.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 13</value>
+  </data>
+  <data name="$this.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>769, 639</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>Batch data</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>CycleBeginningForm</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+</root>

TBF/Rig/DataEntry/PoseidonCmd/EntryForm.cs

@@ -0,0 +1,383 @@
+///
+/// Copyright (c) 2015-2021 Sensus Metering Systems
+///
+using System;
+using System.Collections.Generic;
+using log4net;
+using Config.Entities;
+using NHibernate.Util;
+using TBF.Rig;
+using TBF.Rig.GenericDevices;
+using TBF.Rig.RegisterReaders.PoseidonCmdStartStop;
+using TBF.Rig.Sequences;
+
+namespace TBF.Rig.DataEntry.PoseidonCmd
+{
+	public class EntryForm : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasWMStatesForm, IHasFromUNIDisablePossibility
+	{
+        private static readonly ILog log = LogManager.GetLogger(typeof(EntryForm));
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
+
+		public bool UsesCameras() { return false; }
+
+        readonly EntryFormCfg entryFormCfg;
+		IRegReader[] regReaders;
+
+		/// <summary>
+		/// Properties set by the Begin, End and WMStates form
+		/// </summary>
+		bool[] disabled;				/// This array is shared between forms
+
+		string[] wmCycleEndState;
+		public string WMCycleEndState(int wmNr) { return (wmNr >= 0 && wmNr < wmCycleEndState.Length) ? wmCycleEndState[wmNr] : string.Empty; }
+
+		double[] wmStartState;
+		public double WMStartState(int wmNr) { return (wmNr >= 0 && wmNr < wmStartState.Length) ? wmStartState[wmNr] : 0; }
+
+		double[] wmEndState;
+		public double WMEndState(int wmNr) { return (wmNr >= 0 && wmNr < wmEndState.Length) ? wmEndState[wmNr] : 0; }
+
+		string[] wmStartStateStr;
+		
+
+        System.Windows.Forms.Form modelessDlg;
+        public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
+
+		double refVolume;
+		double errLimLo;
+		double errLimHi;
+
+		bool resultSaved;								/// Set in Run() when results are saved
+
+		IList<Results.Entities.WaterMeter> waterMeters;		/// Reference to ...ProcessData.BatchRslts.WaterMeters[]
+
+		public enum CurrentOp
+		{
+			None,
+			SendStartDataStream,
+			ReadDatastream_StartStates,
+			ReadDatastream_EndStates,
+		}
+
+		CurrentOp currentOp;
+
+
+		public EntryForm() { }
+
+		public EntryForm(Generic.IComponentCfg cfg)
+			: base(cfg)
+		{
+			entryFormCfg = cfg as EntryFormCfg;
+        }
+
+        public override void Initialize()
+        {
+            disabled = new bool[TBF.Data.WMsCount];
+            wmStartState = new double[TBF.Data.WMsCount];
+            wmStartStateStr = new string[TBF.Data.WMsCount];
+            wmEndState = new double[TBF.Data.WMsCount];
+            wmCycleEndState = new string[TBF.Data.WMsCount];
+            currentOp = CurrentOp.None;
+            log.FatalFormat("{0} initialized: {1}", Name, this);
+        }
+
+
+		/// <returns>Reference to the operation</returns>
+		public IOperation ShowCycleBeginFormOp( IRegReader[] regReadersOptional = null)
+		{
+			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
+			currentOp = CurrentOp.SendStartDataStream;
+			this.waterMeters = ProcessData.BatchRslts.Batch.WaterMeters;
+			if (regReadersOptional != null)
+			{
+				bool isAvailable = false;
+				foreach (IRegReader reader in regReadersOptional)
+				{
+					if (reader != null)
+						isAvailable = true;
+				}
+				if (isAvailable)
+				{
+					this.regReaders = regReadersOptional;
+				}
+			}
+			return this;
+		}
+
+        /// <returns>Reference to the operation</returns>
+        public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
+        {
+			if (!(
+				    currentOp == CurrentOp.None 
+			      || currentOp == CurrentOp.SendStartDataStream)
+			    ) throw new Exception("Sequence error");
+			currentOp = CurrentOp.ReadDatastream_StartStates;
+			//TODO BUMI apply show data in dialog if config required
+			//entryFormCfg.Direction = Direction.S640;
+			//currentOp = CurrentOp.EnterTestStartStates;
+			this.regReaders = regReaders;
+			int iterator = 0;
+			foreach (IRegReader reader in regReaders)
+			{
+				if (reader != null && reader is PoseidonReader)
+				{
+					PoseidonReader poseidonReader = (reader as PoseidonReader);
+					if (!string.IsNullOrEmpty(poseidonReader.SerialNr) 
+					    && waterMeters.Count > iterator)
+					{
+						waterMeters[iterator].SerialNr = poseidonReader.SerialNr;
+					}
+				}
+
+				iterator++;
+			}
+			return this;
+		}
+
+        /// <returns>null (not implemented)</returns>
+        public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
+        public IOperation ShowTestCollectFormOp(IRegReader[] regReaders, double volumeRef, double errLimLo, double errLimHi) { return null; }
+
+		/// <returns>Reference to the operation</returns>
+		public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
+		{
+			if (!(currentOp == CurrentOp.None) ) 
+				throw new Exception("Sequence error");
+			currentOp = CurrentOp.ReadDatastream_EndStates;
+			this.regReaders = regReaders;
+			this.refVolume = refVolume;
+			this.errLimLo = errLimLo;
+			this.errLimHi = errLimHi;
+			return this;
+		}
+
+        delegate void EntryFormDlgt(EntryForm myRef);
+        /// 
+        void OpenBeginningDlg(EntryForm myRef)
+        {
+	        if (!ShowForm)
+		        return;
+            myRef.modelessDlg = new CycleBeginningForm(TBF.Data.WMsCount, myRef.entryFormCfg,
+                ProcessData.SelectedProcedure.OrderInfo != null ? ProcessData.SelectedProcedure.OrderInfo.POName : string.Empty);
+            modelessDlg.Show();
+        }
+        /// 
+		void OpenTestStartStatesDlg(EntryForm myRef)
+		{
+			if (!ShowForm)
+				return;
+			myRef.modelessDlg = new TestStartEndForm(myRef.waterMeters.Count, myRef.regReaders, disabled);
+			modelessDlg.Show();
+		}
+		///
+		void OpenTestEndStatesDlg(EntryForm myRef)
+		{
+			if (!ShowForm)
+				return;
+			myRef.modelessDlg = new TestStartEndForm(TBF.Data.WMsCount, myRef.regReaders, wmStartStateStr, disabled, refVolume, errLimLo, errLimHi);
+			modelessDlg.Show();
+		}
+
+		/// <summary>Start this operation</summary>
+		public void Start()
+		{
+			if (!ShowForm)
+				return ;
+			
+			resultSaved = false;
+			switch (currentOp)
+            {
+                case CurrentOp.SendStartDataStream:
+	                ReadAndSetDataToMeters();
+                    if (ProcessData.SelectedProcedure.OrderInfo == null || entryFormCfg.Direction != Direction.S640)
+                    {
+                        Program.MainWnd.Invoke(new EntryFormDlgt(OpenBeginningDlg), this);
+                    }
+                    else
+                    {
+                        /// Only in case of 640 meters and an order information entered during the procedure selection
+                        /// this DataEntry form at the beginning of the cycle is skipped
+                        modelessDlg = null;
+                    }
+                    break;
+				case CurrentOp.ReadDatastream_StartStates:
+					Program.MainWnd.Invoke(new EntryFormDlgt(OpenTestStartStatesDlg), this);
+					break;
+				case CurrentOp.ReadDatastream_EndStates:
+					Program.MainWnd.Invoke(new EntryFormDlgt(OpenTestEndStatesDlg), this);
+					break;
+			}
+		}
+
+		/// <summary>Run this operation</summary>
+		/// <returns>Event.ResultsPrinted</returns>
+		public Event Run()
+		{
+			ReadAndSetDataToMeters();
+			
+			if (!ShowForm)
+				return Event.ModelessFormClosed;
+			
+            if (ProcessData.SelectedProcedure.OrderInfo != null && entryFormCfg.Direction == Direction.S640)
+            {
+                for (int i = 0; i < waterMeters.Count; i++)
+                {
+                    if (waterMeters[i] != null)
+                        waterMeters[i].PurchaseOrder = ProcessData.SelectedProcedure.OrderInfo.POName;
+                }
+                return Event.ModelessFormClosed;
+            }
+
+            if ((modelessDlg is IHasCompleted) && !(modelessDlg as IHasCompleted).Completed)
+			{
+				return Event.ModelessFormIsOpen;
+			}
+
+			if (!resultSaved)		/// This is to save the result only once
+			{
+				if (currentOp == CurrentOp.SendStartDataStream)
+				{
+					CycleBeginningForm dlg = (modelessDlg as CycleBeginningForm);
+					if (dlg != null)
+					{
+                        for (int i = 0; i < Math.Min(dlg.WaterMetersCount, waterMeters.Count); i++)
+                        {
+                            if (waterMeters[i] != null)
+                            {
+                                if (dlg.PurchaseOrder != null) waterMeters[i].PurchaseOrder = dlg.PurchaseOrder;
+                            }
+                        }
+                    }
+				}
+                else if (modelessDlg is TestStartEndForm && currentOp == CurrentOp.ReadDatastream_StartStates)
+				{
+                    /// Fixed start test - start
+                    TestStartEndForm dlg = (modelessDlg as TestStartEndForm);
+                    if (dlg != null)
+                    {
+                        for (int i = 0; i < dlg.WaterMetersCount; i++)
+                        {
+                            wmStartState[i] = dlg.WMStartState[i];
+                            wmStartStateStr[i] = dlg.WMStartStateStr[i];
+                        }
+                    }
+                }
+				else if (modelessDlg is TestStartEndForm && currentOp == CurrentOp.ReadDatastream_EndStates)
+				{
+                    /// Fixed start test - end
+                    TestStartEndForm dlg = (modelessDlg as TestStartEndForm);
+                    if (dlg != null)
+                    {
+                        for (int i = 0; i < dlg.WaterMetersCount; i++)
+                        {
+                            wmEndState[i] = dlg.WMEndState[i];
+                        }
+                    }
+                }
+                resultSaved = true;
+				modelessDlg = null;
+			}
+
+			return Event.ModelessFormClosed;		/// Form closed
+		}
+
+		/// <summary>Stop this operation</summary>
+		public void Stop()
+		{
+			if (modelessDlg is IHasCompleted)
+			{
+				UiBridge.Bridge.OnCloseModelessForm(this, null);
+				modelessDlg = null;
+			}
+			currentOp = CurrentOp.None;
+		}
+
+		public bool ShowForm { get; set; }
+		public bool ReadAndSetDataToMeters()
+		{
+			bool bOperationSuccess = false;
+			if (currentOp == CurrentOp.SendStartDataStream)
+			{
+				bool finishedReading = regReaders == null; // we can work only with register readers
+				while (!finishedReading)
+				{
+					bool bAllReadersFinished = true;
+					foreach (var iRegReader in regReaders )
+					{
+						if (iRegReader is PoseidonReader)
+						{
+							PoseidonReader poseidonReader = (iRegReader as PoseidonReader);
+							if (poseidonReader.CurrentOp == PoseidonReader.CurrentPoseidonOp.SendStartDataStream_Done
+							    || poseidonReader.CurrentOp == PoseidonReader.CurrentPoseidonOp.SendStartDataStream_Runing)
+							{
+								poseidonReader.SetCurrentOp(PoseidonReader.CurrentPoseidonOp.SendStartDataStream);
+							}
+							/// Send start data stream
+							poseidonReader.Run();
+							if (!(poseidonReader.CurrentOp == PoseidonReader.CurrentPoseidonOp.Done
+							      || poseidonReader.CurrentOp == PoseidonReader.CurrentPoseidonOp.Error))
+							{
+								bAllReadersFinished = false;
+							}
+						}
+					}
+					/// Wait for all readers to finish
+					if (bAllReadersFinished)
+					{
+						finishedReading = true;
+					}
+					else
+					{
+						System.Threading.Thread.Sleep(100);
+					}
+				}
+
+				bOperationSuccess = true;
+			}
+			else if ((currentOp == CurrentOp.ReadDatastream_StartStates)
+			         ||  (currentOp == CurrentOp.ReadDatastream_EndStates))
+			{
+				bool finishedReading = regReaders == null; // we can work only with register readers
+				while (!finishedReading)
+				{
+					bool bAllReadersFinished = true;
+					foreach (var iRegReader in regReaders )
+					{
+						if (iRegReader is PoseidonReader)
+						{
+							PoseidonReader poseidonReader = (iRegReader as PoseidonReader);
+							if(poseidonReader == null)
+								continue;
+							if (!(poseidonReader.CurrentOp == PoseidonReader.CurrentPoseidonOp.ReadDatastream_Done
+							    || poseidonReader.CurrentOp == PoseidonReader.CurrentPoseidonOp.ReadDatastream_Running))
+							{
+								poseidonReader.SetCurrentOp((currentOp == CurrentOp.ReadDatastream_StartStates)?
+									PoseidonReader.CurrentPoseidonOp.ReadDataStream_Start :
+									PoseidonReader.CurrentPoseidonOp.ReadDataStream_End);
+							}
+							/// Send start data stream
+							poseidonReader.Run();
+							if (!(poseidonReader.CurrentOp == PoseidonReader.CurrentPoseidonOp.Done
+							      || poseidonReader.CurrentOp == PoseidonReader.CurrentPoseidonOp.Error))
+							{
+								bAllReadersFinished = false;
+							}
+						}
+					}
+					if (bAllReadersFinished)
+					{
+						finishedReading = true;
+					}
+					else
+					{
+						System.Threading.Thread.Sleep(100);
+					}
+				}
+
+				bOperationSuccess = true;
+			}
+			
+			return bOperationSuccess;
+		}
+	}
+}

TBF/Rig/DataEntry/PoseidonCmd/EntryFormCfg.cs

@@ -0,0 +1,191 @@
+///
+/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.Xml.Serialization;
+using Common;
+using Config.Entities;
+using TBF.Resources;
+using TBF.Rig.Generic;
+
+namespace TBF.Rig.DataEntry.PoseidonCmd
+{
+    public enum Direction
+    {
+#if LANG_SK
+        [Description("iPERL normálne (R-L)")]     Forward_RL,
+        [Description("iPERL opačne (L-R)")]       Reversed_LR,
+        [Description("640")]                      S640,
+#elif LANG_DE
+        [Description("iPERL Forward (R-L)")]      Forward_RL,
+        [Description("iPERL Reversed (L-R)")]     Reversed_LR,
+        [Description("640")]                      S640,
+#else
+        [Description("iPERL Forward (R-L)")]      Forward_RL,
+        [Description("iPERL Reversed (L-R)")]     Reversed_LR,
+        [Description("640")]                      S640,
+#endif
+        Count,
+    }
+
+    public enum Orders
+    {
+#if LANG_SK
+        [Description("Ľubovolné")]                         Arbitrary,
+        [Description("Z Oracle databázy")]                 FromOracle,
+        [Description("Zo sledovacej databázy")]            FromTracingDB,
+        [Description("Združené a z Oracle")]               CombinedAndFromOracle,
+        [Description("Združené a zo sledovacej databázy")] CombinedAndFromTracingDB,
+#elif LANG_CZ
+        [Description("Libovolné")]                         Arbitrary,
+        [Description("Z Oracle databáze")]                 FromOracle,
+        [Description("Ze sledovací databáze")]             FromTracingDB,
+        [Description("Sdružené a z Oracle")]               CombinedAndFromOracle,
+        [Description("Sdružené a ze sledovací databáze")]  CombinedAndFromTracingDB,
+#else
+        [Description("Arbitrary")]                         Arbitrary,
+        [Description("From Oracle")]                       FromOracle,
+        [Description("From Tracing DB")]                   FromTracingDB,
+        [Description("Combined and from Oracle")]          CombinedAndFromOracle,
+        [Description("Combined and from Tracing DB")]      CombinedAndFromTracingDB,
+#endif
+        Count,
+    }
+    
+    public class EntryFormCfg : ComponentCfgBase, IComponentCfg, IParamsProvider
+	{
+		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EntryFormCfg) })[0];
+		public override XmlSerializer GetSerializer() { return Serializer; }
+
+        public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities)
+        {
+            return new Configs.ParamsProvider.ComponentCfgCtrl(this, null);
+        }
+
+		///
+		/// Serialized parameters
+		///
+        public Direction Direction;
+        public Orders Orders;
+
+		/// Private parameterless constructor invoked by all other (public) constructors
+		EntryFormCfg() { }
+
+        public EntryFormCfg(string name, IComponentFactory factory)
+            : this()
+        {
+            Name = name;
+            Factory = factory;
+            ParentName = string.Empty;
+            InitializeAll();
+        }
+
+        public string ComponentName { get { return Name; } }
+
+        public void InitializeAll()
+        {
+            Direction = Direction.Forward_RL;
+            Orders = Orders.Arbitrary;
+        }
+
+        string[] paramNames = new string[]
+		{
+            Strings.Direction,
+            Strings.Orders,
+        };
+        public string ParamName(int i) { return paramNames[i]; }
+        public int ParamsCount() { return paramNames.Length; }
+
+        public ICollection<string> ParamValues(int i)
+        {
+            var list = new List<string>();
+            switch (i)
+            {
+                case 0:
+                    for (Direction d = 0; d < Direction.Count; d++) list.Add(d.ToDescription());
+                    return list;
+                case 1:
+                    for (Orders o = 0; o < Orders.Count; o++) list.Add(o.ToDescription());
+                    return list;
+                default:
+                    return null;
+            }
+        }
+
+
+        public string ToString(int i)
+        {
+            switch (i)
+            {
+                case 0: return Direction.ToDescription();
+                case 1: return Orders.ToDescription();
+                default:
+                    return string.Format("Name={0}, Direction={1}, Orders={2}", Name, Direction, Orders);
+            }
+        }
+
+        public CfgUpdateFlags UpdateParam(int i, string str)
+        {
+            switch (i)
+            {
+                case 0:
+                    for (Direction d = 0; d < Direction.Count; d++)
+                        if (d.ToDescription() == str)
+                        {
+                            Direction = d;
+                            return CfgUpdateFlags.RestartRqrd;
+                        }
+                    break;
+
+                case 1:
+                    for (Orders o = 0; o < Orders.Count; o++)
+                        if (o.ToDescription() == str)
+                        {
+                            Orders = o;
+                            return CfgUpdateFlags.RestartRqrd;
+                        }
+                    break;
+            }
+
+            return CfgUpdateFlags.None;
+        }
+
+        public bool ValidateParam(int i, string str, out string message)
+        {
+            message = string.Empty;
+
+            switch (i)
+            {
+                case 0:
+                case 1:
+                    if (ParamValues(i).Contains(str)) return true;
+                    break;
+                default:
+                    message = "Invalid index";
+                    return false;
+            }
+
+            message = ParamName(i) + " is invalid";
+            return false;
+        }
+
+        void CopyContentTo(EntryFormCfg prms)
+        {
+            prms.Direction = this.Direction;
+            prms.Orders = this.Orders;
+        }
+
+        public IParamsProvider Clone()
+        {
+            EntryFormCfg pars = new EntryFormCfg();
+            CopyContentTo(pars);
+            return pars;
+        }
+
+        public bool UpdateEmbeddedDbEntity()
+        {
+            return true;    /// =OK, do nothing
+        }
+    }
+}

TBF/Rig/DataEntry/PoseidonCmd/Factory.cs

@@ -0,0 +1,25 @@
+///
+/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
+///
+using System.Collections.Generic;
+using TBF.Rig.Generic;
+
+namespace TBF.Rig.DataEntry.PoseidonCmd
+{
+	public class Factory : IComponentFactory
+	{
+		public string ClassName { get { return GetType().Namespace.Substring(8); } }
+        public override string ToString() { return ClassName; }
+
+		public IComponent DummyComponent() { return new EntryForm(); }
+
+		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new EntryForm(cfg); }
+
+		public IComponentCfg DefaultConfig() { return new EntryFormCfg("DataEntry-PoseidonCmd", this); }
+
+		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
+		{
+			return ComponentCfgBase.CreateFromDbEntity(EntryFormCfg.Serializer, component, this);
+		}
+	}
+}

TBF/Rig/DataEntry/PoseidonCmd/TestStartEndForm.cs

@@ -0,0 +1,478 @@
+///
+/// Copyright (c) 2015-2017 Sensus Metering Systems
+///
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using log4net;
+using TBF.Rig.GenericDevices;
+using TBF.Resources;
+
+namespace TBF.Rig.DataEntry.PoseidonCmd
+{
+	public partial class TestStartEndForm : Form, GenericDevices.IHasCompleted
+    {
+		private static readonly ILog log = LogManager.GetLogger(typeof(TestStartEndForm));
+
+		// Set to 'true' when the form closes
+		public bool Completed { get { return completed; } }
+		bool completed;
+
+		/// <summary> Number of text boxes for serial numbers </summary>
+        public readonly int WaterMetersCount;
+		readonly IRegReader[] regReaders;
+		readonly bool[] disabled;
+
+		// To be retrieved after the form closes
+		public double[] WMStartState;
+
+		// To be retrieved after the form closes
+		public readonly string[] WMStartStateStr;
+
+		// To be retrieved after the form closes
+        public double[] WMEndState;
+
+		bool endStates;			/// false=start states, true=end states
+		double refVolume;
+		double warningLimLo;	/// limit to display exclamation mark, typically 2x errLimLo
+		double warningLimHi;	/// limit to display exclamation mark, typically 2x errLimHi
+
+		int TextBoxesCount;
+		///
+		Label[] labels;
+		TextBox[] startTextBoxes;
+		TextBox[] endTextBoxes;
+		IList<TextBox> enabledTextBoxes;
+
+		/// <summary>
+		/// Parameterless constructor initializing common part for start and endstate form
+		/// </summary>
+		public TestStartEndForm()
+		{
+			InitializeComponent();
+			ControlBox = false;
+
+			TextBoxesCount = 48;
+
+			labels = new Label[]
+				{
+					label1,  label2,  label3,  label4,  label5,  label6,  label7,  label8,  label9,  label10,
+					label11, label12, label13, label14, label15, label16, label17, label18, label19, label20,
+					label21, label22, label23, label24, label25, label26, label27, label28, label29, label30,
+					label31, label32, label33, label34, label35, label36, label37, label38, label39, label40,
+					label41, label42, label43, label44, label45, label46, label47, label48,
+				};
+			startTextBoxes = new TextBox[]
+				{
+					startTextBox1,  startTextBox2,  startTextBox3,  startTextBox4,  startTextBox5,  startTextBox6,  startTextBox7,  startTextBox8,  startTextBox9,  startTextBox10,
+                    startTextBox11, startTextBox12, startTextBox13, startTextBox14, startTextBox15, startTextBox16, startTextBox17, startTextBox18, startTextBox19, startTextBox20,
+                    startTextBox21, startTextBox22, startTextBox23, startTextBox24, startTextBox25, startTextBox26, startTextBox27, startTextBox28, startTextBox29, startTextBox30,
+                    startTextBox31, startTextBox32, startTextBox33, startTextBox34, startTextBox35, startTextBox36, startTextBox37, startTextBox38, startTextBox39, startTextBox40,
+                    startTextBox41, startTextBox42, startTextBox43, startTextBox44, startTextBox45, startTextBox46, startTextBox47, startTextBox48,
+				};
+			endTextBoxes = new TextBox[]
+				{
+					endTextBox1,  endTextBox2,  endTextBox3,  endTextBox4,  endTextBox5,  endTextBox6,  endTextBox7,  endTextBox8,  endTextBox9,  endTextBox10,
+                    endTextBox11, endTextBox12, endTextBox13, endTextBox14, endTextBox15, endTextBox16, endTextBox17, endTextBox18, endTextBox19, endTextBox20,
+                    endTextBox21, endTextBox22, endTextBox23, endTextBox24, endTextBox25, endTextBox26, endTextBox27, endTextBox28, endTextBox29, endTextBox30,
+                    endTextBox31, endTextBox32, endTextBox33, endTextBox34, endTextBox35, endTextBox36, endTextBox37, endTextBox38, endTextBox39, endTextBox40,
+                    endTextBox41, endTextBox42, endTextBox43, endTextBox44, endTextBox45, endTextBox46, endTextBox47, endTextBox48,
+				};
+			enabledTextBoxes = new List<TextBox>();
+
+			completed = false;
+			StartForceCloseHandler();
+		}
+
+		/// <summary>
+		/// Constructor to fill in start states
+		/// </summary>
+		/// <param name="waterMetersCount">Number of water meters</param>
+		/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
+		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
+			: this()
+		{
+			endStates = false;
+
+			this.WaterMetersCount = waterMetersCount;
+			this.regReaders = regReaders;
+			this.disabled = disabled;
+
+			ShuffleTextBoxes();
+
+			WMStartState = new double[waterMetersCount];
+			WMStartStateStr = new string[waterMetersCount];
+		}
+
+        /// <summary>
+        /// Constructor to fill in end states
+        /// </summary>
+		/// <param name="waterMetersCount">Number of water meters</param>
+		/// <param name="wmStartStateStr">Information entered on test start</param>
+		/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
+		/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
+		/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
+		/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
+		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
+								double refVolume, double errLimLo, double errLimHi)
+			: this()
+        {
+			endStates = true;
+
+			this.WaterMetersCount = waterMetersCount;
+			this.regReaders = regReaders;
+			if (wmStartStateStr == null || wmStartStateStr.Length != waterMetersCount)
+				throw (new Exception("Invalid 'wmStartStateStr' argument"));
+			this.WMStartStateStr = wmStartStateStr;
+			this.disabled = disabled;
+            this.refVolume = refVolume;
+            this.warningLimLo = 2 * errLimLo;
+            this.warningLimHi = 2 * errLimHi;
+
+			ShuffleTextBoxes();
+
+            WMEndState = new double[waterMetersCount];
+		}
+
+		/// <summary>
+		/// Make sure the layout of labels/text boxes on the screen
+		/// corresponds to the layout of watermeters of the test bench.
+		/// </summary>
+		void ShuffleTextBoxes()
+		{
+			if (TBF.Data.WMsCount < TextBoxesCount)
+			{
+				int nrLines = TBF.Data.WMsCount / TBF.Data.LineSize;
+				int gap = (TextBoxesCount - TBF.Data.WMsCount) / nrLines;
+
+				int dest = 0;
+				for (int l = 0; l < nrLines; l++)
+				{
+					for (int i = 0; i < TBF.Data.LineSize; i++)
+					{
+						labels[dest] = labels[l * TBF.Data.LineSize + l * gap + i];
+						startTextBoxes[dest] = startTextBoxes[l * TBF.Data.LineSize + l * gap + i];
+						endTextBoxes[dest] = endTextBoxes[l * TBF.Data.LineSize + l * gap + i];
+						dest++;
+					}
+				}
+				TextBoxesCount = TBF.Data.WMsCount;
+			}
+		}
+
+		private void CycleEndForm_Load(object sender, EventArgs e)
+		{
+            Localize();
+
+            //Height = 115 + 90 * WaterMetersCount;
+
+			for (int i = 0; i < TextBoxesCount; i++)
+			{
+				if (i < WaterMetersCount)
+				{
+					labels[i].Visible = startTextBoxes[i].Visible = endTextBoxes[i].Visible = true;
+				}
+			}
+
+			if (endStates)
+			{
+				for (int i = 0; i < TextBoxesCount; i++)
+				{
+					if (WMStartStateStr != null && i < WMStartStateStr.Length)
+					{
+						startTextBoxes[i].Text = WMStartStateStr[i];
+					}
+
+					if (disabled != null && i < disabled.Length && disabled[i])
+					{
+						endTextBoxes[i].Enabled = false;
+					}
+					else
+					{
+						endTextBoxes[i].Enabled = true;
+						enabledTextBoxes.Add(endTextBoxes[i]);
+					}
+				}
+			}
+			else
+			{
+				for (int i = 0; i < TextBoxesCount; i++)
+				{
+					if (disabled != null && i < disabled.Length && disabled[i])
+					{
+						startTextBoxes[i].Enabled = false;
+					}
+					else
+					{
+						startTextBoxes[i].Enabled = true;
+						enabledTextBoxes.Add(startTextBoxes[i]);
+					}
+				}
+			}
+		}
+
+		void Localize()
+		{
+			Text = Strings.Water_Meter_States;
+			for (int i = 0; i < TextBoxesCount; i++)
+			{
+				labels[i].Text = string.Format("{0} {1}", Strings.Water_Meter, i + 1);
+			}
+            startLabel.Text = start2Label.Text = Strings.Start;
+            endLabel.Text = end2Label.Text = Strings.End;
+			okButton.Text = Strings.OkBtnText;
+		}
+
+		private void okButton_Click(object sender, EventArgs eArgs)
+		{
+            try
+            {
+				if (endStates)
+				{
+					for (int i = 0; i < Math.Min(WaterMetersCount, TextBoxesCount); i++)
+					{
+						if (endTextBoxes[i].Visible && endTextBoxes[i].Enabled)
+						{
+							WMEndState[i] = Utils.ParseUDouble(endTextBoxes[i].Text);
+						}
+					}
+				}
+				else
+				{
+					for (int i = 0; i < Math.Min(WaterMetersCount, TextBoxesCount); i++)
+					{
+						if (startTextBoxes[i].Visible && startTextBoxes[i].Enabled)
+						{
+							WMStartStateStr[i] = startTextBoxes[i].Text;
+							WMStartState[i] = Utils.ParseUDouble(startTextBoxes[i].Text);
+						}
+					}
+				}
+			}
+            catch(Exception e)
+            {
+				log.ErrorFormat("Exception: {0}", e.Message);
+                return;
+            }
+
+			completed = true;
+			Close();
+		}
+
+		#region Forced close handling
+
+		public void StartForceCloseHandler()
+		{
+			UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args)
+			{
+				if (InvokeRequired) { Invoke(new EventHandler<EventArgs>(OnForceClose), sender, args); }
+				else OnForceClose(sender, args);
+			};
+		}
+
+		void OnForceClose(object sender, EventArgs args)
+		{
+			DialogResult = DialogResult.Cancel;
+			Close();
+		}
+
+		#endregion
+
+
+		/// <summary>
+		/// Calculate the approximate error and verify whether it is within limits.
+		/// Make an exclamation mark visible if out of range.
+		/// Similar event handler is implemented for all endTextBoxes (1..24).
+		/// </summary>
+        private void ProcTextChanged(object sender, EventArgs e, TextBox endStateTB, TextBox startStateTB, Label exclamation)
+        {
+            double err = 0;
+            try
+            {
+                double endState = Utils.ParseUDouble(endStateTB.Text);
+                double startState = Utils.ParseUDouble(startStateTB.Text);
+                err = 100.0 * (endState - startState - refVolume) / refVolume;
+            }
+            catch { err = 1000.0f; };
+            exclamation.Visible = (err < warningLimLo) || (warningLimHi < err);
+        }
+
+        private void endTextBox1_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox1, startTextBox1, exclamation1); }
+        private void endTextBox2_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox2, startTextBox2, exclamation2); }
+        private void endTextBox3_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox3, startTextBox3, exclamation3); }
+        private void endTextBox4_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox4, startTextBox4, exclamation4); }
+        private void endTextBox5_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox5, startTextBox5, exclamation5); }
+        private void endTextBox6_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox6, startTextBox6, exclamation6); }
+        private void endTextBox7_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox7, startTextBox7, exclamation7); }
+        private void endTextBox8_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox8, startTextBox8, exclamation8); }
+        private void endTextBox9_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox9, startTextBox9, exclamation9); }
+        private void endTextBox10_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox10, startTextBox10, exclamation10); }
+        private void endTextBox11_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox11, startTextBox11, exclamation11); }
+        private void endTextBox12_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox12, startTextBox12, exclamation12); }
+        private void endTextBox13_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox13, startTextBox13, exclamation13); }
+        private void endTextBox14_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox14, startTextBox14, exclamation14); }
+        private void endTextBox15_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox15, startTextBox15, exclamation15); }
+        private void endTextBox16_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox16, startTextBox16, exclamation16); }
+        private void endTextBox17_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox17, startTextBox17, exclamation17); }
+        private void endTextBox18_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox18, startTextBox18, exclamation18); }
+        private void endTextBox19_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox19, startTextBox19, exclamation19); }
+        private void endTextBox20_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox20, startTextBox20, exclamation20); }
+        private void endTextBox21_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox21, startTextBox21, exclamation21); }
+        private void endTextBox22_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox22, startTextBox22, exclamation22); }
+        private void endTextBox23_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox23, startTextBox23, exclamation23); }
+        private void endTextBox24_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox24, startTextBox24, exclamation24); }
+        private void endTextBox25_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox25, startTextBox25, exclamation25); }
+        private void endTextBox26_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox26, startTextBox26, exclamation26); }
+        private void endTextBox27_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox27, startTextBox27, exclamation27); }
+        private void endTextBox28_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox28, startTextBox28, exclamation28); }
+        private void endTextBox29_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox29, startTextBox29, exclamation29); }
+        private void endTextBox30_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox30, startTextBox30, exclamation30); }
+        private void endTextBox31_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox31, startTextBox31, exclamation31); }
+        private void endTextBox32_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox32, startTextBox32, exclamation32); }
+        private void endTextBox33_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox33, startTextBox33, exclamation33); }
+        private void endTextBox34_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox34, startTextBox34, exclamation34); }
+        private void endTextBox35_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox35, startTextBox35, exclamation35); }
+        private void endTextBox36_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox36, startTextBox36, exclamation36); }
+        private void endTextBox37_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox37, startTextBox37, exclamation37); }
+        private void endTextBox38_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox38, startTextBox38, exclamation38); }
+        private void endTextBox39_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox39, startTextBox39, exclamation39); }
+        private void endTextBox40_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox40, startTextBox40, exclamation40); }
+        private void endTextBox41_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox41, startTextBox41, exclamation41); }
+        private void endTextBox42_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox42, startTextBox42, exclamation42); }
+        private void endTextBox43_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox43, startTextBox43, exclamation43); }
+        private void endTextBox44_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox44, startTextBox44, exclamation44); }
+        private void endTextBox45_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox45, startTextBox45, exclamation45); }
+        private void endTextBox46_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox46, startTextBox46, exclamation46); }
+        private void endTextBox47_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox47, startTextBox47, exclamation47); }
+        private void endTextBox48_TextChanged(object sndr, EventArgs e) { ProcTextChanged(sndr, e, endTextBox48, startTextBox48, exclamation48); }
+
+
+        /// <summary>
+        /// Process a key press within any enabled text boxe
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <param name="currentFocusOwner">TextBox control which received the event</param>
+        private void ProcKeyPress(object sender, KeyPressEventArgs e, TextBox currentFocusOwner)
+        {
+            if (e.KeyChar == '+')
+            {
+                /// Process '+' key ..... Form completed
+                okButton_Click(sender, e);
+            }
+            if (e.KeyChar == '\r')
+            {
+                /// Process <enter> key ..... Next text field
+                if (enabledTextBoxes.Count < 2) return;		/// There is just one enabled textbox
+
+                for (int i = 0; i < enabledTextBoxes.Count; i++)
+                {
+                    if (enabledTextBoxes[i] == currentFocusOwner)
+                    {
+                        /// Change focus to the next enabled text box
+                        enabledTextBoxes[(i + 1) % enabledTextBoxes.Count].Focus();
+                        return;
+                    }
+                }
+            }
+        }
+
+		private void startTextBox1_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox1); }
+		private void startTextBox2_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox2); }
+		private void startTextBox3_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox3); }
+		private void startTextBox4_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox4); }
+		private void startTextBox5_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox5); }
+		private void startTextBox6_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox6); }
+		private void startTextBox7_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox7); }
+		private void startTextBox8_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox8); }
+		private void startTextBox9_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox9); }
+		private void startTextBox10_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox10); }
+		private void startTextBox11_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox11); }
+		private void startTextBox12_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox12); }
+		private void startTextBox13_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox13); }
+		private void startTextBox14_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox14); }
+		private void startTextBox15_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox15); }
+		private void startTextBox16_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox16); }
+		private void startTextBox17_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox17); }
+		private void startTextBox18_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox18); }
+		private void startTextBox19_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox19); }
+		private void startTextBox20_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox20); }
+		private void startTextBox21_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox21); }
+		private void startTextBox22_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox22); }
+		private void startTextBox23_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox23); }
+		private void startTextBox24_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox24); }
+        private void startTextBox25_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox25); }
+        private void startTextBox26_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox26); }
+        private void startTextBox27_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox27); }
+        private void startTextBox28_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox28); }
+        private void startTextBox29_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox29); }
+        private void startTextBox30_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox30); }
+        private void startTextBox31_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox31); }
+        private void startTextBox32_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox32); }
+        private void startTextBox33_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox33); }
+        private void startTextBox34_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox34); }
+        private void startTextBox35_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox35); }
+        private void startTextBox36_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox36); }
+        private void startTextBox37_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox37); }
+        private void startTextBox38_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox38); }
+        private void startTextBox39_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox39); }
+        private void startTextBox40_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox40); }
+        private void startTextBox41_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox41); }
+        private void startTextBox42_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox42); }
+        private void startTextBox43_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox43); }
+        private void startTextBox44_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox44); }
+        private void startTextBox45_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox45); }
+        private void startTextBox46_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox46); }
+        private void startTextBox47_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox47); }
+        private void startTextBox48_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox48); }
+
+		private void endTextBox1_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox1); }
+		private void endTextBox2_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox2); }
+		private void endTextBox3_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox3); }
+		private void endTextBox4_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox4); }
+		private void endTextBox5_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox5); }
+		private void endTextBox6_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox6); }
+		private void endTextBox7_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox7); }
+		private void endTextBox8_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox8); }
+		private void endTextBox9_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox9); }
+		private void endTextBox10_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox10); }
+		private void endTextBox11_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox11); }
+		private void endTextBox12_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox12); }
+		private void endTextBox13_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox13); }
+		private void endTextBox14_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox14); }
+		private void endTextBox15_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox15); }
+		private void endTextBox16_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox16); }
+		private void endTextBox17_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox17); }
+		private void endTextBox18_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox18); }
+		private void endTextBox19_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox19); }
+		private void endTextBox20_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox20); }
+		private void endTextBox21_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox21); }
+		private void endTextBox22_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox22); }
+		private void endTextBox23_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox23); }
+		private void endTextBox24_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox24); }
+        private void endTextBox25_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox25); }
+        private void endTextBox26_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox26); }
+        private void endTextBox27_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox27); }
+        private void endTextBox28_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox28); }
+        private void endTextBox29_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox29); }
+        private void endTextBox30_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox30); }
+        private void endTextBox31_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox31); }
+        private void endTextBox32_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox32); }
+        private void endTextBox33_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox33); }
+        private void endTextBox34_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox34); }
+        private void endTextBox35_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox35); }
+        private void endTextBox36_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox36); }
+        private void endTextBox37_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox37); }
+        private void endTextBox38_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox38); }
+        private void endTextBox39_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox39); }
+        private void endTextBox40_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox40); }
+        private void endTextBox41_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox41); }
+        private void endTextBox42_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox42); }
+        private void endTextBox43_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox43); }
+        private void endTextBox44_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox44); }
+        private void endTextBox45_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox45); }
+        private void endTextBox46_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox46); }
+        private void endTextBox47_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox47); }
+        private void endTextBox48_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox48); }
+	}
+}

TBF/Rig/DataEntry/PoseidonCmd/TestStartEndForm.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>

TBF/Rig/DataEntry/S620/EntryForm.cs

@@ -89,7 +89,7 @@ namespace TBF.Rig.DataEntry.S620
 
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowCycleBeginFormOp()
+		public IOperation ShowCycleBeginFormOp( IRegReader[] regReadersOptional = null)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.ShowFormAtCycleBeginning;

TBF/Rig/DataEntry/Single/EntryFormNoStartEnd.cs

@@ -81,7 +81,7 @@ namespace TBF.Rig.DataEntry.Single
 
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowCycleBeginFormOp()
+		public IOperation ShowCycleBeginFormOp( IRegReader[] regReadersOptional = null)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.ShowFormAtCycleBeginning;

TBF/Rig/DataEntry/Standard12/EntryFormNoStartEnd.cs

@@ -81,7 +81,7 @@ namespace TBF.Rig.DataEntry.Standard12
 
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowCycleBeginFormOp()
+		public IOperation ShowCycleBeginFormOp( IRegReader[] regReadersOptional = null)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.ShowFormAtCycleBeginning;

TBF/Rig/DataEntry/Standard24/EntryFormNoStartEnd.cs

@@ -83,7 +83,7 @@ namespace TBF.Rig.DataEntry.Standard24
 
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowCycleBeginFormOp()
+		public IOperation ShowCycleBeginFormOp( IRegReader[] regReadersOptional = null)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
             this.currentOp = CurrentOp.ShowFormAtCycleBeginning;

TBF/Rig/DataEntry/Standard48/EntryFormNoStartEnd.cs

@@ -81,7 +81,7 @@ namespace TBF.Rig.DataEntry.Standard48
 
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowCycleBeginFormOp()
+		public IOperation ShowCycleBeginFormOp( IRegReader[] regReadersOptional = null)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.ShowFormAtCycleBeginning;

TBF/Rig/DataEntry/Standard6/EntryFormNoStartEnd.cs

@@ -77,7 +77,7 @@ namespace TBF.Rig.DataEntry.Standard6
 
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowCycleBeginFormOp()
+		public IOperation ShowCycleBeginFormOp( IRegReader[] regReadersOptional = null)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.ShowFormAtCycleBeginning;

TBF/Rig/DataEntry/StandardCamera/EntryForm.cs

@@ -158,7 +158,7 @@ namespace TBF.Rig.DataEntry.StandardCamera
 
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowCycleBeginFormOp()
+		public IOperation ShowCycleBeginFormOp( IRegReader[] regReadersOptional = null)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.ShowFormAtCycleBeginning;

TBF/Rig/DataEntry/StandartCameraPurchaseOrder/CycleBeginningForm.cs

@@ -669,7 +669,10 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
             {
                 foreach (PurchaseOrder pOrder in purchaseOrderListExample)
                 {
-                    orderComboBox.Items.Add(pOrder.Name);
+                    if (pOrder != null && !String.IsNullOrEmpty(pOrder.Name))
+                    {
+                        orderComboBox.Items.Add(pOrder.Name);
+                    }
                 }
 
                 LoadPurchaseBox("");

TBF/Rig/DataEntry/StandartCameraPurchaseOrder/EntryForm.cs

@@ -165,7 +165,7 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
 
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowCycleBeginFormOp()
+		public IOperation ShowCycleBeginFormOp( IRegReader[] regReadersOptional = null)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.ShowFormAtCycleBeginning;

TBF/Rig/DataEntry/Uni/EntryFormNoStartEnd.cs

@@ -150,7 +150,7 @@ namespace TBF.Rig.DataEntry.Uni
 
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowCycleBeginFormOp()
+		public IOperation ShowCycleBeginFormOp( IRegReader[] regReadersOptional = null)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.FormAtCycleBeginning;

TBF/Rig/DataEntry/iPerl/CycleBeginningForm.Designer.cs

@@ -33,10 +33,9 @@ namespace TBF.Rig.DataEntry.iPerl
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CycleBeginningForm));
             this.okButton = new System.Windows.Forms.Button();
-            this.orderGroupBox = new System.Windows.Forms.GroupBox();
-            this.orderComboBox = new System.Windows.Forms.ComboBox();
             this.pictureBox = new System.Windows.Forms.PictureBox();
-            this.orderGroupBox.SuspendLayout();
+            this.orderComboBox = new TBF.UI.Shared.SuggestComboBox();
+            this.labelOrder = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
             this.SuspendLayout();
             // 
@@ -48,50 +47,53 @@ namespace TBF.Rig.DataEntry.iPerl
             this.okButton.UseVisualStyleBackColor = true;
             this.okButton.Click += new System.EventHandler(this.okButton_Click);
             // 
-            // orderGroupBox
-            // 
-            this.orderGroupBox.Controls.Add(this.orderComboBox);
-            resources.ApplyResources(this.orderGroupBox, "orderGroupBox");
-            this.orderGroupBox.ForeColor = System.Drawing.Color.Black;
-            this.orderGroupBox.Name = "orderGroupBox";
-            this.orderGroupBox.TabStop = false;
-            // 
-            // orderComboBox
-            // 
-            this.orderComboBox.FormattingEnabled = true;
-            resources.ApplyResources(this.orderComboBox, "orderComboBox");
-            this.orderComboBox.Name = "orderComboBox";
-            // 
             // pictureBox
             // 
             resources.ApplyResources(this.pictureBox, "pictureBox");
             this.pictureBox.Name = "pictureBox";
             this.pictureBox.TabStop = false;
             // 
+            // orderComboBox
+            // 
+            this.orderComboBox.DropDownHeight = 530;
+            this.orderComboBox.FilterRule = null;
+            resources.ApplyResources(this.orderComboBox, "orderComboBox");
+            this.orderComboBox.FormattingEnabled = true;
+            this.orderComboBox.Name = "orderComboBox";
+            this.orderComboBox.PropertySelector = null;
+            this.orderComboBox.SuggestBoxHeight = 192;
+            this.orderComboBox.SuggestListOrderRule = null;
+            // 
+            // labelOrder
+            // 
+            resources.ApplyResources(this.labelOrder, "labelOrder");
+            this.labelOrder.Name = "labelOrder";
+            // 
             // CycleBeginningForm
             // 
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.DarkGray;
+            this.Controls.Add(this.labelOrder);
+            this.Controls.Add(this.orderComboBox);
             this.Controls.Add(this.pictureBox);
-            this.Controls.Add(this.orderGroupBox);
             this.Controls.Add(this.okButton);
             this.ForeColor = System.Drawing.Color.Black;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
             this.Name = "CycleBeginningForm";
             this.TopMost = true;
             this.Load += new System.EventHandler(this.CycleBeginningForm_Load);
-            this.orderGroupBox.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
         #endregion
 
 		private System.Windows.Forms.Button okButton;
-		private System.Windows.Forms.GroupBox orderGroupBox;
-		private System.Windows.Forms.ComboBox orderComboBox;
         private System.Windows.Forms.PictureBox pictureBox;
+        private UI.Shared.SuggestComboBox orderComboBox;
+        private System.Windows.Forms.Label labelOrder;
     }
 }

TBF/Rig/DataEntry/iPerl/CycleBeginningForm.cs

@@ -11,7 +11,6 @@ using TBF.Rig.Sequences;
 using TBF.Rig.Output.DB.SensusOracle;
 using TBF.Resources;
 using System.Drawing;
-using NHibernate;
 
 namespace TBF.Rig.DataEntry.iPerl
 {
@@ -24,8 +23,7 @@ namespace TBF.Rig.DataEntry.iPerl
         readonly EntryFormCfg cfg;
 
         /// Loaded from database beforethe form is open
-        IList<IOrderInfo> listOfOrders;
-        string preselectedOrder;
+        IList<OrderDetails> listOfOrders;
 
 		/// To be retrieved after the form is closed
 		public string PurchaseOrder;
@@ -42,7 +40,6 @@ namespace TBF.Rig.DataEntry.iPerl
 		{
 			InitializeComponent();
 			ControlBox = false;
-            preselectedOrder = null;
 
 			completed = false;
 			StartForceCloseHandler();
@@ -53,12 +50,11 @@ namespace TBF.Rig.DataEntry.iPerl
         /// Constructor
         /// </summary>
         /// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
-        public CycleBeginningForm(int waterMetersCount, EntryFormCfg cfg, string preselectedOrder = null)
+        public CycleBeginningForm(int waterMetersCount, EntryFormCfg cfg)
 			: this()
         {
             this.WaterMetersCount = waterMetersCount;
             this.cfg = cfg;
-            this.preselectedOrder = preselectedOrder;
 			SNText = null;
 			Disabled = null;
         }
@@ -67,49 +63,12 @@ namespace TBF.Rig.DataEntry.iPerl
         private void CycleBeginningForm_Load(object sender, EventArgs e)
         {
 			Text = Strings.Data;
-			orderGroupBox.Text = Strings.Purchase_order;
+			labelOrder.Text = Strings.Purchase_order;
 			okButton.Text = Strings.OkBtnText;
 
-            listOfOrders = new List<IOrderInfo>();
-            
-            if ((cfg.Orders == Orders.FromOracle || cfg.Orders == Orders.CombinedAndFromOracle)
-                 && ProcessData.OracleDB != null)
-            {
-                foreach (var o in ProcessData.OracleDB.ReadOrders())
-                {
-                    listOfOrders.Add(o);
-                }
-            }
-
-            if ((cfg.Orders == Orders.FromTracingDB || cfg.Orders == Orders.CombinedAndFromTracingDB)
-                 && ProcessData.TracingDB != null
-                 && ProcessData.TracingDB.DebugLevel == DebugMode.Normal)
-            {
-                foreach (var o in ProcessData.TracingDB.ReadOrders())
-                {
-                    listOfOrders.Add(o);
-                }
-            }
-
-            string insertFirst = null;
-            if (!string.IsNullOrEmpty(preselectedOrder))
-            {
-                insertFirst = preselectedOrder;
-            }
-            else
-            {
-                if (Program.LocalSettings.PurchaseOrderHistoryCount > 0)
-                {
-                    foreach (var o in listOfOrders)
-                    {
-                        if (o.POName == Program.LocalSettings.PurchaseOrderHistory[0])
-                        {
-                            insertFirst = o.POName;
-                            break;
-                        }
-                    }
-                }
-            }
+            listOfOrders = ((cfg.Orders == Orders.FromOracle || cfg.Orders == Orders.CombinedAndFromOracle) && ProcessData.OracleDB != null)
+                         ? ProcessData.OracleDB.ReadOrders()
+                         : new List<OrderDetails>();
 
             switch (cfg.Orders)
             {
@@ -117,71 +76,25 @@ namespace TBF.Rig.DataEntry.iPerl
                     PrepareOrderCombo(orderComboBox);
                     break;
 
-                case Orders.FromOracle:
-                case Orders.FromTracingDB:
-                    if (insertFirst != null)
-                    {
-                        orderComboBox.Items.Add(insertFirst);
-                        orderComboBox.Text = insertFirst;
-                    }
-
-                    foreach (var o in listOfOrders)
-                        if (o.POName != insertFirst)
-                            orderComboBox.Items.Add(o.POName);
-                    break;
-
                 case Orders.CombinedAndFromOracle:
-                case Orders.CombinedAndFromTracingDB:
-                    if (insertFirst != null)
-                    {
-                        orderComboBox.Items.Add(insertFirst);
-                        orderComboBox.Text = insertFirst;
-                    }
-                    orderComboBox.Items.Add("BBAAMMXX");
-                    orderComboBox.Items.Add("BBAAOMXX");
-                    orderComboBox.Items.Add("BBAAQMXX");
-                    orderComboBox.Items.Add("BBAATMFR");
-                    orderComboBox.Items.Add("BBAATMXX");
-                    orderComboBox.Items.Add("CCAAMMXX");
-                    orderComboBox.Items.Add("CCAAOMXX");
-                    orderComboBox.Items.Add("CCAAQMXX");
-                    orderComboBox.Items.Add("CCAATMFR");
-                    orderComboBox.Items.Add("CCAATMXX");
-                    orderComboBox.Items.Add("DDAAMMXX");
-                    orderComboBox.Items.Add("DDAAOMXX");
-                    orderComboBox.Items.Add("DDAAQMXX");
-                    orderComboBox.Items.Add("DDAATMXX");
-                    orderComboBox.Items.Add("DEAAMMXX");
-                    orderComboBox.Items.Add("DEAAOMXX");
-                    orderComboBox.Items.Add("DEAAQMXX");
-                    orderComboBox.Items.Add("DEAATMXX");
-                    orderComboBox.Items.Add("EEAAMMXX");
-                    orderComboBox.Items.Add("EEAAOMXX");
-                    orderComboBox.Items.Add("EEAAQMXX");
-                    orderComboBox.Items.Add("EEAATMFR");
-                    orderComboBox.Items.Add("EEAATMXX");
-                    orderComboBox.Items.Add("FFAAMMXX");
-                    orderComboBox.Items.Add("FFAAOMXX");
-                    orderComboBox.Items.Add("FFAAQMXX");
-                    orderComboBox.Items.Add("FFAATMFR");
-                    orderComboBox.Items.Add("FFAATMXX");
-                    orderComboBox.Items.Add("GFAAMMXX");
-                    orderComboBox.Items.Add("GFAAOMXX");
-                    orderComboBox.Items.Add("GFAAQMXX");
-                    orderComboBox.Items.Add("GFAATMXX");
+                case Orders.FromOracle:
 
                     foreach (var o in listOfOrders)
-                        if (o.POName != insertFirst)
-                            orderComboBox.Items.Add(o.POName);
+                    {
+                        orderComboBox.Items.Add(o.POName + " - " + o.SNPrefix);
+                    }
+                    if (Program.LocalSettings.PurchaseOrderHistoryCount > 0) 
+                        orderComboBox.SelectedIndex = orderComboBox.FindString(Program.LocalSettings.PurchaseOrderHistory[0]);
+
                     break;
             }
 
             ///
             /// Draw an appropriate test bench picture
             ///
-            Side side = (TBF.Rig.Sequences.ProcessData.BenchInfo is DataContainer.iPerlBenchInfo.Component)
-                                      ? (TBF.Rig.Sequences.ProcessData.BenchInfo as DataContainer.iPerlBenchInfo.Component).Side
-                                      : Side.Left;
+            Side side = (ProcessData.BenchInfo is DataContainer.iPerlBenchInfo.Component)
+                      ? (ProcessData.BenchInfo as DataContainer.iPerlBenchInfo.Component).Side
+                      : Side.Left;
             if ((cfg.Direction == Direction.Reversed_LR) && (side == Side.Left))
             {
                 /// direction L->R (reversed), left side
@@ -202,7 +115,9 @@ namespace TBF.Rig.DataEntry.iPerl
                 /// direction R->L (forward), left side
                 pictureBox.Image = Image.FromFile(string.Format("{0}\\Pictures\\forward_dir_left.jpg", Program.ExecutableDir, true));
             }
-		}
+            pictureBox.SendToBack();
+
+        }
 
 		/// <summary>
 		/// Load Purchase order combo box items from the LocalSettings PurchaseOrderHistory array
@@ -223,45 +138,20 @@ namespace TBF.Rig.DataEntry.iPerl
 
 		private void okButton_Click(object sender, EventArgs e)
         {
-            if (orderComboBox.Text.Length > 8 ||
-                (cfg.Orders != Orders.Arbitrary && !orderComboBox.Items.Contains(orderComboBox.Text)))
+            PurchaseOrder = orderComboBox.Text.Split(' ')[0].Trim();
+
+            if (PurchaseOrder.Length > 10 ||
+                (cfg.Orders != Orders.Arbitrary && orderComboBox.FindString(PurchaseOrder) < 0))
             {
                 MessageBox.Show(Strings.Invalid_order_number, Strings.Error, MessageBoxButtons.OK,
                                 MessageBoxIcon.Exclamation);
                 return;
             }
 
-            IOrderInfo oInfo = (listOfOrders == null) ? null : listOfOrders.FirstOrDefault<IOrderInfo>(x => x.POName == orderComboBox.Text);
-            ///
-            if (oInfo is Output.DB.SensusOracle.OrderDetails)
-            {
-                ProcessData.OrderInfo = oInfo;
-            }
-            else if (oInfo is SharedDatabase.Entities.OrderInfo && ProcessData.TracingDB != null)
-            {
-                try
-                {
-                    using (var session = ProcessData.TracingDB.SessionFactory.OpenSession())
-                    {
-                        var list = session.QueryOver<SharedDatabase.Entities.OrderInfo>()
-                                          .Where(x => (x.POName == Program.MainWnd.SelectedProcedure.OrderInfo.POName))
-                                          .List();
-                        ProcessData.OrderInfo = (list.Count == 1) ? list[0] : null;
-                        string workflow = (list.Count == 1) ? list[0].Workflow : null;
-                        ProcessData.WorkflowSummary = SharedDatabase.WorkflowSummary.ReadFromDB(workflow, "test", session);
-                        session.Close();
-                    }
-                }
-                catch (Exception ex)
-                {
-                    log.ErrorFormat("Unable to load an order, workflow or workstep: {0}", ex);
-                    ProcessData.OrderInfo = null;
-                    ProcessData.WorkflowSummary = null;
-                }
-            }
+            ProcessData.OrderDetails = (listOfOrders == null) ? null : listOfOrders.FirstOrDefault<OrderDetails>(x => x.POName == orderComboBox.Text);
 
-            PurchaseOrder = orderComboBox.Text;
-            Program.LocalSettings.UpdateHistory(orderComboBox.Text, ref Program.LocalSettings.PurchaseOrderHistory);
+            
+            Program.LocalSettings.UpdateHistory(PurchaseOrder, ref Program.LocalSettings.PurchaseOrderHistory);
 
             completed = true;
             Close();
@@ -285,6 +175,6 @@ namespace TBF.Rig.DataEntry.iPerl
 			Close();
 		}
 
-		#endregion
-   }
+        #endregion
+    }
 }

TBF/Rig/DataEntry/iPerl/CycleBeginningForm.resx

@@ -122,10 +122,14 @@
     <value>Verdana, 14.25pt</value>
   </data>
   <data name="okButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>627, 26</value>
+    <value>836, 32</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="okButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="okButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>112, 63</value>
+    <value>149, 78</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="okButton.TabIndex" type="System.Int32, mscorlib">
@@ -144,61 +148,16 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;okButton.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="orderComboBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>90, 32</value>
-  </data>
-  <data name="orderComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>432, 31</value>
-  </data>
-  <data name="orderComboBox.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;orderComboBox.Name" xml:space="preserve">
-    <value>orderComboBox</value>
-  </data>
-  <data name="&gt;&gt;orderComboBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;orderComboBox.Parent" xml:space="preserve">
-    <value>orderGroupBox</value>
-  </data>
-  <data name="&gt;&gt;orderComboBox.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="orderGroupBox.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Verdana, 14.25pt</value>
-  </data>
-  <data name="orderGroupBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>28, 12</value>
-  </data>
-  <data name="orderGroupBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>565, 82</value>
-  </data>
-  <data name="orderGroupBox.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="orderGroupBox.Text" xml:space="preserve">
-    <value>Order</value>
-  </data>
-  <data name="&gt;&gt;orderGroupBox.Name" xml:space="preserve">
-    <value>orderGroupBox</value>
-  </data>
-  <data name="&gt;&gt;orderGroupBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;orderGroupBox.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;orderGroupBox.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>4</value>
   </data>
   <data name="pictureBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>28, 118</value>
+    <value>37, 145</value>
+  </data>
+  <data name="pictureBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="pictureBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>711, 497</value>
+    <value>948, 612</value>
   </data>
   <data name="pictureBox.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
@@ -213,19 +172,79 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;pictureBox.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>3</value>
+  </data>
+  <data name="orderComboBox.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Verdana, 14.25pt</value>
+  </data>
+  <data name="orderComboBox.IntegralHeight" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="orderComboBox.Location" type="System.Drawing.Point, System.Drawing">
+    <value>37, 73</value>
+  </data>
+  <data name="orderComboBox.Size" type="System.Drawing.Size, System.Drawing">
+    <value>777, 37</value>
+  </data>
+  <data name="orderComboBox.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="&gt;&gt;orderComboBox.Name" xml:space="preserve">
+    <value>orderComboBox</value>
+  </data>
+  <data name="&gt;&gt;orderComboBox.Type" xml:space="preserve">
+    <value>TBF.UI.Shared.SuggestComboBox, TBF, Version=2.33.2152.0, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;orderComboBox.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;orderComboBox.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="labelOrder.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="labelOrder.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Verdana, 14.25pt</value>
+  </data>
+  <data name="labelOrder.Location" type="System.Drawing.Point, System.Drawing">
+    <value>32, 32</value>
+  </data>
+  <data name="labelOrder.Size" type="System.Drawing.Size, System.Drawing">
+    <value>83, 29</value>
+  </data>
+  <data name="labelOrder.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
+  </data>
+  <data name="labelOrder.Text" xml:space="preserve">
+    <value>label1</value>
+  </data>
+  <data name="&gt;&gt;labelOrder.Name" xml:space="preserve">
+    <value>labelOrder</value>
+  </data>
+  <data name="&gt;&gt;labelOrder.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;labelOrder.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;labelOrder.ZOrder" xml:space="preserve">
+    <value>1</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
+    <value>8, 16</value>
   </data>
   <data name="$this.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>769, 639</value>
+    <value>1025, 786</value>
+  </data>
+  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>Batch data</value>

TBF/Rig/DataEntry/iPerl/EntryForm.cs

@@ -7,7 +7,6 @@ using log4net;
 using Config.Entities;
 using TBF.Rig;
 using TBF.Rig.GenericDevices;
-using TBF.Rig.Sequences;
 
 namespace TBF.Rig.DataEntry.iPerl
 {
@@ -81,11 +80,11 @@ namespace TBF.Rig.DataEntry.iPerl
 
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowCycleBeginFormOp()
+		public IOperation ShowCycleBeginFormOp( IRegReader[] regReadersOptional = null)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.ShowFormAtCycleBeginning;
-			this.waterMeters = ProcessData.BatchRslts.Batch.WaterMeters;
+			this.waterMeters = TBF.Rig.Sequences.ProcessData.BatchRslts.Batch.WaterMeters;
 			return this;
 		}
 
@@ -98,10 +97,6 @@ namespace TBF.Rig.DataEntry.iPerl
 			return this;
 		}
 
-        /// <returns>null (not implemented)</returns>
-        public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp) { return null; }
-        public IOperation ShowTestCollectFormOp(IRegReader[] regReaders, double volumeRef, double errLimLo, double errLimHi) { return null; }
-
 		/// <returns>Reference to the operation</returns>
 		public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
 		{
@@ -118,8 +113,7 @@ namespace TBF.Rig.DataEntry.iPerl
         /// 
         void OpenBeginningDlg(EntryForm myRef)
         {
-            myRef.modelessDlg = new CycleBeginningForm(TBF.Data.WMsCount, myRef.entryFormCfg,
-                ProcessData.SelectedProcedure.OrderInfo != null ? ProcessData.SelectedProcedure.OrderInfo.POName : string.Empty);
+            myRef.modelessDlg = new CycleBeginningForm(TBF.Data.WMsCount, myRef.entryFormCfg);
             modelessDlg.Show();
         }
         /// 
@@ -142,16 +136,7 @@ namespace TBF.Rig.DataEntry.iPerl
 			switch (currentOp)
             {
                 case CurrentOp.ShowFormAtCycleBeginning:
-                    if (ProcessData.SelectedProcedure.OrderInfo == null || entryFormCfg.Direction != Direction.S640)
-                    {
-                        Program.MainWnd.Invoke(new EntryFormDlgt(OpenBeginningDlg), this);
-                    }
-                    else
-                    {
-                        /// Only in case of 640 meters and an order information entered during the procedure selection
-                        /// this DataEntry form at the beginning of the cycle is skipped
-                        modelessDlg = null;
-                    }
+                    Program.MainWnd.Invoke(new EntryFormDlgt(OpenBeginningDlg), this);
                     break;
 				case CurrentOp.EnterTestStartStates:
 					Program.MainWnd.Invoke(new EntryFormDlgt(OpenTestStartStatesDlg), this);
@@ -166,17 +151,7 @@ namespace TBF.Rig.DataEntry.iPerl
 		/// <returns>Event.ResultsPrinted</returns>
 		public Event Run()
 		{
-            if (ProcessData.SelectedProcedure.OrderInfo != null && entryFormCfg.Direction == Direction.S640)
-            {
-                for (int i = 0; i < waterMeters.Count; i++)
-                {
-                    if (waterMeters[i] != null)
-                        waterMeters[i].PurchaseOrder = ProcessData.SelectedProcedure.OrderInfo.POName;
-                }
-                return Event.ModelessFormClosed;
-            }
-
-            if ((modelessDlg is IHasCompleted) && !(modelessDlg as IHasCompleted).Completed)
+			if ((modelessDlg is IHasCompleted) && !(modelessDlg as IHasCompleted).Completed)
 			{
 				return Event.ModelessFormIsOpen;
 			}
@@ -239,5 +214,26 @@ namespace TBF.Rig.DataEntry.iPerl
 			}
 			currentOp = CurrentOp.None;
 		}
-	}
+
+        public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp = false)
+        {
+            if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
+            currentOp = CurrentOp.EnterTestStartStates;
+            this.regReaders = regReaders;
+            this.waterMeters = waterMeters;
+            // Handle isCondOp if necessary  
+            return this;
+        }
+
+        public IOperation ShowTestCollectFormOp(IRegReader[] regReaders, double volumeRef, double errLimLo, double errLimHi)
+        {
+            if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
+            currentOp = CurrentOp.EnterTestEndStates;
+            this.regReaders = regReaders;
+            this.refVolume = volumeRef;
+            this.errLimLo = errLimLo;
+            this.errLimHi = errLimHi;
+            return this;
+        }
+   	}
 }

TBF/Rig/DataEntry/iPerl/EntryFormCfg.cs

@@ -32,23 +32,17 @@ namespace TBF.Rig.DataEntry.iPerl
     public enum Orders
     {
 #if LANG_SK
-        [Description("Ľubovolné")]                         Arbitrary,
-        [Description("Z Oracle databázy")]                 FromOracle,
-        [Description("Zo sledovacej databázy")]            FromTracingDB,
-        [Description("Združené a z Oracle")]               CombinedAndFromOracle,
-        [Description("Združené a zo sledovacej databázy")] CombinedAndFromTracingDB,
-#elif LANG_CZ
-        [Description("Libovolné")]                         Arbitrary,
-        [Description("Z Oracle databáze")]                 FromOracle,
-        [Description("Ze sledovací databáze")]             FromTracingDB,
-        [Description("Sdružené a z Oracle")]               CombinedAndFromOracle,
-        [Description("Sdružené a ze sledovací databáze")]  CombinedAndFromTracingDB,
+        [Description("Ľubovolné")]                        Arbitrary,
+        [Description("Aktívne z Oracle")]                 FromOracle,
+        [Description("Združené a aktívne z Oracle")]      CombinedAndFromOracle,
+#elif LANG_DE
+        [Description("Arbitrary")]                        Arbitrary,
+        [Description("Active from Oracle")]               FromOracle,
+        [Description("Combined and active from Oracle")]  CombinedAndFromOracle,
 #else
-        [Description("Arbitrary")]                         Arbitrary,
-        [Description("From Oracle")]                       FromOracle,
-        [Description("From Tracing DB")]                   FromTracingDB,
-        [Description("Combined and from Oracle")]          CombinedAndFromOracle,
-        [Description("Combined and from Tracing DB")]      CombinedAndFromTracingDB,
+        [Description("Arbitrary")]                        Arbitrary,
+        [Description("Active from Oracle")]               FromOracle,
+        [Description("Combined and active from Oracle")]  CombinedAndFromOracle,
 #endif
         Count,
     }
@@ -99,15 +93,22 @@ namespace TBF.Rig.DataEntry.iPerl
 
         public ICollection<string> ParamValues(int i)
         {
-            var list = new List<string>();
             switch (i)
             {
                 case 0:
-                    for (Direction d = 0; d < Direction.Count; d++) list.Add(d.ToDescription());
-                    return list;
+                    return new string[]
+                    {
+                        Direction.Forward_RL.ToDescription(),
+                        Direction.Reversed_LR.ToDescription(),
+                        Direction.S640.ToDescription(),
+                    };
                 case 1:
-                    for (Orders o = 0; o < Orders.Count; o++) list.Add(o.ToDescription());
-                    return list;
+                    return new string[]
+                    {
+                        Orders.Arbitrary.ToDescription(),
+                        Orders.FromOracle.ToDescription(),
+                        Orders.CombinedAndFromOracle.ToDescription(),
+                    };
                 default:
                     return null;
             }

TBF/Rig/DataEntry/iPerl/Factory.cs

@@ -8,7 +8,7 @@ namespace TBF.Rig.DataEntry.iPerl
 {
 	public class Factory : IComponentFactory
 	{
-		public string ClassName { get { return GetType().Namespace.Substring(8); } }
+		public string ClassName { get { return "DataEntry-iPerl"; } }
         public override string ToString() { return ClassName; }
 
 		public IComponent DummyComponent() { return new EntryForm(); }

TBF/Rig/Dummy/RegValve/RegValve.cs

@@ -22,7 +22,8 @@ namespace TBF.Rig.Dummy.RegValve
 		public bool IsCoax { get { return false; } }
 
 		public double Position { get { return 50.0; } }
-
+        ///
+		public int RegulationMinStep { get { return 0; } }
 
         IDictionary<double, double> dict;
         public IDictionary<double, double> Dict { get { return dict; } }