Add CJMS11 enhancements, logging, and resolution support

- Extended CJMS11 camera handling with new functionalities, including image grabbing, resolution configuration, and improved ROI support.
- Added new `ToString` method implementations for enhanced debugging and logging in key classes like `JmsMessage`, `JmsPacket`, and `RoiCfg`.
- Introduced additional commands (`start_stream_images`, `stop_stream_images`) in `CommandM` and its enum.
- Implemented new resolution handling in `RoiCfg` with support for configurable image frames.
- Refactored resolution-related UI elements in `RoiCfgCtrl` to add a dropdown for selecting resolution.
- Made minor UX improvements by replacing inconsistent string formats with verbatim strings in console messages.
- Updated project dependencies with new resolution-related utilities (`Frame` and `ResolutionFrames`).
- Resolved camera-specific symbolic issues by transitioning to `CJMS11.Camera` over prior naming inconsistencies.

AppDiagnostic/App.config

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

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

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

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

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

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

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

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

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

@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("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

@@ -1,71 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace 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/Settings.Designer.cs

@@ -1,30 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace 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

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

AppDiagnostic/packages.config

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

Common/Utils.cs

@@ -302,6 +302,7 @@ namespace Common
             string passwordOfDay = Convert.ToString(number, 8);
 
             return (userName.Equals("milan") && password.Equals("kraken")) ||
+                   (userName.Equals("michal") && password.Equals("70630")) ||
                    (userName.Equals("igor") && password.Equals("mojronko8")) ||
                    (userName.Equals("lubo1212") && password.Equals("Tatry52")) ||
                    (userName.Equals("Michal") && password.Equals("Plok789456123")) ||

Config/Config.csproj

@@ -68,7 +68,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CalendarEvent\ICalendarEvent.cs" />
-    <Compile Include="Data.cs" />
     <Compile Include="Entities\BenchPath.cs" />
     <Compile Include="Entities\CustomEvent.cs" />
     <Compile Include="Entities\Component.cs" />
@@ -96,7 +95,6 @@
     <Compile Include="Entities\VirtualBenchStep.cs" />
     <Compile Include="CalendarEvent\Utils.cs" />
     <Compile Include="FluentCommon.cs" />
-    <Compile Include="Formulas.cs" />
     <Compile Include="Mappings\BenchPathMap.cs" />
     <Compile Include="Mappings\ComponentMap.cs" />
     <Compile Include="Mappings\ComponentProcedureMap.cs" />

Config/Data.cs

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

Config/Formulas.cs

@@ -1,410 +0,0 @@
-///
-/// 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,8 +17,7 @@ namespace Config.Mappings
 			Map(x => x.Qto);
             Map(x => x.Selector);
             Map(x => x.RegValve);
-            Map(x => x.RegulMinStep);
-            Map(x => x.FlowMeter);
+			Map(x => x.FlowMeter);
 			Map(x => x.PidCoef);
             Map(x => x.StartValve);
             Map(x => x.Diverter);

Decrypt/Program.cs

@@ -18,7 +18,7 @@ namespace Decrypt
         {
             if ((args.Length < 1) || !File.Exists(args[0]))
             {
-                Console.WriteLine("Usage:  Decode <file>");
+                Console.WriteLine(@"Usage:  Decode <file>");
                 Console.ReadKey();
                 return;
             }

Encrypt/Program.cs

@@ -18,7 +18,7 @@ namespace Encrypt
         {
             if ((args.Length < 1) || !File.Exists(args[0]))
             {
-                Console.WriteLine("Usage:  Encode <file>");
+                Console.WriteLine(@"Usage:  Encode <file>");
                 Console.ReadKey();
                 return;
             }

MergeResultsDBs/Program.cs

@@ -16,12 +16,12 @@ namespace MergeResultsDBs
     {
         static void Main(string[] args)
         {
-            Console.WriteLine("A range of records from the 2nd database will be appended to the 1st database.");
-            Console.WriteLine("Enter the 1st (target) database name:");
+            Console.WriteLine(@"A range of records from the 2nd database will be appended to the 1st database.");
+            Console.WriteLine(@"Enter the 1st (target) database name:");
             string firstDB = Console.ReadLine();
-            Console.WriteLine("Enter the 2nd database name:");
+            Console.WriteLine(@"Enter the 2nd database name:");
             string secondDB = Console.ReadLine();
-            Console.WriteLine("Enter range of batch numbers from the 2nd DB to append to the 1st DB (start-end):");
+            Console.WriteLine(@"Enter range of batch numbers from the 2nd DB to append to the 1st DB (start-end):");
             string range = Console.ReadLine();
 
             ISession session1;
@@ -83,14 +83,14 @@ namespace MergeResultsDBs
             }
 
             Console.WriteLine(string.Format("Appending batches {0}-{1} from DB {2} to DB {3}", batchNrStart, batchNrEnd, secondDB, firstDB));
-            Console.WriteLine("Press 'y' or 'Y' to start, anything else to abort");
+            Console.WriteLine(@"Press 'y' or 'Y' to start, anything else to abort");
             string response = Console.ReadLine();
             if (response != "y" && response != "Y")
             {
                 return;
             }
 
-            Console.WriteLine("PROCESSING DATABASES ...");
+            Console.WriteLine(@"PROCESSING DATABASES ...");
 
             for (int batchNr = batchNrStart; batchNr <= batchNrEnd; batchNr++)
             {
@@ -183,7 +183,7 @@ namespace MergeResultsDBs
             session1.Flush();
             session1.Close();
             session2.Close();
-            Console.WriteLine("Successfully completed");
+            Console.WriteLine(@"Successfully completed");
             Console.ReadLine();
         }
     }

ResetBatchNr/Program.cs

@@ -38,7 +38,7 @@ namespace ResetBatchNr
             ls.BatchNr = 1;
             ls.Save();
 
-            Console.WriteLine("BatchNr was reset to 1");
+            Console.WriteLine(@"BatchNr was reset to 1");
             Console.ReadLine();
             return;
         }

Results/Entities/MeterTestRslt.cs

@@ -29,12 +29,8 @@ 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; }
@@ -170,10 +166,6 @@ 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;
@@ -217,10 +209,6 @@ 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);
@@ -261,10 +249,6 @@ 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

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

SchematicDrawing/DrawingShape.cs

@@ -378,40 +378,6 @@ 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) },
@@ -557,18 +523,12 @@ 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 uni
+            /// Tank
             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,13 +45,11 @@ 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", "17.0.0.0")]
+    [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 {
@@ -730,16 +730,6 @@ 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>
@@ -750,16 +740,6 @@ 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>
@@ -770,16 +750,6 @@ 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>
@@ -790,16 +760,6 @@ 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>
@@ -1010,166 +970,6 @@ 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,18 +319,6 @@
   <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>
@@ -385,66 +373,7 @@
   <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="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">
+  <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,16 +98,6 @@
   <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" />
@@ -128,10 +118,6 @@
     <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" />
@@ -201,12 +187,6 @@
     <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.TankHot, dshape.Shape == Shape.Scale);
+                        graph.AddNode(gnode, dshape.Shape == Shape.Tank, 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

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

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

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

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

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

@@ -1,2 +0,0 @@
-<?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</DefineConstants>
+    <DefineConstants>TRACE;LANG_PL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

TBF.sln

@@ -5,18 +5,16 @@ 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}
-		{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}
+		{743DF7DB-C7B6-42EB-986D-0F485E5588E4} = {743DF7DB-C7B6-42EB-986D-0F485E5588E4}
+		{46E3B0E1-209F-4550-B0DD-D7E2C039B3CE} = {46E3B0E1-209F-4550-B0DD-D7E2C039B3CE}
+		{32817BF9-E380-4467-9C7F-936F4B122BC7} = {32817BF9-E380-4467-9C7F-936F4B122BC7}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Results", "Results\Results.csproj", "{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}"
@@ -28,8 +26,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
-		{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48} = {8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}
 		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB} = {9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}
+		{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48} = {8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeviceTest", "DeviceTest\DeviceTest.csproj", "{6D3384DC-4638-4A92-91A8-F39D900377C6}"
@@ -106,19 +104,6 @@ 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
@@ -142,15 +127,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
@@ -479,66 +464,6 @@ 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.sln.DotSettings.user

@@ -1,4 +1,33 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAssert_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fd08b5425b14a4a129bfa8e447a81395e12190_003F4e_003F763c73b7_003FAssert_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AComponent_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc0c221501f3a41f8ac0af9d6a9dc9ff335fd90_003F1c_003F3d03a130_003FComponent_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AContainerControl_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F32c22f7c1b7049ccad5f07031bb43bf35b8590_003Fb3_003F54768651_003FContainerControl_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AControl_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F32c22f7c1b7049ccad5f07031bb43bf35b8590_003F01_003F35d9c974_003FControl_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEnum_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4290c01eea7748b3aa477ca831e6a387531830_003F96_003F1b5cc389_003FEnum_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExecutionContextSwitcher_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4290c01eea7748b3aa477ca831e6a387531830_003F78_003Fabacf9b6_003FExecutionContextSwitcher_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFileDialog_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F32c22f7c1b7049ccad5f07031bb43bf35b8590_003Fe6_003F4ece5b68_003FFileDialog_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AGetChildAtPointSkip_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F32c22f7c1b7049ccad5f07031bb43bf35b8590_003F63_003F931a2e4f_003FGetChildAtPointSkip_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIList_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4290c01eea7748b3aa477ca831e6a387531830_003F6e_003Fc16f1098_003FIList_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AILog_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c853b67fc2341bf8af0d999ea188b6a42000_003Ff4_003F27b3d1bb_003FILog_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AImage_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1af41839925b4409b823837d7b5f29d691940_003Fcc_003Fba3dfabe_003FImage_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AJsonConvert_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F43b5ed322493bdcdb2e73ba6f9808f93c7c41fdf_003FJsonConvert_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AList_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4290c01eea7748b3aa477ca831e6a387531830_003F92_003Fe3eb9ff2_003FList_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANetworkStream_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc0c221501f3a41f8ac0af9d6a9dc9ff335fd90_003F78_003Fdc4af641_003FNetworkStream_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ARotateFlipType_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1af41839925b4409b823837d7b5f29d691940_003F3b_003Ff7d64930_003FRotateFlipType_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AStreamReader_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4290c01eea7748b3aa477ca831e6a387531830_003Fb8_003Fd3bcd2f1_003FStreamReader_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AStreamWriter_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4290c01eea7748b3aa477ca831e6a387531830_003F2e_003F8ad77ef0_003FStreamWriter_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AStringWriter_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3020f90f960f433086d545c4e07afdfd531820_003F00_003F5212e7ed_003FStringWriter_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATaskFactory_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4290c01eea7748b3aa477ca831e6a387531830_003Fe5_003Fa31e7ef9_003FTaskFactory_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATask_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4290c01eea7748b3aa477ca831e6a387531830_003F9a_003F1a93d99e_003FTask_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATask_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003Fa3_003F820cf97f_003FTask_00601_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATcpClient_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc0c221501f3a41f8ac0af9d6a9dc9ff335fd90_003Fdb_003Fe9bb8972_003FTcpClient_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATestMethodInfo_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4472e9d6a19b4c92bcc9a80bd60ca17d26da8_003F98_003F3ffb6d31_003FTestMethodInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThread_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4290c01eea7748b3aa477ca831e6a387531830_003F06_003Fbeac08f5_003FThread_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4290c01eea7748b3aa477ca831e6a387531830_003F67_003F5737ad8a_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AUdpClient_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc0c221501f3a41f8ac0af9d6a9dc9ff335fd90_003Fdb_003Fe89b26d3_003FUdpClient_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AUserControl_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F32c22f7c1b7049ccad5f07031bb43bf35b8590_003Fc3_003F7d8608ff_003FUserControl_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AXmlReflectionImporter_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9e4992465ee24dc8915fd9be20badb7d281d48_003F14_003Ffe12756e_003FXmlReflectionImporter_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003A_005F_005FError_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4290c01eea7748b3aa477ca831e6a387531830_003Ffa_003Fa44fa010_003F_005F_005FError_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:Boolean x:Key="/Default/Environment/UnitTesting/CreateUnitTestDialog/ShowAdvancedOptions/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/Environment/UnitTesting/CreateUnitTestDialog/TestProjectMapping/=743DF7DB_002DC7B6_002D42EB_002D986D_002D0F485E5588E4/@EntryIndexedValue">77EB589F-C670-4489-AAD6-2A3C02061FD1</s:String>
 	<s:String x:Key="/Default/Environment/UnitTesting/CreateUnitTestDialog/TestProjectMapping/=8648FD92_002DCDA1_002D4C3A_002DB5F9_002DFE547CE1FA48/@EntryIndexedValue">77EB589F-C670-4489-AAD6-2A3C02061FD1</s:String>
@@ -9,12 +38,17 @@
     &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.Modbus.Meret.AdjustableScale.AdjustableMeterTest.GetCorrection&lt;/TestId&gt;&#xD;
     &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.Network.Camera.KeyenceIV3G120.CameraTest.RtpListener&lt;/TestId&gt;&#xD;
     &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.Network.Camera.KeyenceIV3G120.CameraTest.Initialize&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.Network.Camera.CJMS11.CameraTest.Initialize&lt;/TestId&gt;&#xD;
   &lt;/TestAncestor&gt;&#xD;
 &lt;/SessionState&gt;</s:String>
 	
 	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=fee81c72_002D0b13_002D439c_002D8921_002D12878bb8cd86/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="Initialize" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
   &lt;TestAncestor&gt;&#xD;
     &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.Network.Camera.KeyenceIV3G120.CameraTest.Initialize&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.Network.Camera.CJMS11.CameraTest.Initialize&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.Network.Camera.CJMS11.CameraTest.Initialize_TwoCamerasInParallel&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.Network.Camera.CJMS11.CameraTest.Initialize_TwoCamerasInParallelAsync&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.Network.Camera.CJMS11.CameraTest&lt;/TestId&gt;&#xD;
   &lt;/TestAncestor&gt;&#xD;
 &lt;/SessionState&gt;</s:String>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=Config_002FResources_002FStrings/@EntryIndexedValue">False</s:Boolean>
@@ -22,17 +56,21 @@
 	
 	
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=Miscellaneous_0020Files_002FWyqupug/@EntryIndexedValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FResources_002FStrings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FResources_002FStrings/@EntryIndexedValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandartCameraPurchaseOrder_002FCycleBeginningForm/@EntryIndexedValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandartCameraPurchaseOrder_002FCycleEndForm/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandartCameraPurchaseOrder_002FCycleEndForm/@EntryIndexedValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandartCameraPurchaseOrder_002FTestStartEndForm/@EntryIndexedValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FAdapterFTP_002FNetadapterCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FCamera_002FKeyenceIV3G120_002FCameraCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FCamera_002FRoiForFixedStartKeyence_002FRoiCfgCtrl/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FAdapterFTP_002FNetadapterCfgCtrl/@EntryIndexedValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FCamera_002FCJMS11_002FCameraCfgCtrl/@EntryIndexedValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FCamera_002FCJMS11_002FTerminalDlg/@EntryIndexedValue">False</s:Boolean>
 	
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FRestAPI_002FRestApiCfgCtrl/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FCamera_002FKeyenceIV3G120_002FCameraCfgCtrl/@EntryIndexedValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FCamera_002FRoiForFixedStartCJMS11_002FRoiCfgCtrl/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FCamera_002FRoiForFixedStartKeyence_002FRoiCfgCtrl/@EntryIndexedValue">False</s:Boolean>
+	
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FRestAPI_002FRestApiCfgCtrl/@EntryIndexedValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOutput_002FPrinters_002FGroupPrinting_002FSingle_002FPrinterCfgCtrl/@EntryIndexedValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOutput_002FPrinters_002FGroupPrinting_002FSingle_002FPrinterTestBenchComponentSelectorDlg/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOutput_002FPrinters_002FGroupPrinting_002FSingle_002FPrinterTestBenchComponentSelectorDlg/@EntryIndexedValue">False</s:Boolean>
 	
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FRegisterReaders_002FFrequencyMeterFromUniCB_002FRRCfgCtrl/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FComponents_002FComponentsManagerDlg/@EntryIndexedValue">False</s:Boolean>

TBF/Properties/AssemblyInfo.cs

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

TBF/Resources/Strings.Designer.cs

@@ -401,24 +401,6 @@ 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>
@@ -4793,15 +4775,6 @@ 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,12 +197,6 @@
   </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>
@@ -2448,9 +2442,6 @@
   </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

@@ -9,7 +9,6 @@ using Dirichlet.Numerics;
 using TBF.Boxes;
 using TBF.Rig.ControlBoard;
 using TBF.Rig.GenericDevices;
-using System.Windows.Forms;
 
 namespace TBF.Rig.BuiltIn
 {
@@ -196,79 +195,66 @@ 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)
         {
-            try
+            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)
             {
-                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
-                    }
-                }
+                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.InvertSV1)
-                        AddSwitchPoints(switchPointsRaw, ValveBase.MakeList(outPath.StartValve1), none, 0);     /// open SV1
+                    if (outPath.InvertSV2)
+                        AddSwitchPoints(switchPointsRaw, none, ValveBase.MakeList(outPath.StartValve2), -outPath.LagSV2);   /// close SV2 after lag
                     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
-                    }
+                        AddSwitchPoints(switchPointsRaw, ValveBase.MakeList(outPath.StartValve2), none, -outPath.LagSV2);   /// open SV2 after lag
                 }
 
-                switchPoints = SortAndMergeSwitchPoints(switchPointsRaw);
-                timeShift = -switchPoints[0].TimeSec;
-                MakeMasks(switchPoints, timeShift);
+                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
+                }
             }
-            catch (Exception ex)
+            else
             {
-                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;
+                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
+                }
             }
+
+			switchPoints = SortAndMergeSwitchPoints(switchPointsRaw);
+			timeShift = -switchPoints[0].TimeSec;
+			MakeMasks(switchPoints, timeShift);
         }
 
 		/// <summary>Start this operation</summary>

TBF/Rig/ControlBoard/IControlBoard.cs

@@ -93,7 +93,7 @@ namespace TBF.Rig.ControlBoard
         /// <returns>Operation</returns>
         IOperation QueryMeasurementEndOp();
 
-        void StopFlowControl(bool isFromUI, int regVId, int regulationMinStep = 0);
+        void StopFlowControl(bool isFromUI, int regVId);
 
         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, int regulationMinStep = 0)
+        public void StopFlowControl(bool isFromUI, int rvId)
         {
         }
 

TBF/Rig/ControlBoard/Uni/Action.cs

@@ -55,9 +55,6 @@ 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()
@@ -81,7 +78,6 @@ namespace TBF.Rig.ControlBoard.Uni
             RVMovePar1 = 0;
             RVMovePar2 = 0;
             InitDacVal = 0;
-            RegulationMinStep = 0;
         }
 
 
@@ -127,7 +123,7 @@ namespace TBF.Rig.ControlBoard.Uni
         }
 
         ///----------------------------------------------------------------------------------------------
-        public static Action MeasureFlow(bool isFromUI, int flowMeterId, int regulationMinStep = 0)
+        public static Action MeasureFlow(bool isFromUI, int flowMeterId)
         {
             return new Action
             {
@@ -167,7 +163,7 @@ namespace TBF.Rig.ControlBoard.Uni
 
         ///----------------------------------------------------------------------------------------------
         public static Action SetFlow(bool isFromUI, int regValveId, double freqLo, double freqHi,
-                                     int pid, int stabTime_ms, int regulationMinStep = 0)
+                                     int pid, int stabTime_ms)
         {
             int rvMovePar1 = Convert.ToInt32(Math.Round(13.1072 * freqLo));
             int rvMovePar2 = Convert.ToInt32(Math.Round(13.1072 * freqHi));
@@ -182,7 +178,6 @@ 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,
@@ -212,7 +207,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, int regulationMinStep = 0)
+                                       bool isProlonged, int totalPulsesCount, int massPulsesCount = 0)
         {
             return new Action
             {
@@ -230,7 +225,6 @@ namespace TBF.Rig.ControlBoard.Uni
                 TotalPulsesCount = totalPulsesCount,
                 MassPulsesCount = (massPulsesCount <= 0) ? totalPulsesCount : massPulsesCount,
                 StartStop = Command.Start,
-                //RegulationMinStep = regulationMinStep,
             };
         }
         void SetStartTestArgs(Action action)
@@ -278,7 +272,7 @@ namespace TBF.Rig.ControlBoard.Uni
         }
 
         ///----------------------------------------------------------------------------------------------
-        public static Action RegVlvIncrMove(bool isFromUI, int regValveId, double timeSec, int regulationMinStep = 0)
+        public static Action RegVlvIncrMove(bool isFromUI, int regValveId, double timeSec)
         {
             int rvMovePar = Math.Abs(Convert.ToInt32(Math.Round(timeSec / 0.050)));     /// Step is 50 ms
 
@@ -291,7 +285,6 @@ namespace TBF.Rig.ControlBoard.Uni
                 RegVMode = (timeSec >= 0) ? RegValveMode.PulseWidth : (RegValveMode.PulseWidth | RegValveMode.NegPulseWidth),
                 RVMovePar1 = rvMovePar,
                 RVMovePar2 = rvMovePar,
-                //RegulationMinStep = regulationMinStep,
             };
         }
         void SetRegVlvIncrMoveArgs(Action action)
@@ -300,7 +293,6 @@ 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)
@@ -310,7 +302,7 @@ namespace TBF.Rig.ControlBoard.Uni
         }
 
         ///----------------------------------------------------------------------------------------------
-        public static Action RegVlvMoveToPos(bool isFromUI, int regValveId, int adcValLo, int adcValHi = -1, int regulationMinStep = 0)
+        public static Action RegVlvMoveToPos(bool isFromUI, int regValveId, int adcValLo, int adcValHi = -1)
         {
             int rvMovePar1, rvMovePar2;
 
@@ -326,7 +318,7 @@ namespace TBF.Rig.ControlBoard.Uni
                 rvMovePar1 = Math.Max(adcValLo - 5, 0);
                 rvMovePar2 = Math.Min(adcValLo + 5, 1023);
             }
-
+                                        
             return new Action
             {
                 ActionId = ActionID.RegVlvMoveToPos,
@@ -336,7 +328,6 @@ namespace TBF.Rig.ControlBoard.Uni
                 RegVMode = RegValveMode.TargetPosition,
                 RVMovePar1 = rvMovePar1,
                 RVMovePar2 = rvMovePar2,
-                //RegulationMinStep = regulationMinStep,
             };
         }
         void SetRegVlvMoveToPosArgs(Action action)
@@ -345,7 +336,6 @@ 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)
@@ -355,7 +345,7 @@ namespace TBF.Rig.ControlBoard.Uni
         }
 
         ///----------------------------------------------------------------------------------------------
-        public static Action RegVlvStop(bool isFromUI, int regValveId, int RegulationMinStep = 0)
+        public static Action RegVlvStop(bool isFromUI, int regValveId)
         {
             return new Action
             {
@@ -366,7 +356,6 @@ namespace TBF.Rig.ControlBoard.Uni
                 RegVMode = RegValveMode.Stop,
                 RVMovePar1 = 0,
                 RVMovePar2 = 0,
-                //RegulationMinStep = RegulationMinStep
             };
         }
         void SetRegVlvStopArgs(Action action)
@@ -375,7 +364,6 @@ 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)
@@ -616,8 +604,7 @@ namespace TBF.Rig.ControlBoard.Uni
                             combinedAction.TolerRV,
                             combinedAction.StabTime,
                             combinedAction.InitDacVal,
-                            combinedAction.DivThreshold,
-                            combinedAction.RegulationMinStep);
+                            combinedAction.DivThreshold);
 
             return combinedAction;
         }

TBF/Rig/ControlBoard/Uni/OutputMessage.cs

@@ -5,8 +5,6 @@ using System;
 using System.Diagnostics;
 using log4net;
 using Dirichlet.Numerics;
-using Common;
-using System.Web.Routing;
 
 namespace TBF.Rig.ControlBoard.Uni
 {
@@ -90,7 +88,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);
@@ -100,21 +98,8 @@ 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] = (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;
-            //---*/
-
+            message[39] = 0;
+            message[40] = 0;
             Debug.Assert(40 == PayloadLen + 2);
 
             /// Checksum (2 bytes)
@@ -123,8 +108,6 @@ namespace TBF.Rig.ControlBoard.Uni
             message[PayloadLen + 3] = (byte)(checksum & 0xFF);
             message[PayloadLen + 4] = (byte)((checksum >> 8) & 0xFF);
 
-            log.Info("");
-
             return message;
         }
 
@@ -168,16 +151,11 @@ namespace TBF.Rig.ControlBoard.Uni
                 return (byte)0x20;
             }
 
-            else if ((a.ActionId & ActionID.SetFlow) != 0 && a.RegVId == TBF.Rig.Uni.RegValveAnalog.RegValve.RVAnalogIdx)
+            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,9 +2,6 @@
 /// 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;
 
@@ -19,8 +16,7 @@ namespace TBF.Rig.ControlBoard.Uni
         /// Set by the constructor
         ///
         readonly UniCB uniCB;
-        readonly object flowMeter;
-        readonly TBF.Rig.Uni.FlowMetersInParallel.FlowMeter flowMeterInParallel;
+        readonly TBF.Rig.Uni.FlowMeter.FlowMeter flowMeter;
         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)
@@ -54,119 +50,36 @@ 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;
 
-                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;
-            }
+			flowMeter = devices.FlowMeter as TBF.Rig.Uni.FlowMeter.FlowMeter;
+            if (flowMeter == null) throw new ArgumentNullException("Invalid flow meter");
 
             this.pulsesCount = pulsesCount;
             this.withDiverter = withDiverter;
 
             if (withDiverter)
             {
-                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;
-                }
+                diverter = devices.Diverter as TBF.Rig.Uni.Diverter.Diverter;
+                if (diverter == null) throw new ArgumentNullException("Invalid diverter");
             }
 
 			log.Debug(this.ToString());
         }
 
-        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>
+		/// <summary>
         /// Start this operation
         /// </summary>
-        public void Start()
+		public void Start()
         {
-            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);
+            log.InfoFormat("Start() Et#={0} pulses={1} withDiverter={2}", 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.FlowMeter.FlowMeter)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, flowMeter.Idx1, (withDiverter ? diverter.DiverterNr : 0), 0,
+                            false, withDiverter, false, true, false, pulsesCount);
 
-                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;
-            }
-
-           
+            opState = OpState.StartingTest;
         }
 
         /// <summary>

TBF/Rig/ControlBoard/Uni/UniCB.cs

@@ -17,8 +17,6 @@ using TBF.Boxes;
 using TBF.Rig.GenericDevices;
 using TBF.Rig.Sequences;
 using TBF.UiBridge;
-using AppDiagnostic;
-using SharedComponents;
 
 namespace TBF.Rig.ControlBoard.Uni
 {
@@ -549,7 +547,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)
                 {
@@ -575,11 +573,7 @@ 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)
@@ -601,7 +595,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));
@@ -621,7 +615,7 @@ namespace TBF.Rig.ControlBoard.Uni
         {
         }
 
-#endregion
+        #endregion
 
         #region IControlBoard interface
 
@@ -787,13 +781,12 @@ namespace TBF.Rig.ControlBoard.Uni
 
         #endregion
 
-        public void MeasureFlow(bool isFromUI, int flowMeterId, int regulationMinStep = 0)
+        public void MeasureFlow(bool isFromUI, int flowMeterId)
         {
             if (IsUIBlocked && isFromUI) return;
 
-            actionQueue.Enqueue(Action.MeasureFlow(isFromUI, flowMeterId, regulationMinStep));
+            actionQueue.Enqueue(Action.MeasureFlow(isFromUI, flowMeterId));
             log.InfoFormat("Enqueue( MeasureFlow(fm={0}) )", flowMeterId);
-
             foreach (var a in actionQueue) log.DebugFormat("   {0}", a);
         }
 
@@ -801,13 +794,12 @@ 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, int regulationMinStep = 0)
+        public void SetFlow(bool isFromUI, int regVId, double freqLo, double freqHi)
         {
             if (IsUIBlocked && isFromUI) return;
 
-            actionQueue.Enqueue(Action.SetFlow(isFromUI, regVId, freqLo, freqHi, Convert.ToInt32(Math.Round(Devices.PidCoef)), 200, regulationMinStep));
+            actionQueue.Enqueue(Action.SetFlow(isFromUI, regVId, freqLo, freqHi, Convert.ToInt32(Math.Round(Devices.PidCoef)), 200));
             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);
         }
 
@@ -822,23 +814,22 @@ 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, int regulationMinStep = 0)
+        public void StopFlowControl(bool isFromUI, int regVId)
         {
             if (IsUIBlocked && isFromUI) return;
 
             if (regVId < TBF.Rig.Uni.RegValveAnalog.RegValve.RVAnalogIdx)
             {
-                actionQueue.Enqueue(Action.RegVlvStop(isFromUI, regVId, regulationMinStep));
+                actionQueue.Enqueue(Action.RegVlvStop(isFromUI, regVId));
                 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, regulationMinStep));
+                actionQueue.Enqueue(Action.RegVlvMoveToPos(isFromUI, regVId, dacVal));
                 log.InfoFormat("Enqueue( RegVlvMoveToPos(rv={0}, positionLo={1}) )", regVId, dacVal);
             }
             foreach (var a in actionQueue) log.DebugFormat("   {0}", a);
@@ -850,7 +841,6 @@ namespace TBF.Rig.ControlBoard.Uni
 
             actionQueue.Enqueue(Action.Stop(isFromUI));
             log.InfoFormat("Enqueue( Stop() )");
-
             foreach (var a in actionQueue) log.DebugFormat("   {0}", a);
         }
 
@@ -859,11 +849,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, int regulationMinStep = 0)
+        public void RegVlvIncrMove(bool isFromUI, int regVId, double time)
         {
             if (IsUIBlocked && isFromUI || regVId >= TBF.Rig.Uni.RegValveAnalog.RegValve.RVAnalogIdx) return;
             
-            var newAction = Action.RegVlvIncrMove(isFromUI, regVId, time, regulationMinStep);
+            var newAction = Action.RegVlvIncrMove(isFromUI, regVId, time);
             
             var actionsToModify = actionQueue.Where(x => (x.ActionId == ActionID.RegVlvIncrMove && x.RegVId == newAction.RegVId));            
             bool oneModified = false;
@@ -880,7 +870,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);
@@ -895,13 +885,12 @@ 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, int regulationMinStep = 0)
+        public void RegVlvMoveToPos(bool isFromUI, int regVId, int adcValLo, int adcValHi = -1)
         {
             if (IsUIBlocked && isFromUI || regVId > TBF.Rig.Uni.RegValveAnalog.RegValve.RVAnalogIdx) return;
 
-            actionQueue.Enqueue(Action.RegVlvMoveToPos(isFromUI, regVId, adcValLo, adcValHi, regulationMinStep));
+            actionQueue.Enqueue(Action.RegVlvMoveToPos(isFromUI, regVId, adcValLo, adcValHi));
             log.InfoFormat("Enqueue( RegVlvMoveToPos(rv={0}, positionLo={1}, positionHi={2}) )", regVId, adcValLo, adcValHi);
-
             foreach (var a in actionQueue) log.DebugFormat("   {0}", a);
         }
 
@@ -918,7 +907,6 @@ 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);
         }
 
@@ -928,7 +916,6 @@ namespace TBF.Rig.ControlBoard.Uni
 
             actionQueue.Enqueue(Action.DelayStartOrStop(isFromUI));
             log.InfoFormat("Enqueue( DelayStartOrStop() )");
-
             foreach (var a in actionQueue) log.DebugFormat("   {0}", a);
         }
 
@@ -943,7 +930,6 @@ 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);
         }
 
@@ -953,7 +939,6 @@ namespace TBF.Rig.ControlBoard.Uni
 
             actionQueue.Enqueue(Action.GetScopeAnalyzerData(isFromUI));
             log.InfoFormat("Enqueue( GetScopeAnalyzerData() )");
-
             foreach (var a in actionQueue) log.DebugFormat("   {0}", a);
         }
 
@@ -963,7 +948,6 @@ namespace TBF.Rig.ControlBoard.Uni
 
             actionQueue.Enqueue(Action.ResetScopeAnalyzer(isFromUI));
             log.InfoFormat("Enqueue( ResetScopeAnalyzer() )");
-
             foreach (var a in actionQueue) log.DebugFormat("   {0}", a);
         }
 
@@ -973,7 +957,6 @@ 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/StandartCameraPurchaseOrder/CycleBeginningForm.cs

@@ -480,7 +480,7 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
                 }
                 else
                 {
-                    Console.WriteLine("The selected item is not a number.");
+                    Console.WriteLine(@"The selected item is not a number.");
                 }
             }
         }

TBF/Rig/DataEntry/StandartCameraPurchaseOrder/TestStartEndForm.cs

@@ -302,11 +302,27 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
             if (nrLines == 1)
             {
                 Width = 1040;
+                startLabel2.Visible = false;
+				endLabel2.Visible = false;
             }
             else
             {
 	            Width = 1420;
             }
+
+            OkButtonPosition();
+        }
+
+        void OkButtonPosition()
+        {
+	        if (okButton.Location.X > Width)
+	        {
+		        int margin = 5;
+		        okButton.Location = new Point(
+			        this.ClientSize.Width - okButton.Width - margin,
+			        okButton.Location.Y
+		        );
+	        }
         }
 
 		/// <summary>

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

@@ -33,9 +33,10 @@ 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.orderComboBox = new TBF.UI.Shared.SuggestComboBox();
-            this.labelOrder = new System.Windows.Forms.Label();
+            this.orderGroupBox.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
             this.SuspendLayout();
             // 
@@ -47,53 +48,50 @@ 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,6 +11,7 @@ using TBF.Rig.Sequences;
 using TBF.Rig.Output.DB.SensusOracle;
 using TBF.Resources;
 using System.Drawing;
+using NHibernate;
 
 namespace TBF.Rig.DataEntry.iPerl
 {
@@ -23,7 +24,8 @@ namespace TBF.Rig.DataEntry.iPerl
         readonly EntryFormCfg cfg;
 
         /// Loaded from database beforethe form is open
-        IList<OrderDetails> listOfOrders;
+        IList<IOrderInfo> listOfOrders;
+        string preselectedOrder;
 
 		/// To be retrieved after the form is closed
 		public string PurchaseOrder;
@@ -40,6 +42,7 @@ namespace TBF.Rig.DataEntry.iPerl
 		{
 			InitializeComponent();
 			ControlBox = false;
+            preselectedOrder = null;
 
 			completed = false;
 			StartForceCloseHandler();
@@ -50,11 +53,12 @@ namespace TBF.Rig.DataEntry.iPerl
         /// Constructor
         /// </summary>
         /// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
-        public CycleBeginningForm(int waterMetersCount, EntryFormCfg cfg)
+        public CycleBeginningForm(int waterMetersCount, EntryFormCfg cfg, string preselectedOrder = null)
 			: this()
         {
             this.WaterMetersCount = waterMetersCount;
             this.cfg = cfg;
+            this.preselectedOrder = preselectedOrder;
 			SNText = null;
 			Disabled = null;
         }
@@ -63,12 +67,49 @@ namespace TBF.Rig.DataEntry.iPerl
         private void CycleBeginningForm_Load(object sender, EventArgs e)
         {
 			Text = Strings.Data;
-			labelOrder.Text = Strings.Purchase_order;
+			orderGroupBox.Text = Strings.Purchase_order;
 			okButton.Text = Strings.OkBtnText;
 
-            listOfOrders = ((cfg.Orders == Orders.FromOracle || cfg.Orders == Orders.CombinedAndFromOracle) && ProcessData.OracleDB != null)
-                         ? ProcessData.OracleDB.ReadOrders()
-                         : new List<OrderDetails>();
+            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)
             {
@@ -76,25 +117,71 @@ namespace TBF.Rig.DataEntry.iPerl
                     PrepareOrderCombo(orderComboBox);
                     break;
 
-                case Orders.CombinedAndFromOracle:
                 case Orders.FromOracle:
+                case Orders.FromTracingDB:
+                    if (insertFirst != null)
+                    {
+                        orderComboBox.Items.Add(insertFirst);
+                        orderComboBox.Text = insertFirst;
+                    }
 
                     foreach (var o in listOfOrders)
-                    {
-                        orderComboBox.Items.Add(o.POName + " - " + o.SNPrefix);
-                    }
-                    if (Program.LocalSettings.PurchaseOrderHistoryCount > 0) 
-                        orderComboBox.SelectedIndex = orderComboBox.FindString(Program.LocalSettings.PurchaseOrderHistory[0]);
+                        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 = (ProcessData.BenchInfo is DataContainer.iPerlBenchInfo.Component)
-                      ? (ProcessData.BenchInfo as DataContainer.iPerlBenchInfo.Component).Side
-                      : Side.Left;
+            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
@@ -115,9 +202,7 @@ 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
@@ -138,20 +223,45 @@ namespace TBF.Rig.DataEntry.iPerl
 
 		private void okButton_Click(object sender, EventArgs e)
         {
-            PurchaseOrder = orderComboBox.Text.Split(' ')[0].Trim();
-
-            if (PurchaseOrder.Length > 10 ||
-                (cfg.Orders != Orders.Arbitrary && orderComboBox.FindString(PurchaseOrder) < 0))
+            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;
             }
 
-            ProcessData.OrderDetails = (listOfOrders == null) ? null : listOfOrders.FirstOrDefault<OrderDetails>(x => x.POName == orderComboBox.Text);
+            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;
+                }
+            }
 
-            
-            Program.LocalSettings.UpdateHistory(PurchaseOrder, ref Program.LocalSettings.PurchaseOrderHistory);
+            PurchaseOrder = orderComboBox.Text;
+            Program.LocalSettings.UpdateHistory(orderComboBox.Text, ref Program.LocalSettings.PurchaseOrderHistory);
 
             completed = true;
             Close();
@@ -175,6 +285,6 @@ namespace TBF.Rig.DataEntry.iPerl
 			Close();
 		}
 
-        #endregion
-    }
+		#endregion
+   }
 }

TBF/Rig/DataEntry/iPerl/CycleBeginningForm.resx

@@ -122,14 +122,10 @@
     <value>Verdana, 14.25pt</value>
   </data>
   <data name="okButton.Location" type="System.Drawing.Point, System.Drawing">
-    <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>
+    <value>627, 26</value>
   </data>
   <data name="okButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>149, 78</value>
+    <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">
@@ -148,16 +144,61 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;okButton.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <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>37, 145</value>
-  </data>
-  <data name="pictureBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>28, 118</value>
   </data>
   <data name="pictureBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>948, 612</value>
+    <value>711, 497</value>
   </data>
   <data name="pictureBox.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
@@ -172,79 +213,19 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;pictureBox.ZOrder" xml:space="preserve">
-    <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>
+    <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>8, 16</value>
+    <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>1025, 786</value>
-  </data>
-  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>769, 639</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>Batch data</value>

TBF/Rig/DataEntry/iPerl/EntryForm.cs

@@ -7,6 +7,7 @@ using log4net;
 using Config.Entities;
 using TBF.Rig;
 using TBF.Rig.GenericDevices;
+using TBF.Rig.Sequences;
 
 namespace TBF.Rig.DataEntry.iPerl
 {
@@ -84,7 +85,7 @@ namespace TBF.Rig.DataEntry.iPerl
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.ShowFormAtCycleBeginning;
-			this.waterMeters = TBF.Rig.Sequences.ProcessData.BatchRslts.Batch.WaterMeters;
+			this.waterMeters = ProcessData.BatchRslts.Batch.WaterMeters;
 			return this;
 		}
 
@@ -97,6 +98,10 @@ 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)
 		{
@@ -113,7 +118,8 @@ namespace TBF.Rig.DataEntry.iPerl
         /// 
         void OpenBeginningDlg(EntryForm myRef)
         {
-            myRef.modelessDlg = new CycleBeginningForm(TBF.Data.WMsCount, myRef.entryFormCfg);
+            myRef.modelessDlg = new CycleBeginningForm(TBF.Data.WMsCount, myRef.entryFormCfg,
+                ProcessData.SelectedProcedure.OrderInfo != null ? ProcessData.SelectedProcedure.OrderInfo.POName : string.Empty);
             modelessDlg.Show();
         }
         /// 
@@ -136,7 +142,16 @@ namespace TBF.Rig.DataEntry.iPerl
 			switch (currentOp)
             {
                 case CurrentOp.ShowFormAtCycleBeginning:
-                    Program.MainWnd.Invoke(new EntryFormDlgt(OpenBeginningDlg), this);
+                    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.EnterTestStartStates:
 					Program.MainWnd.Invoke(new EntryFormDlgt(OpenTestStartStatesDlg), this);
@@ -151,7 +166,17 @@ namespace TBF.Rig.DataEntry.iPerl
 		/// <returns>Event.ResultsPrinted</returns>
 		public Event Run()
 		{
-			if ((modelessDlg is IHasCompleted) && !(modelessDlg as IHasCompleted).Completed)
+            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;
 			}
@@ -214,26 +239,5 @@ 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,17 +32,23 @@ namespace TBF.Rig.DataEntry.iPerl
     public enum Orders
     {
 #if LANG_SK
-        [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,
+        [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("Active from Oracle")]               FromOracle,
-        [Description("Combined and active from Oracle")]  CombinedAndFromOracle,
+        [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,
     }
@@ -93,22 +99,15 @@ namespace TBF.Rig.DataEntry.iPerl
 
         public ICollection<string> ParamValues(int i)
         {
+            var list = new List<string>();
             switch (i)
             {
                 case 0:
-                    return new string[]
-                    {
-                        Direction.Forward_RL.ToDescription(),
-                        Direction.Reversed_LR.ToDescription(),
-                        Direction.S640.ToDescription(),
-                    };
+                    for (Direction d = 0; d < Direction.Count; d++) list.Add(d.ToDescription());
+                    return list;
                 case 1:
-                    return new string[]
-                    {
-                        Orders.Arbitrary.ToDescription(),
-                        Orders.FromOracle.ToDescription(),
-                        Orders.CombinedAndFromOracle.ToDescription(),
-                    };
+                    for (Orders o = 0; o < Orders.Count; o++) list.Add(o.ToDescription());
+                    return list;
                 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 "DataEntry-iPerl"; } }
+		public string ClassName { get { return GetType().Namespace.Substring(8); } }
         public override string ToString() { return ClassName; }
 
 		public IComponent DummyComponent() { return new EntryForm(); }

TBF/Rig/Dummy/RegValve/RegValve.cs

@@ -22,8 +22,7 @@ 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; } }

TBF/Rig/Network/AdapterJMS/Factory.cs

@@ -0,0 +1,25 @@
+///
+/// Copyright (c) 2017 Sensus Metering Systems
+///
+using System.Collections.Generic;
+using TBF.Rig.Generic;
+
+namespace TBF.Rig.Network.AdapterJMS
+{
+	public class Factory : IComponentFactory
+	{
+		public string ClassName { get { return this.GetType().Namespace.Substring(8); } }
+        public override string ToString() { return ClassName; }
+
+		public IComponent DummyComponent() { return new Netadapter(); }
+
+		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Netadapter(cfg); }
+
+		public IComponentCfg DefaultConfig() { return new NetadapterCfg(this.GetType().Namespace.Substring(8), this); }
+
+		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
+		{
+			return ComponentCfgBase.CreateFromDbEntity(NetadapterCfg.Serializer, component, this);
+		}
+	}
+}

TBF/Rig/Network/AdapterJMS/Netadapter.cs

@@ -0,0 +1,115 @@
+///
+/// Copyright (c) 2017 Sensus Metering Systems
+///
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading.Tasks;
+using Common;
+using Config.Entities;
+using log4net;
+using NHibernate;
+using TBF.Rig.Network.Camera.CJMS11;
+
+namespace TBF.Rig.Network.AdapterJMS
+{
+	public class Netadapter : ComponentBase, GenericDevices.INetworkAdapter
+	{
+		private static readonly ILog log = LogManager.GetLogger(typeof(Netadapter));
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
+
+		readonly NetadapterCfg netadapterCfg;
+
+		IPAddress ipAddress;
+		IPAddress netMask;
+		IPAddress broadcastAddress;
+		
+		int tcpPort = -1;
+		IList<TcpClient> tcpClients;
+		private IList<Task> connectAsyncList;
+
+		public IPAddress IPAddress { get { return ipAddress; } }
+		public IPAddress NetMask { get { return netMask; } }
+		public IPAddress BroadcastAddress { get { return broadcastAddress; } }
+
+		public IList<TcpClient> TcpClients { get { return tcpClients; } }
+		public int TcpPort { get { return tcpPort; } }
+
+		public TcpClient GetTcpClient(string ipAddressCJMS)
+		{
+			foreach (TcpClient tcpClient in tcpClients)
+			{
+				if (tcpClient.Client.RemoteEndPoint.ToString().Contains(ipAddressCJMS))
+				{
+					return tcpClient;
+				}
+			}
+			return null;
+		}
+
+		public IList<Task> TasksConnectAsync { get { return connectAsyncList; } }
+
+
+		public Netadapter() { }
+
+		public Netadapter(Generic.IComponentCfg cfg)
+            : base(cfg)
+        {
+			netadapterCfg = cfg as NetadapterCfg;
+            log.Warn(this.ToString());
+            tcpClients = new List<TcpClient>();
+		}
+
+        public override void Initialize()
+        {
+	        if (DebugLevel == DebugMode.Simulate)
+	        {
+		        ipAddress = IPAddress.Parse("192.168.1.100");
+		        netMask = IPAddress.Parse("255.255.255.0");
+		        broadcastAddress = IPAddress.Parse("192.168.1.255");
+		        return;
+	        }
+	        
+	        //TODO hold connections to cameras and other devices, close them when the adapter is removed.
+	        ISession session = TBF.DB.CreateSession(DBKind.Config);
+	        //TODO BUMI - get the port from the config file - defined by UI
+	        if (tcpPort == -1) tcpPort = 32456; //default port
+
+	        IList<Component> cmpntEntities = session.QueryOver<Component>()
+		        .OrderBy(x => x. ItemNr).Asc
+		        .List();
+
+	        connectAsyncList = new List<Task>();
+	        foreach (var cmpnt in cmpntEntities)
+	        {
+		        Rig.Generic.IComponentFactory factory = TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName);
+
+		        /// Camera - jouined to a network adapter
+		        if (factory is Rig.Network.Camera.CJMS11.Factory)
+		        {
+			        CameraCfg cmpntCfgFromCmpntEntity =
+				        factory.CmpntCfgFromCmpntEntity(cmpnt) as Rig.Network.Camera.CJMS11.CameraCfg;
+			        if (cmpntCfgFromCmpntEntity == null) continue;
+			        // TcpClient tcpClient = new TcpClient();
+			        // tcpClients.Add(tcpClient);
+			        // connectAsyncList.Add(tcpClient.ConnectAsync(cmpntCfgFromCmpntEntity.IPAddressCJMS, tcpPort));
+
+		        }
+	        }
+
+	        //Task.WaitAll(connectAsyncList.ToArray()); // run all tasks in parallel
+
+		    //    AdapterInfo.RefreshNetAdaptersInfo();
+            // AdapterInfo netadapter = AdapterInfo.GetNetAdapter(netadapterCfg.Description);
+            // ipAddress = netadapter.IPAddress;
+            // netMask = netadapter.NetMask;
+            //
+            // if (this.Cfg.DebugLevel != DebugMode.Simulate)
+            // {
+	           //  broadcastAddress = netadapter.GetBroadcastAddress();
+            // }
+        }
+	}
+}

TBF/Rig/Network/AdapterJMS/NetadapterCfg.cs

@@ -0,0 +1,39 @@
+///
+/// Copyright (c) 2017 Sensus Metering Systems
+///
+using System;
+using System.Collections.Generic;
+using System.Xml.Serialization;
+using Config.Entities;
+using TBF.Rig.Generic;
+
+namespace TBF.Rig.Network.AdapterJMS
+{
+	public class NetadapterCfg : ComponentCfgBase, Generic.IComponentCfg
+	{
+		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(NetadapterCfg) })[0];
+		public override XmlSerializer GetSerializer() { return Serializer; }
+
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new NetadapterCfgCtrl(); }
+
+
+		public string Description;			/// Description string of the selected network adapter
+
+
+		/// Private parameterless constructor invoked by all other (public) constructors
+		NetadapterCfg() {}
+
+        public NetadapterCfg(string name, IComponentFactory factory)
+            : this()
+        {
+			Name = name;
+			Factory = factory;
+			ParentName = string.Empty;
+		}
+
+		public string ToString(int i)
+		{
+			return string.Format("Name={0}, Description={1}", Name, Description);
+		}
+	}
+}

TBF/Rig/Network/AdapterJMS/NetadapterCfgCtrl.cs

@@ -0,0 +1,140 @@
+///
+/// Copyright (c) 2017 Sensus Metering Systems
+///
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Windows.Forms;
+using Common;
+using Config.Entities;
+using TBF.Rig.Generic;
+
+namespace TBF.Rig.Network.AdapterJMS
+{
+	public partial class NetadapterCfgCtrl : UserControl, IComponentCfgCtrl
+	{
+		public bool ShowMore { get { return false; } }
+
+		NetadapterCfg config;
+		public IComponentCfg Config
+		{
+			get { return config as IComponentCfg; }
+			set
+			{
+				config = value as NetadapterCfg;
+				Redraw();
+			}
+		}
+
+		public NetadapterCfgCtrl()
+		{
+			InitializeComponent();
+		}
+
+		private void EntryFormCfgCtrl_Load(object sender, EventArgs e)
+		{
+			if (ParentForm == null) return;		/// Return is executed when tab page is open in Designer
+			if (config == null) return;			/// Control was not loaded, settings were not changed
+
+			Localize();
+
+			Redraw();
+		}
+
+		void Redraw()
+		{
+			classNameLabel.Text = config.Factory.ClassName;
+			nameTextBox.Text = config.Name;
+
+			AdapterInfo.RefreshNetAdaptersInfo();
+			IList<AdapterInfo> adapters = AdapterInfo.NetAdapters;
+
+			string cfgAdapter = string.Empty;
+			foreach (AdapterInfo ai in adapters)
+			{
+				string record;
+
+				if (ai.IPAddress == null)
+				{
+					/// This happens with network adapters that currently have no IP address,
+					/// for instance not connected wireless or dial-up adapters
+					record = "???.???.???.???";
+				}
+				else
+				{
+					/// Do not consider IPv6 adapters as well as "Any", "Broadcast", "Loopback" or "None" addresses
+					if ((ai.IPAddress.AddressFamily == System.Net.Sockets.AddressFamily.InterNetworkV6) ||
+						ai.IPAddress.Equals(IPAddress.Any) ||
+						ai.IPAddress.Equals(IPAddress.Broadcast) ||
+						ai.IPAddress.Equals(IPAddress.IPv6Any) ||
+						ai.IPAddress.Equals(IPAddress.IPv6Loopback) ||
+						ai.IPAddress.Equals(IPAddress.IPv6None) ||
+						ai.IPAddress.Equals(IPAddress.Loopback) ||
+						ai.IPAddress.Equals(IPAddress.None))
+					{
+						continue;
+					}
+
+					record = ai.IPAddress.ToString();
+				}
+
+				record += " - " + ai.Description;
+				int i = adapterComboBox.Items.Add(record);
+				if (ai.Description == config.Description)
+				{
+					/// Select the adapter currently in the configuration
+					adapterComboBox.SelectedIndex = i;
+				}
+			}
+
+			/// Select the first one if the adapter from the configuration does not exist on the system
+			if (adapterComboBox.SelectedIndex < 0 && adapterComboBox.Items.Count > 0)
+			{
+				adapterComboBox.SelectedIndex = 0;
+			}
+		}
+
+		void Localize()
+		{
+		}
+
+		public void Closing()
+		{
+		}
+
+		public void Unlock()
+		{
+			nameTextBox.Enabled = true;
+			adapterComboBox.Enabled = true;
+		}
+
+		public CfgUpdateFlags VerifyCfg(ref string message)
+		{
+            CfgUpdateFlags flags = CfgUpdateFlags.None;
+
+			if (!adapterComboBox.Items.Contains(adapterComboBox.Text))
+			{
+				flags = CfgUpdateFlags.Error;
+				message += Environment.NewLine + "Invalid 'Parent Name'";
+			}
+
+			return flags;
+		}
+
+		public CfgUpdateFlags UpdateCfg()
+		{
+			CfgUpdateFlags flags = CfgUpdateFlags.RestartRqrd;
+
+			if (config == null) return CfgUpdateFlags.Error;	/// Control was not loaded, settings were not changed
+
+			config.Name = nameTextBox.Text;
+
+			/// Network adapter
+			string strAdapter = adapterComboBox.Text;
+			int iDash = strAdapter.IndexOf(" - ");
+			config.Description = iDash < 0 ? "" : strAdapter.Substring(iDash + 3);
+
+			return flags;
+		}
+	}
+}

TBF/Rig/Network/AdapterJMS/NetadapterCfgCtrl.designer.cs

@@ -0,0 +1,109 @@
+///
+/// Copyright (c) 2017 Sensus Metering Systems
+///
+namespace TBF.Rig.Network.AdapterJMS
+{
+	partial class NetadapterCfgCtrl
+	{
+		/// <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 Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.nameTextBox = new System.Windows.Forms.TextBox();
+			this.nameLabel = new System.Windows.Forms.Label();
+			this.classNameLabel = new System.Windows.Forms.Label();
+			this.adapterLabel = new System.Windows.Forms.Label();
+			this.adapterComboBox = new System.Windows.Forms.ComboBox();
+			this.SuspendLayout();
+			// 
+			// nameTextBox
+			// 
+			this.nameTextBox.Enabled = false;
+			this.nameTextBox.Location = new System.Drawing.Point(101, 50);
+			this.nameTextBox.Name = "nameTextBox";
+			this.nameTextBox.Size = new System.Drawing.Size(114, 20);
+			this.nameTextBox.TabIndex = 5;
+			// 
+			// nameLabel
+			// 
+			this.nameLabel.AutoSize = true;
+			this.nameLabel.Location = new System.Drawing.Point(9, 53);
+			this.nameLabel.Name = "nameLabel";
+			this.nameLabel.Size = new System.Drawing.Size(35, 13);
+			this.nameLabel.TabIndex = 4;
+			this.nameLabel.Text = "Name";
+			// 
+			// classNameLabel
+			// 
+			this.classNameLabel.AutoSize = true;
+			this.classNameLabel.Location = new System.Drawing.Point(98, 24);
+			this.classNameLabel.Name = "classNameLabel";
+			this.classNameLabel.Size = new System.Drawing.Size(83, 13);
+			this.classNameLabel.TabIndex = 3;
+			this.classNameLabel.Text = "ComonentName";
+			// 
+			// adapterLabel
+			// 
+			this.adapterLabel.AutoSize = true;
+			this.adapterLabel.Location = new System.Drawing.Point(9, 80);
+			this.adapterLabel.Name = "adapterLabel";
+			this.adapterLabel.Size = new System.Drawing.Size(44, 13);
+			this.adapterLabel.TabIndex = 6;
+			this.adapterLabel.Text = "Adapter";
+			// 
+			// adapterComboBox
+			// 
+			this.adapterComboBox.Enabled = false;
+			this.adapterComboBox.Location = new System.Drawing.Point(101, 77);
+			this.adapterComboBox.Name = "adapterComboBox";
+			this.adapterComboBox.Size = new System.Drawing.Size(333, 21);
+			this.adapterComboBox.TabIndex = 7;
+			// 
+			// NetadapterCfgCtrl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.Controls.Add(this.adapterComboBox);
+			this.Controls.Add(this.adapterLabel);
+			this.Controls.Add(this.nameTextBox);
+			this.Controls.Add(this.nameLabel);
+			this.Controls.Add(this.classNameLabel);
+			this.Name = "NetadapterCfgCtrl";
+			this.Size = new System.Drawing.Size(450, 300);
+			this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.TextBox nameTextBox;
+		private System.Windows.Forms.Label nameLabel;
+		private System.Windows.Forms.Label classNameLabel;
+		private System.Windows.Forms.Label adapterLabel;
+		private System.Windows.Forms.ComboBox adapterComboBox;
+	}
+}

TBF/Rig/Network/Camera/CJMS11/CameraCfg.cs

@@ -0,0 +1,74 @@
+///
+/// Copyright (c) 2017 Sensus Metering Systems
+///
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+using System.Xml.Serialization;
+using Common;
+using TBF.Rig.Generic;
+using TBF.Resources;
+
+namespace TBF.Rig.Network.Camera.CJMS11
+{
+	public enum TestImagesMode
+	{
+		None,
+		SaveFirstImages,
+		SaveLastImages,
+		LoadImages,
+		Count,
+        Invalid,
+	}
+
+	public class CameraCfg : ComponentCfgBase, IChildComponentCfg
+	{
+		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(CameraCfg) })[0];
+		public override XmlSerializer GetSerializer() { return Serializer; }
+
+		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new CameraCfgCtrl(); }
+
+		///
+		/// Serialized parameters 
+		///
+		public int HardwareAddress;
+		public bool DisplayTerminal;
+
+		[XmlIgnore]
+		public TestImagesMode TestImagesMode;
+
+		[XmlIgnore]
+		public int TestImagesCount;
+
+		public string IPAddressCJMS;
+
+
+		/// Private parameterless constructor invoked by all other (public) constructors
+		CameraCfg() { }
+
+        public CameraCfg(string name, IComponentFactory factory)
+            : this()
+        {
+			Name = name;
+			Factory = factory;
+			ParentName = "Network.Adapter";
+			HardwareAddress = 1;
+			TestImagesMode = TestImagesMode.None;
+			TestImagesCount = 3000;
+            DebugLevel = DebugMode.AutoDetect;
+            IPAddressCJMS = "192.168.1.100";
+        }
+
+		public string ToString(int i)
+		{
+			return string.Format("Name={0}, s/n={1}, Terminal={2}, TestImagesMode={3}, TestImagesCount={4}, Parent={5}, IPAddressCJMS={6}",
+								 Name,
+                                 HardwareAddress,
+								 DisplayTerminal ? Strings.yes : Strings.no,
+								 TestImagesMode,
+								 TestImagesCount,
+								 ParentName, 
+								 IPAddressCJMS);
+		}
+	}
+}

TBF/Rig/Network/Camera/CJMS11/CameraCfgCtrl.cs

@@ -0,0 +1,276 @@
+///
+/// Copyright (c) 2017 Sensus Metering Systems
+///
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
+using Castle.Components.DictionaryAdapter.Xml;
+using Common;
+using Config.Entities;
+using log4net;
+using TBF.Rig.Generic;
+using TBF.Resources;
+using TBF.Rig.Network.Adapter;
+using TBF.UI.Bench.Components;
+
+namespace TBF.Rig.Network.Camera.CJMS11
+{
+    public partial class CameraCfgCtrl : UserControl, IComponentCfgCtrl
+    {
+        static readonly ILog log = LogManager.GetLogger(typeof(CameraCfgCtrl));
+        ComponentParametersDlg parent;
+        
+        private bool isIPCalculated = false;
+
+        public bool ShowMore
+        {
+            get { return false; }
+        }
+
+        CameraCfg config;
+
+        public IComponentCfg Config
+        {
+            get { return config as IComponentCfg; }
+            set
+            {
+                config = value as CameraCfg;
+                Redraw();
+            }
+        }
+
+        public CameraCfgCtrl()
+        {
+            InitializeComponent();
+        }
+
+        private void PumpCfgCtrl_Load(object sender, EventArgs e)
+        {
+            Localize();
+
+            parent = ParentForm as ComponentParametersDlg;
+            if (parent == null) return;
+
+            if (parent.CmpntEntities != null)
+            {
+                foreach (var cmpnt in parent.CmpntEntities)
+                {
+                    if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is TBF.Rig.Network.AdapterJMS.Factory)
+                    {
+                        parentNameComboBox.Items.Add(cmpnt.Name);
+                    }
+                }
+            }
+
+            for (TestImagesMode mode = 0; mode < TestImagesMode.Count; mode++)
+            {
+                testImagesModeComboBox.Items.Add(mode.ToString());
+            }
+
+            Redraw();
+        }
+
+        void Localize()
+        {
+            nameLabel.Text = Strings.Name;
+            parentNameLabel.Text = Strings.Parent_name;
+            hwAddressLabel.Text = Strings.Serial_number;
+        }
+
+        public void Closing()
+        {
+        }
+
+        void Redraw()
+        {
+            if (config == null) return; /// Control was not loaded, settings were not changed
+
+            classNameLabel.Text = config.Factory.ClassName;
+            nameTextBox.Text = config.Name;
+            parentNameComboBox.Text = string.IsNullOrEmpty(config.ParentName) ? "---" : config.ParentName;
+            hwAddressTextBox.Text = config.HardwareAddress.ToString();
+            displayTerminalCheckBox.Checked = config.DisplayTerminal;
+            testImagesModeComboBox.Text = config.TestImagesMode.ToString();
+            testImagesCountTextBox.Text = config.TestImagesCount.ToString();
+            if (!(isIPCalculated && (config.IPAddressCJMS == null || config.IPAddressCJMS.Equals(""))))
+            {
+                ipAddressTextBox.Text = config.IPAddressCJMS;
+            }
+        }
+
+        public void Unlock()
+        {
+            nameTextBox.Enabled = true;
+            parentNameComboBox.Enabled = true;
+            hwAddressTextBox.Enabled = true;
+            displayTerminalCheckBox.Enabled = true;
+            testImagesModeComboBox.Enabled = true;
+            testImagesCountTextBox.Enabled = true;
+            ipAddressTextBox.Enabled = true;
+        }
+
+        public CfgUpdateFlags VerifyCfg(ref string message)
+        {
+            CfgUpdateFlags flags = CfgUpdateFlags.None;
+
+            int dummy;
+            if (!parentNameComboBox.Items.Contains(parentNameComboBox.Text))
+            {
+                flags |= CfgUpdateFlags.Error;
+                message += Environment.NewLine + string.Format(Strings.Invalid_0, parentNameLabel.Text);
+            }
+
+            if (!int.TryParse(hwAddressTextBox.Text, out dummy) || dummy % 100 > 63)
+            {
+                flags |= CfgUpdateFlags.Error;
+                message += Environment.NewLine + string.Format(Strings.Invalid_0, hwAddressLabel.Text);
+            }
+
+            TestImagesMode newTestImagesMode = TestImagesMode.Invalid;
+            for (TestImagesMode mode = 0; mode < TestImagesMode.Count; mode++)
+            {
+                if (testImagesModeComboBox.Text == mode.ToString()) newTestImagesMode = mode;
+            }
+
+            if (newTestImagesMode == TestImagesMode.Invalid)
+            {
+                flags |= CfgUpdateFlags.Error;
+                message += Environment.NewLine + string.Format(Strings.Invalid_0, testImagesModeLabel.Text);
+            }
+
+            if (!int.TryParse(testImagesCountTextBox.Text, out dummy) || dummy < 0 || dummy > 3000
+                || ((dummy == 0) && (newTestImagesMode != TestImagesMode.None)))
+            {
+                flags |= CfgUpdateFlags.Error;
+                message += Environment.NewLine + string.Format(Strings.Invalid_0, testImagesCountLabel.Text);
+            }
+
+
+            return flags;
+        }
+
+        public CfgUpdateFlags UpdateCfg()
+        {
+            CfgUpdateFlags flags = CfgUpdateFlags.None;
+
+            if (config == null) return CfgUpdateFlags.Error; /// Control was not loaded, settings were not changed
+
+            string newParentName = parentNameComboBox.Text.Equals("---") ? string.Empty : parentNameComboBox.Text;
+            int newHWAddress = int.Parse(hwAddressTextBox.Text);
+            TestImagesMode newTestImagesMode = 0;
+            for (TestImagesMode mode = 0; mode < TestImagesMode.Count; mode++)
+            {
+                if (testImagesModeComboBox.Text == mode.ToString()) newTestImagesMode = mode;
+            }
+
+            int newTestImagesCount = int.Parse(testImagesCountTextBox.Text);
+
+
+            if (config.Name != nameTextBox.Text ||
+                config.ParentName != newParentName ||
+                config.HardwareAddress != newHWAddress ||
+                config.DisplayTerminal != displayTerminalCheckBox.Checked || 
+                (config.IPAddressCJMS != ipAddressTextBox.Text && !ipAddressTextBox.Text.Contains("?"))
+                )
+            {
+                config.Name = nameTextBox.Text;
+                config.ParentName = newParentName;
+                config.HardwareAddress = newHWAddress;
+                config.DisplayTerminal = displayTerminalCheckBox.Checked;
+                if (!ipAddressTextBox.Text.Contains("?"))
+                {
+                    config.IPAddressCJMS = ipAddressTextBox.Text;
+                }
+
+                flags |= (CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
+            }
+
+
+            if (config.TestImagesMode != newTestImagesMode ||
+                config.TestImagesCount != newTestImagesCount)
+            {
+                config.TestImagesMode = newTestImagesMode;
+                config.TestImagesCount = newTestImagesCount;
+
+                flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.VolatileChange);
+            }
+
+            if ((flags & CfgUpdateFlags.InvokeCfgChange) != 0)
+            {
+                Camera.OnCfgChange(this, new CfgChangeArgs(CfgChangeCmd.CfgChange, config));
+            }
+
+            return flags;
+        }
+
+        
+        private void parentNameComboBox_TextChanged(object sender, EventArgs e)
+        {
+            if (parent == null) return;
+
+            if (parent.CmpntEntities != null)
+            {
+                foreach (var cmpnt in parent.CmpntEntities)
+                {
+                    IComponentFactory cmpntFactoryFromClassName =
+                        TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName);
+                    if (cmpntFactoryFromClassName is TBF.Rig.Network.Adapter.Factory)
+                    {
+                        NetadapterCfg netadapterCfg =
+                            cmpntFactoryFromClassName.CmpntCfgFromCmpntEntity(cmpnt) as NetadapterCfg;
+                        string adapterDescription = netadapterCfg.Description;
+                        AdapterInfo netadapter = AdapterInfo.GetNetAdapter(adapterDescription);
+                        ipAddressAdapterTextBox.Text = netadapter.IPAddress.ToString();
+                        if (config.IPAddressCJMS == null || config.IPAddressCJMS.Equals(""))
+                        {
+                            ipAddressTextBox.Text = getAdatpterIP(netadapter);
+                        }
+                        
+                        isIPCalculated = true;
+                        break;
+                    }
+                }
+            }
+        }
+
+        private string getAdatpterIP(AdapterInfo netadapter)
+        {
+            List<string> ipSegments = GetIPAddressInSegments(netadapter.IPAddress.ToString());
+
+            string address = string.Format(
+                "{0}.{1}.{2}.???",
+                ipSegments[0],
+                ipSegments[1],
+                ipSegments[2]
+                );
+           
+            return address;
+        }
+
+        private List<string> GetIPAddressInSegments(string ipAddress)
+        {
+            List<string> ipAddressSegments = new List<string>();
+            // Regular expression to match IPv4 and capture 4 segments
+            string pattern = @"^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$";
+
+            Match match = Regex.Match(ipAddress, pattern);
+
+            if (match.Success)
+            {
+                ipAddressSegments.Add(match.Groups[1].Value);
+                ipAddressSegments.Add(match.Groups[2].Value);
+                ipAddressSegments.Add(match.Groups[3].Value);
+                ipAddressSegments.Add(match.Groups[4].Value);
+            }
+            else
+            {
+                log.Error("Invalid IP address format.");
+            }
+
+            return ipAddressSegments;
+        }
+    }
+}

TBF/Rig/Network/Camera/CJMS11/CameraCfgCtrl.designer.cs

@@ -0,0 +1,260 @@
+///
+/// Copyright (c) 2017 Sensus Metering Systems
+///
+namespace TBF.Rig.Network.Camera.CJMS11
+{
+	partial class CameraCfgCtrl
+	{
+		/// <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 Component Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.hwAddressTextBox = new System.Windows.Forms.TextBox();
+			this.hwAddressLabel = new System.Windows.Forms.Label();
+			this.parentNameLabel = new System.Windows.Forms.Label();
+			this.nameTextBox = new System.Windows.Forms.TextBox();
+			this.nameLabel = new System.Windows.Forms.Label();
+			this.classNameLabel = new System.Windows.Forms.Label();
+			this.parentNameComboBox = new System.Windows.Forms.ComboBox();
+			this.displayTerminalCheckBox = new System.Windows.Forms.CheckBox();
+			this.testImagesCountTextBox = new System.Windows.Forms.TextBox();
+			this.testImagesCountLabel = new System.Windows.Forms.Label();
+			this.testImagesModeComboBox = new System.Windows.Forms.ComboBox();
+			this.testImagesModeLabel = new System.Windows.Forms.Label();
+			this.ipAddressTextBox = new System.Windows.Forms.TextBox();
+			this.iPAddressLabel = new System.Windows.Forms.Label();
+			this.ipAddressAdapterTextBox = new System.Windows.Forms.TextBox();
+			this.label1 = new System.Windows.Forms.Label();
+			this.SuspendLayout();
+			// 
+			// hwAddressTextBox
+			// 
+			this.hwAddressTextBox.Enabled = false;
+			this.hwAddressTextBox.Location = new System.Drawing.Point(198, 209);
+			this.hwAddressTextBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+			this.hwAddressTextBox.Name = "hwAddressTextBox";
+			this.hwAddressTextBox.Size = new System.Drawing.Size(193, 26);
+			this.hwAddressTextBox.TabIndex = 6;
+			// 
+			// hwAddressLabel
+			// 
+			this.hwAddressLabel.AutoSize = true;
+			this.hwAddressLabel.Location = new System.Drawing.Point(42, 213);
+			this.hwAddressLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.hwAddressLabel.Name = "hwAddressLabel";
+			this.hwAddressLabel.Size = new System.Drawing.Size(107, 20);
+			this.hwAddressLabel.TabIndex = 5;
+			this.hwAddressLabel.Text = "Serial number";
+			// 
+			// parentNameLabel
+			// 
+			this.parentNameLabel.AutoSize = true;
+			this.parentNameLabel.Location = new System.Drawing.Point(42, 106);
+			this.parentNameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.parentNameLabel.Name = "parentNameLabel";
+			this.parentNameLabel.Size = new System.Drawing.Size(100, 20);
+			this.parentNameLabel.TabIndex = 3;
+			this.parentNameLabel.Text = "Parent name";
+			// 
+			// nameTextBox
+			// 
+			this.nameTextBox.Enabled = false;
+			this.nameTextBox.Location = new System.Drawing.Point(198, 63);
+			this.nameTextBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+			this.nameTextBox.Name = "nameTextBox";
+			this.nameTextBox.Size = new System.Drawing.Size(193, 26);
+			this.nameTextBox.TabIndex = 2;
+			// 
+			// nameLabel
+			// 
+			this.nameLabel.AutoSize = true;
+			this.nameLabel.Location = new System.Drawing.Point(42, 68);
+			this.nameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.nameLabel.Name = "nameLabel";
+			this.nameLabel.Size = new System.Drawing.Size(51, 20);
+			this.nameLabel.TabIndex = 1;
+			this.nameLabel.Text = "Name";
+			// 
+			// classNameLabel
+			// 
+			this.classNameLabel.AutoSize = true;
+			this.classNameLabel.Location = new System.Drawing.Point(194, 26);
+			this.classNameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.classNameLabel.Name = "classNameLabel";
+			this.classNameLabel.Size = new System.Drawing.Size(125, 20);
+			this.classNameLabel.TabIndex = 0;
+			this.classNameLabel.Text = "ComonentName";
+			// 
+			// parentNameComboBox
+			// 
+			this.parentNameComboBox.Enabled = false;
+			this.parentNameComboBox.FormattingEnabled = true;
+			this.parentNameComboBox.Location = new System.Drawing.Point(198, 102);
+			this.parentNameComboBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+			this.parentNameComboBox.Name = "parentNameComboBox";
+			this.parentNameComboBox.Size = new System.Drawing.Size(193, 28);
+			this.parentNameComboBox.TabIndex = 4;
+			this.parentNameComboBox.TextChanged += new System.EventHandler(this.parentNameComboBox_TextChanged);
+			// 
+			// displayTerminalCheckBox
+			// 
+			this.displayTerminalCheckBox.AutoSize = true;
+			this.displayTerminalCheckBox.Enabled = false;
+			this.displayTerminalCheckBox.Location = new System.Drawing.Point(200, 255);
+			this.displayTerminalCheckBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+			this.displayTerminalCheckBox.Name = "displayTerminalCheckBox";
+			this.displayTerminalCheckBox.Size = new System.Drawing.Size(146, 24);
+			this.displayTerminalCheckBox.TabIndex = 7;
+			this.displayTerminalCheckBox.Text = "Display terminal";
+			this.displayTerminalCheckBox.UseVisualStyleBackColor = true;
+			// 
+			// testImagesCountTextBox
+			// 
+			this.testImagesCountTextBox.Enabled = false;
+			this.testImagesCountTextBox.Location = new System.Drawing.Point(198, 335);
+			this.testImagesCountTextBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+			this.testImagesCountTextBox.Name = "testImagesCountTextBox";
+			this.testImagesCountTextBox.Size = new System.Drawing.Size(67, 26);
+			this.testImagesCountTextBox.TabIndex = 12;
+			// 
+			// testImagesCountLabel
+			// 
+			this.testImagesCountLabel.AutoSize = true;
+			this.testImagesCountLabel.Location = new System.Drawing.Point(42, 339);
+			this.testImagesCountLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.testImagesCountLabel.Name = "testImagesCountLabel";
+			this.testImagesCountLabel.Size = new System.Drawing.Size(139, 20);
+			this.testImagesCountLabel.TabIndex = 11;
+			this.testImagesCountLabel.Text = "Test images count";
+			// 
+			// testImagesModeComboBox
+			// 
+			this.testImagesModeComboBox.Enabled = false;
+			this.testImagesModeComboBox.FormattingEnabled = true;
+			this.testImagesModeComboBox.Location = new System.Drawing.Point(198, 295);
+			this.testImagesModeComboBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+			this.testImagesModeComboBox.Name = "testImagesModeComboBox";
+			this.testImagesModeComboBox.Size = new System.Drawing.Size(193, 28);
+			this.testImagesModeComboBox.TabIndex = 14;
+			// 
+			// testImagesModeLabel
+			// 
+			this.testImagesModeLabel.AutoSize = true;
+			this.testImagesModeLabel.Location = new System.Drawing.Point(42, 299);
+			this.testImagesModeLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.testImagesModeLabel.Name = "testImagesModeLabel";
+			this.testImagesModeLabel.Size = new System.Drawing.Size(139, 20);
+			this.testImagesModeLabel.TabIndex = 13;
+			this.testImagesModeLabel.Text = "Test images mode";
+			// 
+			// ipAddressTextBox
+			// 
+			this.ipAddressTextBox.Enabled = false;
+			this.ipAddressTextBox.Location = new System.Drawing.Point(198, 176);
+			this.ipAddressTextBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+			this.ipAddressTextBox.Name = "ipAddressTextBox";
+			this.ipAddressTextBox.Size = new System.Drawing.Size(193, 26);
+			this.ipAddressTextBox.TabIndex = 15;
+			// 
+			// iPAddressLabel
+			// 
+			this.iPAddressLabel.AutoSize = true;
+			this.iPAddressLabel.Location = new System.Drawing.Point(42, 176);
+			this.iPAddressLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.iPAddressLabel.Name = "iPAddressLabel";
+			this.iPAddressLabel.Size = new System.Drawing.Size(89, 20);
+			this.iPAddressLabel.TabIndex = 16;
+			this.iPAddressLabel.Text = "IP address:";
+			// 
+			// ipAddressAdapterTextBox
+			// 
+			this.ipAddressAdapterTextBox.Enabled = false;
+			this.ipAddressAdapterTextBox.Location = new System.Drawing.Point(200, 140);
+			this.ipAddressAdapterTextBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+			this.ipAddressAdapterTextBox.Name = "ipAddressAdapterTextBox";
+			this.ipAddressAdapterTextBox.Size = new System.Drawing.Size(193, 26);
+			this.ipAddressAdapterTextBox.TabIndex = 17;
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(42, 140);
+			this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(150, 20);
+			this.label1.TabIndex = 18;
+			this.label1.Text = "Adapter IP address:";
+			// 
+			// CameraCfgCtrl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.ipAddressAdapterTextBox);
+			this.Controls.Add(this.iPAddressLabel);
+			this.Controls.Add(this.ipAddressTextBox);
+			this.Controls.Add(this.testImagesModeComboBox);
+			this.Controls.Add(this.testImagesModeLabel);
+			this.Controls.Add(this.hwAddressTextBox);
+			this.Controls.Add(this.hwAddressLabel);
+			this.Controls.Add(this.testImagesCountTextBox);
+			this.Controls.Add(this.testImagesCountLabel);
+			this.Controls.Add(this.displayTerminalCheckBox);
+			this.Controls.Add(this.parentNameComboBox);
+			this.Controls.Add(this.parentNameLabel);
+			this.Controls.Add(this.nameTextBox);
+			this.Controls.Add(this.nameLabel);
+			this.Controls.Add(this.classNameLabel);
+			this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+			this.Name = "CameraCfgCtrl";
+			this.Size = new System.Drawing.Size(603, 391);
+			this.Load += new System.EventHandler(this.PumpCfgCtrl_Load);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+		}
+
+		private System.Windows.Forms.Label label1;
+
+		private System.Windows.Forms.TextBox ipAddressAdapterTextBox;
+
+		private System.Windows.Forms.TextBox ipAddressTextBox;
+		private System.Windows.Forms.Label iPAddressLabel;
+
+		#endregion
+
+		private System.Windows.Forms.TextBox hwAddressTextBox;
+		private System.Windows.Forms.Label hwAddressLabel;
+		private System.Windows.Forms.Label parentNameLabel;
+		private System.Windows.Forms.TextBox nameTextBox;
+		private System.Windows.Forms.Label nameLabel;
+        private System.Windows.Forms.Label classNameLabel;
+		private System.Windows.Forms.ComboBox parentNameComboBox;
+		private System.Windows.Forms.CheckBox displayTerminalCheckBox;
+		private System.Windows.Forms.TextBox testImagesCountTextBox;
+		private System.Windows.Forms.Label testImagesCountLabel;
+		private System.Windows.Forms.ComboBox testImagesModeComboBox;
+		private System.Windows.Forms.Label testImagesModeLabel;
+	}
+}

TBF/Rig/Network/Camera/CJMS11/CameraCfgCtrl.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 

TBF/Rig/Network/Camera/CJMS11/Factory.cs

@@ -0,0 +1,25 @@
+///
+/// Copyright (c) 2017 Sensus Metering Systems
+///
+using System.Collections.Generic;
+using TBF.Rig.Generic;
+
+namespace TBF.Rig.Network.Camera.CJMS11
+{
+	public class Factory : IComponentFactory
+	{
+		public string ClassName { get { return GetType().Namespace.Substring(8); } }
+        public override string ToString() { return ClassName; }
+
+		public IComponent DummyComponent() { return new Camera(); }
+
+		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Camera(cfg, components); }
+
+		public IComponentCfg DefaultConfig() { return new CameraCfg(this.GetType().Namespace.Substring(8), this); }
+
+		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
+		{
+			return ComponentCfgBase.CreateFromDbEntity(CameraCfg.Serializer, component, this);
+		}
+	}
+}

TBF/Rig/Network/Camera/CJMS11/GrabImagesOp.cs

@@ -0,0 +1,178 @@
+///
+/// Copyright (c) 2017 Sensus Slovensko a.s.
+///
+using System;
+using System.Diagnostics;
+using System.Drawing;
+using log4net;
+using Common;
+using Config.Entities;
+using TBF.Rig.Network.Telnet;
+using System.IO;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace TBF.Rig.Network.Camera.CJMS11
+{
+	public class GrabImagesOp : IOperation
+	{
+		/// TODO: Implement support for grabbing multiple images, now imgFileNames.Lenght should be 1
+		
+		private static readonly ILog log = LogManager.GetLogger(typeof(GrabImagesOp));
+		public override string ToString() { return string.Format("GrabImageOp()"); }
+
+		readonly Camera camera;
+		
+		readonly string[] imgFileNames;
+		readonly bool blackAndWhite;
+		readonly bool lowResolution;
+		readonly ImageRotation imageRotation;
+
+		string command;
+		bool grabImageCommandSent;
+		string response;
+		bool grabPassed;
+		bool grabFailed;
+		bool transferringGrabbedImage;
+		
+		Image grabedImage;
+
+
+		/// <summary>
+		/// Events:  Event.None or Event.Error
+		/// </summary>
+		/// <param name="camera">CLP1611.Camera reference</param>
+		public GrabImagesOp(Camera camera, string[] imgFileNames, bool blackAndWhite, bool lowResolution, ImageRotation imageRotation)
+		{
+			/// TODO: Implement support for grabbing multiple images, now imgFileNames.Lenght should be 1
+
+			this.camera = camera;
+			//this.telnet = camera.Telnet;
+			this.imgFileNames = imgFileNames;
+			this.blackAndWhite = blackAndWhite;
+			this.lowResolution = lowResolution;
+			this.imageRotation = imageRotation;
+
+			grabImageCommandSent = false;
+			transferringGrabbedImage = false;
+
+            if (camera.DebugLevel == DebugMode.Normal || camera.DebugLevel == DebugMode.DetectedOn)
+            {
+	            Camera.ImageCameraHandler += ImageReceived;
+            }
+            //TODO BUMI improve by simulate image
+            Camera.ImageCameraHandler += ImageReceived;
+		}
+
+		void PromptReceived(object sndr, PromptReceivedJMSEventArgs a)
+		{
+			response = a.Response;
+		}
+
+		void ImageReceived(object sndr, PromptReceivedImageEventArgs a)
+		{
+			if(a.idxCamera != camera.CameraIdx) return;
+			grabedImage = a.image;
+			grabPassed = true;
+		}
+
+
+		public void Start()
+		{
+			grabImageCommandSent = false;
+			transferringGrabbedImage = false;
+			grabPassed = false;
+			grabedImage = null;
+
+            if ((imgFileNames != null) && (imgFileNames.Length > 0) && File.Exists(imgFileNames[0]))
+            {
+                ///
+                /// An image specified, (1) delete previous image, (2) check if this is a simulation
+                ///
+                File.Delete(imgFileNames[0]);
+
+               /* if (camera.CameraCfg.DebugLevel == DebugMode.Simulate || camera.CameraCfg.DebugLevel == DebugMode.DetectedOff)
+                {
+                    ///
+                    /// Camera is in simulation mode => create a simulated image
+                    ///
+                    File.Copy(string.Format("{0}\\Pictures\\sample.jpg", Program.ExecutableDir), imgFileNames[0]);
+                }*/
+            }
+		}
+
+		public Event Run()
+		{
+            if ((imgFileNames == null) || (imgFileNames.Length < 1) || (imgFileNames[0] == null))
+			{
+                ///
+                /// No images to be grabbed => Done
+                ///
+                return Event.GrabPassed;
+			}
+            /*else if (camera.CameraCfg.DebugLevel == DebugMode.Simulate ||
+                     camera.CameraCfg.DebugLevel == DebugMode.DetectedOff)
+            {
+                ///
+                /// Camera is in simulation mode => create a simulated image and complete
+                ///
+                return Event.GrabPassed;
+            }*/
+            else if (camera.IsGrabImageListenerThreadAlive)
+            {
+	            return Event.CameraBusy;
+            }
+            else if (!grabImageCommandSent)
+			{
+                ///
+                /// Normal operation, no command sent yet => (1) wait until telnet state = Inactive, (2) send a command
+                ///
+                camera.StartGrabImageListener();
+                grabImageCommandSent = true;
+				return Event.CameraBusy;
+			}
+			else if (grabPassed)
+			{
+                ///
+                /// Normal operation, grab passed => transfer/transferring the image
+                
+                
+                if (transferringGrabbedImage)
+				{
+					/// Grab passed and image transfer is in progress
+					return Event.GrabPassed;
+				}
+                else if (camera.IsSaveImageListenerThreadAlive)
+                {
+	                /// Wait until the previous image transfer completes
+	                return Event.CameraBusy;
+                }
+				else //if (0 == camera.DownloadFile(blackAndWhite ? "grabbed.jpg" : "grabbed.bmp", imgFileNames[0]))
+				{
+					camera.StartSaveImageToFileListener(grabedImage, imgFileNames[0]);
+					/// File transfer successfully started
+					transferringGrabbedImage = true;
+					return Event.GrabPassed;
+				}
+			}
+			else 
+			{
+                ///
+                /// Normal operation, grab failed => there in no image to transfer
+                /// 
+				return Event.GrabFailed;
+			}
+			
+		}
+
+		public void Stop()
+		{
+			//if (camera.CameraCfg.DebugLevel == DebugMode.Simulate) return;
+
+			if (camera.IsGrabImageListenerThreadAlive)
+			{
+				camera.SetStopGrabImageListenerFlag();
+			}
+		}
+	}
+}

TBF/Rig/Network/Camera/CJMS11/JmsMessage.cs

@@ -0,0 +1,72 @@
+using TBF.Rig.Network.Camera.CJMS11.POJO;
+
+namespace TBF.Rig.Network.Camera.CJMS11
+{
+    public class JmsMessage
+    {
+        private POJO.MessageStatus status;
+        private CommandM command;
+        private string payload;
+        
+        private string orig_status;
+        private string orig_command;
+        private string orig_payload;
+
+        public POJO.MessageStatus Status
+        {
+            get => status;
+            set => status = value;
+        }
+
+        public CommandM Command
+        {
+            get => command;
+            set => command = value;
+        }
+
+        public string Payload
+        {
+            get => payload;
+            set => payload = value;
+        }
+
+        public string OrigStatus => orig_status;
+
+        public string OrigCommand => orig_command;
+
+        public string OrigPayload => orig_payload;
+
+        public JmsMessage(string status, string command, string payload)
+        {
+            this.status = MessageStatusEnum.GetCommandM(status);
+            this.command = CommandMEnum.GetCommandM(command);
+            
+            orig_status = status;
+            orig_command = command;
+            orig_payload = payload;
+            this.payload = payload;
+        }
+        
+        public bool isMessageImageType(){
+            return this.command == CommandM.grab_image_;
+        }
+
+        public ParsedImage getImage(){
+            if(isMessageImageType()){
+                return JmsPacket.ImageParser(this.payload);
+            }
+            return null;
+        }
+
+        public override string ToString()
+        {
+            return string.Format( "status:{0}, command:{1}, payload:{2}, orig_status:{3}, orig_command:{4}, orig_payload:{5}",
+            status,
+            command,
+            payload,
+            orig_status,
+            orig_command,
+            orig_payload);
+        }
+    }
+}

TBF/Rig/Network/Camera/CJMS11/JmsPacket.cs

@@ -0,0 +1,98 @@
+using System;
+using System.Text.RegularExpressions;
+using log4net;
+using TBF.Rig.Network.Camera.CJMS11.POJO;
+
+namespace TBF.Rig.Network.Camera.CJMS11
+{
+    public class JmsPacket
+    {
+        private static readonly ILog log = LogManager.GetLogger(typeof(JmsPacket));
+
+        private JmsMessage jmsMessage;
+        private string messageOrigin;
+
+        public string MessageOrigin { get => messageOrigin; }
+
+        public JmsMessage JmsMessage
+        {
+            get => jmsMessage;
+            set => jmsMessage = value;
+        }
+
+        public JmsPacket(string message)
+        {
+            messageOrigin = message;
+
+            try
+            {
+                if (ParseMessage(messageOrigin))
+                {
+                    //success
+                }
+
+            }
+            catch (Exception e)
+            {
+                log.Error("Error parsing message: " + e.Message);
+            }
+        }
+
+        private bool ParseMessage(string message) 
+        {
+            message = message.Trim();
+            if (message.Length < 1) return false;
+            
+            this.jmsMessage = JmsMessageFromString(message);
+            
+            return true;
+        }
+
+        public static JmsMessage JmsMessageFromString(string message)
+        {
+            // Equivalent regex pattern
+            var pattern = new Regex(@"^(ACK|NACK):\s*(\S+)\s*(?:~(.*)~)?\s*END$", RegexOptions.Singleline);
+
+            var match = pattern.Match(message);
+            if (match.Success)
+            {
+                string status = match.Groups[1].Value;
+                string commandStr = match.Groups[2].Value;
+                string payload = match.Groups[3].Success ? match.Groups[3].Value : "";
+
+                return new JmsMessage(status, commandStr, payload);
+            }
+            else
+            {
+                throw new ArgumentException($"Message format not recognized: {message}");
+            }
+
+            return null;
+        }
+
+        public static ParsedImage ImageParser(string payloadImage)
+        {
+            // Equivalent regex pattern
+            var imagePattern = new Regex(@"IMAGE:([A-Z0-9_]+):\s*(.*?)\s*~IMAGE_END", RegexOptions.Singleline);
+
+            var match = imagePattern.Match(payloadImage);
+            if (match.Success)
+            {
+                string encoding = match.Groups[1].Value;
+                string imageData = match.Groups[2].Value;
+
+                return new ParsedImage(ImageTypeEnum.GetCommandM(encoding), imageData);
+            }
+            else
+            {
+                throw new ArgumentException($"Payload does not match expected image format: {payloadImage}");
+            }
+        }
+
+        public override string ToString()
+        {
+            return string.Format("JmsPacket -> original message: {0} -> JmsMessage: {1}", messageOrigin, jmsMessage.ToString());
+        }
+    }
+    
+}

TBF/Rig/Network/Camera/CJMS11/LiveStreamOp.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Diagnostics;
+using log4net;
+using Common;
+using TBF.Rig.Network.Telnet;
+
+namespace TBF.Rig.Network.Camera.CJMS11
+{
+	public class LiveStreamOp : IOperation
+	{
+        private static readonly ILog log = LogManager.GetLogger(typeof(LiveStreamOp));
+        
+        readonly Camera camera;
+		readonly Telnet.TelnetClient telnet;
+		readonly string command;
+
+		bool liveStreamCommandSent;
+
+		/// <summary>
+		/// Events:  Event.None or Event.Error
+		/// </summary>
+		/// <param name="camera">CLP1611.Camera reference</param>
+		public LiveStreamOp(Camera camera, string command)
+		{
+			this.camera = camera;
+			this.command = command;
+		}
+
+
+		public void Start()
+		{
+			liveStreamCommandSent = false;
+		}
+
+		public Event Run()
+		{
+			if (camera.CameraCfg.DebugLevel == DebugMode.Simulate) return Event.None;
+
+			log.DebugFormat("Run(): telnet.State = {0}, liveStreamCommandSent = {1}", telnet.State, liveStreamCommandSent);
+
+			if (!liveStreamCommandSent)
+			{
+				if (camera.Running && (telnet.State == TelnetClient.TelnetState.Inactive))
+				{
+					telnet.Enqueue(new Telnet.Command(Telnet.CmdAction.SEND_STRING, command));
+					liveStreamCommandSent = true;
+					log.WarnFormat("{0} IP={1} command={2}", camera.Name, camera.IPAddress, command);
+				}
+			}
+
+			return Event.None;
+		}
+
+		public void Stop()
+		{
+			if (camera.CameraCfg.DebugLevel == DebugMode.Simulate) return;
+
+			log.DebugFormat("Stop(): telnet.State = {0}, liveStreamCommandSent = {1}", telnet.State, liveStreamCommandSent);
+            
+            if (liveStreamCommandSent)
+			{
+				telnet.Enqueue(new Telnet.Command(Telnet.CmdAction.SEND_COMMAND, Telnet.TelnetClient.CtrlCCommand));
+                log.WarnFormat("{0} IP={1} command=CTRL-C", camera.Name, camera.IPAddress);
+            }
+		}
+	}
+}

TBF/Rig/Network/Camera/CJMS11/POJO/CommandM.cs

@@ -0,0 +1,24 @@
+namespace TBF.Rig.Network.Camera.CJMS11
+{
+    public enum CommandM
+    {
+        noCommand,
+        unknown_,         // special: only return - unknown command
+        connect_,         // special: only return - TCP connection created
+        type_camera_,
+        status_,
+        prepare_camera_,
+        grab_image_,
+        send_,
+        start_stream_,
+        stop_stream_,
+        start_stream_images_,
+        stop_stream_images_,
+        get_cfg_,
+        set_cfg_,
+        close_,
+        disconnect_,
+        overload_config_,
+        client_count_
+    }
+}

TBF/Rig/Network/Camera/CJMS11/POJO/CommandMEnum.cs

@@ -0,0 +1,46 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace TBF.Rig.Network.Camera.CJMS11
+{
+    public static class CommandMEnum
+    {
+        private static readonly Dictionary<CommandM, string> commandToString = new Dictionary<CommandM, string>
+        {
+            { CommandM.noCommand, "noCommand" },
+            { CommandM.unknown_, "unknown" },
+            { CommandM.connect_, "connect" },
+            { CommandM.type_camera_, "type_camera" },
+            { CommandM.status_, "status" },
+            { CommandM.prepare_camera_, "prepare_camera" },
+            { CommandM.grab_image_, "grab_image" },
+            { CommandM.send_, "send" },
+            { CommandM.start_stream_, "start_stream" },
+            { CommandM.stop_stream_, "stop_stream" },
+            { CommandM.start_stream_images_, "start_stream_images" },
+            { CommandM.stop_stream_images_, "stop_stream_images" },
+            { CommandM.get_cfg_, "get_cfg" },
+            { CommandM.set_cfg_, "set_cfg" },
+            { CommandM.close_, "close" },
+            { CommandM.disconnect_, "disconnect" },
+            { CommandM.overload_config_, "overload_config" },
+            { CommandM.client_count_, "client_count" }
+        };
+        
+
+        private static readonly Dictionary<string, CommandM> stringToCommand = commandToString.ToDictionary(kvp => kvp.Value, kvp => kvp.Key);
+
+        public static string GetVal(CommandM cmd)
+        {
+            return commandToString.TryGetValue(cmd, out var str) ? str : "unknown";
+        }
+
+        public static CommandM GetCommandM(string token)
+        {
+            if (string.IsNullOrEmpty(token))
+                return CommandM.noCommand;
+
+            return stringToCommand.TryGetValue(token, out var cmd) ? cmd : CommandM.noCommand;
+        }
+    }
+}

TBF/Rig/Network/Camera/CJMS11/POJO/ImageType.cs

@@ -0,0 +1,10 @@
+namespace TBF.Rig.Network.Camera.CJMS11.POJO
+{
+    public enum ImageType
+    {
+        UNKNOWN,
+        BASE_64,
+        MJPEG,
+        RGB888
+    }
+}

TBF/Rig/Network/Camera/CJMS11/POJO/ImageTypeEnum.cs

@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace TBF.Rig.Network.Camera.CJMS11.POJO
+{
+    public class ImageTypeEnum
+    {
+        private static readonly Dictionary<ImageType, string> commandToString = new Dictionary<ImageType, string>
+        {
+            { ImageType.BASE_64, "BASE_64" },
+            { ImageType.MJPEG, "MJPEG" },
+            { ImageType.RGB888, "RGB888" },
+            { ImageType.UNKNOWN, "" }
+        };
+        
+        private static readonly Dictionary<string, ImageType> stringToCommand = commandToString.ToDictionary(kvp => kvp.Value, kvp => kvp.Key);
+
+        public static string GetVal(ImageType cmd)
+        {
+            return commandToString.TryGetValue(cmd, out var str) ? str : "unknown";
+        }
+
+        public static ImageType GetCommandM(string token)
+        {
+            if (string.IsNullOrEmpty(token))
+                return ImageType.UNKNOWN;
+
+            return stringToCommand.TryGetValue(token, out var cmd) ? cmd : ImageType.UNKNOWN;
+        }
+    }
+}