Reconfigured for iPERL-NEW

.gitignore

@@ -4,10 +4,6 @@ Config/bin/
 Config/obj/
 DataStreamInterface/bin/
 DataStreamInterface/obj/
-DataStreamInterfaceTest/bin/
-DataStreamInterfaceTest/obj/
-DataStreamMeter/bin/
-DataStreamMeter/obj/
 Decrypt/bin/
 Decrypt/obj/
 DeviceTest/bin/
@@ -20,16 +16,12 @@ EventViewer/bin/
 EventViewer/obj/
 Events/bin/
 Events/obj/
-FeatureVectorCalculator/bin/
-FeatureVectorCalculator/obj/
 GemCard/bin
 GemCard/obj
 GenCode128/bin
 GenCode128/obj
 GraphLib/bin
 GraphLib/obj
-MergeResultsDBs/bin
-MergeResultsDBs/obj
 TracingDB/bin
 TracingDB/obj
 ResetBatchNr/bin
@@ -40,8 +32,6 @@ Results/bin/
 Results/obj/
 ResultsBrowser/bin/
 ResultsBrowser/obj/
-ResultsParser/bin/
-ResultsParser/obj/
 Statistics/bin/
 Statistics/obj/
 TBF/bin/

Common/BackgroundBeep.cs

@@ -1,37 +0,0 @@
-///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
-///
-using System;
-using System.Threading;
-
-namespace Common
-{
-    public class BackgroundBeep
-    {
-        static Thread beepThread;
-        static AutoResetEvent signalBeep;
-
-        static BackgroundBeep()
-        {
-            signalBeep = new AutoResetEvent(false);
-            beepThread = new Thread(() =>
-            {
-                while (true)
-                {
-                    signalBeep.WaitOne();       /// waits for an event
-                    Console.Beep(500, 400);     /// frequency (Hz), duration (ms)
-                }
-            }, 1);
-            beepThread.IsBackground = true;
-            beepThread.Start();
-        }
-
-        /// <summary>
-        /// Invokes one beep in a separate thread (non-blocking function)
-        /// </summary>
-        public static void Beep()
-        {
-            signalBeep.Set();
-        }
-    }
-}

Common/Common.csproj

@@ -41,10 +41,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BackgroundBeep.cs" />
-    <Compile Include="Enums.cs" />
-    <Compile Include="StatisticalMetrics.cs" />
-    <Compile Include="Iperl\OptoTelegramRaw.cs" />
     <Compile Include="SerializableDictionary.cs" />
     <Compile Include="UIControls\CoolButtonCtrl.cs">
       <SubType>UserControl</SubType>

Common/SerializableDictionary.cs

@@ -1,7 +1,4 @@
-///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
-///
-using System;
+using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
 

Common/StatisticalMetrics.cs

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

@@ -1,46 +1,12 @@
-///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
-///
-using System;
-using System.IO.Ports;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace Common
 {
     public class Utils
     {
-        public static string GetTestName(string name, int repeats, int repetitionNr)
-        {
-            if (name == null) return null;
-            if (repeats == 1) return name;
-            return string.Format("{0} ({1}/{2})", name, repetitionNr, repeats);
-        }
-
-        public static Parity GetParity(string str, Parity defaultParity = Parity.None)
-        {
-            if (str.Equals(Parity.None.ToString())) return Parity.None;
-            if (str.Equals(Parity.Even.ToString())) return Parity.Even;
-            if (str.Equals(Parity.Odd.ToString())) return Parity.Odd;
-            if (str.Equals(Parity.Mark.ToString())) return Parity.Mark;
-            if (str.Equals(Parity.Space.ToString())) return Parity.Space;
-            return defaultParity;
-        }
-
-        public static StopBits GetStopBits(string str, StopBits defaultStopBits = StopBits.One)
-        {
-            if (str.Equals(StopBits.None.ToString())) return StopBits.None;
-            if (str.Equals(StopBits.One.ToString())) return StopBits.One;
-            if (str.Equals(StopBits.OnePointFive.ToString())) return StopBits.OnePointFive;
-            if (str.Equals(StopBits.Two.ToString())) return StopBits.Two;
-            return defaultStopBits;
-        }
-
-        public static Handshake GetHandshake(string str, Handshake defaultHandshake = Handshake.None)
-        {
-            if (str.Equals(Handshake.None.ToString())) return Handshake.None;
-            if (str.Equals(Handshake.RequestToSend.ToString())) return Handshake.RequestToSend;
-            if (str.Equals(Handshake.XOnXOff.ToString())) return Handshake.XOnXOff;
-            if (str.Equals(Handshake.RequestToSendXOnXOff.ToString())) return Handshake.RequestToSendXOnXOff;
-            return defaultHandshake;
-        }
     }
 }

Config/Config.csproj

@@ -19,18 +19,18 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_IPERL_NEW;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;TURA_IPERL_NEW;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -75,6 +75,7 @@
     <Compile Include="Entities\Component.cs" />
     <Compile Include="Entities\ComponentProcedure.cs" />
     <Compile Include="Entities\ComponentTest.cs" />
+    <Compile Include="Entities\Enums.cs" />
     <Compile Include="Entities\FeedingPath.cs" />
     <Compile Include="Entities\Group.cs" />
     <Compile Include="Entities\HeatMetersPath.cs" />
@@ -82,6 +83,7 @@
     <Compile Include="Entities\IHasName.cs" />
     <Compile Include="Entities\IHasValves.cs" />
     <Compile Include="Entities\IParamsProvider.cs" />
+    <Compile Include="Entities\IperlEnums.cs" />
     <Compile Include="Entities\MeasurementCorrection.cs" />
     <Compile Include="Entities\MetersPath.cs" />
     <Compile Include="Entities\OutputPath.cs" />
@@ -89,7 +91,6 @@
     <Compile Include="Entities\Profile.cs" />
     <Compile Include="Entities\PTest.cs" />
     <Compile Include="Entities\Test.cs" />
-    <Compile Include="Entities\TestInstance.cs" />
     <Compile Include="Entities\TransitionSequence.cs" />
     <Compile Include="Entities\TransitionStep.cs" />
     <Compile Include="Entities\Uncertainty.cs" />
@@ -140,10 +141,6 @@
     <EmbeddedResource Include="Resources\Strings.zh-CN.resx" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Common\Common.csproj">
-      <Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
-      <Name>Common</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Users\Users.csproj">
       <Project>{6E5CB0E9-E1B6-4E5D-AC6E-B1049E180F2B}</Project>
       <Name>Users</Name>

Config/Data.cs

@@ -15,10 +15,10 @@ namespace Config
 		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 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;
@@ -44,7 +44,7 @@ namespace Config
 		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
+#elif DEWA_300 || FUZHOU_100 || ROMA_200
         public const int WMsCount = 10;
         public const int LineSize = 10;
         public const int CompoundWMsCount = 1;
@@ -68,7 +68,7 @@ namespace Config
 		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
+#elif TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || ALZIR_25
         public const int WMsCount = 20;
 		public const int LineSize = 10;
 		public const int CompoundWMsCount = 1;
@@ -88,6 +88,11 @@ namespace Config
         public const int MaxPartNr = WMsCount / LineSize;
 #endif
 
+        ///
+		/// Database related: This object reference is set after a successful user login
+		///
+		public static DatabaseSettings CurrentBench;
+
         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/DatabaseSettings.cs

@@ -25,10 +25,10 @@ namespace Config
         {
             BenchName = String.Empty;               /// Empty string (avoid null)
             IsRealBench = false;
-			ProceduresDBSettings = new Users.DBSettings(Common.DBType.MySql, string.Empty);
-			WaterMetersDBSettings = new Users.DBSettings(Common.DBType.MySql, string.Empty);
-            EventsDBSettings = new Users.DBSettings(Common.DBType.MySql, string.Empty);
-			UsersDBSettings = new Users.DBSettings(Common.DBType.MySql, string.Empty);
+			ProceduresDBSettings = new Users.DBSettings(Users.Entities.DBType.MySql, string.Empty);
+			WaterMetersDBSettings = new Users.DBSettings(Users.Entities.DBType.MySql, string.Empty);
+            EventsDBSettings = new Users.DBSettings(Users.Entities.DBType.MySql, string.Empty);
+			UsersDBSettings = new Users.DBSettings(Users.Entities.DBType.MySql, string.Empty);
         }
 
         public object Clone()

Config/Entities/BenchPath.cs

@@ -14,7 +14,6 @@ namespace Config.Entities
         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 string Selector { get; set; }
         public virtual string TempMtrUp { get; set; }
         public virtual string TempMtrDown { get; set; }
         public virtual string PressMtrUp { get; set; }
@@ -47,8 +46,7 @@ namespace Config.Entities
 
 			result.Qfrom         = Qfrom;
             result.Qto           = Qto;
-            result.Selector      = Selector;
-            result.TempMtrUp     = TempMtrUp;
+			result.TempMtrUp     = TempMtrUp;
 			result.TempMtrDown   = TempMtrDown;
 			result.PressMtrUp    = PressMtrUp;
 			result.PressMtrDown  = PressMtrDown;

Config/Entities/Component.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Common;
 
 namespace Config.Entities
 {
@@ -87,7 +86,7 @@ namespace Config.Entities
             else if (line.Equals(DebugMode.FailureDuringOperation.ToString())) result.Mode = DebugMode.FailureDuringOperation;
             else if (line.Equals(DebugMode.Off.ToString())) result.Mode = DebugMode.Off;
             else if (line.Equals(DebugMode.Record.ToString())) result.Mode = DebugMode.Record;
-            else if (line.Equals(DebugMode.Replay.ToString())) result.Mode = DebugMode.Replay;
+            else if (line.Equals(DebugMode.Reply.ToString())) result.Mode = DebugMode.Reply;
             else if (line.Equals(DebugMode.Simulate.ToString())) result.Mode = DebugMode.Simulate;
             else if (line.Equals(DebugMode.Inherit.ToString())) result.Mode = DebugMode.Inherit;
 

Config/Entities/Enums.cs

@@ -1,11 +1,11 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.Reflection;
 
-namespace Common
+namespace Config.Entities
 {
     /// <summary>
     /// Helper class to assign descriptions to enum values
@@ -38,115 +38,6 @@ namespace Common
         }
     }
 
-    /// <summary>
-    /// Identifies the type of a database
-    /// </summary>
-    public enum DBType
-    {
-        None,               /// Database disabled
-        MySql,              /// MySQL database
-        SQLite,             /// SQLite
-        Count
-    }
-
-    /// <summary> Identifies the database based on the content </summary>
-    public enum DBKind
-    {
-        Config,
-        Results,
-        RemoteConfig,
-        Count
-    }
-
-    public enum ProcedureSelection
-    {
-#if LANG_CS
-        [Description("Žádné")]                          None,
-        [Description("Lokální postupy")]                FromLocalDB,
-        [Description("Postupy ze sdílené databázy")]    FromSharedDB,
-        [Description("Zakázky z Oracle databázy")]      OrderNrFromOracleDB,
-        [Description("Zakázky ze sledovací databázy")]  OrderNrFromTracingDB,
-#else
-        [Description("None")]                           None,
-        [Description("Local procedures")]               FromLocalDB,
-        [Description("Shared procedures")]              FromSharedDB,
-        [Description("Orders from Oracle DB")]          OrderNrFromOracleDB,
-        [Description("Orders from Tracing DB")]         OrderNrFromTracingDB,
-#endif
-        Count
-    }
-
-    /// <summary>
-    /// Obsolete - replaced by enum ProcedureSelection (above) in 3.1 and newer
-    /// </summary>
-    public enum RemoteDBUse
-    {
-        [Description("Local DB only")]          LocalDBOnly,
-        [Description("Remote DB only")]         RemoteDBOnly,
-        [Description("Both DB-s, local 1st")]   BothDBsLocalFirst,
-        [Description("Both DB-s, remote 1st")]  BothDBsRemoteFirst,
-        Count
-    }
-
-    /// <summary>
-    /// Obsolete - Contains a procedure name and a database specification (local/remote).
-    /// </summary>
-    public class ProcedureInfo
-    {
-        public readonly string Name;
-        public readonly bool IsRemote;
-
-        public ProcedureInfo(string name, bool isRemote)
-        {
-            Name = name;
-            IsRemote = isRemote;
-        }
-    }
-
-    public enum LoginMethod
-    {
-        UserName,		/// = alias, abbreviation
-        FullName,		/// = description
-        Number,
-        Count
-    }
-
-    public enum AuthorizedAs
-    {
-        PowerUser,
-        LocalUser,
-        RemoteUser,
-        Count
-    }
-
-    /// <summary>
-    /// GID-s of user groups, each user is member of one or more groups.
-    /// </summary>
-    public enum GID
-    {
-        Testers,
-        TestingSpecialists,
-        HeadOfLab,
-        MaintenanceSpecialists,
-        Metrologists,
-        CalibrationSpecialists,
-        Administrators,             /// application / network / database administrator
-        TraceabilityManagement,
-        MetrologicalAuthority,
-        WaterMeterAuthority,
-        NrOfGroups,                 /// Number of groups (this is not a GroupID)
-        None,
-    }
-
-    public enum MySortOrder
-    {
-        None,
-        Ascending,      /// The same like SortOrder.Ascending
-        Descending,     /// The same like SortOrder.Descending
-        Ascending2,     /// Sorts by a surname in ascending order in case or 'Name Surname' column
-        Descending2,    /// Sorts by a surname in descending order in case or 'Name Surname' column
-    }
-
     /// <summary>
     /// Flags returned by each device configuration control Verify(...) function.
     /// </summary>
@@ -161,48 +52,28 @@ namespace Common
         InvokeCfgChange = 0x20,	/// Invoke CfgChange handler of the component 
     }
 
+    public enum RemoteDBUse
+    {
+        [Description("Local DB only")]          LocalDBOnly,
+        [Description("Remote DB only")]         RemoteDBOnly,
+        [Description("Both DB-s, local 1st")]   BothDBsLocalFirst,
+        [Description("Both DB-s, remote 1st")]  BothDBsRemoteFirst,
+        Count
+    }
+
     /// <summary>
-    /// Event severity
+    /// Contains a procedure name and a database specification (local/remote).
     /// </summary>
-    public enum Severity
+    public class ProcedureInfo
     {
-        Undefined,
-        Notification,
-        Warning,
-        Error,
-        FatalError,
-        Count
-    }
+        public readonly string Name;
+        public readonly bool IsRemote;
 
-    public enum EventClass
-    {
-        Undefined,
-        EquipmentHW,
-        Metrology,
-        TestingProcess,
-        BadResults,
-        ComputerResources,
-        Network,
-        Other,
-        Count
-    }
-
-    public enum SubscriberGroup : long
-    {
-        None = 0,
-        Metrology = 1,
-        Maintenance = 2,
-        Production = 4,
-        Management = 8,
-        Finish = 16,
-    }
-
-    public enum EViewerOption
-    {
-        Undefined,
-        AllEvents,
-        RecentEvents,
-        UnreadEvents,
+        public ProcedureInfo(string name, bool isRemote)
+        {
+            Name = name;
+            IsRemote = isRemote;
+        }
     }
 
     public enum ProcedureState
@@ -377,17 +248,6 @@ namespace Common
 		Count
 	}
 
-    /// <summary>
-    /// State of water filled in the test bench.
-    /// </summary>
-    public enum FillState
-    {
-        Unknown,            /// Test bench fill state is unknown
-        Empty,              /// Test bench is empty, no water
-        Full,               /// Test bench is full of water
-        Count
-    }
-
     public enum MeretProtocol
     {
         [Description("<undefined>")]        Undefined,
@@ -564,7 +424,7 @@ namespace Common
         [Description("Fehler")]         FailureDuringOperation,	/// Failure during operation -> disabled 
         [Description("Aus")]            Off,					/// The component is off
         [Description("Aufzeichnen")]    Record,
-        [Description("Abspielen")]      Replay,
+        [Description("Reply")]          Reply,
         [Description("Simuliert")]      Simulate,				/// Test bench simulation, this mode does not require any hardware
         [Description("Geerbt")]         Inherit,
 #elif LANG_FR
@@ -575,7 +435,7 @@ namespace Common
         [Description("Erreur d'exécution")]                 FailureDuringOperation,
         [Description("Éteindre")]                           Off,
         [Description("Record")]                             Record,
-        [Description("Répondre")]                           Replay,
+        [Description("Répondre")]                           Reply,
         [Description("Simuler")]                            Simulate,
         [Description("Hériter")]                            Inherit,
 #else
@@ -586,7 +446,7 @@ namespace Common
         [Description("Run-time error")] FailureDuringOperation,	/// Failure during operation -> disabled 
         [Description("Off")]            Off,					/// The component is off
         [Description("Record")]         Record,
-        [Description("Replay")]         Replay,
+        [Description("Reply")]          Reply,
         [Description("Simulate")]       Simulate,				/// Test bench simulation, this mode does not require any hardware
         [Description("Inherit")]        Inherit,
 #endif
@@ -691,32 +551,26 @@ namespace Common
 		[Description("aus")]		Off,
 		[Description("info")]		Info,
 		[Description("ein")]		On,
-		[Description("stopp")]		Stop,
 #elif LANG_FR
         [Description("éteindre")]   Off,
         [Description("info")]       Info,
         [Description("allumé")]     On,
-        [Description("arrêter")]    Stop,
 #elif LANG_CS
 		[Description("vypnuto")]	Off,
 		[Description("info")]		Info,
 		[Description("zapnuto")]	On,
-		[Description("stop")]	    Stop,
 #elif LANG_RU
         [Description("выкл")]       Off,
         [Description("инфо")]       Info,
         [Description("вкл")]        On,
-        [Description("останов")]    Stop,
 #elif LANG_PL
 		[Description("nie")]		Off,
 		[Description("info")]		Info,
 		[Description("tak")]		On,
-		[Description("przestać")]	Stop,
 #else // LANG_EN
         [Description("off")]		Off,
 		[Description("info")]		Info,
 		[Description("on")]			On,
-        [Description("stop")]       Stop,
 #endif
         Count
 	}
@@ -724,15 +578,15 @@ namespace Common
 
     public enum ErrorFlagMask : long
     {
-        E1  = (1L << 0),    /// shift = 0, E1 = 1L
-        E2  = (1L << 1),
-        E3  = (1L << 2),
-        E4  = (1L << 3),
-        E5  = (1L << 4),
-        E6  = (1L << 5),
-        E7  = (1L << 6),
-        E8  = (1L << 7),
-        E9  = (1L << 8),
+        E1 = (1L << 0),    /// shift = 0, E1 = 1L
+        E2 = (1L << 1),
+        E3 = (1L << 2),
+        E4 = (1L << 3),
+        E5 = (1L << 4),
+        E6 = (1L << 5),
+        E7 = (1L << 6),
+        E8 = (1L << 7),
+        E9 = (1L << 8),
         E10 = (1L << 9),
         E11 = (1L << 10),
         E12 = (1L << 11),
@@ -788,44 +642,4 @@ namespace Common
         E62 = (1L << 61),
         E63 = (1L << 62),
     }
-
-    #region iPERL enums
-
-    public enum Side
-    {
-#if LANG_CS
-        [Description("Levá")]   Left,
-        [Description("Pravá")]  Right,
-#else
-        [Description("Left")]   Left,
-        [Description("Right")]  Right,
-#endif
-        Count
-    }
-
-    public enum FlowDir
-    {
-        R_L,
-        L_R,
-        Count
-    }
-
-    public enum Counting
-    {
-        Arbitrary,
-        Positive,
-        Negative,
-        Count
-    }
-
-    public enum OptoHeadState
-    {
-        Disabled,
-        OptoAndDirOK,
-        OptoNok,
-        DirNok,
-        Count
-    }
-
-    #endregion iPERL enums
 }

Config/Entities/FeedingPath.cs

@@ -14,7 +14,6 @@ namespace Config.Entities
         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 string Selector { get; set; }
 		public virtual string Pump { get; set; }
         public virtual string RegulValvesPct { get; set; }	/// Positions of regulation valves in % separated by ';'
 
@@ -41,14 +40,12 @@ namespace Config.Entities
         {
 			FeedingPath result = new FeedingPath(name, itemNr);
 
-			result.Qfrom         = Qfrom;
-            result.Qto           = Qto;
-            result.Selector      = Selector;
-			result.Pump          = Pump;
+			result.Qfrom = Qfrom;
+            result.Qto = Qto;
+			result.Pump = Pump;
             result.RegulValvesPct = RegulValvesPct;
-            result.ValvesOpen    = ValvesOpen;
-			result.ValvesClose   = ValvesClose;
-
+            result.ValvesOpen = ValvesOpen;
+			result.ValvesClose = ValvesClose;
 
             return result;
         }

Config/Entities/Group.cs

@@ -9,7 +9,7 @@ namespace Config.Entities
     public class Group
     {
         public virtual int Id { get; protected set; }
-        public virtual Common.GID GID { get; set; }
+        public virtual Users.Entities.GID GID { get; set; }
         public virtual long AccessFlags { get; set; }		/// Bitfield of access flags: bit0 .. bit62
         public virtual IList<User> Users { get; set; }      /// Group can be a member of a list of users
 
@@ -18,7 +18,7 @@ namespace Config.Entities
             Users = new List<User>();
 		}
 
-        public Group(Common.GID gid)
+        public Group(Users.Entities.GID gid)
             : this()
         {
 			GID = gid;

Config/Entities/IParamsProvider.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
-using Common;
 
 namespace Config.Entities
 {
@@ -32,7 +31,7 @@ namespace Config.Entities
         /// Returns a list of possible values of one parameter (ComboBox when editing) or null (Textbox when editing).
         /// </summary>
         /// <param name="ix">Zero based index of the parameter</param>
-        ICollection<string> ParamValues(int ix);
+        IList<string> ParamValues(int ix);
 
 		/// <summary>
 		/// Returns a parameter value in the string form

Config/Entities/IperlEnums.cs

@@ -0,0 +1,44 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
+
+namespace Config.Entities
+{
+
+    public enum Side
+    {
+#if LANG_CS
+        [Description("Levá")]   Left,
+        [Description("Pravá")]  Right,
+#else
+        [Description("Left")]   Left,
+        [Description("Right")]  Right,
+#endif
+        Count
+    }
+
+    public enum FlowDir
+    {
+        R_L,
+        L_R,
+        Count
+    }
+
+    public enum Counting
+    {
+        Arbitrary,
+        Positive,
+        Negative,
+        Count
+    }
+
+    public enum OptoHeadState
+    {
+        Disabled,
+        OptoAndDirOK,
+        OptoNok,
+        DirNok,
+        Count
+    }
+}

Config/Entities/OutputPath.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -14,7 +14,6 @@ namespace Config.Entities
         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 string Selector { get; set; }
         public virtual string RegulValve { get; set; }
 		public virtual string FlowMeter { get; set; }
 		public virtual float PidCoef { get; set; }			/// PID coefficient for the regulation path
@@ -22,7 +21,7 @@ namespace Config.Entities
         public virtual string Diverter { get; set; }
 		public virtual string TempDiv { get; set; }
 		public virtual string Scale { get; set; }
-        public virtual string RegulValvesPct { get; set; }	/// Positions of regulation valves in % separated by ';'
+		public virtual string EmptyTankValve { get; set; }	/// Not used anywhere
 
         /// Valves		
 		public virtual string ValvesOpen { get; set; }
@@ -47,19 +46,18 @@ namespace Config.Entities
         {
 			OutputPath result = new OutputPath(name, itemNr);
 
-			result.Name        = Name;
-			result.Qfrom       = Qfrom;
-            result.Qto         = Qto;
-            result.Selector    = Selector;
-			result.RegulValve  = RegulValve;
-			result.FlowMeter   = FlowMeter;
-			result.PidCoef     = PidCoef;
-            result.StartValve  = StartValve;
-			result.Diverter    = Diverter;
-			result.TempDiv     = TempDiv;
-			result.Scale       = Scale;
-            result.RegulValvesPct = RegulValvesPct;
-			result.ValvesOpen  = ValvesOpen;
+			result.Name = Name;
+			result.Qfrom = Qfrom;
+            result.Qto = Qto;
+			result.RegulValve = RegulValve;
+			result.FlowMeter = FlowMeter;
+			result.PidCoef = PidCoef;
+            result.StartValve = StartValve;
+			result.Diverter = Diverter;
+			result.TempDiv = TempDiv;
+			result.Scale = Scale;
+			result.EmptyTankValve = EmptyTankValve;
+			result.ValvesOpen = ValvesOpen;
 			result.ValvesClose = ValvesClose;
 
             return result;

Config/Entities/PTest.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Globalization;
 using System.IO;
-using Common;
 
 namespace Config.Entities
 {
@@ -79,7 +78,7 @@ namespace Config.Entities
             TempLimHi = 25.0;	    /// [°C]
             PressLimLo = 0;	        /// [bar]
             PressLimHi = 16.0;	    /// [bar]
-            Publish = (sbyte)Common.Publish.Always;
+            Publish = (sbyte)Config.Entities.Publish.Always;
             Evaluate = true;
 
             E1 = (sbyte)ErrorFlagsMode.On;

Config/Entities/Procedure.cs

@@ -1,18 +1,17 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using Common;
 
 namespace Config.Entities
 {
     /// <summary>
     /// Stores one test procedure, supports revisions and history log
     /// </summary>
-    public class Procedure : IHasName, IHasItemNr
+	public class Procedure : IHasName, IHasItemNr
     {
         public virtual int Id { get; protected set; }
 		public virtual int ItemNr { get; set; }
@@ -54,13 +53,14 @@ namespace Config.Entities
 		public virtual IList<ComponentProcedure> MoreParams { get; set; }
 		public virtual IList<Test> Tests { get; set; }
 
-        TestInstance[] testInstances;
-
         /// Wrapper
         public virtual IList<Test> RegularTests()
         {
             IList<Test> rslt = new List<Test>();
-            foreach (var t in Tests) if (t.IsRegular()) rslt.Add(t);
+            foreach (var t in Tests)
+            {
+                if ((t.Name.Length > 0 && t.Name[0] != '[') || !t.Name.Contains("]"))  rslt.Add(t);
+            }
             return rslt;
         }
 
@@ -70,7 +70,6 @@ namespace Config.Entities
         {
 			MoreParams = new List<ComponentProcedure>();
 			Tests = new List<Test>();
-            testInstances = null;
 
 			///
 			/// Default values
@@ -79,7 +78,7 @@ namespace Config.Entities
 			CreationTime = DateTime.Now;
 			LastChgUser = CreationUser;
 			LastChgTime = CreationTime;
-			MetersKind = MetersKind.Single;
+			MetersKind = Entities.MetersKind.Single;
 			Watermeters = string.Empty;
 			Description = string.Empty;
 			LongDescription = string.Empty;
@@ -97,70 +96,6 @@ namespace Config.Entities
 			ItemNr = itemNr;
 		}
 
-        public virtual TestInstance[] UpdateTestInstances(IList<string> loopStartNames, IList<string> loopEndNames, IList<string> autoTests = null)
-        {
-            List<TestInstance> instances = new List<TestInstance>();
-
-            if (Tests != null)
-            {
-                int i = 0;
-                while (i < Tests.Count)
-                {
-                    if (!loopStartNames.Contains(Tests[i].Method) && !loopEndNames.Contains(Tests[i].Method))   /// Loop.End is ignored outside a loop
-                    {
-                        ///
-                        /// Outside a loop
-                        ///
-                        for (int j = 1; j <= Tests[i].Repeats; j++)
-                            if (Tests[i].BelongsTo(autoTests))
-                                instances.Add(new TestInstance(Tests[i], j));
-                    }
-                    else if (loopStartNames.Contains(Tests[i].Method))
-                    {
-                        ///
-                        /// Entering a loop
-                        ///
-                        int loopsCount = Tests[i].Repeats;
-                        List<Test> testsInsideLoop = new List<Test>();
-                        i++;
-
-                        while (i < Tests.Count && !loopEndNames.Contains(Tests[i].Method))
-                        {
-                            ///
-                            /// Inside a loop
-                            ///
-                            if (Tests[i].Repeats == loopsCount && !loopStartNames.Contains(Tests[i].Method))    /// Loop.Start is ignored inside a loop
-                            {
-                                if (Tests[i].BelongsTo(autoTests))
-                                    testsInsideLoop.Add(Tests[i]);
-                            }
-
-                            i++;
-                        }
-
-                        ///
-                        /// Append instances of tests inside the last loop to the list
-                        ///
-                        for (int j = 1; j <= loopsCount; j++)
-                        {
-                            foreach (var t in testsInsideLoop)
-                                instances.Add(new TestInstance(t, j));
-                        }
-                    }
-
-                    i++;
-                }
-            }
-
-            testInstances = instances.ToArray();
-            return testInstances;
-        }
-
-        public virtual TestInstance[] GetTestInstances()
-        {
-            return testInstances;
-        }
-
         public virtual Procedure Clone()
         {
             Procedure result = new Procedure();

Config/Entities/Profile.cs

@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using Common;
 
 namespace Config.Entities
 {

Config/Entities/Test.cs

@@ -1,11 +1,10 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using Common;
 
 namespace Config.Entities
 {
@@ -26,7 +25,7 @@ namespace Config.Entities
         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 float TstTime { 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
@@ -45,7 +44,7 @@ namespace Config.Entities
         public virtual int TimeFlow2Mass { get; set; }		/// Delay time from the flow stable to the 1st mass measurement in [s]
         public virtual int TimePump2StartV { get; set; }	/// Delay time from the start of the pump to opening the start valve in [s]
         public virtual int TimeStop2Mass { get; set; }		/// Delay time from the test end (diverted) to the 2nd mass measuremen in [s]
-		public virtual double ShortPulses { get; set; }		///  = Filter
+		public virtual double TolerRed { get; set; }		///  = Filter
         public virtual string RedType { get; set; }
 		public virtual string FeedingPath { get; set; }
 		public virtual string BenchPath { get; set; }
@@ -54,25 +53,12 @@ namespace Config.Entities
 #if HEAT_METERS
         public virtual string HeatMetersPath { get; set; }
 #endif
-        public virtual string TransBefore { get; set; }
-		public virtual string TransBetween { get; set; }
-		public virtual string TransAfter { get; set; }
+        public virtual string RelTransBefore { get; set; }
+		public virtual string RelTransBetween { get; set; }
+		public virtual string TransitionAfter { get; set; }
 
-        public virtual bool IsOuterLoopStart { get; set; }   /// Not mapped to database
-        public virtual bool IsOuterLoopEnd { get; set; }     /// Not mapped to database
-
-        public virtual bool QtgTextChngd { get; set; }       /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        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
-        public virtual bool VolumeTextChngd { get; set; }    /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual bool TempLimLoTextChngd { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual bool TempLimHiTextChngd { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual Unit VolumeUnit { get; set; }         /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual Unit FlowUnit { get; set; }           /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        public virtual Unit MassUnit { get; set; }           /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
-        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 bool IsOuterLoopStart { get; set; }  /// Not mapped to database
+        public virtual bool IsOuterLoopEnd { get; set; }    /// Not mapped to database
 
 		public virtual IList<ComponentTest> MoreParams { get; set; }
 
@@ -89,7 +75,7 @@ namespace Config.Entities
 			///
             Part = 0;
             Profile = TestProfile.UserDefined;
-            Publish = (sbyte)Common.Publish.Always;
+            Publish = (sbyte)Config.Entities.Publish.Always;
 			DoEvaluate = true;
 			Repeats = 1;
 			DoDraining = false;
@@ -108,10 +94,10 @@ namespace Config.Entities
             TimeFlow2Mass = 5;				/// [s] time from the flow stable to the 1st mass measurement in [s]
             TimePump2StartV = 1;			/// [s] time from the 1st mass measurement to the test start in [s]
             TimeStop2Mass = 5;				/// [s] between the test end and the final mass measurement
-            ShortPulses = 0;					/// = Filter parameter
-			TransBefore  = string.Empty;
-			TransBetween = string.Empty;
-			TransAfter = string.Empty;
+            TolerRed = 0;					/// = Filter parameter
+			RelTransBefore  = string.Empty;
+			RelTransBetween = string.Empty;
+			TransitionAfter = string.Empty;
 		}
 
 		public Test(string name, int itemNr, Procedure procedure)
@@ -122,32 +108,6 @@ namespace Config.Entities
 			Procedure = procedure;
 		}
 
-        public virtual bool IsRegular()
-        {
-            /// Irregular / event triggered test names have form "[event] TestName"
-            return (Name.Length > 0 && Name[0] != '[') || !Name.Contains("]");
-        }
-
-        public virtual bool BelongsTo(IList<string> autoTests)
-        {
-            if (IsRegular()) return true;
-
-            if (autoTests == null) return false;
-
-            string action = Name.Substring(1, Name.IndexOf(']') - 1);
-            return autoTests.Contains(action);
-        }
-
-        public virtual void ResetChngdFlags()
-        {
-            QtgTextChngd = false;
-            QfromTextChngd = false;
-            QtoTextChngd = false;
-            VolumeTextChngd = false;
-            TempLimLoTextChngd = false;
-            TempLimHiTextChngd = false;
-        }
-
         // Makes a new copy of this object (not just a reference)
         public virtual Test Clone()
         {
@@ -161,7 +121,7 @@ namespace Config.Entities
 			result.Qfrom = Qfrom;
             result.Qto = Qto;
 			result.Volume = Volume;
-			result.TestTime = TestTime;
+			result.TstTime = TstTime;
 			result.Method = Method;
 			result.ErrLimLo = ErrLimLo;
 			result.ErrLimHi = ErrLimHi;
@@ -180,7 +140,7 @@ namespace Config.Entities
             result.TimeFlow2Mass = TimeFlow2Mass;
             result.TimePump2StartV = TimePump2StartV;
 			result.TimeStop2Mass = TimeStop2Mass;
-			result.ShortPulses = ShortPulses;
+			result.TolerRed = TolerRed;
             result.RedType = RedType;
 			result.FeedingPath = FeedingPath;
 			result.BenchPath = BenchPath;
@@ -189,16 +149,10 @@ namespace Config.Entities
 #if HEAT_METERS
             result.HeatMetersPath = HeatMetersPath;
 #endif
-			result.TransBefore = TransBefore;
-			result.TransBetween = TransBetween;
-			result.TransAfter = TransAfter;
-            result.VolumeUnit = VolumeUnit;
-            result.FlowUnit = FlowUnit;
-            result.MassUnit = MassUnit;
-            result.TempUnit = TempUnit;
-            result.PressUnit = PressUnit;
-            result.LengthUnit = LengthUnit;
-            foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone()); }
+			result.RelTransBefore = RelTransBefore;
+			result.RelTransBetween = RelTransBetween;
+			result.TransitionAfter = TransitionAfter;
+			foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone()); }
 
             return result;
         }
@@ -215,7 +169,7 @@ namespace Config.Entities
             output.WriteLine(Qfrom.ToString(ci));
             output.WriteLine(Qto.ToString(ci));
             output.WriteLine(Volume.ToString(ci));
-            output.WriteLine(TestTime.ToString(ci));
+            output.WriteLine(TstTime.ToString(ci));
             output.WriteLine(Method);
             output.WriteLine(ErrLimLo.ToString(ci));
             output.WriteLine(ErrLimHi.ToString(ci));
@@ -238,10 +192,10 @@ namespace Config.Entities
             output.WriteLine(BenchPath);
             output.WriteLine(OutputPath);
             output.WriteLine(MetersPath);
-            output.WriteLine(TransBefore);
-            output.WriteLine(TransBetween);
+            output.WriteLine(RelTransBefore);
+            output.WriteLine(RelTransBetween);
             output.WriteLine(Profile);
-            output.WriteLine(TransAfter);
+            output.WriteLine(TransitionAfter);
 
             foreach (var prms in MoreParams) { prms.Export(output); }
             output.WriteLine();
@@ -266,7 +220,7 @@ namespace Config.Entities
             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.TstTime = float.Parse(input.ReadLine(), ci);
             tst.Method = input.ReadLine();
 			tst.ErrLimLo = float.Parse(input.ReadLine(), ci);
 			tst.ErrLimHi = float.Parse(input.ReadLine(), ci);
@@ -289,13 +243,13 @@ namespace Config.Entities
             tst.BenchPath = input.ReadLine();
             tst.OutputPath = input.ReadLine();
             tst.MetersPath = input.ReadLine();
-            tst.TransBefore = input.ReadLine();
-            tst.TransBetween = input.ReadLine();
+            tst.RelTransBefore = input.ReadLine();
+            tst.RelTransBetween = 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
-            tst.TransAfter = input.ReadLine();
+            tst.TransitionAfter = input.ReadLine();
 
             while (true)
             {
@@ -328,7 +282,7 @@ namespace Config.Entities
             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 != 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 != TstTime.ToString(ci))            { diff.AppendFormat(fmt, "TstTime", TstTime.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Method)                          { diff.AppendFormat(fmt, "Method", Method, ln); };
             ln = inp.ReadLine(); if (ln != ErrLimLo.ToString(ci))           { diff.AppendFormat(fmt, "ErrLimLo", ErrLimLo.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != ErrLimHi.ToString(ci))           { diff.AppendFormat(fmt, "ErrLimHi", ErrLimHi.ToString(ci), ln); };
@@ -351,10 +305,10 @@ namespace Config.Entities
             ln = inp.ReadLine(); if (ln != BenchPath)                       { diff.AppendFormat(fmt, "BenchPath", BenchPath, ln); };
             ln = inp.ReadLine(); if (ln != OutputPath)                      { diff.AppendFormat(fmt, "OutputPath", OutputPath, ln); };
             ln = inp.ReadLine(); if (ln != MetersPath)                      { diff.AppendFormat(fmt, "MetersPath", MetersPath, ln); };
-            ln = inp.ReadLine(); if (ln != TransBefore)                     { diff.AppendFormat(fmt, "RelTransBefore", TransBefore, ln); };
-            ln = inp.ReadLine(); if (ln != TransBetween)                    { diff.AppendFormat(fmt, "RelTransBetween", TransBetween, ln); };
-            ln = inp.ReadLine(); if (ln != Profile.ToString())              { diff.AppendFormat(fmt, "RelTransAfter", Profile, ln); };
-            ln = inp.ReadLine(); if (ln != TransAfter)                      { diff.AppendFormat(fmt, "TransitionAfter", TransAfter, ln); };
+            ln = inp.ReadLine(); if (ln != RelTransBefore)                  { diff.AppendFormat(fmt, "RelTransBefore", RelTransBefore, ln); };
+            ln = inp.ReadLine(); if (ln != RelTransBetween)                 { diff.AppendFormat(fmt, "RelTransBetween", RelTransBetween, ln); };
+            ln = inp.ReadLine(); if (ln != Profile.ToString())            { diff.AppendFormat(fmt, "RelTransAfter", Profile, ln); };
+            ln = inp.ReadLine(); if (ln != TransitionAfter)                 { diff.AppendFormat(fmt, "TransitionAfter", TransitionAfter, ln); };
 
             return diff.ToString();
         }
@@ -455,6 +409,29 @@ namespace Config.Entities
 			return false;
 		}
 
+		/// <summary>
+		/// Determines whether tests part number is OK.
+		/// Examples of correct part number are:
+		///	1, 2, 12, 21 in case of max. part nr.== 2
+		///	1, 2, 3, 4, 12, 13, 14, 23, 24, 34, 123, 124, 134, 234, 1234 in case of max. part nr.== 4
+		/// </summary>
+		/// <param name="partNr">Tests par tnumber</param>
+		/// <returns>true when Part number is OK</returns>
+		public static bool IsGoodPartNr(int partNr)
+		{
+			bool firstDigitIsOK  = ((partNr % 10) > 0) && ((partNr % 10) <= Config.Data.MaxPartNr);
+			bool secondDigitIsOK = (((partNr/10) % 10) > 0) && (((partNr/10) % 10) <= Config.Data.MaxPartNr);
+			bool thirdDigitIsOK  = (((partNr/100) % 10) > 0) && (((partNr/100) % 10) <= Config.Data.MaxPartNr);
+			bool fourthDigitIsOK = (((partNr/1000) % 10) > 0) && (((partNr/1000) % 10) <= Config.Data.MaxPartNr);
+
+			if (firstDigitIsOK && (partNr / 10 == 0)) return true;
+			if (firstDigitIsOK && secondDigitIsOK && (partNr / 100 == 0)) return true;
+			if (firstDigitIsOK && secondDigitIsOK && thirdDigitIsOK && (partNr / 1000 == 0)) return true;
+			if (firstDigitIsOK && secondDigitIsOK && thirdDigitIsOK && fourthDigitIsOK && (partNr / 10000 == 0)) return true;
+
+			return false;
+		}
+
 		public override string ToString()
 		{
 			string partStr = (Part > 0) ? string.Format(", part {0}", Part) : string.Empty;

Config/Entities/TestInstance.cs

@@ -1,32 +0,0 @@
-///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
-///
-using System;
-
-namespace Config.Entities
-{
-    public class TestInstance
-    {
-        public Test Test;
-        public int Repetition;
-
-        public string Name
-        {
-            get
-            {
-                return (Test != null) ? Common.Utils.GetTestName(Test.Name, Test.Repeats, Repetition) : string.Empty;
-            }
-        }
-
-        public TestInstance(Test test, int repetition)
-        {
-            Test = test;
-            Repetition = repetition;
-        }
-
-        public override string ToString()
-        {
-            return Name;
-        }
-    }
-}

Config/FluentCommon.cs

@@ -14,11 +14,45 @@ namespace Config
 {
     public static class FluentCommon
     {
+		/// <summary>
+		/// Session factories for regular sessions.
+		/// </summary>
+		public static ISessionFactory[] SessionFactories = new ISessionFactory[(int)Users.Entities.DBKind.Count];
+
         /// <summary>
         /// NHibernate session factory (to create the database session 'SessionFactory')
         /// </summary>
         /// <returns>A database session</returns>
-		public static ISessionFactory CreateSessionFactory(Common.DBKind database, Common.DBType dbType, string connectionString, bool createDB)
+        static ISessionFactory CreateSessionFactory(Users.Entities.DBKind database)
+        {
+            Users.Entities.DBType dbType;
+            string connectionString;
+
+			switch (database)
+			{
+                default:
+                case Users.Entities.DBKind.Config:
+					dbType = Data.CurrentBench.ProceduresDBSettings.DbType;
+					connectionString = Data.CurrentBench.ProceduresDBSettings.ConnectionString;
+                    break;
+                case Users.Entities.DBKind.Results:
+					dbType = Data.CurrentBench.WaterMetersDBSettings.DbType;
+					connectionString = Data.CurrentBench.WaterMetersDBSettings.ConnectionString;
+                    break;
+                case Users.Entities.DBKind.RemoteConfig:
+                    dbType = Data.CurrentBench.UsersDBSettings.DbType;
+                    connectionString = Data.CurrentBench.UsersDBSettings.ConnectionString;
+                    break;
+            }
+
+            return CreateSessionFactory(database, dbType, connectionString, false);
+		}
+
+        /// <summary>
+        /// NHibernate session factory (to create the database session 'SessionFactory')
+        /// </summary>
+        /// <returns>A database session</returns>
+		public static ISessionFactory CreateSessionFactory(Users.Entities.DBKind database, Users.Entities.DBType dbType, string connectionString, bool createDB)
         {
 			try
 			{
@@ -27,10 +61,10 @@ namespace Config
                 switch (dbType)
 				{
 					default:
-                    case Common.DBType.SQLite:
+                    case Users.Entities.DBType.SQLite:
 						cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
                         break;
-                    case Common.DBType.MySql:
+                    case Users.Entities.DBType.MySql:
                         cfg = cfg.Database(MySQLConfiguration.Standard.ConnectionString(connectionString));
                         break;
 				}
@@ -38,11 +72,11 @@ namespace Config
                 switch (database)
                 {
                     default:
-					case Common.DBKind.Config:
-                    case Common.DBKind.RemoteConfig:
+					case Users.Entities.DBKind.Config:
+                    case Users.Entities.DBKind.RemoteConfig:
                         cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<Data>());
                         break;
-                    case Common.DBKind.Results:
+                    case Users.Entities.DBKind.Results:
                         cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<Data>());
                         break;
                 }
@@ -82,6 +116,17 @@ namespace Config
             new SchemaExport(config).Create(true, true);
         }
 
+		/// Create a NHibernate session for the given database
+		public static ISession CreateSession(Users.Entities.DBKind database)
+		{
+            if (database < 0 || database >= Users.Entities.DBKind.Count) return null;
+
+            int ix = (int)database;
+            if (SessionFactories[ix] == null) SessionFactories[ix] = CreateSessionFactory(database);
+
+			return SessionFactories[ix].OpenSession();
+		}
+
         /// <summary>
         /// Create an empty users database.
 		/// Database contains only the user 'admin' and the control board component 'CB'.
@@ -89,9 +134,9 @@ namespace Config
         /// <param name="dbType">DBType.SQLite or DBType.MySql</param>
         /// <param name="connectionString">Connection string</param>
         /// <returns>true=success, false=error</returns>
-		public static bool CreateEmptyConfigDB(Common.DBType dbType, string connectionString)
+		public static bool CreateEmptyConfigDB(Users.Entities.DBType dbType, string connectionString)
 		{
-			ISessionFactory sessionFactory = CreateSessionFactory(Common.DBKind.Config, dbType, connectionString, true);
+			ISessionFactory sessionFactory = CreateSessionFactory(Users.Entities.DBKind.Config, dbType, connectionString, true);
 			if (sessionFactory == null) return false;
 
             /// Populate the database
@@ -113,23 +158,23 @@ namespace Config
                     ///
                     /// Prepare all groups, add some of them to admin
                     ///
-                    for (Common.GID gid = 0; gid < Common.GID.NrOfGroups; gid++)
+                    for (Users.Entities.GID gid = 0; gid < Users.Entities.GID.NrOfGroups; gid++)
                     {
                         Config.Entities.Group group = new Config.Entities.Group(gid);
                         switch (gid)
                         {
-                            case Common.GID.Testers:
-                            case Common.GID.TestingSpecialists:
-                            case Common.GID.HeadOfLab:
-                            case Common.GID.MaintenanceSpecialists:
-                            case Common.GID.Metrologists:
-                            case Common.GID.CalibrationSpecialists:
-                            case Common.GID.Administrators:
+                            case Users.Entities.GID.Testers:
+                            case Users.Entities.GID.TestingSpecialists:
+                            case Users.Entities.GID.HeadOfLab:
+                            case Users.Entities.GID.MaintenanceSpecialists:
+                            case Users.Entities.GID.Metrologists:
+                            case Users.Entities.GID.CalibrationSpecialists:
+                            case Users.Entities.GID.Administrators:
 #if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
-                            case Common.GID.TraceabilityManagement:
+                            case Users.Entities.GID.TraceabilityManagement:
 #elif KEMPNO_50 || KRAKOW_50 || TORUN_50 || WARSAW_END
-                            case Common.GID.MetrologicalAuthority:
-                            case Common.GID.WaterMeterAuthority:
+                            case Users.Entities.GID.MetrologicalAuthority:
+                            case Users.Entities.GID.WaterMeterAuthority:
 #endif
                                 admin.AddGroup(group);
                                 session.SaveOrUpdate(group);    /// Save this group

Config/Mappings/OutputPathMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
 using FluentNHibernate.Mapping;
 using Config.Entities;
@@ -23,8 +23,7 @@ namespace Config.Mappings
 			Map(x => x.TempDiv);
 			Map(x => x.Scale)
 				.Column("Balance");
-            Map(x => x.RegulValvesPct)
-                .Column("EmptyTankValve");
+			Map(x => x.EmptyTankValve);
 			Map(x => x.ValvesOpen)
 				.CustomType("StringClob")
 				.CustomSqlType("varchar(8000)");

Config/Mappings/TestMap.cs

@@ -22,8 +22,7 @@ namespace Config.Mappings
             Map(x => x.Qfrom);
 			Map(x => x.Qto);
 			Map(x => x.Volume);
-			Map(x => x.TestTime)
-                .Column("TstTime");
+			Map(x => x.TstTime);
 			Map(x => x.Repeats);
             Map(x => x.DoDraining)
 				.Column("Emptying");
@@ -46,7 +45,7 @@ namespace Config.Mappings
 			Map(x => x.ErrLimLo);
 			Map(x => x.ErrLimHi);
 			Map(x => x.Uncertainty);
-			Map(x => x.ShortPulses)
+			Map(x => x.TolerRed)
                 .Column("TolerRed");	/// ???
 			Map(x => x.RedType);
 			Map(x => x.FeedingPath);
@@ -56,11 +55,11 @@ namespace Config.Mappings
 #if HEAT_METERS
             Map(x => x.HeatMetersPath);
 #endif
-            Map(x => x.TransBefore)
+            Map(x => x.RelTransBefore)
                 .Column("RelTransBefore");
-			Map(x => x.TransBetween)
+			Map(x => x.RelTransBetween)
                 .Column("RelTransBetween");
-			Map(x => x.TransAfter)
+			Map(x => x.TransitionAfter)
                 .Column("TransitionAfter");
 
             HasMany(x => x.MoreParams)

Config/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.26.1519.0")]
-[assembly: AssemblyFileVersion("2.26.1519.0")]
+[assembly: AssemblyVersion("2.26.1458.0")]
+[assembly: AssemblyFileVersion("2.26.1458.0")]

Config/Units.cs

@@ -1,9 +1,8 @@
 ///
-/// Copyright (c) 2016-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2016-2020 Sensus Slovensko a.s.
 ///
 using System;
 using System.Reflection;
-using Common;
 using Config.Entities;
 
 namespace Config
@@ -27,9 +26,7 @@ namespace Config
         [Description("m3")]         m3,         ///   1 m3 = 1000 l
 
         [Description("l/h")]        lph,        ///   1 l/h = 0.001 m3/h
-        [Description("cf/h")]       cfph,       ///   1 cf/h = 0.028316846592 m3/h
         [Description("l/m")]        lpm,        ///   1 l/m = 60 l/h = 0.06 m3/h
-        [Description("US gal/m")]   USgalpm,    ///   1 US gallon per minute = 0.2271247068 m3/h
         [Description("m3/h")]       m3ph,       /// * 1 m3/h
         [Description("l/s")]        lps,        ///   1 liter/s = 3.6 m3/h
         [Description("US gal/s")]   USgalps,    ///   1 US gallon per second = 13.627482408 m3/h
@@ -37,7 +34,6 @@ namespace Config
         [Description("cf/s")]       cfs,        ///   1 cubic foot per second = 101.9406477312 m3/h
 
         [Description("g")]          g,          ///   0.001 kg
-        [Description("oz")]         oz,         ///   0.0283495231 kg
         [Description("lb")]         lb,         ///   0.45359237 kg
         [Description("kg")]         kg,         /// * 1 kilogram
         [Description("t")]          t,          ///   1000 kg
@@ -248,14 +244,14 @@ namespace Config
                    unit == Unit.J || unit == Unit.uSpcm || unit == Unit.ppl || unit == Unit.ppkWh;
         }
 
-        public static bool IsQuantity(Unit unit, Quantity quantity)
+        public static bool IsQuantity(Unit units, Quantity quantity)
         {
-            return (quantity == GetQuantity(unit));
+            return (quantity == GetQuantity(units));
         }
 
-        public static Quantity GetQuantity(Unit unit)
+        public static Quantity GetQuantity(Unit units)
 		{
-            switch (unit)
+            switch (units)
             {
                 case Unit.pulse:
                 case Unit.degree:
@@ -271,9 +267,7 @@ namespace Config
 					return Quantity.Volume;
 
                 case Unit.lph:
-                case Unit.cfph:
                 case Unit.lpm:
-                case Unit.USgalpm:
                 case Unit.m3ph:
                 case Unit.lps:
                 case Unit.USgalps:
@@ -282,7 +276,6 @@ namespace Config
                     return Quantity.Flow;
 
                 case Unit.g:
-                case Unit.oz:
                 case Unit.lb:
                 case Unit.kg:
                 case Unit.t:
@@ -360,32 +353,26 @@ namespace Config
             }
 		}
 
-		public static bool IsVolume(Unit unit)       { return IsQuantity(unit, Config.Quantity.Volume); }
-		public static bool IsFlow(Unit unit)         { return IsQuantity(unit, Config.Quantity.Flow); }
-        public static bool IsMass(Unit unit)         { return IsQuantity(unit, Config.Quantity.Mass); }
-        public static bool IsTime(Unit unit)         { return IsQuantity(unit, Config.Quantity.Time); }
-        public static bool IsTemperature(Unit unit)  { return IsQuantity(unit, Config.Quantity.Temperature); }
-		public static bool IsPressure(Unit unit)     { return IsQuantity(unit, Config.Quantity.Pressure); }
-        public static bool IsHumidity(Unit unit)     { return IsQuantity(unit, Config.Quantity.Humidity); }
-        public static bool IsError(Unit unit)        { return IsQuantity(unit, Config.Quantity.Error); }
-		public static bool IsLength(Unit unit)       { return IsQuantity(unit, Config.Quantity.Length); }
-		public static bool IsDensity(Unit unit)      { return IsQuantity(unit, Config.Quantity.Density); }
-		public static bool IsEnergy(Unit unit)       { return IsQuantity(unit, Config.Quantity.Energy); }
-        public static bool IsPulses(Unit unit)       { return IsQuantity(unit, Config.Quantity.Pulses); }
-        public static bool IsPulsePerLtr(Unit unit)  { return IsQuantity(unit, Config.Quantity.PulsePerLtr); }
-        public static bool IsPulsePerKWh(Unit unit)  { return IsQuantity(unit, Config.Quantity.PulsePerKWh); }
-        public static bool IsConductivity(Unit unit) { return IsQuantity(unit, Config.Quantity.Conductivity); }
+		public static bool IsVolume(Unit units) { return IsQuantity(units, Config.Quantity.Volume); }
+		public static bool IsFlow(Unit units) { return IsQuantity(units, Config.Quantity.Flow); }
+        public static bool IsMass(Unit units) { return IsQuantity(units, Config.Quantity.Mass); }
+        public static bool IsTime(Unit units) { return IsQuantity(units, Config.Quantity.Time); }
+        public static bool IsTemperature(Unit units) { return IsQuantity(units, Config.Quantity.Temperature); }
+		public static bool IsPressure(Unit units) { return IsQuantity(units, Config.Quantity.Pressure); }
+        public static bool IsHumidity(Unit units) { return IsQuantity(units, Config.Quantity.Humidity); }
+        public static bool IsError(Unit units) { return IsQuantity(units, Config.Quantity.Error); }
+		public static bool IsLength(Unit units) { return IsQuantity(units, Config.Quantity.Length); }
+		public static bool IsDensity(Unit units) { return IsQuantity(units, Config.Quantity.Density); }
+		public static bool IsEnergy(Unit units) { return IsQuantity(units, Config.Quantity.Energy); }
+        public static bool IsPulses(Unit units) { return IsQuantity(units, Config.Quantity.Pulses); }
+        public static bool IsPulsePerLtr(Unit units) { return IsQuantity(units, Config.Quantity.PulsePerLtr); }
+        public static bool IsPulsePerKWh(Unit units) { return IsQuantity(units, Config.Quantity.PulsePerKWh); }
+        public static bool IsConductivity(Unit units) { return IsQuantity(units, Config.Quantity.Conductivity); }
 
 
-
-        public static float ConvertTo(Unit unit, float v)
+		public static double ConvertTo(Unit units, double v)
         {
-            return (float)ConvertTo(unit, (double)v);
-        }
-
-        public static double ConvertTo(Unit unit, double v)
-        {
-            switch (unit)
+            switch (units)
             {
                 /// Volume: internal representation in l
                 case Unit.ml:       return 1000 * v;            /// 1 ml = 0.001 l
@@ -396,17 +383,14 @@ namespace Config
 
                 /// Flow: internal representation in m3/h
                 case Unit.lph:      return 1000 * v;            /// 1 l/h
-                case Unit.cfph:     return 35.3146667214886 * v;/// 1 cf/h
                 case Unit.lpm:      return v / 0.06;            /// 1 l/m
-                case Unit.USgalpm:  return 4.40286754395493 * v;/// 1 US gallon per minute
                 case Unit.lps:      return v / 3.6;             /// 1 l/s
-                case Unit.USgalps:  return 0.0733811257326 * v; /// 1 US gallon per second
+                case Unit.USgalps:  return 0.733811257326 * v;  /// 1 US gallon per second
                 case Unit.m3pm:     return v / 60;              /// 1 m3/m
                 case Unit.cfs:      return 0.009809629644858 * v; /// 1 cubic foot per second
 
                 /// Mass: internal representation in kg
                 case Unit.g:        return 1000 * v;            /// 1 g = 0.001 kg
-                case Unit.oz:       return 35.273962 * v;       /// 1 oz = 0.0283495231 kg
                 case Unit.lb:       return 2.2046226 * v;       /// 1 lb = 0.45359237 kg
                 case Unit.t:        return 0.001 * v;           /// 1 t = 1000 kg
 
@@ -463,15 +447,9 @@ namespace Config
             }
         }
 
-
-        public static float ConvertFrom(Unit unit, float v)
+        public static double ConvertFrom(Unit units, double v)
         {
-            return (float)ConvertFrom(unit, (double)v);
-        }
-
-        public static double ConvertFrom(Unit unit, double v)
-        {
-            switch (unit)
+            switch (units)
             {
                 /// Volume: internal representation in l
                 case Unit.ml:       return 0.001 * v;           /// 0.001 l
@@ -482,9 +460,7 @@ namespace Config
 
                 /// Flow: internal representation in m3/h
                 case Unit.lph:      return 0.001 * v;           /// 1 l/h
-                case Unit.cfph:     return 0.028316846592 * v;  /// 1 cf/h
                 case Unit.lpm:      return 0.06 * v;            /// 1 l/m
-                case Unit.USgalpm:  return 0.2271247068 * v;    /// 1 US gallon per minute
                 case Unit.lps:      return 3.6 * v;             /// 1 l/s
                 case Unit.USgalps:  return 13.627482408 * v;    /// 1 US gallon per second
                 case Unit.m3pm:     return 60 * v;              /// 1 m3/m
@@ -492,7 +468,6 @@ namespace Config
 
                 /// Mass: internal representation in kg
                 case Unit.g:        return 0.001 * v;           /// 1 g = 0.001 kg
-                case Unit.oz:       return 0.0283495231 * v;    /// 1 oz = 0.0283495231 kg
                 case Unit.lb:       return 0.45359237 * v;      /// 1 lb = 0.45359237 kg
                 case Unit.t:        return 1000 * v;            /// 1 t = 1000 kg
 
@@ -548,20 +523,5 @@ namespace Config
                 default:            return v;                   /// Do not convert
             }
         }
-
-        /// <summary>
-        /// Converts a string to a unit
-        /// </summary>
-        /// <param name="description">Unit description string</param>
-        /// <returns>Converted unit or Unit.None if not recognized</returns>
-        public static Unit FromDescription(string description)
-        {
-            for (Unit unit = 0; unit < Unit.Count; unit++)
-            {
-                if (unit.ToDescription() == description) return unit;
-            }
-
-            return Unit.None;
-        }
 	}
 }

Config/Utils.cs

@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Common;
 
 namespace Config
 {
@@ -148,7 +147,7 @@ namespace Config
         /// <param name="medium">NotSpecified, ColdWater or HotWater</param>
         /// <param name="Qdflt">Default flow when metrologic does not match pattern</param>
         /// <returns>Q1 or Qmin flow in m3/h</returns>
-        public static double GetQ1Qmin(double Qn, string metroClass, Medium medium = Medium.ColdWater, double Qdflt = 0)
+        public static double GetQ1Qmin(double Qn, string metroClass, Entities.Medium medium = Entities.Medium.ColdWater, double Qdflt = 0)
         {
             if (string.IsNullOrEmpty(metroClass)) return Qdflt;
 
@@ -159,7 +158,7 @@ namespace Config
             }
             else
             {
-                if (medium == Medium.HotWater)
+                if (medium == Entities.Medium.HotWater)
                 {
                     switch (metroClass)
                     {
@@ -193,7 +192,7 @@ namespace Config
         /// <param name="medium">NotSpecified, ColdWater or HotWater</param>
         /// <param name="Qdflt">Default flow when metrologic does not match pattern</param>
         /// <returns>Q2 or Qt flow in m3/h</returns>
-        public static double GetQ2Qt(double Qn, string metroClass, Medium medium = Medium.ColdWater, double Qdflt = 0)
+        public static double GetQ2Qt(double Qn, string metroClass, Entities.Medium medium = Entities.Medium.ColdWater, double Qdflt = 0)
         {
             if (string.IsNullOrEmpty(metroClass)) return Qdflt;
 
@@ -203,7 +202,7 @@ namespace Config
                 return 1.6 * Qn / (double)metroClassRatio;
             }
 
-            if (medium == Medium.HotWater)
+            if (medium == Entities.Medium.HotWater)
             {
                 switch (metroClass)
                 {
@@ -236,7 +235,7 @@ namespace Config
         /// <param name="medium">NotSpecified, ColdWater or HotWater</param>
         /// <param name="Qdflt">Default flow when metrologic does not match pattern</param>
         /// <returns>Q4 or Qmax flow in m3/h</returns>
-        public static double GetQ4Qmax(double Qn, string metroClass, Medium medium = Medium.ColdWater, double Qdflt = 0)
+        public static double GetQ4Qmax(double Qn, string metroClass, Entities.Medium medium = Entities.Medium.ColdWater, double Qdflt = 0)
         {
             if (string.IsNullOrEmpty(metroClass)) return Qdflt;
 

DataStreamInterface/DataFrame.cs

@@ -7,12 +7,12 @@ namespace DataStreamInterface
 {
     public class DataFrame
     {
-        public readonly Int64 ID;          /// Frame ID
+        public readonly UInt64 ID;          /// Frame ID
         public readonly double Time;        /// Time stamp in units of time
         public readonly double Volume;      /// Volume in units of volume
         public readonly double[] Quantity;  /// An array of optional quantities in their respective units
 
-        public DataFrame(Int64 id, double time, double volume, double[] quantity)
+        public DataFrame(UInt64 id, double time, double volume, double[] quantity)
         {
             ID = id;
             Time = time;

DataStreamInterface/DataStreamInterface.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DataStreamInterface</RootNamespace>
     <AssemblyName>DataStreamInterface</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -21,7 +21,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -30,11 +29,9 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

DataStreamInterface/Enums.cs

@@ -259,7 +259,7 @@ namespace DataStreamInterface
                 case Unit.lph:      return 1000 * v;            /// 1 l/h
                 case Unit.lpm:      return v / 0.06;            /// 1 l/m
                 case Unit.lps:      return v / 3.6;             /// 1 l/s
-                case Unit.USgalps:  return 0.0733811257326 * v; /// 1 US gallon per second
+                case Unit.USgalps:  return 0.733811257326 * v;  /// 1 US gallon per second
                 case Unit.m3pm:     return v / 60;              /// 1 m3/m
                 case Unit.cfs:      return 0.009809629644858 * v; /// 1 cubic foot per second
 

DataStreamInterface/IDataStreamMeter.cs

@@ -2,82 +2,58 @@
 /// Copyright (c) 2020 Sensus Slovensko a.s.
 ///
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace DataStreamInterface
 {
     public interface IDataStreamMeter
     {
-        /// <summary>
-        /// Returns count of water meters supported by the data stream component
-        /// </summary>
-        /// <returns>Water meters count</returns>
-        int GetMetersCount();
-
         /// <summary>
         /// Get state of the connected data stream meter
         /// </summary>
-        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
         /// <param name="state">Current state of the meter</param>
-        /// <param name="parameter">Current extra parameter of the meter</param>
         /// <returns>true when successful</returns>
-        bool GetState(int meterIx, out int state, out string parameter);
+        bool GetState(out int state, out string parameter);
 
         /// <summary>
         /// Set state of the connected data stream meter
         /// </summary>
-        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
         /// <param name="state">Required state of the meter</param>
-        /// <param name="parameter">Required extra parameter of the meter</param>
         /// <returns>true when successful</returns>
-        bool SetState(int meterIx, int state, string parameter);
-
-        bool SetStateAll(int state, string parameter);
+        bool SetState(int state, string parameter);
 
         /// <summary>
         /// Establish connection with a data stream meter
         /// </summary>
-        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
         /// <param name="connectionParameters">Connection parameters</param>
         /// <param name="meterId">Meter ID (e.g. serial number)</param>
         /// <returns>true when successful</returns>
-        bool OpenConnection(int meterIx, string connectionParameters, out string meterId);
+        bool OpenConnection(string connectionParameters, out string meterId);
+
+        /// <summary>
+        /// Closes connection with the data stream meter
+        /// </summary>
+        /// <returns>true when successful</returns>
+        bool CloseConnection();
 
         /// <summary>
         /// Stars saving measurement results into internal data structures of the component.
         /// Each data frame obtains a unique ID.
         /// The very first data fraim obrains ID = 0.
         /// </summary>
-        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
         /// <returns>true when successful</returns>
-        bool StartMeasurement(int meterIx);
-
-        bool StartMeasurementAll();
+        bool StartMeasurement();
 
         /// <summary>
         /// Stops saving measurement results into internal data structures of the component.
         /// Updates ID of the last date frame received from the meter.
         /// </summary>
-        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
-        /// <param name="storedFramesCount">Number of stored date frames</param>
+        /// <param name="lastFrameID">ID of the last date frame</param>
         /// <returns>true when successful</returns>
-        bool StopMeasurement(int meterIx, out Int64 storedFramesCount);
-
-        bool StopMeasurementAll(out Int64[] storedFramesCounts);
-
-        /// <summary>
-        /// Closes connection with the data stream meter
-        /// </summary>
-        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
-        /// <returns>true when successful</returns>
-        bool CloseConnection(int meterIx);
-
-        bool CloseConnectionAll();
-
-        /// <summary>
-        /// This function is called when TBF program is shutting down.
-        /// </summary>
-        /// <returns>true when successful</returns>
-        bool Shutdown();
+        bool StopMeasurement(out UInt64 lastFrameID);
 
         ///------------------------------------------------
         /// Units of time, volume and optional quantities
@@ -94,7 +70,7 @@ namespace DataStreamInterface
         Unit GetVolumeUnits();
 
         ///-----------------------------------------------
-        /// Optional quantities: count, units, captions
+        /// Ooptional quantities: count, units, captions
         ///-----------------------------------------------
 
         /// <summary>
@@ -107,13 +83,13 @@ namespace DataStreamInterface
         /// Returns units of the specified quantity
         /// </summary>
         /// <param name="quanityNr">Zero based quantity number 0 .. quantites count-1</param>
-        Unit GetQuantityUnits(int quantityNr);
+        Unit GetQuantityUnits(int quanityNr);
 
         /// <summary>
         /// Returns caption of the specified quantity
         /// </summary>
         /// <param name="quanityNr">Zero based quantity number 0 .. quantites count-1</param>
-        string GetQuantityCaption(int quantityNr);
+        string GetQuantityCaption(int quanityNr);
 
         ///---------------------------
         /// Datastream data exchange
@@ -122,19 +98,17 @@ namespace DataStreamInterface
         /// <summary>
         /// Retuns 'count' data frames starting with data frame with ID = 'id' 
         /// </summary>
-        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
         /// <param name="id">First frame ID</param>
         /// <param name="count">Frames count</param>
         /// <returns>Selected data frames</returns>
-        DataFrame[] GetFrames(int meterIx, Int64 id, int count);
+        DataFrame[] GetFrames(UInt64 id, int count);
 
         /// <summary>
         /// Returns ID of the data frame where time equals or exceeds the specified time.
         /// When time of the first frame (ID=0) is larger then specified time, function returns 0.
         /// </summary>
-        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
         /// <param name="time">Time</param>
         /// <returns>ID of the data frame at or after the pecified time</returns>
-        Int64 GetID(int meterIx, double time);
+        UInt64 GetID(double time);
     }
 }

DataStreamInterfaceTest/ActivityLog.cs

@@ -1,36 +0,0 @@
-using System;
-using System.Text;
-using System.Windows.Forms;
-
-namespace DataStreamInterfaceTest
-{
-    public class ActivityLog
-    {
-        const int LinesCount = 50;
-
-        TextBox textBox;
-        string[] lines;
-        string activity;
-
-        public ActivityLog(TextBox textBox)
-        {
-            this.textBox = textBox;
-            lines = new string[LinesCount];
-            for (int i = 0; i < LinesCount; i++) lines[i] = string.Empty;
-        }
-
-        public void Print(string log)
-        {
-            for (int i = LinesCount - 1; i > 0; i--) lines[i] = lines[i - 1];
-            lines[0] = log;
-            DisplayLines();
-        }
-
-        private void DisplayLines()
-        {
-            StringBuilder sb = new StringBuilder();
-            foreach (var line in lines) sb.AppendLine(line);
-            textBox.Text = sb.ToString();
-        }
-    }
-}

DataStreamInterfaceTest/App.config

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

DataStreamInterfaceTest/DataStreamInterfaceTest.csproj

@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{1D1EEF9C-7F41-43D3-BD09-5054D00F7A23}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DataStreamInterfaceTest</RootNamespace>
-    <AssemblyName>DataStreamInterfaceTest</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ActivityLog.cs" />
-    <Compile Include="DemoMainWnd.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="DemoMainWnd.Designer.cs">
-      <DependentUpon>DemoMainWnd.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GetDblValueDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GetDblValueDlg.designer.cs">
-      <DependentUpon>GetDblValueDlg.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GetFrameBoundariesDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GetFrameBoundariesDlg.designer.cs">
-      <DependentUpon>GetFrameBoundariesDlg.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GetIntegerNumberDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GetIntegerNumberDlg.Designer.cs">
-      <DependentUpon>GetIntegerNumberDlg.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GetStateDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GetStateDlg.designer.cs">
-      <DependentUpon>GetStateDlg.cs</DependentUpon>
-    </Compile>
-    <Compile Include="LviIDComparer.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="DemoMainWnd.resx">
-      <DependentUpon>DemoMainWnd.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GetDblValueDlg.resx">
-      <DependentUpon>GetDblValueDlg.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GetFrameBoundariesDlg.resx">
-      <DependentUpon>GetFrameBoundariesDlg.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GetIntegerNumberDlg.resx">
-      <DependentUpon>GetIntegerNumberDlg.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GetStateDlg.resx">
-      <DependentUpon>GetStateDlg.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <None Include="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="..\DataStreamInterface\DataStreamInterface.csproj">
-      <Project>{7ebeea14-91c4-48d7-af0a-7a4bc3ff9a28}</Project>
-      <Name>DataStreamInterface</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

DataStreamInterfaceTest/DemoMainWnd.Designer.cs

@@ -1,380 +0,0 @@
-namespace DataStreamInterfaceTest
-{
-    partial class DemoMainWnd
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.getIDButton = new System.Windows.Forms.Button();
-            this.getFramesButton = new System.Windows.Forms.Button();
-            this.measurementLabel = new System.Windows.Forms.Label();
-            this.stateLabel = new System.Windows.Forms.Label();
-            this.capabilitiesLabel = new System.Windows.Forms.Label();
-            this.getQuantityUnitsButton = new System.Windows.Forms.Button();
-            this.getQuantityCaptionButton = new System.Windows.Forms.Button();
-            this.getQuantitiesCountButton = new System.Windows.Forms.Button();
-            this.getVolumeUnitsButton = new System.Windows.Forms.Button();
-            this.getTimeUnitsButton = new System.Windows.Forms.Button();
-            this.setStateButton = new System.Windows.Forms.Button();
-            this.getStateButton = new System.Windows.Forms.Button();
-            this.stopMeasurementButton = new System.Windows.Forms.Button();
-            this.startMeasurementButton = new System.Windows.Forms.Button();
-            this.closeConnectionButton = new System.Windows.Forms.Button();
-            this.openConnectionButton = new System.Windows.Forms.Button();
-            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
-            this.logsTextBox = new System.Windows.Forms.TextBox();
-            this.dataTabControl = new System.Windows.Forms.TabControl();
-            this.tabPage1 = new System.Windows.Forms.TabPage();
-            this.framesListView = new System.Windows.Forms.ListView();
-            this.tabPage2 = new System.Windows.Forms.TabPage();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
-            this.splitContainer1.Panel1.SuspendLayout();
-            this.splitContainer1.Panel2.SuspendLayout();
-            this.splitContainer1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
-            this.splitContainer2.Panel1.SuspendLayout();
-            this.splitContainer2.Panel2.SuspendLayout();
-            this.splitContainer2.SuspendLayout();
-            this.dataTabControl.SuspendLayout();
-            this.tabPage1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // splitContainer1
-            // 
-            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
-            this.splitContainer1.IsSplitterFixed = true;
-            this.splitContainer1.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer1.Name = "splitContainer1";
-            // 
-            // splitContainer1.Panel1
-            // 
-            this.splitContainer1.Panel1.Controls.Add(this.getIDButton);
-            this.splitContainer1.Panel1.Controls.Add(this.getFramesButton);
-            this.splitContainer1.Panel1.Controls.Add(this.measurementLabel);
-            this.splitContainer1.Panel1.Controls.Add(this.stateLabel);
-            this.splitContainer1.Panel1.Controls.Add(this.capabilitiesLabel);
-            this.splitContainer1.Panel1.Controls.Add(this.getQuantityUnitsButton);
-            this.splitContainer1.Panel1.Controls.Add(this.getQuantityCaptionButton);
-            this.splitContainer1.Panel1.Controls.Add(this.getQuantitiesCountButton);
-            this.splitContainer1.Panel1.Controls.Add(this.getVolumeUnitsButton);
-            this.splitContainer1.Panel1.Controls.Add(this.getTimeUnitsButton);
-            this.splitContainer1.Panel1.Controls.Add(this.setStateButton);
-            this.splitContainer1.Panel1.Controls.Add(this.getStateButton);
-            this.splitContainer1.Panel1.Controls.Add(this.stopMeasurementButton);
-            this.splitContainer1.Panel1.Controls.Add(this.startMeasurementButton);
-            this.splitContainer1.Panel1.Controls.Add(this.closeConnectionButton);
-            this.splitContainer1.Panel1.Controls.Add(this.openConnectionButton);
-            // 
-            // splitContainer1.Panel2
-            // 
-            this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
-            this.splitContainer1.Size = new System.Drawing.Size(826, 583);
-            this.splitContainer1.SplitterDistance = 150;
-            this.splitContainer1.TabIndex = 0;
-            // 
-            // getIDButton
-            // 
-            this.getIDButton.Location = new System.Drawing.Point(12, 480);
-            this.getIDButton.Name = "getIDButton";
-            this.getIDButton.Size = new System.Drawing.Size(128, 24);
-            this.getIDButton.TabIndex = 12;
-            this.getIDButton.Text = "Get ID";
-            this.getIDButton.UseVisualStyleBackColor = true;
-            this.getIDButton.Click += new System.EventHandler(this.getIDButton_Click);
-            // 
-            // getFramesButton
-            // 
-            this.getFramesButton.Location = new System.Drawing.Point(12, 450);
-            this.getFramesButton.Name = "getFramesButton";
-            this.getFramesButton.Size = new System.Drawing.Size(128, 24);
-            this.getFramesButton.TabIndex = 11;
-            this.getFramesButton.Text = "Get frames";
-            this.getFramesButton.UseVisualStyleBackColor = true;
-            this.getFramesButton.Click += new System.EventHandler(this.getFramesButton_Click);
-            // 
-            // measurementLabel
-            // 
-            this.measurementLabel.AutoSize = true;
-            this.measurementLabel.Location = new System.Drawing.Point(12, 374);
-            this.measurementLabel.Name = "measurementLabel";
-            this.measurementLabel.Size = new System.Drawing.Size(74, 13);
-            this.measurementLabel.TabIndex = 15;
-            this.measurementLabel.Text = "Measurement:";
-            // 
-            // stateLabel
-            // 
-            this.stateLabel.AutoSize = true;
-            this.stateLabel.Location = new System.Drawing.Point(12, 194);
-            this.stateLabel.Name = "stateLabel";
-            this.stateLabel.Size = new System.Drawing.Size(112, 13);
-            this.stateLabel.TabIndex = 14;
-            this.stateLabel.Text = "State and connection:";
-            // 
-            // capabilitiesLabel
-            // 
-            this.capabilitiesLabel.AutoSize = true;
-            this.capabilitiesLabel.Location = new System.Drawing.Point(12, 9);
-            this.capabilitiesLabel.Name = "capabilitiesLabel";
-            this.capabilitiesLabel.Size = new System.Drawing.Size(63, 13);
-            this.capabilitiesLabel.TabIndex = 13;
-            this.capabilitiesLabel.Text = "Capabilities:";
-            // 
-            // getQuantityUnitsButton
-            // 
-            this.getQuantityUnitsButton.Location = new System.Drawing.Point(12, 145);
-            this.getQuantityUnitsButton.Name = "getQuantityUnitsButton";
-            this.getQuantityUnitsButton.Size = new System.Drawing.Size(128, 24);
-            this.getQuantityUnitsButton.TabIndex = 4;
-            this.getQuantityUnitsButton.Text = "Get quantity units";
-            this.getQuantityUnitsButton.UseVisualStyleBackColor = true;
-            this.getQuantityUnitsButton.Click += new System.EventHandler(this.getQuantityUnitsButton_Click);
-            // 
-            // getQuantityCaptionButton
-            // 
-            this.getQuantityCaptionButton.Location = new System.Drawing.Point(12, 115);
-            this.getQuantityCaptionButton.Name = "getQuantityCaptionButton";
-            this.getQuantityCaptionButton.Size = new System.Drawing.Size(128, 24);
-            this.getQuantityCaptionButton.TabIndex = 3;
-            this.getQuantityCaptionButton.Text = "Get quantity caption";
-            this.getQuantityCaptionButton.UseVisualStyleBackColor = true;
-            this.getQuantityCaptionButton.Click += new System.EventHandler(this.getQuantityCaptionButton_Click);
-            // 
-            // getQuantitiesCountButton
-            // 
-            this.getQuantitiesCountButton.Location = new System.Drawing.Point(12, 85);
-            this.getQuantitiesCountButton.Name = "getQuantitiesCountButton";
-            this.getQuantitiesCountButton.Size = new System.Drawing.Size(128, 24);
-            this.getQuantitiesCountButton.TabIndex = 2;
-            this.getQuantitiesCountButton.Text = "Get quantities count";
-            this.getQuantitiesCountButton.UseVisualStyleBackColor = true;
-            this.getQuantitiesCountButton.Click += new System.EventHandler(this.getQuantitiesCountButton_Click);
-            // 
-            // getVolumeUnitsButton
-            // 
-            this.getVolumeUnitsButton.Location = new System.Drawing.Point(12, 55);
-            this.getVolumeUnitsButton.Name = "getVolumeUnitsButton";
-            this.getVolumeUnitsButton.Size = new System.Drawing.Size(128, 24);
-            this.getVolumeUnitsButton.TabIndex = 1;
-            this.getVolumeUnitsButton.Text = "Get volume units";
-            this.getVolumeUnitsButton.UseVisualStyleBackColor = true;
-            this.getVolumeUnitsButton.Click += new System.EventHandler(this.getVolumeUnitsButton_Click);
-            // 
-            // getTimeUnitsButton
-            // 
-            this.getTimeUnitsButton.Location = new System.Drawing.Point(12, 25);
-            this.getTimeUnitsButton.Name = "getTimeUnitsButton";
-            this.getTimeUnitsButton.Size = new System.Drawing.Size(128, 24);
-            this.getTimeUnitsButton.TabIndex = 0;
-            this.getTimeUnitsButton.Text = "Get time units";
-            this.getTimeUnitsButton.UseVisualStyleBackColor = true;
-            this.getTimeUnitsButton.Click += new System.EventHandler(this.getTimeUnitsButton_Click);
-            // 
-            // setStateButton
-            // 
-            this.setStateButton.Location = new System.Drawing.Point(12, 315);
-            this.setStateButton.Name = "setStateButton";
-            this.setStateButton.Size = new System.Drawing.Size(128, 24);
-            this.setStateButton.TabIndex = 8;
-            this.setStateButton.Text = "Set state";
-            this.setStateButton.UseVisualStyleBackColor = true;
-            this.setStateButton.Click += new System.EventHandler(this.setStateButton_Click);
-            // 
-            // getStateButton
-            // 
-            this.getStateButton.Location = new System.Drawing.Point(12, 285);
-            this.getStateButton.Name = "getStateButton";
-            this.getStateButton.Size = new System.Drawing.Size(128, 24);
-            this.getStateButton.TabIndex = 7;
-            this.getStateButton.Text = "Get state";
-            this.getStateButton.UseVisualStyleBackColor = true;
-            this.getStateButton.Click += new System.EventHandler(this.getStateButton_Click);
-            // 
-            // stopMeasurementButton
-            // 
-            this.stopMeasurementButton.Location = new System.Drawing.Point(12, 420);
-            this.stopMeasurementButton.Name = "stopMeasurementButton";
-            this.stopMeasurementButton.Size = new System.Drawing.Size(128, 24);
-            this.stopMeasurementButton.TabIndex = 10;
-            this.stopMeasurementButton.Text = "Stop measurement";
-            this.stopMeasurementButton.UseVisualStyleBackColor = true;
-            this.stopMeasurementButton.Click += new System.EventHandler(this.stopMeasurementButton_Click);
-            // 
-            // startMeasurementButton
-            // 
-            this.startMeasurementButton.Location = new System.Drawing.Point(12, 390);
-            this.startMeasurementButton.Name = "startMeasurementButton";
-            this.startMeasurementButton.Size = new System.Drawing.Size(128, 24);
-            this.startMeasurementButton.TabIndex = 9;
-            this.startMeasurementButton.Text = "Start measurement";
-            this.startMeasurementButton.UseVisualStyleBackColor = true;
-            this.startMeasurementButton.Click += new System.EventHandler(this.startMeasurementButton_Click);
-            // 
-            // closeConnectionButton
-            // 
-            this.closeConnectionButton.Location = new System.Drawing.Point(12, 240);
-            this.closeConnectionButton.Name = "closeConnectionButton";
-            this.closeConnectionButton.Size = new System.Drawing.Size(128, 24);
-            this.closeConnectionButton.TabIndex = 6;
-            this.closeConnectionButton.Text = "Close connection";
-            this.closeConnectionButton.UseVisualStyleBackColor = true;
-            this.closeConnectionButton.Click += new System.EventHandler(this.closeConnectionButton_Click);
-            // 
-            // openConnectionButton
-            // 
-            this.openConnectionButton.Location = new System.Drawing.Point(12, 210);
-            this.openConnectionButton.Name = "openConnectionButton";
-            this.openConnectionButton.Size = new System.Drawing.Size(128, 24);
-            this.openConnectionButton.TabIndex = 5;
-            this.openConnectionButton.Text = "Open connection";
-            this.openConnectionButton.UseVisualStyleBackColor = true;
-            this.openConnectionButton.Click += new System.EventHandler(this.openConnectionButton_Click);
-            // 
-            // splitContainer2
-            // 
-            this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer2.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer2.Name = "splitContainer2";
-            this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
-            // 
-            // splitContainer2.Panel1
-            // 
-            this.splitContainer2.Panel1.Controls.Add(this.logsTextBox);
-            // 
-            // splitContainer2.Panel2
-            // 
-            this.splitContainer2.Panel2.Controls.Add(this.dataTabControl);
-            this.splitContainer2.Size = new System.Drawing.Size(672, 583);
-            this.splitContainer2.SplitterDistance = 222;
-            this.splitContainer2.TabIndex = 0;
-            // 
-            // logsTextBox
-            // 
-            this.logsTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.logsTextBox.Location = new System.Drawing.Point(0, 0);
-            this.logsTextBox.Multiline = true;
-            this.logsTextBox.Name = "logsTextBox";
-            this.logsTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-            this.logsTextBox.Size = new System.Drawing.Size(672, 222);
-            this.logsTextBox.TabIndex = 0;
-            // 
-            // dataTabControl
-            // 
-            this.dataTabControl.Controls.Add(this.tabPage1);
-            this.dataTabControl.Controls.Add(this.tabPage2);
-            this.dataTabControl.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dataTabControl.Location = new System.Drawing.Point(0, 0);
-            this.dataTabControl.Name = "dataTabControl";
-            this.dataTabControl.SelectedIndex = 0;
-            this.dataTabControl.Size = new System.Drawing.Size(672, 357);
-            this.dataTabControl.TabIndex = 0;
-            // 
-            // tabPage1
-            // 
-            this.tabPage1.Controls.Add(this.framesListView);
-            this.tabPage1.Location = new System.Drawing.Point(4, 22);
-            this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(664, 331);
-            this.tabPage1.TabIndex = 0;
-            this.tabPage1.Text = "Transferred frames";
-            this.tabPage1.UseVisualStyleBackColor = true;
-            // 
-            // framesListView
-            // 
-            this.framesListView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.framesListView.GridLines = true;
-            this.framesListView.Location = new System.Drawing.Point(3, 3);
-            this.framesListView.Name = "framesListView";
-            this.framesListView.Size = new System.Drawing.Size(658, 325);
-            this.framesListView.TabIndex = 0;
-            this.framesListView.UseCompatibleStateImageBehavior = false;
-            this.framesListView.View = System.Windows.Forms.View.Details;
-            // 
-            // tabPage2
-            // 
-            this.tabPage2.Location = new System.Drawing.Point(4, 22);
-            this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage2.Size = new System.Drawing.Size(664, 331);
-            this.tabPage2.TabIndex = 1;
-            this.tabPage2.Text = "Graph";
-            this.tabPage2.UseVisualStyleBackColor = true;
-            // 
-            // DemoMainWnd
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(826, 583);
-            this.Controls.Add(this.splitContainer1);
-            this.Name = "DemoMainWnd";
-            this.Text = "Datastream interface test";
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.DemoMainWnd_FormClosing);
-            this.splitContainer1.Panel1.ResumeLayout(false);
-            this.splitContainer1.Panel1.PerformLayout();
-            this.splitContainer1.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
-            this.splitContainer1.ResumeLayout(false);
-            this.splitContainer2.Panel1.ResumeLayout(false);
-            this.splitContainer2.Panel1.PerformLayout();
-            this.splitContainer2.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
-            this.splitContainer2.ResumeLayout(false);
-            this.dataTabControl.ResumeLayout(false);
-            this.tabPage1.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.SplitContainer splitContainer1;
-        private System.Windows.Forms.Button openConnectionButton;
-        private System.Windows.Forms.Button closeConnectionButton;
-        private System.Windows.Forms.Button stopMeasurementButton;
-        private System.Windows.Forms.Button startMeasurementButton;
-        private System.Windows.Forms.Button setStateButton;
-        private System.Windows.Forms.Button getStateButton;
-        private System.Windows.Forms.Button getQuantityUnitsButton;
-        private System.Windows.Forms.Button getQuantityCaptionButton;
-        private System.Windows.Forms.Button getQuantitiesCountButton;
-        private System.Windows.Forms.Button getVolumeUnitsButton;
-        private System.Windows.Forms.Button getTimeUnitsButton;
-        private System.Windows.Forms.Label measurementLabel;
-        private System.Windows.Forms.Label stateLabel;
-        private System.Windows.Forms.Label capabilitiesLabel;
-        private System.Windows.Forms.Button getIDButton;
-        private System.Windows.Forms.Button getFramesButton;
-        private System.Windows.Forms.SplitContainer splitContainer2;
-        private System.Windows.Forms.TextBox logsTextBox;
-        private System.Windows.Forms.TabControl dataTabControl;
-        private System.Windows.Forms.TabPage tabPage1;
-        private System.Windows.Forms.ListView framesListView;
-        private System.Windows.Forms.TabPage tabPage2;
-    }
-}
-

DataStreamInterfaceTest/DemoMainWnd.cs

@@ -1,292 +0,0 @@
-using System;
-using System.Text;
-using System.Windows.Forms;
-using DataStreamInterface;
-
-namespace DataStreamInterfaceTest
-{
-    public partial class DemoMainWnd : Form
-    {
-        IDataStreamMeter dataStreamMeter;
-
-        ActivityLog activityLog;
-
-        Unit timeUnits;
-        Unit volumeUnits;
-        int quantitiesCount;
-        string[] quantityCaption;
-        Unit[] quantityUnit;
-
-        Int64 storedFramesCount;
-        DataFrame[] transferredFrames;
-
-        public DemoMainWnd() : this(null) { }
-
-        public DemoMainWnd(IDataStreamMeter dataStreamMeter)
-        {
-            InitializeComponent();
-            this.dataStreamMeter = dataStreamMeter;
-            activityLog = new ActivityLog(logsTextBox);
-
-            framesListView.Columns.Add("ID", 100);
-            framesListView.Columns.Add("Time", 100);
-            framesListView.Columns.Add("Volume", 100);
-            framesListView.Columns.Add("Additional quantities", 300);
-            framesListView.ListViewItemSorter = new LviIDComparer();
-        }
-
-        void ShowNoMeterInterfaceMessage()
-        {
-            MessageBox.Show("No datastream meter interface");
-        }
-
-        private void getTimeUnitsButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                timeUnits = dataStreamMeter.GetTimeUnits();
-                activityLog.Print(string.Format("Time units are {0}", timeUnits));
-            }
-        }
-
-        private void getVolumeUnitsButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                volumeUnits = dataStreamMeter.GetVolumeUnits();
-                activityLog.Print(string.Format("Volume units are {0}", volumeUnits));
-            }
-        }
-
-        private void getQuantitiesCountButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                int quantitesCountOri = quantitiesCount;
-                quantitiesCount = dataStreamMeter.GetQuantitiesCount();
-                activityLog.Print(string.Format("There are {0} additional quantites", quantitiesCount));
-
-                if (quantitesCountOri == 0)
-                {
-                    quantityUnit = new Unit[quantitiesCount];
-                    quantityCaption = new string[quantitiesCount];
-                    for (int i = 0; i < quantitiesCount; i++) quantityCaption[i] = string.Empty;
-                }
-                else if (quantitiesCount != quantitesCountOri)
-                {
-                    quantityUnit = new Unit[quantitiesCount];
-                    quantityCaption = new string[quantitiesCount];
-                    for (int i = 0; i < quantitiesCount; i++) quantityCaption[i] = string.Empty;
-
-                    activityLog.Print(string.Format("Quantities count changed during operation"));
-                    MessageBox.Show("Quantities count changed during operation", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-                }
-            }
-        }
-
-        private void getQuantityCaptionButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                GetIntegerNumberDlg dlg = new GetIntegerNumberDlg(string.Format("Enter index {0} .. {1}", 0, quantitiesCount - 1), 0, quantitiesCount - 1);
-                if (dlg.ShowDialog() == DialogResult.OK)
-                {
-                    quantityCaption[dlg.Number] = dataStreamMeter.GetQuantityCaption(dlg.Number);
-                    activityLog.Print(string.Format("Caption of quantity #{0} is {1}", dlg.Number, quantityCaption[dlg.Number]));
-                }
-            }
-        }
-
-        private void getQuantityUnitsButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                GetIntegerNumberDlg dlg = new GetIntegerNumberDlg(string.Format("Enter index {0} .. {1}", 0, quantitiesCount - 1), 0, quantitiesCount - 1);
-                if (dlg.ShowDialog() == DialogResult.OK)
-                {
-                    quantityUnit[dlg.Number] = dataStreamMeter.GetQuantityUnits(dlg.Number);
-                    activityLog.Print(string.Format("Units of quantity #{0} are {1}", dlg.Number, quantityUnit[dlg.Number]));
-                }
-            }
-        }
-
-        private void openConnectionButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                string meterId;
-                if (dataStreamMeter.OpenConnection(0, "no connection parameters", out meterId))
-                {
-                    activityLog.Print(string.Format("Connection established, meter ID is {0}", meterId));
-                }
-                else
-                {
-                    activityLog.Print("Failed to establish a connection");
-                }
-            }
-        }
-
-        private void closeConnectionButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                if (dataStreamMeter.CloseConnection(0))
-                {
-                    framesListView.Items.Clear();
-                    activityLog.Print("Connection closed");
-                }
-                else
-                {
-                    activityLog.Print("Failed to close the connection");
-                }
-            }
-        }
-
-        private void DemoMainWnd_FormClosing(object sender, FormClosingEventArgs e)
-        {
-            if (dataStreamMeter == null)
-            {
-                dataStreamMeter.Shutdown();
-            }
-        }
-
-        private void getStateButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                int state;
-                string parameter;
-                if (dataStreamMeter.GetState(0, out state, out parameter))
-                {
-                    activityLog.Print(string.Format("Water meter state is {0} / {1}", state, parameter));
-                }
-                else
-                {
-                    activityLog.Print("Failed to obtain the water meter state");
-                }
-            }
-        }
-
-        private void setStateButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                GetStateDlg dlg = new GetStateDlg();
-                if (dlg.ShowDialog() == DialogResult.OK)
-                {
-                    if (dataStreamMeter.SetState(0, dlg.State, dlg.Parameter))
-                    {
-                        activityLog.Print(string.Format("Water meter state set to {0} / {1}", dlg.State, dlg.Parameter));
-                    }
-                    else
-                    {
-                        activityLog.Print(string.Format("Failed to set the water meter state to {0} / {1}", dlg.State, dlg.Parameter));
-                    }
-                }
-            }
-        }
-
-        private void startMeasurementButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                if (dataStreamMeter.StartMeasurement(0))
-                {
-                    framesListView.Items.Clear();
-                    activityLog.Print(string.Format("Measurement started"));
-                }
-                else
-                {
-                    activityLog.Print("Failed to start a measurement");
-                }
-            }
-        }
-
-        private void stopMeasurementButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                if (dataStreamMeter.StopMeasurement(0, out storedFramesCount))
-                {
-                    framesListView.Items.Clear();
-                    activityLog.Print(string.Format("Measurement sopped, {0} frames acquired", storedFramesCount));
-                }
-                else
-                {
-                    activityLog.Print("Failed to stop the measurement");
-                }
-            }
-        }
-
-        private void getFramesButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                GetFrameBoundariesDlg dlg = new GetFrameBoundariesDlg("Enter frames range boundaries", 0, storedFramesCount - 1);
-                if (dlg.ShowDialog() != DialogResult.OK) return;
-                DataFrame[] frames = dataStreamMeter.GetFrames(0, dlg.From, Convert.ToInt32(dlg.To - dlg.From + 1));
-                {
-                    foreach (var frame in frames)
-                    {
-                        if (frame != null) framesListView.Items.Add(GetListViewItem(frame));
-                    }
-                }
-            }
-        }
-
-        private void getIDButton_Click(object sender, EventArgs e)
-        {
-            if (dataStreamMeter == null)
-                ShowNoMeterInterfaceMessage();
-            else
-            {
-                GetDblValueDlg dlg = new GetDblValueDlg("Enter time in seconds");
-                if (dlg.ShowDialog() == DialogResult.OK)
-                {
-                    Int64 id = dataStreamMeter.GetID(0, dlg.DblValue);
-                    activityLog.Print(string.Format("GetID({0}) returned {1}", dlg.DblValue, id));
-                }
-            }
-        }
-
-        ListViewItem GetListViewItem(DataFrame frame)
-        {
-            ListViewItem lvi = new ListViewItem(frame.ID.ToString());
-            lvi.SubItems.Add(frame.Time.ToString());
-            lvi.SubItems.Add(frame.Volume.ToString());
-            StringBuilder sb = new StringBuilder();
-            foreach (var quantity in frame.Quantity)
-            {
-                sb.Append(quantity.ToString());
-                sb.Append("  ");
-            }
-            lvi.SubItems.Add(sb.ToString());
-            lvi.Tag = frame;
-            return lvi;
-        }
-    }
-}

DataStreamInterfaceTest/GetDblValueDlg.Designer.cs

@@ -1,88 +0,0 @@
-namespace DataStreamInterfaceTest
-{
-    partial class GetDblValueDlg
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.valueTextBox = new System.Windows.Forms.TextBox();
-            this.okButton = new System.Windows.Forms.Button();
-            this.cancelButton = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // valueTextBox
-            // 
-            this.valueTextBox.Location = new System.Drawing.Point(35, 20);
-            this.valueTextBox.Name = "valueTextBox";
-            this.valueTextBox.Size = new System.Drawing.Size(94, 20);
-            this.valueTextBox.TabIndex = 0;
-            // 
-            // okButton
-            // 
-            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.okButton.Location = new System.Drawing.Point(216, 16);
-            this.okButton.Name = "okButton";
-            this.okButton.Size = new System.Drawing.Size(75, 29);
-            this.okButton.TabIndex = 1;
-            this.okButton.Text = "OK";
-            this.okButton.UseVisualStyleBackColor = true;
-            this.okButton.Click += new System.EventHandler(this.okButton_Click);
-            // 
-            // cancelButton
-            // 
-            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.cancelButton.Location = new System.Drawing.Point(306, 16);
-            this.cancelButton.Name = "cancelButton";
-            this.cancelButton.Size = new System.Drawing.Size(75, 29);
-            this.cancelButton.TabIndex = 2;
-            this.cancelButton.Text = "Cancel";
-            this.cancelButton.UseVisualStyleBackColor = true;
-            // 
-            // GetFlowDlg
-            // 
-            this.AcceptButton = this.okButton;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.CancelButton = this.cancelButton;
-            this.ClientSize = new System.Drawing.Size(396, 58);
-            this.Controls.Add(this.cancelButton);
-            this.Controls.Add(this.okButton);
-            this.Controls.Add(this.valueTextBox);
-            this.Name = "GetFlowDlg";
-            this.Text = "Enter flow";
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TextBox valueTextBox;
-        private System.Windows.Forms.Button okButton;
-        private System.Windows.Forms.Button cancelButton;
-    }
-}

DataStreamInterfaceTest/GetDblValueDlg.cs

@@ -1,59 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows.Forms;
-
-namespace DataStreamInterfaceTest
-{
-    public partial class GetDblValueDlg : Form
-    {
-        public double DblValue;
-
-        double lowerLimit;
-        double upperLimit;
-
-
-        public GetDblValueDlg()
-            : this("Enter flow in [m3/h] please")
-        {
-        }
-
-        public GetDblValueDlg(string title)
-            : this(title, 0, 100.0)
-        {
-        }
-
-        public GetDblValueDlg(string title, double lowerLimit, double upperLimit)
-        {
-            InitializeComponent();
-            this.Text = title;
-            this.lowerLimit = lowerLimit;
-            this.upperLimit = upperLimit;
-        }
-
-
-        private void okButton_Click(object sender, EventArgs e)
-        {
-            double val;
-            if (TryParseUDouble(valueTextBox.Text, out val))
-            {
-                DblValue = val;
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            else
-            {
-                MessageBox.Show("Invalid value");
-                DialogResult = DialogResult.None;
-            }
-        }
-
-        /// <summary>
-        /// Parse an unsigned double number
-        /// </summary>
-        bool TryParseUDouble(string text, out double result)
-        {
-            return double.TryParse(text, NumberStyles.AllowDecimalPoint, CultureInfo.CurrentCulture, out result) ||
-                   double.TryParse(text, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out result);
-        }
-    }
-}

DataStreamInterfaceTest/GetFrameBoundariesDlg.Designer.cs

@@ -1,126 +0,0 @@
-namespace DataStreamInterfaceTest
-{
-    partial class GetFrameBoundariesDlg
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.fromTextBox = new System.Windows.Forms.TextBox();
-            this.okButton = new System.Windows.Forms.Button();
-            this.cancelButton = new System.Windows.Forms.Button();
-            this.toTextBox = new System.Windows.Forms.TextBox();
-            this.fromLabel = new System.Windows.Forms.Label();
-            this.toLabel = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // fromTextBox
-            // 
-            this.fromTextBox.Location = new System.Drawing.Point(89, 16);
-            this.fromTextBox.Name = "fromTextBox";
-            this.fromTextBox.Size = new System.Drawing.Size(100, 20);
-            this.fromTextBox.TabIndex = 0;
-            // 
-            // okButton
-            // 
-            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.okButton.Location = new System.Drawing.Point(225, 24);
-            this.okButton.Name = "okButton";
-            this.okButton.Size = new System.Drawing.Size(75, 36);
-            this.okButton.TabIndex = 1;
-            this.okButton.Text = "OK";
-            this.okButton.UseVisualStyleBackColor = true;
-            this.okButton.Click += new System.EventHandler(this.okButton_Click);
-            // 
-            // cancelButton
-            // 
-            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.cancelButton.Location = new System.Drawing.Point(316, 24);
-            this.cancelButton.Name = "cancelButton";
-            this.cancelButton.Size = new System.Drawing.Size(75, 36);
-            this.cancelButton.TabIndex = 2;
-            this.cancelButton.Text = "Cancel";
-            this.cancelButton.UseVisualStyleBackColor = true;
-            // 
-            // toTextBox
-            // 
-            this.toTextBox.Location = new System.Drawing.Point(89, 46);
-            this.toTextBox.Name = "toTextBox";
-            this.toTextBox.Size = new System.Drawing.Size(100, 20);
-            this.toTextBox.TabIndex = 3;
-            // 
-            // fromLabel
-            // 
-            this.fromLabel.AutoSize = true;
-            this.fromLabel.Location = new System.Drawing.Point(12, 19);
-            this.fromLabel.Name = "fromLabel";
-            this.fromLabel.Size = new System.Drawing.Size(30, 13);
-            this.fromLabel.TabIndex = 4;
-            this.fromLabel.Text = "From";
-            // 
-            // toLabel
-            // 
-            this.toLabel.AutoSize = true;
-            this.toLabel.Location = new System.Drawing.Point(12, 49);
-            this.toLabel.Name = "toLabel";
-            this.toLabel.Size = new System.Drawing.Size(20, 13);
-            this.toLabel.TabIndex = 5;
-            this.toLabel.Text = "To";
-            // 
-            // GetFrameBoundariesDlg
-            // 
-            this.AcceptButton = this.okButton;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.AutoSize = true;
-            this.CancelButton = this.cancelButton;
-            this.ClientSize = new System.Drawing.Size(419, 79);
-            this.ControlBox = false;
-            this.Controls.Add(this.toLabel);
-            this.Controls.Add(this.fromLabel);
-            this.Controls.Add(this.toTextBox);
-            this.Controls.Add(this.cancelButton);
-            this.Controls.Add(this.okButton);
-            this.Controls.Add(this.fromTextBox);
-            this.Name = "GetFrameBoundariesDlg";
-            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "Enter frames range boundaries";
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TextBox fromTextBox;
-        private System.Windows.Forms.Button okButton;
-        private System.Windows.Forms.Button cancelButton;
-        private System.Windows.Forms.TextBox toTextBox;
-        private System.Windows.Forms.Label fromLabel;
-        private System.Windows.Forms.Label toLabel;
-    }
-}

DataStreamInterfaceTest/GetFrameBoundariesDlg.cs

@@ -1,88 +0,0 @@
-using System;
-using System.Windows.Forms;
-
-namespace DataStreamInterfaceTest
-{
-    public partial class GetFrameBoundariesDlg : Form
-    {
-        /// <summary>
-        /// Integer number entered in this form
-        /// </summary>
-        public Int64 From;
-        public Int64 To;
-
-        Int64 lowerLimit;
-        Int64 upperLimit;
-
-
-        /// <summary>
-        /// Default constructor
-        /// </summary>
-        public GetFrameBoundariesDlg()
-            : this("Enter state please")
-        {
-        }
-
-        /// <summary>
-        /// Constructor with a custom window title.
-        /// </summary>
-        /// <param name="title">Window title</param>
-        public GetFrameBoundariesDlg(string title)
-            : this(title, Int64.MinValue, Int64.MaxValue)
-        {
-        }
-
-        /// <summary>
-        /// Constructor with a custom window title, limits and non-empty initial value.
-        /// </summary>
-        /// <param name="title">Window title</param>
-        /// <param name="lowerLimit">Lower limit</param>
-        /// <param name="upperLimit">Upper limit</param>
-        /// <param name="initialValue">Initial value</param>
-        public GetFrameBoundariesDlg(string title, Int64 lowerLimit, Int64 upperLimit, int initialValue)
-            : this(title, lowerLimit, upperLimit)
-        {
-            fromTextBox.Text = initialValue.ToString();
-        }
-
-        /// <summary>
-        /// Constructor with a custom window title and lower/upper limits.
-        /// </summary>
-        /// <param name="title">Window title</param>
-        /// <param name="lowerLimit">Lower limit</param>
-        /// <param name="upperLimit">Upper limit</param>
-        public GetFrameBoundariesDlg(string title, Int64 lowerLimit, Int64 upperLimit)
-        {
-            InitializeComponent();
-            this.Text = title;
-            this.lowerLimit = lowerLimit;
-            this.upperLimit = upperLimit;
-        }
-
-
-        /// <summary>
-        /// OK button handler that verifies validity of the entered value.
-        /// </summary>
-        private void okButton_Click(object sender, EventArgs e)
-        {
-            Int64 from;
-            Int64 to;
-            if (Int64.TryParse(fromTextBox.Text, out from) && from >= lowerLimit && from <= upperLimit &&
-                Int64.TryParse(toTextBox.Text, out to) && to >= lowerLimit && to <= upperLimit &&
-                to >= from && to < from + Int32.MaxValue)
-            {
-                From = from;
-                To = to;
-                DialogResult = DialogResult.OK;
-            }
-            else
-            {
-                string message = (lowerLimit != 0 || upperLimit != Int32.MaxValue)
-                               ? string.Format("Invalid boundaries ({0}..{1})", lowerLimit, upperLimit)
-                               : "Invalid boundaries";
-                MessageBox.Show(message);
-                DialogResult = DialogResult.None;   /// Prevent closing this window
-            }
-        }
-    }
-}

DataStreamInterfaceTest/GetIntegerNumberDlg.Designer.cs

@@ -1,90 +0,0 @@
-namespace DataStreamInterfaceTest
-{
-    partial class GetIntegerNumberDlg
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.numberTextBox = new System.Windows.Forms.TextBox();
-            this.okButton = new System.Windows.Forms.Button();
-            this.cancelButton = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // numberTextBox
-            // 
-            this.numberTextBox.Location = new System.Drawing.Point(36, 16);
-            this.numberTextBox.Name = "numberTextBox";
-            this.numberTextBox.Size = new System.Drawing.Size(100, 20);
-            this.numberTextBox.TabIndex = 0;
-            // 
-            // okButton
-            // 
-            this.okButton.Location = new System.Drawing.Point(174, 7);
-            this.okButton.Name = "okButton";
-            this.okButton.Size = new System.Drawing.Size(75, 36);
-            this.okButton.TabIndex = 1;
-            this.okButton.Text = "OK";
-            this.okButton.UseVisualStyleBackColor = true;
-            this.okButton.Click += new System.EventHandler(this.okButton_Click);
-            // 
-            // cancelButton
-            // 
-            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.cancelButton.Location = new System.Drawing.Point(265, 7);
-            this.cancelButton.Name = "cancelButton";
-            this.cancelButton.Size = new System.Drawing.Size(75, 36);
-            this.cancelButton.TabIndex = 2;
-            this.cancelButton.Text = "Cancel";
-            this.cancelButton.UseVisualStyleBackColor = true;
-            // 
-            // GetIntegerNumberDlg
-            // 
-            this.AcceptButton = this.okButton;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.AutoSize = true;
-            this.CancelButton = this.cancelButton;
-            this.ClientSize = new System.Drawing.Size(363, 50);
-            this.ControlBox = false;
-            this.Controls.Add(this.cancelButton);
-            this.Controls.Add(this.okButton);
-            this.Controls.Add(this.numberTextBox);
-            this.Name = "GetIntegerNumberDlg";
-            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "Enter integer number please";
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TextBox numberTextBox;
-        private System.Windows.Forms.Button okButton;
-        private System.Windows.Forms.Button cancelButton;
-    }
-}

DataStreamInterfaceTest/GetIntegerNumberDlg.cs

@@ -1,83 +0,0 @@
-using System;
-using System.Windows.Forms;
-
-namespace DataStreamInterfaceTest
-{
-    public partial class GetIntegerNumberDlg : Form
-    {
-        /// <summary>
-        /// Integer number entered in this form
-        /// </summary>
-        public int Number;
-        
-        int lowerLimit;
-        int upperLimit;
-
-
-        /// <summary>
-        /// Default constructor
-        /// </summary>
-        public GetIntegerNumberDlg()
-            : this("Enter integer number please")
-        {
-        }
-
-        /// <summary>
-        /// Constructor with a custom window title.
-        /// </summary>
-        /// <param name="title">Window title</param>
-        public GetIntegerNumberDlg(string title)
-            : this(title, Int32.MinValue, Int32.MaxValue)
-        {
-        }
-
-        /// <summary>
-        /// Constructor with a custom window title, limits and non-empty initial value.
-        /// </summary>
-        /// <param name="title">Window title</param>
-        /// <param name="lowerLimit">Lower limit</param>
-        /// <param name="upperLimit">Upper limit</param>
-        /// <param name="initialValue">Initial value</param>
-        public GetIntegerNumberDlg(string title, int lowerLimit, int upperLimit, int initialValue)
-            : this(title, lowerLimit, upperLimit)
-        {
-            numberTextBox.Text = initialValue.ToString();
-        }
-
-        /// <summary>
-        /// Constructor with a custom window title and lower/upper limits.
-        /// </summary>
-        /// <param name="title">Window title</param>
-        /// <param name="lowerLimit">Lower limit</param>
-        /// <param name="upperLimit">Upper limit</param>
-        public GetIntegerNumberDlg(string title, int lowerLimit, int upperLimit)
-        {
-            InitializeComponent();
-            this.Text = title;
-            this.lowerLimit = lowerLimit;
-            this.upperLimit = upperLimit;
-        }
-
-
-        /// <summary>
-        /// OK button handler that verifies validity of the entered value.
-        /// </summary>
-        private void okButton_Click(object sender, EventArgs e)
-        {
-            int number;
-            if (int.TryParse(numberTextBox.Text, out number) && number >= lowerLimit && number <= upperLimit)
-            {
-                Number = number;
-                DialogResult = DialogResult.OK;
-            }
-            else
-            {
-                string message = (lowerLimit != Int32.MinValue || upperLimit != Int32.MaxValue)
-                               ? string.Format("Invalid integer number ({0}..{1})", lowerLimit, upperLimit)
-                               : "Invalid integer number";
-                MessageBox.Show(message);
-                DialogResult = DialogResult.None;   /// Prevent closing this window
-            }
-        }
-    }
-}

DataStreamInterfaceTest/GetIntegerNumberDlg.resx

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

DataStreamInterfaceTest/GetStateDlg.Designer.cs

@@ -1,126 +0,0 @@
-namespace DataStreamInterfaceTest
-{
-    partial class GetStateDlg
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.stateTextBox = new System.Windows.Forms.TextBox();
-            this.okButton = new System.Windows.Forms.Button();
-            this.cancelButton = new System.Windows.Forms.Button();
-            this.parameterTextBox = new System.Windows.Forms.TextBox();
-            this.stateLabel = new System.Windows.Forms.Label();
-            this.parameterLabel = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // stateTextBox
-            // 
-            this.stateTextBox.Location = new System.Drawing.Point(89, 16);
-            this.stateTextBox.Name = "stateTextBox";
-            this.stateTextBox.Size = new System.Drawing.Size(100, 20);
-            this.stateTextBox.TabIndex = 0;
-            // 
-            // okButton
-            // 
-            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.okButton.Location = new System.Drawing.Point(225, 24);
-            this.okButton.Name = "okButton";
-            this.okButton.Size = new System.Drawing.Size(75, 36);
-            this.okButton.TabIndex = 1;
-            this.okButton.Text = "OK";
-            this.okButton.UseVisualStyleBackColor = true;
-            this.okButton.Click += new System.EventHandler(this.okButton_Click);
-            // 
-            // cancelButton
-            // 
-            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.cancelButton.Location = new System.Drawing.Point(316, 24);
-            this.cancelButton.Name = "cancelButton";
-            this.cancelButton.Size = new System.Drawing.Size(75, 36);
-            this.cancelButton.TabIndex = 2;
-            this.cancelButton.Text = "Cancel";
-            this.cancelButton.UseVisualStyleBackColor = true;
-            // 
-            // parameterTextBox
-            // 
-            this.parameterTextBox.Location = new System.Drawing.Point(89, 46);
-            this.parameterTextBox.Name = "parameterTextBox";
-            this.parameterTextBox.Size = new System.Drawing.Size(100, 20);
-            this.parameterTextBox.TabIndex = 3;
-            // 
-            // stateLabel
-            // 
-            this.stateLabel.AutoSize = true;
-            this.stateLabel.Location = new System.Drawing.Point(12, 19);
-            this.stateLabel.Name = "stateLabel";
-            this.stateLabel.Size = new System.Drawing.Size(32, 13);
-            this.stateLabel.TabIndex = 4;
-            this.stateLabel.Text = "State";
-            // 
-            // parameterLabel
-            // 
-            this.parameterLabel.AutoSize = true;
-            this.parameterLabel.Location = new System.Drawing.Point(12, 49);
-            this.parameterLabel.Name = "parameterLabel";
-            this.parameterLabel.Size = new System.Drawing.Size(55, 13);
-            this.parameterLabel.TabIndex = 5;
-            this.parameterLabel.Text = "Parameter";
-            // 
-            // GetStateDlg
-            // 
-            this.AcceptButton = this.okButton;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.AutoSize = true;
-            this.CancelButton = this.cancelButton;
-            this.ClientSize = new System.Drawing.Size(419, 79);
-            this.ControlBox = false;
-            this.Controls.Add(this.parameterLabel);
-            this.Controls.Add(this.stateLabel);
-            this.Controls.Add(this.parameterTextBox);
-            this.Controls.Add(this.cancelButton);
-            this.Controls.Add(this.okButton);
-            this.Controls.Add(this.stateTextBox);
-            this.Name = "GetStateDlg";
-            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "Enter state please";
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TextBox stateTextBox;
-        private System.Windows.Forms.Button okButton;
-        private System.Windows.Forms.Button cancelButton;
-        private System.Windows.Forms.TextBox parameterTextBox;
-        private System.Windows.Forms.Label stateLabel;
-        private System.Windows.Forms.Label parameterLabel;
-    }
-}

DataStreamInterfaceTest/GetStateDlg.cs

@@ -1,85 +0,0 @@
-using System;
-using System.Windows.Forms;
-
-namespace DataStreamInterfaceTest
-{
-    public partial class GetStateDlg : Form
-    {
-        /// <summary>
-        /// Integer number entered in this form
-        /// </summary>
-        public int State;
-        public string Parameter;
-        
-        int lowerLimit;
-        int upperLimit;
-
-
-        /// <summary>
-        /// Default constructor
-        /// </summary>
-        public GetStateDlg()
-            : this("Enter state please")
-        {
-        }
-
-        /// <summary>
-        /// Constructor with a custom window title.
-        /// </summary>
-        /// <param name="title">Window title</param>
-        public GetStateDlg(string title)
-            : this(title, Int32.MinValue, Int32.MaxValue)
-        {
-        }
-
-        /// <summary>
-        /// Constructor with a custom window title, limits and non-empty initial value.
-        /// </summary>
-        /// <param name="title">Window title</param>
-        /// <param name="lowerLimit">Lower limit</param>
-        /// <param name="upperLimit">Upper limit</param>
-        /// <param name="initialValue">Initial value</param>
-        public GetStateDlg(string title, int lowerLimit, int upperLimit, int initialValue)
-            : this(title, lowerLimit, upperLimit)
-        {
-            stateTextBox.Text = initialValue.ToString();
-        }
-
-        /// <summary>
-        /// Constructor with a custom window title and lower/upper limits.
-        /// </summary>
-        /// <param name="title">Window title</param>
-        /// <param name="lowerLimit">Lower limit</param>
-        /// <param name="upperLimit">Upper limit</param>
-        public GetStateDlg(string title, int lowerLimit, int upperLimit)
-        {
-            InitializeComponent();
-            this.Text = title;
-            this.lowerLimit = lowerLimit;
-            this.upperLimit = upperLimit;
-        }
-
-
-        /// <summary>
-        /// OK button handler that verifies validity of the entered value.
-        /// </summary>
-        private void okButton_Click(object sender, EventArgs e)
-        {
-            int number;
-            if (int.TryParse(stateTextBox.Text, out number) && number >= lowerLimit && number <= upperLimit)
-            {
-                State = number;
-                Parameter = parameterTextBox.Text;
-                DialogResult = DialogResult.OK;
-            }
-            else
-            {
-                string message = (lowerLimit != Int32.MinValue || upperLimit != Int32.MaxValue)
-                               ? string.Format("Invalid state ({0}..{1})", lowerLimit, upperLimit)
-                               : "Invalid state";
-                MessageBox.Show(message);
-                DialogResult = DialogResult.None;   /// Prevent closing this window
-            }
-        }
-    }
-}

DataStreamInterfaceTest/GetStateDlg.resx

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

DataStreamInterfaceTest/LviIDComparer.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Collections;
-using System.Windows.Forms;
-
-namespace DataStreamInterfaceTest
-{
-    public class LviIDComparer : IComparer
-    {
-        int column;
-        SortOrder order;
-
-        public LviIDComparer()
-        {
-            column = 0;
-            order = SortOrder.Ascending;
-        }
-
-        public LviIDComparer(int column, SortOrder order)
-        {
-            this.column = column;
-            this.order = order;
-        }
-
-        public int Compare(object x, object y)
-        {
-            Int64 valX = Int64.Parse(((ListViewItem)x).SubItems[column].Text);
-            Int64 valY = Int64.Parse(((ListViewItem)y).SubItems[column].Text);
-
-            if (order == SortOrder.Ascending)
-            {
-                return valX > valY ? 1 : valX == valY ? 0 : -1;
-            }
-            else
-            {
-                return valX < valY ? 1 : valX == valY ? 0 : -1;
-            }
-        }
-    }
-}

DataStreamInterfaceTest/Program.cs

@@ -1,55 +0,0 @@
-using System;
-using System.IO;
-using System.ComponentModel.Composition;
-using System.ComponentModel.Composition.Hosting;
-using System.Windows.Forms;
-using DataStreamInterface;
-
-namespace DataStreamInterfaceTest
-{
-    class Program
-    {
-#if DEBUG
-        const string CatalogDir = "..\\..\\..\\DataStreamMeter\\bin\\Debug";
-#else
-        const string CatalogDir = "..\\..\\..\\DataStreamMeter\\bin\\Release";
-#endif
-
-        [Import(typeof(IDataStreamMeter))]
-        IDataStreamMeter dataStreamMeter;
-
-        private Program()
-        {
-            Console.WriteLine("Components found:");
-            foreach (var file in Directory.EnumerateFiles(CatalogDir))
-            {
-                Console.WriteLine(file);
-            }
-
-            try
-            {
-                var catalog = new AggregateCatalog();
-                catalog.Catalogs.Add(new AssemblyCatalog(typeof(DataStreamInterface.IDataStreamMeter).Assembly));
-                catalog.Catalogs.Add(new DirectoryCatalog(CatalogDir));
-                (new CompositionContainer(catalog)).ComposeParts(this);
-            }
-            catch (CompositionException compositionException)
-            {
-                Console.WriteLine(compositionException.ToString());
-            }
-        }
-
-        /// <summary>
-        /// The main entry point for the application.
-        /// </summary>
-        [STAThread]
-        static void Main()
-        {
-            Program p = new Program();
-
-            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new DemoMainWnd(p.dataStreamMeter));
-        }
-    }
-}

DataStreamInterfaceTest/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("DataStreamInterfaceTest")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("DataStreamInterfaceTest")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
-[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("429fdea9-ec3a-47d8-88b3-5df11de8b4c8")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

DataStreamInterfaceTest/Properties/Resources.Designer.cs

@@ -1,71 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace DataStreamInterfaceTest.Properties
-{
-
-
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
-        private static global::System.Resources.ResourceManager resourceMan;
-
-        private static global::System.Globalization.CultureInfo resourceCulture;
-
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
-        }
-
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DataStreamMainDemo.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;
-            }
-        }
-    }
-}

DataStreamInterfaceTest/Properties/Resources.resx

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

DataStreamInterfaceTest/Properties/Settings.Designer.cs

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

DataStreamInterfaceTest/Properties/Settings.settings

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

DataStreamMeter/DataStreamMeter.csproj

@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{E6925701-57A6-4167-B5C4-BF670F1DE310}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DataStreamMeter</RootNamespace>
-    <AssemblyName>DataStreamMeter</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="GetDblValueDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GetDblValueDlg.Designer.cs">
-      <DependentUpon>GetDblValueDlg.cs</DependentUpon>
-    </Compile>
-    <Compile Include="MeterDataEventArgs.cs" />
-    <Compile Include="MeterSimulationDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MeterSimulationDlg.Designer.cs">
-      <DependentUpon>MeterSimulationDlg.cs</DependentUpon>
-    </Compile>
-    <Compile Include="MeterSimulation.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Sample.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\DataStreamInterface\DataStreamInterface.csproj">
-      <Project>{7ebeea14-91c4-48d7-af0a-7a4bc3ff9a28}</Project>
-      <Name>DataStreamInterface</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="GetDblValueDlg.resx">
-      <DependentUpon>GetDblValueDlg.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MeterSimulationDlg.resx">
-      <DependentUpon>MeterSimulationDlg.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

DataStreamMeter/GetDblValueDlg.Designer.cs

@@ -1,88 +0,0 @@
-namespace DataStreamMeter
-{
-    partial class GetDblValueDlg
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.valueTextBox = new System.Windows.Forms.TextBox();
-            this.okButton = new System.Windows.Forms.Button();
-            this.cancelButton = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // valueTextBox
-            // 
-            this.valueTextBox.Location = new System.Drawing.Point(35, 20);
-            this.valueTextBox.Name = "valueTextBox";
-            this.valueTextBox.Size = new System.Drawing.Size(94, 20);
-            this.valueTextBox.TabIndex = 0;
-            // 
-            // okButton
-            // 
-            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.okButton.Location = new System.Drawing.Point(216, 16);
-            this.okButton.Name = "okButton";
-            this.okButton.Size = new System.Drawing.Size(75, 29);
-            this.okButton.TabIndex = 1;
-            this.okButton.Text = "OK";
-            this.okButton.UseVisualStyleBackColor = true;
-            this.okButton.Click += new System.EventHandler(this.okButton_Click);
-            // 
-            // cancelButton
-            // 
-            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.cancelButton.Location = new System.Drawing.Point(306, 16);
-            this.cancelButton.Name = "cancelButton";
-            this.cancelButton.Size = new System.Drawing.Size(75, 29);
-            this.cancelButton.TabIndex = 2;
-            this.cancelButton.Text = "Cancel";
-            this.cancelButton.UseVisualStyleBackColor = true;
-            // 
-            // GetFlowDlg
-            // 
-            this.AcceptButton = this.okButton;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.CancelButton = this.cancelButton;
-            this.ClientSize = new System.Drawing.Size(396, 58);
-            this.Controls.Add(this.cancelButton);
-            this.Controls.Add(this.okButton);
-            this.Controls.Add(this.valueTextBox);
-            this.Name = "GetFlowDlg";
-            this.Text = "Enter flow";
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TextBox valueTextBox;
-        private System.Windows.Forms.Button okButton;
-        private System.Windows.Forms.Button cancelButton;
-    }
-}

DataStreamMeter/GetDblValueDlg.cs

@@ -1,59 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows.Forms;
-
-namespace DataStreamMeter
-{
-    public partial class GetDblValueDlg : Form
-    {
-        public double DblValue;
-
-        double lowerLimit;
-        double upperLimit;
-
-
-        public GetDblValueDlg()
-            : this("Enter flow in [m3/h] please")
-        {
-        }
-
-        public GetDblValueDlg(string title)
-            : this(title, 0, 100.0)
-        {
-        }
-
-        public GetDblValueDlg(string title, double lowerLimit, double upperLimit)
-        {
-            InitializeComponent();
-            this.Text = title;
-            this.lowerLimit = lowerLimit;
-            this.upperLimit = upperLimit;
-        }
-
-
-        private void okButton_Click(object sender, EventArgs e)
-        {
-            double val;
-            if (TryParseUDouble(valueTextBox.Text, out val))
-            {
-                DblValue = val;
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            else
-            {
-                MessageBox.Show("Invalid value");
-                DialogResult = DialogResult.None;
-            }
-        }
-
-        /// <summary>
-        /// Parse an unsigned double number
-        /// </summary>
-        bool TryParseUDouble(string text, out double result)
-        {
-            return double.TryParse(text, NumberStyles.AllowDecimalPoint, CultureInfo.CurrentCulture, out result) ||
-                   double.TryParse(text, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out result);
-        }
-    }
-}

DataStreamMeter/MeterDataEventArgs.cs

@@ -1,20 +0,0 @@
-using System;
-
-namespace DataStreamMeter
-{
-    public class MeterDataEventArgs : EventArgs
-    {
-        public State State;
-        public double Time;
-        public double Volume;
-        public double Flow;
-
-        public MeterDataEventArgs(State state, double time, double volume, double flow)
-        {
-            State = state;
-            Time = time;
-            Volume = volume;
-            Flow = flow;
-        }
-    }
-}

DataStreamMeter/MeterSimulation.cs

@@ -1,351 +0,0 @@
-using System;
-using System.ComponentModel.Composition;
-using DataStreamInterface;
-
-namespace DataStreamMeter
-{
-    [Export(typeof(IDataStreamMeter))]
-    public class MeterSimulation : IDataStreamMeter
-    {
-        MeterSimulationDlg modelessDlg;
-
-        /// Water meter specification
-        public readonly string MeterID = "3141592653";
-        public const Unit TimeUnits = Unit.s;           /// Unit.s, Unit.ms, ...
-        public const Unit VolumeUnits = Unit.l;         /// Unit.l, Unit.USgal, ...
-        public const Unit FlowUnits = Unit.m3ph;        /// Unit.m3ph, Unit.USgalps, Unit.cfs, ...
-        public const double SamplingPeriodSec = 0.125;  /// Sampling period in seconds (here 125 ms, 8 Hz)
-        public readonly double SamplingPeriod;
-
-
-        public const Int64 MaxSamplesCount = 40000;    /// Maximal test time is SamplingPeriod * MaxSamplesCount
-        Sample[] samples = new Sample[MaxSamplesCount];
-        Int64 storedSamplesCount;
-
-
-        readonly object stateChangeAndTimerTickLock = new object();
-        public State State;
-        string connectionParameters;
-
-        /// initialTime is time when simulation started 
-        /// (lastSampleTime - initialTime).TotalSeconds is multiple of Sampling Period
-        DateTime initialTime;
-
-        /// Last user interface tick info
-        bool lastTickValid;
-        State lastTickState;
-
-        /// Values incrementally updated on each timer tick
-        double currentTime;
-        double currentVolume;
-        double currentFlow;
-        double currentFlow_m3ph;
-
-        DateTime startTimeStamp;        /// Measurement start DateTime
-        double startTime;               /// Measurement start time in seconds
-        DateTime stopTimeStamp;         /// Measurement end DateTime
-        double stopTime;                /// Measurement end time in seconds
-
-
-        public MeterSimulation()
-        {
-            modelessDlg = null;
-            State = State.Disconnected;
-            SamplingPeriod = DataStreamInterface.Units.ConvertTo(TimeUnits, SamplingPeriodSec);
-            lastTickValid = false;
-            initialTime = DateTime.Now.Date;    /// An arbitrary initial time (in this case the last midnight)
-        }
-
-        public Unit GetTimeUnits()
-        {
-            return TimeUnits;
-        }
-
-        public Unit GetVolumeUnits()
-        {
-            return VolumeUnits;
-        }
-
-        public int GetQuantitiesCount()
-        {
-            return 1;
-        }
-
-        public string GetQuantityCaption(int quantityNr)
-        {
-            if (quantityNr == 0) return "Flow";
-            return string.Empty;
-        }
-
-        public Unit GetQuantityUnits(int quantityNr)
-        {
-            if (quantityNr == 0) return FlowUnits;
-            return Unit.None;
-        }
-
-
-        public int GetMetersCount()
-        {
-            return 20;
-        }
-
-        public bool OpenConnection(int meterIx, string connectionParameters, out string meterID)
-        {
-            lock (stateChangeAndTimerTickLock)
-            {
-                if (State != State.Disconnected)
-                {
-                    /// Meter is already connected
-                    meterID = MeterID;
-                    return true;
-                }
-
-                /// Connect the meter
-                meterID = MeterID;
-                this.connectionParameters = connectionParameters;
-                lastTickValid = false;
-                State = State.Connected;
-            }
-
-            /// Open modeless form
-            modelessDlg = new MeterSimulationDlg(this, MeterID);
-            modelessDlg.Show();
-            return true;
-        }
-
-        public bool CloseConnection(int meterIx)
-        {
-            bool closeModelessDlg = false;
-
-            lock (stateChangeAndTimerTickLock)
-            {
-                if (State != State.Disconnected)
-                {
-                    State = State.Disconnected;
-                    storedSamplesCount = 0;
-                    closeModelessDlg = true;
-                }
-            }
-
-            if (closeModelessDlg)
-            {
-                if (modelessDlg != null) modelessDlg.Close();
-                modelessDlg = null;
-            }
-            return true;
-        }
-
-        public bool CloseConnectionAll()
-        {
-            return CloseConnection(0);
-        }
-
-        public bool Shutdown()
-        {
-            return true;
-        }
-
-        public bool GetState(int meterIx, out int state, out string parameter)
-        {
-            state = (int)this.State;
-            parameter = this.connectionParameters;
-            return true;
-        }
-
-        public bool SetState(int meterIx, int state, string parameter)
-        {
-            /// It's not allowed to change the satate in this demo
-            return false;
-        }
-
-        public bool SetStateAll(int state, string parameter)
-        {
-            return SetState(0, state, parameter);
-        }
-
-        public bool StartMeasurement(int meterIx = 0)
-        {
-            lock (stateChangeAndTimerTickLock)
-            {
-                if (State == State.Connected)
-                {
-                    startTimeStamp = DateTime.Now;
-                    startTime = TimeInSecondsFromDateTime(startTimeStamp, initialTime, SamplingPeriodSec);
-                    storedSamplesCount = 0;
-                    State = State.MeasurementInProgress;
-                    return true;
-                }
-                else
-                {
-                    return false;
-                }
-            }
-        }
-
-        public bool StartMeasurementAll()
-        {
-            return StartMeasurement(0);
-        }
-
-        public bool StopMeasurement(int meterIx, out Int64 storedFramesCount)
-        {
-            lock (stateChangeAndTimerTickLock)
-            {
-                if (State == State.MeasurementInProgress)
-                {
-                    stopTimeStamp = DateTime.Now;
-                    stopTime = TimeInSecondsFromDateTime(stopTimeStamp, initialTime, SamplingPeriodSec);
-
-                    int newSamplesCount = Convert.ToInt32(Math.Round((stopTime - currentTime) / SamplingPeriodSec));
-                    double time = Units.ConvertTo(TimeUnits, currentTime);
-                    double volume = currentVolume;
-                    double volumeIncrement = Units.ConvertTo(VolumeUnits, currentFlow_m3ph * (SamplingPeriodSec / 3.6));
-                    for (int i = 0; i < newSamplesCount; i++)
-                    {
-                        time += SamplingPeriod;
-                        volume += volumeIncrement;
-                        if (storedSamplesCount < MaxSamplesCount)
-                        {
-                            samples[storedSamplesCount++] = new Sample(time, volume, currentFlow);
-                        }
-                    }
-
-                    State = State.Connected;
-                    storedFramesCount = storedSamplesCount;
-                    return true;
-                }
-                else
-                {
-                    storedFramesCount = 0;
-                    return false;
-                }
-            }
-        }
-
-        public bool StopMeasurementAll(out Int64[] storedFramesCount)
-        {
-            storedFramesCount = new Int64[1];
-            return StopMeasurement(0, out storedFramesCount[0]);
-        }
-
-        public void TimerTick(double flow_m3ph)
-        {
-            lock (stateChangeAndTimerTickLock)
-            {
-                double lastSampleTime = TimeInSecondsFromDateTime(DateTime.Now, initialTime, SamplingPeriodSec);
-                currentFlow_m3ph = flow_m3ph;
-                currentFlow = Units.ConvertTo(FlowUnits, flow_m3ph);
-
-                if (!lastTickValid)
-                {
-                    currentTime = lastSampleTime;
-                    currentVolume = 0;
-                    lastTickValid = true;
-                    lastTickState = State;
-                    return;
-                }
-                else
-                {
-                    int newSamplesCount = Convert.ToInt32(Math.Round((lastSampleTime - currentTime) / SamplingPeriodSec));
-                    double volumeIncrement = Units.ConvertTo(VolumeUnits, currentFlow_m3ph * (SamplingPeriodSec / 3.6));
-                    for (int i = 0; i < newSamplesCount; i++)
-                    {
-                        currentTime += SamplingPeriodSec;
-                        currentVolume += volumeIncrement;
-
-                        if (State == State.MeasurementInProgress && currentTime > startTime && storedSamplesCount < MaxSamplesCount)
-                        {
-                            samples[storedSamplesCount++] = new Sample(Units.ConvertTo(TimeUnits, currentTime), currentVolume, currentFlow);
-                        }
-                    }
-                    currentTime = lastSampleTime;   /// Rectify, prevent error propagation
-                    lastTickState = State;
-                }
-            }
-
-            modelessDlg.OnMeterdata(new MeterDataEventArgs(State, currentTime, currentVolume, currentFlow));
-        }
-
-        
-        /// <summary>
-        /// Obtain the last time instance before 'DateTime time' which is multiple of samplingPeriod-s after 'DateTime initialTime'.
-        /// </summary>
-        /// <param name="time">Time to be converted to seconds and rounded to samplingPeriod-s</param>
-        /// <param name="startTime">Initial time</param>
-        /// <param name="samplePeriod">Sampling period in seconds</param>
-        /// <returns></returns>
-        double TimeInSecondsFromDateTime(DateTime time, DateTime initialTime, double samplingPeriod)
-        {
-            TimeSpan span = time - initialTime;
-            return samplingPeriod * Math.Floor(span.TotalSeconds / samplingPeriod);
-        }
-
-
-        ///---------------------------
-        /// Datastream data exchange
-        ///---------------------------
-
-        /// <summary>
-        /// Retuns 'count' data frames starting with data frame with ID = 'id' 
-        /// </summary>
-        /// <param name="id">First frame ID</param>
-        /// <param name="count">Frames count</param>
-        /// <returns>Selected data frames</returns>
-        public DataFrame[] GetFrames(int meterIx, Int64 startID, int count)
-        {
-            DataFrame[] frames = new DataFrame[count];
-
-            if (State != State.MeasurementInProgress)
-            {
-                for (int j = 0; j < count; j++)
-                {
-                    Int64 id = startID + j;
-                    if (id < storedSamplesCount)
-                    {
-                        frames[j] = new DataFrame(id, samples[id].Time, samples[id].Volume, new double[1] { samples[id].Flow });
-                    }
-                }
-            }
-
-            return frames;
-        }
-
-        /// <summary>
-        /// Returns ID of the data frame where time equals or exceeds the specified time.
-        /// When time of the first frame (ID=0) is larger then specified time, function returns 0.
-        /// </summary>
-        /// <param name="time">Time</param>
-        /// <returns>ID of the data frame at or after the pecified time</returns>
-        public Int64 GetID(int meterIx, double time)
-        {
-            if (storedSamplesCount == 0) return -1;
-
-            Int64 lo = 0;
-            Int64 hi = storedSamplesCount - 1;
-
-            if (samples[hi].Time < time) return -1;
-
-            while (lo < hi)
-            {
-                Int64 mid = (lo + hi) / 2;
-                if (samples[mid].Time < time)
-                {
-                    lo = mid + 1;
-                }
-                else
-                {
-                    hi = mid;
-                }
-            }
-
-            return lo;
-        }
-    }
-
-    public enum State
-    {
-        Disconnected = 0,
-        Connected = 1,
-        MeasurementInProgress = 2,
-    }
-}

DataStreamMeter/MeterSimulationDlg.Designer.cs

@@ -1,323 +0,0 @@
-namespace DataStreamMeter
-{
-    partial class MeterSimulationDlg
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.meterIDGroupBox = new System.Windows.Forms.GroupBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.volumeUnitsTextBox = new System.Windows.Forms.TextBox();
-            this.timeUnitsTextBox = new System.Windows.Forms.TextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.meterIDTextBox = new System.Windows.Forms.TextBox();
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.setFlowButton = new System.Windows.Forms.Button();
-            this.flowm3phTextBox = new System.Windows.Forms.TextBox();
-            this.flowTrackBar = new System.Windows.Forms.TrackBar();
-            this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.flowTextBox = new System.Windows.Forms.TextBox();
-            this.volumeTextBox = new System.Windows.Forms.TextBox();
-            this.timeTextBox = new System.Windows.Forms.TextBox();
-            this.stateTextBox = new System.Windows.Forms.TextBox();
-            this.label8 = new System.Windows.Forms.Label();
-            this.label7 = new System.Windows.Forms.Label();
-            this.label6 = new System.Windows.Forms.Label();
-            this.label5 = new System.Windows.Forms.Label();
-            this.lastUITickTextBox = new System.Windows.Forms.TextBox();
-            this.label4 = new System.Windows.Forms.Label();
-            this.timer1 = new System.Windows.Forms.Timer(this.components);
-            this.meterIDGroupBox.SuspendLayout();
-            this.groupBox1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.flowTrackBar)).BeginInit();
-            this.groupBox2.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // meterIDGroupBox
-            // 
-            this.meterIDGroupBox.Controls.Add(this.label3);
-            this.meterIDGroupBox.Controls.Add(this.label2);
-            this.meterIDGroupBox.Controls.Add(this.volumeUnitsTextBox);
-            this.meterIDGroupBox.Controls.Add(this.timeUnitsTextBox);
-            this.meterIDGroupBox.Controls.Add(this.label1);
-            this.meterIDGroupBox.Controls.Add(this.meterIDTextBox);
-            this.meterIDGroupBox.Location = new System.Drawing.Point(12, 12);
-            this.meterIDGroupBox.Name = "meterIDGroupBox";
-            this.meterIDGroupBox.Size = new System.Drawing.Size(453, 105);
-            this.meterIDGroupBox.TabIndex = 0;
-            this.meterIDGroupBox.TabStop = false;
-            this.meterIDGroupBox.Text = "Water meter info";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(18, 76);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(67, 13);
-            this.label3.TabIndex = 5;
-            this.label3.Text = "Volume units";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(18, 50);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(55, 13);
-            this.label2.TabIndex = 4;
-            this.label2.Text = "Time units";
-            // 
-            // volumeUnitsTextBox
-            // 
-            this.volumeUnitsTextBox.Enabled = false;
-            this.volumeUnitsTextBox.Location = new System.Drawing.Point(122, 73);
-            this.volumeUnitsTextBox.Name = "volumeUnitsTextBox";
-            this.volumeUnitsTextBox.Size = new System.Drawing.Size(52, 20);
-            this.volumeUnitsTextBox.TabIndex = 3;
-            // 
-            // timeUnitsTextBox
-            // 
-            this.timeUnitsTextBox.Enabled = false;
-            this.timeUnitsTextBox.Location = new System.Drawing.Point(122, 47);
-            this.timeUnitsTextBox.Name = "timeUnitsTextBox";
-            this.timeUnitsTextBox.Size = new System.Drawing.Size(52, 20);
-            this.timeUnitsTextBox.TabIndex = 2;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(18, 24);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(73, 13);
-            this.label1.TabIndex = 1;
-            this.label1.Text = "Meter ID (s/n)";
-            // 
-            // meterIDTextBox
-            // 
-            this.meterIDTextBox.Enabled = false;
-            this.meterIDTextBox.Location = new System.Drawing.Point(122, 21);
-            this.meterIDTextBox.Name = "meterIDTextBox";
-            this.meterIDTextBox.Size = new System.Drawing.Size(145, 20);
-            this.meterIDTextBox.TabIndex = 0;
-            // 
-            // groupBox1
-            // 
-            this.groupBox1.Controls.Add(this.setFlowButton);
-            this.groupBox1.Controls.Add(this.flowm3phTextBox);
-            this.groupBox1.Controls.Add(this.flowTrackBar);
-            this.groupBox1.Location = new System.Drawing.Point(12, 123);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(453, 96);
-            this.groupBox1.TabIndex = 1;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "Flow";
-            // 
-            // setFlowButton
-            // 
-            this.setFlowButton.Location = new System.Drawing.Point(289, 17);
-            this.setFlowButton.Name = "setFlowButton";
-            this.setFlowButton.Size = new System.Drawing.Size(75, 23);
-            this.setFlowButton.TabIndex = 4;
-            this.setFlowButton.Text = "Set value";
-            this.setFlowButton.UseVisualStyleBackColor = true;
-            this.setFlowButton.Click += new System.EventHandler(this.setFlowButton_Click);
-            // 
-            // flowm3phTextBox
-            // 
-            this.flowm3phTextBox.Enabled = false;
-            this.flowm3phTextBox.Location = new System.Drawing.Point(122, 19);
-            this.flowm3phTextBox.Name = "flowm3phTextBox";
-            this.flowm3phTextBox.Size = new System.Drawing.Size(145, 20);
-            this.flowm3phTextBox.TabIndex = 3;
-            // 
-            // flowTrackBar
-            // 
-            this.flowTrackBar.LargeChange = 1;
-            this.flowTrackBar.Location = new System.Drawing.Point(0, 43);
-            this.flowTrackBar.Maximum = 25;
-            this.flowTrackBar.Name = "flowTrackBar";
-            this.flowTrackBar.Size = new System.Drawing.Size(447, 45);
-            this.flowTrackBar.TabIndex = 2;
-            this.flowTrackBar.Scroll += new System.EventHandler(this.flowTrackBar_Scroll);
-            // 
-            // groupBox2
-            // 
-            this.groupBox2.Controls.Add(this.flowTextBox);
-            this.groupBox2.Controls.Add(this.volumeTextBox);
-            this.groupBox2.Controls.Add(this.timeTextBox);
-            this.groupBox2.Controls.Add(this.stateTextBox);
-            this.groupBox2.Controls.Add(this.label8);
-            this.groupBox2.Controls.Add(this.label7);
-            this.groupBox2.Controls.Add(this.label6);
-            this.groupBox2.Controls.Add(this.label5);
-            this.groupBox2.Controls.Add(this.lastUITickTextBox);
-            this.groupBox2.Controls.Add(this.label4);
-            this.groupBox2.Location = new System.Drawing.Point(12, 225);
-            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(453, 150);
-            this.groupBox2.TabIndex = 2;
-            this.groupBox2.TabStop = false;
-            this.groupBox2.Text = "State";
-            // 
-            // flowTextBox
-            // 
-            this.flowTextBox.Enabled = false;
-            this.flowTextBox.Location = new System.Drawing.Point(122, 121);
-            this.flowTextBox.Name = "flowTextBox";
-            this.flowTextBox.Size = new System.Drawing.Size(99, 20);
-            this.flowTextBox.TabIndex = 9;
-            // 
-            // volumeTextBox
-            // 
-            this.volumeTextBox.Enabled = false;
-            this.volumeTextBox.Location = new System.Drawing.Point(122, 95);
-            this.volumeTextBox.Name = "volumeTextBox";
-            this.volumeTextBox.Size = new System.Drawing.Size(99, 20);
-            this.volumeTextBox.TabIndex = 8;
-            // 
-            // timeTextBox
-            // 
-            this.timeTextBox.Enabled = false;
-            this.timeTextBox.Location = new System.Drawing.Point(122, 68);
-            this.timeTextBox.Name = "timeTextBox";
-            this.timeTextBox.Size = new System.Drawing.Size(99, 20);
-            this.timeTextBox.TabIndex = 7;
-            // 
-            // stateTextBox
-            // 
-            this.stateTextBox.Enabled = false;
-            this.stateTextBox.Location = new System.Drawing.Point(122, 42);
-            this.stateTextBox.Name = "stateTextBox";
-            this.stateTextBox.Size = new System.Drawing.Size(99, 20);
-            this.stateTextBox.TabIndex = 6;
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(18, 124);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(29, 13);
-            this.label8.TabIndex = 5;
-            this.label8.Text = "Flow";
-            // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(18, 98);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(42, 13);
-            this.label7.TabIndex = 4;
-            this.label7.Text = "Volume";
-            // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(18, 71);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(30, 13);
-            this.label6.TabIndex = 3;
-            this.label6.Text = "Time";
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(18, 45);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(32, 13);
-            this.label5.TabIndex = 2;
-            this.label5.Text = "State";
-            // 
-            // lastUITickTextBox
-            // 
-            this.lastUITickTextBox.Enabled = false;
-            this.lastUITickTextBox.Location = new System.Drawing.Point(122, 13);
-            this.lastUITickTextBox.Name = "lastUITickTextBox";
-            this.lastUITickTextBox.Size = new System.Drawing.Size(145, 20);
-            this.lastUITickTextBox.TabIndex = 1;
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(18, 16);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(61, 13);
-            this.label4.TabIndex = 0;
-            this.label4.Text = "Last UI tick";
-            // 
-            // timer1
-            // 
-            this.timer1.Interval = 1000;
-            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
-            // 
-            // MeterSimulationDlg
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(477, 387);
-            this.Controls.Add(this.groupBox2);
-            this.Controls.Add(this.groupBox1);
-            this.Controls.Add(this.meterIDGroupBox);
-            this.Name = "MeterSimulationDlg";
-            this.Text = "MeterDialog";
-            this.meterIDGroupBox.ResumeLayout(false);
-            this.meterIDGroupBox.PerformLayout();
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.flowTrackBar)).EndInit();
-            this.groupBox2.ResumeLayout(false);
-            this.groupBox2.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.GroupBox meterIDGroupBox;
-        private System.Windows.Forms.TextBox meterIDTextBox;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.TextBox volumeUnitsTextBox;
-        private System.Windows.Forms.TextBox timeUnitsTextBox;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.GroupBox groupBox1;
-        private System.Windows.Forms.TextBox flowm3phTextBox;
-        private System.Windows.Forms.TrackBar flowTrackBar;
-        private System.Windows.Forms.GroupBox groupBox2;
-        private System.Windows.Forms.Button setFlowButton;
-        private System.Windows.Forms.Timer timer1;
-        private System.Windows.Forms.TextBox lastUITickTextBox;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.TextBox flowTextBox;
-        private System.Windows.Forms.TextBox volumeTextBox;
-        private System.Windows.Forms.TextBox timeTextBox;
-        private System.Windows.Forms.TextBox stateTextBox;
-        private System.Windows.Forms.Label label8;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.Label label5;
-    }
-}

DataStreamMeter/MeterSimulationDlg.cs

@@ -1,91 +0,0 @@
-using System;
-using System.Windows.Forms;
-
-namespace DataStreamMeter
-{
-    public partial class MeterSimulationDlg : Form
-    {
-        MeterSimulation meterSimulation;
-        double currentFlow;
-
-
-        public string MeterID;
-
-
-        public void OnMeterdata(MeterDataEventArgs args)
-        {
-            if (MeterDataHandler == null) return;
-            MeterDataHandler(null, args);
-        }
-        public event EventHandler<MeterDataEventArgs> MeterDataHandler;
-
-
-        /// <summary>
-        /// Default constructor with no meter
-        /// </summary>
-        public MeterSimulationDlg()
-            : this(null, string.Empty)
-        {
-        }
-
-        public MeterSimulationDlg(MeterSimulation meterSimulation, string meterID)
-        {
-            InitializeComponent();
-            this.meterSimulation = meterSimulation;
-            meterIDTextBox.Text = meterID;
-
-            currentFlow = 0;
-            flowm3phTextBox.Text = currentFlow.ToString();
-            flowTrackBar.Value = Convert.ToInt32(currentFlow);
-
-            MeterDataHandler += delegate(object sender, MeterDataEventArgs args)
-            {
-                if (InvokeRequired)
-                {
-                    Invoke(new EventHandler<MeterDataEventArgs>(DisplayMeterData), sender, args);
-                }
-                else
-                {
-                    DisplayMeterData(sender, args);
-                }
-            };
-
-            if (meterSimulation != null)
-            {
-                timer1.Enabled = true;
-                timer1.Start();
-            }
-        }
-
-        private void flowTrackBar_Scroll(object sender, EventArgs e)
-        {
-            currentFlow = flowTrackBar.Value;
-            flowm3phTextBox.Text = currentFlow.ToString("F2");
-        }
-
-        private void setFlowButton_Click(object sender, EventArgs e)
-        {
-            GetDblValueDlg dlg = new GetDblValueDlg("Enter flow in [m3/h] please", 0, 25.0);
-            if (dlg.ShowDialog() == DialogResult.OK)
-            {
-                currentFlow = dlg.DblValue;
-                flowm3phTextBox.Text = currentFlow.ToString();
-                flowTrackBar.Value = Convert.ToInt32(currentFlow);
-            }
-        }
-
-        private void timer1_Tick(object sender, EventArgs e)
-        {
-            lastUITickTextBox.Text = DateTime.Now.ToString("HH:mm:ss fff");
-            meterSimulation.TimerTick(currentFlow);
-        }
-
-        void DisplayMeterData(object sender, MeterDataEventArgs args)
-        {
-            stateTextBox.Text = args.State.ToString();
-            timeTextBox.Text = args.Time.ToString();
-            volumeTextBox.Text = args.Volume.ToString();
-            flowTextBox.Text = args.Flow.ToString();
-        }
-    }
-}

DataStreamMeter/MeterSimulationDlg.resx

@@ -1,123 +0,0 @@
-<?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>
-  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</root>

DataStreamMeter/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("DataStreamMeter")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("DataStreamMeter")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
-[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("8acd46eb-c84d-4199-9f40-7420b7ebabc2")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

DataStreamMeter/Sample.cs

@@ -1,23 +0,0 @@
-using System;
-
-namespace DataStreamMeter
-{
-    public class Sample
-    {
-        public readonly double Time;        /// In water meter time units
-        public readonly double Volume;      /// In water meter colume units
-        public readonly double Flow;        /// In water meter flow units
-
-        public Sample(double time, double volume, double flow)
-        {
-            Time = time;
-            Volume = volume;
-            Flow = flow;
-        }
-
-        public override string ToString()
-        {
-            return string.Format("time={0} volume={1} flow={2}", Time, Volume, Flow);
-        }
-    }
-}

Decrypt/Decrypt.csproj

@@ -16,7 +16,7 @@
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -27,7 +27,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>

DeviceTest/DeviceTest.csproj

@@ -16,7 +16,7 @@
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -27,7 +27,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
@@ -90,10 +90,6 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Common\Common.csproj">
-      <Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
-      <Name>Common</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Config\Config.csproj">
       <Project>{743DF7DB-C7B6-42EB-986D-0F485E5588E4}</Project>
       <Name>Config</Name>

DeviceTest/DeviceTestDlg.cs

@@ -2,13 +2,12 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Text;
 using System.Threading;
-using System.Xml.Serialization;
 using System.Windows.Forms;
-using Common;
-using TBF.Rig;
-using TBF.Rig.Generic;
-using TBF.UI.Bench.Components;
+using TBF.BenchControl;
+using TBF.BenchControl.Generic;
+using System.Xml.Serialization;
 
 
 namespace DeviceTest
@@ -80,7 +79,7 @@ namespace DeviceTest
                 compClasses.Add(componentFactory.ClassName);
             }
 
-			tbfComponents = new List<TBF.Rig.Generic.IComponent>();
+			tbfComponents = new List<TBF.BenchControl.Generic.IComponent>();
 			tbfDevices = new List<IDevice>();
 		}
 
@@ -109,8 +108,8 @@ namespace DeviceTest
 						config.Name = Program.LocalSettings.ParentName;
 						config.ParentName = string.Empty;
 						config.ItemNr = 0;
-						config.DebugLevel = DebugMode.Normal;
-						config.LogLevel = LogLevel.Debug;
+						config.DebugLevel = Config.Entities.DebugMode.Normal;
+						config.LogLevel = Config.Entities.LogLevel.Debug;
 						config.Corrections = null;
 						config.Factory = parentFactory;
 						parentCfg = config;
@@ -142,8 +141,8 @@ namespace DeviceTest
 						config.Name = Program.LocalSettings.ComponentName;
 						config.ParentName = string.IsNullOrEmpty(Program.LocalSettings.ComponentParentName) ? string.Empty : Program.LocalSettings.ComponentParentName;
 						config.ItemNr = 1;
-						config.DebugLevel = DebugMode.Normal;
-						config.LogLevel = LogLevel.Debug;
+						config.DebugLevel = Config.Entities.DebugMode.Normal;
+						config.LogLevel = Config.Entities.LogLevel.Debug;
 						config.Corrections = null;
 						config.Factory = component1Factory;
 						component1Cfg = config;
@@ -177,8 +176,8 @@ namespace DeviceTest
 						config.Name = Program.LocalSettings.Component2Name;
 						config.ParentName = string.IsNullOrEmpty(Program.LocalSettings.Component2ParentName) ? string.Empty : Program.LocalSettings.Component2ParentName;
 						config.ItemNr = 2;
-						config.DebugLevel = DebugMode.Normal;
-						config.LogLevel = LogLevel.Debug;
+						config.DebugLevel = Config.Entities.DebugMode.Normal;
+						config.LogLevel = Config.Entities.LogLevel.Debug;
 						config.Corrections = null;
 						config.Factory = component2Factory;
 						component2Cfg = config;
@@ -212,8 +211,8 @@ namespace DeviceTest
 						config.Name = Program.LocalSettings.Component3Name;
 						config.ParentName = string.IsNullOrEmpty(Program.LocalSettings.Component3ParentName) ? string.Empty : Program.LocalSettings.Component3ParentName;
 						config.ItemNr = 3;
-						config.DebugLevel = DebugMode.Normal;
-						config.LogLevel = LogLevel.Debug;
+						config.DebugLevel = Config.Entities.DebugMode.Normal;
+						config.LogLevel = Config.Entities.LogLevel.Debug;
 						config.Corrections = null;
 						config.Factory = component3Factory;
 						component3Cfg = config;
@@ -384,7 +383,7 @@ namespace DeviceTest
 		/// <returns>true when factory changed</returns>
 		bool FactoryFromClassName(string className, ref IComponentFactory factory)
 		{
-            foreach (var fac in TbfComponents.Factories)
+			foreach (var fac in TbfComponents.Factories)
 			{
 				if (className == fac.ClassName)
 				{
@@ -422,13 +421,13 @@ namespace DeviceTest
 			{
 				parentCfg = parentFactory.DefaultConfig();
 			}
-            ComponentParametersDlg cfgForm = new ComponentParametersDlg();
-            cfgForm.CmpntEntities = new List<Config.Entities.Component>();
-
-            IComponentCfgCtrl cfgControl = parentCfg.GetControl(cfgForm.CmpntEntities);
+			IComponentCfgCtrl cfgControl = parentCfg.GetControl();
 			cfgControl.Config = parentCfg;
 			cfgControl.Config.ItemNr = 0;
 
+			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+			cfgForm.TbfComponents = new List<Config.Entities.Component>();
+
 			cfgForm.ComponentCfgCtrl = cfgControl;
 			cfgForm.UnlockAfterStart = true;
 			DialogResult dr = cfgForm.ShowDialog();
@@ -451,17 +450,17 @@ namespace DeviceTest
 			{
 				component1Cfg = component1Factory.DefaultConfig();
 			}
+			IComponentCfgCtrl cfgControl = component1Cfg.GetControl();
+			cfgControl.Config = component1Cfg;
+			cfgControl.Config.ItemNr = 1;
+
 			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
 			///
-			var compEntities = new List<Config.Entities.Component>();
+			IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
-			cfgForm.CmpntEntities = compEntities;
+			cfgForm.TbfComponents = compEntities;
 
-            IComponentCfgCtrl cfgControl = component1Cfg.GetControl(compEntities);
-            cfgControl.Config = component1Cfg;
-            cfgControl.Config.ItemNr = 1;
-
-            cfgForm.ComponentCfgCtrl = cfgControl;
+			cfgForm.ComponentCfgCtrl = cfgControl;
 			cfgForm.UnlockAfterStart = true;
 			DialogResult dr = cfgForm.ShowDialog();
 			if (dr != DialogResult.OK) return;
@@ -485,18 +484,18 @@ namespace DeviceTest
 			{
 				component2Cfg = component2Factory.DefaultConfig();
 			}
+			IComponentCfgCtrl cfgControl = component2Cfg.GetControl();
+			cfgControl.Config = component2Cfg;
+			cfgControl.Config.ItemNr = 1;
+
 			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
 			///
-			var compEntities = new List<Config.Entities.Component>();
+			IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
 			if (component1Factory != null && component1Cfg != null) compEntities.Add(component1Cfg.CreateDbEntity());
-			cfgForm.CmpntEntities = compEntities;
+			cfgForm.TbfComponents = compEntities;
 
-            IComponentCfgCtrl cfgControl = component2Cfg.GetControl(compEntities);
-            cfgControl.Config = component2Cfg;
-            cfgControl.Config.ItemNr = 1;
-
-            cfgForm.ComponentCfgCtrl = cfgControl;
+			cfgForm.ComponentCfgCtrl = cfgControl;
 			cfgForm.UnlockAfterStart = true;
 			DialogResult dr = cfgForm.ShowDialog();
 			if (dr != DialogResult.OK) return;
@@ -520,19 +519,19 @@ namespace DeviceTest
 			{
 				component3Cfg = component3Factory.DefaultConfig();
 			}
+			IComponentCfgCtrl cfgControl = component3Cfg.GetControl();
+			cfgControl.Config = component3Cfg;
+			cfgControl.Config.ItemNr = 1;
+
 			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
 			///
-			var compEntities = new List<Config.Entities.Component>();
+			IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
 			if (component1Factory != null && component1Cfg != null) compEntities.Add(component1Cfg.CreateDbEntity());
 			if (component2Factory != null && component2Cfg != null) compEntities.Add(component2Cfg.CreateDbEntity());
-			cfgForm.CmpntEntities = compEntities;
+			cfgForm.TbfComponents = compEntities;
 
-            IComponentCfgCtrl cfgControl = component3Cfg.GetControl(compEntities);
-            cfgControl.Config = component3Cfg;
-            cfgControl.Config.ItemNr = 1;
-
-            cfgForm.ComponentCfgCtrl = cfgControl;
+			cfgForm.ComponentCfgCtrl = cfgControl;
 			cfgForm.UnlockAfterStart = true;
 			DialogResult dr = cfgForm.ShowDialog();
 			if (dr != DialogResult.OK) return;
@@ -569,7 +568,7 @@ namespace DeviceTest
 			{
 				if (parentFactory != null && parentCfg != null)
 				{
-					TBF.Rig.Generic.IComponent component = parentFactory.GetComponent(parentCfg, tbfComponents);
+					TBF.BenchControl.Generic.IComponent component = parentFactory.GetComponent(parentCfg, tbfComponents);
 					tbfComponents.Add(component);
 					IDevice dev = component as IDevice;
 					if (dev != null)
@@ -581,7 +580,7 @@ namespace DeviceTest
 				}
 				if (component1Factory != null && component1Cfg != null)
 				{
-					TBF.Rig.Generic.IComponent component = component1Factory.GetComponent(component1Cfg, tbfComponents);
+					TBF.BenchControl.Generic.IComponent component = component1Factory.GetComponent(component1Cfg, tbfComponents);
 					tbfComponents.Add(component);
 					tbfComponent1forOp = component;
 					IDevice dev = component as IDevice;
@@ -594,7 +593,7 @@ namespace DeviceTest
 				}
 				if (component2Factory != null && component2Cfg != null)
 				{
-					TBF.Rig.Generic.IComponent component2 = component2Factory.GetComponent(component2Cfg, tbfComponents);
+					TBF.BenchControl.Generic.IComponent component2 = component2Factory.GetComponent(component2Cfg, tbfComponents);
 					tbfComponents.Add(component2);
 					tbfComponent2forOp = component2;
 					IDevice dev = component2 as IDevice;
@@ -607,7 +606,7 @@ namespace DeviceTest
 				}
 				if (component3Factory != null && component3Cfg != null)
 				{
-					TBF.Rig.Generic.IComponent component3 = component3Factory.GetComponent(component3Cfg, tbfComponents);
+					TBF.BenchControl.Generic.IComponent component3 = component3Factory.GetComponent(component3Cfg, tbfComponents);
 					tbfComponents.Add(component3);
 					tbfComponent3forOp = component3;
 					IDevice dev = component3 as IDevice;
@@ -646,8 +645,7 @@ namespace DeviceTest
 								MessageBoxIcon.Exclamation);
 
 				foreach (var dev in tbfDevices) dev.StopDevice();
-                foreach (var dev in tbfDevices) dev.StopDevice2();
-                tbfDevices.Clear();
+				tbfDevices.Clear();
 
 				startButton.Enabled = true;
 				stopButton.Enabled = false;
@@ -664,120 +662,120 @@ namespace DeviceTest
 			int previousOperation = 0;
 
 
-			if (tbfComponent1forOp is TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter)
+			if (tbfComponent1forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
 			{
-				operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
+				operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
 			}
-			else if (tbfComponent1forOp is TBF.Rig.Network.Camera.CLP1611.Camera)
+			else if (tbfComponent1forOp is TBF.BenchControl.Network.Camera.CLP1611.Camera)
 			{
-				operation1 = (tbfComponent1forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
-				operation2 = (tbfComponent1forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
+				operation1 = (tbfComponent1forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
+				operation2 = (tbfComponent1forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
 			}
-			else if (tbfComponent1forOp is TBF.Rig.Network.Camera.Roi.Roi)
+			else if (tbfComponent1forOp is TBF.BenchControl.Network.Camera.Roi.Roi)
 			{
-				operation1 = (tbfComponent1forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
+				operation1 = (tbfComponent1forOp as TBF.BenchControl.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent1forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
+			else if (tbfComponent1forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
 			{
-				operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation2 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
-            else if (tbfComponent1forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
+            else if (tbfComponent1forOp is TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
-                operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
-                operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
+                operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
+                operation2 = (tbfComponent1forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
             }
-            else if (tbfComponent1forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent1forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
 			{
-				//operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(1);
-				//operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(2);
-				//operation3 = (tbfComponent1forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(3);
-				//operation4 = (tbfComponent1forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(0);
+				//operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(1);
+				//operation2 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(2);
+				//operation3 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(3);
+				//operation4 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(0);
 			}
-            else if (tbfComponent3forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
             {
-                operation1 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
-                operation2 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
-                operation3 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
-                operation4 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
+                operation1 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
+                operation2 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
+                operation3 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
+                operation4 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
             }
 
 
-			if (tbfComponent2forOp is TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter)
+			if (tbfComponent2forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
 			{
-				operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
+				operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
 			}
-			else if (tbfComponent2forOp is TBF.Rig.Network.Camera.CLP1611.Camera)
+			else if (tbfComponent2forOp is TBF.BenchControl.Network.Camera.CLP1611.Camera)
 			{
-				operation21 = (tbfComponent2forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
-				operation22 = (tbfComponent2forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
+				operation21 = (tbfComponent2forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
+				operation22 = (tbfComponent2forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
 			}
-			else if (tbfComponent2forOp is TBF.Rig.Network.Camera.Roi.Roi)
+			else if (tbfComponent2forOp is TBF.BenchControl.Network.Camera.Roi.Roi)
 			{
-				operation21 = (tbfComponent2forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
+				operation21 = (tbfComponent2forOp as TBF.BenchControl.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent2forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
+			else if (tbfComponent2forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
 			{
-				operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation22 = (tbfComponent2forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
-            else if (tbfComponent2forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
+            else if (tbfComponent2forOp is TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
-                operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
-                operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
+                operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
+                operation22 = (tbfComponent2forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
             }
-            else if (tbfComponent2forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent2forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
 			{
-				//operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(1);
-                //operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(2);
-                //operation23 = (tbfComponent2forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(3);
-                //operation24 = (tbfComponent2forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(0);
+				//operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(1);
+                //operation22 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(2);
+                //operation23 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(3);
+                //operation24 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(0);
 			}
-            else if (tbfComponent3forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
             {
-                operation21 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
-                operation22 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
-                operation23 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
-                operation24 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
+                operation21 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
+                operation22 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
+                operation23 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
+                operation24 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
             }
 
 
-			if (tbfComponent3forOp is TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter)
+			if (tbfComponent3forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
 			{
-				operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
+				operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
 			}
-			else if (tbfComponent3forOp is TBF.Rig.Network.Camera.CLP1611.Camera)
+			else if (tbfComponent3forOp is TBF.BenchControl.Network.Camera.CLP1611.Camera)
 			{
-				operation31 = (tbfComponent3forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
-				operation33 = (tbfComponent3forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
+				operation31 = (tbfComponent3forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
+				operation33 = (tbfComponent3forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
 			}
-			else if (tbfComponent3forOp is TBF.Rig.Network.Camera.Roi.Roi)
+			else if (tbfComponent3forOp is TBF.BenchControl.Network.Camera.Roi.Roi)
 			{
-				operation31 = (tbfComponent3forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
+				operation31 = (tbfComponent3forOp as TBF.BenchControl.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent3forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
+			else if (tbfComponent3forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
 			{
-				operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
-            else if (tbfComponent3forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
+            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
-                operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
-                operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
+                operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
+                operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
             }
-            else if (tbfComponent3forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
 			{
-				//operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(1);
-				//operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(2);
-				//operation33 = (tbfComponent3forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(3);
-				//operation34 = (tbfComponent3forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(0);
+				//operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(1);
+				//operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(2);
+				//operation33 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(3);
+				//operation34 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(0);
 			}
-            else if (tbfComponent3forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
             {
-                operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
-                operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
-                operation33 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
-                operation34 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
+                operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
+                operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
+                operation33 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
+                operation34 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
             }
 
 
@@ -858,8 +856,7 @@ namespace DeviceTest
 			}
 
 			foreach (var d in tbfDevices) d.StopDevice();
-            foreach (var d in tbfDevices) d.StopDevice2();
-        }
+		}
 
 		private void stopButton_Click(object sender, EventArgs e)
 		{

Encrypt/Encrypt.csproj

@@ -16,7 +16,7 @@
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -27,7 +27,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>

EventViewer/EventViewerWnd.Designer.cs

@@ -138,7 +138,6 @@
             // eventsListView
             // 
             this.eventsListView.AllowColumnReorder = true;
-            this.eventsListView.CheckBoxes = true;
             this.eventsListView.Dock = System.Windows.Forms.DockStyle.Fill;
             this.eventsListView.DoubleClickActivation = false;
             this.eventsListView.FullRowSelect = true;

EventViewer/EventViewerWnd.cs

@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
 using NHibernate;
-using Common;
 using Common.UIControls;
 using Events;
 using Events.Entities;
@@ -211,8 +210,8 @@ namespace EventViewer
             {
                 lvi.UseItemStyleForSubItems = false;
                 lvi.SubItems.Add(evnt.Severity.ToString());
-                lvi.SubItems[lvi.SubItems.Count - 1].BackColor = global::Events.Utils.GetSeverityColor(evnt.Severity);
-                lvi.SubItems[lvi.SubItems.Count - 1].ForeColor = global::Events.Utils.GetSeverityColor(evnt.Severity, true);
+                lvi.SubItems[lvi.SubItems.Count - 1].BackColor = Utils.GetSeverityColor(evnt.Severity);
+                lvi.SubItems[lvi.SubItems.Count - 1].ForeColor = Utils.GetSeverityColor(evnt.Severity, true);
             }
             lvi.SubItems.Add(evnt.Message);
             eventsListView.Items.Add(lvi);
@@ -276,7 +275,7 @@ namespace EventViewer
 
         private void settingsButton_Click(object sender, EventArgs e)
         {
-            //Common.GID[] groupsWithAccess = new Common.GID[] { Common.GID.Administrators };
+            //Users.Entities.GID[] groupsWithAccess = new Users.Entities.GID[] { Users.Entities.GID.Administrators };
             Users.Forms.LoginDlg dlg = new Users.Forms.LoginDlg(true);
             if (dlg.ShowDialog() == DialogResult.OK)
             {
@@ -291,7 +290,7 @@ namespace EventViewer
         {
             try
             {
-                Users.GlobalData.RemoteUsersDB = new Users.DBSettings(Common.DBType.MySql, Program.LocalSettings.UsersDBConnString);
+                Users.GlobalData.RemoteUsersDB = new Users.DBSettings(Users.Entities.DBType.MySql, Program.LocalSettings.UsersDBConnString);
                 Users.Forms.LoginDlg dlg = new Users.Forms.LoginDlg();
                 if (dlg.ShowDialog() == DialogResult.OK)
                 {

EventViewer/LocalSettings.cs

@@ -59,8 +59,8 @@ namespace EventViewer
             ConnectionString = "SERVER=localhost; DATABASE=test-e; UID=root; PASSWORD=kraken; CHARSET=utf8";
             UsersDBConnString = "SERVER=localhost; DATABASE=test; UID=root; PASSWORD=kraken; CHARSET=utf8;";
 #else
-            ConnectionString = "SERVER=10.42.128.24; DATABASE=st_wr_shared_events; UID=v9305784; PASSWORD=p89344390; CHARSET=utf8";
-            UsersDBConnString = "SERVER=10.42.128.24; DATABASE=st_wr_shared_config; UID=u9305784; PASSWORD=p89344390; CHARSET=utf8;";
+            ConnectionString = "SERVER=10.42.128.16; DATABASE=st_wr_shared_events; UID=v9305784; PASSWORD=p89344390; CHARSET=utf8";
+            UsersDBConnString = "SERVER=10.42.128.16; DATABASE=st_wr_shared_config; UID=u9305784; PASSWORD=p89344390; CHARSET=utf8;";
 #endif
             RecentTimeDays = 7;
             Language = "sk";
@@ -147,7 +147,7 @@ namespace EventViewer
                     }
                 }
             }
-            catch (Exception)
+            catch (Exception e)
             {
                 //log.ErrorFormat("Failed to load from '{0}': {1}", fileName, e.Message);
                 return null;
@@ -203,7 +203,7 @@ namespace EventViewer
                 }
 #endif
             }
-            catch (Exception)
+            catch (Exception e)
             {
                 //log.ErrorFormat("Failed to save to '{0}': {1}", Program.LocalSettingsFileName, e.Message);
             }

EventViewer/Program.cs

@@ -122,7 +122,7 @@ namespace EventViewer
                 /// Open the main application window
                 Application.Run(new EventViewerWnd());
             }
-            catch (Exception)
+            catch (Exception e)
             {
                 //LogException(log, "Exception in Application.Run(new ResultsBrowserWnd(args))", e);
             }

Events/DB.cs

@@ -8,7 +8,6 @@ using FluentNHibernate.Cfg.Db;
 using NHibernate;
 using NHibernate.Cfg;
 using NHibernate.Tool.hbm2ddl;
-using Common;
 using Events.Entities;
 
 namespace Events
@@ -35,9 +34,9 @@ namespace Events
 		}
 
 		/// <summary> Database type (MySQL or SQLite) for all sessions </summary>
-		private static DBType dbType;
+		private static Entities.DBType dbType;
 		/// 
-		public static DBType DbType
+		public static Entities.DBType DbType
 		{
 			get { return dbType; }
 			set { dbType = value; SessionFactory = null; }
@@ -64,10 +63,10 @@ namespace Events
 			switch (dbType)
 			{
 				default:
-				case DBType.SQLite:
+				case Entities.DBType.SQLite:
 					cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
                     break;
-				case DBType.MySql:
+				case Entities.DBType.MySql:
                     cfg = cfg.Database(MySQLConfiguration.Standard.ConnectionString(connectionString));
                     break;
 			}

Events/Entities/Enums.cs

@@ -0,0 +1,58 @@
+///
+/// Copyright (c) 2020 Sensus Slovensko a.s.
+///
+namespace Events.Entities
+{
+    /// <summary>
+    /// Identifies the type of a database
+    /// </summary>
+    public enum DBType
+    {
+        None,               /// Database disabled
+        MySql,              /// MySQL database
+        SQLite,             /// SQLite
+        Count
+    }
+
+
+    public enum Severity
+    {
+        Undefined,
+        Notification,
+        Warning,
+        Error,
+        FatalError,
+        Count
+    }
+
+    public enum EventClass
+    {
+        Undefined,
+        EquipmentHW,
+        Metrology,
+        TestingProcess,
+        BadResults,
+        ComputerResources,
+        Network,
+        Other,
+        Count
+    }
+
+    public enum SubscriberGroup : long
+    {
+        None = 0,
+        Metrology = 1,
+        Maintenance = 2,
+        Production = 4,
+        Management = 8,
+        Finish = 16,
+    }
+
+    public enum EViewerOption
+    {
+        Undefined,
+        AllEvents,
+        RecentEvents,
+        UnreadEvents,
+    }
+}

Events/Entities/Event.cs

@@ -3,7 +3,6 @@
 ///
 using System;
 using System.Collections.Generic;
-using Common;
 
 namespace Events.Entities
 {

Events/Events.csproj

@@ -56,6 +56,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DB.cs" />
+    <Compile Include="Entities\Enums.cs" />
     <Compile Include="Entities\Event.cs" />
     <Compile Include="Entities\Subscriber.cs" />
     <Compile Include="Utils.cs" />
@@ -66,12 +67,6 @@
   <ItemGroup>
     <Folder Include="DeliveryServices\" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Common\Common.csproj">
-      <Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
-      <Name>Common</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Events/Utils.cs

@@ -3,7 +3,6 @@
 ///
 using System;
 using System.Drawing;
-using Common;
 using Events.Entities;
 
 namespace Events

FeatureVectorCalculator/App.config

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

FeatureVectorCalculator/CalculatorWnd.Designer.cs

@@ -1,280 +0,0 @@
-namespace FeatureVectorCalculator
-{
-    partial class CalculatorWnd
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.rawFileComboBox = new System.Windows.Forms.ComboBox();
-            this.browseButton = new System.Windows.Forms.Button();
-            this.resultsTextBox = new System.Windows.Forms.TextBox();
-            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
-            this.splitContainer3 = new System.Windows.Forms.SplitContainer();
-            this.tabControl1 = new System.Windows.Forms.TabControl();
-            this.tabPage1 = new System.Windows.Forms.TabPage();
-            this.tabPage2 = new System.Windows.Forms.TabPage();
-            this.tabPage3 = new System.Windows.Forms.TabPage();
-            this.tabPage4 = new System.Windows.Forms.TabPage();
-            this.tabPage5 = new System.Windows.Forms.TabPage();
-            this.tabPage6 = new System.Windows.Forms.TabPage();
-            this.tabPage7 = new System.Windows.Forms.TabPage();
-            this.tabPage8 = new System.Windows.Forms.TabPage();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
-            this.splitContainer1.Panel1.SuspendLayout();
-            this.splitContainer1.Panel2.SuspendLayout();
-            this.splitContainer1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
-            this.splitContainer2.Panel1.SuspendLayout();
-            this.splitContainer2.Panel2.SuspendLayout();
-            this.splitContainer2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit();
-            this.splitContainer3.Panel1.SuspendLayout();
-            this.splitContainer3.Panel2.SuspendLayout();
-            this.splitContainer3.SuspendLayout();
-            this.tabControl1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // rawFileComboBox
-            // 
-            this.rawFileComboBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.rawFileComboBox.FormattingEnabled = true;
-            this.rawFileComboBox.Location = new System.Drawing.Point(0, 0);
-            this.rawFileComboBox.Name = "rawFileComboBox";
-            this.rawFileComboBox.Size = new System.Drawing.Size(1040, 21);
-            this.rawFileComboBox.TabIndex = 0;
-            // 
-            // browseButton
-            // 
-            this.browseButton.Location = new System.Drawing.Point(7, 0);
-            this.browseButton.Name = "browseButton";
-            this.browseButton.Size = new System.Drawing.Size(66, 37);
-            this.browseButton.TabIndex = 1;
-            this.browseButton.Text = "Browse";
-            this.browseButton.UseVisualStyleBackColor = true;
-            this.browseButton.Click += new System.EventHandler(this.browseButton_Click);
-            // 
-            // resultsTextBox
-            // 
-            this.resultsTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.resultsTextBox.Location = new System.Drawing.Point(0, 0);
-            this.resultsTextBox.Multiline = true;
-            this.resultsTextBox.Name = "resultsTextBox";
-            this.resultsTextBox.Size = new System.Drawing.Size(1127, 156);
-            this.resultsTextBox.TabIndex = 3;
-            // 
-            // splitContainer1
-            // 
-            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer1.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer1.Name = "splitContainer1";
-            this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
-            // 
-            // splitContainer1.Panel1
-            // 
-            this.splitContainer1.Panel1.Controls.Add(this.splitContainer2);
-            // 
-            // splitContainer1.Panel2
-            // 
-            this.splitContainer1.Panel2.Controls.Add(this.tabControl1);
-            this.splitContainer1.Size = new System.Drawing.Size(1127, 733);
-            this.splitContainer1.SplitterDistance = 200;
-            this.splitContainer1.TabIndex = 4;
-            // 
-            // splitContainer2
-            // 
-            this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
-            this.splitContainer2.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer2.Name = "splitContainer2";
-            this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
-            // 
-            // splitContainer2.Panel1
-            // 
-            this.splitContainer2.Panel1.Controls.Add(this.splitContainer3);
-            // 
-            // splitContainer2.Panel2
-            // 
-            this.splitContainer2.Panel2.Controls.Add(this.resultsTextBox);
-            this.splitContainer2.Size = new System.Drawing.Size(1127, 200);
-            this.splitContainer2.SplitterDistance = 40;
-            this.splitContainer2.TabIndex = 3;
-            // 
-            // splitContainer3
-            // 
-            this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
-            this.splitContainer3.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer3.Name = "splitContainer3";
-            // 
-            // splitContainer3.Panel1
-            // 
-            this.splitContainer3.Panel1.Controls.Add(this.rawFileComboBox);
-            // 
-            // splitContainer3.Panel2
-            // 
-            this.splitContainer3.Panel2.Controls.Add(this.browseButton);
-            this.splitContainer3.Size = new System.Drawing.Size(1127, 40);
-            this.splitContainer3.SplitterDistance = 1040;
-            this.splitContainer3.TabIndex = 0;
-            // 
-            // tabControl1
-            // 
-            this.tabControl1.Controls.Add(this.tabPage1);
-            this.tabControl1.Controls.Add(this.tabPage2);
-            this.tabControl1.Controls.Add(this.tabPage3);
-            this.tabControl1.Controls.Add(this.tabPage4);
-            this.tabControl1.Controls.Add(this.tabPage5);
-            this.tabControl1.Controls.Add(this.tabPage6);
-            this.tabControl1.Controls.Add(this.tabPage7);
-            this.tabControl1.Controls.Add(this.tabPage8);
-            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabControl1.Location = new System.Drawing.Point(0, 0);
-            this.tabControl1.Name = "tabControl1";
-            this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(1127, 529);
-            this.tabControl1.TabIndex = 0;
-            // 
-            // tabPage1
-            // 
-            this.tabPage1.Location = new System.Drawing.Point(4, 22);
-            this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(1119, 503);
-            this.tabPage1.TabIndex = 0;
-            this.tabPage1.Text = "OffsetV";
-            this.tabPage1.UseVisualStyleBackColor = true;
-            // 
-            // tabPage2
-            // 
-            this.tabPage2.Location = new System.Drawing.Point(4, 22);
-            this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage2.Size = new System.Drawing.Size(1119, 503);
-            this.tabPage2.TabIndex = 1;
-            this.tabPage2.Text = "KOhmsR";
-            this.tabPage2.UseVisualStyleBackColor = true;
-            // 
-            // tabPage3
-            // 
-            this.tabPage3.Location = new System.Drawing.Point(4, 22);
-            this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Size = new System.Drawing.Size(1119, 503);
-            this.tabPage3.TabIndex = 2;
-            this.tabPage3.Text = "KOhmsC";
-            this.tabPage3.UseVisualStyleBackColor = true;
-            // 
-            // tabPage4
-            // 
-            this.tabPage4.Location = new System.Drawing.Point(4, 22);
-            this.tabPage4.Name = "tabPage4";
-            this.tabPage4.Size = new System.Drawing.Size(1119, 503);
-            this.tabPage4.TabIndex = 3;
-            this.tabPage4.Text = "DutFlowLph";
-            this.tabPage4.UseVisualStyleBackColor = true;
-            // 
-            // tabPage5
-            // 
-            this.tabPage5.Location = new System.Drawing.Point(4, 22);
-            this.tabPage5.Name = "tabPage5";
-            this.tabPage5.Size = new System.Drawing.Size(1119, 503);
-            this.tabPage5.TabIndex = 4;
-            this.tabPage5.Text = "RefFlowLph";
-            this.tabPage5.UseVisualStyleBackColor = true;
-            // 
-            // tabPage6
-            // 
-            this.tabPage6.Location = new System.Drawing.Point(4, 22);
-            this.tabPage6.Name = "tabPage6";
-            this.tabPage6.Size = new System.Drawing.Size(1119, 503);
-            this.tabPage6.TabIndex = 5;
-            this.tabPage6.Text = "FlowRatio";
-            this.tabPage6.UseVisualStyleBackColor = true;
-            // 
-            // tabPage7
-            // 
-            this.tabPage7.Location = new System.Drawing.Point(4, 22);
-            this.tabPage7.Name = "tabPage7";
-            this.tabPage7.Size = new System.Drawing.Size(1119, 503);
-            this.tabPage7.TabIndex = 6;
-            this.tabPage7.Text = "MagField";
-            this.tabPage7.UseVisualStyleBackColor = true;
-            // 
-            // tabPage8
-            // 
-            this.tabPage8.Location = new System.Drawing.Point(4, 22);
-            this.tabPage8.Name = "tabPage8";
-            this.tabPage8.Size = new System.Drawing.Size(1119, 503);
-            this.tabPage8.TabIndex = 7;
-            this.tabPage8.Text = "EmfV";
-            this.tabPage8.UseVisualStyleBackColor = true;
-            // 
-            // CalculatorWnd
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1127, 733);
-            this.Controls.Add(this.splitContainer1);
-            this.Name = "CalculatorWnd";
-            this.Text = "Feature vector calculator";
-            this.splitContainer1.Panel1.ResumeLayout(false);
-            this.splitContainer1.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
-            this.splitContainer1.ResumeLayout(false);
-            this.splitContainer2.Panel1.ResumeLayout(false);
-            this.splitContainer2.Panel2.ResumeLayout(false);
-            this.splitContainer2.Panel2.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
-            this.splitContainer2.ResumeLayout(false);
-            this.splitContainer3.Panel1.ResumeLayout(false);
-            this.splitContainer3.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();
-            this.splitContainer3.ResumeLayout(false);
-            this.tabControl1.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.ComboBox rawFileComboBox;
-        private System.Windows.Forms.Button browseButton;
-        private System.Windows.Forms.TextBox resultsTextBox;
-        private System.Windows.Forms.SplitContainer splitContainer1;
-        private System.Windows.Forms.SplitContainer splitContainer2;
-        private System.Windows.Forms.SplitContainer splitContainer3;
-        private System.Windows.Forms.TabControl tabControl1;
-        private System.Windows.Forms.TabPage tabPage1;
-        private System.Windows.Forms.TabPage tabPage2;
-        private System.Windows.Forms.TabPage tabPage3;
-        private System.Windows.Forms.TabPage tabPage4;
-        private System.Windows.Forms.TabPage tabPage5;
-        private System.Windows.Forms.TabPage tabPage6;
-        private System.Windows.Forms.TabPage tabPage7;
-        private System.Windows.Forms.TabPage tabPage8;
-    }
-}
-

FeatureVectorCalculator/CalculatorWnd.cs

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

FeatureVectorCalculator/CalculatorWnd.resx

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

FeatureVectorCalculator/FeatureVectorCalculator.csproj

@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{6280F3F9-139A-48E3-8C88-25EB4124E982}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>FeatureVectorCalculator</RootNamespace>
-    <AssemblyName>FeatureVectorCalculator</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>FeatureVectorCalculator.Program</StartupObject>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Windows.Forms.DataVisualization" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CalculatorWnd.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="CalculatorWnd.Designer.cs">
-      <DependentUpon>CalculatorWnd.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SignalChart.cs" />
-    <EmbeddedResource Include="CalculatorWnd.resx">
-      <DependentUpon>CalculatorWnd.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="..\Common\Common.csproj">
-      <Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
-      <Name>Common</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

FeatureVectorCalculator/Program.cs

@@ -1,25 +0,0 @@
-///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace FeatureVectorCalculator
-{
-    static class Program
-    {
-        /// <summary>
-        /// The main entry point for the application.
-        /// </summary>
-        [STAThread]
-        static void Main()
-        {
-            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new CalculatorWnd());
-        }
-    }
-}

FeatureVectorCalculator/Properties/AssemblyInfo.cs

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

FeatureVectorCalculator/Properties/Resources.Designer.cs

@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace FeatureVectorCalculator.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", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FeatureVectorCalculator.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;
-            }
-        }
-    }
-}

FeatureVectorCalculator/Properties/Resources.resx

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

FeatureVectorCalculator/Properties/Settings.Designer.cs

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

FeatureVectorCalculator/Properties/Settings.settings

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

FeatureVectorCalculator/SignalChart.cs

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

GemCard/CardNative.cs

@@ -199,8 +199,7 @@ namespace GemCard
 		{
 			Disconnect(DISCONNECT.Unpower);
 
-            try { ReleaseContext(); }
-            catch { }
+			ReleaseContext();
 		}
 
 		#region ICard Members
@@ -216,73 +215,66 @@ namespace GemCard
 		/// <returns>A string array of the readers</returns>
 		public	override string[]	ListReaders()
 		{
-            try
-            {
-                EstablishContext(SCOPE.User);
+			EstablishContext(SCOPE.User);
 
-                string[] sListReaders = null;
-                UInt32 pchReaders = 0;
-                IntPtr szListReaders = IntPtr.Zero;
+			string[]	sListReaders = null;
+			UInt32	pchReaders = 0;
+			IntPtr	szListReaders = IntPtr.Zero;
 
-                m_nLastError = SCardListReaders(m_hContext, null, szListReaders, out pchReaders);
-                if (m_nLastError == 0)
-                {
-                    szListReaders = Marshal.AllocHGlobal((int)pchReaders);
-                    m_nLastError = SCardListReaders(m_hContext, null, szListReaders, out pchReaders);
-                    if (m_nLastError == 0)
-                    {
-                        char[] caReadersData = new char[pchReaders];
-                        int nbReaders = 0;
-                        for (int nI = 0; nI < pchReaders; nI++)
-                        {
-                            caReadersData[nI] = (char)Marshal.ReadByte(szListReaders, nI);
+			m_nLastError = SCardListReaders(m_hContext, null, szListReaders, out pchReaders);
+			if (m_nLastError == 0)
+			{
+				szListReaders = Marshal.AllocHGlobal((int) pchReaders);
+				m_nLastError = SCardListReaders(m_hContext, null, szListReaders, out pchReaders);
+				if (m_nLastError == 0)
+				{
+					char[] caReadersData = new char[pchReaders];
+					int	nbReaders = 0;
+					for (int nI = 0; nI < pchReaders; nI++)
+					{
+						caReadersData[nI] = (char) Marshal.ReadByte(szListReaders, nI);
 
-                            if (caReadersData[nI] == 0)
-                                nbReaders++;
-                        }
+						if (caReadersData[nI] == 0)
+							nbReaders++;
+					}
 
-                        // Remove last 0
-                        --nbReaders;
+					// Remove last 0
+					--nbReaders;
 
-                        if (nbReaders != 0)
-                        {
-                            sListReaders = new string[nbReaders];
-                            char[] caReader = new char[pchReaders];
-                            int nIdx = 0;
-                            int nIdy = 0;
-                            int nIdz = 0;
-                            // Get the nJ string from the multi-string
+					if (nbReaders != 0)
+					{
+						sListReaders = new string[nbReaders];
+						char[] caReader = new char[pchReaders];
+						int	nIdx = 0;
+						int	nIdy = 0;
+						int	nIdz = 0;
+						// Get the nJ string from the multi-string
 
-                            while (nIdx < pchReaders - 1)
-                            {
-                                caReader[nIdy] = caReadersData[nIdx];
-                                if (caReader[nIdy] == 0)
-                                {
-                                    sListReaders[nIdz] = new string(caReader, 0, nIdy);
-                                    ++nIdz;
-                                    nIdy = 0;
-                                    caReader = new char[pchReaders];
-                                }
-                                else
-                                    ++nIdy;
+						while(nIdx < pchReaders - 1)
+						{
+							caReader[nIdy] = caReadersData[nIdx];
+							if (caReader[nIdy] == 0)
+							{
+								sListReaders[nIdz] = new string(caReader, 0, nIdy);
+								++nIdz;
+								nIdy = 0;
+								caReader = new char[pchReaders];
+							}
+							else
+								++nIdy;
 
-                                ++nIdx;
-                            }
-                        }
+							++nIdx;
+						}
+					}
 
-                    }
+				}
 
-                    Marshal.FreeHGlobal(szListReaders);
-                }
+				Marshal.FreeHGlobal(szListReaders);
+			}
 
-                ReleaseContext();
+			ReleaseContext();
 
-                return sListReaders;
-            }
-            catch
-            {
-                return new string[0];
-            }
+			return sListReaders;
 		}
 
 		/// <summary>

GemCard/GemCard.csproj

@@ -97,7 +97,7 @@
     <BaseAddress>285212672</BaseAddress>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <FileAlignment>4096</FileAlignment>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
     <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
@@ -110,7 +110,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Optimize>true</Optimize>
     <FileAlignment>4096</FileAlignment>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     <Prefer32Bit>false</Prefer32Bit>

MergeResultsDBs/App.config

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

MergeResultsDBs/MergeResultsDBs.csproj

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{9786D0A8-BA9A-41F6-9E61-C7B2B76D4C08}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MergeResultsDBs</RootNamespace>
-    <AssemblyName>MergeResultsDBs</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FluentNHibernate">
-      <HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="Iesi.Collections">
-      <HintPath>..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net">
-      <HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="MySql.Data">
-      <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate">
-      <HintPath>..\packages\NHibernate.4.0.4.4000\lib\net40\NHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Config\Config.csproj">
-      <Project>{743df7db-c7b6-42eb-986d-0f485e5588e4}</Project>
-      <Name>Config</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Results\Results.csproj">
-      <Project>{9d0dcc88-dc81-47eb-9fdd-4c3907871bfb}</Project>
-      <Name>Results</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

MergeResultsDBs/Program.cs

@@ -1,190 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using log4net;
-using NHibernate;
-using FluentNHibernate;
-using Results;
-using Results.Entities;
-
-namespace MergeResultsDBs
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            Console.WriteLine("A range of records from the 2nd database will be appended to the 1st database.");
-            Console.WriteLine("Enter the 1st (target) database name:");
-            string firstDB = Console.ReadLine();
-            Console.WriteLine("Enter the 2nd database name:");
-            string secondDB = Console.ReadLine();
-            Console.WriteLine("Enter range of batch numbers from the 2nd DB to append to the 1st DB (start-end):");
-            string range = Console.ReadLine();
-
-            ISession session1;
-            IList<Components> componentsList;
-            int componentsListInitialCount;
-            IList<TestData> testDataList;
-            int testDataListInitialCount;
-            IList<WaterMeterData> waterMeterDataList;
-            int waterMeterDataListInitialCount;
-            try
-            {
-                DB.ConnectionString = string.Format("SERVER=localhost; DATABASE={0}; UID=root; PASSWORD=kraken; CHARSET=utf8;", firstDB);
-                session1 = DB.CreateSession();
-
-                componentsList = session1.QueryOver<Components>().List();
-                componentsListInitialCount = componentsList.Count;
-
-                testDataList = session1.QueryOver<TestData>().List();
-                testDataListInitialCount = testDataList.Count();
-
-                waterMeterDataList = session1.QueryOver<WaterMeterData>().List();
-                waterMeterDataListInitialCount = waterMeterDataList.Count();
-            }
-            catch (Exception exc)
-            {
-                MessageBox.Show(string.Format("Cannot open the 1st database:\r\n{0}", exc.Message));
-                return;
-            }
-
-            ISession session2;
-            IList<Components> oriComponentsList;
-            IList<TestData> oriTestDataList;
-            IList<WaterMeterData> oriWMDataList;
-            try
-            {
-                DB.ConnectionString = string.Format("SERVER=localhost; DATABASE={0}; UID=root; PASSWORD=kraken; CHARSET=utf8;", secondDB);
-                session2 = DB.CreateSession();
-
-                oriComponentsList = session2.QueryOver<Components>().List();
-                oriTestDataList = session2.QueryOver<TestData>().List();
-                oriWMDataList = session2.QueryOver<WaterMeterData>().List();
-            }
-            catch (Exception exc)
-            {
-                MessageBox.Show(string.Format("Cannot open the 2nd database:\r\n{0}", exc.Message));
-                return;
-            }
-
-            int batchNrStart;
-            int batchNrEnd;
-            string[] fields = range.Split(new char[] { '-' });
-            if (fields.Length != 2 ||
-                !int.TryParse(fields[0], out batchNrStart) ||
-                !int.TryParse(fields[1], out batchNrEnd) ||
-                batchNrEnd < batchNrStart)
-            {
-                MessageBox.Show("Invalid range of batch numbers");
-                return;
-            }
-
-            Console.WriteLine(string.Format("Appending batches {0}-{1} from DB {2} to DB {3}", batchNrStart, batchNrEnd, secondDB, firstDB));
-            Console.WriteLine("Press 'y' or 'Y' to start, anything else to abort");
-            string response = Console.ReadLine();
-            if (response != "y" && response != "Y")
-            {
-                return;
-            }
-
-            Console.WriteLine("PROCESSING DATABASES ...");
-
-            for (int batchNr = batchNrStart; batchNr <= batchNrEnd; batchNr++)
-            {
-                Console.Write(string.Format("{0} ", batchNr));
-
-                /// Copy one batch from the 2nd to the 1st database
-                var oriBatches = session2.QueryOver<Batch>()
-                                         .Where(x => (x.BatchNr == batchNr))
-                                         .List();
-                if (oriBatches.Count != 1) continue;
-
-                ///---------------------------------------------------------------
-                Batch oriBatch = oriBatches[0];
-
-                var transaction = session1.BeginTransaction();
-                try
-                {
-                    Batch batch = new Batch(oriBatch);
-
-                    oriBatch.TestRslts = session2.QueryOver<TestRslt>()
-                                                 .Where(x => (x.Batch.Id == oriBatch.Id))
-                                                 .List();
-                    foreach (var oriTR in oriBatch.TestRslts)
-                    {
-                        /// Find appropriate Components
-                        Components components = oriTR.Components == null
-                                              ? null
-                                              : Components.UpdateList(componentsList, new Components(oriTR.Components));
-                        if (components != null) session1.SaveOrUpdate(components);
-
-                        /// Find appropriate TestData
-                        TestData testData = TestData.UpdateList(testDataList, new TestData(oriTR.TestData));
-                        session1.SaveOrUpdate(testData);
-
-                        TestRslt tr = new TestRslt();
-                        tr.CopyContentFrom(oriTR);
-                        tr.Batch = batch;
-                        tr.Components = components;
-                        tr.TestData = testData;
-
-                        batch.TestRslts.Add(tr);
-                        session1.SaveOrUpdate(tr);
-                    }
-
-                    oriBatch.WaterMeters = session2.QueryOver<WaterMeter>()
-                                                   .Where(x => (x.Batch.Id == oriBatch.Id))
-                                                   .List();
-                    foreach (var oriWM in oriBatch.WaterMeters)
-                    {
-                        /// Find appropriate WaterMeterData
-                        WaterMeterData wmData = WaterMeterData.UpdateList(waterMeterDataList, new WaterMeterData(oriWM.WaterMeterData));
-                        session1.SaveOrUpdate(wmData);
-
-                        WaterMeter wm = new WaterMeter();
-                        wm.CopyContentFrom(oriWM);
-                        wm.Batch = batch;
-                        wm.WaterMeterData = wmData;
-
-                        foreach (var oriMTR in oriWM.MeterTestRslts)
-                        {
-                            MeterTestRslt mtr = new MeterTestRslt(oriMTR);
-                            mtr.WaterMeter = wm;
-                            mtr.TestRslt = batch.TestRslts.FirstOrDefault<TestRslt>(x => (x.Name() == oriMTR.TestRslt.Name() &&
-                                                                                          x.Part == oriMTR.TestRslt.Part &&
-                                                                                          x.RepetitionNr == oriMTR.TestRslt.RepetitionNr));
-                            if (mtr.TestRslt == null)
-                            {
-                                throw new Exception("Something strange happened");
-                            }
-
-                            wm.MeterTestRslts.Add(mtr);
-                            session1.SaveOrUpdate(mtr);
-                        }
-
-                        batch.WaterMeters.Add(wm);
-                        session1.SaveOrUpdate(wm);
-                    }
-
-                    session1.SaveOrUpdate(batch);
-                    transaction.Commit();
-                }
-                catch
-                {
-                    transaction.Rollback();
-                    throw new Exception("Commit failed - transaction reverted");
-                }
-            }
-            Console.WriteLine();
-
-            session1.Flush();
-            session1.Close();
-            session2.Close();
-            Console.WriteLine("Successfully completed");
-            Console.ReadLine();
-        }
-    }
-}

MergeResultsDBs/Properties/AssemblyInfo.cs

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

RestClient/RestClient.csproj

@@ -20,7 +20,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,7 +29,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

Results/BatchResults.cs

@@ -1,12 +1,8 @@
-///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
-///
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using Common;
 using Results.Entities;
 
 namespace Results
@@ -44,7 +40,7 @@ namespace Results
 
 		public static BatchResults NewFromProcedure(int batchNr, int benchId, string benchName, string a1, string a2, string a3, string a4, string a5,
                                                     string user, int userNr, string programVer, Config.Entities.Procedure procedure,
-                                                    WaterMeterData[] waterMeterDatas, int[] waterMeterParts, double realDensity, double atTemperature, double buoyancy)
+													WaterMeterData[] waterMeterDatas, int[] waterMeterParts, double densityCorr)
 		{
 			BatchResults d = new BatchResults(waterMeterDatas.Length);
             int year = DateTime.Now.Year;
@@ -69,12 +65,10 @@ namespace Results
 					ProcedureRevision = procedure.Revision,
 					ProtocolTitle = string.Empty,
 					StartTime = DateTime.Now,
-                    RealDensity = realDensity,
-                    AtTemperature = atTemperature,
-                    Buoyancy = buoyancy,
-                    Compound = (procedure.MetersKind == MetersKind.Combined),
+					DensityCorr = (float)densityCorr,
+					Compound = (procedure.MetersKind == Config.Entities.MetersKind.Combined),
 #if HEAT_METERS
-                    HeatMeter = (procedure.MetersKind == MetersKind.HeatMeter),
+                    HeatMeter = (procedure.MetersKind == Config.Entities.MetersKind.HeatMeter),
 #endif
                 };
 
@@ -102,41 +96,45 @@ namespace Results
                 }
 			}
 
-			foreach (var ti in procedure.GetTestInstances())
+
+			foreach (var t in procedure.Tests)
 			{
-				TestData td = TestData.UpdateList(d.TestDataList, new TestData(ti.Test));
+				TestData td = TestData.UpdateList(d.TestDataList, new TestData(t));
 
-				/// Create an empty test result and add it to the list
-				TestRslt tr = new TestRslt(d.Batch, td, ti.Test.Part, ti.Repetition);
-				d.Batch.TestRslts.Add(tr);
-
-				for (int i = 0; i < d.WMPositionsCount; i++)
+				for (int rnr = 1; rnr <= t.Repeats; rnr++)
 				{
-                    if (!d.Batch.WaterMeters[i].Disabled && ti.Test.IsPartCompatible(waterMeterParts[i]))
-                    {
-                        ///
-                        /// Create empty watermeter test results and add them to the list and to dictionaries
-                        ///
-                        IList<MeterTestRslt> wmtrs = d.Batch.WaterMeters[i].MeterTestRslts;
-                        if (d.Batch.Compound)
+					/// Create an empty test result and add it to the list
+					TestRslt tr = new TestRslt(d.Batch, td, t.Part, rnr);
+					d.Batch.TestRslts.Add(tr);
+
+					for (int i = 0; i < d.WMPositionsCount; i++)
+					{
+                        if (!d.Batch.WaterMeters[i].Disabled && t.IsPartCompatible(waterMeterParts[i]))
                         {
-                            /// Compound water meter
-                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, CompoundMeterId.CompoundMain));
-                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, CompoundMeterId.CompoundAux));
-                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, CompoundMeterId.Compound));
+                            ///
+                            /// Create empty watermeter test results and add them to the list and to dictionaries
+                            ///
+                            IList<MeterTestRslt> wmtrs = d.Batch.WaterMeters[i].MeterTestRslts;
+                            if (d.Batch.Compound)
+                            {
+                                /// Compound water meter
+                                wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.CompoundMain));
+                                wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.CompoundAux));
+                                wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.Compound));
+                            }
+                            else if (d.Batch.HeatMeter)
+                            {
+                                /// Heat meter
+                                wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.HeatMeterVolume));
+                                wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.HeatMeterEnergy));
+                            }
+                            else
+                            {
+                                /// Water meter
+                                wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.Single));
+                            }
                         }
-                        else if (d.Batch.HeatMeter)
-                        {
-                            /// Heat meter
-                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, CompoundMeterId.HeatMeterVolume));
-                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, CompoundMeterId.HeatMeterEnergy));
-                        }
-                        else
-                        {
-                            /// Water meter
-                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, CompoundMeterId.Single));
-                        }
-                    }
+					}
 				}
 			}
 
@@ -158,10 +156,10 @@ namespace Results
                 if (batch.WaterMeters[wmNr0].WMPosition > wmNr0 + 1)
                 {
                     batch.WaterMeters.Insert(wmNr0, new WaterMeter() { Batch = batch,
-                                                                       WaterMeterData = null,
-                                                                       WMPosition = wmNr0 + 1,
-                                                                       YearOfProduction = 0,
-                                                                       Disabled = true, });
+                                                                        WaterMeterData = null,
+                                                                        WMPosition = wmNr0 + 1,
+                                                                        YearOfProduction = 0,
+                                                                        Disabled = true, });
                 }
             }
 
@@ -173,7 +171,7 @@ namespace Results
 			return Batch.GetTestRslt(name, part);
 		}
 
-		public MeterTestRslt GetMeterTestRslt(string name, int wmNr0, CompoundMeterId meterId)
+		public MeterTestRslt GetMeterTestRslt(string name, int wmNr0, Config.Entities.CompoundMeterId meterId)
 		{
             if (Batch.WaterMeters != null && Batch.WaterMeters.Count > wmNr0 && !Batch.WaterMeters[wmNr0].Disabled)
 			{

Results/DB.cs

@@ -37,9 +37,9 @@ namespace Results
 		}
 
 		/// <summary> Database type (MySQL or SQLite) for all sessions </summary>
-		private static Common.DBType dbType;
+		private static Users.Entities.DBType dbType;
 		/// 
-		public static Common.DBType DbType
+		public static Users.Entities.DBType DbType
 		{
 			get { return dbType; }
 			set { dbType = value; SessionFactory = null; }
@@ -66,10 +66,10 @@ namespace Results
 			switch (dbType)
 			{
 				default:
-				case Common.DBType.MySql:
+				case Users.Entities.DBType.MySql:
                     cfg = cfg.Database(MySQLConfiguration.Standard.ConnectionString(connectionString));
                     break;
-                case Common.DBType.SQLite:
+                case Users.Entities.DBType.SQLite:
                     cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
                     break;
             }

Results/Entities/Batch.cs

@@ -1,52 +1,51 @@
 ///
-/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2020 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Common;
 
 namespace Results.Entities
 {
 	public class Batch
 	{
         public virtual int Id { get; protected set; }
-        public virtual int BatchNr { get; set; }
+		public virtual int BatchNr { get; set; }
         public virtual string ProgramVersion { get; set; }
         public virtual int TestBenchId { get; set; }
-        public virtual string TestBenchName { get; set; }           /// CEVAK, not mapped to DB
-        public virtual string Address1 { get; set; }                /// CEVAK, not mapped to DB
-        public virtual string Address2 { get; set; }                /// CEVAK, not mapped to DB
-        public virtual string Address3 { get; set; }                /// CEVAK, not mapped to DB
-        public virtual string Address4 { get; set; }                /// CEVAK, not mapped to DB
-        public virtual string Address5 { get; set; }                /// CEVAK, not mapped to DB
-        public virtual string UserName { get; set; }    
-        public virtual int UserNumber { get; set; }
-        public virtual string ProcedureName { get; set; }
+        public virtual string TestBenchName { get; set; }	        /// CEVAK, not mapped to DB
+        public virtual string Address1 { get; set; }	            /// CEVAK, not mapped to DB
+        public virtual string Address2 { get; set; }	            /// CEVAK, not mapped to DB
+        public virtual string Address3 { get; set; }	            /// CEVAK, not mapped to DB
+        public virtual string Address4 { get; set; }	            /// CEVAK, not mapped to DB
+        public virtual string Address5 { get; set; }	            /// CEVAK, not mapped to DB
+		public virtual string UserName { get; set; }
+		public virtual int UserNumber { get; set; }
+		public virtual string ProcedureName { get; set; }
         public virtual bool IsRemoteProcedure { get; set; }         /// Stara Tura, not mapped to DB
-        public virtual string ProcedureDescription { get; set; }    /// CEVAK, not mapped to DB
-        public virtual int ProcedureRevision { get; set; }
-        public virtual string WatermetersStr { get; set; }          /// CEVAK, not mapped to DB
-        public virtual string ProtocolTitle { get; set; }
+		public virtual string ProcedureDescription { get; set; }	/// CEVAK, not mapped to DB
+		public virtual int ProcedureRevision { get; set; }
+		public virtual string WatermetersStr { get; set; }			/// CEVAK, not mapped to DB
+		public virtual string ProtocolTitle { get; set; }
         public virtual string Remark { get; set; }
-        public virtual double RealDensity { get; set; }             /// Density correction in [kg/m3]
-        public virtual double AtTemperature { get; set; }
-        public virtual double Buoyancy { get; set; }
+        public virtual float DensityCorr { get; set; }				/// Density correction in [kg/m3]
+		public virtual float Custom2 { get; set; }
+		public virtual float Custom3 { get; set; }
         public virtual int Counter6 { get; set; }
         public virtual int Counter7 { get; set; }
         public virtual int Counter8 { get; set; }
         public virtual int Counter9 { get; set; }
         public virtual int Counter10 { get; set; }
         public virtual DateTime StartTime { get; set; }
-        public virtual DateTime EndTime { get; set; }
+		public virtual DateTime EndTime { get; set; }
         public virtual bool Dirty { get; set; }
         public virtual bool RsltsSent { get; set; }
-        public virtual bool RsltsPrinted { get; set; }
-        public virtual IList<TestData> Tests { get; set; }
-        public virtual IList<WaterMeter> WaterMeters { get; set; }
-        public virtual IList<TestRslt> TestRslts { get; set; }
-        public virtual bool Compound { get; set; }                  /// Not mapped to DB now
-        public virtual bool HeatMeter { get; set; }                 /// Not mapped to DB now
+		public virtual bool RsltsPrinted { get; set; }
+		public virtual IList<TestData> Tests { get; set; }
+		public virtual IList<WaterMeter> WaterMeters { get; set; }
+		public virtual IList<TestRslt> TestRslts { get; set; }
+		public virtual bool Compound { get; set; }					/// Not mapped to DB now
+        public virtual bool HeatMeter { get; set; }					/// Not mapped to DB now
 
         public virtual IList<TestData> RegularTests()
         {
@@ -118,54 +117,8 @@ namespace Results.Entities
             ProtocolTitle = string.Empty;
             ProtocolTitle = string.Empty;
             Remark = string.Empty;
-            RealDensity = Config.Data.RealDensity;
-            AtTemperature = Config.Data.AtTemperature;
-            Buoyancy = Config.Data.Buoyancy;
 		}
 
-        /// <summary>
-        /// Copy constructor, copies all except of Id.
-        /// Lists Tests, WaterMeters and TestRslts are empty. Have to be copied elwhere.
-        /// </summary>
-        public Batch(Batch oriBatch)
-        {
-            BatchNr              = oriBatch.BatchNr;
-            ProgramVersion       = oriBatch.ProgramVersion;
-            TestBenchId          = oriBatch.TestBenchId;
-            TestBenchName        = oriBatch.TestBenchName;
-            Address1             = oriBatch.Address1;
-            Address2             = oriBatch.Address2;
-            Address3             = oriBatch.Address3;
-            Address4             = oriBatch.Address4;
-            Address5             = oriBatch.Address5;
-            UserName             = oriBatch.UserName;
-            UserNumber           = oriBatch.UserNumber;
-            ProcedureName        = oriBatch.ProcedureName;
-            IsRemoteProcedure    = oriBatch.IsRemoteProcedure;
-            ProcedureDescription = oriBatch.ProcedureDescription;
-            ProcedureRevision    = oriBatch.ProcedureRevision;
-            WatermetersStr       = oriBatch.WatermetersStr;
-            ProtocolTitle        = oriBatch.ProtocolTitle;
-            Remark               = oriBatch.Remark;
-            RealDensity          = oriBatch.RealDensity;
-            AtTemperature        = oriBatch.AtTemperature;
-            Buoyancy             = oriBatch.Buoyancy;
-            Counter6             = oriBatch.Counter6;
-            Counter7             = oriBatch.Counter7;
-            Counter8             = oriBatch.Counter8;
-            Counter9             = oriBatch.Counter9;
-            Counter10            = oriBatch.Counter10;
-            StartTime            = oriBatch.StartTime;
-            EndTime              = oriBatch.EndTime;
-            Dirty                = oriBatch.Dirty;
-            RsltsSent            = oriBatch.RsltsSent;
-            RsltsPrinted         = oriBatch.RsltsPrinted;
-
-            Tests       = new List<TestData>();
-            WaterMeters = new List<WaterMeter>();
-            TestRslts   = new List<TestRslt>();
-        }
-
         public virtual int PassedMetersCount()
         {
             int count = 0;
@@ -258,7 +211,7 @@ namespace Results.Entities
         {
             for (int i = 0; i < TestRslts.Count; i++)
             {
-                if (TestRslts[i].Publish() == Publish.Always)
+                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
                     return TestRslts[i].AmbTempStart;
             }
             return 0;
@@ -267,7 +220,7 @@ namespace Results.Entities
         {
             for (int i = 0; i < TestRslts.Count; i++)
             {
-                if (TestRslts[i].Publish() == Publish.Always)
+                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
                     return TestRslts[i].AmbPressStart;
             }
             return 0;
@@ -276,7 +229,7 @@ namespace Results.Entities
         {
             for (int i = 0; i < TestRslts.Count; i++)
             {
-                if (TestRslts[i].Publish() == Publish.Always)
+                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
                     return TestRslts[i].AmbHumiStart;
             }
             return 0;
@@ -286,7 +239,7 @@ namespace Results.Entities
         {
             for (int i = TestRslts.Count - 1; i >= 0; i++)
             {
-                if (TestRslts[i].Publish() == Publish.Always)
+                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
                     return TestRslts[i].AmbTempEnd;
             }
             return 0;
@@ -295,7 +248,7 @@ namespace Results.Entities
         {
             for (int i = TestRslts.Count - 1; i >= 0; i++)
             {
-                if (TestRslts[i].Publish() == Publish.Always)
+                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
                     return TestRslts[i].AmbPressEnd;
             }
             return 0;
@@ -304,12 +257,30 @@ namespace Results.Entities
         {
             for (int i = TestRslts.Count - 1; i >= 0; i++)
             {
-                if (TestRslts[i].Publish() == Publish.Always)
+                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
                     return TestRslts[i].AmbHumiEnd;
             }
             return 0;
         }
 
+        public virtual double Buoyancy()
+        {
+            double timeSum = 0;
+            double sum = 0;
+
+            foreach (var tr in TestRslts)
+            {
+                if (tr.TestData.Evaluate && tr.TestDone)
+                {
+                    double duration = (tr.EndTime - tr.StartTime).TotalSeconds;
+                    timeSum += duration;
+                    sum += (tr.Buoyancy * duration);
+                }
+            }
+
+            return (timeSum == 0) ? 0 : (sum / timeSum);
+        }
+
 		public virtual TestRslt GetTestRslt(string name, int part)
 		{
 			foreach (var tr in TestRslts)
@@ -326,10 +297,10 @@ namespace Results.Entities
 
 		public virtual string ToString(int i)
 		{
-            return string.Format("Batch: BatchNr={0} ProgramVersion={1} TestBenchId={2} UserName={3} UserNumber={4} ProcedureName={5}{6} ProcRev={7} ProtocolTitle={8} Remark={9} RealDensity={10} AtTemperature={11} Buoyancy={12} StartTime={13} EndTime={14} Dirty={15} RsltsSent={16} RsltsPrinted={17}",
+            return string.Format("Batch: BatchNr={0} ProgramVersion={1} TestBenchId={2} UserName={3} UserNumber={4} ProcedureName={5}{6} ProcRev={7} ProtocolTitle={8} Remark={9} DensityCorr={10} Custom2={11} Custom3={12} StartTime={13} EndTime={14} Dirty={15} RsltsSent={16} RsltsPrinted={17}",
                                 BatchNr, ProgramVersion, TestBenchId, UserName, UserNumber,
 								ProcedureName, (IsRemoteProcedure ? "(R)" : ""), ProcedureRevision,
-                                ProtocolTitle, Remark, RealDensity, AtTemperature, Buoyancy,
+                                ProtocolTitle, Remark, DensityCorr, Custom2, Custom3,
                                 StartTime, EndTime, Dirty, RsltsSent, RsltsPrinted);
 		}
 
@@ -354,9 +325,9 @@ namespace Results.Entities
             writer.Write((WatermetersStr != null) ? WatermetersStr : string.Empty);
             writer.Write((ProtocolTitle != null) ? ProtocolTitle : string.Empty);
             writer.Write((Remark != null) ? Remark : string.Empty);
-            writer.Write(RealDensity);
-            writer.Write(AtTemperature);
-            writer.Write(Buoyancy);
+            writer.Write(DensityCorr);
+            writer.Write(Custom2);
+            writer.Write(Custom3);
             writer.Write(Counter6);
             writer.Write(Counter7);
             writer.Write(Counter8);
@@ -421,9 +392,9 @@ namespace Results.Entities
             WatermetersStr = reader.ReadString();
             ProtocolTitle = reader.ReadString();
             Remark = reader.ReadString();
-            RealDensity = reader.ReadDouble();
-            AtTemperature = reader.ReadDouble();
-            Buoyancy = reader.ReadDouble();
+            DensityCorr = reader.ReadInt32();
+            Custom2 = reader.ReadInt32();
+            Custom3 = reader.ReadInt32();
             Counter6 = reader.ReadInt32();
             Counter7 = reader.ReadInt32();
             Counter8 = reader.ReadInt32();