feat(build): add picture loading, validation, and error handling; introduce CopyReleasePictures.ps1 for release asset management

Cause:

- develop/SLM-PT50_genesisDirectDecode_mirror lacked the latest changes from develop/Local-master.
- The target branch needed the updated results workflow, configuration persistence, diagnostics and packaged dependencies.

Solution:

1. Merge source branch into target branch
   - Merged develop/Local-master into develop/SLM-PT50_genesisDirectDecode_mirror.
   - Integrate the source branch changes into the target branch while retaining both parent histories.

2. Integrate application and dependency updates
   - Include the ResultsWorkspace and per-meter ResultsWriter export updates, persistent Previous results component settings and ASIC optical logging improvements.
   - Include tracked packages/Common files and runtime library updates.
   - Preserve the existing merge contents; this amendment changes only the commit message and application revision.

3. Regression verification
   - Verified the source and target branch names against the merge commit and its parent history.
   - Verified that AssemblyVersion and AssemblyFileVersion both use 3.9.3147.112 and that the revision diff passes whitespace checks.
   - No regression tests were added or run for this amendment; application build and merged runtime behavior remain unverified.

4. Increased revision
   - Updated AssemblyVersion and AssemblyFileVersion from 3.9.3147.111 to 3.9.3147.112.

.cr/personal/FavoritesList/List.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Root Type="DevExpress.CodeRush.Foundation.CodePlaces.Options.FavoritesListContainer">
+  <Options Language="Neutral">
+    <Groups />
+  </Options>
+</Root>

.gitignore

@@ -1,3 +1,12 @@
+# Generated build outputs for all projects, including Debug/Release archives.
+[Bb]in/
+[Oo]bj/
+
+# Generated test results and hardware diagnostic captures.
+[Tt]est[Rr]esults/
+
+AppDiagnostic/bin/
+AppDiagnostic/obj/
 Common/bin/
 Common/obj/
 Config/bin/
@@ -16,8 +25,6 @@ Encrypt/bin/
 Encrypt/obj/
 EventViewer/bin/
 EventViewer/obj/
-Events/bin/
-Events/obj/
 FeatureVectorCalculator/bin/
 FeatureVectorCalculator/obj/
 GemCard/bin/
@@ -28,10 +35,18 @@ GenericTest/bin/
 GenericTest/obj/
 GraphLib/bin/
 GraphLib/obj/
+LabelPrinting/bin/
+LabelPrinting/obj/
 MergeResultsDBs/bin/
 MergeResultsDBs/obj/
+NfcC7_Dll/bin/
+NfcC7_Dll/obj/
+NfcC7_DLL.Tests/bin/
+NfcC7_DLL.Tests/obj/
 OrderManagement/bin/
 OrderManagement/obj/
+ProductionTracing/bin/
+ProductionTracing/obj/
 RecordProcessing/bin/
 RecordProcessing/obj/
 ResetBatchNr/bin/
@@ -44,26 +59,108 @@ ResultsBrowser/bin/
 ResultsBrowser/obj/
 ResultsParser/bin/
 ResultsParser/obj/
-SharedDatabase/bin
-SharedDatabase/obj
-SchematicDrawing/bin
-SchematicDrawing/obj
+S640TestApp/bin/
+S640TestApp/obj/
+SharedComponents/bin/
+SharedComponents/obj/
+SharedDatabase/bin/
+SharedDatabase/obj/
+SchematicDrawing/bin/
+SchematicDrawing/obj/
 Statistics/bin/
 Statistics/obj/
 TBF/bin/
 TBF/obj/
+TBFTests/bin/
+TBFTests/obj/
 ToFirstMonitor/bin/
 ToFirstMonitor/obj/
 ToSecondMonitor/bin/
 ToSecondMonitor/obj/
-Users/bin/
-Users/obj/
 UserManagement/bin/
 UserManagement/obj/
 WorkflowConfigurator/bin/
 WorkflowConfigurator/obj/
 Workplace/bin/
 Workplace/obj/
+DataStreamInterfaceTest/bin/
+DataStreamInterfaceTest/obj/
+DataStreamMeter/bin/
+DataStreamMeter/obj/
+Events/bin/
+Events/obj/
+TracingDB/bin/
+TracingDB/obj/
+Users/bin/
+Users/obj/
 .vs/
+.idea/
 *.suo
 *.bak
+TBF.sln.DotSettings.user
+/ExternalProjects
+/GenesisCordonelTester
+/packages/*
+!/packages/Common/
+/GenesisCordonelInterface/bin/Debug/GenesisCordonelInterfaceLogger.log
+/GenesisCordonelInterface/bin/Debug/GenesisCordonelTesterLogger.log
+/GenesisCordonelInterface/bin/Debug/SirtConfig.json
+/GenesisCordonelInterface/bin/Release
+/GenesisCordonelInterface/obj/Debug
+/GenesisCordonelInterface/obj/Release
+/ExternalProjects
+/AppDiagnostic.Logging/bin/Debug/net472/AppDiagnostic.Logging.dll
+/AppDiagnostic.Logging/bin/Debug/net472/AppDiagnostic.Logging.pdb
+/AppDiagnostic.Logging/obj/Debug/net472/AppDiagnostic.Logging.AssemblyInfo.cs
+/AppDiagnostic.Logging/obj/Debug/net472/AppDiagnostic.Logging.AssemblyInfoInputs.cache
+/AppDiagnostic.Logging/obj/Debug/net472/AppDiagnostic.Logging.csproj.AssemblyReference.cache
+/AppDiagnostic.Logging/obj/Debug/net472/AppDiagnostic.Logging.dll
+/AppDiagnostic.Logging/obj/Debug/net472/AppDiagnostic.Logging.pdb
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Metrology.Measurements.dll
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Metrology.Measurements.pdb
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Ui.CordonelPreadjustmentUi.dll
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Ui.CordonelPreadjustmentUi.pdb
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Ui.GenesisToolBox.exe
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Ui.GenesisToolBox.pdb
+/GenesisCordonelInterface/bin/Debug/XylemCommonUiLegacyGenCtl.dll
+/GenesisCordonelInterface/bin/Debug/XylemCommonUiLegacyGenCtl.pdb
+/GenesisCordonelInterface/bin/Debug/de/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile.resources.dll
+/GenesisCordonelInterface/bin/Debug/GenesisCordonelInterface.exe
+/GenesisCordonelInterface/bin/Debug/GenesisCordonelInterface.pdb
+/GenesisCordonelInterface/bin/Debug/TempFlansh.exe
+/GenesisCordonelInterface/bin/Debug/TempFlansh.pdb
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Hardware.Interfaces.Protocols.ProtocolCore.dll
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Hardware.Interfaces.Protocols.ProtocolCore.pdb
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Hardware.Interfaces.Protocols.TransmitProtocol.dll
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Hardware.Interfaces.Protocols.TransmitProtocol.pdb
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Hardware.WaterMeter.eRegister.eRegisterCore.dll
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Hardware.WaterMeter.eRegister.eRegisterCore.pdb
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Hardware.WaterMeter.Genesis.DataPackages.dll
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Hardware.WaterMeter.Genesis.DataPackages.pdb
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.dll
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.pdb
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile.dll
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile.pdb
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisPwd.dll
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Hardware.WaterMeter.Genesis.GenesisPwd.pdb
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.RequestProtocol.dll
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.RequestProtocol.pdb
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.StreamingProtocol.dll
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.StreamingProtocol.pdb
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Hardware.WaterMeter.MagFlux.MagFluxConfig.dll
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Hardware.WaterMeter.MagFlux.MagFluxConfig.pdb
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Hardware.WaterMeter.MagFlux.MagFluxCore.dll
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Hardware.WaterMeter.MagFlux.MagFluxCore.pdb
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Logic.RelatePcb.dll
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Logic.RelatePcb.pdb
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Logic.ServiceCore.dll
+/GenesisCordonelInterface/bin/Debug/Xylem.Common.Logic.ServiceCore.pdb
+/GenesisCordonelInterface/RuntimePackage/Package
+/SharedComponents/obj/SharedComponents.csproj.nuget.g.props
+/AppDiagnostic.Logging/obj/Release/net472/AppDiagnostic.Logging.AssemblyInfo.cs
+/AppDiagnostic.Logging/obj/Release/net472/AppDiagnostic.Logging.AssemblyInfoInputs.cache
+/AppDiagnostic.Logging/obj/Release/net472/AppDiagnostic.Logging.csproj.AssemblyReference.cache
+/AppDiagnostic.Logging/obj/Release/net472/AppDiagnostic.Logging.dll
+/AppDiagnostic.Logging/obj/Release/net472/AppDiagnostic.Logging.pdb
+/AppDiagnostic.Logging/bin/Release/net472/AppDiagnostic.Logging.dll
+/AppDiagnostic.Logging/bin/Release/net472/AppDiagnostic.Logging.pdb

AppDiagnostic.Logging/AppDiagnostic.Logging.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+    <LangVersion>7.3</LangVersion>
+    <RootNamespace>AppDiagnostic.Logging</RootNamespace>
+    <AssemblyName>AppDiagnostic.Logging</AssemblyName>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+    <ProjectGuid>{A7AF8ED2-362E-4DBB-B607-EBA2820719EC}</ProjectGuid>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="NLog" Version="5.2.2" />
+    <Reference Include="System.Runtime.Serialization" />
+  </ItemGroup>
+
+</Project>

AppDiagnostic.Logging/AppDiagnosticConnector.cs

@@ -0,0 +1,41 @@
+using NLog;
+using NLog.Config;
+using NLog.Layouts;
+
+namespace AppDiagnostic.Logging
+{
+    public static class AppDiagnosticConnector
+    {
+        private static readonly object syncRoot = new object();
+
+        public static void Register()
+        {
+            lock (syncRoot)
+            {
+                LoggingConfiguration configuration = LogManager.Configuration ?? new LoggingConfiguration();
+                NLog.Targets.Target existingTarget = configuration.FindTargetByName("appDiagnostic");
+
+                if (existingTarget != null)
+                {
+                    return;
+                }
+
+                var target = new AppDiagnosticTarget
+                {
+                    Name = "appDiagnostic",
+                    PipeName = DiagnosticProtocol.DefaultPipeName,
+                    QueueLimit = DiagnosticProtocol.DefaultQueueLimit,
+                    ReconnectDelayMilliseconds = DiagnosticProtocol.DefaultReconnectDelayMilliseconds,
+                    ConnectTimeoutMilliseconds = DiagnosticProtocol.DefaultConnectTimeoutMilliseconds,
+                    Layout = new SimpleLayout("${message}")
+                };
+
+                configuration.AddTarget(target.Name, target);
+                configuration.AddRule(LogLevel.Trace, LogLevel.Fatal, target, "*");
+
+                LogManager.Configuration = configuration;
+                LogManager.ReconfigExistingLoggers();
+            }
+        }
+    }
+}

AppDiagnostic.Logging/AppDiagnosticTarget.cs

@@ -0,0 +1,233 @@
+using NLog;
+using NLog.Targets;
+using System;
+using System.Collections.Concurrent;
+using System.Diagnostics;
+using System.IO;
+using System.IO.Pipes;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace AppDiagnostic.Logging
+{
+    [Target("AppDiagnostic")]
+    public sealed class AppDiagnosticTarget : TargetWithLayout
+    {
+        private readonly object connectionLock = new object();
+        private readonly string applicationName;
+        private readonly int processId;
+
+        private BlockingCollection<DiagnosticLogEntry> queue;
+        private CancellationTokenSource cancellation;
+        private Task senderTask;
+        private NamedPipeClientStream pipeClient;
+
+        public AppDiagnosticTarget()
+        {
+            using (Process process = Process.GetCurrentProcess())
+            {
+                applicationName = process.ProcessName;
+                processId = process.Id;
+            }
+
+            PipeName = DiagnosticProtocol.DefaultPipeName;
+            QueueLimit = DiagnosticProtocol.DefaultQueueLimit;
+            ReconnectDelayMilliseconds =
+                DiagnosticProtocol.DefaultReconnectDelayMilliseconds;
+            ConnectTimeoutMilliseconds =
+                DiagnosticProtocol.DefaultConnectTimeoutMilliseconds;
+        }
+
+        public string PipeName { get; set; }
+
+        public int QueueLimit { get; set; }
+
+        public int ReconnectDelayMilliseconds { get; set; }
+
+        public int ConnectTimeoutMilliseconds { get; set; }
+
+        protected override void InitializeTarget()
+        {
+            base.InitializeTarget();
+
+            int queueLimit = QueueLimit > 0
+                ? QueueLimit
+                : DiagnosticProtocol.DefaultQueueLimit;
+
+            queue = new BlockingCollection<DiagnosticLogEntry>(queueLimit);
+            cancellation = new CancellationTokenSource();
+
+            senderTask = Task.Factory.StartNew(
+                ProcessQueue,
+                cancellation.Token,
+                TaskCreationOptions.LongRunning,
+                TaskScheduler.Default);
+        }
+
+        protected override void Write(LogEventInfo logEvent)
+        {
+            if (logEvent == null || queue == null || queue.IsAddingCompleted)
+            {
+                return;
+            }
+
+            var entry = new DiagnosticLogEntry
+            {
+                TimestampUtc = logEvent.TimeStamp.ToUniversalTime(),
+                MachineName = Environment.MachineName,
+                ApplicationName = applicationName,
+                ProcessId = processId,
+                LoggerName = logEvent.LoggerName ?? string.Empty,
+                Level = logEvent.Level?.Name ?? string.Empty,
+                Message = Layout != null
+                    ? Layout.Render(logEvent)
+                    : logEvent.FormattedMessage,
+                Exception = logEvent.Exception?.ToString() ?? string.Empty
+            };
+
+            try
+            {
+                queue.TryAdd(entry);
+            }
+            catch (ObjectDisposedException)
+            {
+                // A concurrent NLog shutdown may dispose the queue.
+            }
+            catch (InvalidOperationException)
+            {
+                // A concurrent NLog shutdown may complete the queue.
+            }
+            }
+
+        protected override void CloseTarget()
+        {
+            BlockingCollection<DiagnosticLogEntry> currentQueue = queue;
+            CancellationTokenSource currentCancellation = cancellation;
+
+            if (currentQueue != null)
+            {
+                currentQueue.CompleteAdding();
+            }
+
+            if (currentCancellation != null)
+            {
+                currentCancellation.Cancel();
+            }
+
+            CloseConnection();
+
+            try
+            {
+                senderTask?.Wait(2000);
+            }
+            catch (AggregateException)
+            {
+                // Cancellation during application shutdown is expected.
+            }
+
+            currentQueue?.Dispose();
+            currentCancellation?.Dispose();
+
+            queue = null;
+            cancellation = null;
+            senderTask = null;
+
+            base.CloseTarget();
+        }
+
+        private void ProcessQueue()
+        {
+            CancellationToken token = cancellation.Token;
+
+            try
+            {
+                foreach (DiagnosticLogEntry entry in
+                    queue.GetConsumingEnumerable(token))
+                {
+                    SendWhenConnected(entry, token);
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                // Target shutdown is expected to cancel the sender.
+            }
+        }
+
+        private void SendWhenConnected(
+            DiagnosticLogEntry entry,
+            CancellationToken token)
+        {
+            while (!token.IsCancellationRequested)
+            {
+                try
+                {
+                    EnsureConnected();
+                    DiagnosticMessageSerializer.WriteFramed(pipeClient, entry);
+                    return;
+                }
+                catch (Exception exception) when (
+                    exception is IOException ||
+                    exception is TimeoutException ||
+                    exception is InvalidOperationException)
+                {
+                    CloseConnection();
+
+                    int delay = ReconnectDelayMilliseconds > 0
+                        ? ReconnectDelayMilliseconds
+                        : DiagnosticProtocol.DefaultReconnectDelayMilliseconds;
+
+                    if (token.WaitHandle.WaitOne(delay))
+                    {
+                        return;
+                    }
+                }
+            }
+        }
+
+        private void EnsureConnected()
+        {
+            lock (connectionLock)
+            {
+                if (pipeClient != null && pipeClient.IsConnected)
+                {
+                    return;
+                }
+
+                CloseConnectionWithoutLock();
+
+                pipeClient = new NamedPipeClientStream(
+                    ".",
+                    string.IsNullOrWhiteSpace(PipeName)
+                        ? DiagnosticProtocol.DefaultPipeName
+                        : PipeName,
+                    PipeDirection.Out,
+                    PipeOptions.Asynchronous);
+
+                int timeout = ConnectTimeoutMilliseconds > 0
+                    ? ConnectTimeoutMilliseconds
+                    : DiagnosticProtocol.DefaultConnectTimeoutMilliseconds;
+
+                pipeClient.Connect(timeout);
+            }
+        }
+
+        private void CloseConnection()
+        {
+            lock (connectionLock)
+            {
+                CloseConnectionWithoutLock();
+            }
+        }
+
+        private void CloseConnectionWithoutLock()
+        {
+            if (pipeClient == null)
+            {
+                return;
+            }
+
+            pipeClient.Dispose();
+            pipeClient = null;
+        }
+    }
+}

AppDiagnostic.Logging/DiagnosticLogEntry.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace AppDiagnostic.Logging
+{
+    [DataContract]
+    public sealed class DiagnosticLogEntry
+    {
+        [DataMember(Order = 1)]
+        public DateTime TimestampUtc { get; set; }
+
+        [DataMember(Order = 2)]
+        public string MachineName { get; set; }
+
+        [DataMember(Order = 3)]
+        public string ApplicationName { get; set; }
+
+        [DataMember(Order = 4)]
+        public int ProcessId { get; set; }
+
+        [DataMember(Order = 5)]
+        public string LoggerName { get; set; }
+
+        [DataMember(Order = 6)]
+        public string Level { get; set; }
+
+        [DataMember(Order = 7)]
+        public string Message { get; set; }
+
+        [DataMember(Order = 8)]
+        public string Exception { get; set; }
+    }
+}

AppDiagnostic.Logging/DiagnosticMessageSerializer.cs

@@ -0,0 +1,113 @@
+using System;
+using System.IO;
+using System.Runtime.Serialization.Json;
+
+namespace AppDiagnostic.Logging
+{
+    public static class DiagnosticMessageSerializer
+    {
+        private static readonly DataContractJsonSerializer Serializer =
+            new DataContractJsonSerializer(typeof(DiagnosticLogEntry));
+
+        private static readonly object SerializerLock = new object();
+
+        public static byte[] Serialize(DiagnosticLogEntry entry)
+        {
+            if (entry == null)
+            {
+                throw new ArgumentNullException(nameof(entry));
+            }
+
+            using (var stream = new MemoryStream())
+            {
+                lock (SerializerLock)
+                {
+                    Serializer.WriteObject(stream, entry);
+                }
+
+                return stream.ToArray();
+            }
+        }
+
+        public static DiagnosticLogEntry Deserialize(byte[] payload)
+        {
+            if (payload == null)
+            {
+                throw new ArgumentNullException(nameof(payload));
+            }
+
+            if (payload.Length == 0 ||
+                payload.Length > DiagnosticProtocol.MaximumMessageSize)
+            {
+                throw new InvalidDataException("Invalid diagnostic message size.");
+            }
+
+            using (var stream = new MemoryStream(payload, false))
+            {
+                lock (SerializerLock)
+                {
+                    return (DiagnosticLogEntry)Serializer.ReadObject(stream);
+                }
+            }
+        }
+
+        public static void WriteFramed(Stream stream, DiagnosticLogEntry entry)
+        {
+            if (stream == null)
+            {
+                throw new ArgumentNullException(nameof(stream));
+            }
+
+            byte[] payload = Serialize(entry);
+
+            if (payload.Length > DiagnosticProtocol.MaximumMessageSize)
+            {
+                throw new InvalidDataException("Diagnostic message is too large.");
+            }
+
+            byte[] length = BitConverter.GetBytes(payload.Length);
+            stream.Write(length, 0, length.Length);
+            stream.Write(payload, 0, payload.Length);
+            stream.Flush();
+        }
+
+        public static DiagnosticLogEntry ReadFramed(Stream stream)
+        {
+            if (stream == null)
+            {
+                throw new ArgumentNullException(nameof(stream));
+            }
+
+            byte[] lengthBuffer = ReadExactly(stream, sizeof(int));
+            int payloadLength = BitConverter.ToInt32(lengthBuffer, 0);
+
+            if (payloadLength <= 0 ||
+                payloadLength > DiagnosticProtocol.MaximumMessageSize)
+            {
+                throw new InvalidDataException("Invalid diagnostic message size.");
+            }
+
+            return Deserialize(ReadExactly(stream, payloadLength));
+        }
+
+        private static byte[] ReadExactly(Stream stream, int count)
+        {
+            byte[] buffer = new byte[count];
+            int offset = 0;
+
+            while (offset < count)
+            {
+                int bytesRead = stream.Read(buffer, offset, count - offset);
+
+                if (bytesRead == 0)
+                {
+                    throw new EndOfStreamException();
+                }
+
+                offset += bytesRead;
+            }
+
+            return buffer;
+        }
+    }
+}

AppDiagnostic.Logging/DiagnosticProtocol.cs

@@ -0,0 +1,11 @@
+namespace AppDiagnostic.Logging
+{
+    public static class DiagnosticProtocol
+    {
+        public const string DefaultPipeName = "Sensus.AppDiagnostic.LogPipe";
+        public const int MaximumMessageSize = 1024 * 1024;
+        public const int DefaultQueueLimit = 10000;
+        public const int DefaultReconnectDelayMilliseconds = 500;
+        public const int DefaultConnectTimeoutMilliseconds = 250;
+    }
+}

AppDiagnostic.Logging/README.md

@@ -0,0 +1,37 @@
+# AppDiagnostic.Logging
+
+Reusable NLog target for sending structured diagnostic events from multiple
+.NET Framework processes to `AppDiagnostic.exe` through a local named pipe.
+
+## Producer integration
+
+Reference this project from the producer application and add the extension and
+target to its NLog configuration:
+
+```xml
+<extensions>
+  <add assembly="AppDiagnostic.Logging" />
+</extensions>
+
+<targets>
+  <target name="appDiagnostic"
+          xsi:type="AppDiagnostic"
+          layout="${message}" />
+</targets>
+
+<rules>
+  <logger name="*" minlevel="Trace" writeTo="appDiagnostic" />
+</rules>
+```
+
+The target writes to a bounded background queue. Producer threads are not
+blocked while the diagnostic viewer is unavailable. Queued messages are sent
+after the viewer becomes available; new messages are discarded when the queue
+limit is reached.
+
+The receiver can read messages with:
+
+```csharp
+DiagnosticLogEntry entry =
+    DiagnosticMessageSerializer.ReadFramed(namedPipeServerStream);
+```

AppDiagnostic.Logging/obj/AppDiagnostic.Logging.csproj.nuget.dgspec.json

@@ -0,0 +1,65 @@
+{
+  "format": 1,
+  "restore": {
+    "C:\\Sensus_projects\\New\\LocalBranch_start_at_6.3.2026\\tbf-local\\tbf\\AppDiagnostic.Logging\\AppDiagnostic.Logging.csproj": {}
+  },
+  "projects": {
+    "C:\\Sensus_projects\\New\\LocalBranch_start_at_6.3.2026\\tbf-local\\tbf\\AppDiagnostic.Logging\\AppDiagnostic.Logging.csproj": {
+      "version": "1.0.0",
+      "restore": {
+        "projectUniqueName": "C:\\Sensus_projects\\New\\LocalBranch_start_at_6.3.2026\\tbf-local\\tbf\\AppDiagnostic.Logging\\AppDiagnostic.Logging.csproj",
+        "projectName": "AppDiagnostic.Logging",
+        "projectPath": "C:\\Sensus_projects\\New\\LocalBranch_start_at_6.3.2026\\tbf-local\\tbf\\AppDiagnostic.Logging\\AppDiagnostic.Logging.csproj",
+        "packagesPath": "C:\\Users\\MFRNIAK\\.nuget\\packages\\",
+        "outputPath": "C:\\Sensus_projects\\New\\LocalBranch_start_at_6.3.2026\\tbf-local\\tbf\\AppDiagnostic.Logging\\obj\\",
+        "projectStyle": "PackageReference",
+        "fallbackFolders": [
+          "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
+        ],
+        "configFilePaths": [
+          "C:\\Users\\MFRNIAK\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
+        ],
+        "originalTargetFrameworks": [
+          "net472"
+        ],
+        "sources": {
+          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+          "https://api.nuget.org/v3/index.json": {}
+        },
+        "frameworks": {
+          "net472": {
+            "framework": "net472",
+            "targetAlias": "net472",
+            "projectReferences": {}
+          }
+        },
+        "warningProperties": {
+          "warnAsError": [
+            "NU1605"
+          ]
+        },
+        "restoreAuditProperties": {
+          "enableAudit": "true",
+          "auditLevel": "low",
+          "auditMode": "direct"
+        },
+        "SdkAnalysisLevel": "10.0.300"
+      },
+      "frameworks": {
+        "net472": {
+          "framework": "net472",
+          "targetAlias": "net472",
+          "dependencies": {
+            "NLog": {
+              "target": "Package",
+              "version": "[5.2.2, )"
+            }
+          },
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.303\\RuntimeIdentifierGraph.json"
+        }
+      }
+    }
+  }
+}

AppDiagnostic.Logging/obj/AppDiagnostic.Logging.csproj.nuget.g.props

@@ -0,0 +1,16 @@
+<?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\MFRNIAK\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
+    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">7.0.0</NuGetToolVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <SourceRoot Include="C:\Users\MFRNIAK\.nuget\packages\" />
+    <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
+  </ItemGroup>
+</Project>

AppDiagnostic.Logging/obj/AppDiagnostic.Logging.csproj.nuget.g.targets

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

AppDiagnostic.Logging/obj/Debug/net472/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs

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

AppDiagnostic.Logging/obj/Debug/net472/AppDiagnostic.Logging.GeneratedMSBuildEditorConfig.editorconfig

@@ -0,0 +1,8 @@
+is_global = true
+build_property.RootNamespace = AppDiagnostic.Logging
+build_property.ProjectDir = C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\
+build_property.EnableComHosting = 
+build_property.EnableGeneratedComInterfaceComImportInterop = 
+build_property.CsWinRTUseWindowsUIXamlProjections = false
+build_property.EffectiveAnalysisLevelStyle = 
+build_property.EnableCodeStyleSeverity = 

AppDiagnostic.Logging/obj/Debug/net472/AppDiagnostic.Logging.csproj.CoreCompileInputs.cache

@@ -0,0 +1 @@
+551ba94934db30a277a1a9cec2dacbe03f8393107e5d0b2436695f9bd62bd569

AppDiagnostic.Logging/obj/Debug/net472/AppDiagnostic.Logging.csproj.FileListAbsolute.txt

@@ -0,0 +1,11 @@
+C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\bin\Debug\net472\AppDiagnostic.Logging.dll
+C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\bin\Debug\net472\AppDiagnostic.Logging.pdb
+C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\bin\Debug\net472\NLog.dll
+C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\obj\Debug\net472\AppDiagnostic.Logging.csproj.AssemblyReference.cache
+C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\obj\Debug\net472\AppDiagnostic.Logging.GeneratedMSBuildEditorConfig.editorconfig
+C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\obj\Debug\net472\AppDiagnostic.Logging.AssemblyInfoInputs.cache
+C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\obj\Debug\net472\AppDiagnostic.Logging.AssemblyInfo.cs
+C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\obj\Debug\net472\AppDiagnostic.Logging.csproj.CoreCompileInputs.cache
+C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\obj\Debug\net472\AppDiagn.CFEA7AC0.Up2Date
+C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\obj\Debug\net472\AppDiagnostic.Logging.dll
+C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\obj\Debug\net472\AppDiagnostic.Logging.pdb

AppDiagnostic.Logging/obj/Release/net472/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs

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

AppDiagnostic.Logging/obj/Release/net472/AppDiagnostic.Logging.GeneratedMSBuildEditorConfig.editorconfig

@@ -0,0 +1,8 @@
+is_global = true
+build_property.RootNamespace = AppDiagnostic.Logging
+build_property.ProjectDir = C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\
+build_property.EnableComHosting = 
+build_property.EnableGeneratedComInterfaceComImportInterop = 
+build_property.CsWinRTUseWindowsUIXamlProjections = false
+build_property.EffectiveAnalysisLevelStyle = 
+build_property.EnableCodeStyleSeverity = 

AppDiagnostic.Logging/obj/Release/net472/AppDiagnostic.Logging.csproj.CoreCompileInputs.cache

@@ -0,0 +1 @@
+a53d59482cad49b656138b1af5cf3e55edf2108969aedc574c362be6c671436b

AppDiagnostic.Logging/obj/Release/net472/AppDiagnostic.Logging.csproj.FileListAbsolute.txt

@@ -0,0 +1,11 @@
+C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\bin\Release\net472\AppDiagnostic.Logging.dll
+C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\bin\Release\net472\AppDiagnostic.Logging.pdb
+C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\bin\Release\net472\NLog.dll
+C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\obj\Release\net472\AppDiagnostic.Logging.csproj.AssemblyReference.cache
+C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\obj\Release\net472\AppDiagnostic.Logging.GeneratedMSBuildEditorConfig.editorconfig
+C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\obj\Release\net472\AppDiagnostic.Logging.AssemblyInfoInputs.cache
+C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\obj\Release\net472\AppDiagnostic.Logging.AssemblyInfo.cs
+C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\obj\Release\net472\AppDiagnostic.Logging.csproj.CoreCompileInputs.cache
+C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\obj\Release\net472\AppDiagn.CFEA7AC0.Up2Date
+C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\obj\Release\net472\AppDiagnostic.Logging.dll
+C:\Sensus_projects\New\LocalBranch_start_at_6.3.2026\tbf-local\tbf\AppDiagnostic.Logging\obj\Release\net472\AppDiagnostic.Logging.pdb

AppDiagnostic.Logging/obj/project.assets.json

@@ -0,0 +1,119 @@
+{
+  "version": 4,
+  "targets": {
+    "net472": {
+      "NLog/5.2.2": {
+        "type": "package",
+        "frameworkAssemblies": [
+          "System",
+          "System.Configuration",
+          "System.Core",
+          "System.IO.Compression",
+          "System.Xml"
+        ],
+        "compile": {
+          "lib/net46/NLog.dll": {
+            "related": ".xml"
+          }
+        },
+        "runtime": {
+          "lib/net46/NLog.dll": {
+            "related": ".xml"
+          }
+        }
+      }
+    }
+  },
+  "libraries": {
+    "NLog/5.2.2": {
+      "sha512": "r6Q9740g29gTwmTWlsgdIFm0mhNsfNZmbvWKX/Fxmi8X89ZrpUowHM2T2X1lP7RVpND+ef+XnfKL5g6Q1iNGXA==",
+      "type": "package",
+      "path": "nlog/5.2.2",
+      "files": [
+        ".nupkg.metadata",
+        ".signature.p7s",
+        "N.png",
+        "lib/net35/NLog.dll",
+        "lib/net35/NLog.xml",
+        "lib/net45/NLog.dll",
+        "lib/net45/NLog.xml",
+        "lib/net46/NLog.dll",
+        "lib/net46/NLog.xml",
+        "lib/netstandard1.3/NLog.dll",
+        "lib/netstandard1.3/NLog.xml",
+        "lib/netstandard1.5/NLog.dll",
+        "lib/netstandard1.5/NLog.xml",
+        "lib/netstandard2.0/NLog.dll",
+        "lib/netstandard2.0/NLog.xml",
+        "nlog.5.2.2.nupkg.sha512",
+        "nlog.nuspec"
+      ]
+    }
+  },
+  "projectFileDependencyGroups": {
+    "net472": [
+      "NLog >= 5.2.2"
+    ]
+  },
+  "packageFolders": {
+    "C:\\Users\\MFRNIAK\\.nuget\\packages\\": {},
+    "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
+  },
+  "project": {
+    "version": "1.0.0",
+    "restore": {
+      "projectUniqueName": "C:\\Sensus_projects\\New\\LocalBranch_start_at_6.3.2026\\tbf-local\\tbf\\AppDiagnostic.Logging\\AppDiagnostic.Logging.csproj",
+      "projectName": "AppDiagnostic.Logging",
+      "projectPath": "C:\\Sensus_projects\\New\\LocalBranch_start_at_6.3.2026\\tbf-local\\tbf\\AppDiagnostic.Logging\\AppDiagnostic.Logging.csproj",
+      "packagesPath": "C:\\Users\\MFRNIAK\\.nuget\\packages\\",
+      "outputPath": "C:\\Sensus_projects\\New\\LocalBranch_start_at_6.3.2026\\tbf-local\\tbf\\AppDiagnostic.Logging\\obj\\",
+      "projectStyle": "PackageReference",
+      "fallbackFolders": [
+        "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
+      ],
+      "configFilePaths": [
+        "C:\\Users\\MFRNIAK\\AppData\\Roaming\\NuGet\\NuGet.Config",
+        "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+        "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
+      ],
+      "originalTargetFrameworks": [
+        "net472"
+      ],
+      "sources": {
+        "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+        "https://api.nuget.org/v3/index.json": {}
+      },
+      "frameworks": {
+        "net472": {
+          "framework": "net472",
+          "targetAlias": "net472",
+          "projectReferences": {}
+        }
+      },
+      "warningProperties": {
+        "warnAsError": [
+          "NU1605"
+        ]
+      },
+      "restoreAuditProperties": {
+        "enableAudit": "true",
+        "auditLevel": "low",
+        "auditMode": "direct"
+      },
+      "SdkAnalysisLevel": "10.0.300"
+    },
+    "frameworks": {
+      "net472": {
+        "framework": "net472",
+        "targetAlias": "net472",
+        "dependencies": {
+          "NLog": {
+            "target": "Package",
+            "version": "[5.2.2, )"
+          }
+        },
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.303\\RuntimeIdentifierGraph.json"
+      }
+    }
+  }
+}

AppDiagnostic.Logging/obj/project.nuget.cache

@@ -0,0 +1,10 @@
+{
+  "version": 2,
+  "dgSpecHash": "ezwKOPZAAXU=",
+  "success": true,
+  "projectFilePath": "C:\\Sensus_projects\\New\\LocalBranch_start_at_6.3.2026\\tbf-local\\tbf\\AppDiagnostic.Logging\\AppDiagnostic.Logging.csproj",
+  "expectedPackageFiles": [
+    "C:\\Users\\MFRNIAK\\.nuget\\packages\\nlog\\5.2.2\\nlog.5.2.2.nupkg.sha512"
+  ],
+  "logs": []
+}

AppDiagnostic/App.config

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    </startup>
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly>
+                <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
+</configuration>

AppDiagnostic/AppDiagnostic.csproj

@@ -0,0 +1,104 @@
+<?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="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="ColorRuleEditorForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DiagnosticLogFormatter.cs" />
+    <Compile Include="DiagnosticLogStore.cs" />
+    <Compile Include="DiagnosticPipeServer.cs" />
+    <Compile Include="LogColorizer.cs" />
+    <Compile Include="LogColorRule.cs" />
+    <Compile Include="LogColorRuleRepository.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>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\AppDiagnostic.Logging\AppDiagnostic.Logging.csproj">
+      <Project>{A7AF8ED2-362E-4DBB-B607-EBA2820719EC}</Project>
+      <Name>AppDiagnostic.Logging</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\TBF_icon.ico" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

AppDiagnostic/BufferedListView.cs

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

AppDiagnostic/ColorRuleEditorForm.cs

@@ -0,0 +1,319 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Windows.Forms;
+
+namespace AppDiagnostic
+{
+    public sealed class ColorRuleEditorForm : Form
+    {
+        private readonly List<LogColorRule> rules;
+        private readonly ListBox ruleList = new ListBox();
+        private readonly TextBox patternTextBox = new TextBox();
+        private readonly CheckBox enabledCheckBox = new CheckBox();
+        private readonly CheckBox boldCheckBox = new CheckBox();
+        private readonly CheckBox backgroundCheckBox = new CheckBox();
+        private readonly Button foregroundButton = new Button();
+        private readonly Button backgroundButton = new Button();
+        private readonly RichTextBox previewBox = new RichTextBox();
+        private readonly Font previewBoldFont;
+        private bool loadingRule;
+
+        public ColorRuleEditorForm(IEnumerable<LogColorRule> sourceRules)
+        {
+            rules = sourceRules.Select(rule => rule.Clone()).ToList();
+            InitializeWindow();
+            previewBoldFont = new Font(previewBox.Font, FontStyle.Bold);
+            RefreshRuleList(0);
+            RefreshPreview();
+        }
+
+        public List<LogColorRule> Rules => rules.Select(rule => rule.Clone()).ToList();
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                previewBoldFont.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+
+        private void InitializeWindow()
+        {
+            Text = "Log color rules";
+            Icon = Properties.Resources.TBF_icon;
+            StartPosition = FormStartPosition.CenterParent;
+            MinimumSize = new Size(760, 500);
+            ClientSize = new Size(860, 560);
+
+            var root = new TableLayoutPanel { Dock = DockStyle.Fill, ColumnCount = 1, RowCount = 3, Padding = new Padding(10) };
+            root.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
+            root.RowStyles.Add(new RowStyle(SizeType.Absolute, 145F));
+            root.RowStyles.Add(new RowStyle(SizeType.Absolute, 42F));
+
+            var split = new SplitContainer { Dock = DockStyle.Fill, SplitterDistance = 280 };
+            split.Panel1.Padding = new Padding(0, 0, 8, 0);
+            split.Panel2.Padding = new Padding(8, 0, 0, 0);
+
+            ruleList.Dock = DockStyle.Fill;
+            ruleList.IntegralHeight = false;
+            ruleList.SelectedIndexChanged += RuleList_SelectedIndexChanged;
+
+            var listButtons = new FlowLayoutPanel { Dock = DockStyle.Bottom, Height = 36, FlowDirection = FlowDirection.LeftToRight };
+            listButtons.Controls.Add(CreateButton("Add", AddRule_Click));
+            listButtons.Controls.Add(CreateButton("Delete", DeleteRule_Click));
+            listButtons.Controls.Add(CreateButton("Up", MoveUp_Click));
+            listButtons.Controls.Add(CreateButton("Down", MoveDown_Click));
+            split.Panel1.Controls.Add(ruleList);
+            split.Panel1.Controls.Add(listButtons);
+
+            var editor = new TableLayoutPanel { Dock = DockStyle.Top, AutoSize = true, ColumnCount = 2, Padding = new Padding(4) };
+            editor.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 120F));
+            editor.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
+
+            enabledCheckBox.Text = "Rule enabled";
+            enabledCheckBox.AutoSize = true;
+            enabledCheckBox.CheckedChanged += EditorValueChanged;
+            AddEditorRow(editor, "State", enabledCheckBox);
+
+            patternTextBox.Dock = DockStyle.Fill;
+            patternTextBox.TextChanged += EditorValueChanged;
+            AddEditorRow(editor, "Substring", patternTextBox);
+
+            foregroundButton.Text = "Choose text color...";
+            foregroundButton.AutoSize = true;
+            foregroundButton.Click += ForegroundButton_Click;
+            AddEditorRow(editor, "Text color", foregroundButton);
+
+            var backgroundPanel = new FlowLayoutPanel { Dock = DockStyle.Fill, AutoSize = true };
+            backgroundCheckBox.Text = "Use background";
+            backgroundCheckBox.AutoSize = true;
+            backgroundCheckBox.CheckedChanged += EditorValueChanged;
+            backgroundButton.Text = "Choose...";
+            backgroundButton.AutoSize = true;
+            backgroundButton.Click += BackgroundButton_Click;
+            backgroundPanel.Controls.Add(backgroundCheckBox);
+            backgroundPanel.Controls.Add(backgroundButton);
+            AddEditorRow(editor, "Background", backgroundPanel);
+
+            boldCheckBox.Text = "Bold text";
+            boldCheckBox.AutoSize = true;
+            boldCheckBox.CheckedChanged += EditorValueChanged;
+            AddEditorRow(editor, "Font", boldCheckBox);
+
+            var resetButton = CreateButton("Restore default rules", RestoreDefaults_Click);
+            resetButton.AutoSize = true;
+            AddEditorRow(editor, string.Empty, resetButton);
+            split.Panel2.Controls.Add(editor);
+
+            previewBox.Dock = DockStyle.Fill;
+            previewBox.ReadOnly = true;
+            previewBox.WordWrap = true;
+            previewBox.Font = new Font("Consolas", 9F);
+            previewBox.Text = "2026-09-10 14:25:31.042|DEBUG|TBF[14280]|TBF.UI.MainWnd|Device configuration loaded.\n2026-09-10 14:25:31.384|INFO |TBF[14280]|TBF.Rig.StateMachine|Test bench started.\n2026-09-10 14:25:32.018|WARN |TBF[14280]|TBF.Device|Pressure is approaching the limit.\n2026-09-10 14:25:32.611|ERROR|TBF[14280]|TBF.Device|Communication failed.";
+
+            var previewGroup = new GroupBox { Text = "Live preview", Dock = DockStyle.Fill, Padding = new Padding(8) };
+            previewGroup.Controls.Add(previewBox);
+
+            var footer = new FlowLayoutPanel { Dock = DockStyle.Fill, FlowDirection = FlowDirection.RightToLeft, Padding = new Padding(0, 8, 0, 0) };
+            var okButton = new Button { Text = "OK", DialogResult = DialogResult.OK, AutoSize = true };
+            var cancelButton = new Button { Text = "Cancel", DialogResult = DialogResult.Cancel, AutoSize = true };
+            footer.Controls.Add(okButton);
+            footer.Controls.Add(cancelButton);
+
+            AcceptButton = okButton;
+            CancelButton = cancelButton;
+            root.Controls.Add(split, 0, 0);
+            root.Controls.Add(previewGroup, 0, 1);
+            root.Controls.Add(footer, 0, 2);
+            Controls.Add(root);
+        }
+
+        private static Button CreateButton(string text, EventHandler clickHandler)
+        {
+            var button = new Button { Text = text, AutoSize = true };
+            button.Click += clickHandler;
+            return button;
+        }
+
+        private static void AddEditorRow(TableLayoutPanel panel, string labelText, Control control)
+        {
+            int row = panel.RowCount++;
+            panel.RowStyles.Add(new RowStyle(SizeType.AutoSize));
+            var label = new Label { Text = labelText, AutoSize = true, Anchor = AnchorStyles.Left, Margin = new Padding(3, 8, 3, 3) };
+            control.Margin = new Padding(3, 5, 3, 5);
+            panel.Controls.Add(label, 0, row);
+            panel.Controls.Add(control, 1, row);
+        }
+
+        private void RefreshRuleList(int selectedIndex)
+        {
+            ruleList.BeginUpdate();
+            ruleList.Items.Clear();
+            foreach (LogColorRule rule in rules)
+            {
+                ruleList.Items.Add(rule);
+            }
+            ruleList.EndUpdate();
+
+            if (rules.Count > 0)
+            {
+                ruleList.SelectedIndex = Math.Max(0, Math.Min(selectedIndex, rules.Count - 1));
+            }
+        }
+
+        private void RuleList_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            LogColorRule rule = ruleList.SelectedItem as LogColorRule;
+            if (rule == null)
+            {
+                return;
+            }
+
+            loadingRule = true;
+            enabledCheckBox.Checked = rule.Enabled;
+            patternTextBox.Text = rule.Pattern;
+            foregroundButton.BackColor = rule.ForeColor;
+            backgroundCheckBox.Checked = rule.UseBackColor;
+            backgroundButton.Enabled = rule.UseBackColor;
+            backgroundButton.BackColor = rule.UseBackColor ? rule.BackColor : SystemColors.Control;
+            boldCheckBox.Checked = rule.Bold;
+            loadingRule = false;
+        }
+
+        private void EditorValueChanged(object sender, EventArgs e)
+        {
+            if (loadingRule)
+            {
+                return;
+            }
+
+            LogColorRule rule = ruleList.SelectedItem as LogColorRule;
+            if (rule == null)
+            {
+                return;
+            }
+
+            rule.Enabled = enabledCheckBox.Checked;
+            rule.Pattern = patternTextBox.Text;
+            rule.UseBackColor = backgroundCheckBox.Checked;
+            rule.Bold = boldCheckBox.Checked;
+            backgroundButton.Enabled = rule.UseBackColor;
+            int index = ruleList.SelectedIndex;
+            RefreshRuleList(index);
+            RefreshPreview();
+        }
+
+        private void ForegroundButton_Click(object sender, EventArgs e)
+        {
+            LogColorRule rule = ruleList.SelectedItem as LogColorRule;
+            if (rule == null)
+            {
+                return;
+            }
+
+            using (var dialog = new ColorDialog { Color = rule.ForeColor, FullOpen = true })
+            {
+                if (dialog.ShowDialog(this) != DialogResult.OK)
+                {
+                    return;
+                }
+
+                rule.ForeColorArgb = dialog.Color.ToArgb();
+                foregroundButton.BackColor = dialog.Color;
+                RefreshPreview();
+            }
+        }
+
+        private void BackgroundButton_Click(object sender, EventArgs e)
+        {
+            LogColorRule rule = ruleList.SelectedItem as LogColorRule;
+            if (rule == null)
+            {
+                return;
+            }
+
+            Color initialColor = rule.UseBackColor ? rule.BackColor : SystemColors.Window;
+            using (var dialog = new ColorDialog { Color = initialColor, FullOpen = true })
+            {
+                if (dialog.ShowDialog(this) != DialogResult.OK)
+                {
+                    return;
+                }
+
+                rule.BackColorArgb = dialog.Color.ToArgb();
+                rule.UseBackColor = true;
+                backgroundCheckBox.Checked = true;
+                backgroundButton.BackColor = dialog.Color;
+                RefreshPreview();
+            }
+        }
+
+        private void AddRule_Click(object sender, EventArgs e)
+        {
+            rules.Add(new LogColorRule { Pattern = "NEW SUBSTRING", ForeColorArgb = Color.MediumPurple.ToArgb() });
+            RefreshRuleList(rules.Count - 1);
+            patternTextBox.Focus();
+            patternTextBox.SelectAll();
+        }
+
+        private void DeleteRule_Click(object sender, EventArgs e)
+        {
+            int index = ruleList.SelectedIndex;
+            if (index < 0)
+            {
+                return;
+            }
+
+            rules.RemoveAt(index);
+            RefreshRuleList(Math.Min(index, rules.Count - 1));
+            RefreshPreview();
+        }
+
+        private void MoveUp_Click(object sender, EventArgs e)
+        {
+            MoveSelectedRule(-1);
+        }
+
+        private void MoveDown_Click(object sender, EventArgs e)
+        {
+            MoveSelectedRule(1);
+        }
+
+        private void MoveSelectedRule(int offset)
+        {
+            int index = ruleList.SelectedIndex;
+            int newIndex = index + offset;
+            if (index < 0 || newIndex < 0 || newIndex >= rules.Count)
+            {
+                return;
+            }
+
+            LogColorRule rule = rules[index];
+            rules.RemoveAt(index);
+            rules.Insert(newIndex, rule);
+            RefreshRuleList(newIndex);
+            RefreshPreview();
+        }
+
+        private void RestoreDefaults_Click(object sender, EventArgs e)
+        {
+            rules.Clear();
+            rules.AddRange(LogColorRule.CreateDefaults());
+            RefreshRuleList(0);
+            RefreshPreview();
+        }
+
+        private void RefreshPreview()
+        {
+            int selectionStart = previewBox.SelectionStart;
+            int selectionLength = previewBox.SelectionLength;
+            string text = previewBox.Text;
+            LogColorizer.Apply(previewBox, 0, text.Length, text, rules, previewBox.Font, previewBoldFont);
+            previewBox.Select(Math.Min(selectionStart, previewBox.TextLength), Math.Min(selectionLength, Math.Max(0, previewBox.TextLength - selectionStart)));
+        }
+    }
+}

AppDiagnostic/DiagApi.cs

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

AppDiagnostic/DiagnosticLogFormatter.cs

@@ -0,0 +1,24 @@
+using AppDiagnostic.Logging;
+using System;
+
+namespace AppDiagnostic
+{
+    public static class DiagnosticLogFormatter
+    {
+        public static string Format(DiagnosticLogEntry entry)
+        {
+            if (entry == null)
+            {
+                return string.Empty;
+            }
+
+            string level = (entry.Level ?? string.Empty).ToUpperInvariant().PadRight(5);
+            string application = string.IsNullOrWhiteSpace(entry.ApplicationName) ? "Unknown" : entry.ApplicationName;
+            string logger = entry.LoggerName ?? string.Empty;
+            string message = entry.Message ?? string.Empty;
+            string exception = string.IsNullOrWhiteSpace(entry.Exception) ? string.Empty : Environment.NewLine + entry.Exception;
+
+            return $"{entry.TimestampUtc.ToLocalTime():yyyy-MM-dd HH:mm:ss.fff}|{level}|{application}[{entry.ProcessId}]|{logger}|{message}{exception}";
+        }
+    }
+}

AppDiagnostic/DiagnosticLogStore.cs

@@ -0,0 +1,82 @@
+using AppDiagnostic.Logging;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace AppDiagnostic
+{
+    public sealed class DiagnosticLogStore
+    {
+        private const int MaximumLogCount = 10000;
+        private static readonly DiagnosticLogStore instance = new DiagnosticLogStore();
+        private readonly object syncRoot = new object();
+        private readonly List<DiagnosticLogEntry> entries = new List<DiagnosticLogEntry>();
+        private long totalReceived;
+        private long version;
+
+        private DiagnosticLogStore()
+        {
+        }
+
+        public static DiagnosticLogStore Instance => instance;
+
+        public long TotalReceived
+        {
+            get
+            {
+                lock (syncRoot)
+                {
+                    return totalReceived;
+                }
+            }
+        }
+
+        public long Version
+        {
+            get
+            {
+                lock (syncRoot)
+                {
+                    return version;
+                }
+            }
+        }
+
+        public void Add(DiagnosticLogEntry entry)
+        {
+            if (entry == null)
+            {
+                return;
+            }
+
+            lock (syncRoot)
+            {
+                entries.Add(entry);
+                totalReceived++;
+                version++;
+
+                int excessCount = entries.Count - MaximumLogCount;
+                if (excessCount > 0)
+                {
+                    entries.RemoveRange(0, excessCount);
+                }
+            }
+        }
+
+        public List<DiagnosticLogEntry> GetSnapshot()
+        {
+            lock (syncRoot)
+            {
+                return entries.ToList();
+            }
+        }
+
+        public void Clear()
+        {
+            lock (syncRoot)
+            {
+                entries.Clear();
+                version++;
+            }
+        }
+    }
+}

AppDiagnostic/DiagnosticPipeServer.cs

@@ -0,0 +1,164 @@
+using AppDiagnostic.Logging;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Pipes;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace AppDiagnostic
+{
+    public sealed class DiagnosticPipeServer : IDisposable
+    {
+        private readonly Action<DiagnosticLogEntry> messageReceived;
+        private readonly CancellationTokenSource cancellation = new CancellationTokenSource();
+        private readonly object syncRoot = new object();
+        private readonly List<NamedPipeServerStream> connectedClients = new List<NamedPipeServerStream>();
+        private NamedPipeServerStream waitingServer;
+        private Task serverTask;
+
+        public DiagnosticPipeServer(Action<DiagnosticLogEntry> messageReceived)
+        {
+            this.messageReceived = messageReceived ?? throw new ArgumentNullException(nameof(messageReceived));
+        }
+
+        public int ConnectedClientCount
+        {
+            get
+            {
+                lock (syncRoot)
+                {
+                    return connectedClients.Count;
+                }
+            }
+        }
+
+        public void Start()
+        {
+            if (serverTask != null)
+            {
+                return;
+            }
+
+            serverTask = Task.Run((Action)AcceptConnections);
+        }
+
+        private void AcceptConnections()
+        {
+            while (!cancellation.IsCancellationRequested)
+            {
+                NamedPipeServerStream server = null;
+
+                try
+                {
+                    server = new NamedPipeServerStream(DiagnosticProtocol.DefaultPipeName, PipeDirection.In, NamedPipeServerStream.MaxAllowedServerInstances, PipeTransmissionMode.Byte, PipeOptions.Asynchronous);
+
+                    lock (syncRoot)
+                    {
+                        waitingServer = server;
+                    }
+
+                    server.WaitForConnection();
+
+                    lock (syncRoot)
+                    {
+                        waitingServer = null;
+                        connectedClients.Add(server);
+                    }
+
+                    NamedPipeServerStream connectedServer = server;
+                    server = null;
+                    Task.Run(() => ReadClient(connectedServer));
+                }
+                catch (ObjectDisposedException)
+                {
+                    if (!cancellation.IsCancellationRequested)
+                    {
+                        throw;
+                    }
+                }
+                catch (IOException)
+                {
+                    if (!cancellation.IsCancellationRequested)
+                    {
+                        Thread.Sleep(250);
+                    }
+                }
+                finally
+                {
+                    lock (syncRoot)
+                    {
+                        if (ReferenceEquals(waitingServer, server))
+                        {
+                            waitingServer = null;
+                        }
+                    }
+
+                    server?.Dispose();
+                }
+            }
+        }
+
+        private void ReadClient(NamedPipeServerStream client)
+        {
+            try
+            {
+                while (client.IsConnected && !cancellation.IsCancellationRequested)
+                {
+                    DiagnosticLogEntry entry = DiagnosticMessageSerializer.ReadFramed(client);
+                    messageReceived(entry);
+                }
+            }
+            catch (EndOfStreamException)
+            {
+                // The producer application was closed.
+            }
+            catch (IOException)
+            {
+                // The producer application disconnected.
+            }
+            catch (ObjectDisposedException)
+            {
+                // The diagnostic application is shutting down.
+            }
+            finally
+            {
+                lock (syncRoot)
+                {
+                    connectedClients.Remove(client);
+                }
+
+                client.Dispose();
+            }
+        }
+
+        public void Dispose()
+        {
+            cancellation.Cancel();
+
+            lock (syncRoot)
+            {
+                waitingServer?.Dispose();
+                waitingServer = null;
+
+                foreach (NamedPipeServerStream client in connectedClients.ToArray())
+                {
+                    client.Dispose();
+                }
+
+                connectedClients.Clear();
+            }
+
+            try
+            {
+                serverTask?.Wait(2000);
+            }
+            catch (AggregateException)
+            {
+                // Cancellation during shutdown is expected.
+            }
+
+            cancellation.Dispose();
+        }
+    }
+}

AppDiagnostic/LogAdapter.cs

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

AppDiagnostic/LogColorRule.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+
+namespace AppDiagnostic
+{
+    [Serializable]
+    public sealed class LogColorRule
+    {
+        public bool Enabled { get; set; } = true;
+        public string Pattern { get; set; } = string.Empty;
+        public int ForeColorArgb { get; set; } = Color.Black.ToArgb();
+        public int BackColorArgb { get; set; }
+        public bool UseBackColor { get; set; }
+        public bool Bold { get; set; }
+
+        public Color ForeColor => Color.FromArgb(ForeColorArgb);
+        public Color BackColor => Color.FromArgb(BackColorArgb);
+
+        public LogColorRule Clone()
+        {
+            return new LogColorRule
+            {
+                Enabled = Enabled,
+                Pattern = Pattern,
+                ForeColorArgb = ForeColorArgb,
+                BackColorArgb = BackColorArgb,
+                UseBackColor = UseBackColor,
+                Bold = Bold
+            };
+        }
+
+        public override string ToString()
+        {
+            string state = Enabled ? string.Empty : "[disabled] ";
+            return state + Pattern;
+        }
+
+        public static List<LogColorRule> CreateDefaults()
+        {
+            return new List<LogColorRule>
+            {
+                Create("|TRACE|", Color.DimGray, false),
+                Create("|DEBUG|", Color.RoyalBlue, false),
+                Create("|INFO |", Color.ForestGreen, false),
+                Create("|WARN |", Color.DarkOrange, true),
+                Create("|ERROR|", Color.Crimson, true),
+                Create("|FATAL|", Color.White, true, Color.DarkRed)
+            };
+        }
+
+        private static LogColorRule Create(string pattern, Color foreground, bool bold, Color? background = null)
+        {
+            return new LogColorRule
+            {
+                Enabled = true,
+                Pattern = pattern,
+                ForeColorArgb = foreground.ToArgb(),
+                BackColorArgb = background?.ToArgb() ?? Color.Empty.ToArgb(),
+                UseBackColor = background.HasValue,
+                Bold = bold
+            };
+        }
+    }
+}

AppDiagnostic/LogColorRuleRepository.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml.Serialization;
+
+namespace AppDiagnostic
+{
+    public static class LogColorRuleRepository
+    {
+        private static readonly string settingsFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Sensus", "AppDiagnostic");
+        private static readonly string settingsPath = Path.Combine(settingsFolder, "color-rules.xml");
+
+        public static List<LogColorRule> Load()
+        {
+            try
+            {
+                if (!File.Exists(settingsPath))
+                {
+                    return LogColorRule.CreateDefaults();
+                }
+
+                var serializer = new XmlSerializer(typeof(List<LogColorRule>));
+                using (FileStream stream = File.OpenRead(settingsPath))
+                {
+                    var rules = serializer.Deserialize(stream) as List<LogColorRule>;
+                    return rules == null || rules.Count == 0 ? LogColorRule.CreateDefaults() : rules;
+                }
+            }
+            catch
+            {
+                return LogColorRule.CreateDefaults();
+            }
+        }
+
+        public static void Save(IEnumerable<LogColorRule> rules)
+        {
+            Directory.CreateDirectory(settingsFolder);
+
+            var serializer = new XmlSerializer(typeof(List<LogColorRule>));
+            using (FileStream stream = File.Create(settingsPath))
+            {
+                serializer.Serialize(stream, new List<LogColorRule>(rules));
+            }
+        }
+    }
+}

AppDiagnostic/LogColorizer.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace AppDiagnostic
+{
+    public static class LogColorizer
+    {
+        public static void Apply(RichTextBox target, int startIndex, int length, string text, IEnumerable<LogColorRule> rules, Font regularFont, Font boldFont)
+        {
+            if (target == null || length <= 0)
+            {
+                return;
+            }
+
+            target.Select(startIndex, length);
+            target.SelectionColor = target.ForeColor;
+            target.SelectionBackColor = target.BackColor;
+            target.SelectionFont = regularFont;
+
+            foreach (LogColorRule rule in rules)
+            {
+                if (rule == null || !rule.Enabled || string.IsNullOrEmpty(rule.Pattern))
+                {
+                    continue;
+                }
+
+                int searchIndex = 0;
+                while (searchIndex < text.Length)
+                {
+                    int matchIndex = text.IndexOf(rule.Pattern, searchIndex, StringComparison.OrdinalIgnoreCase);
+                    if (matchIndex < 0)
+                    {
+                        break;
+                    }
+
+                    target.Select(startIndex + matchIndex, rule.Pattern.Length);
+                    target.SelectionColor = rule.ForeColor;
+                    target.SelectionBackColor = rule.UseBackColor ? rule.BackColor : target.BackColor;
+                    target.SelectionFont = rule.Bold ? boldFont : regularFont;
+                    searchIndex = matchIndex + rule.Pattern.Length;
+                }
+            }
+        }
+    }
+}

AppDiagnostic/LogFilter.cs

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

AppDiagnostic/MainForm.Designer.cs

@@ -0,0 +1,309 @@
+namespace AppDiagnostic
+{
+    partial class MainForm
+    {
+        private System.ComponentModel.IContainer components = null;
+        private System.Windows.Forms.ToolStrip mainToolStrip;
+        private System.Windows.Forms.ToolStripButton pauseButton;
+        private System.Windows.Forms.ToolStripButton refreshButton;
+        private System.Windows.Forms.ToolStripButton clearButton;
+        private System.Windows.Forms.ToolStripButton saveButton;
+        private System.Windows.Forms.ToolStripButton copyButton;
+        private System.Windows.Forms.ToolStripButton copyAllButton;
+        private System.Windows.Forms.ToolStripButton wrapButton;
+        private System.Windows.Forms.ToolStripButton autoScrollButton;
+        private System.Windows.Forms.ToolStripButton alwaysOnTopButton;
+        private System.Windows.Forms.ToolStripButton colorRulesButton;
+        private System.Windows.Forms.ToolStripButton closeButton;
+        private System.Windows.Forms.TableLayoutPanel filterPanel;
+        private System.Windows.Forms.Label filterLabel;
+        private System.Windows.Forms.TextBox filterTextBox;
+        private System.Windows.Forms.Label levelLabel;
+        private System.Windows.Forms.ComboBox levelComboBox;
+        private System.Windows.Forms.Label applicationLabel;
+        private System.Windows.Forms.ComboBox applicationComboBox;
+        private System.Windows.Forms.Button applyFilterButton;
+        private System.Windows.Forms.Button clearFilterButton;
+        private System.Windows.Forms.RichTextBox logView;
+        private System.Windows.Forms.StatusStrip statusStrip;
+        private System.Windows.Forms.ToolStripStatusLabel receiverStatusLabel;
+        private System.Windows.Forms.ToolStripStatusLabel statusSpacer;
+        private System.Windows.Forms.ToolStripStatusLabel countStatusLabel;
+        private System.Windows.Forms.ContextMenuStrip logContextMenu;
+        private System.Windows.Forms.ToolStripMenuItem copySelectionMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem copyLineMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem copyAllMenuItem;
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && components != null)
+            {
+                components.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.mainToolStrip = new System.Windows.Forms.ToolStrip();
+            this.pauseButton = new System.Windows.Forms.ToolStripButton();
+            this.refreshButton = new System.Windows.Forms.ToolStripButton();
+            this.clearButton = new System.Windows.Forms.ToolStripButton();
+            this.saveButton = new System.Windows.Forms.ToolStripButton();
+            this.copyButton = new System.Windows.Forms.ToolStripButton();
+            this.copyAllButton = new System.Windows.Forms.ToolStripButton();
+            this.wrapButton = new System.Windows.Forms.ToolStripButton();
+            this.autoScrollButton = new System.Windows.Forms.ToolStripButton();
+            this.alwaysOnTopButton = new System.Windows.Forms.ToolStripButton();
+            this.colorRulesButton = new System.Windows.Forms.ToolStripButton();
+            this.closeButton = new System.Windows.Forms.ToolStripButton();
+            this.filterPanel = new System.Windows.Forms.TableLayoutPanel();
+            this.filterLabel = new System.Windows.Forms.Label();
+            this.filterTextBox = new System.Windows.Forms.TextBox();
+            this.levelLabel = new System.Windows.Forms.Label();
+            this.levelComboBox = new System.Windows.Forms.ComboBox();
+            this.applicationLabel = new System.Windows.Forms.Label();
+            this.applicationComboBox = new System.Windows.Forms.ComboBox();
+            this.applyFilterButton = new System.Windows.Forms.Button();
+            this.clearFilterButton = new System.Windows.Forms.Button();
+            this.logContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.copySelectionMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.copyLineMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.copyAllMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.logView = new System.Windows.Forms.RichTextBox();
+            this.statusStrip = new System.Windows.Forms.StatusStrip();
+            this.receiverStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
+            this.statusSpacer = new System.Windows.Forms.ToolStripStatusLabel();
+            this.countStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
+            this.mainToolStrip.SuspendLayout();
+            this.filterPanel.SuspendLayout();
+            this.logContextMenu.SuspendLayout();
+            this.statusStrip.SuspendLayout();
+            this.SuspendLayout();
+            //
+            // mainToolStrip
+            //
+            this.mainToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
+            this.mainToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+                this.pauseButton,
+                this.refreshButton,
+                this.clearButton,
+                this.saveButton,
+                new System.Windows.Forms.ToolStripSeparator(),
+                this.copyButton,
+                this.copyAllButton,
+                new System.Windows.Forms.ToolStripSeparator(),
+                this.wrapButton,
+                this.autoScrollButton,
+                this.alwaysOnTopButton,
+                this.colorRulesButton,
+                this.closeButton});
+            this.mainToolStrip.Location = new System.Drawing.Point(0, 0);
+            this.mainToolStrip.Name = "mainToolStrip";
+            this.mainToolStrip.Padding = new System.Windows.Forms.Padding(6, 3, 6, 3);
+            this.mainToolStrip.Size = new System.Drawing.Size(1184, 31);
+            this.mainToolStrip.TabIndex = 0;
+            //
+            // pauseButton
+            //
+            this.pauseButton.CheckOnClick = true;
+            this.pauseButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.pauseButton.Text = "Pause";
+            this.pauseButton.ToolTipText = "Pause screen updates while continuing to receive logs";
+            this.pauseButton.Click += new System.EventHandler(this.pauseButton_Click);
+            //
+            // refreshButton
+            //
+            this.refreshButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.refreshButton.Text = "Refresh";
+            this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
+            //
+            // clearButton
+            //
+            this.clearButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.clearButton.Text = "Clear";
+            this.clearButton.Click += new System.EventHandler(this.clearButton_Click);
+            //
+            // saveButton
+            //
+            this.saveButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.saveButton.Text = "Save...";
+            this.saveButton.Click += new System.EventHandler(this.saveButton_Click);
+            //
+            // copyButton
+            //
+            this.copyButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.copyButton.Text = "Copy";
+            this.copyButton.ToolTipText = "Copy selected text or the current log line";
+            this.copyButton.Click += new System.EventHandler(this.copyButton_Click);
+            //
+            // copyAllButton
+            //
+            this.copyAllButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.copyAllButton.Text = "Copy all";
+            this.copyAllButton.Click += new System.EventHandler(this.copyAllButton_Click);
+            //
+            // wrapButton
+            //
+            this.wrapButton.Checked = true;
+            this.wrapButton.CheckOnClick = true;
+            this.wrapButton.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.wrapButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.wrapButton.Text = "Wrap lines";
+            this.wrapButton.Click += new System.EventHandler(this.wrapButton_Click);
+            //
+            // autoScrollButton
+            //
+            this.autoScrollButton.Checked = true;
+            this.autoScrollButton.CheckOnClick = true;
+            this.autoScrollButton.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.autoScrollButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.autoScrollButton.Text = "Auto-scroll";
+            //
+            // alwaysOnTopButton
+            //
+            this.alwaysOnTopButton.CheckOnClick = true;
+            this.alwaysOnTopButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.alwaysOnTopButton.Text = "Always on top";
+            this.alwaysOnTopButton.Click += new System.EventHandler(this.alwaysOnTopButton_Click);
+            //
+            // colorRulesButton
+            //
+            this.colorRulesButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.colorRulesButton.Text = "Color rules...";
+            this.colorRulesButton.Click += new System.EventHandler(this.colorRulesButton_Click);
+            //
+            // closeButton
+            //
+            this.closeButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.closeButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.closeButton.Text = "Close";
+            this.closeButton.Click += new System.EventHandler(this.closeButton_Click);
+            //
+            // filterPanel
+            //
+            this.filterPanel.ColumnCount = 8;
+            this.filterPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 42F));
+            this.filterPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.filterPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 42F));
+            this.filterPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 105F));
+            this.filterPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 72F));
+            this.filterPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 180F));
+            this.filterPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 66F));
+            this.filterPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 66F));
+            this.filterPanel.Controls.Add(this.filterLabel, 0, 0);
+            this.filterPanel.Controls.Add(this.filterTextBox, 1, 0);
+            this.filterPanel.Controls.Add(this.levelLabel, 2, 0);
+            this.filterPanel.Controls.Add(this.levelComboBox, 3, 0);
+            this.filterPanel.Controls.Add(this.applicationLabel, 4, 0);
+            this.filterPanel.Controls.Add(this.applicationComboBox, 5, 0);
+            this.filterPanel.Controls.Add(this.applyFilterButton, 6, 0);
+            this.filterPanel.Controls.Add(this.clearFilterButton, 7, 0);
+            this.filterPanel.Dock = System.Windows.Forms.DockStyle.Top;
+            this.filterPanel.Location = new System.Drawing.Point(0, 31);
+            this.filterPanel.Name = "filterPanel";
+            this.filterPanel.Padding = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.filterPanel.RowCount = 1;
+            this.filterPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.filterPanel.Size = new System.Drawing.Size(1184, 38);
+            this.filterPanel.TabIndex = 1;
+            //
+            // filter controls
+            //
+            this.filterLabel.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.filterLabel.AutoSize = true;
+            this.filterLabel.Text = "Filter";
+            this.filterTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.filterTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.filterTextBox_KeyDown);
+            this.levelLabel.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.levelLabel.AutoSize = true;
+            this.levelLabel.Text = "Level";
+            this.levelComboBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.levelComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.levelComboBox.SelectedIndexChanged += new System.EventHandler(this.filterValueChanged);
+            this.applicationLabel.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.applicationLabel.AutoSize = true;
+            this.applicationLabel.Text = "Application";
+            this.applicationComboBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.applicationComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.applicationComboBox.SelectedIndexChanged += new System.EventHandler(this.filterValueChanged);
+            this.applyFilterButton.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.applyFilterButton.Text = "Apply";
+            this.applyFilterButton.Click += new System.EventHandler(this.applyFilterButton_Click);
+            this.clearFilterButton.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.clearFilterButton.Text = "Reset";
+            this.clearFilterButton.Click += new System.EventHandler(this.clearFilterButton_Click);
+            //
+            // logContextMenu
+            //
+            this.logContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+                this.copySelectionMenuItem,
+                this.copyLineMenuItem,
+                this.copyAllMenuItem});
+            this.copySelectionMenuItem.Text = "Copy selection";
+            this.copySelectionMenuItem.Click += new System.EventHandler(this.copySelectionMenuItem_Click);
+            this.copyLineMenuItem.Text = "Copy current line";
+            this.copyLineMenuItem.Click += new System.EventHandler(this.copyLineMenuItem_Click);
+            this.copyAllMenuItem.Text = "Copy all visible logs";
+            this.copyAllMenuItem.Click += new System.EventHandler(this.copyAllButton_Click);
+            //
+            // logView
+            //
+            this.logView.BackColor = System.Drawing.SystemColors.Window;
+            this.logView.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.logView.ContextMenuStrip = this.logContextMenu;
+            this.logView.DetectUrls = false;
+            this.logView.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.logView.Font = new System.Drawing.Font("Consolas", 9F);
+            this.logView.HideSelection = false;
+            this.logView.Location = new System.Drawing.Point(0, 69);
+            this.logView.Name = "logView";
+            this.logView.ReadOnly = true;
+            this.logView.Size = new System.Drawing.Size(1184, 554);
+            this.logView.TabIndex = 2;
+            this.logView.Text = "";
+            this.logView.WordWrap = true;
+            //
+            // statusStrip
+            //
+            this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+                this.receiverStatusLabel,
+                this.statusSpacer,
+                this.countStatusLabel});
+            this.statusStrip.Location = new System.Drawing.Point(0, 623);
+            this.statusStrip.Name = "statusStrip";
+            this.statusStrip.Size = new System.Drawing.Size(1184, 22);
+            this.statusStrip.TabIndex = 3;
+            this.receiverStatusLabel.Text = "Listening";
+            this.statusSpacer.Spring = true;
+            this.countStatusLabel.Text = "Received: 0 | Visible: 0";
+            //
+            // MainForm
+            //
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1184, 645);
+            this.Controls.Add(this.logView);
+            this.Controls.Add(this.filterPanel);
+            this.Controls.Add(this.mainToolStrip);
+            this.Controls.Add(this.statusStrip);
+            this.KeyPreview = true;
+            this.MinimumSize = new System.Drawing.Size(860, 480);
+            this.Name = "MainForm";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "Application live diagnostic";
+            this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.MainForm_KeyDown);
+            this.mainToolStrip.ResumeLayout(false);
+            this.mainToolStrip.PerformLayout();
+            this.filterPanel.ResumeLayout(false);
+            this.filterPanel.PerformLayout();
+            this.logContextMenu.ResumeLayout(false);
+            this.statusStrip.ResumeLayout(false);
+            this.statusStrip.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+        }
+    }
+}

AppDiagnostic/MainForm.cs

@@ -0,0 +1,446 @@
+using AppDiagnostic.Logging;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Windows.Forms;
+
+namespace AppDiagnostic
+{
+    public partial class MainForm : Form
+    {
+        private readonly Func<int> connectedClientCountProvider;
+        private readonly Func<bool> activationRequestProvider;
+        private readonly Timer refreshTimer;
+        private readonly Font regularLogFont;
+        private readonly Font boldLogFont;
+        private List<LogColorRule> colorRules;
+        private long lastRenderedVersion = -1;
+        private int observedEntryCount;
+        private int visibleEntryCount;
+        private bool loadingFilters;
+
+        public MainForm() : this(null, null)
+        {
+        }
+
+        public MainForm(Func<int> connectedClientCountProvider, Func<bool> activationRequestProvider)
+        {
+            this.connectedClientCountProvider = connectedClientCountProvider;
+            this.activationRequestProvider = activationRequestProvider;
+            InitializeComponent();
+            Icon = Properties.Resources.TBF_icon;
+
+            regularLogFont = new Font(logView.Font, FontStyle.Regular);
+            boldLogFont = new Font(logView.Font, FontStyle.Bold);
+            colorRules = LogColorRuleRepository.Load();
+
+            InitializeFilters();
+
+            refreshTimer = new Timer { Interval = 250 };
+            refreshTimer.Tick += refreshTimer_Tick;
+            refreshTimer.Start();
+
+            RefreshView(true);
+        }
+
+        protected override void OnFormClosing(FormClosingEventArgs e)
+        {
+            refreshTimer.Stop();
+            refreshTimer.Dispose();
+            regularLogFont.Dispose();
+            boldLogFont.Dispose();
+            base.OnFormClosing(e);
+        }
+
+        private void InitializeFilters()
+        {
+            loadingFilters = true;
+            levelComboBox.Items.AddRange(new object[] { "All levels", "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "FATAL" });
+            levelComboBox.SelectedIndex = 0;
+            applicationComboBox.Items.Add("All applications");
+            applicationComboBox.SelectedIndex = 0;
+            loadingFilters = false;
+        }
+
+        private void refreshTimer_Tick(object sender, EventArgs e)
+        {
+            ProcessActivationRequest();
+            RefreshView(false);
+        }
+
+        private void ProcessActivationRequest()
+        {
+            if (activationRequestProvider == null || !activationRequestProvider())
+            {
+                return;
+            }
+
+            if (WindowState == FormWindowState.Minimized)
+            {
+                WindowState = FormWindowState.Normal;
+            }
+
+            Show();
+            BringToFront();
+            Activate();
+        }
+
+        private void RefreshView(bool forceFullRefresh)
+        {
+            List<DiagnosticLogEntry> snapshot = DiagnosticLogStore.Instance.GetSnapshot();
+            UpdateApplicationFilter(snapshot);
+
+            if (pauseButton.Checked)
+            {
+                UpdateStatus(snapshot.Count);
+                return;
+            }
+
+            long currentVersion = DiagnosticLogStore.Instance.Version;
+            if (!forceFullRefresh && currentVersion == lastRenderedVersion)
+            {
+                UpdateStatus(snapshot.Count);
+                return;
+            }
+
+            bool canAppend = !forceFullRefresh && snapshot.Count > observedEntryCount;
+            if (canAppend)
+            {
+                AppendEntries(snapshot.Skip(observedEntryCount));
+            }
+            else
+            {
+                RebuildView(snapshot);
+            }
+
+            observedEntryCount = snapshot.Count;
+            lastRenderedVersion = currentVersion;
+            UpdateStatus(snapshot.Count);
+        }
+
+        private void RebuildView(IEnumerable<DiagnosticLogEntry> entries)
+        {
+            logView.SuspendLayout();
+            logView.Clear();
+            visibleEntryCount = 0;
+            AppendEntries(entries, false);
+            logView.ResumeLayout();
+
+            if (autoScrollButton.Checked)
+            {
+                ScrollToEnd();
+            }
+        }
+
+        private void AppendEntries(IEnumerable<DiagnosticLogEntry> entries, bool scrollAfterAppend = true)
+        {
+            int originalSelectionStart = logView.SelectionStart;
+            int originalSelectionLength = logView.SelectionLength;
+
+            foreach (DiagnosticLogEntry entry in entries)
+            {
+                if (!MatchesFilter(entry))
+                {
+                    continue;
+                }
+
+                AppendEntry(entry);
+                visibleEntryCount++;
+            }
+
+            if (scrollAfterAppend && autoScrollButton.Checked)
+            {
+                ScrollToEnd();
+            }
+            else if (!autoScrollButton.Checked)
+            {
+                int safeStart = Math.Min(originalSelectionStart, logView.TextLength);
+                int safeLength = Math.Min(originalSelectionLength, logView.TextLength - safeStart);
+                logView.Select(safeStart, safeLength);
+            }
+        }
+
+        private void AppendEntry(DiagnosticLogEntry entry)
+        {
+            string text = DiagnosticLogFormatter.Format(entry);
+
+            if (logView.TextLength > 0)
+            {
+                logView.AppendText(Environment.NewLine);
+            }
+
+            int startIndex = logView.TextLength;
+            logView.AppendText(text);
+            LogColorizer.Apply(logView, startIndex, text.Length, text, colorRules, regularLogFont, boldLogFont);
+            logView.Select(logView.TextLength, 0);
+        }
+
+        private bool MatchesFilter(DiagnosticLogEntry entry)
+        {
+            string selectedLevel = levelComboBox.SelectedItem as string;
+            if (!string.IsNullOrEmpty(selectedLevel) && selectedLevel != "All levels" && !string.Equals(entry.Level, selectedLevel, StringComparison.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+
+            string selectedApplication = applicationComboBox.SelectedItem as string;
+            if (!string.IsNullOrEmpty(selectedApplication) && selectedApplication != "All applications" && !string.Equals(entry.ApplicationName, selectedApplication, StringComparison.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+
+            string filter = filterTextBox.Text.Trim();
+            return filter.Length == 0 || DiagnosticLogFormatter.Format(entry).IndexOf(filter, StringComparison.OrdinalIgnoreCase) >= 0;
+        }
+
+        private void UpdateApplicationFilter(IEnumerable<DiagnosticLogEntry> entries)
+        {
+            string selectedApplication = applicationComboBox.SelectedItem as string ?? "All applications";
+            List<string> applications = entries.Select(entry => entry.ApplicationName).Where(name => !string.IsNullOrWhiteSpace(name)).Distinct(StringComparer.OrdinalIgnoreCase).OrderBy(name => name).ToList();
+            List<string> currentApplications = applicationComboBox.Items.Cast<string>().Skip(1).ToList();
+
+            if (applications.SequenceEqual(currentApplications, StringComparer.OrdinalIgnoreCase))
+            {
+                return;
+            }
+
+            loadingFilters = true;
+            applicationComboBox.BeginUpdate();
+            applicationComboBox.Items.Clear();
+            applicationComboBox.Items.Add("All applications");
+            applicationComboBox.Items.AddRange(applications.Cast<object>().ToArray());
+            applicationComboBox.SelectedItem = applicationComboBox.Items.Cast<string>().FirstOrDefault(item => string.Equals(item, selectedApplication, StringComparison.OrdinalIgnoreCase)) ?? "All applications";
+            applicationComboBox.EndUpdate();
+            loadingFilters = false;
+        }
+
+        private void UpdateStatus(int storedCount)
+        {
+            int clients = connectedClientCountProvider?.Invoke() ?? 0;
+            receiverStatusLabel.Text = pauseButton.Checked ? $"Paused | Connected sources: {clients}" : $"Listening | Connected sources: {clients}";
+            countStatusLabel.Text = $"Received: {DiagnosticLogStore.Instance.TotalReceived:N0} | Stored: {storedCount:N0} | Visible: {visibleEntryCount:N0}";
+        }
+
+        private void ScrollToEnd()
+        {
+            logView.Select(logView.TextLength, 0);
+            logView.ScrollToCaret();
+        }
+
+        private void pauseButton_Click(object sender, EventArgs e)
+        {
+            pauseButton.Text = pauseButton.Checked ? "Resume" : "Pause";
+
+            if (!pauseButton.Checked)
+            {
+                RefreshView(true);
+            }
+            else
+            {
+                UpdateStatus(DiagnosticLogStore.Instance.GetSnapshot().Count);
+            }
+        }
+
+        private void refreshButton_Click(object sender, EventArgs e)
+        {
+            RefreshView(true);
+        }
+
+        private void clearButton_Click(object sender, EventArgs e)
+        {
+            DiagnosticLogStore.Instance.Clear();
+            observedEntryCount = 0;
+            visibleEntryCount = 0;
+            RefreshView(true);
+        }
+
+        private void saveButton_Click(object sender, EventArgs e)
+        {
+            using (var dialog = new SaveFileDialog())
+            {
+                dialog.Filter = "Text files (*.txt)|*.txt|Log files (*.log)|*.log|All files (*.*)|*.*";
+                dialog.Title = "Save visible diagnostic logs";
+                dialog.DefaultExt = "log";
+                dialog.FileName = $"AppDiagnostic_{DateTime.Now:yyyyMMdd_HHmmss}.log";
+
+                if (dialog.ShowDialog(this) != DialogResult.OK)
+                {
+                    return;
+                }
+
+                try
+                {
+                    File.WriteAllText(dialog.FileName, logView.Text);
+                }
+                catch (Exception exception)
+                {
+                    MessageBox.Show(this, $"Unable to save diagnostic logs: {exception.Message}", "Save error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
+
+        private void copyButton_Click(object sender, EventArgs e)
+        {
+            CopySelectionOrCurrentLine();
+        }
+
+        private void copySelectionMenuItem_Click(object sender, EventArgs e)
+        {
+            if (logView.SelectionLength > 0)
+            {
+                CopyText(logView.SelectedText);
+            }
+        }
+
+        private void copyLineMenuItem_Click(object sender, EventArgs e)
+        {
+            CopyCurrentLine();
+        }
+
+        private void copyAllButton_Click(object sender, EventArgs e)
+        {
+            CopyText(logView.Text);
+        }
+
+        private void CopySelectionOrCurrentLine()
+        {
+            if (logView.SelectionLength > 0)
+            {
+                CopyText(logView.SelectedText);
+            }
+            else
+            {
+                CopyCurrentLine();
+            }
+        }
+
+        private void CopyCurrentLine()
+        {
+            if (logView.Lines.Length == 0)
+            {
+                return;
+            }
+
+            int lineIndex = logView.GetLineFromCharIndex(logView.SelectionStart);
+            if (lineIndex >= 0 && lineIndex < logView.Lines.Length)
+            {
+                CopyText(logView.Lines[lineIndex]);
+            }
+        }
+
+        private void CopyText(string text)
+        {
+            if (string.IsNullOrEmpty(text))
+            {
+                return;
+            }
+
+            try
+            {
+                Clipboard.SetText(text);
+            }
+            catch (Exception exception)
+            {
+                MessageBox.Show(this, $"Unable to copy text: {exception.Message}", "Clipboard error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void wrapButton_Click(object sender, EventArgs e)
+        {
+            logView.WordWrap = wrapButton.Checked;
+        }
+
+        private void alwaysOnTopButton_Click(object sender, EventArgs e)
+        {
+            TopMost = alwaysOnTopButton.Checked;
+        }
+
+        private void colorRulesButton_Click(object sender, EventArgs e)
+        {
+            using (var editor = new ColorRuleEditorForm(colorRules))
+            {
+                if (editor.ShowDialog(this) != DialogResult.OK)
+                {
+                    return;
+                }
+
+                colorRules = editor.Rules;
+
+                try
+                {
+                    LogColorRuleRepository.Save(colorRules);
+                }
+                catch (Exception exception)
+                {
+                    MessageBox.Show(this, $"Unable to save color rules: {exception.Message}", "Settings error", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                }
+
+                RefreshView(true);
+            }
+        }
+
+        private void applyFilterButton_Click(object sender, EventArgs e)
+        {
+            RefreshView(true);
+        }
+
+        private void clearFilterButton_Click(object sender, EventArgs e)
+        {
+            loadingFilters = true;
+            filterTextBox.Clear();
+            levelComboBox.SelectedIndex = 0;
+            applicationComboBox.SelectedIndex = 0;
+            loadingFilters = false;
+            RefreshView(true);
+        }
+
+        private void filterValueChanged(object sender, EventArgs e)
+        {
+            if (!loadingFilters)
+            {
+                RefreshView(true);
+            }
+        }
+
+        private void filterTextBox_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                RefreshView(true);
+                e.SuppressKeyPress = true;
+            }
+            else if (e.KeyCode == Keys.Escape)
+            {
+                clearFilterButton_Click(sender, EventArgs.Empty);
+                e.SuppressKeyPress = true;
+            }
+        }
+
+        private void closeButton_Click(object sender, EventArgs e)
+        {
+            Close();
+        }
+
+        private void MainForm_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Control && e.KeyCode == Keys.F)
+            {
+                filterTextBox.Focus();
+                filterTextBox.SelectAll();
+                e.SuppressKeyPress = true;
+            }
+            else if (e.Control && e.KeyCode == Keys.S)
+            {
+                saveButton_Click(sender, EventArgs.Empty);
+                e.SuppressKeyPress = true;
+            }
+            else if (e.KeyCode == Keys.F5)
+            {
+                RefreshView(true);
+                e.SuppressKeyPress = true;
+            }
+        }
+    }
+}

AppDiagnostic/MainForm.resx

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

AppDiagnostic/Program.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+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()
+        {
+            bool isFirstInstance;
+
+            using (var instanceMutex = new Mutex(true, "Sensus.AppDiagnostic.SingleInstance", out isFirstInstance))
+            using (var activationEvent = new EventWaitHandle(false, EventResetMode.AutoReset, "Sensus.AppDiagnostic.Activate"))
+            {
+                if (!isFirstInstance)
+                {
+                    activationEvent.Set();
+                    return;
+                }
+
+                Application.EnableVisualStyles();
+                Application.SetCompatibleTextRenderingDefault(false);
+
+                using (var diagnosticServer = new DiagnosticPipeServer(DiagnosticLogStore.Instance.Add))
+                {
+                    diagnosticServer.Start();
+                    Application.Run(new MainForm(() => diagnosticServer.ConnectedClientCount, () => activationEvent.WaitOne(0)));
+                }
+            }
+        }
+    }
+}

AppDiagnostic/Properties/AssemblyInfo.cs

@@ -0,0 +1,33 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("AppDiagnostic")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("AppDiagnostic")]
+[assembly: AssemblyCopyright("Copyright ©  2024")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("fa9abad1-7184-4295-ade8-d44f2e3de6b2")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

AppDiagnostic/Properties/Resources.Designer.cs

@@ -0,0 +1,73 @@
+//------------------------------------------------------------------------------
+// <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 {
+    using System;
+    
+    
+    /// <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", "17.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 (object.ReferenceEquals(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;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        /// </summary>
+        internal static System.Drawing.Icon TBF_icon {
+            get {
+                object obj = ResourceManager.GetObject("TBF_icon", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
+    }
+}

AppDiagnostic/Properties/Resources.resx

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

AppDiagnostic/Properties/Settings.Designer.cs

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

AppDiagnostic/Properties/Settings.settings

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

AppDiagnostic/packages.config

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

Common/Common.csproj

@@ -17,7 +17,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -30,12 +30,17 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net">
-      <HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.2.2\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -64,6 +69,7 @@
       <DependentUpon>ModelessForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Formulas.cs" />
+    <Compile Include="CurrentUser.cs" />
     <Compile Include="GlobalData.cs" />
     <Compile Include="IMeasurementCorrection.cs" />
     <Compile Include="IOrderInfo.cs" />
@@ -76,6 +82,7 @@
     </Compile>
     <Compile Include="QuitAppException.cs" />
     <Compile Include="SerializableDictionary.cs" />
+    <Compile Include="StatisticalMetrics.cs" />
     <Compile Include="Telegram.cs" />
     <Compile Include="UIControls\CoolButtonCtrl.cs">
       <SubType>UserControl</SubType>
@@ -88,7 +95,9 @@
     <Compile Include="Utils.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Forms\ListViewEx.resx">
       <DependentUpon>ListViewEx.cs</DependentUpon>

Common/CurrentUser.cs

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

Common/DBSettings.cs

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

Common/Enums.cs

@@ -1,9 +1,10 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Runtime.InteropServices;
 
 namespace Common
 {
@@ -185,16 +186,70 @@ namespace Common
 		Count,
 	}
 
+    public enum FlowNames
+    {
+        QnQtQmin = 0,
+        Q3Q2Q1 = 1,
+        QpQi = 2,
+        Count,
+    }
+
     public enum ProfileType
     {
         Q3R,
         QnClassColdWater,
         QnClassHotWater,
         QpQi,
+        CompoundQ3RQ3R,
+        CompoundQnClassQnClass,
+        CompoundQ3RQnClass,
+        CompoundQnClassQ3R,
+        CompoundQpQiQpQi,
         Manual,
         Count,
     }
 
+    public enum FlowId
+    {
+        Any,
+        Q4,
+        Q3,
+        Q2,
+        Q1,
+        Q4Main,
+        Q3Main,
+        Q2Main,
+        Q1Main,
+        Q4Aux,
+        Q3Aux,
+        Q2Aux,
+        Q1Aux,
+        Qmax,
+        Qn,
+        Qt,
+        Qmin,
+        QmaxMain,
+        QnMain,
+        QtMain,
+        QminMain,
+        QmaxAux,
+        QnAux,
+        QtAux,
+        QminAux,
+        Qp,
+        Qp10,
+        Qi,
+        QpMain,
+        Qp10Main,
+        QiMain,
+        QpAux,
+        Qp10Aux,
+        QiAux,
+        Qdetected,
+        Qfall,
+        Qrise,
+    }
+
     public enum ErrorLimitType
     {
         Manual,
@@ -235,11 +290,20 @@ namespace Common
 		CompoundAux,
 		Compound,
 		HeatMeterVolume,
-		HeatMeterEnergy,
+        HeatMeterMass,//...MF
+        HeatMeterEnergy,
 		SingleOrCompound,		/// Only used when querying results
 	}
 
-	public enum Medium
+    public enum PulsesTypeByQuantity : short
+    {
+        [Description("dm3")]       Volume_dm3,
+        [Description("kg")]        Mass_kg,
+
+        Count
+	}
+
+    public enum Medium
 	{
         [Description("")]       NotSpecified,
 #if LANG_PL
@@ -266,11 +330,13 @@ namespace Common
         [Description("V")]      V,         /// vertical
         [Description("STR")]    S,         /// standrohre
         [Description("F")]      F,         /// fall
+        [Description("H/V")]    HV,        /// horizontal / vertical
 #else
-        [Description("H")] H,              /// horizontal
-        [Description("V")] V,              /// vertical
-        [Description("S")] S,              /// steig
-        [Description("F")] F,              /// fall
+        [Description("H")]      H,         /// horizontal
+        [Description("V")]      V,         /// vertical
+        [Description("S")]      S,         /// steig
+        [Description("F")]      F,         /// fall
+        [Description("H/V")]    HV,        /// horizontal / vertical
 #endif
 		Count
     }
@@ -464,8 +530,10 @@ namespace Common
     public enum TestProfile
     {
         UserDefined,
+        UserDefinedCompound,
         UserDefinedHeatMeter,
         Protected,                  /// The first protected one
+        ProtectedCompound,
         ProtectedHeatMeter,
     }
 
@@ -640,7 +708,16 @@ namespace Common
         Count,
     }
 
-	public enum ImageRotation
+    public enum DivResolution : int
+    {
+        [Description("1 ms (0.25 s)")]  _1ms = 0,
+        [Description("2 ms (0.5 s)")]   _2ms = 1,
+        [Description("4 ms (1 s)")]     _4ms = 2,
+        [Description("8 ms (2 s)")]     _8ms = 3,
+        Count,
+    }
+
+    public enum ImageRotation
 	{
 		[Description("0 deg")]		None,
 		[Description("90 deg")]		Deg90,
@@ -762,6 +839,15 @@ namespace Common
         E63 = (1L << 62),
     }
 
+    //...MF
+    public enum FlowType : int
+    {
+        none,
+        volume,
+        mass,
+        Count,
+    }
+
     #region iPERL enums
 
     public enum Side

Common/Forms/ListViewEx.cs

@@ -61,6 +61,9 @@ namespace Common.Forms
 		private const int HDN_ITEMCHANGINGW = (HDN_FIRST-20);
 		#endregion
 
+        public MySortOrder SortOrder = MySortOrder.None;
+        public int SortColumn = -1;
+
 		///	<summary>
 		///	Required designer variable.
 		///	</summary>

Common/Forms/MessageEventArgs.cs

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

Common/Forms/ModelessForm.cs

@@ -1,4 +1,7 @@
-using System;
+///
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
+///
+using System;
 using System.Drawing;
 using System.Windows.Forms;
 
@@ -53,20 +56,20 @@ namespace Common.Forms
         public event EventHandler<MessageEventArgs> UpdateMessageHandler;
         void OnUpdateMessage(object sender, MessageEventArgs args)
         {
-            if (args.Message != null) label1.Text = args.Message;
+            if (args != null && args.Message != null) label1.Text = args.Message;
         }
 
 
         /// <summary>
         /// Called from the state machine when an operation forces a modeless dialog close.
         /// </summary>
-        public static void CloseForm()
+        public void CloseForm()
         {
             if (CloseFormHandler == null) return;
             try { CloseFormHandler(null, null); }
             catch (Exception) { }
         }
-        static public event EventHandler<EventArgs> CloseFormHandler;
+        public event EventHandler<EventArgs> CloseFormHandler;
         void OnCloseForm(object sender, EventArgs args)
         {
             DialogResult = DialogResult.Cancel;

Common/Formulas.cs

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

Common/GlobalData.cs

@@ -5,38 +5,10 @@ using System;
 
 namespace Common
 {
-    public class GlobalData
+    public static class GlobalData
     {
         public static double SampleDensity = 0; /// sample water density measured in an accredited labo [kg/m3]
         public static double SampleTemp = 0;    /// sample temperature when density measured in an accredited labo [°C]
         public static double Buoyancy = 0;
-
-        public const string AdminUsername = "admin";
-        public const string AdminPassword = "staratura";
-
-        public static DBSettings RemoteUsersDB = null;
-		public static DBSettings LocalUsersDB = null;
-
-        public static IUser CurrentUser;
-        public static IUser CurrentUser2;
-        public static IUser CurrentUser3;
-        
-        public static Common.AuthorizedAs AuthorizedAs;
-		public static DateTime LastAuthorization = DateTime.Now;
-
-        public static int MinPasswdLength = 0;
-        public static int PasswdExpirationPeriodDays = 0; 
-
-        public static string GetCurrentUserName()
-        {
-            if (CurrentUser == null || CurrentUser.UserName == null)
-                return string.Empty;
-            else if (CurrentUser2 == null || CurrentUser2.UserName == null)
-                return CurrentUser.UserName;
-            else if (CurrentUser3 == null || CurrentUser3.UserName == null)
-                return string.Format("{0},{1}", CurrentUser.UserName, CurrentUser2.UserName);
-            else
-                return string.Format("{0},{1},{2}", CurrentUser.UserName, CurrentUser2.UserName, CurrentUser3.UserName);
-        }
     }
 }

Common/IMeasurementCorrection.cs

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

Common/IUser.cs

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

Common/Iperl/OptoTelegramRaw.cs

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

Common/StatisticalMetrics.cs

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

Common/Units.cs

@@ -2,7 +2,7 @@
 /// Copyright (c) 2016-2021 Sensus Slovensko a.s.
 ///
 using System;
-using System.Reflection;
+using System.Linq;
 
 namespace Common
 {
@@ -34,6 +34,20 @@ namespace Common
         [Description("m3/m")]       m3pm,       ///   1 m3/m = 60 m3/h
         [Description("cf/s")]       cfs,        ///   1 cubic foot per second = 101.9406477312 m3/h
 
+
+        [Description("g/s")]        gps,        /// 1 g/s   = 0.0036 t/h
+        [Description("g/min")]      gpm,        /// 1 g/min = 0.00006 t/h
+        [Description("g/h")]        gph,        /// 1 g/h   = 0.000001 t/h
+        [Description("kg/s")]       kgps,       /// 1 kg/s   = 3.6 t/h
+        [Description("kg/min")]     kgpm,       /// 1 kg/min = 0.06 t/h
+        [Description("kg/h")]       kgph,       /// 1 kg/h   = 0.001 t/h
+        [Description("t/s")]        tps,        /// 1 t/s   = 3600 t/h
+        [Description("t/min")]      tpm,        /// 1 t/min = 60 t/h
+        [Description("t/h")]        tph,        /// 1 t/h   = 1 t/h
+        [Description("lb/s")]       lbps,       /// 1 lb/s   ≈ 1.633 t/h
+        [Description("lb/min")]     lbpm,       /// 1 lb/min ≈ 0.027216 t/h
+        [Description("lb/h")]       lbph,       /// 1 lb/h   ≈ 0.0004536 t/h
+
         [Description("g")]          g,          ///   0.001 kg
         [Description("oz")]         oz,         ///   0.0283495231 kg
         [Description("lb")]         lb,         ///   0.45359237 kg
@@ -106,6 +120,14 @@ namespace Common
         /// 
         [Description("pulse/kWh")]  ppkWh,		/// * 1 pulse/kWh
         [Description("kWh/pulse")]  kWhpp,		///   1 kWh/pulse
+        
+        ///
+        [Description("A")]  A, /// *1 A
+	    [Description("mA")] mA, /// 1 mA = 0.001 A
+        ///
+        [Description("V")]  V, /// *1 V
+        [Description("mV")] mV, /// 1 mV = 0.001 V                     
+                               
                                                 
         Count
     }
@@ -136,6 +158,8 @@ namespace Common
         [Description("Boolean")]			Boolean,
         [Description("Datum und Uhrzeit")]  DateTime,
         [Description("Aufgezählt")]         Enumerated,
+        [Description("Strom")]              Current,
+		[Description("Spannung")]           Voltage,
 #elif LANG_PL
         [Description("Objętość")]			Volume,
 		[Description("Przepływ")]           Flow,
@@ -159,6 +183,8 @@ namespace Common
         [Description("Boolean")]			Boolean,
         [Description("Data i czas")]		DateTime,
         [Description("Wyliczone")]          Enumerated,
+        [Description("Prąd")]               Current,
+        [Description("Napięcie")]            Voltage,
 #elif LANG_CS
 		[Description("Objem")]				Volume,
 		[Description("Průtok")]				Flow,
@@ -182,6 +208,8 @@ namespace Common
         [Description("Boolean")]			Boolean,
         [Description("Datum a čas")]		DateTime,
         [Description("Vyjmenované")]        Enumerated,
+		[Description("Proud")]				Current,
+		[Description("Napětí")]            Voltage,
 #elif LANG_IT
 		[Description("Volume")]				Volume,
 		[Description("Flusso")]				Flow,
@@ -205,10 +233,16 @@ namespace Common
         [Description("Boolean")]			Boolean,
         [Description("Data e ora")]		    DateTime,
         [Description("Enumerato")]          Enumerated,
+		[Description("Corrente")]            Current,
+		[Description("Voltaggio")]            Voltage,
 #else
+        [Description("RegisterReader")]     RegisterReader,
+        [Description("MultiFunctionalVariables")]     MultiFunctionalVariables,
+        [Description("VolumeFlow")]         VolumeFlow,
         [Description("Volume")]				Volume,
 		[Description("Flow")]				Flow,
-		[Description("Mass")]				Mass,
+        [Description("MassFlow")]           MassFlow,
+        [Description("Mass")]				Mass,
         [Description("Time")]				Time,
         [Description("Temperature")]		Temperature,
 		[Description("Pressure")]			Pressure,
@@ -219,6 +253,8 @@ namespace Common
 		[Description("Energy")]				Energy,
 		[Description("Pulses")]				Pulses,
         [Description("Pulses/liter")]		PulsePerLtr,
+        [Description("Pulses/kg")]          PulsePerKilogram, //...MF
+        [Description("Pulses/Unit")]        PulsePerUnit,//...MF
         [Description("Pulses/kWh")]			PulsePerKWh,
         [Description("Conductivity")]       Conductivity,
 
@@ -228,6 +264,8 @@ namespace Common
         [Description("Boolean")]			Boolean,
         [Description("Date and time")]		DateTime,
         [Description("Enumerated")]         Enumerated,
+		[Description("Current")]            Current,
+		[Description("Voltage")]            Voltage,
 #endif
         Count,
 	}
@@ -243,59 +281,103 @@ namespace Common
         {
             return unit == Unit.l || unit == Unit.m3ph || unit == Unit.kg || unit == Unit.s || unit == Unit.C ||
                    unit == Unit.bar || unit == Unit.RPct || unit == Unit.Pct || unit == Unit.mm || unit == Unit.kgpm3 ||
-                   unit == Unit.J || unit == Unit.uSpcm || unit == Unit.ppl || unit == Unit.ppkWh;
+                   unit == Unit.J || unit == Unit.uSpcm || unit == Unit.ppl || unit == Unit.ppkWh || unit == Unit.A || 
+                   unit == Unit.V;
         }
 
         public static bool IsQuantity(Unit unit, Quantity quantity)
         {
-            return (quantity == GetQuantity(unit));
+            return GetQuantity(unit).Contains(quantity);
         }
 
-        public static Quantity GetQuantity(Unit unit)
+        public static Quantity[] GetQuantity(Unit unit)
 		{
             switch (unit)
             {
                 case Unit.pulse:
                 case Unit.degree:
-                    return Quantity.Pulses;
+                    return new[] { Quantity.Pulses };
 
                 case Unit.ml:
+                    return new[] { Quantity.Volume, Quantity.MultiFunctionalVariables };
                 case Unit.l:
+                    return new[] { Quantity.Volume, Quantity.MultiFunctionalVariables };
                 case Unit.dm3:
+                    return new[] { Quantity.Volume, Quantity.MultiFunctionalVariables };
                 case Unit.USgal:
+                    return new[] { Quantity.Volume, Quantity.MultiFunctionalVariables };
                 case Unit.UKgal:
+                    return new[] { Quantity.Volume, Quantity.MultiFunctionalVariables };
                 case Unit.cf:
+                    return new[] { Quantity.Volume, Quantity.MultiFunctionalVariables };
                 case Unit.m3:
-					return Quantity.Volume;
+					return new[] { Quantity.Volume, Quantity.MultiFunctionalVariables };
 
                 case Unit.lph:
+                    return new[] { Quantity.Flow };
                 case Unit.cfph:
+                    return new[] { Quantity.Flow };
                 case Unit.lpm:
+                    return new[] { Quantity.Flow };
                 case Unit.USgalpm:
+                    return new[] { Quantity.Flow };
                 case Unit.m3ph:
+                    return new[] { Quantity.Flow };
                 case Unit.lps:
+                    return new[] { Quantity.Flow };
                 case Unit.USgalps:
+                    return new[] { Quantity.Flow };
                 case Unit.m3pm:
+                    return new[] { Quantity.Flow };
                 case Unit.cfs:
-                    return Quantity.Flow;
+                    return new[] { Quantity.Flow };
+
+                case Unit.gps:
+                    return new[] { Quantity.MassFlow};
+                case Unit.gpm:
+                    return new[] { Quantity.MassFlow};
+                case Unit.gph:
+                    return new[] { Quantity.MassFlow};
+                case Unit.kgps:
+                    return new[] { Quantity.MassFlow};
+                case Unit.kgpm:
+                    return new[] { Quantity.MassFlow};
+                case Unit.kgph:
+                    return new[] { Quantity.MassFlow};
+                case Unit.tps:
+                    return new[] { Quantity.MassFlow};
+                case Unit.tpm:
+                    return new[] { Quantity.MassFlow};
+                case Unit.tph:
+                    return new[] { Quantity.MassFlow};
+                case Unit.lbps:
+                    return new[] { Quantity.MassFlow};
+                case Unit.lbpm:
+                    return new[] { Quantity.MassFlow};
+                case Unit.lbph:
+                    return new[] { Quantity.MassFlow};
 
                 case Unit.g:
+                    return new[] { Quantity.Mass, Quantity.MultiFunctionalVariables };
                 case Unit.oz:
+                    return new[] { Quantity.Mass, Quantity.MultiFunctionalVariables };
                 case Unit.lb:
+                    return new[] { Quantity.Mass, Quantity.MultiFunctionalVariables };
                 case Unit.kg:
+                    return new[] { Quantity.Mass, Quantity.MultiFunctionalVariables };
                 case Unit.t:
-					return Quantity.Mass;
+					return new[] { Quantity.Mass, Quantity.MultiFunctionalVariables };
 
                 case Unit.ms:
                 case Unit.s:
                 case Unit.min:
                 case Unit.hour:
-                    return Quantity.Time;
+                    return new[] { Quantity.Time };
 
                 case Unit.C:
                 case Unit.F:
                 case Unit.K:
-					return Quantity.Temperature;
+					return new[] { Quantity.Temperature };
 
                 case Unit.Pa:
                 case Unit.hPa:
@@ -305,14 +387,14 @@ namespace Common
                 case Unit.psi:
                 case Unit.bar:
                 case Unit.MPa:
-                    return Quantity.Pressure;
+                    return new[] { Quantity.Pressure };
 
                 case Unit.RPct:
-                    return Quantity.Humidity;
+                    return new[] { Quantity.Humidity };
 
                 case Unit.Promile:
                 case Unit.Pct:
-					return Quantity.Error;
+					return new[] { Quantity.Error };
 
                 case Unit.mm:
                 case Unit.cm:
@@ -321,23 +403,23 @@ namespace Common
                 case Unit.foot:
                 case Unit.yard:
                 case Unit.m:
-					return Quantity.Length;
+					return new[] { Quantity.Length };
 
-				case Unit.kgpm3:
+                case Unit.kgpm3:
 				case Unit.kgpl:
-					return Quantity.Density;
+					return new[] { Quantity.Density };
 
-				case Unit.J:
+                case Unit.J:
 				case Unit.kJ:
                 case Unit.MJ:
                 case Unit.Wh:
 				case Unit.kWh:
                 case Unit.MWh:
-                    return Quantity.Energy;
+                    return new[] { Quantity.Energy };
 
                 case Unit.uSpcm:
                 case Unit.mSpm:
-                    return Quantity.Conductivity;
+                    return new[] { Quantity.Conductivity };
 
                 case Unit.ppl:
                 case Unit.ppdm3:
@@ -347,32 +429,44 @@ namespace Common
                 case Unit.dm3pp:
                 case Unit.lpdeg:
                 case Unit.dm3pdeg:
-                    return Quantity.PulsePerLtr;
+                    return new[] { Quantity.PulsePerLtr };
 
                 case Unit.ppkWh:
                 case Unit.kWhpp:
-                    return Quantity.PulsePerKWh;
+                    return new[] { Quantity.PulsePerKWh };
+
+                case Unit.A:
+                case Unit.mA:
+		                return new[] { Quantity.Current };
+
+                case Unit.V:
+                case Unit.mV:
+	                return new[] { Quantity.Voltage };
 
                 default:
-					return Quantity.Number;
+					return new[] { Quantity.Number };
             }
 		}
 
-		public static bool IsVolume(Unit units)       { return IsQuantity(units, Quantity.Volume); }
-		public static bool IsFlow(Unit units)         { return IsQuantity(units, Quantity.Flow); }
-        public static bool IsMass(Unit units)         { return IsQuantity(units, Quantity.Mass); }
-        public static bool IsTime(Unit units)         { return IsQuantity(units, Quantity.Time); }
-        public static bool IsTemperature(Unit units)  { return IsQuantity(units, Quantity.Temperature); }
-		public static bool IsPressure(Unit units)     { return IsQuantity(units, Quantity.Pressure); }
-        public static bool IsHumidity(Unit units)     { return IsQuantity(units, Quantity.Humidity); }
-        public static bool IsError(Unit units)        { return IsQuantity(units, Quantity.Error); }
-		public static bool IsLength(Unit units)       { return IsQuantity(units, Quantity.Length); }
-		public static bool IsDensity(Unit units)      { return IsQuantity(units, Quantity.Density); }
-		public static bool IsEnergy(Unit units)       { return IsQuantity(units, Quantity.Energy); }
-        public static bool IsPulses(Unit units)       { return IsQuantity(units, Quantity.Pulses); }
-        public static bool IsPulsePerLtr(Unit units)  { return IsQuantity(units, Quantity.PulsePerLtr); }
-        public static bool IsPulsePerKWh(Unit units)  { return IsQuantity(units, Quantity.PulsePerKWh); }
-        public static bool IsConductivity(Unit units) { return IsQuantity(units, Quantity.Conductivity); }
+        public static bool IsVolumeFlow(Unit unit)   { return IsQuantity(unit, Quantity.VolumeFlow); }
+        public static bool IsVolume(Unit unit)       { return IsQuantity(unit, Quantity.Volume); }
+		public static bool IsFlow(Unit unit)         { return IsQuantity(unit, Quantity.Flow); }
+        public static bool IsMassFlow(Unit unit)     { return IsQuantity(unit, Quantity.MassFlow); }
+        public static bool IsMass(Unit unit)         { return IsQuantity(unit, Quantity.Mass); }
+        public static bool IsTime(Unit unit)         { return IsQuantity(unit, Quantity.Time); }
+        public static bool IsTemperature(Unit unit)  { return IsQuantity(unit, Quantity.Temperature); }
+		public static bool IsPressure(Unit unit)     { return IsQuantity(unit, Quantity.Pressure); }
+        public static bool IsHumidity(Unit unit)     { return IsQuantity(unit, Quantity.Humidity); }
+        public static bool IsError(Unit unit)        { return IsQuantity(unit, Quantity.Error); }
+		public static bool IsLength(Unit unit)       { return IsQuantity(unit, Quantity.Length); }
+		public static bool IsDensity(Unit unit)      { return IsQuantity(unit, Quantity.Density); }
+		public static bool IsEnergy(Unit unit)       { return IsQuantity(unit, Quantity.Energy); }
+        public static bool IsPulses(Unit unit)       { return IsQuantity(unit, Quantity.Pulses); }
+        public static bool IsPulsePerLtr(Unit unit)  { return IsQuantity(unit, Quantity.PulsePerLtr); }
+        public static bool IsPulsePerKWh(Unit unit)  { return IsQuantity(unit, Quantity.PulsePerKWh); }
+        public static bool IsConductivity(Unit unit) { return IsQuantity(unit, Quantity.Conductivity); }
+        public static bool IsCurrent(Unit unit) { return IsQuantity(unit, Quantity.Current); }
+        public static bool IsVoltage(Unit unit) { return IsQuantity(unit, Quantity.Voltage); }
 
 
 
@@ -456,6 +550,13 @@ namespace Common
                 case Unit.dm3pp:
                 case Unit.lpdeg:
                 case Unit.dm3pdeg:  return (v <= float.Epsilon) ? 0 : 1/v;
+                
+                /// Current: internal representation in A
+                case Unit.mA:       return 1000 * v;           /// 1000 mA = 1 A
+                                                                
+                /// Voltage: internal representation in V
+                case Unit.mV:     return 1000 * v;				/// 1000 mV = 1 V
+
 
                 default:            return v;                   /// Do not convert
             }
@@ -535,6 +636,12 @@ namespace Common
 
                 /// Electrical conductivity
                 case Unit.mSpm:     return 10 * v;
+                
+                /// Current: internal representation in A
+                case Unit.mA:       return 0.001 * v;           /// 1 mA = 0.001 A
+                                                                
+                /// Voltage: internal representation in V
+                case Unit.mV:     return 0.001 * v;				/// 1 mV = 0.001 V
 
                 /// Invert
                 case Unit.kWhpp:

Common/Utils.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
 ///
 using System;
 
@@ -14,6 +14,35 @@ namespace Common
             return string.Format("{0} ({1}/{2})", name, repetitionNr, repeats);
         }
 
+        public static string ToNiceString(double value, int sigDigits)
+        {
+            string format = SignificantDigitsToFmt(value, sigDigits);
+            return (format == "F0") ? value.ToString("F0") : value.ToString(format).TrimEnd(new char[] { '0' });
+        }
+
+        public static FlowNames ProfileType2FlowNames(ProfileType pt, bool isAux = false)
+        {
+            switch (pt)
+            {
+                case ProfileType.Q3R:
+                case ProfileType.CompoundQ3RQ3R:
+                    return FlowNames.Q3Q2Q1;
+                case ProfileType.CompoundQ3RQnClass:
+                    return isAux ? FlowNames.QnQtQmin : FlowNames.Q3Q2Q1;
+                case ProfileType.QnClassColdWater:
+                case ProfileType.QnClassHotWater:
+                case ProfileType.CompoundQnClassQnClass:
+                    return FlowNames.QnQtQmin;
+                case ProfileType.CompoundQnClassQ3R:
+                    return isAux ? FlowNames.Q3Q2Q1 : FlowNames.QnQtQmin;
+                case ProfileType.QpQi:
+                case ProfileType.CompoundQpQiQpQi:
+                    return FlowNames.QpQi;
+                default:
+                    return FlowNames.Q3Q2Q1;
+            }
+        }
+
         public static string SignificantDigitsToFmt(double value, int sigDigits)
         {
             if (sigDigits == 6)
@@ -212,9 +241,9 @@ namespace Common
             int length = string.IsNullOrEmpty(password) ? 0 : password.Length;
 
             /// Password length must be at least 6
-            if (length < GlobalData.MinPasswdLength)
+            if (length < CurrentUser.MinPasswdLength)
             {
-                explanation = string.Format("Password must have at least {0} characters", GlobalData.MinPasswdLength);
+                explanation = string.Format("Password must have at least {0} characters", CurrentUser.MinPasswdLength);
                 return false;
             }
             else
@@ -272,16 +301,21 @@ namespace Common
             int number = (date.Year % 10) + 10 * (date.Month - 1) + 120 * date.Day;
             string passwordOfDay = Convert.ToString(number, 8);
 
-            return (userName.Equals("milan") && password.Equals("kremik")) ||
+            return (userName.Equals("milan") && password.Equals("kraken")) ||
+                   (userName.Equals("bumi") && password.Equals("70630")) ||
                    (userName.Equals("igor") && password.Equals("mojronko8")) ||
-                   (userName.Equals("MARIAN") && password.Equals("NM-309BN")) ||
                    (userName.Equals("lubo1212") && password.Equals("Tatry52")) ||
-                   (userName.Equals("Michal") && password.Equals("1236natahA8")) ||
+                   (userName.Equals("Michal") && password.Equals("Plok789456123")) ||
                    (userName.Equals("martin") && password.Equals("vaclavek84")) ||
                    (userName.Equals("pakan") && password.Equals("kuriatko")) ||
-                   (userName.Equals("augustin") && password.Equals("jaugust")) ||
+                   (userName.Equals("jan") && password.Equals("jaugust")) ||
                    (userName.Equals("JCermak") && password.Equals("Zt6911")) ||
                    (userName.Equals("gilles") && password.Equals("alibaba")) ||
+                   (userName.Equals("michal") && password.Equals("mojnelson8")) ||
+                   (userName.Equals("marek") && password.Equals("mareciino")) ||
+#if DEBUG                   
+                   (userName.Equals("Sensus Developers") && password.Equals("5fbg12gf5hn8nhy1fr")) ||
+#endif
                    (userName.Equals(passwordOfDay) && password.Equals(passwordOfDay));
         }
 

Common/packages.config

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

Config/Config.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -30,7 +30,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;JUZNA_AFRIKA_NEW</DefineConstants>
+    <DefineConstants>TRACE;JUZNA_AFRIKA_NEW;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -43,7 +43,7 @@
       <HintPath>..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
     </Reference>
     <Reference Include="log4net">
-      <HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
+      <HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="MySql.Data">
       <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
@@ -68,6 +68,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CalendarEvent\ICalendarEvent.cs" />
+    <Compile Include="Data.cs" />
     <Compile Include="Entities\BenchPath.cs" />
     <Compile Include="Entities\CustomEvent.cs" />
     <Compile Include="Entities\Component.cs" />
@@ -95,6 +96,7 @@
     <Compile Include="Entities\VirtualBenchStep.cs" />
     <Compile Include="CalendarEvent\Utils.cs" />
     <Compile Include="FluentCommon.cs" />
+    <Compile Include="Formulas.cs" />
     <Compile Include="Mappings\BenchPathMap.cs" />
     <Compile Include="Mappings\ComponentMap.cs" />
     <Compile Include="Mappings\ComponentProcedureMap.cs" />
@@ -115,6 +117,7 @@
     <Compile Include="Mappings\UncertaintyMap.cs" />
     <Compile Include="Mappings\UserMap.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="PurchaseResources.cs" />
     <Compile Include="Resources\Strings.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -123,7 +126,9 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\Strings.cs.resx" />
-    <EmbeddedResource Include="Resources\Strings.de.resx" />
+    <EmbeddedResource Include="Resources\Strings.de.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Resources\Strings.fr.resx" />
     <EmbeddedResource Include="Resources\Strings.it.resx" />
     <EmbeddedResource Include="Resources\Strings.pl.resx" />

Config/Data.cs

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

Config/Entities/BenchPath.cs

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

Config/Entities/FeedingPath.cs

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

Config/Entities/MeasurementCorrection.cs

@@ -1,17 +1,17 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 
 namespace Config.Entities
 {
-	public class MeasurementCorrection : Common.IMeasurementCorrection
+    public class MeasurementCorrection : Common.IMeasurementCorrection, IComparable<MeasurementCorrection>
 	{
 		public virtual int Id { get; protected set; }
         public virtual int RangeIx { get; set; }        /// 0..5
-		public virtual float Measurement { get; set; }
-		public virtual float Correction { get; set; }
+		public virtual double Measurement { get; set; }
+		public virtual double Correction { get; set; }
 
         public MeasurementCorrection()
         {
@@ -23,6 +23,11 @@ namespace Config.Entities
             RangeIx = rangeIx; 
         }
 
+        public virtual int CompareTo(MeasurementCorrection other)
+        {
+            return (Measurement > other.Measurement) ? 1 : ((Measurement == other.Measurement) ? 0 : -1);
+        }
+
 
         /// <summary>
         /// Calculates corrected value from a list of corrections by interpolation.
@@ -53,10 +58,9 @@ namespace Config.Entities
                 return corrections[0].Correction;
             }
 
-            int count = corrections.Count;
-            for (int i = 1; i < count; i++)
+            for (int i = 1; i < corrections.Count; i++)
             {
-                if (rawValue < corrections[0].Measurement)
+                if (rawValue < corrections[i].Measurement)
                 {
                     double d1 = rawValue - corrections[i - 1].Measurement;
                     double d2 = corrections[i].Measurement - rawValue;
@@ -75,7 +79,12 @@ namespace Config.Entities
             }
 
             /// rawValue is above the highest value in the correction table
-            return corrections[count - 1].Correction;
+            return corrections[corrections.Count - 1].Correction;
+        }
+
+        public override string ToString()
+        {
+            return string.Format("{0} {1} ({2})", Measurement, Correction, RangeIx);
         }
     }
 }

Config/Entities/OutputPath.cs

@@ -1,46 +1,56 @@
 ///
-/// Copyright (c) 2013-2017 Sensus Metering Systems
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 
 namespace Config.Entities
 {
 	public class OutputPath : IHasName, IHasItemNr, IHasValves
     {
-        public virtual int Id { get; protected set; }
-		public virtual int ItemNr { get; set; }
+        public virtual int    Id { get; protected set; }
+		public virtual int    ItemNr { get; set; }
 		public virtual string Name { get; set; }
         public virtual string OriName { get; set; }         /// Not mapped to database
-        public virtual float Qfrom { get; set; }			/// Water flow in [m3/h]
-        public virtual float Qto { get; set; }				/// Water flow in [m3/h]
+        public virtual double Qfrom { get; set; }			/// Water flow in [m3/h]
+        public virtual double Qto { get; set; }				/// Water flow in [m3/h]
+        public virtual Unit   FlowUnit { get; set; }        /// Not mapped to database, used in UI
         public virtual string Selector { get; set; }
         public virtual string RegValve { get; set; }
-		public virtual string FlowMeter { get; set; }
-		public virtual float PidCoef { get; set; }			/// PID coefficient for the regulation path
+        public virtual int RegulMinStep { get; set; }
+        public virtual string FlowMeter { get; set; }
+        public virtual float  PidCoef { get; set; }			/// PID coefficient for the regulation path
         public virtual string StartValve { get; set; }
         public virtual string Diverter { get; set; }
 		public virtual string TempMtrDiv { get; set; }
 		public virtual string Scale { get; set; }
+        public virtual string RegVPositions { get; set; }	/// Positions of regulation valves in Category.Output in % separated by ';'
 
         /// Valves		
 		public virtual string ValvesOpen { get; set; }
 		public virtual string ValvesClose { get; set; }
 
+        public virtual bool QfromTextChngd { get; set; }    /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
+        public virtual bool QtoTextChngd { get; set; }      /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
+
         /// ------------- Additional stuff not mapped into the database -------------
 
 		public OutputPath()
         {
 			ValvesOpen = string.Empty;
 			ValvesClose = string.Empty;
-		}
+            RegulMinStep = 0;
+        }
 
 		public OutputPath(string name, int itemNr)
 			: this()
 		{
 			Name = name;
 			ItemNr = itemNr;
-		}
+            RegulMinStep = 0;
+
+        }
 
 		public virtual OutputPath Clone(string name, int itemNr)
         {
@@ -49,14 +59,17 @@ namespace Config.Entities
 			result.Name        = Name;
 			result.Qfrom       = Qfrom;
             result.Qto         = Qto;
+            result.FlowUnit    = FlowUnit;
             result.Selector    = Selector;
             result.RegValve    = RegValve;
-			result.FlowMeter   = FlowMeter;
+            result.RegulMinStep = RegulMinStep;
+            result.FlowMeter   = FlowMeter;
 			result.PidCoef     = PidCoef;
             result.StartValve  = StartValve;
 			result.Diverter    = Diverter;
 			result.TempMtrDiv  = TempMtrDiv;
 			result.Scale       = Scale;
+            result.RegVPositions= RegVPositions;
 			result.ValvesOpen  = ValvesOpen;
 			result.ValvesClose = ValvesClose;
 

Config/Entities/PTest.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
+/// Copyright (c) 2019-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Globalization;
@@ -16,7 +16,9 @@ namespace Config.Entities
         public virtual int Id { get; protected set; }
         public virtual int ItemNr { get; set; }
         public virtual string Name { get; set; }
-        public virtual int Part { get; set; }				    /// Part=0 ... test of all WM-s                                                               /// Part>0 ... part of a set of tests with the same Name: subset of WM-s is given by MetersPath
+        public virtual int Part { get; set; }                   /// Part=0 ... test of all WM-s    
+                                                                /// Part>0 ... part of a set of tests with the same Name: subset of WM-s is given by MetersPath
+        public virtual FlowId FlowId { get; set; }
         public virtual double CoefQfrom { get; set; }           /// Water flow low limit in [m3/h]
         public virtual double CoefQto { get; set; }				/// Water flow high limit in [m3/h]
         public virtual double ErrLimLo { get; set; }			/// in [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
@@ -27,6 +29,7 @@ namespace Config.Entities
         public virtual double PressLimHi { get; set; }          /// [bar] max. water pressure                                            
         public virtual sbyte Publish { get; set; }			    /// 0=no, 1=in all protocols, 2=on screen, 3=internal
         public virtual bool Evaluate { get; set; }
+        public virtual string Method { get; set; }              /// Test method (component name)
 
         public virtual sbyte E1 { get; set; }                   ///
         public virtual sbyte E2 { get; set; }                   ///
@@ -81,6 +84,7 @@ namespace Config.Entities
             PressLimHi = 16.0;	    /// [bar]
             Publish = (sbyte)Common.Publish.Always;
             Evaluate = true;
+            Method = string.Empty;
 
             E1 = (sbyte)ErrorFlagsMode.On;
             E2 = (sbyte)ErrorFlagsMode.On;
@@ -140,6 +144,7 @@ namespace Config.Entities
             result.PressLimHi = PressLimHi;
             result.Publish = Publish;
             result.Evaluate = Evaluate;
+            result.Method = Method;
 
             result.E1 = E1;
             result.E2 = E2;
@@ -183,6 +188,7 @@ namespace Config.Entities
 
             output.WriteLine(Name);
             output.WriteLine(Part);
+            output.WriteLine(((ushort)FlowId).ToString(ci));
             output.WriteLine(CoefQfrom.ToString(ci));
             output.WriteLine(CoefQto.ToString(ci));
             output.WriteLine(ErrLimLo.ToString(ci));
@@ -193,6 +199,7 @@ namespace Config.Entities
             output.WriteLine(PressLimHi.ToString(ci));
             output.WriteLine(Publish.ToString());
             output.WriteLine(Evaluate.ToString());
+            output.WriteLine(Method);
 
             output.WriteLine(E1.ToString());
             output.WriteLine(E2.ToString());
@@ -241,16 +248,36 @@ namespace Config.Entities
 
             tst.Name = firstLine;
             tst.Part = int.Parse(input.ReadLine());
+            tst.FlowId = (FlowId)ushort.Parse(input.ReadLine(), ci);
             tst.CoefQfrom = double.Parse(input.ReadLine(), ci);
 			tst.CoefQto = double.Parse(input.ReadLine(), ci);
 			tst.ErrLimLo = double.Parse(input.ReadLine(), ci);
 			tst.ErrLimHi = double.Parse(input.ReadLine(), ci);
 			tst.TempLimLo = double.Parse(input.ReadLine(), ci);
 			tst.TempLimHi = double.Parse(input.ReadLine(), ci);
-            tst.Publish = sbyte.Parse(input.ReadLine());
+            tst.PressLimLo = double.Parse(input.ReadLine(), ci);
+            tst.PressLimHi = double.Parse(input.ReadLine(), ci);
+            tst.Publish = sbyte.Parse(input.ReadLine(), ci);
             tst.Evaluate = bool.Parse(input.ReadLine());
+            tst.Method = input.ReadLine();
 
-            /// TODO (E1 .. E21)
+            tst.E1 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E2 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E3 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E4 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E5 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E6 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E7 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E8 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E9 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E10 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E11 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E12 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E13 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E14 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E15 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E16 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E21 = sbyte.Parse(input.ReadLine(), ci);
 
             tst.Delta_Q_pct = double.Parse(input.ReadLine(), ci);
             tst.Delta_T = double.Parse(input.ReadLine(), ci);
@@ -283,6 +310,7 @@ namespace Config.Entities
 
                                  if (Name != firstLine)               { diff.AppendFormat(fmt, "Name", Name, firstLine); };
             ln = inp.ReadLine(); if (ln != Part.ToString())           { diff.AppendFormat(fmt, "Part", Part.ToString(), ln); };
+            ln = inp.ReadLine(); if (ln != ((ushort)FlowId).ToString()){diff.AppendFormat(fmt, "FlowId", ((ushort)FlowId).ToString(), ln); };
             ln = inp.ReadLine(); if (ln != CoefQfrom.ToString(ci))    { diff.AppendFormat(fmt, "CoefQfrom", CoefQfrom.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != CoefQto.ToString(ci))      { diff.AppendFormat(fmt, "CoefQto", CoefQto.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != ErrLimLo.ToString(ci))     { diff.AppendFormat(fmt, "ErrLimLo", ErrLimLo.ToString(ci), ln); };
@@ -293,6 +321,7 @@ namespace Config.Entities
             ln = inp.ReadLine(); if (ln != PressLimHi.ToString(ci))   { diff.AppendFormat(fmt, "Pressure_max", PressLimHi.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Publish.ToString())        { diff.AppendFormat(fmt, "Publish", Publish.ToString(), ln); };
             ln = inp.ReadLine(); if (ln != Evaluate.ToString())       { diff.AppendFormat(fmt, "Evaluate", Evaluate.ToString(), ln); };
+            ln = inp.ReadLine(); if (ln != Method)                    { diff.AppendFormat(fmt, "Method", Method, ln); };
 
             ln = inp.ReadLine(); if (ln != E1.ToString()) { diff.AppendFormat(fmt, "E1", E1.ToString(), ln); };
             ln = inp.ReadLine(); if (ln != E2.ToString()) { diff.AppendFormat(fmt, "E2", E2.ToString(), ln); };

Config/Entities/Procedure.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -47,7 +47,7 @@ namespace Config.Entities
         public virtual int AltProcPeriod { get; set; }			/// Period of alternative procedures (0 = no alt. procedure)
 
         public virtual float DN { get; set; }                   /// Not mapped to DB, valid in ProceduresCtrl for procedure filtering only
-        public virtual float Qn { get; set; }                   ///   - ' ' -
+        public virtual double Qn { get; set; }                  ///   - ' ' -
         public virtual string MClass { get; set; }              ///   - ' ' -
         public virtual string Producer { get; set; }            ///   - ' ' -
 
@@ -75,7 +75,7 @@ namespace Config.Entities
 			///
 			/// Default values
 			/// 
-            CreationUser = Common.GlobalData.GetCurrentUserName();
+            CreationUser = Common.CurrentUser.UserName();
 			CreationTime = DateTime.Now;
 			LastChgUser = CreationUser;
 			LastChgTime = CreationTime;

Config/Entities/Profile.cs

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

Config/Entities/Test.cs

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

Config/Entities/User.cs

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

Config/FluentCommon.cs

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

Config/Formulas.cs

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

Config/Mappings/BenchPathMap.cs

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

Config/Mappings/ComponentMap.cs

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

Config/Mappings/OutputPathMap.cs

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

Config/Mappings/PTestMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
+/// Copyright (c) 2019-2023 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Config.Entities;
@@ -14,6 +14,7 @@ namespace Config.Mappings
             Map(x => x.ItemNr);
 			Map(x => x.Name);
             Map(x => x.Part);
+            Map(x => x.FlowId);
             Map(x => x.CoefQfrom);
 			Map(x => x.CoefQto);
             Map(x => x.ErrLimLo);
@@ -24,6 +25,7 @@ namespace Config.Mappings
             Map(x => x.PressLimHi);
             Map(x => x.Publish);
             Map(x => x.Evaluate);
+            Map(x => x.Method);
             Map(x => x.E1);
             Map(x => x.E2);
             Map(x => x.E3);

Config/Mappings/TestMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2017 Sensus Metering Systems
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Config.Entities;
@@ -20,15 +20,16 @@ namespace Config.Mappings
             Map(x => x.Qtg);
             Map(x => x.Qfrom);
 			Map(x => x.Qto);
-			Map(x => x.Volume);
+            Map(x => x.IsFromToInPct);
+            Map(x => x.Volume);
 			Map(x => x.TestTime);
 			Map(x => x.Repeats);
             Map(x => x.DoDraining);
             Map(x => x.DoDrainingAfter);
-            Map(x => x.DoControlWaterTemp);
             Map(x => x.TempLimLo);
 			Map(x => x.TempLimHi);
-			Map(x => x.PumpPower);
+            Map(x => x.TempControl);
+            Map(x => x.PumpPower);
             Map(x => x.MassRepeats);
             Map(x => x.MassSpread);
 			Map(x => x.MassMethod)

Config/PurchaseResources.cs

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

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

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

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

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

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;
             }

DeviceTest/DeviceTest.csproj

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

DeviceTest/DeviceTestDlg.cs

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

DeviceTest/app.config

@@ -1,3 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

DeviceTest/packages.config

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

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;
             }

EventViewer/EventViewerWnd.cs

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