Reconfigured for FLEX Chennai - Managed Oracle client v.19

Common/Common.csproj

@@ -42,6 +42,8 @@
   </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">

Common/Enums.cs

@@ -1,11 +1,11 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.Reflection;
 
-namespace Config.Entities
+namespace Common
 {
     /// <summary>
     /// Helper class to assign descriptions to enum values
@@ -38,6 +38,115 @@ namespace Config.Entities
         }
     }
 
+    /// <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>
@@ -52,28 +161,48 @@ namespace Config.Entities
         InvokeCfgChange = 0x20,	/// Invoke CfgChange handler of the component 
     }
 
-    public enum RemoteDBUse
+    /// <summary>
+    /// Event severity
+    /// </summary>
+    public enum Severity
     {
-        [Description("Local DB only")]          LocalDBOnly,
-        [Description("Remote DB only")]         RemoteDBOnly,
-        [Description("Both DB-s, local 1st")]   BothDBsLocalFirst,
-        [Description("Both DB-s, remote 1st")]  BothDBsRemoteFirst,
+        Undefined,
+        Notification,
+        Warning,
+        Error,
+        FatalError,
         Count
     }
 
-    /// <summary>
-    /// Contains a procedure name and a database specification (local/remote).
-    /// </summary>
-    public class ProcedureInfo
+    public enum EventClass
     {
-        public readonly string Name;
-        public readonly bool IsRemote;
+        Undefined,
+        EquipmentHW,
+        Metrology,
+        TestingProcess,
+        BadResults,
+        ComputerResources,
+        Network,
+        Other,
+        Count
+    }
 
-        public ProcedureInfo(string name, bool isRemote)
-        {
-            Name = name;
-            IsRemote = isRemote;
-        }
+    public enum SubscriberGroup : long
+    {
+        None = 0,
+        Metrology = 1,
+        Maintenance = 2,
+        Production = 4,
+        Management = 8,
+        Finish = 16,
+    }
+
+    public enum EViewerOption
+    {
+        Undefined,
+        AllEvents,
+        RecentEvents,
+        UnreadEvents,
     }
 
     public enum ProcedureState
@@ -424,7 +553,7 @@ namespace Config.Entities
         [Description("Fehler")]         FailureDuringOperation,	/// Failure during operation -> disabled 
         [Description("Aus")]            Off,					/// The component is off
         [Description("Aufzeichnen")]    Record,
-        [Description("Reply")]          Reply,
+        [Description("Abspielen")]      Replay,
         [Description("Simuliert")]      Simulate,				/// Test bench simulation, this mode does not require any hardware
         [Description("Geerbt")]         Inherit,
 #elif LANG_FR
@@ -435,7 +564,7 @@ namespace Config.Entities
         [Description("Erreur d'exécution")]                 FailureDuringOperation,
         [Description("Éteindre")]                           Off,
         [Description("Record")]                             Record,
-        [Description("Répondre")]                           Reply,
+        [Description("Répondre")]                           Replay,
         [Description("Simuler")]                            Simulate,
         [Description("Hériter")]                            Inherit,
 #else
@@ -446,7 +575,7 @@ namespace Config.Entities
         [Description("Run-time error")] FailureDuringOperation,	/// Failure during operation -> disabled 
         [Description("Off")]            Off,					/// The component is off
         [Description("Record")]         Record,
-        [Description("Reply")]          Reply,
+        [Description("Replay")]         Replay,
         [Description("Simulate")]       Simulate,				/// Test bench simulation, this mode does not require any hardware
         [Description("Inherit")]        Inherit,
 #endif
@@ -584,15 +713,15 @@ namespace Config.Entities
 
     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),
@@ -648,4 +777,44 @@ namespace Config.Entities
         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
 }

Common/Iperl/OptoTelegramRaw.cs

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

Common/StatisticalMetrics.cs

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

Common/Utils.cs

@@ -2,10 +2,7 @@
 /// Copyright (c) 2021 Sensus Slovensko a.s.
 ///
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.IO.Ports;
 
 namespace Common
 {
@@ -18,45 +15,32 @@ namespace Common
             return string.Format("{0} ({1}/{2})", name, repetitionNr, repeats);
         }
 
-        public static void CalculateFeatureVector(Iperl.OptoTelegramRaw[] optoData, int optoDataCount, int startIx, int endIx, ref float[] x)
+        public static Parity GetParity(string str, Parity defaultParity = Parity.None)
         {
-            if (startIx < 0 || endIx >= optoDataCount || startIx >= endIx) return;
+            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;
+        }
 
-            int n = 0;
-            Int64 sumFlow = 0;
-            Int64 sumFlow2 = 0;
-            Int64 sumEmf = 0;
-            Int64 sumEmf2 = 0;
-            Int64 sumMagF = 0;
-            Int64 sumMagF2 = 0;
-            Int64 sumImp = 0;
-            Int64 sumImp2 = 0;
+        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;
+        }
 
-            for (int ix = startIx; ix <= endIx; ix++)
-            {
-                if (optoData[ix].Flags == Iperl.OptoTelegramFlags.OK ||
-                    optoData[ix].Flags == Iperl.OptoTelegramFlags.OK_TestStart ||
-                    optoData[ix].Flags == Iperl.OptoTelegramFlags.OK_TestEnd)
-                {
-                    n++;
-                    sumFlow += optoData[ix].FlowRaw;
-                    sumFlow2 += ((int)optoData[ix].FlowRaw * (int)optoData[ix].FlowRaw);
-                    sumEmf += (int)optoData[ix].EmfRaw;
-                    sumEmf2 += ((Int64)optoData[ix].EmfRaw * (Int64)optoData[ix].EmfRaw);
-                    sumMagF += optoData[ix].MagneticFieldRaw;
-                    sumMagF2 += ((int)optoData[ix].MagneticFieldRaw * (int)optoData[ix].MagneticFieldRaw);
-                    sumImp += optoData[ix].Impedance;
-                    sumImp2 += ((int)optoData[ix].Impedance * (int)optoData[ix].Impedance);
-                }
-            }
-
-            if (n >= 2)
-            {
-                if (x.Length > 0) x[0] = ((float)sumFlow2 - (float)sumFlow * (float)sumFlow / n) / (n - 1);
-                if (x.Length > 1) x[1] = ((float)sumEmf2  - (float)sumEmf  * (float)sumEmf  / n) / (n - 1);
-                if (x.Length > 2) x[2] = ((float)sumMagF2 - (float)sumMagF * (float)sumMagF / n) / (n - 1);
-                if (x.Length > 3) x[3] = ((float)sumImp2  - (float)sumImp  * (float)sumImp  / n) / (n - 1);
-            }
+        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;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_IPERL_NEW;IPERL;ORACLE_DB</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;TURA_IPERL_NEW;IPERL;ORACLE_DB</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -75,7 +75,6 @@
     <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" />
@@ -83,7 +82,6 @@
     <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" />

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;
@@ -88,11 +88,6 @@ 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(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);
+			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);
         }
 
         public object Clone()

Config/Entities/Component.cs

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

Config/Entities/Group.cs

@@ -9,7 +9,7 @@ namespace Config.Entities
     public class Group
     {
         public virtual int Id { get; protected set; }
-        public virtual Users.Entities.GID GID { get; set; }
+        public virtual Common.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(Users.Entities.GID gid)
+        public Group(Common.GID gid)
             : this()
         {
 			GID = gid;

Config/Entities/IParamsProvider.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using Common;
 
 namespace Config.Entities
 {

Config/Entities/IperlEnums.cs

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

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

Config/Entities/Procedure.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using Common;
 
 namespace Config.Entities
 {
@@ -78,7 +79,7 @@ namespace Config.Entities
 			CreationTime = DateTime.Now;
 			LastChgUser = CreationUser;
 			LastChgTime = CreationTime;
-			MetersKind = Entities.MetersKind.Single;
+			MetersKind = MetersKind.Single;
 			Watermeters = string.Empty;
 			Description = string.Empty;
 			LongDescription = string.Empty;

Config/Entities/Profile.cs

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

Config/Entities/Test.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using Common;
 
 namespace Config.Entities
 {
@@ -25,7 +26,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 TstTime { get; set; }			/// Test time (estimate) in [s]
+        public virtual float TestTime { get; set; }			/// Test time (estimate) in [s]
         public virtual string Method { get; set; }
         public virtual float ErrLimLo { get; set; }			/// in [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
         public virtual float ErrLimHi { get; set; }			/// in [%] usually > 0, in case of heat meters: -Qn in m3/h
@@ -44,7 +45,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 TolerRed { get; set; }		///  = Filter
+		public virtual double ShortPulses { get; set; }		///  = Filter
         public virtual string RedType { get; set; }
 		public virtual string FeedingPath { get; set; }
 		public virtual string BenchPath { get; set; }
@@ -53,9 +54,9 @@ namespace Config.Entities
 #if HEAT_METERS
         public virtual string HeatMetersPath { get; set; }
 #endif
-        public virtual string RelTransBefore { get; set; }
-		public virtual string RelTransBetween { get; set; }
-		public virtual string TransitionAfter { get; set; }
+        public virtual string TransBefore { get; set; }
+		public virtual string TransBetween { get; set; }
+		public virtual string TransAfter { get; set; }
 
         public virtual bool IsOuterLoopStart { get; set; }  /// Not mapped to database
         public virtual bool IsOuterLoopEnd { get; set; }    /// Not mapped to database
@@ -75,7 +76,7 @@ namespace Config.Entities
 			///
             Part = 0;
             Profile = TestProfile.UserDefined;
-            Publish = (sbyte)Config.Entities.Publish.Always;
+            Publish = (sbyte)Common.Publish.Always;
 			DoEvaluate = true;
 			Repeats = 1;
 			DoDraining = false;
@@ -94,10 +95,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
-            TolerRed = 0;					/// = Filter parameter
-			RelTransBefore  = string.Empty;
-			RelTransBetween = string.Empty;
-			TransitionAfter = string.Empty;
+            ShortPulses = 0;					/// = Filter parameter
+			TransBefore  = string.Empty;
+			TransBetween = string.Empty;
+			TransAfter = string.Empty;
 		}
 
 		public Test(string name, int itemNr, Procedure procedure)
@@ -137,7 +138,7 @@ namespace Config.Entities
 			result.Qfrom = Qfrom;
             result.Qto = Qto;
 			result.Volume = Volume;
-			result.TstTime = TstTime;
+			result.TestTime = TestTime;
 			result.Method = Method;
 			result.ErrLimLo = ErrLimLo;
 			result.ErrLimHi = ErrLimHi;
@@ -156,7 +157,7 @@ namespace Config.Entities
             result.TimeFlow2Mass = TimeFlow2Mass;
             result.TimePump2StartV = TimePump2StartV;
 			result.TimeStop2Mass = TimeStop2Mass;
-			result.TolerRed = TolerRed;
+			result.ShortPulses = ShortPulses;
             result.RedType = RedType;
 			result.FeedingPath = FeedingPath;
 			result.BenchPath = BenchPath;
@@ -165,9 +166,9 @@ namespace Config.Entities
 #if HEAT_METERS
             result.HeatMetersPath = HeatMetersPath;
 #endif
-			result.RelTransBefore = RelTransBefore;
-			result.RelTransBetween = RelTransBetween;
-			result.TransitionAfter = TransitionAfter;
+			result.TransBefore = TransBefore;
+			result.TransBetween = TransBetween;
+			result.TransAfter = TransAfter;
 			foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone()); }
 
             return result;
@@ -185,7 +186,7 @@ namespace Config.Entities
             output.WriteLine(Qfrom.ToString(ci));
             output.WriteLine(Qto.ToString(ci));
             output.WriteLine(Volume.ToString(ci));
-            output.WriteLine(TstTime.ToString(ci));
+            output.WriteLine(TestTime.ToString(ci));
             output.WriteLine(Method);
             output.WriteLine(ErrLimLo.ToString(ci));
             output.WriteLine(ErrLimHi.ToString(ci));
@@ -208,10 +209,10 @@ namespace Config.Entities
             output.WriteLine(BenchPath);
             output.WriteLine(OutputPath);
             output.WriteLine(MetersPath);
-            output.WriteLine(RelTransBefore);
-            output.WriteLine(RelTransBetween);
+            output.WriteLine(TransBefore);
+            output.WriteLine(TransBetween);
             output.WriteLine(Profile);
-            output.WriteLine(TransitionAfter);
+            output.WriteLine(TransAfter);
 
             foreach (var prms in MoreParams) { prms.Export(output); }
             output.WriteLine();
@@ -236,7 +237,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.TstTime = float.Parse(input.ReadLine(), ci);
+			tst.TestTime = float.Parse(input.ReadLine(), ci);
             tst.Method = input.ReadLine();
 			tst.ErrLimLo = float.Parse(input.ReadLine(), ci);
 			tst.ErrLimHi = float.Parse(input.ReadLine(), ci);
@@ -259,13 +260,13 @@ namespace Config.Entities
             tst.BenchPath = input.ReadLine();
             tst.OutputPath = input.ReadLine();
             tst.MetersPath = input.ReadLine();
-            tst.RelTransBefore = input.ReadLine();
-            tst.RelTransBetween = input.ReadLine();
+            tst.TransBefore = input.ReadLine();
+            tst.TransBetween = input.ReadLine();
             string line = input.ReadLine();
             tst.Profile = line.Equals(TestProfile.ProtectedHeatMeter.ToString()) ? TestProfile.ProtectedHeatMeter
                           : line.Equals(TestProfile.UserDefinedHeatMeter.ToString()) ? TestProfile.UserDefinedHeatMeter
                           : line.Equals(TestProfile.Protected.ToString()) ? TestProfile.Protected : TestProfile.UserDefined;  /// UserDefined is the default
-            tst.TransitionAfter = input.ReadLine();
+            tst.TransAfter = input.ReadLine();
 
             while (true)
             {
@@ -298,7 +299,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 != TstTime.ToString(ci))            { diff.AppendFormat(fmt, "TstTime", TstTime.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != TestTime.ToString(ci))           { diff.AppendFormat(fmt, "TstTime", TestTime.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Method)                          { diff.AppendFormat(fmt, "Method", Method, ln); };
             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); };
@@ -321,10 +322,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 != RelTransBefore)                  { diff.AppendFormat(fmt, "RelTransBefore", RelTransBefore, ln); };
-            ln = inp.ReadLine(); if (ln != RelTransBetween)                 { diff.AppendFormat(fmt, "RelTransBetween", RelTransBetween, 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 != TransitionAfter)                 { diff.AppendFormat(fmt, "TransitionAfter", TransitionAfter, ln); };
+            ln = inp.ReadLine(); if (ln != TransAfter)                 { diff.AppendFormat(fmt, "TransitionAfter", TransAfter, ln); };
 
             return diff.ToString();
         }
@@ -425,29 +426,6 @@ 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/FluentCommon.cs

@@ -14,45 +14,11 @@ 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>
-        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)
+		public static ISessionFactory CreateSessionFactory(Common.DBKind database, Common.DBType dbType, string connectionString, bool createDB)
         {
 			try
 			{
@@ -61,10 +27,10 @@ namespace Config
                 switch (dbType)
 				{
 					default:
-                    case Users.Entities.DBType.SQLite:
+                    case Common.DBType.SQLite:
 						cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
                         break;
-                    case Users.Entities.DBType.MySql:
+                    case Common.DBType.MySql:
                         cfg = cfg.Database(MySQLConfiguration.Standard.ConnectionString(connectionString));
                         break;
 				}
@@ -72,11 +38,11 @@ namespace Config
                 switch (database)
                 {
                     default:
-					case Users.Entities.DBKind.Config:
-                    case Users.Entities.DBKind.RemoteConfig:
+					case Common.DBKind.Config:
+                    case Common.DBKind.RemoteConfig:
                         cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<Data>());
                         break;
-                    case Users.Entities.DBKind.Results:
+                    case Common.DBKind.Results:
                         cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<Data>());
                         break;
                 }
@@ -116,17 +82,6 @@ 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'.
@@ -134,9 +89,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(Users.Entities.DBType dbType, string connectionString)
+		public static bool CreateEmptyConfigDB(Common.DBType dbType, string connectionString)
 		{
-			ISessionFactory sessionFactory = CreateSessionFactory(Users.Entities.DBKind.Config, dbType, connectionString, true);
+			ISessionFactory sessionFactory = CreateSessionFactory(Common.DBKind.Config, dbType, connectionString, true);
 			if (sessionFactory == null) return false;
 
             /// Populate the database
@@ -158,23 +113,23 @@ namespace Config
                     ///
                     /// Prepare all groups, add some of them to admin
                     ///
-                    for (Users.Entities.GID gid = 0; gid < Users.Entities.GID.NrOfGroups; gid++)
+                    for (Common.GID gid = 0; gid < Common.GID.NrOfGroups; gid++)
                     {
                         Config.Entities.Group group = new Config.Entities.Group(gid);
                         switch (gid)
                         {
-                            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:
+                            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:
 #if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
-                            case Users.Entities.GID.TraceabilityManagement:
+                            case Common.GID.TraceabilityManagement:
 #elif KEMPNO_50 || KRAKOW_50 || TORUN_50 || WARSAW_END
-                            case Users.Entities.GID.MetrologicalAuthority:
-                            case Users.Entities.GID.WaterMeterAuthority:
+                            case Common.GID.MetrologicalAuthority:
+                            case Common.GID.WaterMeterAuthority:
 #endif
                                 admin.AddGroup(group);
                                 session.SaveOrUpdate(group);    /// Save this group

Config/Mappings/TestMap.cs

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

Config/Units.cs

@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Reflection;
+using Common;
 using Config.Entities;
 
 namespace Config

Config/Utils.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Common;
 
 namespace Config
 {
@@ -147,7 +148,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, Entities.Medium medium = Entities.Medium.ColdWater, double Qdflt = 0)
+        public static double GetQ1Qmin(double Qn, string metroClass, Medium medium = Medium.ColdWater, double Qdflt = 0)
         {
             if (string.IsNullOrEmpty(metroClass)) return Qdflt;
 
@@ -158,7 +159,7 @@ namespace Config
             }
             else
             {
-                if (medium == Entities.Medium.HotWater)
+                if (medium == Medium.HotWater)
                 {
                     switch (metroClass)
                     {
@@ -192,7 +193,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, Entities.Medium medium = Entities.Medium.ColdWater, double Qdflt = 0)
+        public static double GetQ2Qt(double Qn, string metroClass, Medium medium = Medium.ColdWater, double Qdflt = 0)
         {
             if (string.IsNullOrEmpty(metroClass)) return Qdflt;
 
@@ -202,7 +203,7 @@ namespace Config
                 return 1.6 * Qn / (double)metroClassRatio;
             }
 
-            if (medium == Entities.Medium.HotWater)
+            if (medium == Medium.HotWater)
             {
                 switch (metroClass)
                 {
@@ -235,7 +236,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, Entities.Medium medium = Entities.Medium.ColdWater, double Qdflt = 0)
+        public static double GetQ4Qmax(double Qn, string metroClass, Medium medium = Medium.ColdWater, double Qdflt = 0)
         {
             if (string.IsNullOrEmpty(metroClass)) return Qdflt;
 

Decrypt/Decrypt.csproj

@@ -16,7 +16,7 @@
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</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>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</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>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</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>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
@@ -90,6 +90,10 @@
     </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,12 +2,13 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Text;
 using System.Threading;
-using System.Windows.Forms;
-using TBF.BenchControl;
-using TBF.BenchControl.Generic;
 using System.Xml.Serialization;
+using System.Windows.Forms;
+using Common;
+using TBF.Rig;
+using TBF.Rig.Generic;
+using TBF.UI.Bench.Components;
 
 
 namespace DeviceTest
@@ -79,7 +80,7 @@ namespace DeviceTest
                 compClasses.Add(componentFactory.ClassName);
             }
 
-			tbfComponents = new List<TBF.BenchControl.Generic.IComponent>();
+			tbfComponents = new List<TBF.Rig.Generic.IComponent>();
 			tbfDevices = new List<IDevice>();
 		}
 
@@ -108,8 +109,8 @@ namespace DeviceTest
 						config.Name = Program.LocalSettings.ParentName;
 						config.ParentName = string.Empty;
 						config.ItemNr = 0;
-						config.DebugLevel = Config.Entities.DebugMode.Normal;
-						config.LogLevel = Config.Entities.LogLevel.Debug;
+						config.DebugLevel = DebugMode.Normal;
+						config.LogLevel = LogLevel.Debug;
 						config.Corrections = null;
 						config.Factory = parentFactory;
 						parentCfg = config;
@@ -141,8 +142,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 = Config.Entities.DebugMode.Normal;
-						config.LogLevel = Config.Entities.LogLevel.Debug;
+						config.DebugLevel = DebugMode.Normal;
+						config.LogLevel = LogLevel.Debug;
 						config.Corrections = null;
 						config.Factory = component1Factory;
 						component1Cfg = config;
@@ -176,8 +177,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 = Config.Entities.DebugMode.Normal;
-						config.LogLevel = Config.Entities.LogLevel.Debug;
+						config.DebugLevel = DebugMode.Normal;
+						config.LogLevel = LogLevel.Debug;
 						config.Corrections = null;
 						config.Factory = component2Factory;
 						component2Cfg = config;
@@ -211,8 +212,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 = Config.Entities.DebugMode.Normal;
-						config.LogLevel = Config.Entities.LogLevel.Debug;
+						config.DebugLevel = DebugMode.Normal;
+						config.LogLevel = LogLevel.Debug;
 						config.Corrections = null;
 						config.Factory = component3Factory;
 						component3Cfg = config;
@@ -383,7 +384,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)
 				{
@@ -421,13 +422,13 @@ namespace DeviceTest
 			{
 				parentCfg = parentFactory.DefaultConfig();
 			}
-			IComponentCfgCtrl cfgControl = parentCfg.GetControl();
+            ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+            cfgForm.CmpntEntities = new List<Config.Entities.Component>();
+
+            IComponentCfgCtrl cfgControl = parentCfg.GetControl(cfgForm.CmpntEntities);
 			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();
@@ -450,17 +451,17 @@ namespace DeviceTest
 			{
 				component1Cfg = component1Factory.DefaultConfig();
 			}
-			IComponentCfgCtrl cfgControl = component1Cfg.GetControl();
-			cfgControl.Config = component1Cfg;
-			cfgControl.Config.ItemNr = 1;
-
 			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
 			///
-			IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
+			var compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
-			cfgForm.TbfComponents = compEntities;
+			cfgForm.CmpntEntities = compEntities;
 
-			cfgForm.ComponentCfgCtrl = cfgControl;
+            IComponentCfgCtrl cfgControl = component1Cfg.GetControl(compEntities);
+            cfgControl.Config = component1Cfg;
+            cfgControl.Config.ItemNr = 1;
+
+            cfgForm.ComponentCfgCtrl = cfgControl;
 			cfgForm.UnlockAfterStart = true;
 			DialogResult dr = cfgForm.ShowDialog();
 			if (dr != DialogResult.OK) return;
@@ -484,18 +485,18 @@ namespace DeviceTest
 			{
 				component2Cfg = component2Factory.DefaultConfig();
 			}
-			IComponentCfgCtrl cfgControl = component2Cfg.GetControl();
-			cfgControl.Config = component2Cfg;
-			cfgControl.Config.ItemNr = 1;
-
 			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
 			///
-			IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
+			var 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.TbfComponents = compEntities;
+			cfgForm.CmpntEntities = compEntities;
 
-			cfgForm.ComponentCfgCtrl = cfgControl;
+            IComponentCfgCtrl cfgControl = component2Cfg.GetControl(compEntities);
+            cfgControl.Config = component2Cfg;
+            cfgControl.Config.ItemNr = 1;
+
+            cfgForm.ComponentCfgCtrl = cfgControl;
 			cfgForm.UnlockAfterStart = true;
 			DialogResult dr = cfgForm.ShowDialog();
 			if (dr != DialogResult.OK) return;
@@ -519,19 +520,19 @@ namespace DeviceTest
 			{
 				component3Cfg = component3Factory.DefaultConfig();
 			}
-			IComponentCfgCtrl cfgControl = component3Cfg.GetControl();
-			cfgControl.Config = component3Cfg;
-			cfgControl.Config.ItemNr = 1;
-
 			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
 			///
-			IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
+			var 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.TbfComponents = compEntities;
+			cfgForm.CmpntEntities = compEntities;
 
-			cfgForm.ComponentCfgCtrl = cfgControl;
+            IComponentCfgCtrl cfgControl = component3Cfg.GetControl(compEntities);
+            cfgControl.Config = component3Cfg;
+            cfgControl.Config.ItemNr = 1;
+
+            cfgForm.ComponentCfgCtrl = cfgControl;
 			cfgForm.UnlockAfterStart = true;
 			DialogResult dr = cfgForm.ShowDialog();
 			if (dr != DialogResult.OK) return;
@@ -568,7 +569,7 @@ namespace DeviceTest
 			{
 				if (parentFactory != null && parentCfg != null)
 				{
-					TBF.BenchControl.Generic.IComponent component = parentFactory.GetComponent(parentCfg, tbfComponents);
+					TBF.Rig.Generic.IComponent component = parentFactory.GetComponent(parentCfg, tbfComponents);
 					tbfComponents.Add(component);
 					IDevice dev = component as IDevice;
 					if (dev != null)
@@ -580,7 +581,7 @@ namespace DeviceTest
 				}
 				if (component1Factory != null && component1Cfg != null)
 				{
-					TBF.BenchControl.Generic.IComponent component = component1Factory.GetComponent(component1Cfg, tbfComponents);
+					TBF.Rig.Generic.IComponent component = component1Factory.GetComponent(component1Cfg, tbfComponents);
 					tbfComponents.Add(component);
 					tbfComponent1forOp = component;
 					IDevice dev = component as IDevice;
@@ -593,7 +594,7 @@ namespace DeviceTest
 				}
 				if (component2Factory != null && component2Cfg != null)
 				{
-					TBF.BenchControl.Generic.IComponent component2 = component2Factory.GetComponent(component2Cfg, tbfComponents);
+					TBF.Rig.Generic.IComponent component2 = component2Factory.GetComponent(component2Cfg, tbfComponents);
 					tbfComponents.Add(component2);
 					tbfComponent2forOp = component2;
 					IDevice dev = component2 as IDevice;
@@ -606,7 +607,7 @@ namespace DeviceTest
 				}
 				if (component3Factory != null && component3Cfg != null)
 				{
-					TBF.BenchControl.Generic.IComponent component3 = component3Factory.GetComponent(component3Cfg, tbfComponents);
+					TBF.Rig.Generic.IComponent component3 = component3Factory.GetComponent(component3Cfg, tbfComponents);
 					tbfComponents.Add(component3);
 					tbfComponent3forOp = component3;
 					IDevice dev = component3 as IDevice;
@@ -663,120 +664,120 @@ namespace DeviceTest
 			int previousOperation = 0;
 
 
-			if (tbfComponent1forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
+			if (tbfComponent1forOp is TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter)
 			{
-				operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
+				operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
 			}
-			else if (tbfComponent1forOp is TBF.BenchControl.Network.Camera.CLP1611.Camera)
+			else if (tbfComponent1forOp is TBF.Rig.Network.Camera.CLP1611.Camera)
 			{
-				operation1 = (tbfComponent1forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
-				operation2 = (tbfComponent1forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
+				operation1 = (tbfComponent1forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
+				operation2 = (tbfComponent1forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
 			}
-			else if (tbfComponent1forOp is TBF.BenchControl.Network.Camera.Roi.Roi)
+			else if (tbfComponent1forOp is TBF.Rig.Network.Camera.Roi.Roi)
 			{
-				operation1 = (tbfComponent1forOp as TBF.BenchControl.Network.Camera.Roi.Roi).RoiDetectionOp();
+				operation1 = (tbfComponent1forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent1forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
+			else if (tbfComponent1forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
 			{
-				operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation2 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
-            else if (tbfComponent1forOp is TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter)
+            else if (tbfComponent1forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
-                operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
-                operation2 = (tbfComponent1forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
+                operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
+                operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
             }
-            else if (tbfComponent1forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent1forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
 			{
-				//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);
+				//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);
 			}
-            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent3forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
             {
-                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);
+                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);
             }
 
 
-			if (tbfComponent2forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
+			if (tbfComponent2forOp is TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter)
 			{
-				operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
+				operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
 			}
-			else if (tbfComponent2forOp is TBF.BenchControl.Network.Camera.CLP1611.Camera)
+			else if (tbfComponent2forOp is TBF.Rig.Network.Camera.CLP1611.Camera)
 			{
-				operation21 = (tbfComponent2forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
-				operation22 = (tbfComponent2forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
+				operation21 = (tbfComponent2forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
+				operation22 = (tbfComponent2forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
 			}
-			else if (tbfComponent2forOp is TBF.BenchControl.Network.Camera.Roi.Roi)
+			else if (tbfComponent2forOp is TBF.Rig.Network.Camera.Roi.Roi)
 			{
-				operation21 = (tbfComponent2forOp as TBF.BenchControl.Network.Camera.Roi.Roi).RoiDetectionOp();
+				operation21 = (tbfComponent2forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent2forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
+			else if (tbfComponent2forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
 			{
-				operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation22 = (tbfComponent2forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
-            else if (tbfComponent2forOp is TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter)
+            else if (tbfComponent2forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
-                operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
-                operation22 = (tbfComponent2forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
+                operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
+                operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
             }
-            else if (tbfComponent2forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent2forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
 			{
-				//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);
+				//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);
 			}
-            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent3forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
             {
-                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);
+                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);
             }
 
 
-			if (tbfComponent3forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
+			if (tbfComponent3forOp is TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter)
 			{
-				operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
+				operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
 			}
-			else if (tbfComponent3forOp is TBF.BenchControl.Network.Camera.CLP1611.Camera)
+			else if (tbfComponent3forOp is TBF.Rig.Network.Camera.CLP1611.Camera)
 			{
-				operation31 = (tbfComponent3forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
-				operation33 = (tbfComponent3forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
+				operation31 = (tbfComponent3forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
+				operation33 = (tbfComponent3forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
 			}
-			else if (tbfComponent3forOp is TBF.BenchControl.Network.Camera.Roi.Roi)
+			else if (tbfComponent3forOp is TBF.Rig.Network.Camera.Roi.Roi)
 			{
-				operation31 = (tbfComponent3forOp as TBF.BenchControl.Network.Camera.Roi.Roi).RoiDetectionOp();
+				operation31 = (tbfComponent3forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent3forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
+			else if (tbfComponent3forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
 			{
-				operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
-            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter)
+            else if (tbfComponent3forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
-                operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
-                operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
+                operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
+                operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
             }
-            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent3forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
 			{
-				//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);
+				//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);
 			}
-            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent3forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
             {
-                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);
+                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);
             }
 
 

Encrypt/Encrypt.csproj

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

EventViewer/EventViewerWnd.cs

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

Events/DB.cs

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

Events/Entities/Enums.cs

@@ -1,58 +0,0 @@
-///
-/// 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,6 +3,7 @@
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 
 namespace Events.Entities
 {

Events/Events.csproj

@@ -56,7 +56,6 @@
   </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" />
@@ -67,6 +66,12 @@
   <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,6 +3,7 @@
 ///
 using System;
 using System.Drawing;
+using Common;
 using Events.Entities;
 
 namespace Events

FeatureVectorCalculator/CalculatorWnd.Designer.cs

@@ -30,21 +30,46 @@
         {
             this.rawFileComboBox = new System.Windows.Forms.ComboBox();
             this.browseButton = new System.Windows.Forms.Button();
-            this.processButton = 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(29, 28);
+            this.rawFileComboBox.Location = new System.Drawing.Point(0, 0);
             this.rawFileComboBox.Name = "rawFileComboBox";
-            this.rawFileComboBox.Size = new System.Drawing.Size(715, 21);
+            this.rawFileComboBox.Size = new System.Drawing.Size(1040, 21);
             this.rawFileComboBox.TabIndex = 0;
             // 
             // browseButton
             // 
-            this.browseButton.Location = new System.Drawing.Point(769, 19);
+            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;
@@ -52,37 +77,184 @@
             this.browseButton.UseVisualStyleBackColor = true;
             this.browseButton.Click += new System.EventHandler(this.browseButton_Click);
             // 
-            // processButton
-            // 
-            this.processButton.Location = new System.Drawing.Point(29, 66);
-            this.processButton.Name = "processButton";
-            this.processButton.Size = new System.Drawing.Size(91, 46);
-            this.processButton.TabIndex = 2;
-            this.processButton.Text = "Process";
-            this.processButton.UseVisualStyleBackColor = true;
-            this.processButton.Click += new System.EventHandler(this.processButton_Click);
-            // 
             // resultsTextBox
             // 
-            this.resultsTextBox.Location = new System.Drawing.Point(29, 131);
+            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(715, 181);
+            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(859, 335);
-            this.Controls.Add(this.resultsTextBox);
-            this.Controls.Add(this.processButton);
-            this.Controls.Add(this.browseButton);
-            this.Controls.Add(this.rawFileComboBox);
+            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);
-            this.PerformLayout();
 
         }
 
@@ -90,8 +262,19 @@
 
         private System.Windows.Forms.ComboBox rawFileComboBox;
         private System.Windows.Forms.Button browseButton;
-        private System.Windows.Forms.Button processButton;
         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

@@ -4,13 +4,20 @@
 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;
@@ -27,63 +34,115 @@ namespace FeatureVectorCalculator
             }
         }
 
+        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();
-            var dr = ofd.ShowDialog();
-            rawFileComboBox.Text = ofd.FileName;
+
+            if (ofd.ShowDialog() == DialogResult.OK)
+            {
+                rawFileComboBox.Text = ofd.FileName;
+                ProcessRawDataFile(ofd.FileName);
+            }
         }
 
-        private void processButton_Click(object sender, EventArgs e)
+        void ProcessRawDataFile(string fileName)
         {
-            if (optoData == null) return;
-
             int counter = 0;
             int startIx = -1;
             int endIx = -1;
 
-            using (StreamReader reader = new StreamReader(rawFileComboBox.Text))
+            ClearOutput();
+
+            resultsTextBox.Text = string.Format("File name: {0}{1}", fileName, Environment.NewLine);
+
+            try
             {
-                string line;
-                while ((line = reader.ReadLine()) != null && counter < MaxOptoDataCount)
+                using (StreamReader reader = new StreamReader(fileName))
                 {
-                    int ix = line.IndexOf(" :\t");
-                    
-                    if (ix >= 0)
+                    string line;
+                    while ((line = reader.ReadLine()) != null && counter < MaxOptoDataCount)
                     {
-                        if (optoData[counter].UpdateFromString(line.Substring(ix + 3), counter, 0, ref volumeRawExtLast, ref timestampExtLast, true))
+                        int ix = line.IndexOf(" :\t");
+                        string[] items = line.Split('\t');
+
+                        if (items.Length > 18)
                         {
-                            if (line.EndsWith("####  start test  ####"))
+                            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))
                             {
-                                startIx = counter;
-                                optoData[counter].Flags = OptoTelegramFlags.OK_TestStart;
-                            }
-                            else if (line.EndsWith("####  end of test  ####"))
-                            {
-                                endIx = counter;
-                                optoData[counter].Flags = OptoTelegramFlags.OK_TestEnd;
+                                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;
+                        else
+                        {
+                            optoData[counter].Flags = OptoTelegramFlags.InvalidTelegram;
+                        }
+
+                        counter++;
                     }
 
-                    counter++;
+                    reader.Close();
                 }
-
-                reader.Close();
             }
-
-            float[] featureVector = new float[9];
-            Common.Utils.CalculateFeatureVector(optoData, counter, startIx, endIx, ref featureVector);
-
-            resultsTextBox.Clear();
-            for (int i = 0; i < 9; i++)
+            catch (Exception exc)
             {
-                resultsTextBox.Text += string.Format("X{0} = {1}\r\n", i + 1, featureVector[i]);
+                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/FeatureVectorCalculator.csproj

@@ -37,6 +37,7 @@
   <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" />
@@ -55,6 +56,7 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SignalChart.cs" />
     <EmbeddedResource Include="CalculatorWnd.resx">
       <DependentUpon>CalculatorWnd.cs</DependentUpon>
     </EmbeddedResource>

FeatureVectorCalculator/SignalChart.cs

@@ -0,0 +1,78 @@
+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/GemCard.csproj

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

RestClient/RestClient.csproj

@@ -20,7 +20,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</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>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

Results/BatchResults.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
+using Common;
 using Results.Entities;
 
 namespace Results
@@ -71,9 +72,9 @@ namespace Results
                     RealDensity = realDensity,
                     AtTemperature = atTemperature,
                     Buoyancy = buoyancy,
-                    Compound = (procedure.MetersKind == Config.Entities.MetersKind.Combined),
+                    Compound = (procedure.MetersKind == MetersKind.Combined),
 #if HEAT_METERS
-                    HeatMeter = (procedure.MetersKind == Config.Entities.MetersKind.HeatMeter),
+                    HeatMeter = (procedure.MetersKind == MetersKind.HeatMeter),
 #endif
                 };
 
@@ -120,20 +121,20 @@ namespace Results
                         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));
+                            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));
                         }
                         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));
+                            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, Config.Entities.CompoundMeterId.Single));
+                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, CompoundMeterId.Single));
                         }
                     }
 				}
@@ -172,7 +173,7 @@ namespace Results
 			return Batch.GetTestRslt(name, part);
 		}
 
-		public MeterTestRslt GetMeterTestRslt(string name, int wmNr0, Config.Entities.CompoundMeterId meterId)
+		public MeterTestRslt GetMeterTestRslt(string name, int wmNr0, 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 Users.Entities.DBType dbType;
+		private static Common.DBType dbType;
 		/// 
-		public static Users.Entities.DBType DbType
+		public static Common.DBType DbType
 		{
 			get { return dbType; }
 			set { dbType = value; SessionFactory = null; }
@@ -66,10 +66,10 @@ namespace Results
 			switch (dbType)
 			{
 				default:
-				case Users.Entities.DBType.MySql:
+				case Common.DBType.MySql:
                     cfg = cfg.Database(MySQLConfiguration.Standard.ConnectionString(connectionString));
                     break;
-                case Users.Entities.DBType.SQLite:
+                case Common.DBType.SQLite:
                     cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
                     break;
             }

Results/Entities/Batch.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Common;
 
 namespace Results.Entities
 {
@@ -257,7 +258,7 @@ namespace Results.Entities
         {
             for (int i = 0; i < TestRslts.Count; i++)
             {
-                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
+                if (TestRslts[i].Publish() == Publish.Always)
                     return TestRslts[i].AmbTempStart;
             }
             return 0;
@@ -266,7 +267,7 @@ namespace Results.Entities
         {
             for (int i = 0; i < TestRslts.Count; i++)
             {
-                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
+                if (TestRslts[i].Publish() == Publish.Always)
                     return TestRslts[i].AmbPressStart;
             }
             return 0;
@@ -275,7 +276,7 @@ namespace Results.Entities
         {
             for (int i = 0; i < TestRslts.Count; i++)
             {
-                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
+                if (TestRslts[i].Publish() == Publish.Always)
                     return TestRslts[i].AmbHumiStart;
             }
             return 0;
@@ -285,7 +286,7 @@ namespace Results.Entities
         {
             for (int i = TestRslts.Count - 1; i >= 0; i++)
             {
-                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
+                if (TestRslts[i].Publish() == Publish.Always)
                     return TestRslts[i].AmbTempEnd;
             }
             return 0;
@@ -294,7 +295,7 @@ namespace Results.Entities
         {
             for (int i = TestRslts.Count - 1; i >= 0; i++)
             {
-                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
+                if (TestRslts[i].Publish() == Publish.Always)
                     return TestRslts[i].AmbPressEnd;
             }
             return 0;
@@ -303,7 +304,7 @@ namespace Results.Entities
         {
             for (int i = TestRslts.Count - 1; i >= 0; i++)
             {
-                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
+                if (TestRslts[i].Publish() == Publish.Always)
                     return TestRslts[i].AmbHumiEnd;
             }
             return 0;

Results/Entities/MeterTestRslt.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Common;
 
 namespace Results.Entities
 {
@@ -87,23 +88,23 @@ namespace Results.Entities
 		public virtual double QRise()		  { return WaterMeter.QRise; }			/// [m3/h]
 		public virtual double QFall()		  { return WaterMeter.QFall; }			/// [m3/h]
 
-		public virtual bool                   Evaluate() { return TestData().Evaluate; }
-		public virtual Config.Entities.Publish Publish() { return (Config.Entities.Publish)TestData().Publish; }
+		public virtual bool   Evaluate()      { return TestData().Evaluate; }
+		public virtual Common.Publish Publish() { return (Publish)TestData().Publish; }
 
         public virtual WaterMeterData WaterMeterData()   { return WaterMeter.WaterMeterData; }
         public virtual Batch          Batch()            { return WaterMeter.Batch; }
 
 		public virtual bool IsPilotRslt()
 		{
-			return	(CompoundMeterId == (byte)Config.Entities.CompoundMeterId.Single) ||
-					(CompoundMeterId == (byte)Config.Entities.CompoundMeterId.Compound) ||
-					(CompoundMeterId == (byte)Config.Entities.CompoundMeterId.HeatMeterEnergy);
+			return	(CompoundMeterId == (byte)Common.CompoundMeterId.Single) ||
+					(CompoundMeterId == (byte)Common.CompoundMeterId.Compound) ||
+					(CompoundMeterId == (byte)Common.CompoundMeterId.HeatMeterEnergy);
 		}
 
-        public virtual bool IsPulses() { return (RegReaderType == (int)Config.Entities.RegisterReaderType.Pulses || RegReaderType == (int)Config.Entities.RegisterReaderType.Unknown); }
-        public virtual bool IsCamera() { return (RegReaderType == (int)Config.Entities.RegisterReaderType.Camera); }
-        public virtual bool IsDataStream() { return (RegReaderType == (int)Config.Entities.RegisterReaderType.DataStream); }
-        public virtual bool IsManual() { return (RegReaderType == (int)Config.Entities.RegisterReaderType.Manual); }
+        public virtual bool IsPulses()     { return (RegReaderType == (int)RegisterReaderType.Pulses || RegReaderType == (int)RegisterReaderType.Unknown); }
+        public virtual bool IsCamera()     { return (RegReaderType == (int)RegisterReaderType.Camera); }
+        public virtual bool IsDataStream() { return (RegReaderType == (int)RegisterReaderType.DataStream); }
+        public virtual bool IsManual()     { return (RegReaderType == (int)RegisterReaderType.Manual); }
 
         public virtual string PassedColorStr(string yesNoFormatOrEmpty)
         {
@@ -124,7 +125,7 @@ namespace Results.Entities
 			Passed = false;
         }
 
-		public MeterTestRslt(WaterMeter waterMeterRslt, TestRslt testRslt, Config.Entities.CompoundMeterId compoundMeterId)
+		public MeterTestRslt(WaterMeter waterMeterRslt, TestRslt testRslt, CompoundMeterId compoundMeterId)
             : this()
         {
 			WaterMeter = waterMeterRslt;

Results/Entities/TestData.cs

@@ -51,7 +51,7 @@ namespace Results.Entities
             Qfrom              = (double)test.Qfrom;
 			Qto                = (double)test.Qto;
 			TargetVolume       = (double)test.Volume;
-			TargetTime         = (double)test.TstTime;
+			TargetTime         = (double)test.TestTime;
 			Method             =         test.Method;
 			ErrLimLo           = (double)test.ErrLimLo;
 			ErrLimHi           = (double)test.ErrLimHi;

Results/Entities/TestRslt.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
+using Common;
 
 namespace Results.Entities
 {
@@ -228,7 +229,7 @@ namespace Results.Entities
         public virtual float TempLimLo()     { return TestData.TempLimLo; }
         public virtual float TempLimHi()     { return TestData.TempLimHi; }
         public virtual bool Evaluate()       { return TestData.Evaluate; }
-		public virtual Config.Entities.Publish Publish() { return (Config.Entities.Publish)TestData.Publish; }
+		public virtual Publish Publish() { return (Publish)TestData.Publish; }
 
 
 		public TestRslt()

Results/Entities/WaterMeter.cs

@@ -1,11 +1,11 @@
 ///
-/// Copyright (c) 2015-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
-using Config.Entities;
+using Common;
 using Results.Resources;
 
 namespace Results.Entities
@@ -43,8 +43,9 @@ namespace Results.Entities
 	{
         public virtual int Id { get; protected set; }
         public virtual string SerialNr          { get; set; }	/// S/N _or_ S/N of the main meter of a compound meter _or_ PCB Number of an iPerl water meter
-        public virtual string SerialNrAux       { get; set; }	/// S/N of the aux. meter of a compound meter _or_ a complete assigned S/N of an iPerl water meter
-		public virtual string PurchaseOrder		{ get; set; }
+        public virtual string SerialNrAux       { get; set; }	/// S/N of the aux. meter of a compound meter _or_ eRegister PCB Number of a 640 water meter                       
+        public virtual string RadioAddress      { get; set; }
+        public virtual string PurchaseOrder     { get; set; }
 		public virtual int    YearOfProduction  { get; set; }
 		public virtual int    WMPosition        { get; set; }   /// 1-based water meter position
 		public virtual string EndState			{ get; set; }	/// End state (of the main water meter)
@@ -76,7 +77,6 @@ namespace Results.Entities
         /// <summary>
         /// Data from a production test bench (in case of tests on iPerl special)
         /// </summary>
-        public virtual string RadioAddress      { get; set; }
         public virtual int    PaletteNr         { get; set; }
         public virtual int    UmkartonNr        { get; set; }
         public virtual string ProdTestBench     { get; set; }
@@ -93,6 +93,7 @@ namespace Results.Entities
         public virtual string Prefix            { get; set; }
         public virtual string Suffix            { get; set; }
         public virtual string CompleteSerialNr  { get; set; }
+        public virtual string OriRadioAddress   { get; set; }   /// Not mapped to DB !!!    Original radio address of a 640 water meter (albatrosID)
         public virtual int    WMTypeRevision    { get; set; }
         public virtual int    Pruefindex        { get; set; }	/// >= 1 ... pruefindex
 		public virtual int	  HydrPruefung		{ get; set; }
@@ -329,7 +330,7 @@ namespace Results.Entities
 			return GetMeterTestRslt(testName, CompoundMeterId.SingleOrCompound);
 		}
 
-		public virtual MeterTestRslt GetMeterTestRslt(string testName, Config.Entities.CompoundMeterId meterId)
+		public virtual MeterTestRslt GetMeterTestRslt(string testName, CompoundMeterId meterId)
 		{
 			if (string.IsNullOrEmpty(testName)) return null;
 			if (Disabled) return null;
@@ -343,18 +344,15 @@ namespace Results.Entities
 					{
 						return mtr;
 					}
-					else if (meterId == Config.Entities.CompoundMeterId.SingleOrCompound &&
-							 mtr.CompoundMeterId == (byte)Config.Entities.CompoundMeterId.Single)
+					else if (meterId == CompoundMeterId.SingleOrCompound && mtr.CompoundMeterId == (byte)CompoundMeterId.Single)
 					{
 						return mtr;
 					}
-					else if (meterId == Config.Entities.CompoundMeterId.SingleOrCompound &&
-							 mtr.CompoundMeterId == (byte)Config.Entities.CompoundMeterId.Compound)
+					else if (meterId == CompoundMeterId.SingleOrCompound && mtr.CompoundMeterId == (byte)CompoundMeterId.Compound)
 					{
 						return mtr;
 					}
-                    else if (meterId == Config.Entities.CompoundMeterId.SingleOrCompound &&
-                             mtr.CompoundMeterId == (byte)Config.Entities.CompoundMeterId.HeatMeterEnergy)
+                    else if (meterId == CompoundMeterId.SingleOrCompound && mtr.CompoundMeterId == (byte)CompoundMeterId.HeatMeterEnergy)
                     {
                         return mtr;
                     }
@@ -518,7 +516,7 @@ namespace Results.Entities
 
             foreach (var mtr in MeterTestRslts)
             {
-                MeterTestRslt srcMtr = src.GetMeterTestRslt(mtr.Name(), (Config.Entities.CompoundMeterId)mtr.CompoundMeterId);
+                MeterTestRslt srcMtr = src.GetMeterTestRslt(mtr.Name(), (CompoundMeterId)mtr.CompoundMeterId);
                 if (srcMtr != null)
                 {
                     mtr.CopyContentFrom(srcMtr);
@@ -557,8 +555,8 @@ namespace Results.Entities
                 {
                     if ((mtr.CompoundMeterId == (byte)CompoundMeterId.Single || mtr.CompoundMeterId == (byte)CompoundMeterId.Compound || mtr.CompoundMeterId == (byte)CompoundMeterId.HeatMeterEnergy)
                           && mtr.TestDone
-                          && (mtr.Publish() != Config.Entities.Publish.Never)
-                          && (mtr.Publish() != Config.Entities.Publish.Internal))
+                          && (mtr.Publish() != Publish.Never)
+                          && (mtr.Publish() != Publish.Internal))
                     {
                         testNames.Add(mtr.Name());
                     }

Results/Entities/WaterMeterData.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.IO;
-using Config.Entities;
+using Common;
 
 namespace Results.Entities
 {
@@ -204,17 +204,17 @@ namespace Results.Entities
             Producer = reader.ReadString();
             DN = reader.ReadDouble();
             L = reader.ReadDouble();
-            Mounting = (Config.Entities.Mounting)reader.ReadInt32();
+            Mounting = (Mounting)reader.ReadInt32();
             NewQnames = reader.ReadBoolean();
             Q4_Qmax = reader.ReadDouble();
             Q3_Qn = reader.ReadDouble();
             Q2_Qt = reader.ReadDouble();
             Q1_Qmin = reader.ReadDouble();
             MetrologicalClass = reader.ReadString();
-            TemperatureClass = (Config.Entities.TemperatureClass)reader.ReadInt32();
-            PressureLossClass = (Config.Entities.PressureLossClass)reader.ReadInt32();
-            MaxAdmissiblePressure = (Config.Entities.MaxAdmissiblePressure)reader.ReadInt32();
-            FlowProfileSensitivityClass = (Config.Entities.FlowProfileSensitivityClass)reader.ReadInt32();
+            TemperatureClass = (TemperatureClass)reader.ReadInt32();
+            PressureLossClass = (PressureLossClass)reader.ReadInt32();
+            MaxAdmissiblePressure = (MaxAdmissiblePressure)reader.ReadInt32();
+            FlowProfileSensitivityClass = (FlowProfileSensitivityClass)reader.ReadInt32();
             ApprovalInfo = reader.ReadString();
             Certificate = reader.ReadString();
             PulsesPerLtr = reader.ReadDouble();
@@ -222,7 +222,7 @@ namespace Results.Entities
             Q3_Qn_Aux = reader.ReadDouble();
             MetrologicalClassAux = reader.ReadString();
             ApprovalInfoAux = reader.ReadString();
-            Medium = (Config.Entities.Medium)reader.ReadInt32();
+            Medium = (Medium)reader.ReadInt32();
             Text1 = reader.ReadString();
             Text2 = reader.ReadString();
             Text3 = reader.ReadString();

Results/Forms/BatchResultsDlg.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 using log4net;
-using Config.Entities;
+using Common;
 using Results.Resources;
 using NHibernate;
 using TracingDB.Entities;

Results/Forms/ManualEntryConfigCtrl.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using Results.Resources;
 
@@ -78,7 +79,7 @@ namespace Results.Forms
             unitsCB = new ComboBox();
 
             ComboBox alignmentCB = new ComboBox();
-            for (Config.Entities.Alignment a = 0; a < Config.Entities.Alignment.Count; a++)
+            for (Alignment a = 0; a < Alignment.Count; a++)
             {
                 alignmentCB.Items.Add(a.ToDescription());
             }

Results/Forms/MoreWMResultsDlg.cs

@@ -76,8 +76,8 @@ namespace Results.Forms
 
 //                foreach (var mtr in wMtr.MeterTestRslts)
 //                {
-//                    if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Config.Entities.Publish.Never &&
-//                                                                            mtr.Publish() != Config.Entities.Publish.Internal)
+//                    if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Publish.Never &&
+//                                                                            mtr.Publish() != Publish.Internal)
 //                    {
 //                        string str = item.Print(wMtr, mtr.Name());
 

Results/Forms/OneWMResultsColumnsCtrl.cs

@@ -5,6 +5,7 @@ using System;
 using System.Drawing;
 using System.Windows.Forms;
 using System.Collections.Generic;
+using Common;
 
 namespace Results.Forms
 {
@@ -107,8 +108,8 @@ namespace Results.Forms
 
                 foreach (var mtr in wMtr.MeterTestRslts)
                 {
-                    if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Config.Entities.Publish.Never &&
-                                                                            mtr.Publish() != Config.Entities.Publish.Internal)
+                    if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Publish.Never &&
+                                                                            mtr.Publish() != Publish.Internal)
                     {
                         string str = item.Print(wMtr, mtr.Name());
 

Results/Forms/OneWMResultsRowsCtrl.cs

@@ -5,6 +5,7 @@ using System;
 using System.Drawing;
 using System.Windows.Forms;
 using System.Collections.Generic;
+using Common;
 
 namespace Results.Forms
 {
@@ -109,8 +110,8 @@ namespace Results.Forms
             lView.Items.Clear();
             foreach (var mtr in wMtr.MeterTestRslts)
             {
-                if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Config.Entities.Publish.Never
-                                                                     && mtr.Publish() != Config.Entities.Publish.Internal)
+                if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Publish.Never
+                                                                     && mtr.Publish() != Publish.Internal)
                 {
                     ListViewItem lvi = new ListViewItem(testNames[ix++]);
 

Results/Forms/ResultsConfigCtrl.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
-using Config.Entities;
+using Common;
 using Results.Resources;
 
 namespace Results.Forms
@@ -99,7 +99,7 @@ namespace Results.Forms
             unitsCB = new ComboBox();
 
             ComboBox alignmentCB = new ComboBox();
-            for (Config.Entities.Alignment a = 0; a < Config.Entities.Alignment.Count; a++)
+            for (Alignment a = 0; a < Alignment.Count; a++)
             {
                 alignmentCB.Items.Add(a.ToDescription());
             }
@@ -187,7 +187,7 @@ namespace Results.Forms
 					}
 
                 case Column.Alignment:
-                    for (Config.Entities.Alignment a = 0; a < Config.Entities.Alignment.Count; a++)
+                    for (Alignment a = 0; a < Alignment.Count; a++)
                     {
                         if (a.ToDescription().Equals(editors[e.SubItem].Text))
                         {

Results/Forms/ResultsConfigDlg.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using log4net;
-using Config.Entities;
+using Common;
 using Results;
 using Results.Resources;
 

Results/ItemID.cs

@@ -333,15 +333,17 @@ namespace Results
         RegValve,                       /// 282
 
         X1,                             /// 283
-        X2,
-        X3,
-        X4,
-        X5,
-        X6,
-        X7,
-        X8,
+        X2,                             /// 284
+        X3,                             /// 285
+        X4,                             /// 286
+        X5,                             /// 287
+        X6,                             /// 288
+        X7,                             /// 289
+        X8,                             /// 290
         X9,                             /// 291
 
+        RadioAddress,                   /// 292
+
         Count,
     }
 }

Results/ManualEntryItemSpec.cs

@@ -3,8 +3,8 @@
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 using Config;
-using Config.Entities;
 using Results.Entities;
 using Results.Resources;
 using System.Globalization;

Results/Mappings/WaterMeterMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2017 Sensus Metering Systems
+/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Results.Entities;
@@ -13,7 +13,8 @@ namespace Results.Mappings
 			Id(x => x.Id);
 			Map(x => x.SerialNr);
 			Map(x => x.SerialNrAux);
-			Map(x => x.PurchaseOrder);
+            Map(x => x.RadioAddress);
+            Map(x => x.PurchaseOrder);
 			Map(x => x.YearOfProduction);
 			Map(x => x.WMPosition);
 			Map(x => x.EndState);
@@ -43,7 +44,6 @@ namespace Results.Mappings
 			Map(x => x.FWVersion);
 #endif
 #if TURA_SPECIAL
-            Map(x => x.RadioAddress);
             Map(x => x.PaletteNr);
             Map(x => x.UmkartonNr);
             Map(x => x.ProdTestBench);
@@ -60,6 +60,7 @@ namespace Results.Mappings
             Map(x => x.Prefix);
             Map(x => x.Suffix);
             Map(x => x.CompleteSerialNr);
+            Map(x => x.OriRadioAddress);
             Map(x => x.Pruefindex);
             Map(x => x.HydrPruefung);
             Map(x => x.WMTypeRevision);

Results/Output/Printers/Enhanced/EnhancedPrintDocument.cs

@@ -7,7 +7,7 @@ using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Printing;
 using System.IO;
-using Config.Entities;
+using Common;
 using GenCode128;
 using Gma.QrCodeNet.Encoding;
 using Results.Resources;

Results/Output/Printers/Enhanced/EnhancedPrinterCfg.cs

@@ -1,12 +1,13 @@
 ///
 /// Copyright (c) 2017-2020 Sensus Slovensko a.s.
 ///
+using Common;
 
 namespace Results.Output.Printers.Enhanced
 {
 	public class EnhancedPrinterCfg
 	{
-		public Config.Entities.PageOrientation PageOrientation;
+		public PageOrientation PageOrientation;
         public string Template;
         public int TopMargin;
 		public int BottomMargin;

Results/Output/Printers/Label/LabelPrintDocument.cs

@@ -8,7 +8,7 @@ using System.Drawing.Drawing2D;
 using System.Drawing.Printing;
 using System.IO;
 using Gma.QrCodeNet.Encoding;
-using Config.Entities;
+using Common;
 using Results.Resources;
 using GenCode128;
 

Results/Output/Printers/Label/LabelPrinterCfg.cs

@@ -1,13 +1,14 @@
 ///
 /// Copyright (c) 2018-2020 Sensus Slovensko a.s.
 ///
+using Common;
 
 namespace Results.Output.Printers.Label
 {
 	public class LabelPrinterCfg
 	{
 		public string Template;								/// Full path to a 'png' file
-		public Config.Entities.PageOrientation PageOrientation;
+		public PageOrientation PageOrientation;
 		public int PaperWidth;								/// In 0,254 mm = 1/100 in = 100dpi pixels count
 		public int PaperHeight;								/// In 0,254 mm = 1/100 in = 100dpi pixels count
 		public string[] ItemsToPrint;

Results/Output/Printers/MultiLabel/MultiLabelPrintDocument.cs

@@ -8,7 +8,7 @@ using System.Drawing.Drawing2D;
 using System.Drawing.Printing;
 using System.IO;
 using Gma.QrCodeNet.Encoding;
-using Config.Entities;
+using Common;
 using Results.Resources;
 using GenCode128;
 

Results/Output/Printers/MultiLabel/MultiLabelPrinterCfg.cs

@@ -1,12 +1,13 @@
 ///
 /// Copyright (c) 2020 Sensus Slovensko a.s.
 ///
+using Common;
 
 namespace Results.Output.Printers.MultiLabel
 {
 	public class MultiLabelPrinterCfg
 	{
-		public Config.Entities.PageOrientation PageOrientation;
+		public PageOrientation PageOrientation;
         public int LabelColumnsCount;
         public int LeftTopLabelLeft;
         public int LeftTopLabelTop;

Results/Output/Printers/Munich/MunichPrintDocument.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Printing;
-using Config.Entities;
+using Common;
 using System.IO;
 using Results.Resources;
 
@@ -120,7 +120,7 @@ namespace Results.Output.Printers.Munich
 			resultsCount = 0;
             foreach (var mtr in wm.RegularMeterTestRslts())
             {
-                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always) resultsCount++;
+                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always) resultsCount++;
             }
 
 			pageNr = 1;
@@ -381,7 +381,7 @@ namespace Results.Output.Printers.Munich
             int rowCount = 0;
             foreach (var mtr in wm.RegularMeterTestRslts()) 
 			{
-                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
+                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always)
                 {
                     if (from <= rowCount && rowCount <= to)
                     {
@@ -449,7 +449,7 @@ namespace Results.Output.Printers.Munich
             int rowCount = 0;
             foreach (var mtr in wm.RegularMeterTestRslts())
 			{
-                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
+                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always)
                 {
                     if (from <= rowCount && rowCount <= to)
                     {

Results/Output/Printers/OnePerBatch/OnePerBatchPrintDocument.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Printing;
 using System.IO;
-using Config.Entities;
+using Common;
 using Results.Resources;
 
 namespace Results.Output.Printers.OnePerBatch

Results/Output/Printers/OnePerBatch/OnePerBatchPrinterCfg.cs

@@ -1,13 +1,14 @@
 ///
 /// Copyright (c) 2020 Sensus Slovensko a.s.
 ///
+using Common;
 
 namespace Results.Output.Printers.OnePerBatch
 {
 	public class OnePerBatchPrinterCfg
 	{
         public string AutoTestParam;
-        public Config.Entities.PageOrientation PageOrientation;
+        public PageOrientation PageOrientation;
         public string Template;
 		public int TopMargin;
 		public int BottomMargin;
@@ -34,9 +35,9 @@ namespace Results.Output.Printers.OnePerBatch
         public string[] CommonItems1;
         public string[] CommonItems2;
         public string[] CommonItems3;
-        public Config.Entities.TableForm Form;
+        public TableForm Form;
         public string[] TestItems;
-        public Config.Entities.TableForm Form2;
+        public TableForm Form2;
         public string[] TestItems2;
         public int BelowW0Pct;
         public int BelowW1Pct;

Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs

@@ -7,7 +7,7 @@ using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Printing;
 using System.IO;
-using Config.Entities;
+using Common;
 using GenCode128;
 using Gma.QrCodeNet.Encoding;
 using Results.Resources;

Results/Output/Printers/OnePerMeter/OnePerMeterPrinterCfg.cs

@@ -1,12 +1,13 @@
 ///
 /// Copyright (c) 2017-2020 Sensus Slovensko a.s.
 ///
+using Common;
 
 namespace Results.Output.Printers.OnePerMeter
 {
 	public class OnePerMeterPrinterCfg
 	{
-		public Config.Entities.PageOrientation PageOrientation;
+		public PageOrientation PageOrientation;
         public string Template;
 		public int TopMargin;
 		public int BottomMargin;
@@ -33,9 +34,9 @@ namespace Results.Output.Printers.OnePerMeter
         public string[] CommonItems1;
         public string[] CommonItems2;
         public string[] CommonItems3;
-        public Config.Entities.TableForm Form;
+        public TableForm Form;
         public string[] TestItems;
-        public Config.Entities.TableForm Form2;
+        public TableForm Form2;
         public string[] TestItems2;
         public int BelowW0Pct;
         public int BelowW1Pct;

Results/Output/Printers/PrintersCommon.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Printing;
-using Config.Entities;
+using Common;
 
 namespace Results.Output.Printers
 {

Results/Output/Printers/Zapiska/ZapiskaPrintDocument.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Printing;
 using System.IO;
-using Config.Entities;
+using Common;
 using Results;
 using Results.Resources;
 

Results/Output/Printers/Zapiska/ZapiskaPrinterCfg.cs

@@ -1,12 +1,13 @@
 ///
 /// Copyright (c) 2017 Sensus Slovensko a.s.
 ///
+using Common;
 
 namespace Results.Output.Printers.Zapiska
 {
 	public class ZapiskaPrinterCfg
 	{
-		public Config.Entities.PageOrientation PageOrientation;
+		public PageOrientation PageOrientation;
         public string Template;
         public int TopMargin;
 		public int BottomMargin;

Results/Output/SensusTestInfo.cs

@@ -556,7 +556,7 @@ namespace Results.Output
                 QBezeichnungLog = fullTestNameWoPart,                       /// Flow name in Oracle database
                 Range = range,
                 Flow = (range == Range.R100_110) ? test.Qfrom : (range == Range.R90_100) ? test.Qto : (test.Qfrom + test.Qto) / 2,
-                TestTime = (int)Math.Round(test.TstTime),
+                TestTime = (int)Math.Round(test.TestTime),
                 ErrLimLoFromDB = test.ErrLimLo,
                 ErrLimHiFromDB = test.ErrLimHi,
                 Uncertainty = test.Uncertainty,

Results/Output/Table.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Printing;
-using Config.Entities;
+using Common;
 
 namespace Results.Output
 {
@@ -283,7 +283,7 @@ namespace Results.Output
             WMeterRsltItemSpec.TableRowNr = 1;
             foreach (var mtr in string.IsNullOrEmpty(autoTestParam) ? wm.RegularMeterTestRslts() : wm.AutoMeterTestRslts(autoTestParam))
             {
-                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
+                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always)
                 {
                     string[] oneTableRow = new string[table.ColumnsCount];
                     horizAlignment = new Alignment[table.ColumnsCount];
@@ -317,7 +317,7 @@ namespace Results.Output
             int columnsCount = 1;          /// Left column contains item caption                         
             foreach (var mtr in string.IsNullOrEmpty(autoTestParam) ? wm.RegularMeterTestRslts() : wm.AutoMeterTestRslts(autoTestParam))
             {
-                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
+                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always)
                 {
                     columnsCount++;        /// One additional column for each test to be published
                 }
@@ -343,7 +343,7 @@ namespace Results.Output
                 WMeterRsltItemSpec.TableColumnNr = 1;
                 foreach (var mtr in string.IsNullOrEmpty(autoTestParam) ? wm.RegularMeterTestRslts() : wm.AutoMeterTestRslts(autoTestParam))
                 {
-                    if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
+                    if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always)
                     {
                         /// Strip color information
                         oneTableRow[WMeterRsltItemSpec.TableColumnNr] =
@@ -374,7 +374,7 @@ namespace Results.Output
             int columnsCount = 2;          /// Left two columns contain item caption and units
             foreach (var mtr in string.IsNullOrEmpty(autoTestParam) ? wm.RegularMeterTestRslts() : wm.AutoMeterTestRslts(autoTestParam))
             {
-                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
+                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always)
                 {
                     columnsCount++;        /// One additional column for each test to be published
                 }
@@ -410,7 +410,7 @@ namespace Results.Output
                     WMeterRsltItemSpec.TableColumnNr = 1;
                     foreach (var mtr in string.IsNullOrEmpty(autoTestParam) ? wm.RegularMeterTestRslts() : wm.AutoMeterTestRslts(autoTestParam))
                     {
-                        if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
+                        if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always)
                         {
                             int colIx = WMeterRsltItemSpec.TableColumnNr + 1;
 

Results/Output/WMChart.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms.DataVisualization.Charting;
-using Config.Entities;
+using Common;
 using Results.Entities;
 using Results.Resources;
 

Results/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.1622.0")]
-[assembly: AssemblyFileVersion("2.26.1622.0")]
+[assembly: AssemblyVersion("2.27.1776.0")]
+[assembly: AssemblyFileVersion("2.27.1776.0")]

Results/Resources/Strings.Designer.cs

@@ -906,6 +906,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Radio address.
+        /// </summary>
+        internal static string Radio_address {
+            get {
+                return ResourceManager.GetString("Radio_address", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Ref.pulses.
         /// </summary>
@@ -1581,6 +1590,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Radio address.
+        /// </summary>
+        internal static string Tooltip_RA {
+            get {
+                return ResourceManager.GetString("Tooltip_RA", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Calculated density of water from table or formula at water density calibration temperature (r).
         /// </summary>

Results/Resources/Strings.resx

@@ -831,4 +831,10 @@
   <data name="Info_flags" xml:space="preserve">
     <value>Info flags</value>
   </data>
+  <data name="Tooltip_RA" xml:space="preserve">
+    <value>Radio address</value>
+  </data>
+  <data name="Radio_address" xml:space="preserve">
+    <value>Radio address</value>
+  </data>
 </root>

Results/Results.csproj

@@ -19,17 +19,17 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_IPERL_NEW;IPERL;ORACLE_DB</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;TURA_IPERL_NEW;IPERL;ORACLE_DB</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>

Results/WMeterRsltItemSpec.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using Config;
-using Config.Entities;
+using Common;
 using Results.Entities;
 using Results.Resources;
 using System.Globalization;
@@ -28,7 +28,7 @@ namespace Results
         public string Format;		                    /// Specifies format for the output
         public string Precision;	                    /// Specifies precision for the output
         public int Width;                               /// Specifies the number of characters of the output, 0 = automatic
-        public Config.Entities.Alignment Alignment;     /// Specifies alignment for the output
+        public Alignment Alignment;                     /// Specifies alignment for the output
 
         public WMeterRsltItemSpec Clone()
         {
@@ -67,11 +67,11 @@ namespace Results
                 {
                     return str;
                 }
-                else if (Alignment == Config.Entities.Alignment.Left)
+                else if (Alignment == Alignment.Left)
                 {
                     return str + new string(' ', Width - len);
                 }
-                else if (Alignment == Config.Entities.Alignment.Right)
+                else if (Alignment == Alignment.Right)
                 {
                     return new string(' ', Width - len) + str;
                 }
@@ -367,11 +367,12 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Text5, "Text5", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Text5)));
 
             /// Water meters results
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr,          Strings.sn, Strings.Tooltip_sn, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.SerialNr)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Purchase_order,     Strings.PO,                     Quantity.String, ItemCategory.Other,       (w, t, u, f, p) => FormatStr(f, w.PurchaseOrder)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Year_of_production, Strings.Year,                   Quantity.Number, ItemCategory.Other,       (w, t, u, f, p) => FormatInt(f, w.YearOfProduction)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.WM_Position,        Strings.Pos,                    Quantity.Number, ItemCategory.Other,       (w, t, u, f, p) => FormatInt(f, w.WMPosition)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Formatted_WM_ID,    "Formatted WM ID",              Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? string.Format("{0}-{1}", w.BatchNr(), w.WMPosition) : string.Format(f, w.StartTime(), w.EndTime(), w.BatchNr(), w.WMPosition, w.SerialNr)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr,          Strings.sn,      Strings.Tooltip_sn, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.SerialNr)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.RadioAddress, Strings.Radio_address, Strings.Tooltip_RA, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.RadioAddress)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Purchase_order,     Strings.PO,                          Quantity.String, ItemCategory.Other,       (w, t, u, f, p) => FormatStr(f, w.PurchaseOrder)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Year_of_production, Strings.Year,                        Quantity.Number, ItemCategory.Other,       (w, t, u, f, p) => FormatInt(f, w.YearOfProduction)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.WM_Position,        Strings.Pos,                         Quantity.Number, ItemCategory.Other,       (w, t, u, f, p) => FormatInt(f, w.WMPosition)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Formatted_WM_ID,    "Formatted WM ID",                   Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? string.Format("{0}-{1}", w.BatchNr(), w.WMPosition) : string.Format(f, w.StartTime(), w.EndTime(), w.BatchNr(), w.WMPosition, w.SerialNr)));
 
             /// Water meters results (single)
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state,           Strings.End_state,           Quantity.String,       ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.EndState)));
@@ -423,10 +424,10 @@ namespace Results
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Meter_type,  Strings.Meter_type,  Quantity.String, ItemCategory.Other,       (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Compound ? Strings.Compound : (w.WaterMeterData.HeatMeter ? Strings.Heat_meter : Strings.Single))));
 
 #if HEAT_METERS
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy,           Strings.Energy + " ()",       Quantity.Energy, ItemCategory.Other,	(w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeMeter) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy_start,     Strings.Energy + " start ()", Quantity.Energy, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeStart) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy_end,       Strings.Energy + " end ()",   Quantity.Energy, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeEnd) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_energy, Strings.Energy_ref + " ()",   Quantity.Energy, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeRef) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy,           Strings.Energy + " ()",       Quantity.Energy, ItemCategory.Other,	(w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterEnergy).VolumeMeter) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy_start,     Strings.Energy + " start ()", Quantity.Energy, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterEnergy).VolumeStart) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy_end,       Strings.Energy + " end ()",   Quantity.Energy, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterEnergy).VolumeEnd) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_energy, Strings.Energy_ref + " ()",   Quantity.Energy, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterEnergy).VolumeRef) : string.Empty));
 #endif
 
 #if IPERL
@@ -826,7 +827,7 @@ namespace Results
 							item.Precision = field[5];
 							item.Width = int.Parse(field[6]);
 							item.Alignment = 0;
-							for (Config.Entities.Alignment a = 0; a < Config.Entities.Alignment.Count; a++)
+							for (Alignment a = 0; a < Alignment.Count; a++)
 							{
 								if (a.ToString().Equals(field[7])) { item.Alignment = a; break; }
 							}

ResultsBrowser/Forms/PrinterConfigDlg.cs

@@ -3,8 +3,9 @@ using System.Collections.Generic;
 using System.IO;
 using System.Windows.Forms;
 using Config.Entities;
-using TBF.BenchControl;
-using TBF.BenchControl.Generic;
+using TBF.Rig;
+using TBF.Rig.Generic;
+using TBF.UI.Bench.Components;
 
 namespace ResultsBrowser.Forms
 {
@@ -87,13 +88,13 @@ namespace ResultsBrowser.Forms
 				printerCfg = printerFactory.CmpntCfgFromCmpntEntity(cmpnt);
 			}
 
-			IComponentCfgCtrl cfgControl = printerCfg.GetControl();
+            ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+            cfgForm.CmpntEntities = new List<Component>();
+
+            IComponentCfgCtrl cfgControl = printerCfg.GetControl(cfgForm.CmpntEntities);
 			cfgControl.Config = printerCfg;
 			cfgControl.Config.ItemNr = 0;
 
-            TBF.BenchControl.ComponentParametersDlg cfgForm = new TBF.BenchControl.ComponentParametersDlg();
-			cfgForm.TbfComponents = new List<Component>();
-
 			cfgForm.ComponentCfgCtrl = cfgControl;
 			cfgForm.UnlockAfterStart = true;
 			DialogResult dr = cfgForm.ShowDialog();

ResultsBrowser/Forms/StatisticsDlg.cs

@@ -3,11 +3,12 @@
 ///
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Windows.Forms;
+using Common;
 using Results.Entities;
 using ResultsBrowser.Resources;
 using ResultsBrowser.Output.Printers.Statistics;
-using System.IO;
 
 namespace ResultsBrowser.Forms
 {
@@ -168,10 +169,10 @@ namespace ResultsBrowser.Forms
 			switch (MessageBox.Show(Strings.Yes_Portrait_No_Landscape, Strings.Page_orientation, MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question))
 			{
 				case DialogResult.Yes:
-					new StatisticsPrintDocument(title, table, Config.Entities.PageOrientation.Portrait).Print();
+					new StatisticsPrintDocument(title, table, PageOrientation.Portrait).Print();
 					break;
 				case DialogResult.No:
-					new StatisticsPrintDocument(title, table, Config.Entities.PageOrientation.Landscape).Print();
+					new StatisticsPrintDocument(title, table, PageOrientation.Landscape).Print();
 					break;
 				default:
 					break;

ResultsBrowser/Output/Printers/Statistics/StatisticsPrintDocument.cs

@@ -1,11 +1,11 @@
 ///
-/// Copyright (c) 2016 Sensus Metering Systems
+/// Copyright (c) 2016 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Printing;
-using Config.Entities;
+using Common;
 
 namespace ResultsBrowser.Output.Printers.Statistics
 {

ResultsBrowser/ResultsBrowser.csproj

@@ -16,23 +16,23 @@
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_IPERL_NEW;IPERL;ORACLE_DB</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;TURA_IPERL_NEW;IPERL;ORACLE_DB</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -304,6 +304,10 @@
     </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>

ResultsBrowser/ResultsBrowserWnd.cs

@@ -6,14 +6,15 @@ using System.Collections.Generic;
 using System.IO;
 using System.Windows.Forms;
 using NHibernate;
-using Results.Entities;
-using TBF.BenchControl;
-using TBF.BenchControl.Generic;
-using TBF.BenchControl.GenericDevices;
-using ResultsBrowser.Filters;
-using ResultsBrowser.Resources;
 using Oracle;
 using Oracle.DataAccess.Client;
+using Common;
+using Results.Entities;
+using TBF.Rig;
+using TBF.Rig.Generic;
+using TBF.Rig.GenericDevices;
+using ResultsBrowser.Filters;
+using ResultsBrowser.Resources;
 
 namespace ResultsBrowser
 {
@@ -44,7 +45,7 @@ namespace ResultsBrowser
             filtersConfig = new FiltersConfig();
             this.args = args;
 
-            tbfComponents = new List<TBF.BenchControl.Generic.IComponent>();
+            tbfComponents = new List<TBF.Rig.Generic.IComponent>();
             tbfDevices = new List<IDevice>();
 
             timePeriodStart = new DateTime(0);
@@ -197,7 +198,7 @@ namespace ResultsBrowser
         private void formatOfResultsBtn_Click(object sender, EventArgs e)
         {
             Results.Forms.ResultsConfigDlg dlg = new Results.Forms.ResultsConfigDlg();
-            dlg.MetersKind = Config.Entities.MetersKind.Single;
+            dlg.MetersKind = MetersKind.Single;
             dlg.SelectedItems = Results.WMeterRsltItemSpec.FromStrArray(filtersConfig.ResultItems);
 
             if (dlg.ShowDialog() == DialogResult.OK)
@@ -432,7 +433,7 @@ namespace ResultsBrowser
 #if MUNICH
             foreach (var wm in waterMeters)
             {
-                new Results.Output.Printers.Munich.MunichPrintDocument(string.Format("4/13 - {0}", BenchName()), wm, Config.Entities.PageOrientation.Portrait).Print();
+                new Results.Output.Printers.Munich.MunichPrintDocument(string.Format("4/13 - {0}", BenchName()), wm, PageOrientation.Portrait).Print();
             }
 #elif CEVAK_40
 			IList<Results.Entities.Batch> batches = new List<Results.Entities.Batch>();
@@ -444,7 +445,7 @@ namespace ResultsBrowser
             //foreach (var batch in batches)
             //{
             //    new Results.Output.Printers.Cevak.PrintDocumentCevak(batch,
-            //                                                         Config.Entities.PageOrientation.Portrait,
+            //                                                         PageOrientation.Portrait,
             //                                                         60, 60, 60,
             //                                                         "PT40 Z/E-35-A",
             //                                                         "0111-OOP-C035-13").Print();
@@ -822,7 +823,7 @@ namespace ResultsBrowser
 #endif
                         default: Results.DB.ConnectionString = string.Empty; break;
                     }
-                    Results.DB.DbType = Users.Entities.DBType.MySql;
+                    Results.DB.DbType = Common.DBType.MySql;
 
                     string[] fields = dlg.InputList.Split(new char[] { ',' });
                     int[] batchNrs = new int[fields.Length];
@@ -936,7 +937,7 @@ namespace ResultsBrowser
                         default: Results.DB.ConnectionString = string.Empty; break;
                     }
 #endif
-                    Results.DB.DbType = Users.Entities.DBType.MySql;
+                    Results.DB.DbType = Common.DBType.MySql;
 
                     if (!string.IsNullOrEmpty(Results.DB.ConnectionString))
                     {

Statistics/Statistics.csproj

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

TBF/BenchControl/DataEntry/iPerl/CycleBeginningForm.cs

@@ -1,148 +0,0 @@
-///
-/// Copyright (c) 2015 Sensus Metering Systems
-///
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-using log4net;
-using TBF.Resources;
-using System.Drawing;
-
-namespace TBF.BenchControl.DataEntry.iPerl
-{
-	public partial class CycleBeginningForm : Form, GenericDevices.IHasCompleted
-    {
-		private static readonly ILog log = LogManager.GetLogger(typeof(CycleBeginningForm));
-
-		/// <summary> Number of water meters </summary>
-        public readonly int WaterMetersCount;
-        public readonly bool reversedDirection;
-
-		/// To be retrieved after the form is closed
-		public string PurchaseOrder;
-		public string[] SNText;
-		public bool[] Disabled;
-
-		/// Set to 'true' when the form closes
-        public bool Completed { get { return completed; } }
-		bool completed;
-
-
-		/// <summary> Parameterless constructor for common functionality </summary>
-		public CycleBeginningForm()
-		{
-			InitializeComponent();
-			ControlBox = false;
-
-			completed = false;
-			StartForceCloseHandler();
-		}
-
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
-        public CycleBeginningForm(int waterMetersCount, bool reversedDirection)
-			: this()
-        {
-            this.WaterMetersCount = waterMetersCount;
-            this.reversedDirection = reversedDirection;
-			SNText = null;
-			Disabled = null;
-        }
-
-
-        private void CycleBeginningForm_Load(object sender, EventArgs e)
-        {
-			Text = Strings.Data;
-			orderGroupBox.Text = Strings.Purchase_order;
-			okButton.Text = Strings.OkBtnText;			
-			PrepareOrderCombo(orderComboBox);
-
-            ///
-            /// Draw an appropriate test bench picture
-            ///
-            Config.Entities.Side side = (TBF.BenchControl.Sequences.ProcessData.BenchInfo is DataContainers.BenchInfo.iPerl.Component)
-                                      ? (TBF.BenchControl.Sequences.ProcessData.BenchInfo as DataContainers.BenchInfo.iPerl.Component).Side
-                                      : Config.Entities.Side.Left;
-            if (reversedDirection && (side == Config.Entities.Side.Left))
-            {
-                /// direction L->R (reversed), left side
-                pictureBox.Image = Image.FromFile(string.Format("{0}\\Pictures\\reversed_dir_left.jpg", Program.ExecutableDir, true));
-            }
-            else if (reversedDirection && (side == Config.Entities.Side.Right))
-            {
-                /// direction L->R (reversed), right side
-                pictureBox.Image = Image.FromFile(string.Format("{0}\\Pictures\\reversed_dir_right.jpg", Program.ExecutableDir, true));
-            }
-            else if (side == Config.Entities.Side.Right)
-            {
-                /// direction R->L (forward), right side
-                pictureBox.Image = Image.FromFile(string.Format("{0}\\Pictures\\forward_dir_right.jpg", Program.ExecutableDir, true));
-            }
-            else
-            {
-                /// direction R->L (forward), left side
-                pictureBox.Image = Image.FromFile(string.Format("{0}\\Pictures\\forward_dir_left.jpg", Program.ExecutableDir, true));
-            }
-		}
-
-		/// <summary>
-		/// Load Purchase order combo box items from the LocalSettings PurchaseOrderHistory array
-		/// </summary>
-		/// <param name="orderComboBox">Puchase order ComboBox</param>
-		void PrepareOrderCombo(ComboBox orderComboBox)
-		{
-			for (int i = 0; i < Program.LocalSettings.PurchaseOrderHistoryCount; i++)
-			{
-				orderComboBox.Items.Add(Program.LocalSettings.PurchaseOrderHistory[i]);
-			}
-
-			if (orderComboBox.Items.Count > 0)
-			{
-				orderComboBox.Text = orderComboBox.Items[0].ToString();
-			}
-		}
-
-
-		private void okButton_Click(object sender, EventArgs e)
-        {
-            if (orderComboBox.Text.Length > 8)
-            {
-                MessageBox.Show(string.Format(Strings.Purchase_order_may_have_max_N_characters, 8),
-                                Strings.Error,
-                                MessageBoxButtons.OK,
-                                MessageBoxIcon.Exclamation);
-            }
-            else
-            {
-                PurchaseOrder = orderComboBox.Text;
-                Program.LocalSettings.UpdateHistory(orderComboBox.Text, ref Program.LocalSettings.PurchaseOrderHistory);
-
-                completed = true;
-                Close();
-            }
-        }
-
-
-		#region Forced close handling
-
-		public void StartForceCloseHandler()
-		{
-			UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args)
-			{
-				if (InvokeRequired) { Invoke(new EventHandler<EventArgs>(OnForceClose), sender, args); }
-				else OnForceClose(sender, args);
-			};
-		}
-
-		private void OnForceClose(object sender, EventArgs args)
-		{
-			DialogResult = DialogResult.Cancel;
-			Close();
-		}
-
-		#endregion
-   }
-}

TBF/BenchControl/DataEntry/iPerl/EntryFormCfg.cs

@@ -1,43 +0,0 @@
-///
-/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml.Serialization;
-using TBF.BenchControl.Generic;
-
-namespace TBF.BenchControl.DataEntry.iPerl
-{
-	public class EntryFormCfg : ComponentCfgBase, Generic.IComponentCfg
-	{
-		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EntryFormCfg) })[0];
-		public override XmlSerializer GetSerializer() { return Serializer; }
-
-		public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
-
-		///
-		/// Serialized parameters
-		///
-        public bool ReversedDirection;
-
-		/// Private parameterless constructor invoked by all other (public) constructors
-		EntryFormCfg()
-        {
-			Name = "DataEntry-iPerl";
-            ParentName = string.Empty;
-            ReversedDirection = false;
-        }
-
-        public EntryFormCfg(IComponentFactory factory)
-            : this()
-        {
-            this.Factory = factory;
-        }
-
-        public string ToString(int i)
-        {
-            return string.Format("Name={0}, ReversedDir={1}", Name, ReversedDirection);
-        }
-    }
-}

TBF/BenchControl/DataEntry/iPerl/EntryFormCfgCtrl.cs

@@ -1,78 +0,0 @@
-///
-/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
-///
-using System;
-using System.Windows.Forms;
-using Config.Entities;
-using TBF.BenchControl.Generic;
-using TBF.Resources;
-
-namespace TBF.BenchControl.DataEntry.iPerl
-{
-	public partial class EntryFormCfgCtrl : UserControl, IComponentCfgCtrl
-	{
-		public bool ShowMore { get { return false; } }
-
-		EntryFormCfg config;
-		public IComponentCfg Config
-		{
-			get { return config as IComponentCfg; }
-			set
-			{
-				config = value as EntryFormCfg;
-				Redraw();
-			}
-		}
-
-		public EntryFormCfgCtrl()
-		{
-			InitializeComponent();
-		}
-
-		private void EntryFormCfgCtrl_Load(object sender, EventArgs e)
-		{
-			Localize();
-			Redraw();
-		}
-
-		void Localize()
-		{
-		}
-
-		public void Closing()
-		{
-		}
-
-		void Redraw()
-		{
-			if (config == null) return;			/// Control was not loaded, settings were not changed
-			classNameLabel.Text = config.Factory.ClassName;
-			nameTextBox.Text = config.Name;
-            reversedIperlDirectionCheckBox.Checked = config.ReversedDirection;
-		}
-
-		public void Unlock()
-		{
-			nameTextBox.Enabled = true;
-            reversedIperlDirectionCheckBox.Enabled = true;
-		}
-
-		public CfgUpdateFlags VerifyCfg(ref string message)
-		{
-            CfgUpdateFlags flags = CfgUpdateFlags.None;
-			return flags;
-		}
-
-		public CfgUpdateFlags UpdateCfg()
-		{
-			CfgUpdateFlags flags = CfgUpdateFlags.RestartRqrd;
-
-			if (config == null) return CfgUpdateFlags.Error;	/// Control was not loaded, settings were not changed
-
-			config.Name = nameTextBox.Text;
-            config.ReversedDirection = reversedIperlDirectionCheckBox.Checked;
-
-			return flags;
-		}
-	}
-}

TBF/BenchControl/DataEntry/iPerl/EntryFormCfgCtrl.designer.cs

@@ -1,100 +0,0 @@
-///
-/// Copyright (c) 2015 Sensus Metering Systems
-///
-namespace TBF.BenchControl.DataEntry.iPerl
-{
-	partial class EntryFormCfgCtrl
-	{
-		/// <summary> 
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary> 
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Component Designer generated code
-
-		/// <summary> 
-		/// Required method for Designer support - do not modify 
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-            this.nameTextBox = new System.Windows.Forms.TextBox();
-            this.nameLabel = new System.Windows.Forms.Label();
-            this.classNameLabel = new System.Windows.Forms.Label();
-            this.reversedIperlDirectionCheckBox = new System.Windows.Forms.CheckBox();
-            this.SuspendLayout();
-            // 
-            // nameTextBox
-            // 
-            this.nameTextBox.Enabled = false;
-            this.nameTextBox.Location = new System.Drawing.Point(131, 57);
-            this.nameTextBox.Name = "nameTextBox";
-            this.nameTextBox.Size = new System.Drawing.Size(130, 20);
-            this.nameTextBox.TabIndex = 5;
-            // 
-            // nameLabel
-            // 
-            this.nameLabel.AutoSize = true;
-            this.nameLabel.Location = new System.Drawing.Point(32, 60);
-            this.nameLabel.Name = "nameLabel";
-            this.nameLabel.Size = new System.Drawing.Size(35, 13);
-            this.nameLabel.TabIndex = 4;
-            this.nameLabel.Text = "Name";
-            // 
-            // classNameLabel
-            // 
-            this.classNameLabel.AutoSize = true;
-            this.classNameLabel.Location = new System.Drawing.Point(128, 32);
-            this.classNameLabel.Name = "classNameLabel";
-            this.classNameLabel.Size = new System.Drawing.Size(83, 13);
-            this.classNameLabel.TabIndex = 3;
-            this.classNameLabel.Text = "ComonentName";
-            // 
-            // reversedIperlDirectionCheckBox
-            // 
-            this.reversedIperlDirectionCheckBox.AutoSize = true;
-            this.reversedIperlDirectionCheckBox.Enabled = false;
-            this.reversedIperlDirectionCheckBox.Location = new System.Drawing.Point(131, 91);
-            this.reversedIperlDirectionCheckBox.Name = "reversedIperlDirectionCheckBox";
-            this.reversedIperlDirectionCheckBox.Size = new System.Drawing.Size(158, 17);
-            this.reversedIperlDirectionCheckBox.TabIndex = 14;
-            this.reversedIperlDirectionCheckBox.Text = "Reversed direction of iPerl-s";
-            this.reversedIperlDirectionCheckBox.UseVisualStyleBackColor = true;
-            // 
-            // EntryFormCfgCtrl
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.reversedIperlDirectionCheckBox);
-            this.Controls.Add(this.nameTextBox);
-            this.Controls.Add(this.nameLabel);
-            this.Controls.Add(this.classNameLabel);
-            this.Name = "EntryFormCfgCtrl";
-            this.Size = new System.Drawing.Size(300, 200);
-            this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.TextBox nameTextBox;
-		private System.Windows.Forms.Label nameLabel;
-        private System.Windows.Forms.Label classNameLabel;
-        private System.Windows.Forms.CheckBox reversedIperlDirectionCheckBox;
-	}
-}

TBF/BenchControl/GenericDevices/IHasTestName.cs

@@ -1,14 +0,0 @@
-///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
-///
-using System;
-
-namespace TBF.BenchControl.GenericDevices
-{
-    interface IHasTestName
-    {
-        string TestName { set; }
-        int TestRepeats { set; }
-        int RepetitionNr { set; }
-    }
-}

TBF/BenchControl/Output/DB/SensusOracle/Auftrag.cs

@@ -1,33 +0,0 @@
-///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
-///
-using System;
-
-namespace TBF.BenchControl.Output.DB.SensusOracle
-{
-    public class Auftrag
-    {
-        public string AuftragsNummer;      /// Production order
-        public int SollStueck;             /// Targer pieces count
-        public string VariantenCode;       /// Spec
-        public int EsrsteZaehlerNr;        /// First S/N
-        public string Prefix;              /// S/N prefix
-        public string Suffix;              /// S/N suffix
-        public int Zaehlwerk;              /// SAP number of the counter
-        public DateTime Created;
-        public DateTime DueDate;
-        public string Remark;
-
-        public Auftrag()
-        {
-            Prefix = string.Empty;
-            Suffix = string.Empty;
-            Remark = string.Empty;
-        }
-
-        public override string ToString()
-        {
-            return string.Format("{0}  [{1}]  {2}", AuftragsNummer, SollStueck, VariantenCode);
-        }
-    }
-}

TBF/BenchControl/Output/DB/SensusOracle/DatabaseCfg.cs

@@ -1,47 +0,0 @@
-///
-/// Copyright (c) 2015-2019 Sensus Slovensko a.s.
-///
-using System;
-using System.Xml.Serialization;
-using Config.Entities;
-using TBF.BenchControl.Generic;
-
-namespace TBF.BenchControl.Output.DB.SensusOracle
-{
-	public class DatabaseCfg : ComponentCfgBase, Generic.IComponentCfg
-	{
-		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(DatabaseCfg) })[0];
-		public override XmlSerializer GetSerializer() { return Serializer; }
-
-		public IComponentCfgCtrl GetControl() { return new DatabaseCfgCtrl(); }
-
-        /// <summary> Serialized parameters </summary>
-        public bool TestMode;
-
-        /// <summary> Procedure parameters </summary>
-        [XmlIgnore]
-        public ProcedureParams ProcParams;
-        public override IParamsProvider GetRuntimeProcParamsProvider() { return ProcParams; }
-        public override IParamsProvider CreateProcParamsProvider() { return new ProcedureParams(true); }
-
-		/// Private parameterless constructor invoked by all other (public) constructors
-		DatabaseCfg()
-        {
-            ProcParams = new ProcedureParams(true);
-        }
-
-        public DatabaseCfg(string name, IComponentFactory factory)
-            : this()
-        {
-            Name = name;
-            Factory = factory;
-            ParentName = string.Empty;
-            TestMode = false;
-        }
-
-		public string ToString(int i)
-		{
-            return string.Format("Name={0} TestMode={1}", Name, TestMode);
-		}
-	}
-}

TBF/BenchControl/Output/DB/SensusOracle/DatabaseCfgCtrl.cs

@@ -1,76 +0,0 @@
-///
-/// Copyright (c) 2015-2020 Sensus Slovensko a.s.
-///
-using System;
-using System.Windows.Forms;
-using Config.Entities;
-using TBF.BenchControl.Generic;
-
-namespace TBF.BenchControl.Output.DB.SensusOracle
-{
-    public partial class DatabaseCfgCtrl : Configs.ConfigCtrlUtils, IComponentCfgCtrl
-	{
-		public bool ShowMore { get { return false; } }
-
-		DatabaseCfg config;
-		public IComponentCfg Config
-		{
-			get { return config as IComponentCfg; }
-			set
-			{
-				config = value as DatabaseCfg;
-				Redraw();
-			}
-		}
-
-		public DatabaseCfgCtrl()
-		{
-			InitializeComponent();
-		}
-
-		private void WriterCfgCtrl_Load(object sender, EventArgs e)
-		{
-            Redraw();
-		}
-
-		public void Closing()
-		{
-		}
-
-		void Redraw()
-		{
-			if (config == null) return;			/// Control was not loaded, settings were not changed
-			classNameLabel.Text = config.Factory.ClassName;
-			nameTextBox.Text = config.Name;
-            testModeCheckBox.Checked = config.TestMode;
-		}
-
-		public void Unlock()
-		{
-			nameTextBox.Enabled = true;
-            testModeCheckBox.Enabled = true;
-		}
-
-		public CfgUpdateFlags VerifyCfg(ref string message)
-		{
-            return CfgUpdateFlags.None;
-		}
-
-		public CfgUpdateFlags UpdateCfg()
-		{
-            if (config == null) return CfgUpdateFlags.Error;	/// Control was not loaded, settings were not changed
-
-            CfgUpdateFlags flags = CfgUpdateFlags.None;
-
-			if (config.Name != nameTextBox.Text)
-			{
-				config.Name = nameTextBox.Text;
-				flags |= CfgUpdateFlags.RestartRqrd;
-			}
-
-            flags |= UpdateDifferent(ref config.TestMode, testModeCheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd);
-
-			return flags;
-		}
-	}
-}

TBF/BenchControl/Output/DB/SensusOracle/DatabaseCfgCtrl.designer.cs

@@ -1,100 +0,0 @@
-///
-/// Copyright (c) 2015-2018 Sensus Slovensko a.s.
-///
-namespace TBF.BenchControl.Output.DB.SensusOracle
-{
-	partial class DatabaseCfgCtrl
-	{
-		/// <summary> 
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary> 
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Component Designer generated code
-
-		/// <summary> 
-		/// Required method for Designer support - do not modify 
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-            this.nameTextBox = new System.Windows.Forms.TextBox();
-            this.nameLabel = new System.Windows.Forms.Label();
-            this.classNameLabel = new System.Windows.Forms.Label();
-            this.testModeCheckBox = new System.Windows.Forms.CheckBox();
-            this.SuspendLayout();
-            // 
-            // nameTextBox
-            // 
-            this.nameTextBox.Enabled = false;
-            this.nameTextBox.Location = new System.Drawing.Point(123, 59);
-            this.nameTextBox.Name = "nameTextBox";
-            this.nameTextBox.Size = new System.Drawing.Size(146, 20);
-            this.nameTextBox.TabIndex = 2;
-            // 
-            // nameLabel
-            // 
-            this.nameLabel.AutoSize = true;
-            this.nameLabel.Location = new System.Drawing.Point(19, 62);
-            this.nameLabel.Name = "nameLabel";
-            this.nameLabel.Size = new System.Drawing.Size(35, 13);
-            this.nameLabel.TabIndex = 1;
-            this.nameLabel.Text = "Name";
-            // 
-            // classNameLabel
-            // 
-            this.classNameLabel.AutoSize = true;
-            this.classNameLabel.Location = new System.Drawing.Point(120, 31);
-            this.classNameLabel.Name = "classNameLabel";
-            this.classNameLabel.Size = new System.Drawing.Size(83, 13);
-            this.classNameLabel.TabIndex = 0;
-            this.classNameLabel.Text = "ComonentName";
-            // 
-            // testModeCheckBox
-            // 
-            this.testModeCheckBox.AutoSize = true;
-            this.testModeCheckBox.Enabled = false;
-            this.testModeCheckBox.Location = new System.Drawing.Point(123, 113);
-            this.testModeCheckBox.Name = "testModeCheckBox";
-            this.testModeCheckBox.Size = new System.Drawing.Size(155, 17);
-            this.testModeCheckBox.TabIndex = 12;
-            this.testModeCheckBox.Text = "TestMode (no writes to DB)";
-            this.testModeCheckBox.UseVisualStyleBackColor = true;
-            // 
-            // DatabaseCfgCtrl
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.testModeCheckBox);
-            this.Controls.Add(this.nameTextBox);
-            this.Controls.Add(this.nameLabel);
-            this.Controls.Add(this.classNameLabel);
-            this.Name = "DatabaseCfgCtrl";
-            this.Size = new System.Drawing.Size(383, 291);
-            this.Load += new System.EventHandler(this.WriterCfgCtrl_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.TextBox nameTextBox;
-		private System.Windows.Forms.Label nameLabel;
-        private System.Windows.Forms.Label classNameLabel;
-        private System.Windows.Forms.CheckBox testModeCheckBox;
-	}
-}

TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/EntryFormCfgCtrl.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>

TBF/BenchControl/TestMethods/FixedStart/Compound/Factory.cs

@@ -1,25 +0,0 @@
-///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
-///
-using System.Collections.Generic;
-using TBF.BenchControl.Generic;
-using TBF.BenchControl.Configs.NameOnly;
-
-namespace TBF.BenchControl.TestMethods.FixedStart.Compound
-{
-	public class Factory : IComponentFactory
-	{
-		public string ClassName { get { return GetType().Namespace.Substring(17); } }
-
-		public IComponent DummyComponent() { return new Component(); }
-
-		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Component(cfg); }
-
-		public IComponentCfg DefaultConfig() { return new TestMethodCfg(this.GetType().Namespace.Substring(29), this); }
-
-		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
-		{
-			return ComponentCfgBase.CreateFromDbEntity(TestMethodCfg.Serializer, component, this);
-		}
-	}
-}

TBF/BenchControl/TestMethods/FixedStart/Single/Factory.cs

@@ -1,25 +0,0 @@
-///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
-///
-using System.Collections.Generic;
-using TBF.BenchControl.Generic;
-using TBF.BenchControl.Configs.NameOnly;
-
-namespace TBF.BenchControl.TestMethods.FixedStart.Single
-{
-	public class Factory : IComponentFactory
-	{
-		public string ClassName { get { return GetType().Namespace.Substring(17); } }
-
-		public IComponent DummyComponent() { return new Component(); }
-
-		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Component(cfg); }
-
-        public IComponentCfg DefaultConfig() { return new TestMethodCfg(this.GetType().Namespace.Substring(29).Replace(".Single", ""), this); }
-
-		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
-		{
-			return ComponentCfgBase.CreateFromDbEntity(TestMethodCfg.Serializer, component, this);
-		}
-	}
-}

TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/Compound/Factory.cs

@@ -1,25 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System.Collections.Generic;
-using TBF.BenchControl.Generic;
-using TBF.BenchControl.Configs.NameOnly;
-
-namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval.Compound
-{
-	public class Factory : IComponentFactory
-	{
-		public string ClassName { get { return GetType().Namespace.Substring(17); } }
-
-		public IComponent DummyComponent() { return new Component(); }
-
-		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Component(cfg); }
-
-		public IComponentCfg DefaultConfig() { return new TestMethodCfg(this.GetType().Namespace.Substring(29), this); }
-
-		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
-		{
-			return ComponentCfgBase.CreateFromDbEntity(TestMethodCfg.Serializer, component, this);
-		}
-	}
-}

TBF/BenchControl/TestMethods/FixedStartMassCollection/Compound/Factory.cs

@@ -1,25 +0,0 @@
-///
-/// Copyright (c) 2013-2016 Sensus Metering Systems
-///
-using System.Collections.Generic;
-using TBF.BenchControl.Generic;
-using TBF.BenchControl.Configs.NameOnly;
-
-namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.Compound
-{
-	public class Factory : IComponentFactory
-	{
-		public string ClassName { get { return GetType().Namespace.Substring(17); } }
-
-		public IComponent DummyComponent() { return new Component(); }
-
-		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Component(cfg); }
-
-		public IComponentCfg DefaultConfig() { return new TestMethodCfg(this.GetType().Namespace.Substring(29), this); }
-
-		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
-		{
-			return ComponentCfgBase.CreateFromDbEntity(TestMethodCfg.Serializer, component, this);
-		}
-	}
-}

TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/Factory.cs

@@ -1,24 +0,0 @@
-///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
-///
-using System.Collections.Generic;
-using TBF.BenchControl.Generic;
-
-namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl.Compound
-{
-	public class Factory : IComponentFactory
-	{
-		public string ClassName { get { return GetType().Namespace.Substring(17); } }
-
-		public IComponent DummyComponent() { return new Component(); }
-
-		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Component(cfg); }
-
-		public IComponentCfg DefaultConfig() { return new TestMethodCfg(this.GetType().Namespace.Substring(29), this); }
-
-		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
-		{
-			return ComponentCfgBase.CreateFromDbEntity(TestMethodCfg.Serializer, component, this);
-		}
-	}
-}

TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfgCtrl.cs

@@ -1,69 +0,0 @@
-///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
-///
-using System;
-using System.Windows.Forms;
-using Config.Entities;
-using TBF.BenchControl.Generic;
-
-namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl.Compound
-{
-	public partial class TestMethodCfgCtrl : UserControl, IComponentCfgCtrl
-	{
-		public bool ShowMore { get { return false; } }
-
-		TestMethodCfg config;
-		public IComponentCfg Config
-		{
-			get { return config as IComponentCfg; }
-			set
-			{
-				config = value as TestMethodCfg;
-				Redraw();
-			}
-		}
-
-		public TestMethodCfgCtrl()
-		{
-			InitializeComponent();
-		}
-
-		private void EntryFormCfgCtrl_Load(object sender, EventArgs e)
-		{
-			Redraw();
-		}
-
-		public void Closing()
-		{
-		}
-
-		void Redraw()
-		{
-			if (config == null) return;			/// Control was not loaded, settings were not changed
-			classNameLabel.Text = config.Factory.ClassName;
-			nameTextBox.Text = config.Name;
-		}
-
-		public void Unlock()
-		{
-			nameTextBox.Enabled = true;
-		}
-
-		public CfgUpdateFlags VerifyCfg(ref string message)
-		{
-            CfgUpdateFlags flags = CfgUpdateFlags.None;
-			return flags;
-		}
-
-		public CfgUpdateFlags UpdateCfg()
-		{
-			CfgUpdateFlags flags = CfgUpdateFlags.RestartRqrd;
-
-			if (config == null) return CfgUpdateFlags.Error;	/// Control was not loaded, settings were not changed
-
-			config.Name = nameTextBox.Text;
-
-			return flags;
-		}
-	}
-}

TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfgCtrl.designer.cs

@@ -1,86 +0,0 @@
-///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
-///
-namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl.Compound
-{
-	partial class TestMethodCfgCtrl
-	{
-		/// <summary> 
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary> 
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Component Designer generated code
-
-		/// <summary> 
-		/// Required method for Designer support - do not modify 
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.nameTextBox = new System.Windows.Forms.TextBox();
-			this.nameLabel = new System.Windows.Forms.Label();
-			this.classNameLabel = new System.Windows.Forms.Label();
-			this.SuspendLayout();
-			// 
-			// nameTextBox
-			// 
-			this.nameTextBox.Enabled = false;
-			this.nameTextBox.Location = new System.Drawing.Point(137, 57);
-			this.nameTextBox.Name = "nameTextBox";
-			this.nameTextBox.Size = new System.Drawing.Size(130, 20);
-			this.nameTextBox.TabIndex = 5;
-			// 
-			// nameLabel
-			// 
-			this.nameLabel.AutoSize = true;
-			this.nameLabel.Location = new System.Drawing.Point(27, 60);
-			this.nameLabel.Name = "nameLabel";
-			this.nameLabel.Size = new System.Drawing.Size(35, 13);
-			this.nameLabel.TabIndex = 4;
-			this.nameLabel.Text = "Name";
-			// 
-			// classNameLabel
-			// 
-			this.classNameLabel.AutoSize = true;
-			this.classNameLabel.Location = new System.Drawing.Point(134, 33);
-			this.classNameLabel.Name = "classNameLabel";
-			this.classNameLabel.Size = new System.Drawing.Size(83, 13);
-			this.classNameLabel.TabIndex = 3;
-			this.classNameLabel.Text = "ComonentName";
-			// 
-			// BasicPrinterCfgCtrl
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.Controls.Add(this.nameTextBox);
-			this.Controls.Add(this.nameLabel);
-			this.Controls.Add(this.classNameLabel);
-			this.Name = "BasicPrinterCfgCtrl";
-			this.Size = new System.Drawing.Size(300, 200);
-			this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load);
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.TextBox nameTextBox;
-		private System.Windows.Forms.Label nameLabel;
-		private System.Windows.Forms.Label classNameLabel;
-	}
-}

TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/Factory.cs

@@ -1,24 +0,0 @@
-///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
-///
-using System.Collections.Generic;
-using TBF.BenchControl.Generic;
-
-namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl.HeatMeters
-{
-	public class Factory : IComponentFactory
-	{
-		public string ClassName { get { return GetType().Namespace.Substring(17); } }
-
-		public IComponent DummyComponent() { return new Component(); }
-
-		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Component(cfg); }
-
-		public IComponentCfg DefaultConfig() { return new TestMethodCfg(this.GetType().Namespace.Substring(29), this); }
-
-		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
-		{
-			return ComponentCfgBase.CreateFromDbEntity(TestMethodCfg.Serializer, component, this);
-		}
-	}
-}