In progres : Copying results from Config DB to Results DB.

.gitignore

@@ -10,12 +10,12 @@ Encrypt/bin/
 Encrypt/obj/
 GemCard/bin
 GemCard/obj
+GenCode128/bin
+GenCode128/obj
 GraphLib/bin
 GraphLib/obj
 TracingDB/bin
 TracingDB/obj
-RestClient/bin
-RestClient/obj
 Results/bin/
 Results/obj/
 ResultsBrowser/bin/

Config/Config.csproj

@@ -10,30 +10,27 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Config</RootNamespace>
     <AssemblyName>Config</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;MURES_40</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <PlatformTarget>x86</PlatformTarget>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;MURES_40</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FluentNHibernate">
@@ -84,17 +81,19 @@
     <Compile Include="Entities\IperlEnums.cs" />
     <Compile Include="Entities\MeasurementCorrection.cs" />
     <Compile Include="Entities\MetersPath.cs" />
+    <Compile Include="Entities\MeterTestResult.cs" />
     <Compile Include="Entities\OutputPath.cs" />
     <Compile Include="Entities\Procedure.cs" />
-    <Compile Include="Entities\Profile.cs" />
-    <Compile Include="Entities\PTest.cs" />
+    <Compile Include="Entities\ProcedureHistory.cs" />
     <Compile Include="Entities\Test.cs" />
+    <Compile Include="Entities\TestResult.cs" />
     <Compile Include="Entities\TransitionSequence.cs" />
     <Compile Include="Entities\TransitionStep.cs" />
-    <Compile Include="Entities\Uncertainty.cs" />
     <Compile Include="Entities\User.cs" />
     <Compile Include="Entities\VirtualBenchSequence.cs" />
     <Compile Include="Entities\VirtualBenchStep.cs" />
+    <Compile Include="Entities\Watermeter.cs" />
+    <Compile Include="Entities\WMType.cs" />
     <Compile Include="FluentCommon.cs" />
     <Compile Include="Formulas.cs" />
     <Compile Include="Mappings\BenchPathMap.cs" />
@@ -106,15 +105,18 @@
     <Compile Include="Mappings\HeatMetersPathMap.cs" />
     <Compile Include="Mappings\MeasurementCorrectionMap.cs" />
     <Compile Include="Mappings\MetersPathMap.cs" />
+    <Compile Include="Mappings\MeterTestResultMap.cs" />
     <Compile Include="Mappings\OutputPathMap.cs" />
     <Compile Include="Mappings\ProcedureMap.cs" />
-    <Compile Include="Mappings\ProfileMap.cs" />
-    <Compile Include="Mappings\PTestMap.cs" />
     <Compile Include="Mappings\TestMap.cs" />
+    <Compile Include="Mappings\TestResultMap.cs" />
     <Compile Include="Mappings\TransitionSequenceMap.cs" />
     <Compile Include="Mappings\TransitionStepMap.cs" />
-    <Compile Include="Mappings\UncertaintyMap.cs" />
     <Compile Include="Mappings\UserMap.cs" />
+    <Compile Include="Mappings\VirtualBenchSequenceMap.cs" />
+    <Compile Include="Mappings\VirtualBenchStepMap.cs" />
+    <Compile Include="Mappings\WatermeterMap.cs" />
+    <Compile Include="Mappings\WMTypeMap.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resources\Strings.Designer.cs">
       <AutoGen>True</AutoGen>

Config/Data.cs

@@ -32,10 +32,10 @@ namespace Config
 		public const int CompoundWMsCount = 3;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = 3;
-#elif DEWA_300 || ROMA_200
+#elif DEWA_300
         public const int WMsCount = 10;
         public const int LineSize = 10;
-        public const int CompoundWMsCount = 1;
+        public const int CompoundWMsCount = 3;
         public const int HeatMetersCount = 0;
         public const int MaxPartNr = WMsCount / LineSize;
 #elif DUBAJ_50
@@ -110,9 +110,5 @@ namespace Config
 		/// 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/Entities/Component.cs

@@ -1,8 +1,9 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 
 namespace Config.Entities
@@ -18,7 +19,6 @@ namespace Config.Entities
 		public virtual LogLevel Logging { get; set; }
 		public virtual string Parameters { get; set; }
 		public virtual IList<MeasurementCorrection> Corrections { get; set; }
-        public virtual IList<Uncertainty> Uncertainties { get; set; }
 
 		/// ------------- Additional stuff not mapped into the database -------------
 
@@ -27,7 +27,6 @@ namespace Config.Entities
             Name = string.Empty;
             ClassName = string.Empty;
 			Corrections = new List<MeasurementCorrection>();
-            Uncertainties = new List<Uncertainty>();
 		}
 
         public static Component CreateFromCfg(string name, string className, string parentName, int itemNr,

Config/Entities/Enums.cs

@@ -83,23 +83,6 @@ namespace Config.Entities
 		Count,
 	}
 
-    public enum ProfileType
-    {
-        Q3R,
-        QnClassColdWater,
-        QnClassHotWater,
-        QpQi,
-        Manual,
-        Count,
-    }
-
-    public enum ErrorLimitType
-    {
-        Manual,
-        QpClass,
-        Count,
-    }
-
 	/// <summary> Kind of meters for the procedure / test </summary>
 	public enum MetersKind
 	{
@@ -327,13 +310,19 @@ namespace Config.Entities
         Count
 	}
 
-    public enum TestProfile
+    public enum TestRedType
     {
-        UserDefined,
-        UserDefinedHeatMeter,
-        Protected,                  /// The first protected one
-        ProtectedHeatMeter,
-    }
+        Fix,
+        /// etc.
+		Count,
+	}
+
+    public enum FQC1
+    {
+        FQC1,
+        FQP1,
+		Count,
+	}
 
 	public enum Progress
 	{
@@ -588,41 +577,9 @@ namespace Config.Entities
         E29,
         E30,
         E31,
-        E32,
-        E33,
-        E34,
-        E35,
-        E36,
-        E37,
-        E38,
-        E39,
-        E40,
-        E41,
-        E42,
-        E43,
-        E44,
-        E45,
-        E46,
-        E47,
-        E48,
-        E49,
-        E50,
-        E51,
-        E52,
-        E53,
-        E54,
-        E55,
-        E56,
-        E57,
-        E58,
-        E59,
-        E60,
-        E61,
-        E62,
-        E63,
     }
 
-    public enum ErrorFlagMask : long
+    public enum ErrorFlagMask
     {
         E1 = (1 << (int)ErrorFlagShift.E1),
         E2 = (1 << (int)ErrorFlagShift.E2),
@@ -655,37 +612,5 @@ namespace Config.Entities
         E29 = (1 << (int)ErrorFlagShift.E29),
         E30 = (1 << (int)ErrorFlagShift.E30),
         E31 = (1 << (int)ErrorFlagShift.E31),
-        E32 = (1 << (int)ErrorFlagShift.E32),
-        E33 = (1 << (int)ErrorFlagShift.E33),
-        E34 = (1 << (int)ErrorFlagShift.E34),
-        E35 = (1 << (int)ErrorFlagShift.E35),
-        E36 = (1 << (int)ErrorFlagShift.E36),
-        E37 = (1 << (int)ErrorFlagShift.E37),
-        E38 = (1 << (int)ErrorFlagShift.E38),
-        E39 = (1 << (int)ErrorFlagShift.E39),
-        E40 = (1 << (int)ErrorFlagShift.E40),
-        E41 = (1 << (int)ErrorFlagShift.E41),
-        E42 = (1 << (int)ErrorFlagShift.E42),
-        E43 = (1 << (int)ErrorFlagShift.E43),
-        E44 = (1 << (int)ErrorFlagShift.E44),
-        E45 = (1 << (int)ErrorFlagShift.E45),
-        E46 = (1 << (int)ErrorFlagShift.E46),
-        E47 = (1 << (int)ErrorFlagShift.E47),
-        E48 = (1 << (int)ErrorFlagShift.E48),
-        E49 = (1 << (int)ErrorFlagShift.E49),
-        E50 = (1 << (int)ErrorFlagShift.E50),
-        E51 = (1 << (int)ErrorFlagShift.E51),
-        E52 = (1 << (int)ErrorFlagShift.E52),
-        E53 = (1 << (int)ErrorFlagShift.E53),
-        E54 = (1 << (int)ErrorFlagShift.E54),
-        E55 = (1 << (int)ErrorFlagShift.E55),
-        E56 = (1 << (int)ErrorFlagShift.E56),
-        E57 = (1 << (int)ErrorFlagShift.E57),
-        E58 = (1 << (int)ErrorFlagShift.E58),
-        E59 = (1 << (int)ErrorFlagShift.E59),
-        E60 = (1 << (int)ErrorFlagShift.E60),
-        E61 = (1 << (int)ErrorFlagShift.E61),
-        E62 = (1 << (int)ErrorFlagShift.E62),
-        E63 = (1 << (int)ErrorFlagShift.E63),
     }
 }

Config/Entities/Group.cs

@@ -1,27 +1,24 @@
 ///
-/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System;
-using System.Collections.Generic;
 
 namespace Config.Entities
 {
     public class Group
     {
         public virtual int Id { get; protected set; }
-        public virtual Users.Entities.GID GID { get; set; }
-        public virtual long AccessFlags { get; set; }		/// Bitfield of access flags: bit0 .. bit62
-        public virtual IList<User> Users { get; set; }      /// Group can be a member of a list of users
+        public virtual int Gid { get; set; }
+        public virtual string Name { get; set; }
 
 		public Group()
 		{
-            Users = new List<User>();
 		}
 
-        public Group(Users.Entities.GID gid)
-            : this()
-        {
-			GID = gid;
+		public Group(int gid, string name)
+		{
+			Gid = gid;
+			Name = name;
 		}
-    }
+	}
 }

Config/Entities/MeterTestResult.cs

@@ -0,0 +1,67 @@
+///
+/// Copyright (c) 2013-2015 Sensus Metering Systems
+///
+using System;
+
+namespace Config.Entities
+{
+    public class MeterTestResult
+    {
+        public virtual int Id { get; protected set; }
+        public virtual TestResult TestResult { get; set; }      /// reference to the TestResult entity
+
+		public virtual bool Disabled { get; set; }				/// true = this meter was disabled and the results should be disregarded
+		public virtual string SerialNr { get; set; }
+        public virtual string EndState { get; set; }
+        public virtual float VolumeStart { get; set; }          /// liter
+        public virtual float VolumeEnd { get; set; }            /// liter
+        public virtual float VolumeMeter { get; set; }          /// liter
+        public virtual float VolumeRef { get; set; }            /// liter
+        public virtual float VolumeErrorPct { get; set; }       /// %
+        public virtual float PulsesMeter { get; set; }			/// # of pulses
+        public virtual float PulsesPerLiter { get; set; }		/// Pulses per liter
+        public virtual float PulsesMaster { get; set; }
+        public virtual float Time { get; set; }                 /// sec.
+		public virtual float TimeStart { get; set; }            /// sec. - Not mapped to DB !!!
+		public virtual float TimeEnd { get; set; }              /// sec. - Not mapped to DB !!!
+		public virtual int CalibFactor { get; set; }			/// iPerl calibration factor used during the test - Not mapped to DB !!!
+		public virtual double Q2Correction { get; set; }		/// iPerl Q2 correction used during the test - Not mapped to DB !!!
+		public virtual bool Passed { get; set; }				/// true=test passed - Not mapped to DB !!!															
+
+        public MeterTestResult()
+        {
+            PulsesPerLiter = 1.0f;
+        }
+
+        public MeterTestResult(TestResult testResult)
+            : this()
+        {
+            TestResult = testResult;
+        }
+
+        public virtual MeterTestResult Clone(TestResult testResult)
+        {
+            MeterTestResult result = new MeterTestResult(testResult);
+
+			result.Disabled = Disabled;
+			result.SerialNr = SerialNr;
+            result.EndState = EndState;
+            result.VolumeStart = VolumeStart;
+            result.VolumeEnd = VolumeEnd;
+            result.VolumeMeter = VolumeMeter;
+            result.VolumeRef = VolumeRef;
+            result.VolumeErrorPct = VolumeErrorPct;
+            result.PulsesMeter = PulsesMeter;
+            result.PulsesPerLiter = PulsesPerLiter;
+            result.PulsesMaster = PulsesMaster;
+            result.Time = Time;
+			result.TimeStart = TimeStart;
+			result.TimeEnd = TimeEnd;
+			result.CalibFactor = CalibFactor;
+			result.Q2Correction = Q2Correction;
+			result.Passed = Passed;
+
+            return result;
+        }
+    }
+}

Config/Entities/PTest.cs

@@ -1,337 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using System.Globalization;
-using System.IO;
-
-namespace Config.Entities
-{
-    /// <summary>
-    /// Test, consisting of one or more repetitions of the test 'SingleTest'.
-    /// </summary>
-	public class PTest : IHasName, IHasItemNr
-    {
-        public virtual int Id { get; protected set; }
-        public virtual int ItemNr { get; set; }
-        public virtual string Name { get; set; }
-        public virtual int Part { get; set; }				    /// Part=0 ... test of all WM-s                                                               /// Part>0 ... part of a set of tests with the same Name: subset of WM-s is given by MetersPath
-        public virtual double CoefQfrom { get; set; }           /// Water flow low limit in [m3/h]
-        public virtual double CoefQto { get; set; }				/// Water flow high limit in [m3/h]
-        public virtual double ErrLimLo { get; set; }			/// in [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
-        public virtual double ErrLimHi { get; set; }			/// in [%] usually > 0, in case of heat meters: -Qn in m3/h
-        public virtual double TempLimLo { get; set; }		    /// Lower limit for the controlled temperature
-        public virtual double TempLimHi { get; set; }		    /// Upper limit for the controlled temperature
-        public virtual double PressLimLo { get; set; }          /// [bar] min. water pressure                                            
-        public virtual double PressLimHi { get; set; }          /// [bar] max. water pressure                                            
-        public virtual sbyte Publish { get; set; }			    /// 0=no, 1=in all protocols, 2=on screen, 3=internal
-        public virtual bool Evaluate { get; set; }
-
-        public virtual sbyte E1 { get; set; }                   ///
-        public virtual sbyte E2 { get; set; }                   ///
-        public virtual sbyte E3 { get; set; }                   ///
-        public virtual sbyte E4 { get; set; }                   ///
-        public virtual sbyte E5 { get; set; }                   ///
-        public virtual sbyte E6 { get; set; }                   ///
-        public virtual sbyte E7 { get; set; }                   ///
-        public virtual sbyte E8 { get; set; }                   ///
-        public virtual sbyte E9 { get; set; }                   /// 0=off, 1=info, 2=evaluate
-        public virtual sbyte E10 { get; set; }                  ///
-        public virtual sbyte E11 { get; set; }                  ///
-        public virtual sbyte E12 { get; set; }                  ///
-        public virtual sbyte E13 { get; set; }                  ///
-        public virtual sbyte E14 { get; set; }                  ///
-        public virtual sbyte E15 { get; set; }                  ///
-        public virtual sbyte E16 { get; set; }                  ///
-        public virtual sbyte E21 { get; set; }                  ///
-
-        public virtual double Delta_Q_pct { get; set; }			/// [%]  max deviation from the mean flow
-        public virtual double Delta_T { get; set; }				/// [°C] max. T_up or T_down deviation from the mean temperature
-        public virtual double Delta_Tup_Tdn { get; set; }		/// [°C] max. difference abs(T_up - T_down)
-        public virtual double TestTime_min { get; set; }		/// [s]
-        public virtual double TestTime_max { get; set; }		/// [s]
-        public virtual double AmbTemp_min { get; set; }			/// [°C] min. ambient temperature
-        public virtual double AmbTemp_max { get; set; }			/// [°C] max. ambient temperature
-
-        public virtual double Coef_E9 { get; set; }				/// Coefficient used in E9, default 0.025
-        public virtual double Coef_E10 { get; set; }			/// Coefficient used in E10, default 0.04
-        public virtual double Coef_E11 { get; set; }			/// Coefficient used in E11, default 0.1
-        public virtual double Coef_E12 { get; set; }			/// Coefficient used in E12, default 1
-        public virtual double Offset_E9 { get; set; }           /// [s] default 0 (no offset)
-        public virtual double Offset_E12 { get; set; }          /// [s] default 0 (no offset)
-
-		public virtual Profile Profile { get; set; }
-
-        /// ------------- Additional stuff not mapped into the database -------------
-
-        public PTest()
-        {
-			///
-			/// Default values
-			///
-            Part = 0;
-            CoefQfrom = 1.0;
-            CoefQto = 1.1;
-            ErrLimLo = -2.0;		/// [%]
-            ErrLimHi = 2.0;			/// [%]
-            TempLimLo = 15.0;	    /// [°C]
-            TempLimHi = 25.0;	    /// [°C]
-            PressLimLo = 0;	        /// [bar]
-            PressLimHi = 16.0;	    /// [bar]
-            Publish = (sbyte)Config.Entities.Publish.Always;
-            Evaluate = true;
-
-            E1 = 1;
-            E2 = 1;
-            E3 = 1;
-            E4 = 1;
-            E5 = 1;
-            E6 = 1;
-            E7 = 1;
-            E8 = 1;
-            E9 = 1;
-            E10 = 1;
-            E11 = 1;
-            E12 = 1;
-            E13 = 1;
-            E14 = 1;
-            E15 = 1;
-            E16 = 1;
-            E21 = 1;
-
-            Delta_Q_pct = 5.0;		/// [%]
-            Delta_T = 10.0;		    /// [°C]
-            Delta_Tup_Tdn = 10.0;	/// [°C]
-            TestTime_min = 0;		/// [s]
-            TestTime_max = 99999;	/// [s]
-            AmbTemp_min = 5.0;	    /// [°C]
-            AmbTemp_max = 95.0;	    /// [°C]
-
-            Coef_E9 = 0.025;
-            Coef_E10 = 0.04;
-            Coef_E11 = 0.1;
-            Coef_E12 = 1.0;
-            Offset_E9 = 0;          /// [s]
-            Offset_E12 = 0;         /// [s]
-		}
-
-		public PTest(string name, int itemNr, Profile profile)
-			: this()
-		{
-			Name = name;
-			ItemNr = itemNr;
-			Profile = profile;
-		}
-
-        // Makes a new copy of this object (not just a reference)
-        public virtual PTest Clone()
-        {
-            PTest result = new PTest(Name, ItemNr, Profile);
-
-            result.Part = Part;
-            result.CoefQfrom = CoefQfrom;
-            result.CoefQto = CoefQto;
-			result.ErrLimLo = ErrLimLo;
-			result.ErrLimHi = ErrLimHi;
-			result.TempLimLo = TempLimLo;
-			result.TempLimHi = TempLimHi;
-            result.PressLimLo = PressLimLo;
-            result.PressLimHi = PressLimHi;
-            result.Publish = Publish;
-            result.Evaluate = Evaluate;
-
-            result.E1 = E1;
-            result.E2 = E2;
-            result.E3 = E3;
-            result.E4 = E4;
-            result.E5 = E5;
-            result.E6 = E6;
-            result.E7 = E7;
-            result.E8 = E8;
-            result.E9 = E9;
-            result.E10 = E10;
-            result.E11 = E11;
-            result.E12 = E12;
-            result.E13 = E13;
-            result.E14 = E14;
-            result.E15 = E15;
-            result.E16 = E16;
-            result.E21 = E21;
-
-            result.Delta_Q_pct = Delta_Q_pct;
-            result.Delta_T = Delta_T;
-            result.Delta_Tup_Tdn = Delta_Tup_Tdn;
-            result.TestTime_min = TestTime_min;
-            result.TestTime_max = TestTime_max;
-            result.AmbTemp_min = AmbTemp_min;
-            result.AmbTemp_max = AmbTemp_max;
-
-            result.Coef_E9 = Coef_E9;
-            result.Coef_E10 = Coef_E10;
-            result.Coef_E11 = Coef_E11;
-            result.Coef_E12 = Coef_E12;
-            result.Offset_E9 = Offset_E9;
-            result.Offset_E12 = Offset_E12;
-
-            return result;
-        }
-
-        public virtual void Export(StreamWriter output)
-        {
-            CultureInfo ci = CultureInfo.InvariantCulture;
-
-            output.WriteLine(Name);
-            output.WriteLine(Part);
-            output.WriteLine(CoefQfrom.ToString(ci));
-            output.WriteLine(CoefQto.ToString(ci));
-            output.WriteLine(ErrLimLo.ToString(ci));
-            output.WriteLine(ErrLimHi.ToString(ci));
-			output.WriteLine(TempLimLo.ToString(ci));
-			output.WriteLine(TempLimHi.ToString(ci));
-            output.WriteLine(PressLimLo.ToString(ci));
-            output.WriteLine(PressLimHi.ToString(ci));
-            output.WriteLine(Publish.ToString());
-            output.WriteLine(Evaluate.ToString());
-
-            output.WriteLine(E1.ToString());
-            output.WriteLine(E2.ToString());
-            output.WriteLine(E3.ToString());
-            output.WriteLine(E4.ToString());
-            output.WriteLine(E5.ToString());
-            output.WriteLine(E6.ToString());
-            output.WriteLine(E7.ToString());
-            output.WriteLine(E8.ToString());
-            output.WriteLine(E9.ToString());
-            output.WriteLine(E10.ToString());
-            output.WriteLine(E11.ToString());
-            output.WriteLine(E12.ToString());
-            output.WriteLine(E13.ToString());
-            output.WriteLine(E14.ToString());
-            output.WriteLine(E15.ToString());
-            output.WriteLine(E16.ToString());
-            output.WriteLine(E21.ToString());
-
-            output.WriteLine(Delta_Q_pct.ToString(ci));
-            output.WriteLine(Delta_T.ToString(ci));
-            output.WriteLine(Delta_Tup_Tdn.ToString(ci));
-            output.WriteLine(TestTime_min.ToString(ci)); 
-            output.WriteLine(TestTime_max.ToString(ci));
-            output.WriteLine(AmbTemp_min.ToString(ci));
-            output.WriteLine(AmbTemp_max.ToString(ci));
-            
-            output.WriteLine(Coef_E9.ToString(ci));
-            output.WriteLine(Coef_E10.ToString(ci));
-            output.WriteLine(Coef_E11.ToString(ci));
-            output.WriteLine(Coef_E12.ToString(ci));
-            output.WriteLine(Offset_E9.ToString(ci));
-            output.WriteLine(Offset_E12.ToString(ci));
-        }
-
-        public static PTest Import(StreamReader input, Profile newProfile)
-        {
-            string firstLine = input.ReadLine();
-            if (string.IsNullOrEmpty(firstLine))
-            {
-                return null;
-            }
-
-            CultureInfo ci = CultureInfo.InvariantCulture;
-            PTest tst = new PTest();
-
-            tst.Name = firstLine;
-            tst.Part = int.Parse(input.ReadLine());
-            tst.CoefQfrom = double.Parse(input.ReadLine(), ci);
-			tst.CoefQto = double.Parse(input.ReadLine(), ci);
-			tst.ErrLimLo = double.Parse(input.ReadLine(), ci);
-			tst.ErrLimHi = double.Parse(input.ReadLine(), ci);
-			tst.TempLimLo = double.Parse(input.ReadLine(), ci);
-			tst.TempLimHi = double.Parse(input.ReadLine(), ci);
-            tst.Publish = sbyte.Parse(input.ReadLine());
-            tst.Evaluate = bool.Parse(input.ReadLine());
-
-            /// TODO (E1 .. E21)
-
-            tst.Delta_Q_pct = double.Parse(input.ReadLine(), ci);
-            tst.Delta_T = double.Parse(input.ReadLine(), ci);
-            tst.Delta_Tup_Tdn = double.Parse(input.ReadLine(), ci);
-            tst.TestTime_min = double.Parse(input.ReadLine(), ci);
-            tst.TestTime_max = double.Parse(input.ReadLine(), ci);
-            tst.AmbTemp_min = double.Parse(input.ReadLine(), ci);
-            tst.AmbTemp_max = double.Parse(input.ReadLine(), ci);
-
-            tst.Coef_E9 = double.Parse(input.ReadLine(), ci);
-            tst.Coef_E10 = double.Parse(input.ReadLine(), ci);
-            tst.Coef_E11 = double.Parse(input.ReadLine(), ci);
-            tst.Coef_E12 = double.Parse(input.ReadLine(), ci);
-            tst.Offset_E9 = double.Parse(input.ReadLine(), ci);
-            tst.Offset_E12 = double.Parse(input.ReadLine(), ci);
-
-            tst.Profile = newProfile;
-            return tst;
-        }
-
-        public virtual string Compare(StreamReader inp)
-        {
-            System.Text.StringBuilder diff = new System.Text.StringBuilder();
-            string fmt = string.Format("Test {0} : ", Name) + "{0} = {1}\r\n (in the file {2})\r\n";
-            string ln;
-            CultureInfo ci = CultureInfo.InvariantCulture;
-
-            string firstLine = inp.ReadLine();
-            if (string.IsNullOrEmpty(firstLine)) return string.Format("Test {0} is missing in the file\r\n", Name);
-
-                                 if (Name != firstLine)               { diff.AppendFormat(fmt, "Name", Name, firstLine); };
-            ln = inp.ReadLine(); if (ln != Part.ToString())           { diff.AppendFormat(fmt, "Part", Part.ToString(), ln); };
-            ln = inp.ReadLine(); if (ln != CoefQfrom.ToString(ci))    { diff.AppendFormat(fmt, "CoefQfrom", CoefQfrom.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != CoefQto.ToString(ci))      { diff.AppendFormat(fmt, "CoefQto", CoefQto.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != ErrLimLo.ToString(ci))     { diff.AppendFormat(fmt, "ErrLimLo", ErrLimLo.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != ErrLimHi.ToString(ci))     { diff.AppendFormat(fmt, "ErrLimHi", ErrLimHi.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != TempLimLo.ToString(ci))    { diff.AppendFormat(fmt, "TempLimLo", TempLimLo.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != TempLimHi.ToString(ci))    { diff.AppendFormat(fmt, "TempLimHi", TempLimHi.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != PressLimLo.ToString(ci))   { diff.AppendFormat(fmt, "Pressure_min", PressLimLo.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != PressLimHi.ToString(ci))   { diff.AppendFormat(fmt, "Pressure_max", PressLimHi.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != Publish.ToString())        { diff.AppendFormat(fmt, "Publish", Publish.ToString(), ln); };
-            ln = inp.ReadLine(); if (ln != Evaluate.ToString())       { diff.AppendFormat(fmt, "Evaluate", Evaluate.ToString(), ln); };
-
-            ln = inp.ReadLine(); if (ln != E1.ToString()) { diff.AppendFormat(fmt, "E1", E1.ToString(), ln); };
-            ln = inp.ReadLine(); if (ln != E2.ToString()) { diff.AppendFormat(fmt, "E2", E2.ToString(), ln); };
-            ln = inp.ReadLine(); if (ln != E3.ToString()) { diff.AppendFormat(fmt, "E3", E3.ToString(), ln); };
-            ln = inp.ReadLine(); if (ln != E4.ToString()) { diff.AppendFormat(fmt, "E4", E4.ToString(), ln); };
-            ln = inp.ReadLine(); if (ln != E5.ToString()) { diff.AppendFormat(fmt, "E5", E5.ToString(), ln); };
-            ln = inp.ReadLine(); if (ln != E6.ToString()) { diff.AppendFormat(fmt, "E6", E6.ToString(), ln); };
-            ln = inp.ReadLine(); if (ln != E7.ToString()) { diff.AppendFormat(fmt, "E7", E7.ToString(), ln); };
-            ln = inp.ReadLine(); if (ln != E8.ToString()) { diff.AppendFormat(fmt, "E8", E8.ToString(), ln); };
-            ln = inp.ReadLine(); if (ln != E9.ToString()) { diff.AppendFormat(fmt, "E9", E9.ToString(), ln); };
-            ln = inp.ReadLine(); if (ln != E10.ToString()) { diff.AppendFormat(fmt, "E10", E10.ToString(), ln); };
-            ln = inp.ReadLine(); if (ln != E11.ToString()) { diff.AppendFormat(fmt, "E11", E11.ToString(), ln); };
-            ln = inp.ReadLine(); if (ln != E12.ToString()) { diff.AppendFormat(fmt, "E12", E12.ToString(), ln); };
-            ln = inp.ReadLine(); if (ln != E13.ToString()) { diff.AppendFormat(fmt, "E13", E13.ToString(), ln); };
-            ln = inp.ReadLine(); if (ln != E14.ToString()) { diff.AppendFormat(fmt, "E14", E14.ToString(), ln); };
-            ln = inp.ReadLine(); if (ln != E15.ToString()) { diff.AppendFormat(fmt, "E15", E15.ToString(), ln); };
-            ln = inp.ReadLine(); if (ln != E16.ToString()) { diff.AppendFormat(fmt, "E16", E16.ToString(), ln); };
-            ln = inp.ReadLine(); if (ln != E21.ToString()) { diff.AppendFormat(fmt, "E21", E21.ToString(), ln); };
-
-            ln = inp.ReadLine(); if (ln != Delta_Q_pct.ToString(ci)) { diff.AppendFormat(fmt, "Delta_Q_pct", Delta_Q_pct.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != Delta_T.ToString(ci)) { diff.AppendFormat(fmt, "Delta_T", Delta_T.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != Delta_Tup_Tdn.ToString(ci)) { diff.AppendFormat(fmt, "Delta_Tup_Tdn", Delta_Tup_Tdn.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != TestTime_min.ToString(ci)) { diff.AppendFormat(fmt, "TestTime_min", TestTime_min.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != TestTime_max.ToString(ci)) { diff.AppendFormat(fmt, "TestTime_max", TestTime_max.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != AmbTemp_min.ToString(ci)) { diff.AppendFormat(fmt, "AmbTemp_min", AmbTemp_min.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != AmbTemp_max.ToString(ci)) { diff.AppendFormat(fmt, "AmbTemp_max", AmbTemp_max.ToString(ci), ln); };
-
-            ln = inp.ReadLine(); if (ln != Coef_E9.ToString(ci)) { diff.AppendFormat(fmt, "Coef_E9", Coef_E9.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != Coef_E10.ToString(ci)) { diff.AppendFormat(fmt, "Coef_E10", Coef_E10.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != Coef_E11.ToString(ci)) { diff.AppendFormat(fmt, "Coef_E11", Coef_E11.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != Coef_E12.ToString(ci)) { diff.AppendFormat(fmt, "Coef_E12", Coef_E12.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != Offset_E9.ToString(ci)) { diff.AppendFormat(fmt, "Offset_E9", Offset_E9.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != Offset_E12.ToString(ci)) { diff.AppendFormat(fmt, "Offset_E12", Offset_E12.ToString(ci), ln); };
-
-            return diff.ToString();
-        }
-
-		public override string ToString()
-		{
-			return string.Format("{0}", Name);
-		}
-    }
-}

Config/Entities/Procedure.cs

@@ -86,10 +86,12 @@ namespace Config.Entities
 			result.LastChgUser = LastChgUser;
 			result.LastChgTime = LastChgTime;
 			result.LongDescription = LongDescription;
+
 			result.ProcedureState = ProcedureState;
 			result.Revision = Revision;
 			result.PredecessorId = Id;
 			result.ObtainedByCopy = ObtainedByCopy;
+
 			result.MetersKind = MetersKind;
 			result.Watermeters = Watermeters;
             result.Protected = Protected;
@@ -100,8 +102,6 @@ namespace Config.Entities
 			result.ResultsWriter = ResultsWriter;
 			result.TransitionStart = TransitionStart;
 			result.TransitionEnd = TransitionEnd;
-            result.AltProcName = AltProcName;
-            result.AltProcPeriod = AltProcPeriod;
 
 			foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone(result)); }
 			foreach (var test in Tests) { result.Tests.Add(test.Clone()); }

Config/Entities/ProcedureHistory.cs

@@ -0,0 +1,31 @@
+///
+/// Copyright (c) 2013-2015 Sensus Metering Systems
+///
+using System;
+using System.Collections.Generic;
+
+namespace Config.Entities
+{
+    public class ProcedureHistory
+    {
+        public virtual int Id { get; protected set; }
+        public virtual Procedure Current { get; set; }
+        public virtual IList<Procedure> OldProcedures { get; set; }
+
+        /// ------------- Additional stuff not mapped into the database -------------
+
+        public ProcedureHistory()
+        {
+            Current = new Procedure();
+            OldProcedures = new List<Procedure>();
+        }
+
+        public virtual ProcedureHistory Clone()
+        {
+            ProcedureHistory result = new ProcedureHistory();
+            result.Current = Current.Clone();
+            foreach (Procedure p in OldProcedures) result.OldProcedures.Add(p.Clone());
+            return result;
+        }
+    }
+}

Config/Entities/Profile.cs

@@ -1,143 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-
-namespace Config.Entities
-{
-    /// <summary>
-    /// Stores one test procedure, supports revisions and history log
-    /// </summary>
-	public class Profile : IHasName, IHasItemNr
-    {
-        public virtual int Id { get; protected set; }
-		public virtual int ItemNr { get; set; }
-		public virtual string Name { get; set; }
-        public virtual string Description { get; set; }			    /// Short description
-		public virtual string CreationUser { get; set; }		    /// Name of the user who has created or changed this procedure
-		public virtual DateTime CreationTime { get; set; }		    /// Date and time of the creation or change
-		public virtual string LastChgUser { get; set; }			    /// Name of the user who has created or changed this procedure
-		public virtual DateTime LastChgTime { get; set; }		    /// Date and time of the creation or change
-        public virtual ProfileType ProfileType { get; set; }
-        public virtual ErrorLimitType ErrorLimitType { get; set; }
-
-		public virtual IList<PTest> Tests { get; set; }
-
-        /// ------------- Additional stuff not mapped into the database -------------
-
-        public Profile()
-        {
-			Tests = new List<PTest>();
-
-			///
-			/// Default values
-			/// 
-			CreationUser = (Users.GlobalData.CurrentUser != null) ? Users.GlobalData.CurrentUser.UserName : null;
-			CreationTime = DateTime.Now;
-			LastChgUser = CreationUser;
-			LastChgTime = CreationTime;
-			Description = string.Empty;
-        }
-
-		public Profile(string name, int itemNr)
-			: this()
-		{
-			Name = name;
-			ItemNr = itemNr;
-		}
-
-        public virtual Profile Clone()
-        {
-            Profile result = new Profile();
-
-			result.ItemNr = ItemNr;
-			result.Name = Name;
-			result.Description = Description;
-			result.CreationUser = CreationUser;
-			result.CreationTime = CreationTime;
-			result.LastChgUser = LastChgUser;
-			result.LastChgTime = LastChgTime;
-            result.ProfileType = ProfileType;
-            result.ErrorLimitType = ErrorLimitType;
-
-			foreach (var test in Tests) { result.Tests.Add(test.Clone()); }
-
-            return result;
-        }
-
-        public virtual void Export(StreamWriter output)
-        {
-			output.WriteLine(ItemNr.ToString(CultureInfo.InvariantCulture));
-            output.WriteLine(Name);
-            output.WriteLine(Description);
-            output.WriteLine(CreationUser);
-			output.WriteLine(CreationTime.ToString(CultureInfo.InvariantCulture));
-            output.WriteLine(LastChgUser);
-			output.WriteLine(LastChgTime.ToString(CultureInfo.InvariantCulture));
-
-            foreach (var test in Tests) { test.Export(output); }
-            output.WriteLine();
-
-            output.Close();
-        }
-
-        public static Profile Import(StreamReader input)
-        {
-            Profile result = new Profile();
-
-			result.ItemNr = int.Parse(input.ReadLine(), CultureInfo.InvariantCulture);
-            result.Name = input.ReadLine();
-            result.Description = input.ReadLine();
-            result.CreationUser = input.ReadLine();
-			result.CreationTime = DateTime.Parse(input.ReadLine(), CultureInfo.InvariantCulture);
-            result.LastChgUser = input.ReadLine();
-			result.LastChgTime = DateTime.Parse(input.ReadLine(), CultureInfo.InvariantCulture);
-            string line = input.ReadLine();
-
-            while (true)
-            {
-                PTest tst = PTest.Import(input, result);
-                if (tst == null)
-                    break;
-                else
-                    result.Tests.Add(tst);
-            }
-
-            return result;
-        }
-
-        public virtual string Compare(StreamReader inp)
-        {
-            System.Text.StringBuilder diff = new System.Text.StringBuilder();
-            const string fmt = "{0} = {1}\r\n (in the file {2})\r\n";
-            string ln;
-
-            ln = inp.ReadLine();            /// skip ItemNr
-            ln = inp.ReadLine(); if (ln != Name)                          { diff.AppendFormat(fmt, "Name", Name, ln); };
-            ln = inp.ReadLine(); if (ln != Description)                   { diff.AppendFormat(fmt, "Description", Description, ln); };
-            ln = inp.ReadLine();            /// skip CreationUser
-            ln = inp.ReadLine();            /// skip CreationTime
-            ln = inp.ReadLine();            /// skip LastChgUser
-            ln = inp.ReadLine();            /// skip LastChgTime
-
-            //foreach (var test in Tests)
-            //{
-            //    string testDiff = test.Compare(inp);
-            //    if (testDiff.Contains(
-            //}
-
-            //bool extraTestsInFile = true;
-            //while (Test.Import(inp, null) != null) { extraTestsInFile = true; }
-
-            return diff.ToString();
-        }
-
-		public override string ToString()
-		{
-			return string.Format("{0}", Name);
-		}
-    }
-}

Config/Entities/Test.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -18,11 +18,9 @@ namespace Config.Entities
         public virtual string Name { get; set; }	
 		public virtual int Part { get; set; }				/// Part=0 ... test of all WM-s
 															/// Part>0 ... part of a set of tests with the same Name: subset of WM-s is given by MetersPath
-        public virtual TestProfile Profile { get; set; }    /// UserDefined, Protected, UserDefinedHeatMeter, ProtectedHeatMeter
-        public virtual sbyte Publish { get; set; }			/// 0=no, 1=in all protocols, 2=on screen, 3=internal
-		public virtual bool DoEvaluate { get; set; }
-        public virtual float Qtg { get; set; }              /// Target water flow [m3/h]
-        public virtual float Qfrom { get; set; }			/// Water flow low limit in [m3/h]
+		public virtual sbyte Publish { get; set; }			/// 0=no, 1=in all protocols, 2=on screen, 3=internal
+		public virtual bool DoEvaluate { get; set; }	
+		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]
@@ -45,7 +43,7 @@ namespace Config.Entities
         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 string RedType { get; set; }
+        public virtual TestRedType RedType { get; set; }
 		public virtual string FeedingPath { get; set; }
 		public virtual string BenchPath { get; set; }
 		public virtual string OutputPath { get; set; }
@@ -55,6 +53,7 @@ namespace Config.Entities
 #endif
         public virtual string RelTransBefore { get; set; }
 		public virtual string RelTransBetween { get; set; }
+		public virtual string RelTransAfter { get; set; }
 		public virtual string TransitionAfter { get; set; }
 
         public virtual bool IsOuterLoopStart { get; set; }  /// Not mapped to database
@@ -73,9 +72,7 @@ namespace Config.Entities
 			///
 			/// Default values
 			///
-            Part = 0;
-            Profile = TestProfile.UserDefined;
-            Publish = (sbyte)Config.Entities.Publish.Always;
+			Publish = (sbyte)Config.Entities.Publish.Always;
 			DoEvaluate = true;
 			Repeats = 1;
 			DoDraining = false;
@@ -97,6 +94,7 @@ namespace Config.Entities
             TolerRed = 0;					/// = Filter parameter
 			RelTransBefore  = string.Empty;
 			RelTransBetween = string.Empty;
+			RelTransAfter   = string.Empty;
 			TransitionAfter = string.Empty;
 		}
 
@@ -114,10 +112,8 @@ namespace Config.Entities
             Test result = new Test(Name, ItemNr, Procedure);
 
 			result.Part = Part;
-            result.Profile = Profile;
-            result.Publish = Publish;
+			result.Publish = Publish;
 			result.DoEvaluate = DoEvaluate;
-            result.Qtg = Qtg;
 			result.Qfrom = Qfrom;
             result.Qto = Qto;
 			result.Volume = Volume;
@@ -151,6 +147,7 @@ namespace Config.Entities
 #endif
 			result.RelTransBefore = RelTransBefore;
 			result.RelTransBetween = RelTransBetween;
+			result.RelTransAfter = RelTransAfter;
 			result.TransitionAfter = TransitionAfter;
 			foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone()); }
 
@@ -165,7 +162,6 @@ namespace Config.Entities
             output.WriteLine(Part.ToString(ci));
             output.WriteLine(Publish.ToString(ci));
             output.WriteLine(DoEvaluate.ToString());
-            output.WriteLine(Qtg.ToString(ci));
             output.WriteLine(Qfrom.ToString(ci));
             output.WriteLine(Qto.ToString(ci));
             output.WriteLine(Volume.ToString(ci));
@@ -194,7 +190,7 @@ namespace Config.Entities
             output.WriteLine(MetersPath);
             output.WriteLine(RelTransBefore);
             output.WriteLine(RelTransBetween);
-            output.WriteLine(Profile);
+            output.WriteLine(RelTransAfter);
             output.WriteLine(TransitionAfter);
 
             foreach (var prms in MoreParams) { prms.Export(output); }
@@ -216,8 +212,7 @@ namespace Config.Entities
 			tst.Part = int.Parse(input.ReadLine(), ci);
 			tst.Publish = sbyte.Parse(input.ReadLine(), ci);
 			tst.DoEvaluate = bool.Parse(input.ReadLine());
-            tst.Qtg = float.Parse(input.ReadLine(), ci);
-            tst.Qfrom = float.Parse(input.ReadLine(), ci);
+			tst.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);
@@ -245,10 +240,7 @@ namespace Config.Entities
             tst.MetersPath = input.ReadLine();
             tst.RelTransBefore = input.ReadLine();
             tst.RelTransBetween = input.ReadLine();
-            string line = input.ReadLine();
-            tst.Profile = line.Equals(TestProfile.ProtectedHeatMeter.ToString()) ? TestProfile.ProtectedHeatMeter
-                          : line.Equals(TestProfile.UserDefinedHeatMeter.ToString()) ? TestProfile.UserDefinedHeatMeter
-                          : line.Equals(TestProfile.Protected.ToString()) ? TestProfile.Protected : TestProfile.UserDefined;  /// UserDefined is the default
+            tst.RelTransAfter = input.ReadLine();
             tst.TransitionAfter = input.ReadLine();
 
             while (true)
@@ -278,7 +270,6 @@ namespace Config.Entities
             ln = inp.ReadLine(); if (ln != Part.ToString(ci))               { diff.AppendFormat(fmt, "Part", Part.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Publish.ToString(ci))            { diff.AppendFormat(fmt, "Publish", Publish.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != DoEvaluate.ToString(ci))         { diff.AppendFormat(fmt, "Evaluate", DoEvaluate.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != Qtg.ToString(ci))                { diff.AppendFormat(fmt, "Qtg", Qtg.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Qfrom.ToString(ci))              { diff.AppendFormat(fmt, "Qfrom", Qfrom.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Qto.ToString(ci))                { diff.AppendFormat(fmt, "Qto", Qto.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Volume.ToString(ci))             { diff.AppendFormat(fmt, "Volume", Volume.ToString(ci), ln); };
@@ -289,7 +280,7 @@ namespace Config.Entities
             ln = inp.ReadLine(); if (ln != Uncertainty.ToString(ci))        { diff.AppendFormat(fmt, "Uncertainty", Uncertainty.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Repeats.ToString(ci))            { diff.AppendFormat(fmt, "Repeats", Repeats.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != DoDraining.ToString(ci))         { diff.AppendFormat(fmt, "Draining", DoDraining.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != DoDrainingAfter.ToString(ci))    { diff.AppendFormat(fmt, "Zeroing", DoDrainingAfter.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != DoDrainingAfter.ToString(ci))          { diff.AppendFormat(fmt, "Zeroing", DoDrainingAfter.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != DoControlWaterTemp.ToString())   { diff.AppendFormat(fmt, "DoControlWaterTemp", DoControlWaterTemp.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != TempLimLo.ToString(ci))          { diff.AppendFormat(fmt, "TempLimLo", TempLimLo.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != TempLimHi.ToString(ci))          { diff.AppendFormat(fmt, "TempLimHi", TempLimHi.ToString(ci), ln); };
@@ -307,7 +298,7 @@ namespace Config.Entities
             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 != Profile.ToString())            { diff.AppendFormat(fmt, "RelTransAfter", Profile, ln); };
+            ln = inp.ReadLine(); if (ln != RelTransAfter)                   { diff.AppendFormat(fmt, "RelTransAfter", RelTransAfter, ln); };
             ln = inp.ReadLine(); if (ln != TransitionAfter)                 { diff.AppendFormat(fmt, "TransitionAfter", TransitionAfter, ln); };
 
             return diff.ToString();

Config/Entities/TestResult.cs

@@ -0,0 +1,171 @@
+///
+/// Copyright (c) 2013-2015 Sensus Metering Systems
+///
+using System;
+using System.Collections.Generic;
+
+namespace Config.Entities
+{
+    public class TestResult
+    {
+        public virtual int Id { get; protected set; }
+		public virtual string Name { get; set; }
+		public virtual int BatchNr { get; set; }
+		public virtual string PurchaseOrder { get; set; }
+		public virtual MetersKind MetersKind { get; set; }
+		public virtual IList<MeterTestResult> Meters { get; set; }
+		public virtual IList<MeterTestResult> CombinedMeters { get; set; }
+
+        /// Value copied from the procedure (Entities.Procedure)
+        public virtual string ProcedureName { get; set; }
+		public virtual string ProtocolTitle { get; set; }
+
+		/// Values copied from the test (Entities.Test)
+        public virtual int TestId { get; set; }				/// Test entity ID to distinguish between tests with the same name
+		public virtual string TestName { get; set; }
+		public virtual int Part { get; set; }
+		public virtual bool DoNotEvaluate { get; set; }		///        Not mapped to the database
+		public virtual bool DoNotPublish { get; set; }		///        Not mapped to the database
+		public virtual float Qfrom { get; set; }			/// [m3/h] Water flow low limit
+		public virtual float Qto { get; set; }				/// [m3/h] Water flow high limit
+		public virtual float Volume { get; set; }			/// [l]    Target test volume
+		public virtual float TstTime { get; set; }			/// [s]    Test time estimate
+		public virtual int Repeats { get; set; }
+		public virtual bool Emptying { get; set; }
+		public virtual bool Zeroing { get; set; }
+		public virtual float PumpPower { get; set; }		/// Power of the pump in [%] in the range 0 .. 100.0f, use values 0% and 100% for non-FM pumps
+		public virtual int Time2MassMsrmt { get; set; }
+		public virtual string Method { get; set; }
+		public virtual float ErrLimLo { get; set; }			/// [%]    Lower error limit (usually < 0)
+		public virtual float ErrLimHi { get; set; }			/// [%]    Upper error limit (usually > 0)
+		public virtual float Uncertainty { get; set; }		///	[%]    Makes error limits tighter: 0 <= Uncertainty <= abs(ErrLimXx)
+		
+		/// To be replaced by the virtual bench component parameters
+		public virtual string FeedingPath { get; set; }
+		public virtual string BenchPath { get; set; }
+		public virtual string OutputPath { get; set; }
+		public virtual string MetersPath { get; set; }
+
+		/// Results
+		public virtual DateTime TimeStart { get; set; }     ///         Date and time of the test start
+		public virtual DateTime TimeEnd { get; set; }       ///         Date and time of the test end
+		public virtual int RepetitionNr { get; set; }       ///         Repetition number from the set of repeated tests (1...)
+		public virtual float AmbientTempAve { get; set; }   /// [deg.C] Average ambient air temperature
+        public virtual float AmbientPressAve { get; set; }  ///         Average ambient air pressure
+		public virtual float AmbientHumiAve { get; set; }   /// [%]     Average ambient air relative humidity
+		public virtual float PressInAvrg { get; set; }      /// [Bar]   Input water pressure (average)
+		public virtual float PressInStart { get; set; }     /// [Bar]
+		public virtual float PressInEnd { get; set; }       /// [Bar]
+		public virtual float PressOutAvrg { get; set; }     /// [Bar]
+		public virtual float PressOutStart { get; set; }    /// [Bar]
+		public virtual float PressOutEnd { get; set; }      /// [Bar]
+		public virtual float TempInAvrg { get; set; }		/// [deg.C]
+		public virtual float TempInStart { get; set; }		/// [deg.C]
+		public virtual float TempInEnd { get; set; }		/// [deg.C]
+		public virtual float TempOutAvrg { get; set; }		/// [deg.C]
+		public virtual float TempOutStart { get; set; }		/// [deg.C]
+		public virtual float TempOutEnd { get; set; }		/// [deg.C]
+		public virtual float TempDivAvrg { get; set; }		/// [deg.C]
+		public virtual float TempDivStart { get; set; }		/// [deg.C]
+		public virtual float TempDivEnd { get; set; }		/// [deg.C]
+		public virtual float MassStartRaw { get; set; }		/// [kg]
+		public virtual float MassStart { get; set; }		/// [kg]
+		public virtual float MassEndRaw { get; set; }		/// [kg]
+		public virtual float MassEnd { get; set; }			/// [kg]
+		public virtual float MassDiff { get; set; }			/// [kg]
+		public virtual float DensityIn { get; set; }		/// [kg/m3]
+		public virtual float DensityOut { get; set; }		/// [kg/m3]
+		public virtual float DensityDiv { get; set; }		/// [kg/m3]
+		public virtual float Buoyancy { get; set; }												///TODO -> map
+		public virtual float FlowMass { get; set; }         /// [kg/h]  calculated from conventional true value
+		public virtual float FlowVolume { get; set; }       /// [l/h]   calculated from conventional true value
+        public virtual float VolumeCTV { get; set; }        /// [l]     Volume conventional true value
+        public virtual float VolumeMaster { get; set; }     /// [l]     Volume from the master flow meter
+        public virtual float Time { get; set; }             /// [s]     Measurement time in seconds
+        public virtual float ErrorMaster { get; set; }		/// [%]
+        public virtual float PulsesMaster { get; set; }
+        public virtual float ConstMaster { get; set; }      /// [pls/l] Pulses per liter master flow meter
+		public virtual float QRise { get; set; }			///         Detected Q_rise of a composed meter
+		public virtual float QFall { get; set; }			///         Detected Q_fall of a composed meter
+		public virtual float TimeDivStart0 { get; set; }
+        public virtual float TimeDivStart1 { get; set; }
+        public virtual float TimeDivStart2 { get; set; }
+        public virtual float TimeDivStart3 { get; set; }
+        public virtual float TimeDivStart4 { get; set; }
+        public virtual float TimeDivStart5 { get; set; }
+        public virtual float TimeDivEnd0 { get; set; }
+        public virtual float TimeDivEnd1 { get; set; }
+        public virtual float TimeDivEnd2 { get; set; }
+        public virtual float TimeDivEnd3 { get; set; }
+        public virtual float TimeDivEnd4 { get; set; }
+        public virtual float TimeDivEnd5 { get; set; }
+
+		public TestResult()
+		{
+			Meters = new List<MeterTestResult>();
+			CombinedMeters = new List<MeterTestResult>();
+		}
+        
+		public TestResult(MetersKind kind)
+			: this()
+        {
+			MetersKind = kind;
+
+			if (kind == MetersKind.Single)
+			{
+				for (int i = 0; i < Config.Data.WMsCount; i++) Meters.Add(new MeterTestResult(this));
+			}
+			else if (kind == MetersKind.Combined)
+			{
+				for (int i = 0; i < 2 * Config.Data.CompoundWMsCount; i++) Meters.Add(new MeterTestResult(this));
+				for (int i = 0; i < Config.Data.CompoundWMsCount; i++) CombinedMeters.Add(new MeterTestResult(this));
+			}
+		}
+
+		public TestResult(Test test, int repetitionNr, MetersKind kind)
+			: this(kind)
+        {
+			if (test.Repeats == 1)
+			{
+                Name = test.Name;
+			}
+			else
+			{
+				Name = string.Format("{0} ({1}/{2})", test.Name, repetitionNr, test.Repeats);
+			}
+			RepetitionNr = repetitionNr;
+
+            /// Copy test parameters from Entities.Procedure object
+            ProcedureName = test.Procedure.Name;
+			ProtocolTitle = string.Empty;
+
+			/// Copy test parameters from Entities.Test object
+            TestId = test.Id;
+			TestName = test.Name;
+			Part = test.Part;
+			Qfrom = test.Qfrom;
+			Qto = test.Qto;
+			Volume = test.Volume;
+			TstTime = test.TstTime;
+			Repeats = test.Repeats;
+			Emptying = test.DoDraining;
+			Zeroing = test.DoDrainingAfter;
+			PumpPower = PumpPower;
+			Time2MassMsrmt = test.TimeStop2Mass;
+			Method = test.Method;
+			ErrLimLo = test.ErrLimLo;
+			ErrLimHi = test.ErrLimHi;
+			Uncertainty = test.Uncertainty;
+
+			FeedingPath = test.FeedingPath;
+			BenchPath = test.BenchPath;
+			OutputPath = test.OutputPath;
+			MetersPath = test.MetersPath;
+		}
+
+        public override string ToString()
+        {
+			return string.Format("batch={0}, procedure={1}, test={2}, {3} {4}", BatchNr, ProcedureName, TestName, TimeStart.ToShortDateString(), TimeStart.ToShortTimeString());
+        }
+    }
+}

Config/Entities/Uncertainty.cs

@@ -1,20 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-
-namespace Config.Entities
-{
-    public class Uncertainty
-    {
-        public virtual int Id { get; protected set; }
-        public virtual float Measurement { get; set; }
-        public virtual float MainUncertainty { get; set; }
-        public virtual float Resolution { get; set; }
-        public virtual float DriftPerYr { get; set; }
-        public virtual float Conditions { get; set; }
-        public virtual float UncertaintyOfCorrection { get; set; }
-
-        public Uncertainty() { }
-    }
-}

Config/Entities/User.cs

@@ -16,7 +16,6 @@ namespace Config.Entities
 		public virtual string Password { get; set; }
         public virtual string Password2 { get; set; }
         public virtual string Password3 { get; set; }
-        public virtual string Password4 { get; set; }
         public virtual DateTime LastPwChange { get; set; }
         public virtual IList<Group> Groups { get; set; }   //User can be a member of a list of groups
 

Config/Entities/WMType.cs

@@ -0,0 +1,78 @@
+///
+/// Copyright (c) 2013-2015 Sensus Metering Systems
+///
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+/// This class holds the watermeter type specific data 
+/// that have all watermaters of the same type in common
+
+namespace Config.Entities
+{
+    public class WMType
+    {
+        // mapped
+        public virtual int Id { get; protected set; }           /// primary key
+        public virtual DateTime CreateTime { get; set; }        /// Date and time of the creation or change
+        public virtual string CreateUserName { get; set; }      /// Name of the user who has created or changed this procedure
+        public virtual string CreateDescription { get; set; }   /// Description\
+         
+        public virtual string Name { get; set; }                /// type name
+        public virtual float PulseRate { get; set; }            /// Pulses per Liter
+
+        // not yet mapped
+        public virtual int IdentNr { get; protected set; }      /// identification number of watermeter tzpe
+        public virtual int Diameter { get; set; }               /// nominal diameter
+        public virtual int Pressure { get; set; }               /// nominal pressure
+        public virtual int Length { get; set; }                 /// construction length
+        public virtual int Temperatur { get; set; }             /// nominal temperature in C
+        public virtual float NominalFlow { get; set; }          /// nominal flow Qn
+       
+        /// ------------- Additional stuff not mapped into the database -------------
+
+        public WMType()
+        {
+        }
+
+        public static WMType DefaultWMType()
+        {
+            WMType procedure = new WMType()
+            {
+                CreateTime = DateTime.Now,
+				CreateUserName = Users.GlobalData.CurrentUser.UserName,
+                CreateDescription = "A default water meter created.",
+                Name = "Watermeter",
+                PulseRate = 1000,
+            };
+            return procedure;
+        }
+
+        public virtual WMType Clone()
+        {
+            WMType result = new WMType();
+
+            result.CreateTime = CreateTime;
+            result.CreateUserName = CreateUserName;
+            result.CreateDescription = CreateDescription;
+            result.Name = Name;
+            result.PulseRate = PulseRate;
+
+            return result;
+        }
+
+        public override string ToString()
+        {
+            string result = "";
+            result += "WMTpe: " + Environment.NewLine;
+            result += "    Name        = " + Name + Environment.NewLine;
+            result += "    Created by  = " + CreateUserName + Environment.NewLine;
+            result += "    Created on  = " + CreateTime.ToString() + Environment.NewLine;
+            result += "    Description = " + CreateDescription + Environment.NewLine;
+            result += "    Pulse rate  = " + PulseRate.ToString() + Environment.NewLine;
+            return result;
+        }
+    }
+}
+

Config/Entities/Watermeter.cs

@@ -0,0 +1,40 @@
+///
+/// Copyright (c) 2013-2015 Sensus Metering Systems
+///
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using NHibernate;
+using FluentNHibernate;
+
+namespace Config.Entities
+{
+    public class Watermeter
+    {
+        public virtual int Id { get; protected set; }           /// primary key
+
+        public virtual DateTime CreateTime { get; set; }        /// Date and time of the creation or change
+        public virtual string CreateUserName { get; set; }      /// Name of the user who has created or changed this procedure
+        public virtual string CreateDescription { get; set; }   /// Description
+
+        /// mapped
+        public virtual string Serial { get; set; }              /// serial number 
+        public virtual WMType WMType { get; set; }              /// type of watermeter                                              
+                                                                /// 
+
+		/// <summary>
+		/// Load a watermeter from the database
+		/// </summary>
+		public static Watermeter LoadBySerialnr(string SerialNr)
+        {
+            IList<Watermeter> ListOfWatermeters = FluentCommon.CreateSession(Users.Entities.DBKind.Results)
+				.CreateQuery("FROM Watermeter WHERE Serial = :SerialNrParameter")
+				.SetParameter("SerialNrParameter", SerialNr)
+				.List<Watermeter>();
+            if (ListOfWatermeters.Count > 0) return ListOfWatermeters.ElementAt(0);
+            return null;
+        }
+    }
+}

Config/FluentCommon.cs

@@ -145,8 +145,17 @@ namespace Config
                 using (var transaction = session.BeginTransaction())
                 {
                     ///
-					/// Create user 'admin'
+                    /// Prepare all groups
                     ///
+					var testers					= new Config.Entities.Group((int)Users.Grp.GID.Testers, Strings.Tester);
+					var testingSpecialists		= new Config.Entities.Group((int)Users.Grp.GID.TestingSpecialists, Strings.Testing_Specialist);
+					var headOfLab				= new Config.Entities.Group((int)Users.Grp.GID.HeadOfLab, Strings.Head_of_Lab);
+					var maintenanceSpecialists	= new Config.Entities.Group((int)Users.Grp.GID.MaintenanceSpecialists, Strings.Maintenance_Specialist);
+					var metrologists			= new Config.Entities.Group((int)Users.Grp.GID.Metrologists, Strings.Metrologist);
+					var calibrationSpecialists	= new Config.Entities.Group((int)Users.Grp.GID.CalibrationSpecialists, Strings.Calibration_Specialist);
+					var administrators			= new Config.Entities.Group((int)Users.Grp.GID.Administrators, Strings.Administrator);
+
+					/// Create the user 'admin' add his groups
                     var admin = new Config.Entities.User
                     {
 						UserName = Data.AdminUsername,
@@ -154,35 +163,20 @@ namespace Config
                         LastPwChange = DateTime.Now
                     };
 					admin.SetPassword(Data.AdminPassword);
+                    admin.AddGroup(testers);
+                    admin.AddGroup(testingSpecialists);
+                    admin.AddGroup(headOfLab);
+                    admin.AddGroup(maintenanceSpecialists);
+                    admin.AddGroup(metrologists);
+                    admin.AddGroup(calibrationSpecialists);
+                    admin.AddGroup(administrators);
 
-                    ///
-                    /// Prepare all groups, add some of them to admin
-                    ///
-                    for (Users.Entities.GID gid = 0; gid < Users.Entities.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:
-#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
-                            case Users.Entities.GID.TraceabilityManagement:
-#elif KEMPNO_50 || KRAKOW_50 || TORUN_50 || WARSAW_END
-                            case Users.Entities.GID.MetrologicalAuthority:
-                            case Users.Entities.GID.WaterMeterAuthority:
-#endif
-                                admin.AddGroup(group);
-                                session.SaveOrUpdate(group);    /// Save this group
-                                break;
-                        }
-                    }
+                    session.SaveOrUpdate(admin);
+
+					///// Create the control board component
+					//var cmpnt = (new BenchControl.Elde.ControlBoardCfg(new BenchControl.Elde.ControlBoardFactory())).CreateDbEntity();
+					//session.SaveOrUpdate(cmpnt);
 
-                    session.SaveOrUpdate(admin);                /// Save user 'admin'
                     transaction.Commit();
                 }
             }

Config/Formulas.cs

@@ -11,23 +11,14 @@ namespace Config
     {
 		private static readonly ILog log = LogManager.GetLogger(typeof(Formulas));
 
-
         ///
-        /// Wrappers
+        /// Tables to calculate specific enthalpy
         ///
-        public static double RealDensity() { return Data.RealDensity; }
-        public static double AtTemperature() { return Data.AtTemperature; }
-        public static double Buoyancy() { return Data.Buoyancy; }
-
-
-        /// Private tables with coeficients to calculate specific enthalpy
-        static readonly int[] Ii;
-        static readonly int[] Ji;
-        static readonly double[] ni;
-
-        /// Private table with coeficients to calculate temperature of a platinum thermometer
-        static readonly double[] Di;
+        private static readonly int[] Ii;
+        private static readonly int[] Ji;
+        private static readonly double[] ni;
 
+		private static readonly double[] Di;
 
         /// <summary> 
 		/// Constructor
@@ -162,9 +153,9 @@ namespace Config
 		/// </summary>
 		/// <param name="t">Temperature in [°C]</param>
 		/// <returns>Density in [kg/m3]</returns>
-		public static double WaterDensityFromTemp(double t)
+		public static double WaterDensityFromTemp(double t, double realDensity, double atTemperature)
 		{
-            return DistilledWaterDensityFromTemp(t) + DensityCorrection(RealDensity(), AtTemperature());
+            return DistilledWaterDensityFromTemp(t) + DensityCorrection(realDensity, atTemperature);
 		}
 
         /// <summary>
@@ -172,7 +163,7 @@ namespace Config
         /// </summary>
         /// <param name="t">Temperature in [°C]</param>
         /// <returns>Density in [kg/m3]</returns>
-        public static double WaterDensityFromTempPress(double temp, double pressure)
+        public static double WaterDensityFromTempPress(double temp, double pressure, double realDensity, double atTemperature)
         {
             double x0 = 5.08821E-10;
             double x1 = 1.2639418;
@@ -182,7 +173,7 @@ namespace Config
             double theta = temp / 100.0;
             double B = x0 * (((x3 * theta + x2) * theta + x1) * theta + 1) / (1 + x4 * theta);
 
-            return WaterDensityFromTemp(temp) * (1 + B * Config.Units.ConvertTo(Config.Unit.Pa, pressure));
+            return WaterDensityFromTemp(temp, realDensity, atTemperature) * (1 + B * Config.Units.ConvertTo(Config.Unit.Pa, pressure));
         }
 
 
@@ -403,5 +394,11 @@ namespace Config
 
             return (-(R0 * A) + Math.Sqrt(R0 * R0 * A * A - 4 * R0 * B * (R0 - R))) / (2 * R0 * B);
         }
+
+
+		public static double Buoyancy()
+		{
+			return 1.00103;
+		}
 	}
 }

Config/Mappings/ComponentMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
 using FluentNHibernate.Mapping;
 using Config.Entities;
@@ -23,9 +23,6 @@ namespace Config.Mappings
 			HasMany(x => x.Corrections)
 				.OrderBy("Measurement")
 				.Cascade.All();
-            HasMany(x => x.Uncertainties)
-                .OrderBy("Measurement")
-                .Cascade.All();
-        }
+		}
     }
 }

Config/Mappings/GroupMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
 using FluentNHibernate.Mapping;
 
@@ -7,18 +7,11 @@ namespace Config.Mappings
 {
     class GroupMap : ClassMap<Entities.Group>
     {
-        /// <seealso>
-        ///  https://stackoverflow.com/questions/9108083/fluent-nhibernate-many-to-many-mapping-way/9125059
-        /// </seealso>
         public GroupMap()
         {
             Id(x => x.Id);
-            Map(x => x.GID).Column("Name");
-            Map(x => x.AccessFlags);
-            HasManyToMany(x => x.Users)
-                .Cascade.SaveUpdate()
-                .Inverse()
-                .Table("UsersGroups");
+            Map(x => x.Gid);
+            Map(x => x.Name);
         }
     }
 }

Config/Mappings/MeterTestResultMap.cs

@@ -0,0 +1,29 @@
+///
+/// Copyright (c) 2013-2015 Sensus Metering Systems
+///
+using FluentNHibernate.Mapping;
+using Config.Entities;
+
+namespace Config.Mappings
+{
+	class MeterTestResultMap : ClassMap<MeterTestResult>
+    {
+        public MeterTestResultMap()
+        {
+            Id(x => x.Id);
+            References(x => x.TestResult);
+			Map(x => x.Disabled);
+			Map(x => x.SerialNr);
+            Map(x => x.EndState);
+            Map(x => x.VolumeStart);
+            Map(x => x.VolumeEnd);
+            Map(x => x.VolumeMeter);
+            Map(x => x.VolumeRef);
+            Map(x => x.VolumeErrorPct);
+            Map(x => x.PulsesMeter);
+            Map(x => x.PulsesPerLiter);
+            Map(x => x.PulsesMaster);
+            Map(x => x.Time);
+        }
+    }
+}

Config/Mappings/PTestMap.cs

@@ -1,60 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using FluentNHibernate.Mapping;
-using Config.Entities;
-
-namespace Config.Mappings
-{
-    class PTestMap : ClassMap<PTest>
-    {
-        public PTestMap()
-        {
-            Id(x => x.Id);
-            Map(x => x.ItemNr);
-			Map(x => x.Name);
-            Map(x => x.Part);
-            Map(x => x.CoefQfrom);
-			Map(x => x.CoefQto);
-            Map(x => x.ErrLimLo);
-            Map(x => x.ErrLimHi);
-            Map(x => x.TempLimLo);
-			Map(x => x.TempLimHi);
-            Map(x => x.PressLimLo);
-            Map(x => x.PressLimHi);
-            Map(x => x.Publish);
-            Map(x => x.Evaluate);
-            Map(x => x.E1);
-            Map(x => x.E2);
-            Map(x => x.E3);
-            Map(x => x.E4);
-            Map(x => x.E5);
-            Map(x => x.E6);
-            Map(x => x.E7);
-            Map(x => x.E8);
-            Map(x => x.E9);
-            Map(x => x.E10);
-            Map(x => x.E11);
-            Map(x => x.E12);
-            Map(x => x.E13);
-            Map(x => x.E14);
-            Map(x => x.E15);
-            Map(x => x.E16);
-            Map(x => x.E21);
-            Map(x => x.Delta_Q_pct);
-            Map(x => x.Delta_T);
-            Map(x => x.Delta_Tup_Tdn);
-            Map(x => x.TestTime_min);
-            Map(x => x.TestTime_max);
-            Map(x => x.AmbTemp_min);
-            Map(x => x.AmbTemp_max);
-            Map(x => x.Coef_E9);
-            Map(x => x.Coef_E10);
-            Map(x => x.Coef_E11);
-            Map(x => x.Coef_E12);
-            Map(x => x.Offset_E9);
-            Map(x => x.Offset_E12);
-			References(x => x.Profile);
-		}
-    }
-}

Config/Mappings/ProfileMap.cs

@@ -1,28 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using FluentNHibernate.Mapping;
-using Config.Entities;
-
-namespace Config.Mappings
-{
-	class ProfileMap : ClassMap<Profile>
-    {
-        public ProfileMap()
-        {   
-            Id(x => x.Id);
-			Map(x => x.ItemNr);
-			Map(x => x.Name);
-            Map(x => x.Description);
-			Map(x => x.CreationUser);
-			Map(x => x.CreationTime);
-			Map(x => x.LastChgUser);
-			Map(x => x.LastChgTime);
-            Map(x => x.ProfileType);
-            Map(x => x.ErrorLimitType);
-            HasMany(x => x.Tests)
-				.OrderBy("ItemNr")
-				.Cascade.All();
-        }
-    }
-}

Config/Mappings/TestMap.cs

@@ -14,14 +14,10 @@ namespace Config.Mappings
             Map(x => x.ItemNr);
 			Map(x => x.Name);
 			Map(x => x.Part);
-            Map(x => x.Profile);
-            Map(x => x.Publish);
+			Map(x => x.Publish);
 			Map(x => x.DoEvaluate)
 				.Column("Evaluate");
-#if TEST_PROFILES
-            Map(x => x.Qtg);
-#endif
-            Map(x => x.Qfrom);
+			Map(x => x.Qfrom);
 			Map(x => x.Qto);
 			Map(x => x.Volume);
 			Map(x => x.TstTime);
@@ -49,7 +45,7 @@ namespace Config.Mappings
 			Map(x => x.Uncertainty);
 			Map(x => x.TolerRed)
                 .Column("TolerRed");	/// ???
-			Map(x => x.RedType);
+			Map(x => x.RedType);	    /// ???
 			Map(x => x.FeedingPath);
 			Map(x => x.BenchPath);
 			Map(x => x.OutputPath);
@@ -57,14 +53,11 @@ namespace Config.Mappings
 #if HEAT_METERS
             Map(x => x.HeatMetersPath);
 #endif
-            Map(x => x.RelTransBefore)
-                .Column("RelTransBefore");
-			Map(x => x.RelTransBetween)
-                .Column("RelTransBetween");
-			Map(x => x.TransitionAfter)
-                .Column("TransitionAfter");
-
-            HasMany(x => x.MoreParams)
+            Map(x => x.RelTransBefore);
+			Map(x => x.RelTransBetween);
+			Map(x => x.RelTransAfter);
+			Map(x => x.TransitionAfter);
+			HasMany(x => x.MoreParams)
 				.Cascade.All();
 			References(x => x.Procedure);
 		}

Config/Mappings/TestResultMap.cs

@@ -0,0 +1,109 @@
+///
+/// Copyright (c) 2013-2015 Sensus Metering Systems
+///
+using FluentNHibernate.Mapping;
+using Config.Entities;
+
+namespace Config.Mappings
+{
+	class TestResultMap : ClassMap<TestResult>
+    {
+        public TestResultMap()
+        {
+            Id(x => x.Id);
+			Map(x => x.Name);
+			Map(x => x.BatchNr);
+			Map(x => x.PurchaseOrder);
+			Map(x => x.MetersKind);
+            HasMany(x => x.Meters)
+                .Cascade.All();
+			HasMany(x => x.CombinedMeters)
+				.Cascade.All();
+
+            Map(x => x.ProcedureName);
+			Map(x => x.ProtocolTitle);
+
+            Map(x => x.TestId);
+            Map(x => x.TestName);
+			Map(x => x.Part);
+			Map(x => x.Qfrom);
+			Map(x => x.Qto);
+			Map(x => x.Volume);
+			Map(x => x.TstTime);
+			Map(x => x.Repeats);
+			Map(x => x.Emptying);
+			Map(x => x.Zeroing);
+			Map(x => x.PumpPower);
+			Map(x => x.Time2MassMsrmt);
+            Map(x => x.Method);
+			Map(x => x.ErrLimLo);
+			Map(x => x.ErrLimHi);
+			Map(x => x.Uncertainty);
+
+			Map(x => x.FeedingPath)
+                .CustomType("StringClob")
+                .CustomSqlType("varchar(4000)");
+			Map(x => x.BenchPath)
+                .CustomType("StringClob")
+                .CustomSqlType("varchar(4000)");
+			Map(x => x.OutputPath)
+                .CustomType("StringClob")
+                .CustomSqlType("varchar(4000)");
+			Map(x => x.MetersPath)
+                .CustomType("StringClob")
+                .CustomSqlType("varchar(4000)");
+
+            Map(x => x.TimeStart);
+            Map(x => x.TimeEnd);
+		    Map(x => x.RepetitionNr);
+			Map(x => x.AmbientTempAve);
+            Map(x => x.AmbientPressAve);
+            Map(x => x.AmbientHumiAve);
+            Map(x => x.PressInAvrg);
+            Map(x => x.PressInStart);
+		    Map(x => x.PressInEnd);
+            Map(x => x.PressOutAvrg);
+            Map(x => x.PressOutStart);
+		    Map(x => x.PressOutEnd);
+            Map(x => x.TempInAvrg);
+		    Map(x => x.TempInStart);
+		    Map(x => x.TempInEnd);
+		    Map(x => x.TempOutAvrg);
+		    Map(x => x.TempOutStart);
+		    Map(x => x.TempOutEnd);
+		    Map(x => x.TempDivAvrg);
+		    Map(x => x.TempDivStart);
+		    Map(x => x.TempDivEnd);
+            Map(x => x.MassStartRaw);
+            Map(x => x.MassStart);
+            Map(x => x.MassEndRaw);
+            Map(x => x.MassEnd);
+            Map(x => x.MassDiff);
+            Map(x => x.DensityIn);
+            Map(x => x.DensityOut);
+            Map(x => x.DensityDiv);
+            Map(x => x.FlowMass);         /// from conventional true value
+            Map(x => x.FlowVolume);       /// from conventional true value
+            Map(x => x.VolumeCTV);        /// volume conventional true value
+            Map(x => x.VolumeMaster);     /// volume from the master flow meter
+            Map(x => x.Time);             /// measurement time in seconds
+            Map(x => x.ErrorMaster);
+            Map(x => x.PulsesMaster);
+            Map(x => x.ConstMaster);      /// Pulses per liter master flow meter
+			Map(x => x.QRise);
+			Map(x => x.QFall);
+            Map(x => x.TimeDivStart0);
+            Map(x => x.TimeDivStart1);
+            Map(x => x.TimeDivStart2);
+            Map(x => x.TimeDivStart3);
+            Map(x => x.TimeDivStart4);
+            Map(x => x.TimeDivStart5);
+            Map(x => x.TimeDivEnd0);
+            Map(x => x.TimeDivEnd1);
+            Map(x => x.TimeDivEnd2);
+            Map(x => x.TimeDivEnd3);
+            Map(x => x.TimeDivEnd4);
+            Map(x => x.TimeDivEnd5);
+        }
+    }
+}

Config/Mappings/UncertaintyMap.cs

@@ -1,22 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using FluentNHibernate.Mapping;
-using Config.Entities;
-
-namespace Config.Mappings
-{
-    class UncertaintyMap : ClassMap<Uncertainty>
-    {
-        public UncertaintyMap()
-        {
-            Id(x => x.Id);
-            Map(x => x.Measurement);
-            Map(x => x.MainUncertainty);
-            Map(x => x.Resolution);
-            Map(x => x.DriftPerYr);
-            Map(x => x.Conditions);
-            Map(x => x.UncertaintyOfCorrection);
-        }
-    }
-}

Config/Mappings/UserMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2016-2019 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 
@@ -12,16 +12,14 @@ namespace Config.Mappings
             Id(x => x.Id);
             Map(x => x.UserName).Column("Name");
 			Map(x => x.Number);
+#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
             Map(x => x.Tag);
+#endif
 			Map(x => x.Password);
-            Map(x => x.Password2);
-            Map(x => x.Password3);
-            Map(x => x.Password4);
             Map(x => x.FullName).Column("Description");
             Map(x => x.LastPwChange);
-            HasManyToMany(x => x.Groups)
-                .Cascade.SaveUpdate()
-                .Table("UsersGroups");
+            HasMany(x => x.Groups)
+                .Cascade.All();
         }
     }
 }

Config/Mappings/VirtualBenchSequenceMap.cs

@@ -0,0 +1,22 @@
+///
+/// Copyright (c) 2013-2015 Sensus Metering Systems
+///
+using FluentNHibernate.Mapping;
+using Config.Entities;
+
+namespace Config.Mappings
+{
+	class VirtualBenchSequenceMap : ClassMap<VirtualBenchSequence>
+	{
+		public VirtualBenchSequenceMap()
+        {   
+            Id(x => x.Id);
+			Map(x => x.ItemNr);
+			Map(x => x.Name);
+			Map(x => x.Description);
+			HasMany(x => x.VirtualBenchSteps)
+				.OrderBy("ItemNr")
+				.Cascade.All();
+        }
+	}
+}

Config/Mappings/VirtualBenchStepMap.cs

@@ -0,0 +1,20 @@
+///
+/// Copyright (c) 2013-2015 Sensus Metering Systems
+///
+using FluentNHibernate.Mapping;
+using Config.Entities;
+
+namespace Config.Mappings
+{
+	class VirtualBenchStepMap : ClassMap<VirtualBenchStep>
+	{
+		public VirtualBenchStepMap()
+        {
+            Id(x => x.Id);
+            Map(x => x.ItemNr);
+            Map(x => x.Duration);
+
+			References(x => x.VirtualBenchSequence);
+		}
+	}
+}

Config/Mappings/WMTypeMap.cs

@@ -0,0 +1,20 @@
+///
+/// Copyright (c) 2013-2015 Sensus Metering Systems
+///
+using FluentNHibernate.Mapping;
+
+namespace Config.Mappings
+{
+	class WMTypeMap : ClassMap<Entities.WMType>
+    {
+        public WMTypeMap()
+        {
+            Id(x => x.Id);
+            Map(x => x.CreateTime);
+            Map(x => x.CreateUserName);
+            Map(x => x.CreateDescription);
+            Map(x => x.Name);
+            Map(x => x.PulseRate);
+        }
+    }
+}

Config/Mappings/WatermeterMap.cs

@@ -0,0 +1,19 @@
+///
+/// Copyright (c) 2013-2015 Sensus Metering Systems
+///
+using FluentNHibernate.Mapping;
+
+namespace Config.Mappings
+{
+	class WatermeterMap : ClassMap<Entities.Watermeter>
+    {
+        public WatermeterMap()
+        {
+            Id(x => x.Id);
+            Map(x => x.Serial);
+            // HasOne(x => x.WMType)
+            //    .Cascade.All();
+            References(x => x.WMType);
+        }
+    }
+}

Config/Properties/AssemblyInfo.cs

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

Config/Resources/Strings.de.resx

@@ -117,6 +117,27 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Administrator" xml:space="preserve">
+    <value>Administrator</value>
+  </data>
+  <data name="Calibration_Specialist" xml:space="preserve">
+    <value>Kalibriertechniker</value>
+  </data>
+  <data name="Head_of_Lab" xml:space="preserve">
+    <value>Laborleiter</value>
+  </data>
+  <data name="Maintenance_Specialist" xml:space="preserve">
+    <value>Wartungstechniker</value>
+  </data>
+  <data name="Metrologist" xml:space="preserve">
+    <value>Messtechniker</value>
+  </data>
+  <data name="Tester" xml:space="preserve">
+    <value>Prüfer</value>
+  </data>
+  <data name="Testing_Specialist" xml:space="preserve">
+    <value>Prüftechniker</value>
+  </data>
   <data name="Failed" xml:space="preserve">
     <value>NiO</value>
   </data>

Config/Resources/Strings.fr.resx

@@ -117,6 +117,27 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Administrator" xml:space="preserve">
+    <value>Administrateur</value>
+  </data>
+  <data name="Calibration_Specialist" xml:space="preserve">
+    <value>Spécialiste en calibration</value>
+  </data>
+  <data name="Head_of_Lab" xml:space="preserve">
+    <value>Chef de laboratoire</value>
+  </data>
+  <data name="Maintenance_Specialist" xml:space="preserve">
+    <value>Spécialiste en maintenance</value>
+  </data>
+  <data name="Metrologist" xml:space="preserve">
+    <value>Métrologue</value>
+  </data>
+  <data name="Tester" xml:space="preserve">
+    <value>Testeur</value>
+  </data>
+  <data name="Testing_Specialist" xml:space="preserve">
+    <value>Spécialiste d'essais</value>
+  </data>
   <data name="Failed" xml:space="preserve">
     <value>Échoué</value>
   </data>

Config/Resources/Strings.it.resx

@@ -117,6 +117,27 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Administrator" xml:space="preserve">
+    <value>Amministratore</value>
+  </data>
+  <data name="Calibration_Specialist" xml:space="preserve">
+    <value>esperto in calibrazione</value>
+  </data>
+  <data name="Head_of_Lab" xml:space="preserve">
+    <value>capo di laboratorio</value>
+  </data>
+  <data name="Maintenance_Specialist" xml:space="preserve">
+    <value>esperto di manutenzione</value>
+  </data>
+  <data name="Metrologist" xml:space="preserve">
+    <value>metrologo</value>
+  </data>
+  <data name="Tester" xml:space="preserve">
+    <value>tester</value>
+  </data>
+  <data name="Testing_Specialist" xml:space="preserve">
+    <value>esperto di prove </value>
+  </data>
   <data name="Failed" xml:space="preserve">
     <value>NOK</value>
   </data>

Config/Resources/Strings.pl.resx

@@ -117,6 +117,27 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Administrator" xml:space="preserve">
+    <value>Administrator</value>
+  </data>
+  <data name="Calibration_Specialist" xml:space="preserve">
+    <value>Specjalista ds. kalibracji</value>
+  </data>
+  <data name="Head_of_Lab" xml:space="preserve">
+    <value>Kierownik Laboratorium</value>
+  </data>
+  <data name="Maintenance_Specialist" xml:space="preserve">
+    <value>Konserwator</value>
+  </data>
+  <data name="Metrologist" xml:space="preserve">
+    <value>Metrolog</value>
+  </data>
+  <data name="Tester" xml:space="preserve">
+    <value>Pracownik przeprowadzający testy</value>
+  </data>
+  <data name="Testing_Specialist" xml:space="preserve">
+    <value>Specjalista ds. testów</value>
+  </data>
   <data name="Failed" xml:space="preserve">
     <value>Niepowodzenie</value>
   </data>

Config/Resources/Strings.resx

@@ -117,6 +117,27 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Administrator" xml:space="preserve">
+    <value>Administrator</value>
+  </data>
+  <data name="Calibration_Specialist" xml:space="preserve">
+    <value>Calibration Specialist</value>
+  </data>
+  <data name="Head_of_Lab" xml:space="preserve">
+    <value>Head of Lab</value>
+  </data>
+  <data name="Maintenance_Specialist" xml:space="preserve">
+    <value>Maintenance Specialist</value>
+  </data>
+  <data name="Metrologist" xml:space="preserve">
+    <value>Metrologist</value>
+  </data>
+  <data name="Tester" xml:space="preserve">
+    <value>Tester</value>
+  </data>
+  <data name="Testing_Specialist" xml:space="preserve">
+    <value>Testing Specialist</value>
+  </data>
   <data name="Failed" xml:space="preserve">
     <value>NOK</value>
   </data>

Config/Resources/Strings.ru.resx

@@ -117,6 +117,27 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Administrator" xml:space="preserve">
+    <value>Администратор</value>
+  </data>
+  <data name="Calibration_Specialist" xml:space="preserve">
+    <value>Специалист по калибровке</value>
+  </data>
+  <data name="Head_of_Lab" xml:space="preserve">
+    <value>Руководитель лаборатории</value>
+  </data>
+  <data name="Maintenance_Specialist" xml:space="preserve">
+    <value>Специалист по техобслуживанию</value>
+  </data>
+  <data name="Metrologist" xml:space="preserve">
+    <value>Метролог</value>
+  </data>
+  <data name="Tester" xml:space="preserve">
+    <value>Контролер</value>
+  </data>
+  <data name="Testing_Specialist" xml:space="preserve">
+    <value>Специалист по тестированию</value>
+  </data>
   <data name="Failed" xml:space="preserve">
     <value>NOK</value>
   </data>

Config/Resources/Strings.zh-CN.resx

@@ -1,129 +1,128 @@
 <?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.
+	<!-- 
+		Microsoft ResX Schema
 
-    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>
-  <data name="Error" xml:space="preserve">
-    <value>错误 Error</value>
-  </data>
-  <data name="Failed" xml:space="preserve">
-    <value>NOK</value>
-  </data>
-  <data name="Passed" xml:space="preserve">
-    <value>好</value>
-  </data>
+		Version 1.3
+
+		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">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+	
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<data name="Administrator" xml:space="preserve">
+		<value>管理员</value>
+	</data>
+	<data name="Calibration_Specialist" xml:space="preserve">
+		<value>校准专员</value>
+	</data>
+	<data name="Failed" xml:space="preserve">
+		<value>NOK</value>
+	</data>
+	<data name="Head_of_Lab" xml:space="preserve">
+		<value>实验室负责人</value>
+	</data>
+	<data name="Maintenance_Specialist" xml:space="preserve">
+		<value>维护专员</value>
+	</data>
+	<data name="Metrologist" xml:space="preserve">
+		<value>计量者</value>
+	</data>
+	<data name="Passed" xml:space="preserve">
+		<value>好</value>
+	</data>
+	<data name="Tester" xml:space="preserve">
+		<value>测试仪</value>
+	</data>
+	<data name="Testing_Specialist" xml:space="preserve">
+		<value>测试专员</value>
+	</data>
 </root>

Config/Utils.cs

@@ -138,119 +138,5 @@ namespace Config
             /// pattern NOT found
             return string.Empty;
         }
-
-        /// <summary>
-        /// Get either Q1 or Qmin flow for a given Qn and metrological class
-        /// </summary>
-        /// <param name="Qn">Nominal flow in m3/h</param>
-        /// <param name="metroClass">Metrological class ("A" ,"B", "C" or "R#")</param>
-        /// <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)
-        {
-            if (string.IsNullOrEmpty(metroClass)) return Qdflt;
-
-            int metroClassRatio;
-            if ((metroClass[0] == 'R') && int.TryParse(metroClass.Substring(1), out metroClassRatio) && (metroClassRatio > 0))
-            {
-                return Qn / (double)metroClassRatio;
-            }
-            else
-            {
-                if (medium == Entities.Medium.HotWater)
-                {
-                    switch (metroClass)
-                    {
-                        case "A": return (Qn < 15) ? (0.04 * Qn) : (0.08 * Qn);
-                        case "B": return (Qn < 15) ? (0.02 * Qn) : (0.04 * Qn);
-                        case "C": return (Qn < 15) ? (0.01 * Qn) : (0.02 * Qn);
-                        case "D": return (Qn < 15) ? (0.01 * Qn) : Qdflt;
-                        default: break;
-                    }
-                }
-                else
-                {
-                    switch (metroClass)
-                    {
-                        case "A": return (Qn < 15) ? (0.04 * Qn) : (0.08 * Qn);
-                        case "B": return (Qn < 15) ? (0.02 * Qn) : (0.03 * Qn);
-                        case "C": return (Qn < 15) ? (0.01 * Qn) : (0.006 * Qn);
-                        default: break;
-                    }
-                }
-            }
-
-            return Qdflt;
-        }
-
-        /// <summary>
-        /// Get either Q2 or Qt flow for a given Qn and metrological class
-        /// </summary>
-        /// <param name="Qn">Nominal flow in m3/h</param>
-        /// <param name="metroClass">Metrological class ("A" ,"B", "C" or "R#")</param>
-        /// <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)
-        {
-            if (string.IsNullOrEmpty(metroClass)) return Qdflt;
-
-            int metroClassRatio;
-            if ((metroClass[0] == 'R') && int.TryParse(metroClass.Substring(1), out metroClassRatio) && (metroClassRatio > 0))
-            {
-                return 1.6 * Qn / (double)metroClassRatio;
-            }
-
-            if (medium == Entities.Medium.HotWater)
-            {
-                switch (metroClass)
-                {
-                    case "A": return (Qn < 15) ? (0.1 * Qn) : (0.2 * Qn);
-                    case "B": return (Qn < 15) ? (0.08 * Qn) : (0.15 * Qn);
-                    case "C": return (Qn < 15) ? (0.06 * Qn) : (0.1 * Qn);
-                    case "D": return (Qn < 15) ? (0.015 * Qn) : Qdflt;
-                    default: break;
-                }
-            }
-            else
-            {
-                switch (metroClass)
-                {
-                    case "A": return (Qn < 15) ? (0.1 * Qn) : (0.3 * Qn);
-                    case "B": return (Qn < 15) ? (0.08 * Qn) : (0.2 * Qn);
-                    case "C": return (Qn < 15) ? (0.015 * Qn) : (0.015 * Qn);
-                    default: break;
-                }
-            }
-
-            return Qdflt;
-        }
-
-        /// <summary>
-        /// Get either Q4 or Qmax flow for a given Qn and metrological class
-        /// </summary>
-        /// <param name="Qn">Nominal flow in m3/h</param>
-        /// <param name="metroClass">Metrological class ("A" ,"B", "C" or "R#")</param>
-        /// <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)
-        {
-            if (string.IsNullOrEmpty(metroClass)) return Qdflt;
-
-            switch (metroClass[0])
-            {
-                case 'A':
-                case 'B':
-                case 'C':
-                case 'D':
-                    return 2 * Qn;
-                case 'R':
-                    return 1.25 * Qn;
-                default:
-                    return Qdflt;
-            }
-        }
     }
 }

Decrypt/Decrypt.csproj

@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Decrypt</RootNamespace>
     <AssemblyName>Decrypt</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -24,7 +24,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -34,7 +33,6 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>Decrypt.Program</StartupObject>

Decrypt/app.config

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

DeviceTest/DeviceTest.csproj

@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DeviceTest</RootNamespace>
     <AssemblyName>DeviceTest</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -24,7 +24,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -34,7 +33,6 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>DeviceTest.Program</StartupObject>

DeviceTest/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace DeviceTest.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

DeviceTest/app.config

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

Dirichlet.Numerics/Dirichlet.Numerics.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -10,10 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Dirichlet.Numerics</RootNamespace>
     <AssemblyName>Dirichlet.Numerics</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -23,7 +22,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -32,7 +30,6 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -51,4 +48,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

Encrypt/Encrypt.csproj

@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Encrypt</RootNamespace>
     <AssemblyName>Encrypt</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -24,7 +24,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -34,7 +33,6 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>Encrypt.Program</StartupObject>

Encrypt/app.config

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

GemCard/GemCard.csproj

@@ -28,7 +28,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -66,7 +66,6 @@
     <RemoveIntegerChecks>false</RemoveIntegerChecks>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -88,7 +87,6 @@
     <RemoveIntegerChecks>false</RemoveIntegerChecks>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -101,7 +99,6 @@
     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
     <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -113,7 +110,6 @@
     <PlatformTarget>x86</PlatformTarget>
     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System">

GenCode128/AssemblyInfo.cs

@@ -0,0 +1,51 @@
+using System.Reflection;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("GenCode128")]
+[assembly: AssemblyDescription("GenCode128")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Chris Wuestefeld")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("2006 Chris Wuestefeld")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+
+// In order to sign your assembly you must specify a key to use. Refer to the 
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing. 
+//
+// Notes: 
+//   (*) If no key is specified, the assembly is not signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. KeyFile refers to a file which contains
+//       a key.
+//   (*) If the KeyFile and the KeyName values are both specified, the 
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP, that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
+//           in the KeyFile is installed into the CSP and used.
+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
+//       When specifying the KeyFile, the location of the KeyFile should be
+//       relative to the project output directory which is
+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
+//       located in the project directory, you would specify the AssemblyKeyFile 
+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+[assembly: AssemblyKeyName("")]

GenCode128/Code128Code.cs

@@ -0,0 +1,139 @@
+namespace GenCode128
+{
+    /// <summary>
+    /// Static tools for determining codes for individual characters in the content
+    /// </summary>
+    public static class Code128Code
+    {
+        private const int CShift = 98;
+        private const int CCodeA = 101;
+        private const int CCodeB = 100;
+        private const int CStartA = 103;
+        private const int CStartB = 104;
+        private const int CStop = 106;
+        
+        /// <summary>
+        /// Indicates which code sets can represent a character -- CodeA, CodeB, or either
+        /// </summary>
+        public enum CodeSetAllowed
+        {
+            CodeA,
+            CodeB,
+            CodeAorB
+        }
+
+        /// <summary>
+        /// Get the Code128 code value(s) to represent an ASCII character, with 
+        /// optional look-ahead for length optimization
+        /// </summary>
+        /// <param name="charAscii">The ASCII value of the character to translate</param>
+        /// <param name="lookAheadAscii">The next character in sequence (or -1 if none)</param>
+        /// <param name="currentCodeSet">The current codeset, that the returned codes need to follow;
+        /// if the returned codes change that, then this value will be changed to reflect it</param>
+        /// <returns>An array of integers representing the codes that need to be output to produce the 
+        /// given character</returns>
+        public static int[] CodesForChar(int charAscii, int lookAheadAscii, ref CodeSet currentCodeSet)
+        {
+            int[] result;
+            var shifter = -1;
+
+            if (!CharCompatibleWithCodeset(charAscii, currentCodeSet))
+            {
+                // if we have a lookahead character AND if the next character is ALSO not compatible
+                if ((lookAheadAscii != -1) && !CharCompatibleWithCodeset(lookAheadAscii, currentCodeSet))
+                {
+                    // we need to switch code sets
+                    switch (currentCodeSet)
+                    {
+                        case CodeSet.CodeA:
+                            shifter = CCodeB;
+                            currentCodeSet = CodeSet.CodeB;
+                            break;
+                        case CodeSet.CodeB:
+                            shifter = CCodeA;
+                            currentCodeSet = CodeSet.CodeA;
+                            break;
+                    }
+                }
+                else
+                {
+                    // no need to switch code sets, a temporary SHIFT will suffice
+                    shifter = CShift;
+                }
+            }
+
+            if (shifter != -1)
+            {
+                result = new int[2];
+                result[0] = shifter;
+                result[1] = CodeValueForChar(charAscii);
+            }
+            else
+            {
+                result = new int[1];
+                result[0] = CodeValueForChar(charAscii);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Tells us which codesets a given character value is allowed in
+        /// </summary>
+        /// <param name="charAscii">ASCII value of character to look at</param>
+        /// <returns>Which codeset(s) can be used to represent this character</returns>
+        public static CodeSetAllowed CodesetAllowedForChar(int charAscii)
+        {
+            if (charAscii >= 32 && charAscii <= 95)
+            {
+                return CodeSetAllowed.CodeAorB;
+            }
+            else
+            {
+                return charAscii < 32 ? CodeSetAllowed.CodeA : CodeSetAllowed.CodeB;
+            }
+        }
+
+        /// <summary>
+        /// Determine if a character can be represented in a given codeset
+        /// </summary>
+        /// <param name="charAscii">character to check for</param>
+        /// <param name="currentCodeSet">codeset context to test</param>
+        /// <returns>true if the codeset contains a representation for the ASCII character</returns>
+        public static bool CharCompatibleWithCodeset(int charAscii, CodeSet currentCodeSet)
+        {
+            var csa = CodesetAllowedForChar(charAscii);
+            return csa == CodeSetAllowed.CodeAorB || (csa == CodeSetAllowed.CodeA && currentCodeSet == CodeSet.CodeA)
+                   || (csa == CodeSetAllowed.CodeB && currentCodeSet == CodeSet.CodeB);
+        }
+
+        /// <summary>
+        /// Gets the integer code128 code value for a character (assuming the appropriate code set)
+        /// </summary>
+        /// <param name="charAscii">character to convert</param>
+        /// <returns>code128 symbol value for the character</returns>
+        public static int CodeValueForChar(int charAscii)
+        {
+            return charAscii >= 32 ? charAscii - 32 : charAscii + 64;
+        }
+
+        /// <summary>
+        /// Return the appropriate START code depending on the codeset we want to be in
+        /// </summary>
+        /// <param name="cs">The codeset you want to start in</param>
+        /// <returns>The code128 code to start a barcode in that codeset</returns>
+        public static int StartCodeForCodeSet(CodeSet cs)
+        {
+            return cs == CodeSet.CodeA ? CStartA : CStartB;
+        }
+
+        /// <summary>
+        /// Return the Code128 stop code
+        /// </summary>
+        /// <returns>the stop code</returns>
+        public static int StopCode()
+        {
+            return CStop;
+        }
+    }
+}

GenCode128/Code128Content.cs

@@ -0,0 +1,97 @@
+namespace GenCode128
+{
+    using System.Collections;
+    using System.Text;
+
+    /// <summary>
+    /// Represent the set of code values to be output into barcode form
+    /// </summary>
+    public class Code128Content
+    {
+        /// <summary>
+        /// Create content based on a string of ASCII data
+        /// </summary>
+        /// <param name="asciiData">the string that should be represented</param>
+        public Code128Content(string asciiData)
+        {
+            this.Codes = this.StringToCode128(asciiData);
+        }
+
+        /// <summary>
+        /// Provides the Code128 code values representing the object's string
+        /// </summary>
+        public int[] Codes
+        {
+            get { return codes; }
+            set { codes = value; }
+        }
+        int[] codes;
+
+        /// <summary>
+        /// Transform the string into integers representing the Code128 codes
+        /// necessary to represent it
+        /// </summary>
+        /// <param name="asciiData">String to be encoded</param>
+        /// <returns>Code128 representation</returns>
+        private int[] StringToCode128(string asciiData)
+        {
+            // turn the string into ascii byte data
+            var asciiBytes = Encoding.ASCII.GetBytes(asciiData);
+
+            // decide which codeset to start with
+            var csa1 = asciiBytes.Length > 0
+                           ? Code128Code.CodesetAllowedForChar(asciiBytes[0])
+                           : Code128Code.CodeSetAllowed.CodeAorB;
+            var csa2 = asciiBytes.Length > 1
+                           ? Code128Code.CodesetAllowedForChar(asciiBytes[1])
+                           : Code128Code.CodeSetAllowed.CodeAorB;
+            var currentCodeSet = this.GetBestStartSet(csa1, csa2);
+
+            // set up the beginning of the barcode
+            // assume no codeset changes, account for start, checksum, and stop
+            var codes = new ArrayList(asciiBytes.Length + 3) { Code128Code.StartCodeForCodeSet(currentCodeSet) };
+            
+            // add the codes for each character in the string
+            for (var i = 0; i < asciiBytes.Length; i++)
+            {
+                int thischar = asciiBytes[i];
+                var nextchar = asciiBytes.Length > i + 1 ? asciiBytes[i + 1] : -1;
+
+                codes.AddRange(Code128Code.CodesForChar(thischar, nextchar, ref currentCodeSet));
+            }
+
+            // calculate the check digit
+            var checksum = (int)codes[0];
+            for (var i = 1; i < codes.Count; i++)
+            {
+                checksum += i * (int)codes[i];
+            }
+
+            codes.Add(checksum % 103);
+
+            codes.Add(Code128Code.StopCode());
+
+            var result = codes.ToArray(typeof(int)) as int[];
+            return result;
+        }
+
+        /// <summary>
+        /// Determines the best starting code set based on the the first two 
+        /// characters of the string to be encoded
+        /// </summary>
+        /// <param name="csa1">First character of input string</param>
+        /// <param name="csa2">Second character of input string</param>
+        /// <returns>The codeset determined to be best to start with</returns>
+        private CodeSet GetBestStartSet(Code128Code.CodeSetAllowed csa1, Code128Code.CodeSetAllowed csa2)
+        {
+            var vote = 0;
+
+            vote += csa1 == Code128Code.CodeSetAllowed.CodeA ? 1 : 0;
+            vote += csa1 == Code128Code.CodeSetAllowed.CodeB ? -1 : 0;
+            vote += csa2 == Code128Code.CodeSetAllowed.CodeA ? 1 : 0;
+            vote += csa2 == Code128Code.CodeSetAllowed.CodeB ? -1 : 0;
+
+            return vote > 0 ? CodeSet.CodeA : CodeSet.CodeB; // ties go to codeB due to my own prejudices
+        }
+    }
+}

GenCode128/Code128Rendering.cs

@@ -0,0 +1,188 @@
+namespace GenCode128
+{
+    using System;
+    using System.Drawing;
+
+    /// <summary>
+    /// Summary description for Code128Rendering.
+    /// </summary>
+    public static class Code128Rendering
+    {
+        private const int CQuietWidth = 10;
+
+        // Code patterns:
+        // in principle these rows should each have 6 elements
+        // however, the last one -- STOP -- has 7. The cost of the
+        // extra integers is trivial, and this lets the code flow
+        // much more elegantly
+        private static readonly int[,] CPatterns =
+                                                    {
+                                                     { 2, 1, 2, 2, 2, 2, 0, 0 }, // 0
+                                                     { 2, 2, 2, 1, 2, 2, 0, 0 }, // 1
+                                                     { 2, 2, 2, 2, 2, 1, 0, 0 }, // 2
+                                                     { 1, 2, 1, 2, 2, 3, 0, 0 }, // 3
+                                                     { 1, 2, 1, 3, 2, 2, 0, 0 }, // 4
+                                                     { 1, 3, 1, 2, 2, 2, 0, 0 }, // 5
+                                                     { 1, 2, 2, 2, 1, 3, 0, 0 }, // 6
+                                                     { 1, 2, 2, 3, 1, 2, 0, 0 }, // 7
+                                                     { 1, 3, 2, 2, 1, 2, 0, 0 }, // 8
+                                                     { 2, 2, 1, 2, 1, 3, 0, 0 }, // 9
+                                                     { 2, 2, 1, 3, 1, 2, 0, 0 }, // 10
+                                                     { 2, 3, 1, 2, 1, 2, 0, 0 }, // 11
+                                                     { 1, 1, 2, 2, 3, 2, 0, 0 }, // 12
+                                                     { 1, 2, 2, 1, 3, 2, 0, 0 }, // 13
+                                                     { 1, 2, 2, 2, 3, 1, 0, 0 }, // 14
+                                                     { 1, 1, 3, 2, 2, 2, 0, 0 }, // 15
+                                                     { 1, 2, 3, 1, 2, 2, 0, 0 }, // 16
+                                                     { 1, 2, 3, 2, 2, 1, 0, 0 }, // 17
+                                                     { 2, 2, 3, 2, 1, 1, 0, 0 }, // 18
+                                                     { 2, 2, 1, 1, 3, 2, 0, 0 }, // 19
+                                                     { 2, 2, 1, 2, 3, 1, 0, 0 }, // 20
+                                                     { 2, 1, 3, 2, 1, 2, 0, 0 }, // 21
+                                                     { 2, 2, 3, 1, 1, 2, 0, 0 }, // 22
+                                                     { 3, 1, 2, 1, 3, 1, 0, 0 }, // 23
+                                                     { 3, 1, 1, 2, 2, 2, 0, 0 }, // 24
+                                                     { 3, 2, 1, 1, 2, 2, 0, 0 }, // 25
+                                                     { 3, 2, 1, 2, 2, 1, 0, 0 }, // 26
+                                                     { 3, 1, 2, 2, 1, 2, 0, 0 }, // 27
+                                                     { 3, 2, 2, 1, 1, 2, 0, 0 }, // 28
+                                                     { 3, 2, 2, 2, 1, 1, 0, 0 }, // 29
+                                                     { 2, 1, 2, 1, 2, 3, 0, 0 }, // 30
+                                                     { 2, 1, 2, 3, 2, 1, 0, 0 }, // 31
+                                                     { 2, 3, 2, 1, 2, 1, 0, 0 }, // 32
+                                                     { 1, 1, 1, 3, 2, 3, 0, 0 }, // 33
+                                                     { 1, 3, 1, 1, 2, 3, 0, 0 }, // 34
+                                                     { 1, 3, 1, 3, 2, 1, 0, 0 }, // 35
+                                                     { 1, 1, 2, 3, 1, 3, 0, 0 }, // 36
+                                                     { 1, 3, 2, 1, 1, 3, 0, 0 }, // 37
+                                                     { 1, 3, 2, 3, 1, 1, 0, 0 }, // 38
+                                                     { 2, 1, 1, 3, 1, 3, 0, 0 }, // 39
+                                                     { 2, 3, 1, 1, 1, 3, 0, 0 }, // 40
+                                                     { 2, 3, 1, 3, 1, 1, 0, 0 }, // 41
+                                                     { 1, 1, 2, 1, 3, 3, 0, 0 }, // 42
+                                                     { 1, 1, 2, 3, 3, 1, 0, 0 }, // 43
+                                                     { 1, 3, 2, 1, 3, 1, 0, 0 }, // 44
+                                                     { 1, 1, 3, 1, 2, 3, 0, 0 }, // 45
+                                                     { 1, 1, 3, 3, 2, 1, 0, 0 }, // 46
+                                                     { 1, 3, 3, 1, 2, 1, 0, 0 }, // 47
+                                                     { 3, 1, 3, 1, 2, 1, 0, 0 }, // 48
+                                                     { 2, 1, 1, 3, 3, 1, 0, 0 }, // 49
+                                                     { 2, 3, 1, 1, 3, 1, 0, 0 }, // 50
+                                                     { 2, 1, 3, 1, 1, 3, 0, 0 }, // 51
+                                                     { 2, 1, 3, 3, 1, 1, 0, 0 }, // 52
+                                                     { 2, 1, 3, 1, 3, 1, 0, 0 }, // 53
+                                                     { 3, 1, 1, 1, 2, 3, 0, 0 }, // 54
+                                                     { 3, 1, 1, 3, 2, 1, 0, 0 }, // 55
+                                                     { 3, 3, 1, 1, 2, 1, 0, 0 }, // 56
+                                                     { 3, 1, 2, 1, 1, 3, 0, 0 }, // 57
+                                                     { 3, 1, 2, 3, 1, 1, 0, 0 }, // 58
+                                                     { 3, 3, 2, 1, 1, 1, 0, 0 }, // 59
+                                                     { 3, 1, 4, 1, 1, 1, 0, 0 }, // 60
+                                                     { 2, 2, 1, 4, 1, 1, 0, 0 }, // 61
+                                                     { 4, 3, 1, 1, 1, 1, 0, 0 }, // 62
+                                                     { 1, 1, 1, 2, 2, 4, 0, 0 }, // 63
+                                                     { 1, 1, 1, 4, 2, 2, 0, 0 }, // 64
+                                                     { 1, 2, 1, 1, 2, 4, 0, 0 }, // 65
+                                                     { 1, 2, 1, 4, 2, 1, 0, 0 }, // 66
+                                                     { 1, 4, 1, 1, 2, 2, 0, 0 }, // 67
+                                                     { 1, 4, 1, 2, 2, 1, 0, 0 }, // 68
+                                                     { 1, 1, 2, 2, 1, 4, 0, 0 }, // 69
+                                                     { 1, 1, 2, 4, 1, 2, 0, 0 }, // 70
+                                                     { 1, 2, 2, 1, 1, 4, 0, 0 }, // 71
+                                                     { 1, 2, 2, 4, 1, 1, 0, 0 }, // 72
+                                                     { 1, 4, 2, 1, 1, 2, 0, 0 }, // 73
+                                                     { 1, 4, 2, 2, 1, 1, 0, 0 }, // 74
+                                                     { 2, 4, 1, 2, 1, 1, 0, 0 }, // 75
+                                                     { 2, 2, 1, 1, 1, 4, 0, 0 }, // 76
+                                                     { 4, 1, 3, 1, 1, 1, 0, 0 }, // 77
+                                                     { 2, 4, 1, 1, 1, 2, 0, 0 }, // 78
+                                                     { 1, 3, 4, 1, 1, 1, 0, 0 }, // 79
+                                                     { 1, 1, 1, 2, 4, 2, 0, 0 }, // 80
+                                                     { 1, 2, 1, 1, 4, 2, 0, 0 }, // 81
+                                                     { 1, 2, 1, 2, 4, 1, 0, 0 }, // 82
+                                                     { 1, 1, 4, 2, 1, 2, 0, 0 }, // 83
+                                                     { 1, 2, 4, 1, 1, 2, 0, 0 }, // 84
+                                                     { 1, 2, 4, 2, 1, 1, 0, 0 }, // 85
+                                                     { 4, 1, 1, 2, 1, 2, 0, 0 }, // 86
+                                                     { 4, 2, 1, 1, 1, 2, 0, 0 }, // 87
+                                                     { 4, 2, 1, 2, 1, 1, 0, 0 }, // 88
+                                                     { 2, 1, 2, 1, 4, 1, 0, 0 }, // 89
+                                                     { 2, 1, 4, 1, 2, 1, 0, 0 }, // 90
+                                                     { 4, 1, 2, 1, 2, 1, 0, 0 }, // 91
+                                                     { 1, 1, 1, 1, 4, 3, 0, 0 }, // 92
+                                                     { 1, 1, 1, 3, 4, 1, 0, 0 }, // 93
+                                                     { 1, 3, 1, 1, 4, 1, 0, 0 }, // 94
+                                                     { 1, 1, 4, 1, 1, 3, 0, 0 }, // 95
+                                                     { 1, 1, 4, 3, 1, 1, 0, 0 }, // 96
+                                                     { 4, 1, 1, 1, 1, 3, 0, 0 }, // 97
+                                                     { 4, 1, 1, 3, 1, 1, 0, 0 }, // 98
+                                                     { 1, 1, 3, 1, 4, 1, 0, 0 }, // 99
+                                                     { 1, 1, 4, 1, 3, 1, 0, 0 }, // 100
+                                                     { 3, 1, 1, 1, 4, 1, 0, 0 }, // 101
+                                                     { 4, 1, 1, 1, 3, 1, 0, 0 }, // 102
+                                                     { 2, 1, 1, 4, 1, 2, 0, 0 }, // 103
+                                                     { 2, 1, 1, 2, 1, 4, 0, 0 }, // 104
+                                                     { 2, 1, 1, 2, 3, 2, 0, 0 }, // 105
+                                                     { 2, 3, 3, 1, 1, 1, 2, 0 } // 106
+                                                   };
+
+        /// <summary>
+        /// Make an image of a Code128 barcode for a given string
+        /// </summary>
+        /// <param name="inputData">Message to be encoded</param>
+        /// <param name="barWeight">Base thickness for bar width (1 or 2 works well)</param>
+        /// <param name="addQuietZone">Add required horizontal margins (use if output is tight)</param>
+        /// <returns>An Image of the Code128 barcode representing the message</returns>
+        public static Image MakeBarcodeImage(string inputData, int barWeight, bool addQuietZone)
+        {
+            // get the Code128 codes to represent the message
+            var content = new Code128Content(inputData);
+            var codes = content.Codes;
+
+            var width = (((codes.Length - 3) * 11) + 35) * barWeight;
+            var height = Convert.ToInt32(Math.Ceiling(Convert.ToSingle(width) * .15F));
+
+            if (addQuietZone)
+            {
+                width += 2 * CQuietWidth * barWeight; // on both sides
+            }
+
+            // get surface to draw on
+            Image myImage = new Bitmap(width, height);
+            using (var gr = Graphics.FromImage(myImage))
+            {
+                // set to white so we don't have to fill the spaces with white
+                gr.FillRectangle(Brushes.White, 0, 0, width, height);
+
+                // skip quiet zone
+                var cursor = addQuietZone ? CQuietWidth * barWeight : 0;
+
+                for (var codeIdx = 0; codeIdx < codes.Length; codeIdx++)
+                {
+                    var code = codes[codeIdx];
+
+                    // take the bars two at a time: a black and a white
+                    for (var bar = 0; bar < 8; bar += 2)
+                    {
+                        var barWidth = CPatterns[code, bar] * barWeight;
+                        var spcWidth = CPatterns[code, bar + 1] * barWeight;
+
+                        // if width is zero, don't try to draw it
+                        if (barWidth > 0)
+                        {
+                            gr.FillRectangle(Brushes.Black, cursor, 0, barWidth, height);
+                        }
+
+                        // note that we never need to draw the space, since we 
+                        // initialized the graphics to all white
+
+                        // advance cursor beyond this pair
+                        cursor += barWidth + spcWidth;
+                    }
+                }
+            }
+
+            return myImage;
+        }
+    }
+}

GenCode128/CodeSet.cs

@@ -0,0 +1,9 @@
+namespace GenCode128
+{
+    public enum CodeSet
+    {
+        CodeA,
+        CodeB
+        //// CodeC   // not supported
+    }
+}

GenCode128/GenCode128.csproj

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{32817BF9-E380-4467-9C7F-936F4B122BC7}</ProjectGuid>
+    <SccProjectName>
+    </SccProjectName>
+    <SccLocalPath>
+    </SccLocalPath>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccProvider>
+    </SccProvider>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>GenCode128</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>GenCode128</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Drawing">
+      <Name>System.Drawing</Name>
+    </Reference>
+    <Reference Include="System.Windows.Forms">
+      <Name>System.Windows.Forms</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Code128Code.cs" />
+    <Compile Include="CodeSet.cs" />
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Code128Content.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Code128Rendering.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>

GraphLib/GraphLib.csproj

@@ -10,13 +10,12 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ClassLibrary1</RootNamespace>
     <AssemblyName>GraphLib</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -26,7 +25,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -35,7 +33,6 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

GraphLib/Properties/Resources.Designer.cs

@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.18408
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -13,12 +13,12 @@ namespace ClassLibrary1.Properties {
     
     
     /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
@@ -33,7 +33,7 @@ namespace ClassLibrary1.Properties {
         }
         
         /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@ namespace ClassLibrary1.Properties {
         }
         
         /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Globalization.CultureInfo Culture {

RestClient/BaseClient.cs

@@ -1,198 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Threading.Tasks;
-
-namespace RestClient
-{
-    public class BaseClient
-    {
-        private string _token;
-
-        private string _baseUrl;
-
-        public string ErrorMessage { get; set; }
-
-        private readonly HttpClient client;
-        private AuthenticationHeaderValue _authValue;
-
-        public BaseClient(string baseUrl)
-        {
-            this._baseUrl = baseUrl;
-        }
-
-        public void SetToken(string token)
-        {
-            _authValue = new AuthenticationHeaderValue("Bearer", token);
-        }
-
-        protected Uri GetUrl(string relativeUrl)
-        {
-            try
-            {
-                return new Uri(_baseUrl + relativeUrl);
-            }
-            catch (Exception)
-            {
-                Trace.TraceError("Invalid url " + relativeUrl);
-                return null;
-            }
-        }
-
-        protected async Task<TResult> GetResultAsync<TResult>(string relativeUrl)
-        {
-            ErrorMessage = String.Empty;
-            Uri url = null;
-            try
-            {
-                url = new Uri(_baseUrl + relativeUrl);
-            }
-            catch (Exception)
-            {
-                Trace.TraceError("Invalid url " + relativeUrl);
-                return default(TResult);
-            }
-            using (var client = GetClient())
-            {
-                try
-                {
-                    var result = await client.GetAsync(url).ConfigureAwait(false);
-                    var parsedResult = await result.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    if (result.IsSuccessStatusCode)
-                    {
-                        return JsonConvert.DeserializeObject<TResult>(parsedResult);
-                    }
-                    if (result.StatusCode == System.Net.HttpStatusCode.NotFound)
-                    {
-                        //Create not an error message, because communication is okay, only the meter is not available in database.
-                        return default(TResult);
-                    }
-                    try
-                    {
-                        string Messages = await result.Content.ReadAsStringAsync();
-                        var errors = JsonConvert.DeserializeObject<Dictionary<string, object>>(Messages);
-                        string ServiceError = String.Empty;
-                        if (errors != null)
-                        {
-                            ServiceError = errors["Message"].ToString();
-                        }
-                        ErrorMessage = string.Format("Error message: {0}", ServiceError);
-                    }
-                    catch
-                    {
-                        result.EnsureSuccessStatusCode();
-                    }
-                    return default(TResult);
-                }
-                catch (Exception ex)
-                {
-                    string Message = ex.Message;
-                    if (ex.InnerException != null)
-                    {
-                        Message += ". " + ex.InnerException.Message;
-                    }
-                    Trace.TraceError(Message);
-                    ErrorMessage = Message;
-                    return default(TResult);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Post method.
-        /// </summary>
-        /// <typeparam name="TResult"></typeparam>
-        /// <param name="relativeUrl"></param>
-        /// <param name="Position"></param>
-        /// /// <param name="withBaseUrl"></param>
-        /// <returns>The new resource</returns>
-        protected async Task<string> PostWithReturnDataAsync<TResult>(string relativeUrl, bool withBaseUrl, TResult Position)
-        {
-            string data = string.Empty;
-            ErrorMessage = String.Empty;
-            Uri url = null;
-            try
-            {
-                if (withBaseUrl)
-                {
-                    url = new Uri(_baseUrl + relativeUrl);
-                }
-                else
-                {
-                    url = new Uri(relativeUrl);
-                }
-            }
-            catch (Exception ex)
-            {
-                Trace.TraceError("Invalid url " + url);
-                ErrorMessage = ex.Message;
-                return data;
-            }
-            using (var client = GetClient())
-            {
-                try
-                {
-                    string json = JsonConvert.SerializeObject(Position);
-                    HttpContent content = new StringContent(json, System.Text.Encoding.UTF8, "application/json");
-                    HttpResponseMessage response = await client.PostAsync(url.ToString(), content).ConfigureAwait(false);
-                    if (response.IsSuccessStatusCode)
-                    {
-                        data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-                        return data;
-                    }
-                    else
-                    {
-                        if (response.StatusCode == HttpStatusCode.NotFound)
-                        {
-                            ErrorMessage = String.Format("Status code: {0}. Url: {1}", response.StatusCode, url);
-                        }
-                        else
-                        {
-                            string errorMessageService = string.Empty;
-                            string message = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-                            if (string.IsNullOrEmpty(message))
-                            {
-                                errorMessageService = response.ReasonPhrase;
-                            }
-                            else
-                            {
-                                try
-                                {
-                                    var errors = JsonConvert.DeserializeObject<Dictionary<string, object>>(message);
-                                    errorMessageService = errors["Message"].ToString();
-                                }
-                                catch (Exception)
-                                {
-                                    errorMessageService = message;
-                                }
-                            }
-                            ErrorMessage = String.Format("Status code: {0}. Error message: {1}", response.StatusCode, errorMessageService);
-                        }
-                        return data;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Trace.TraceError(ex.Message);
-                    ErrorMessage = ex.Message;
-                    return data;
-                }
-            }
-        }
-
-        protected HttpClient GetClient()
-        {
-            HttpClientHandler handler = new HttpClientHandler();
-            handler.ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => { return true; };
-            HttpClient client = new HttpClient(handler);
-            client.DefaultRequestHeaders.Accept.Clear();
-            client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-            client.DefaultRequestHeaders.Authorization = _authValue;
-            return client;
-        }
-    }
-}

RestClient/GetQ2PreCorrectionClient.cs

@@ -1,82 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using RestClient.Models;
-
-namespace RestClient
-{
-    public class GetQ2PreCorrectionClient : BaseClient
-    {
-        public GetQ2PreCorrectionClient(string baseUrl)
-            : base(baseUrl)
-        { }
-
-        public async Task GetToken(string name, string password, string urlLogin)
-        {
-            LoginUser user = new LoginUser { Name = name, Password = password };
-            var response = await PostWithReturnDataAsync(urlLogin, false, user).ConfigureAwait(false);
-            var tmp = JsonConvert.DeserializeObject<CustomJwt>(response);
-            if (tmp != null)
-            {
-                SetToken(tmp.access_token);
-            }
-            else
-            {
-                throw new Exception(string.Format("No token loaded: {0}", ErrorMessage));
-            }
-        }
-
-        public async Task<Q2PreCorrection> GetQ2Correction(string relativeUrl)
-        {
-            ErrorMessage = String.Empty;
-            Uri url = GetUrl(relativeUrl);
-            if (url == null) return new Q2PreCorrection { AreDataCalculated = false, CorrLR = 0, CorrRL = 0, };
-
-            using (var client = GetClient())
-            {
-                try
-                {
-                    var result = await client.GetAsync(url).ConfigureAwait(false);
-                    string jsonResult = await result.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    if (result.IsSuccessStatusCode)
-                    {
-                        Q2PreCorrection retVal = new Q2PreCorrection();
-
-                        string pattern = "\"areDataCalculated\":";
-                        int position = jsonResult.IndexOf(pattern) + pattern.Length;
-                        int length = jsonResult.Substring(position).IndexOfAny(new char[] { ',', '}', '\r', '\n' });
-                        retVal.AreDataCalculated = bool.Parse(jsonResult.Substring(position, length));
-
-                        pattern = "\"right\":";
-                        position = jsonResult.IndexOf(pattern) + pattern.Length;
-                        length = jsonResult.Substring(position).IndexOfAny(new char[] { ',', '}', '\r', '\n' });
-                        retVal.CorrLR = int.Parse(jsonResult.Substring(position, length));
-
-                        pattern = "\"left\":";
-                        position = jsonResult.IndexOf(pattern) + pattern.Length;
-                        length = jsonResult.Substring(position).IndexOfAny(new char[] { ',', '}', '\r', '\n' });
-                        retVal.CorrRL = int.Parse(jsonResult.Substring(position, length));
-
-                        return retVal;
-                    }
-                    else
-                    {
-                        return new Q2PreCorrection { AreDataCalculated = false, CorrLR = 0, CorrRL = 0, };
-                    }
-                }
-                catch (Exception ex)
-                {
-                    string Message = ex.Message;
-                    if (ex.InnerException != null)
-                    {
-                        Message += ". " + ex.InnerException.Message;
-                    }
-                    Trace.TraceError(Message);
-                    ErrorMessage = Message;
-                    return new Q2PreCorrection { AreDataCalculated = false, CorrLR = 0, CorrRL = 0, };
-                }
-            }
-        }
-    }
-}

RestClient/Models/CustomJwt.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace RestClient.Models
-{
-    public class CustomJwt
-    {
-        public string access_token { get; set; }
-        public string token_type { get; set; }
-        public int expires_in { get; set; }
-    }
-}

RestClient/Models/LoginUser.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace RestClient.Models
-{
-    public class LoginUser
-    {
-        public string Name { get; set; }
-        public string Password { get; set; }
-    }
-}

RestClient/Properties/AssemblyInfo.cs

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

RestClient/Q2PreCorrection.cs

@@ -1,11 +0,0 @@
-using System;
-
-namespace RestClient
-{
-    public class Q2PreCorrection
-    {
-        public bool AreDataCalculated;
-        public int CorrLR;
-        public int CorrRL;
-    }
-}

RestClient/RestClient.csproj

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{46E3B0E1-209F-4550-B0DD-D7E2C039B3CE}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>RestClient</RootNamespace>
-    <AssemblyName>RestClient</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="BaseClient.cs" />
-    <Compile Include="GetQ2PreCorrectionClient.cs" />
-    <Compile Include="Models\CustomJwt.cs" />
-    <Compile Include="Models\LoginUser.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Q2PreCorrection.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

RestClient/packages.config

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

Results/Entities/Components.cs

@@ -59,15 +59,15 @@ namespace Results.Entities
 		public virtual bool Equals(Components bc)
 		{
 			if (TestBenchId != bc.TestBenchId) return false;
-			if (!TestBenchName.Equals(bc.TestBenchName)) return false;
-			if (!Pump.Equals(bc.Pump)) return false;
-			if (!RegValve.Equals(bc.RegValve)) return false;
-			if (!Flowmeter.Equals(bc.Flowmeter)) return false;
-			if (!Diverter.Equals(bc.Diverter)) return false;
-			if (!Scale.Equals(bc.Scale)) return false;
-			if (!Custom1.Equals(bc.Custom1)) return false;
-			if (!Custom2.Equals(bc.Custom2)) return false;
-			if (!Custom3.Equals(bc.Custom3)) return false;
+			if (TestBenchName != bc.TestBenchName) return false;
+			if (Pump != bc.Pump) return false;
+			if (RegValve != bc.RegValve) return false;
+			if (Flowmeter != bc.Flowmeter) return false;
+			if (Diverter != bc.Diverter) return false;
+			if (Scale != bc.Scale) return false;
+			if (Custom1 != bc.Custom1) return false;
+			if (Custom2 != bc.Custom2) return false;
+			if (Custom3 != bc.Custom3) return false;
 
 			return true;
 		}

Results/Entities/MeterTestRslt.cs

@@ -25,8 +25,7 @@ namespace Results.Entities
  
 		/// Main result
 		public virtual double Error			  { get; set; }		/// [%]
-        public virtual long   ErrorIndicators { get; set; }		/// Not mapped to DB !!!, bit24=E25, bit25=E26, bit26=E27, bit27=E28 (error flags)
-        public virtual long   InfoIndicators  { get; set; }		/// Not mapped to DB !!!, bit24=E25, bit25=E26, bit26=E27, bit27=E28 (info flags)
+        public virtual int    ErrorIndicators { get; set; }		/// Not mapped to DB !!!, bit24=E25, bit25=E26, bit26=E27, bit27=E28
         public virtual double KorrErrQ        { get; set; }     /// [%] not mapped to results DB, saved to Oracle DB
 		public virtual bool   TestDone		  { get; set; }		/// true = test was completed
 		public virtual bool   Passed		  { get; set; }		/// true = test passed, water meter is OK
@@ -51,15 +50,14 @@ namespace Results.Entities
 		public virtual TestData TestData()    { return TestRslt.TestData; }
 		/// 
 		public virtual int    Repeats()		  { return TestData().Repeats; }
-        public virtual double Qtg()           { return TestData().Qtg; }			/// [m3/h]
-        public virtual double Qfrom()         { return TestData().Qfrom; }			/// [m3/h]
+		public virtual double Qfrom()		  { return TestData().Qfrom; }			/// [m3/h]
 		public virtual double Qto()			  { return TestData().Qto; }			/// [m3/h]
 		public virtual double TargetVolume()  { return TestData().TargetVolume; }	/// [l]
 		public virtual double TargetTime()	  { return TestData().TargetTime; }		/// [s]
 		public virtual string Method()		  { return TestData().Method; }
 		public virtual double ErrLimLo()	  { return TestData().ErrLimLo; }		/// [%]
 		public virtual double ErrLimHi()	  { return TestData().ErrLimHi; }		/// [%]
-		public virtual double Uncertainty()   { return TestData().ErrLimMargin; }	/// [%]
+		public virtual double Uncertainty()   { return TestData().Uncertainty; }	/// [%]
 
 		public virtual string ProcedureName() { return WaterMeter.Batch.ProcedureName; }
 		public virtual int    BatchNr()       { return WaterMeter.Batch.BatchNr; }

Results/Entities/TestData.cs

@@ -15,15 +15,14 @@ namespace Results.Entities
         public virtual int    Id					{ get; protected set; }
         public virtual string Name					{ get; set; }
 		public virtual int    Repeats				{ get; set; }
-        public virtual double Qtg                   { get; set; }	/// [m3/h] flow range low limit
-        public virtual double Qfrom                 { get; set; }	/// [m3/h] flow range low limit
+		public virtual double Qfrom					{ get; set; }	/// [m3/h] flow range low limit
 		public virtual double Qto					{ get; set; }	/// [m3/h] flow range high limit
 		public virtual double TargetVolume			{ get; set; }	/// [l] target test volume
 		public virtual double TargetTime			{ get; set; }	/// [s] target test time
 		public virtual string Method				{ get; set; }
         public virtual double ErrLimLo              { get; set; }	/// [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
         public virtual double ErrLimHi              { get; set; }	/// [%] usually > 0, in case of heat meters: -Qn in m3/h
-        public virtual double ErrLimMargin          { get; set; }	///	[%] makes error limits tighter: 0 <= ErrLimMargin <= abs(ErrLimXx)
+		public virtual double Uncertainty			{ get; set; }	///	[%] makes error limits tighter: 0 <= Uncertainty <= abs(ErrLimXx)
 		public virtual bool   DoControlWaterTemp	{ get; set; }
 		public virtual float  TempLimLo				{ get; set; }
 		public virtual float  TempLimHi				{ get; set; }
@@ -31,7 +30,7 @@ namespace Results.Entities
 		public virtual bool   Evaluate				{ get; set; }
 
 
-		protected TestData()
+		public TestData()
         {
 			Name = string.Empty;
 			Method = string.Empty;
@@ -42,15 +41,14 @@ namespace Results.Entities
 		{
 			Name = test.Name;
 			Repeats = test.Repeats;
-            Qtg = (double)test.Qtg;
-            Qfrom = (double)test.Qfrom;
+			Qfrom = (double)test.Qfrom;
 			Qto = (double)test.Qto;
 			TargetVolume = (double)test.Volume;
 			TargetTime = (double)test.TstTime;
 			Method = test.Method;
 			ErrLimLo = (double)test.ErrLimLo;
 			ErrLimHi = (double)test.ErrLimHi;
-			ErrLimMargin = (double)test.Uncertainty;
+			Uncertainty = (double)test.Uncertainty;
 			DoControlWaterTemp = test.DoControlWaterTemp;
 			TempLimLo = test.TempLimLo;
 			TempLimHi = test.TempLimHi;
@@ -66,17 +64,16 @@ namespace Results.Entities
 		/// <returns>first = two entities are equal (except of Id)</returns>
 		public virtual bool Equals(TestData td)
 		{
-			if (!Name.Equals(td.Name)) return false;
+			if (Name != td.Name) return false;
 			if (Repeats != td.Repeats) return false;
-            if (Qtg != td.Qtg) return false;
-            if (Qfrom != td.Qfrom) return false;
+			if (Qfrom != td.Qfrom) return false;
 			if (Qto != td.Qto) return false;
 			if (TargetVolume != td.TargetVolume) return false;
 			if (TargetTime != td.TargetTime) return false;
-			if (!Method.Equals(td.Method)) return false;
+			if (Method != td.Method) return false;
 			if (ErrLimLo != td.ErrLimLo) return false;
 			if (ErrLimHi != td.ErrLimHi) return false;
-			if (ErrLimMargin != td.ErrLimMargin) return false;
+			if (Uncertainty != td.Uncertainty) return false;
 			if (DoControlWaterTemp != td.DoControlWaterTemp) return false;
 			if (DoControlWaterTemp)
 			{

Results/Entities/TestRslt.cs

@@ -56,9 +56,9 @@ namespace Results.Entities
         public virtual float  DivEnd90 { get; set; }        /// [s]    Diverter switch time when test starts at level 90 (e.g. 90%) (not mapped to DB)
         public virtual float  DivEnd50 { get; set; }        /// [s]    Diverter switch time when test starts at level 50 (e.g. 50%) (not mapped to DB)
         public virtual float  DivEnd10 { get; set; }        /// [s]    Diverter switch time when test starts at level 10 (e.g. 10%) (not mapped to DB)
-
-        public virtual long ErrorFlags { get; set; }		/// bitfield : bit0=E1, bit1=E2, bit2=E3, etc.
-        public virtual long InfoFlags { get; set; }	        /// bitfield : bit0=E1, bit1=E2, bit2=E3, etc.
+        
+        public virtual int    ErrorFlags { get; set; }		/// bitfield : bit0=E1, bit1=E2, bit2=E3, etc.
+		public virtual sbyte  ErrorFlagsMd { get; set; }	/// 0=off, 1=info, 2=on (evaluated in MeterTestRslt.Passed)
 
 		/// Main results of heat meters
 		public virtual double RefEnergy { get; set; }		/// [J]    Joul
@@ -115,12 +115,6 @@ namespace Results.Entities
         public virtual float FlowMin { get; set; }			/// [m3/h]
         public virtual float FlowMax { get; set; }			/// [m3/h] 
 
-        public virtual float Uncertnt { get; set; }	/// [%] Relative error uncertainty
-        public virtual float UncertntScale { get; set; }	/// [%] Contribution to uncertainty from scale
-        public virtual float UncertntDensity { get; set; }	/// [%] Contribution to uncertainty from density
-        public virtual float UncertntTemp { get; set; }	/// [%] Contribution to uncertainty from temperature
-        public virtual float UncertntPressure { get; set; }	/// [%] Contribution to uncertainty from pressure
-
         public virtual float Custom1  { get; set; }			/// [°C] T ref hi mean
 		public virtual float Custom2  { get; set; }			/// [°C] T ref hi start
 		public virtual float Custom3  { get; set; }			/// [°C] T ref hi end
@@ -131,7 +125,7 @@ namespace Results.Entities
 		public virtual float Custom8  { get; set; }			/// [°C] T ref lo end
 		public virtual float Custom9  { get; set; }			/// [°C] T ref lo min
 		public virtual float Custom10 { get; set; }			/// [°C] T ref lo max
-                                                            
+
 		/// Wrappers
 		public virtual string Name()		 { return Utils.GetTestName(TestData.Name, TestData.Repeats, RepetitionNr); }
         public virtual int Repeats()         { return TestData.Repeats; }
@@ -141,8 +135,8 @@ namespace Results.Entities
 		public virtual double TargetTime()	 { return TestData.TargetTime; }
 		public virtual string Method()		 { return TestData.Method; }
         public virtual string RefFlowmeter() { return (Components != null) ? Components.Flowmeter : string.Empty; }
-        public virtual bool IsRelErrTest()   { return (MethodClass != null) ? (MethodClass.Contains("FixedStart") || MethodClass.Contains("FlyingStart") || MethodClass.Contains("CombinedWithDetection") || MethodClass.Contains("DiverterTest") || MethodClass.Contains("ManualEntry")) : true; }
-        public virtual bool IsPMaxTest()     { return (MethodClass != null) ? (MethodClass.Contains("PMaxTest") || MethodClass.Contains("LeakTest") || TestData.Method.ToLower().Contains("pmax")) : true; }
+        public virtual bool IsRelErrTest()   { return (MethodClass != null) ? (MethodClass.Contains("FixedStart") || MethodClass.Contains("FlyingStart") || MethodClass.Contains("CombinedWithDetection") || MethodClass.Contains("DiverterTest")) : true; }
+        public virtual bool IsPMaxTest()     { return (MethodClass != null) ? (MethodClass.Contains("PMaxTest") || MethodClass.Contains("LeakTest")) : true; }
         public virtual bool IsStartStop()    { return (MethodClass != null) ? MethodClass.Contains("FixedStart") : true; }
         public virtual bool IsDiverter()     { return (MethodClass != null) ? ((MethodClass.Contains("FlyingStart") && MethodClass.Contains("MassColl")) || MethodClass.Contains("DiverterTest")) : true; }
         public virtual bool IsVolumeMethod() { return (MethodClass != null) ? (MethodClass.Contains("TestMethods.FixedStart.") || MethodClass.Contains("TestMethods.FlyingStart.")) : false; }
@@ -208,7 +202,7 @@ namespace Results.Entities
             }
         }
 
-		public virtual double ErrLimMargin()  { return TestData.ErrLimMargin; }
+		public virtual double Uncertainty()  { return TestData.Uncertainty; }
         public virtual float TempLimLo()     { return TestData.TempLimLo; }
         public virtual float TempLimHi()     { return TestData.TempLimHi; }
         public virtual bool Evaluate()       { return TestData.Evaluate; }
@@ -270,7 +264,7 @@ namespace Results.Entities
             DivEnd50 = src.DivEnd50;
             DivEnd90 = src.DivEnd90;
 			ErrorFlags = src.ErrorFlags;
-            InfoFlags = src.InfoFlags;
+			ErrorFlagsMd = src.ErrorFlagsMd;
 		    RefEnergy = src.RefEnergy;
             AmbTempMean = src.AmbTempMean;
 		    AmbTempStart = src.AmbTempStart;
@@ -334,6 +328,12 @@ namespace Results.Entities
 		    Custom10 = src.Custom10;
         }
 
+		/// <summary> Wrapper </summary>
+		public virtual Config.Entities.ErrorFlagsMode ErrorFlagsMode()
+		{
+			return (Config.Entities.ErrorFlagsMode)ErrorFlagsMd;
+		}
+
         /// <summary> Wrapper </summary>
         public virtual string ErrorFlagsStr()
         {
@@ -364,11 +364,11 @@ namespace Results.Entities
 
 		public virtual string ToString(int i)
 		{
-            return string.Format("TestRslt: Part={0} RepetitionNr={1} TestDone={2} Remark={3} StartTime={4} EndTime={5} FlowSetTime={6} TestTime={7} PulsesMaster={8} ConstMaster={9} MassStartRaw={10} MassStart={11} MassEndRaw={12} MassEnd={13} DensityIn={14} DensityOut={15} DensityDiv={16} Buoyancy={17} FlowMass={18} FlowVolume={19} VolumeCTV={20} VolumeMaster={21} ErrorMaster={22} DiverterStart={85} DiverterEnd={86} ErrorFlags={23} InfoFlags={24} AmbTempMean={25} AmbTempStart={26} AmbTempEnd={27} AmbTempMin={28} AmbTempMax={29} AmbPressMean={30} AmbPressStart={31} AmbPressEnd={32} AmbPressMin={33}  AmbPressMax={34} AmbHumiMean={35} AmbHumiStart={36} AmbHumiEnd={37} AmbHumiMin={38} AmbHumiMax={39} PressUpMean={40} PressUpStart={41} PressUpEnd={42} PressUpMin={43} PressUpMax={44} PressDownMean={45} PressDownStart={46} PressDownEnd={47} PressDownMin={48} PressDownMax={49} PressDeltaMean={50} PressDeltaStart={51} PressDeltaEnd={52} PressDeltaMin={53} PressDeltaMax={54} TempUpMean={55} TempUpStart={56} TempUpEnd={57} TempUpMin={58} TempUpMax={59} TempDownMean={60} TempDownStart={61} TempDownEnd={62} TempDownMin={63} TempDownMax={64} TempDivMean={65} TempDivStart={66} TempDivEnd={67} TempDivMin={68} TempDivMax={69} FlowMean={70} FlowStart={71} FlowEnd={72} FlowMin={73} FlowMax={74} Custom1={75} Custom2={76} Custom3={77} Custom4={78} Custom5={79} Custom6={80} Custom7={81} Custom8={82} Custom9={83} Custom10={84}", 
+			return string.Format("TestRslt: Part={0} RepetitionNr={1} TestDone={2} Remark={3} StartTime={4} EndTime={5} FlowSetTime={6} TestTime={7} PulsesMaster={8} ConstMaster={9} MassStartRaw={10} MassStart={11} MassEndRaw={12} MassEnd={13} DensityIn={14} DensityOut={15} DensityDiv={16} Buoyancy={17} FlowMass={18} FlowVolume={19} VolumeCTV={20} VolumeMaster={21} ErrorMaster={22} DiverterStart={85} DiverterEnd={86} ErrorFlags={23} ErrorFlagsMd={24} AmbTempMean={25} AmbTempStart={26} AmbTempEnd={27} AmbTempMin={28} AmbTempMax={29} AmbPressMean={30} AmbPressStart={31} AmbPressEnd={32} AmbPressMin={33}  AmbPressMax={34} AmbHumiMean={35} AmbHumiStart={36} AmbHumiEnd={37} AmbHumiMin={38} AmbHumiMax={39} PressUpMean={40} PressUpStart={41} PressUpEnd={42} PressUpMin={43} PressUpMax={44} PressDownMean={45} PressDownStart={46} PressDownEnd={47} PressDownMin={48} PressDownMax={49} PressDeltaMean={50} PressDeltaStart={51} PressDeltaEnd={52} PressDeltaMin={53} PressDeltaMax={54} TempUpMean={55} TempUpStart={56} TempUpEnd={57} TempUpMin={58} TempUpMax={59} TempDownMean={60} TempDownStart={61} TempDownEnd={62} TempDownMin={63} TempDownMax={64} TempDivMean={65} TempDivStart={66} TempDivEnd={67} TempDivMin={68} TempDivMax={69} FlowMean={70} FlowStart={71} FlowEnd={72} FlowMin={73} FlowMax={74} Custom1={75} Custom2={76} Custom3={77} Custom4={78} Custom5={79} Custom6={80} Custom7={81} Custom8={82} Custom9={83} Custom10={84}", 
 								Part, RepetitionNr, TestDone, Remark, StartTime, EndTime, FlowSetTime, TestTime,
 								PulsesMaster, ConstMaster, MassStartRaw, MassStart, MassEndRaw, MassEnd,
 								DensityIn, DensityLine, DensityDiv, Buoyancy, FlowMass, FlowVolume,
-								VolumeCTV, VolumeMaster, ErrorMaster, ErrorFlags, InfoFlags, 
+								VolumeCTV, VolumeMaster, ErrorMaster, ErrorFlags, ErrorFlagsMd, 
 								AmbTempMean, AmbTempStart, AmbTempEnd, AmbTempMin, AmbTempMax,
 								AmbPressMean, AmbPressStart, AmbPressEnd, AmbPressMin, AmbPressMax,
 								AmbHumiMean, AmbHumiStart, AmbHumiEnd, AmbHumiMin, AmbHumiMax,

Results/Entities/WaterMeter.cs

@@ -51,8 +51,7 @@ namespace Results.Entities
 		public virtual string EndStateAux       { get; set; }	/// End state of the auxiliary water meter
 		public virtual double QRise				{ get; set; }	/// [m3/h] detected Q_rise of a composed meter or 'sensitivity' of a single meter
 		public virtual double QFall				{ get; set; }	/// [m3/h] detected Q_fall of a composed meter
-        public virtual long   ErrorFlags        { get; set; }	/// bitfield : bit14=E15, bit15=E16
-        public virtual long   InfoFlags         { get; set; }	/// bitfield : bit14=E15, bit15=E16
+        public virtual int    ErrorFlags        { get; set; }	/// bitfield : bit14=E15, bit15=E16
         public virtual bool   Passed            { get; set; }
         public virtual int    ResultCode        { get; set; }
 		public virtual string ArchivePath		{ get; set; }
@@ -137,19 +136,23 @@ namespace Results.Entities
 		public virtual MeterTestRslt LastMeterTestRslts() { return lastMeterTestRslts; }
 
 
-        public virtual long ErrorFlagsFromTests()
+        public virtual int ErrorFlagsFromTests(out ErrorFlagsMode errorFlagsMode)
         {
-            long errorFlags = 0;
+            int errorFlags = 0;
+            ErrorFlagsMode eFlagsMode = 0;  /// = ErrorFlagsMode.Off;
             foreach (var mtr in MeterTestRslts)
             {
                 if (mtr.Evaluate() && mtr.TestDone) errorFlags |= mtr.TestRslt.ErrorFlags;
+                if ((int)mtr.TestRslt.ErrorFlagsMode() > (int)eFlagsMode) eFlagsMode = mtr.TestRslt.ErrorFlagsMode();
             }
+            errorFlagsMode = eFlagsMode;    /// Maximum from all tests (=ErrorFlagsMode.On if at least one test is ErrorFlagsMode.On)
             return errorFlags;
         }
 
-        public virtual long ErrorFlagsFromTestsAndWM()
+        public virtual int ErrorFlagsFromTestsAndWM(out ErrorFlagsMode errorFlagsMode)
         {
-            return ErrorFlagsFromTests() | ErrorFlags;
+            int eFlagsFromTests = ErrorFlagsFromTests(out errorFlagsMode) | ErrorFlags;
+            return (errorFlagsMode != ErrorFlagsMode.Off) ? (eFlagsFromTests | ErrorFlags) : 0;
         }
 
         /// <summary>
@@ -158,7 +161,8 @@ namespace Results.Entities
         /// <returns>ErrorFlags string</returns>
         public virtual string ErrorFlagsStr()
         {
-            string eFlags = Utils.ErrorFlagsStr(ErrorFlagsFromTestsAndWM());
+            ErrorFlagsMode errorFlagsMode;
+            string eFlags = Utils.ErrorFlagsStr(ErrorFlagsFromTestsAndWM(out errorFlagsMode));
 #if LANG_PL
             return string.IsNullOrEmpty(eFlags) ? "brak" : eFlags;
 #else
@@ -168,7 +172,8 @@ namespace Results.Entities
 
         public virtual string PassedOrErrorFlagsStr()
         {
-            string eFlags = Utils.ErrorFlagsStr(ErrorFlagsFromTestsAndWM());
+            ErrorFlagsMode errorFlagsMode;
+            string eFlags = Utils.ErrorFlagsStr(ErrorFlagsFromTestsAndWM(out errorFlagsMode));
             return string.IsNullOrEmpty(eFlags) ? (WaterMeterData.Text4 + PassedColorStr(null)) : eFlags;
         }
 
@@ -188,14 +193,19 @@ namespace Results.Entities
                 }
             }
 
-            errFlgsStr.Append(Utils.ErrorFlagsStr(ErrorFlagsFromTestsAndWM()));
+            ErrorFlagsMode errorFlagsMode;
+            errFlgsStr.Append(Utils.ErrorFlagsStr(ErrorFlagsFromTestsAndWM(out errorFlagsMode)));
 
             return errFlgsStr.ToString();
         }
 
         public virtual bool  PassedFromTests()
         {
-            bool passed = (ErrorFlagsFromTestsAndWM() == 0);
+            ErrorFlagsMode eFlagsMode;
+            int eFlags = ErrorFlagsFromTestsAndWM(out eFlagsMode);
+
+            bool passed = true;
+            if (eFlagsMode == ErrorFlagsMode.On && eFlags != 0) passed = false;
 
             foreach (var mtr in MeterTestRslts)
             {

Results/Entities/WaterMeterData.cs

@@ -68,8 +68,8 @@ namespace Results.Entities
 		/// <returns>first = two entities are equal (except of Id)</returns>
 		public virtual bool Equals(WaterMeterData wmd)
 		{
-			if (!ProductName.Equals(wmd.ProductName)) return false;
-			if (!Producer.Equals(wmd.Producer)) return false;
+			if (ProductName != wmd.ProductName) return false;
+			if (Producer != wmd.Producer) return false;
 
             if (DN != wmd.DN) return false;
             if (L != wmd.L) return false;
@@ -81,13 +81,13 @@ namespace Results.Entities
 			if (Q2_Qt   != wmd.Q2_Qt) return false;
 			if (Q1_Qmin != wmd.Q1_Qmin) return false;
 
-            if (!MetrologicalClass.Equals(wmd.MetrologicalClass)) return false;
-            if (!TemperatureClass.Equals(wmd.TemperatureClass)) return false;
-            if (!PressureLossClass.Equals(wmd.PressureLossClass)) return false;
-            if (!MaxAdmissiblePressure.Equals(wmd.MaxAdmissiblePressure)) return false;
-            if (!FlowProfileSensitivityClass.Equals(wmd.FlowProfileSensitivityClass)) return false;
+            if (MetrologicalClass != wmd.MetrologicalClass) return false;
+            if (TemperatureClass != wmd.TemperatureClass) return false;
+            if (PressureLossClass != wmd.PressureLossClass) return false;
+            if (MaxAdmissiblePressure != wmd.MaxAdmissiblePressure) return false;
+            if (FlowProfileSensitivityClass != wmd.FlowProfileSensitivityClass) return false;
 
-            if (!ApprovalInfo.Equals(wmd.ApprovalInfo)) return false;
+            if (ApprovalInfo != wmd.ApprovalInfo) return false;
             if (Certificate != wmd.Certificate) return false;
 
             if (PulsesPerLtr != wmd.PulsesPerLtr) return false;

Results/Forms/ManualEntryConfigCtrl.Designer.cs

@@ -1,258 +0,0 @@
-namespace Results.Forms
-{
-    partial class ManualEntryConfigCtrl
-    {
-        /// <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.availableTabControl = new System.Windows.Forms.TabControl();
-            this.tabPage1 = new System.Windows.Forms.TabPage();
-            this.availableByQuantityTreeView = new System.Windows.Forms.TreeView();
-            this.tabPage2 = new System.Windows.Forms.TabPage();
-            this.availableByCategoryTreeView = new System.Windows.Forms.TreeView();
-            this.tabPage3 = new System.Windows.Forms.TabPage();
-            this.availableAlphabeticTreeView = new System.Windows.Forms.TreeView();
-            this.downButton = new System.Windows.Forms.Button();
-            this.upButton = new System.Windows.Forms.Button();
-            this.selectedResultsListViewEx = new Results.Forms.ListViewEx();
-            this.removeAllButton = new System.Windows.Forms.Button();
-            this.removeButton = new System.Windows.Forms.Button();
-            this.addButton = new System.Windows.Forms.Button();
-            this.selectedItemsLabel = new System.Windows.Forms.Label();
-            this.availableItemsLabel = new System.Windows.Forms.Label();
-            this.availableTabControl.SuspendLayout();
-            this.tabPage1.SuspendLayout();
-            this.tabPage2.SuspendLayout();
-            this.tabPage3.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // availableTabControl
-            // 
-            this.availableTabControl.Controls.Add(this.tabPage1);
-            this.availableTabControl.Controls.Add(this.tabPage2);
-            this.availableTabControl.Controls.Add(this.tabPage3);
-            this.availableTabControl.Enabled = false;
-            this.availableTabControl.Location = new System.Drawing.Point(9, 33);
-            this.availableTabControl.Name = "availableTabControl";
-            this.availableTabControl.SelectedIndex = 0;
-            this.availableTabControl.Size = new System.Drawing.Size(206, 453);
-            this.availableTabControl.TabIndex = 59;
-            // 
-            // tabPage1
-            // 
-            this.tabPage1.Controls.Add(this.availableByQuantityTreeView);
-            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(198, 427);
-            this.tabPage1.TabIndex = 0;
-            this.tabPage1.Text = "A...Z";
-            this.tabPage1.UseVisualStyleBackColor = true;
-            // 
-            // availableByQuantityTreeView
-            // 
-            this.availableByQuantityTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.availableByQuantityTreeView.Location = new System.Drawing.Point(3, 3);
-            this.availableByQuantityTreeView.Name = "availableByQuantityTreeView";
-            this.availableByQuantityTreeView.Size = new System.Drawing.Size(192, 421);
-            this.availableByQuantityTreeView.TabIndex = 0;
-            this.availableByQuantityTreeView.DoubleClick += new System.EventHandler(this.availableByQuantityTreeView_DoubleClick);
-            // 
-            // tabPage2
-            // 
-            this.tabPage2.Controls.Add(this.availableByCategoryTreeView);
-            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(198, 427);
-            this.tabPage2.TabIndex = 1;
-            this.tabPage2.Text = "by quantity";
-            this.tabPage2.UseVisualStyleBackColor = true;
-            // 
-            // availableByCategoryTreeView
-            // 
-            this.availableByCategoryTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.availableByCategoryTreeView.Location = new System.Drawing.Point(3, 3);
-            this.availableByCategoryTreeView.Name = "availableByCategoryTreeView";
-            this.availableByCategoryTreeView.Size = new System.Drawing.Size(192, 421);
-            this.availableByCategoryTreeView.TabIndex = 0;
-            this.availableByCategoryTreeView.DoubleClick += new System.EventHandler(this.availableByCategoryTreeView_DoubleClick);
-            // 
-            // tabPage3
-            // 
-            this.tabPage3.Controls.Add(this.availableAlphabeticTreeView);
-            this.tabPage3.Location = new System.Drawing.Point(4, 22);
-            this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Size = new System.Drawing.Size(198, 427);
-            this.tabPage3.TabIndex = 2;
-            this.tabPage3.Text = "by category";
-            this.tabPage3.UseVisualStyleBackColor = true;
-            // 
-            // availableAlphabeticTreeView
-            // 
-            this.availableAlphabeticTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.availableAlphabeticTreeView.Location = new System.Drawing.Point(0, 0);
-            this.availableAlphabeticTreeView.Name = "availableAlphabeticTreeView";
-            this.availableAlphabeticTreeView.Size = new System.Drawing.Size(198, 427);
-            this.availableAlphabeticTreeView.TabIndex = 0;
-            this.availableAlphabeticTreeView.DoubleClick += new System.EventHandler(this.availableAlphabeticTreeView_DoubleClick);
-            // 
-            // downButton
-            // 
-            this.downButton.Enabled = false;
-            this.downButton.Location = new System.Drawing.Point(221, 351);
-            this.downButton.Name = "downButton";
-            this.downButton.Size = new System.Drawing.Size(93, 30);
-            this.downButton.TabIndex = 58;
-            this.downButton.Text = "Down";
-            this.downButton.UseVisualStyleBackColor = true;
-            this.downButton.Click += new System.EventHandler(this.downButton_Click);
-            // 
-            // upButton
-            // 
-            this.upButton.Enabled = false;
-            this.upButton.Location = new System.Drawing.Point(221, 315);
-            this.upButton.Name = "upButton";
-            this.upButton.Size = new System.Drawing.Size(93, 30);
-            this.upButton.TabIndex = 57;
-            this.upButton.Text = "Up";
-            this.upButton.UseVisualStyleBackColor = true;
-            this.upButton.Click += new System.EventHandler(this.upButton_Click);
-            // 
-            // selectedResultsListViewEx
-            // 
-            this.selectedResultsListViewEx.AllowColumnReorder = true;
-            this.selectedResultsListViewEx.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.selectedResultsListViewEx.DoubleClickActivation = false;
-            this.selectedResultsListViewEx.Enabled = false;
-            this.selectedResultsListViewEx.FullRowSelect = true;
-            this.selectedResultsListViewEx.GridLines = true;
-            this.selectedResultsListViewEx.Location = new System.Drawing.Point(322, 33);
-            this.selectedResultsListViewEx.Name = "selectedResultsListViewEx";
-            this.selectedResultsListViewEx.Size = new System.Drawing.Size(594, 453);
-            this.selectedResultsListViewEx.TabIndex = 56;
-            this.selectedResultsListViewEx.UseCompatibleStateImageBehavior = false;
-            this.selectedResultsListViewEx.View = System.Windows.Forms.View.Details;
-            this.selectedResultsListViewEx.DoubleClick += new System.EventHandler(this.selectedResultsListViewEx_DoubleClick);
-            // 
-            // removeAllButton
-            // 
-            this.removeAllButton.Enabled = false;
-            this.removeAllButton.Location = new System.Drawing.Point(221, 223);
-            this.removeAllButton.Name = "removeAllButton";
-            this.removeAllButton.Size = new System.Drawing.Size(94, 30);
-            this.removeAllButton.TabIndex = 55;
-            this.removeAllButton.Text = "<< R&emove all";
-            this.removeAllButton.UseVisualStyleBackColor = true;
-            this.removeAllButton.Visible = false;
-            this.removeAllButton.Click += new System.EventHandler(this.removeAllButton_Click);
-            // 
-            // removeButton
-            // 
-            this.removeButton.Enabled = false;
-            this.removeButton.Location = new System.Drawing.Point(221, 188);
-            this.removeButton.Name = "removeButton";
-            this.removeButton.Size = new System.Drawing.Size(93, 30);
-            this.removeButton.TabIndex = 54;
-            this.removeButton.Text = "< &Remove";
-            this.removeButton.UseVisualStyleBackColor = true;
-            this.removeButton.Click += new System.EventHandler(this.removeButton_Click);
-            // 
-            // addButton
-            // 
-            this.addButton.Enabled = false;
-            this.addButton.Location = new System.Drawing.Point(221, 153);
-            this.addButton.Name = "addButton";
-            this.addButton.Size = new System.Drawing.Size(93, 30);
-            this.addButton.TabIndex = 53;
-            this.addButton.Text = "&Add >";
-            this.addButton.UseVisualStyleBackColor = true;
-            this.addButton.Click += new System.EventHandler(this.addButton_Click);
-            // 
-            // selectedItemsLabel
-            // 
-            this.selectedItemsLabel.AutoSize = true;
-            this.selectedItemsLabel.Location = new System.Drawing.Point(321, 11);
-            this.selectedItemsLabel.Name = "selectedItemsLabel";
-            this.selectedItemsLabel.Size = new System.Drawing.Size(79, 13);
-            this.selectedItemsLabel.TabIndex = 52;
-            this.selectedItemsLabel.Text = "Selected items:";
-            // 
-            // availableItemsLabel
-            // 
-            this.availableItemsLabel.AutoSize = true;
-            this.availableItemsLabel.Location = new System.Drawing.Point(11, 11);
-            this.availableItemsLabel.Name = "availableItemsLabel";
-            this.availableItemsLabel.Size = new System.Drawing.Size(80, 13);
-            this.availableItemsLabel.TabIndex = 51;
-            this.availableItemsLabel.Text = "Available items:";
-            // 
-            // ManualEntryConfigCtrl
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.availableTabControl);
-            this.Controls.Add(this.downButton);
-            this.Controls.Add(this.upButton);
-            this.Controls.Add(this.selectedResultsListViewEx);
-            this.Controls.Add(this.removeAllButton);
-            this.Controls.Add(this.removeButton);
-            this.Controls.Add(this.addButton);
-            this.Controls.Add(this.selectedItemsLabel);
-            this.Controls.Add(this.availableItemsLabel);
-            this.Name = "ManualEntryConfigCtrl";
-            this.Size = new System.Drawing.Size(925, 496);
-            this.Load += new System.EventHandler(this.ManualEntryConfigCtrl_Load);
-            this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.ManualEntryConfigCtrl_KeyPress);
-            this.availableTabControl.ResumeLayout(false);
-            this.tabPage1.ResumeLayout(false);
-            this.tabPage2.ResumeLayout(false);
-            this.tabPage3.ResumeLayout(false);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TabControl availableTabControl;
-        private System.Windows.Forms.TabPage tabPage1;
-        private System.Windows.Forms.TreeView availableByQuantityTreeView;
-        private System.Windows.Forms.TabPage tabPage2;
-        private System.Windows.Forms.TreeView availableByCategoryTreeView;
-        private System.Windows.Forms.TabPage tabPage3;
-        private System.Windows.Forms.TreeView availableAlphabeticTreeView;
-        private System.Windows.Forms.Button downButton;
-        private System.Windows.Forms.Button upButton;
-        private ListViewEx selectedResultsListViewEx;
-        private System.Windows.Forms.Button removeAllButton;
-        private System.Windows.Forms.Button removeButton;
-        private System.Windows.Forms.Button addButton;
-        private System.Windows.Forms.Label selectedItemsLabel;
-        private System.Windows.Forms.Label availableItemsLabel;
-
-    }
-}

Results/Forms/ManualEntryConfigCtrl.cs

@@ -1,450 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows.Forms;
-using Config.Entities;
-using Results.Resources;
-
-namespace Results.Forms
-{
-    public partial class ManualEntryConfigCtrl : UserControl
-    {
-        /// <summary>
-        /// ListViewEx columns
-        /// </summary>
-        enum Column
-        {
-            Item,
-            Caption,
-            Units,
-			Count,
-        }
-
-        Control[] editors;		/// all editors except of units
-		ComboBox unitsCB;		/// units combo box
-
-        public IList<ManualEntryItemSpec> SelectedItems;
-		public bool Unlocked
-		{
-			set
-			{
-				availableTabControl.Enabled = value;
-				selectedResultsListViewEx.Enabled = value;
-				addButton.Enabled = value;
-				removeButton.Enabled = value;
-				removeAllButton.Enabled = value;
-				upButton.Enabled = value;
-				downButton.Enabled = value;
-				unlocked = value;
-			}
-			get { return unlocked; }
-		}
-		bool unlocked;
-
-
-        public ManualEntryConfigCtrl()
-		{
-			InitializeComponent();
-		}
-
-
-		void Localize()
-		{
-			Text = Strings.Configuration;
-            availableItemsLabel.Text = Strings.Available_items;
-			availableTabControl.TabPages[0].Text = Strings.Quantity;
-			availableTabControl.TabPages[1].Text = Strings.Category;
-			availableTabControl.TabPages[2].Text = "A...Z";
-
-			selectedItemsLabel.Text = Strings.Selected_items;
-
-			addButton.Text = Strings.Add;
-			removeButton.Text = Strings.Remove;
-			removeAllButton.Text = Strings.Remove_all;
-            upButton.Text = Strings.UpBtnText;
-            downButton.Text = Strings.DownBtnText;
-		}
-
-		private void ManualEntryConfigCtrl_Load(object sender, EventArgs e)
-		{
-			Localize();
-
-            /// Add columns to ListViewEx
-            selectedResultsListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Item, Width = 120 });
-            selectedResultsListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Caption });
-            selectedResultsListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Units });
-
-            /// Create controls used by ListViewEx to edit items
-            unitsCB = new ComboBox();
-
-            ComboBox alignmentCB = new ComboBox();
-            for (Config.Entities.Alignment a = 0; a < Config.Entities.Alignment.Count; a++)
-            {
-                alignmentCB.Items.Add(a.ToDescription());
-            }
-
-            editors = new Control[]
-                {
-                    null,
-                    new TextBox(),		/// caption
-                    unitsCB,
-                };
-            foreach (var edi in editors)
-            {
-                if (edi != null)
-                {
-                    edi.Visible = false;
-                    Controls.Add(edi);
-                }
-            }
-
-            selectedResultsListViewEx.SubItemClicked += new SubItemEventHandler(selectedResultsListViewEx_SubItemClicked);
-            selectedResultsListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(selectedResultsListViewEx_SubItemEndEditing);
-			
-			availableByQuantityTreeView.ShowNodeToolTips = true;
-			availableByCategoryTreeView.ShowNodeToolTips = true;
-			availableAlphabeticTreeView.ShowNodeToolTips = true;
-
-            RedrawAvailable();
-			RedrawSelected();
-		}
-
-        void selectedResultsListViewEx_SubItemClicked(object sender, SubItemEventArgs e)
-        {
-			if (e.SubItem == (int)Column.Units)
-			{
-                Config.Quantity quantity = (e.Item.Tag as ManualEntryItemSpec).Quantity;
-				unitsCB.Items.Clear();
-				unitsCB.Items.Add(Config.Unit.None.ToDescription());				/// "---"
-				for (Config.Unit u = (Config.Unit)1; u < Config.Unit.Count; u++)
-				{
-					if (Config.Units.IsQuantity(u, quantity))  unitsCB.Items.Add(u.ToDescription());
-				}
-				selectedResultsListViewEx.StartEditing(unitsCB, e.Item, e.SubItem);
-			}
-            else if ((e.SubItem > 0) && (e.SubItem < (int)Column.Count))
-            {
-                selectedResultsListViewEx.StartEditing(editors[e.SubItem], e.Item, e.SubItem);
-            }
-        }
-
-        void selectedResultsListViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
-        {
-            ListViewItem lvi = e.Item;
-            ManualEntryItemSpec item = lvi.Tag as ManualEntryItemSpec;
-
-            switch ((Column)e.SubItem)
-            {
-                case Column.Caption:    item.Caption = e.DisplayText;   return;
-                case Column.Units:
-                    for (Config.Unit u = 0; u < Config.Unit.Count; u++)
-                    {
-						if (u.ToDescription().Equals(unitsCB.Text))
-                        {
-                            item.Units = u;
-                            return;     /// OK
-                        }
-                    }
-                    break;              /// Error
-	
-				default:
-                    return;             /// OK
-            }
-
-            e.DisplayText = e.Item.SubItems[e.SubItem].Text;
-            e.Cancel = true;
-            return;
-        }
-
-
-		/// <summary>
-		/// Redraw available items (right hand side)
-		/// </summary>
-		void RedrawAvailable()
-		{
-			RedrawByQuantity(availableByQuantityTreeView);
-			RedrawByCategory(availableByCategoryTreeView);
-			RedrawInAlphabeticOrder(availableAlphabeticTreeView);
-		}
-
-
-		void RedrawInAlphabeticOrder(TreeView treeView)
-		{
-			treeView.Nodes.Clear();
-
-            IList<ManualEntryItemSpec> alphabeticlList = ManualEntryItemSpec.AllItems.OrderBy(x => x.Name).ToList();
-			///
-			foreach (var item in alphabeticlList)
-			{
-				TreeNode node = new TreeNode(item.Name);
-				node.Tag = item;
-				node.ToolTipText = item.ToolTipText;
-				treeView.Nodes.Add(node);
-			}
-		}
-
-
-		void RedrawByQuantity(TreeView treeView)
-		{
-			treeView.Nodes.Clear();
-
-			IList<Config.Quantity> quantities = new List<Config.Quantity>();
-			for (Config.Quantity q = 0; q < Config.Quantity.Count; q++) quantities.Add(q);
-
-			IList<Config.Quantity> sortedQuantities = quantities.OrderBy(x => x.ToDescription()).ToList();
-
-			foreach (var q in sortedQuantities)
-			{
-				int n = 0;
-                foreach (var ri in ManualEntryItemSpec.AllItems)
-				{
-					if (ri.Quantity == q) n++;
-				}
-
-				if (n > 0)
-				{
-					TreeNode[] array = new TreeNode[n];
-					int i = 0;
-                    foreach (var ri in ManualEntryItemSpec.AllItems)
-					{
-						if (ri.Quantity == q)
-						{
-							TreeNode node = new TreeNode(ri.Name);
-							node.Tag = ri;
-							node.ToolTipText = ri.ToolTipText;
-							array[i++] = node;
-						}
-					}
-
-					treeView.Nodes.Add(new TreeNode(q.ToDescription(), array));
-				}
-			}
-		}
-
-
-		void RedrawByCategory(TreeView treeView)
-		{
-			treeView.Nodes.Clear();
-
-			IList<ItemCategory> categories = new List<ItemCategory>();
-			for (ItemCategory c = 0; c < ItemCategory.Count; c++) categories.Add(c);
-
-			IList<ItemCategory> sortedCategories = categories.OrderBy(x => x.ToDescription()).ToList();
-
-			foreach (var c in sortedCategories)
-			{
-				int n = 0;
-                foreach (var ri in ManualEntryItemSpec.AllItems)
-				{
-					if (ri.Category == c) n++;
-				}
-
-				if (n > 0)
-				{
-					TreeNode[] array = new TreeNode[n];
-					int i = 0;
-                    foreach (var ri in ManualEntryItemSpec.AllItems)
-					{
-						if (ri.Category == c)
-						{
-							TreeNode node = new TreeNode(ri.Name);
-							node.Tag = ri;
-							node.ToolTipText = ri.ToolTipText;
-							array[i++] = node;
-						}
-					}
-
-					treeView.Nodes.Add(new TreeNode(c.ToDescription(), array));
-				}
-			}
-		}
-
-
-		/// <summary>
-		/// Redraw selected items (right hand side)
-		/// </summary>
-		void RedrawSelected()
-		{
-			selectedResultsListViewEx.Items.Clear();
-
-			if (SelectedItems == null) return;
-
-			foreach (var item in SelectedItems)
-			{
-                ListViewItem lvi = new ListViewItem(item.Name);     /// Item
-                lvi.Tag = item;
-                lvi.SubItems.Add(item.Caption);                     /// Header
-                lvi.SubItems.Add(item.Units.ToDescription());		/// Units
-				selectedResultsListViewEx.Items.Add(lvi);
-			}
-		}
-
-        void UpdateSelectedFromView()
-        {
-        }
-
-
-		void addButton_Click(object sender, EventArgs e)
-		{
-			switch (availableTabControl.SelectedIndex)
-			{
-				case 0:
-					availableByQuantityTreeView_DoubleClick(this, null);
-					break;
-				case 1:
-					availableByCategoryTreeView_DoubleClick(this, null);
-					break;
-				case 2:
-					availableAlphabeticTreeView_DoubleClick(this, null);
-					break;
-				default:
-					break;
-			}
-		}
-
-		private void availableByQuantityTreeView_DoubleClick(object sender, EventArgs e)
-		{
-			if (availableByQuantityTreeView.SelectedNode != null &&
-                availableByQuantityTreeView.SelectedNode.Tag is ManualEntryItemSpec)
-			{
-                AddItem(availableByQuantityTreeView.SelectedNode.Tag as ManualEntryItemSpec);
-			}
-		}
-
-		private void availableByCategoryTreeView_DoubleClick(object sender, EventArgs e)
-		{
-			if (availableByCategoryTreeView.SelectedNode != null &&
-                availableByCategoryTreeView.SelectedNode.Tag is ManualEntryItemSpec)
-			{
-                AddItem(availableByCategoryTreeView.SelectedNode.Tag as ManualEntryItemSpec);
-			}
-		}
-
-		private void availableAlphabeticTreeView_DoubleClick(object sender, EventArgs e)
-		{
-			if (availableAlphabeticTreeView.SelectedNode != null &&
-                availableAlphabeticTreeView.SelectedNode.Tag is ManualEntryItemSpec)
-			{
-                AddItem(availableAlphabeticTreeView.SelectedNode.Tag as ManualEntryItemSpec);
-			}
-		}
-
-        void AddItem(ManualEntryItemSpec item)
-		{
-            ManualEntryItemSpec newItem = item.Clone();
-			newItem.Caption = newItem.Name;
-			SelectedItems.Add(newItem);
-			RedrawSelected();
-
-			/// Select the last item
-			selectedResultsListViewEx.Focus();
-			selectedResultsListViewEx.Items[SelectedItems.Count - 1].Selected = true;
-			selectedResultsListViewEx.Items[SelectedItems.Count - 1].EnsureVisible();
-		}
-
-
-		private void selectedResultsListViewEx_DoubleClick(object sender, EventArgs e)
-		{
-			/// Double click works when just one item is selected
-
-			if (selectedResultsListViewEx.SelectedIndices.Count == 1)
-			{
-				SelectedItems.RemoveAt(selectedResultsListViewEx.SelectedIndices[0]);
-				RedrawAvailable();
-				RedrawSelected();
-			}
-		}
-
-		void removeButton_Click(object sender, EventArgs e)
-		{
-			/// Remove from the list (the last selected item first so that the indexes are not affected)
-
-			for (int i = selectedResultsListViewEx.SelectedIndices.Count - 1; i >= 0; i--)
-			{
-				SelectedItems.RemoveAt(selectedResultsListViewEx.SelectedIndices[i]);
-			}
-			RedrawAvailable();
-			RedrawSelected();
-		}
-
-		void removeAllButton_Click(object sender, EventArgs e)
-		{
-			/// Remove all items from 'Selected' list
-
-			SelectedItems.Clear();
-			RedrawAvailable();
-			RedrawSelected();
-		}
-
-        //void okButton_Click(object sender, EventArgs e)
-        //{
-        //    DialogResult = DialogResult.OK;
-        //    Close();
-        //}
-
-        private void ManualEntryConfigCtrl_KeyPress(object sender, KeyPressEventArgs e)
-        {
-            e.Handled = true;
-        }
-
-        private void upButton_Click(object sender, EventArgs e)
-        {
-            if (selectedResultsListViewEx.SelectedIndices.Count != 1) return;
-
-            int selIdx = selectedResultsListViewEx.SelectedIndices[0];
-            if (selIdx == 0)
-            {
-                /// Cannot move up
-                selectedResultsListViewEx.Focus();
-                selectedResultsListViewEx.Items[0].Selected = true;
-                return;
-            }
-
-            ManualEntryItemSpec tmp = SelectedItems[selIdx - 1];
-            SelectedItems[selIdx - 1] = SelectedItems[selIdx];
-            SelectedItems[selIdx] = tmp;
-
-            RedrawSelected();
-
-            selectedResultsListViewEx.Focus();
-            selectedResultsListViewEx.Items[selIdx - 1].Selected = true;
-            selectedResultsListViewEx.Items[selIdx - 1].EnsureVisible();
-        }
-
-        private void downButton_Click(object sender, EventArgs e)
-        {
-            if (selectedResultsListViewEx.SelectedIndices.Count != 1) return;
-
-            int selIdx = selectedResultsListViewEx.SelectedIndices[0];
-            if (selIdx == SelectedItems.Count - 1)
-            {
-                /// Cannot move down
-                selectedResultsListViewEx.Focus();
-                selectedResultsListViewEx.Items[SelectedItems.Count - 1].Selected = true;
-                return;
-            }
-
-            ManualEntryItemSpec tmp = SelectedItems[selIdx + 1];
-            SelectedItems[selIdx + 1] = SelectedItems[selIdx];
-            SelectedItems[selIdx] = tmp;
-            
-            RedrawSelected();
-
-            selectedResultsListViewEx.Focus();
-            selectedResultsListViewEx.Items[selIdx + 1].Selected = true;
-            selectedResultsListViewEx.Items[selIdx + 1].EnsureVisible();
-        }
-
-        //private void cancelButton_Click(object sender, EventArgs e)
-        //{
-        //    DialogResult = DialogResult.Cancel;
-        //    Close();
-        //}
-
-		private void availableByCategoryTreeView_NodeMouseHover2(object sender, TreeNodeMouseHoverEventArgs e)
-		{
-			ToolTip toolTip = new ToolTip();
-			toolTip.SetToolTip(this, e.Node.ToolTipText); 
-		}
-    }
-}

Results/Forms/ManualEntryConfigDlg.cs

@@ -1,60 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows.Forms;
-using log4net;
-using Config.Entities;
-using Results;
-using Results.Resources;
-
-namespace Results.Forms
-{
-	public partial class ManualEntryConfigDlg : Form
-	{
-        public IList<ManualEntryItemSpec> SelectedItems
-        {
-            set { manualEntryConfigCtrl.SelectedItems = value; }
-            get { return manualEntryConfigCtrl.SelectedItems; }
-        }
-
-		
-		public ManualEntryConfigDlg()
-		{
-			InitializeComponent();
-			manualEntryConfigCtrl.Unlocked = true;
-		}
-
-
-		void Localize()
-		{
-			Text = Strings.Configuration;
-			okButton.Text = Strings.OkBtnText;
-			cancelButton.Text = Strings.CancelBtnText;
-		}
-
-		void ManualEntryConfig_Load(object sender, EventArgs e)
-		{
-			Localize();
-		}
-
-        void okButton_Click(object sender, EventArgs e)
-		{
-            DialogResult = DialogResult.OK;
-			Close();
-		}
-
-        private void cancelButton_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-
-        private void ManualEntryConfigDlg_KeyPress(object sender, KeyPressEventArgs e)
-        {
-            e.Handled = true;
-        }
-	}
-}

Results/Forms/ManualEntryConfigDlg.designer.cs

@@ -1,95 +0,0 @@
-///
-/// Copyright (c) 2016 Sensus Metering Systems
-///
-namespace Results.Forms
-{
-	partial class ManualEntryConfigDlg
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-            this.okButton = new System.Windows.Forms.Button();
-            this.cancelButton = new System.Windows.Forms.Button();
-            this.manualEntryConfigCtrl = new Results.Forms.ManualEntryConfigCtrl();
-            this.SuspendLayout();
-            // 
-            // okButton
-            // 
-            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.okButton.Location = new System.Drawing.Point(939, 29);
-            this.okButton.Name = "okButton";
-            this.okButton.Size = new System.Drawing.Size(105, 42);
-            this.okButton.TabIndex = 4;
-            this.okButton.Text = "OK";
-            this.okButton.UseVisualStyleBackColor = true;
-            this.okButton.Click += new System.EventHandler(this.okButton_Click);
-            // 
-            // cancelButton
-            // 
-            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.cancelButton.Location = new System.Drawing.Point(939, 82);
-            this.cancelButton.Name = "cancelButton";
-            this.cancelButton.Size = new System.Drawing.Size(105, 42);
-            this.cancelButton.TabIndex = 5;
-            this.cancelButton.Text = "Cancel";
-            this.cancelButton.UseVisualStyleBackColor = true;
-            this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
-            // 
-            // manualEntryConfigCtrl
-            // 
-            this.manualEntryConfigCtrl.Location = new System.Drawing.Point(-1, 1);
-            this.manualEntryConfigCtrl.Name = "manualEntryConfigCtrl";
-            this.manualEntryConfigCtrl.Size = new System.Drawing.Size(925, 496);
-            this.manualEntryConfigCtrl.TabIndex = 6;
-            this.manualEntryConfigCtrl.Unlocked = false;
-            // 
-            // ManualEntryConfigDlg
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1066, 498);
-            this.Controls.Add(this.manualEntryConfigCtrl);
-            this.Controls.Add(this.cancelButton);
-            this.Controls.Add(this.okButton);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.Name = "ManualEntryConfigDlg";
-            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "ManualEntryConfig";
-            this.Load += new System.EventHandler(this.ManualEntryConfig_Load);
-            this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.ManualEntryConfigDlg_KeyPress);
-            this.ResumeLayout(false);
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Button okButton;
-        private System.Windows.Forms.Button cancelButton;
-        private ManualEntryConfigCtrl manualEntryConfigCtrl;
-	}
-}

Results/ManualEntryItemSpec.cs

@@ -1,252 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using Config;
-using Config.Entities;
-using Results.Entities;
-using Results.Resources;
-using System.Globalization;
-
-namespace Results
-{
-    public class ManualEntryItemSpec
-    {
-        ///
-        /// Public fields
-        ///
-        public readonly int Uid;
-        public readonly string Name;			        /// Name-s of all items must be unique
-        public readonly string ToolTipText;				/// Tool-Tip Text
-        public readonly Quantity Quantity;				/// Quantity
-        public readonly ItemCategory Category;			/// 
-        public string Caption;		                    /// Specifies item description to be printed as a caption (in the header, etc.)
-        public Config.Unit Units;	                    /// Specifies units for the output
-
-
-        public ManualEntryItemSpec Clone()
-        {
-            ManualEntryItemSpec item = new ManualEntryItemSpec((ItemID)Uid, Name, ToolTipText, Quantity, Category, updateDlgt);
-            item.Caption = Caption;
-            item.Units = Units;
-            return item;
-        }
-
-
-		///
-		/// Function to pick a MeterTestResult field and convert it into a string
-		/// 
-        public delegate bool UpdateDlgt(string str, MeterTestRslt meterTestRslt);
-
-		private readonly UpdateDlgt updateDlgt;
-
-        public bool Update(string str, MeterTestRslt meterTestRslt)
-        {
-            return (updateDlgt != null) ? updateDlgt(str, meterTestRslt) : true;
-        }
-
-        public static bool ParseBool(string str, out bool success)
-        {
-            bool b;
-            success = bool.TryParse(str, out b);
-            return b;
-        }
-
-		public static int ParseInt(string str, out bool success)
-		{
-            int i;
-            success = int.TryParse(str, out i);
-            return i;
-		}
-
-        public static float ParseFloat(string str, out bool success)
-        {
-            float f;
-            success = float.TryParse(str, NumberStyles.AllowDecimalPoint, CultureInfo.CurrentCulture, out f) ||
-                      float.TryParse(str, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out f);
-            return f;
-        }
-
-        public static double ParseDouble(string str, out bool success)
-        {
-            double d;
-            success = double.TryParse(str, NumberStyles.AllowDecimalPoint, CultureInfo.CurrentCulture, out d) ||
-                      double.TryParse(str, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out d);
-            return d;
-        }
-
-
-		///
-		/// Public constructor
-		///
-        public ManualEntryItemSpec(ItemID itemId, string name, string toolTipText, Quantity quantity, ItemCategory category, UpdateDlgt updateDlgt)
-        {
-            Uid = (int)itemId;
-            Name = name;
-            ToolTipText = toolTipText;
-            Quantity = quantity;
-            Category = category;
-            this.updateDlgt = updateDlgt;
-        }
-
-
-		/// Static list of all available items
-        public static readonly IList<ManualEntryItemSpec> AllItems;
-
-
-        /// <summary>
-        /// Initializes the <see cref="ManualEntryItemSpec"/> class.
-        /// </summary>
-        /// Static constructor that initializes the list of all items
-        static ManualEntryItemSpec()
-        {
-            AllItems = new List<ManualEntryItemSpec>();
-
-            AllItems.Add(new ManualEntryItemSpec(ItemID.P_PMax_test_mean,
-                                                 string.Format("{0} PMax mean", Strings.VName_Press),
-                                                 "PMax test pressure",
-                                                 Quantity.Pressure,
-                                                 ItemCategory.TestResult,
-                                                 (str, mtr) => { bool r;
-                                                                 mtr.TestRslt.PressUpMean = mtr.TestRslt.PressDownMean = ParseFloat(str, out r);
-                                                                 return r; }));
-            AllItems.Add(new ManualEntryItemSpec(ItemID.T_line_mean,
-                                                 string.Format("{0} LN ME", Strings.VName_Temp),
-                                                 Strings.Tooltip_T_ln_me,
-                                                 Quantity.Temperature,
-                                                 ItemCategory.TestResult,
-                                                 (str, mtr) => { bool r;
-                                                                 mtr.TestRslt.TempUpMean = mtr.TestRslt.TempDownMean = ParseFloat(str, out r);
-                                                                 return r; }));
-            AllItems.Add(new ManualEntryItemSpec(ItemID.Test_time,
-                                                 Strings.T_s,
-                                                 "Test time",
-                                                 Quantity.Time,
-                                                 ItemCategory.MeterResult,
-                                                 (str, mtr) => { bool r;
-                                                                 mtr.TestTime = ParseDouble(str, out r);
-                                                                 return r; }));
-            AllItems.Add(new ManualEntryItemSpec(ItemID.PMax_test_time,
-                                                 "Pressure test time",
-                                                 "Pressure test time",
-                                                 Quantity.Time,
-                                                 ItemCategory.MeterResult,
-                                                 (str, mtr) => { bool r;
-                                                                 mtr.TestTime = ParseDouble(str, out r);
-                                                                 return r; }));
-            AllItems.Add(new ManualEntryItemSpec(ItemID.TestPassed,
-                                                 Strings.Test_passed,
-                                                 "Passed",
-                                                 Quantity.Boolean,
-                                                 ItemCategory.MeterResult,
-                                                 (str, mtr) => { bool r;
-                                                                 mtr.Passed = ParseBool(str, out r);
-                                                                 return r; }));
-        }
-
-
-        /// <summary>
-        /// Converts a list of 'Output item specifications' to a string array
-        /// </summary>
-        /// <param name="items"></param>
-        /// <returns></returns>
-        public static string[] ToStrArray(IList<ManualEntryItemSpec> items)
-        {
-            int count = (items != null) ? items.Count : 0;
-            string[] result = new string[count];
-            for (int i = 0; i < count; i++)
-            {
-                if (items[i].Caption == null) items[i].Caption = string.Empty;
-
-                result[i] = string.Format("{0}~{1}~{2}",
-                                          items[i].Uid,
-                                          items[i].Caption.Replace("~", "\n"),
-                                          items[i].Units);
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// Converts a string array to a list of 'Output item specifications'
-        /// </summary>
-        /// <param name="strArray"></param>
-        /// <returns></returns>
-        public static IList<ManualEntryItemSpec> FromStrArray(string[] strArray)
-        {
-            IList<ManualEntryItemSpec> result = new List<ManualEntryItemSpec>();
-
-            if (strArray != null)
-            {
-                for (int i = 0; i < strArray.Length; i++)
-                {
-                    try
-                    {
-                        ManualEntryItemSpec item;
-                        string[] field = strArray[i].Split(new char[] { '~' });
-
-                        if (!strArray[i].Contains("~"))
-                        {
-                            item = GetItem(0);
-                            item.Caption = "Prs.Err.";
-                            result.Add(item);
-                        }
-                        else if ((item = GetItem(int.Parse(field[0]))) != null)
-                        {
-                            ///
-                            /// Load the new style results item specification
-                            /// 
-                            item.Caption = field[1].Replace("\n", "~");
-                            item.Units = 0;
-                            for (Config.Unit u = 0; u < Config.Unit.Count; u++)
-                            {
-                                if (u.ToString().Equals(field[2])) { item.Units = u; break; }
-                            }
-                            result.Add(item);
-                        }
-                        else
-                        {
-                            ///
-                            /// Create an item with parse error information
-                            /// 
-                            ManualEntryItemSpec item2 = GetItem(0);
-                            item2.Caption = "Prs.Err.";
-                            result.Add(item2);
-                        }
-                    }
-                    catch
-                    {
-                        ManualEntryItemSpec item = GetItem(0);
-                        item.Caption = "Prs.Err.";
-                        result.Add(item);
-                    }
-                }
-            }
-            return result;
-        }
-
-
-        public static ManualEntryItemSpec GetItem(int uid)
-        {
-            foreach (var item in AllItems)
-            {
-                if (item.Uid == uid) return item.Clone();
-            }
-            return null;
-        }
-
-
-        public static ManualEntryItemSpec GetItem(ItemID itemId)
-        {
-            return GetItem((int)itemId);
-        }
-
-        public override string ToString()
-        {
-            if (!string.IsNullOrEmpty(Caption))
-                return Caption;
-            else
-                return ((ItemID)Uid).ToString();
-        }
-    }
-}

Results/Mappings/BatchMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
+/// Copyright (c) 2015 Sensus Metering Systems
 ///
 using FluentNHibernate.Mapping;
 using Results.Entities;
@@ -26,16 +26,6 @@ namespace Results.Mappings
 				.Column("Custom1"); ;
 			Map(x => x.Custom2);
 			Map(x => x.Custom3);
-            Map(x => x.Counter1);
-            Map(x => x.Counter2);
-            Map(x => x.Counter3);
-            Map(x => x.Counter4);
-            Map(x => x.Counter5);
-            Map(x => x.Counter6);
-            Map(x => x.Counter7);
-            Map(x => x.Counter8);
-            Map(x => x.Counter9);
-            Map(x => x.Counter10);
 			Map(x => x.StartTime);
 			Map(x => x.EndTime);
             Map(x => x.Dirty);

Results/Mappings/MeterTestRsltMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2015 Sensus Metering Systems
 ///
 using FluentNHibernate.Mapping;
 using Results.Entities;
@@ -12,7 +12,6 @@ namespace Results.Mappings
 		{
 			Id(x => x.Id);
 			Map(x => x.CompoundMeterId);
-            Map(x => x.RegReaderType);
 			Map(x => x.PulsesMeter);
 			Map(x => x.PulsesMaster);
 			Map(x => x.PulsesPerLiter);

Results/Mappings/TestDataMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2015 Sensus Metering Systems
 ///
 using FluentNHibernate.Mapping;
 using Results.Entities;
@@ -12,10 +12,7 @@ namespace Results.Mappings
 		{
 			Id(x => x.Id);
 			Map(x => x.Name);
-#if TEST_PROFILES
-            Map(x => x.Qtg);
-#endif
-            Map(x => x.Qfrom);
+			Map(x => x.Qfrom);
 			Map(x => x.Qto);
 			Map(x => x.TargetVolume);
 			Map(x => x.TargetTime);
@@ -23,7 +20,7 @@ namespace Results.Mappings
 			Map(x => x.Method);
 			Map(x => x.ErrLimLo);
 			Map(x => x.ErrLimHi);
-            Map(x => x.ErrLimMargin).Column("Uncertainty");
+			Map(x => x.Uncertainty);
 			Map(x => x.Publish);
 			Map(x => x.Evaluate);
 		}

Results/Mappings/TestRsltMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2018 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Results.Entities;
@@ -16,7 +16,6 @@ namespace Results.Mappings
 			References<Components>(x => x.Components);
 			Map(x => x.Part);
 			Map(x => x.RepetitionNr);
-            Map(x => x.MethodClass);
 
 			Map(x => x.TestDone);
 			Map(x => x.Remark)
@@ -25,13 +24,9 @@ namespace Results.Mappings
 			Map(x => x.StartTime);
 			Map(x => x.EndTime);
 			Map(x => x.FlowSetTime);
-			Map(x => x.TimeBtwnMassMsrmnts);
 			Map(x => x.TestTime);
-            Map(x => x.TestTimeCorrection);
 			Map(x => x.PulsesMaster);
-			Map(x => x.ConstMasterRaw);
-            Map(x => x.ConstMasterCorr);
-            Map(x => x.ConstMaster);
+			Map(x => x.ConstMaster);
 			Map(x => x.MassStartRaw);
 			Map(x => x.MassStart);
 			Map(x => x.MassEndRaw);
@@ -48,7 +43,7 @@ namespace Results.Mappings
             Map(x => x.DiverterStart);
             Map(x => x.DiverterEnd);
             Map(x => x.ErrorFlags);
-			Map(x => x.InfoFlags);
+			Map(x => x.ErrorFlagsMd);
 #if HEAT_METERS
 			Map(x => x.RefEnergy);
 #endif
@@ -103,12 +98,6 @@ namespace Results.Mappings
 			Map(x => x.FlowMin);
 			Map(x => x.FlowMax);
 
-            Map(x => x.Uncertnt);
-            Map(x => x.UncertntScale);
-            Map(x => x.UncertntDensity);
-            Map(x => x.UncertntTemp);
-            Map(x => x.UncertntPressure);
-
 			Map(x => x.Custom1);
 			Map(x => x.Custom2);
 			Map(x => x.Custom3);

Results/Mappings/WaterMeterDataMap.cs

@@ -42,8 +42,6 @@ namespace Results.Mappings
             Map(x => x.MetrologicalClassAux);
             Map(x => x.ApprovalInfoAux);
 
-            Map(x => x.Medium);
-
             Map(x => x.Text1);
             Map(x => x.Text2);
             Map(x => x.Text3);

Results/Mappings/WaterMeterMap.cs

@@ -21,8 +21,7 @@ namespace Results.Mappings
 			Map(x => x.QRise);
 			Map(x => x.QFall);
             Map(x => x.ErrorFlags);
-            Map(x => x.InfoFlags);
-            Map(x => x.Passed);
+			Map(x => x.Passed);
             Map(x => x.ResultCode);
 			Map(x => x.ArchivePath);
 			Map(x => x.Remark)

Results/Output/Printers/Enums.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace Results.Output.Printers
+{
+    public enum BarcodeType
+    {
+        None,
+        Code_128_Horizontally,
+        Code_128_Vertically,
+        QR_Code,
+        Count
+    }
+}

Results/Output/Printers/Label/LabelPrintDocument.cs

@@ -1,19 +1,24 @@
 ///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
+/// Copyright (c) 2020 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Drawing.Drawing2D;
 using System.Drawing.Printing;
 using System.IO;
+using Gma.QrCodeNet.Encoding;
 using Config.Entities;
 using Results.Resources;
+using GenCode128;
 
 namespace Results.Output.Printers.Label
 {
 	public class LabelPrintDocument : PrintersCommon
 	{
-		/// Size of the printed area without margins, after taking into account 'pageOrientation'
+        static QrEncoder encoder = new QrEncoder();
+
+        /// Size of the printed area without margins, after taking into account 'pageOrientation'
 		readonly int printHeight;
 		readonly int printWidth;
 
@@ -93,6 +98,55 @@ namespace Results.Output.Printers.Label
 					e.Graphics.DrawString(item.Print(wm), this.font, Brushes.Black, printArea);
 				}
 			}
+
+            if (cfg.BarcodeType != BarcodeType.None && cfg.BarcodeType < BarcodeType.Count)
+            {
+                try
+                {
+                    if (cfg.BarcodeType == BarcodeType.QR_Code)
+                    {
+                        QrCode qrCode = encoder.Encode(wm.SerialNr);
+                        DrawQR(e.Graphics, qrCode, cfg.BarcodeLeft, cfg.BarcodeTop, cfg.BarcodeWidth, cfg.BarcodeHeight);
+                    }
+                    else if (cfg.BarcodeType == BarcodeType.Code_128_Horizontally || cfg.BarcodeType == BarcodeType.Code_128_Vertically)
+                    {
+                        Image img = Code128Rendering.MakeBarcodeImage(wm.SerialNr, 1, true);
+                        if (cfg.BarcodeType == BarcodeType.Code_128_Vertically)
+                        {
+                            img.RotateFlip(RotateFlipType.Rotate90FlipNone);
+                        }
+                        e.Graphics.DrawImage(img, cfg.BarcodeLeft, cfg.BarcodeTop, cfg.BarcodeWidth, cfg.BarcodeHeight);
+                    }
+                }
+                catch (Exception)
+                {
+                }
+            }
 		}
+
+
+        public static void DrawQR(Graphics g, QrCode qrCode, float left, float top, float width, float height)
+        {
+            /// Assuming 100 dpi (printer)
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+            g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+            g.PixelOffsetMode = PixelOffsetMode.HighQuality;
+
+            float qrPixWidth = width / qrCode.Matrix.Width;
+            float qrPixHeight = height / qrCode.Matrix.Height;
+            for (int i = 0; i < qrCode.Matrix.Height; i++)
+            {
+                for (int j = 0; j < qrCode.Matrix.Width; j++)
+                {
+                    if (qrCode.Matrix[j, i])
+                    {
+                        g.FillRectangle(Brushes.Black, new RectangleF(left + j * qrPixWidth,
+                                                                      top + i * qrPixHeight,
+                                                                      qrPixWidth,
+                                                                      qrPixHeight));
+                    }
+                }
+            }
+        }
     }
 }

Results/Output/Printers/Label/LabelPrinterCfg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
+/// Copyright (c) 2018-2020 Sensus Slovensko a.s.
 ///
 
 namespace Results.Output.Printers.Label
@@ -17,5 +17,10 @@ namespace Results.Output.Printers.Label
 		public System.Globalization.CultureInfo CultureInfo;
 		public bool GoodOnly;
 		public bool SupressPrinting;						/// true = Bypass printing
-	}
+        public BarcodeType BarcodeType;                     /// s/n is printed as barcode when valid (BarcodeType.None < BarcodeType < BarcodeType.Count)
+        public int BarcodeLeft;
+        public int BarcodeTop;
+        public int BarcodeWidth;
+        public int BarcodeHeight;
+    }
 }

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.25.1400.0")]
-[assembly: AssemblyFileVersion("2.25.1400.0")]
+[assembly: AssemblyVersion("2.18.1423.0")]
+[assembly: AssemblyFileVersion("2.18.1423.0")]

Results/Resources/Strings.Designer.cs

@@ -114,15 +114,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Available items.
-        /// </summary>
-        internal static string Available_items {
-            get {
-                return ResourceManager.GetString("Available_items", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Available results.
         /// </summary>
@@ -987,15 +978,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Selected item.
-        /// </summary>
-        internal static string Selected_items {
-            get {
-                return ResourceManager.GetString("Selected_items", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Selected results.
         /// </summary>

Results/Resources/Strings.resx

@@ -819,10 +819,4 @@
   <data name="This_position_is_disabled" xml:space="preserve">
     <value>This position is disabled</value>
   </data>
-  <data name="Available_items" xml:space="preserve">
-    <value>Available items</value>
-  </data>
-  <data name="Selected_items" xml:space="preserve">
-    <value>Selected item</value>
-  </data>
 </root>

Results/Results.csproj

@@ -10,34 +10,34 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Results</RootNamespace>
     <AssemblyName>Results</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;MURES_40</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;MURES_40</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FluentNHibernate">
       <HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
     </Reference>
+    <Reference Include="Gma.QrCodeNet.Encoding">
+      <HintPath>..\packages\QrCode.Net.0.4.0.0\net40\Gma.QrCodeNet.Encoding.dll</HintPath>
+    </Reference>
     <Reference Include="Iesi.Collections">
       <HintPath>..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
     </Reference>
@@ -85,18 +85,6 @@
     <Compile Include="Forms\ListViewExtensions.cs" />
     <Compile Include="Forms\LviIntColumnComparer.cs" />
     <Compile Include="Forms\LviTextColumnComparer.cs" />
-    <Compile Include="Forms\ManualEntryConfigCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Forms\ManualEntryConfigCtrl.designer.cs">
-      <DependentUpon>ManualEntryConfigCtrl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\ManualEntryConfigDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\ManualEntryConfigDlg.designer.cs">
-      <DependentUpon>ManualEntryConfigDlg.cs</DependentUpon>
-    </Compile>
     <Compile Include="Forms\MoreWMResultsDlg.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -135,7 +123,6 @@
     </Compile>
     <Compile Include="Forms\WaterMeterEventArgs.cs" />
     <Compile Include="ItemID.cs" />
-    <Compile Include="ManualEntryItemSpec.cs" />
     <Compile Include="Mappings\BatchMap.cs" />
     <Compile Include="Mappings\ComponentsMap.cs" />
     <Compile Include="Mappings\MeterTestRsltMap.cs" />
@@ -147,6 +134,7 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Output\Printers\Enhanced\EnhancedPrinterCfg.cs" />
+    <Compile Include="Output\Printers\Enums.cs" />
     <Compile Include="Output\Printers\Label\LabelPrintDocument.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -186,6 +174,10 @@
       <Project>{743DF7DB-C7B6-42EB-986D-0F485E5588E4}</Project>
       <Name>Config</Name>
     </ProjectReference>
+    <ProjectReference Include="..\GenCode128\GenCode128.csproj">
+      <Project>{32817bf9-e380-4467-9c7f-936f4b122bc7}</Project>
+      <Name>GenCode128</Name>
+    </ProjectReference>
     <ProjectReference Include="..\TracingDB\TracingDB.csproj">
       <Project>{EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF}</Project>
       <Name>TracingDB</Name>
@@ -207,12 +199,6 @@
     <EmbeddedResource Include="Forms\ListViewEx.resx">
       <DependentUpon>ListViewEx.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\ManualEntryConfigCtrl.resx">
-      <DependentUpon>ManualEntryConfigCtrl.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\ManualEntryConfigDlg.resx">
-      <DependentUpon>ManualEntryConfigDlg.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Forms\MoreWMResultsDlg.resx">
       <DependentUpon>MoreWMResultsDlg.cs</DependentUpon>
     </EmbeddedResource>

Results/Utils.cs

@@ -61,12 +61,12 @@ namespace Results
         /// </summary>
         /// <param name="errorFlags">Input</param>
         /// <returns>Output string</returns>
-        public static string ErrorFlagsStr(long errorFlags)
+        public static string ErrorFlagsStr(int errorFlags)
         {
             StringBuilder sb = new StringBuilder();
-            for (int i = 0; i < 63; i++)
+            for (int i = 0; i < 31; i++)
             {
-                if ((errorFlags & (1L << i)) != 0)
+                if ((errorFlags & (1 << i)) != 0)
                 {
                     sb.Append("E");
                     sb.Append(i + 1);

Results/WMeterRsltItemSpec.cs

@@ -44,10 +44,8 @@ namespace Results
         }
 
 
-        /// This is to show RealDensity and AtTemperatire in reports.
-        public static double RealDensity;       	/// true water density [kg/m3]
-        public static double AtTemperature;     	/// measured at temperature [°C]
-        public static double Buoyancy;
+        public static double RealDensity;
+        public static double AtTemperature;
 
 
 		///
@@ -313,7 +311,7 @@ namespace Results
             ///
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_limit_Lo,  Strings.ErrLimLo + "()",    Quantity.Error, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).ErrLimLo())));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_limit_Hi,  Strings.ErrLimHi + "()",    Quantity.Error, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).ErrLimHi())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Uncertainty,     Strings.Uncertainty + "()", Quantity.Error, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).ErrLimMargin())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Uncertainty,     Strings.Uncertainty + "()", Quantity.Error, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).Uncertainty())));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_error, string.Format("{0} rel.ref. ()", Strings.VName_Error), Strings.Tooltip_E_rel_ref, Quantity.Error, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).ErrorMaster)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_error_corr, string.Format("{0} ref.corr. ()", Strings.VName_Error), "Relative error of the reference flow meter after correction using correction curve", Quantity.Error, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", Config.Formulas.ErrorFromVolumes(w.GetTestRslt(t).ConstMasterCorr, w.GetTestRslt(t).ConstMaster))));
 #if ORACLE_DB

ResultsBrowser/LocalSettings.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
+/// Copyright (c) 2018-2020 Sensus Slovensko a.s.
 ///
 using System;
 using System.IO;
@@ -116,11 +116,11 @@ namespace ResultsBrowser
             Bench4 = "WR14";
             Bench5 = "WR15";
             Bench6 = "PT7";
-            ConnectionString1 = "SERVER=10.42.128.93; DATABASE=st-wr10-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;";
-            ConnectionString2 = "SERVER=10.42.128.102; DATABASE=st-wr11-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;";
-            ConnectionString3 = "SERVER=10.42.128.89; DATABASE=st-wr13-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;";
-            ConnectionString4 = "SERVER=10.42.128.213; DATABASE=st-wr14-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;";
-            ConnectionString5 = "SERVER=10.42.128.214; DATABASE=st-wr15-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;";
+            ConnectionString1 = "SERVER=10.42.130.69; DATABASE=st-wr10-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;";
+            ConnectionString2 = "SERVER=10.42.129.27; DATABASE=st-wr11-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;";
+            ConnectionString3 = "SERVER=10.42.128.61; DATABASE=st-wr13-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;";
+            ConnectionString4 = "SERVER=10.42.130.72; DATABASE=st-wr14-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;";
+            ConnectionString5 = "SERVER=10.42.130.71; DATABASE=st-wr15-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;";
             ConnectionString6 = "SERVER=10.42.129.26; DATABASE=iperlspecial-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;";
             Language = "SK";
 #endif

ResultsBrowser/OraData.cs

@@ -0,0 +1,30 @@
+using System;
+
+namespace ResultsBrowser
+{
+    public class OraData
+    {
+        public string PO;
+        public string PcbNr;
+        public int TestBenchId;
+        public int MaxPruefIx;
+        public int SN;
+        public int TestId;
+        public int WMPosition;
+        public int HydrPruefung;
+        public double AdjErr;
+        public double AdjErrA4;
+        public double Q3RlErr;
+        public double Q3LrErr;
+        public double Q2RlErr;
+        public double Q2LrErr;
+        public double Q1RlErr;
+        public double Q1LrErr;
+        public int CalibFactor;
+        public int CalibFactorLNA;
+        public int Q2CorrectionRl;
+        public int Q2CorrectionLr;
+
+        public OraData() { }
+    }
+}

ResultsBrowser/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Sensus")]
 [assembly: AssemblyProduct("ResultsBrowser")]
-[assembly: AssemblyCopyright("Copyright ©  2015 - 2018 Sensus Slovensko a.s.")]
+[assembly: AssemblyCopyright("Copyright ©  2015 - 2020 Sensus Slovensko a.s.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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.24.1368.0")]
-[assembly: AssemblyFileVersion("2.24.1368.0")]
+[assembly: AssemblyVersion("2.18.1413.0")]
+[assembly: AssemblyFileVersion("2.18.1413.0")]

ResultsBrowser/Properties/Resources.Designer.cs

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

ResultsBrowser/Properties/Settings.Designer.cs

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

ResultsBrowser/ResultsBrowser.csproj

@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ResultsBrowser</RootNamespace>
     <AssemblyName>ResultsBrowser</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -21,21 +21,19 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;MURES_40</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;MURES_40</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>ResultsBrowser.Program</StartupObject>
@@ -179,6 +177,7 @@
       <DependentUpon>StatisticsOptionsDlg.cs</DependentUpon>
     </Compile>
     <Compile Include="LocalSettings.cs" />
+    <Compile Include="OraData.cs" />
     <Compile Include="Output\Printers\Statistics\StatisticsPrintDocument.cs">
       <SubType>Component</SubType>
     </Compile>

ResultsBrowser/ResultsBrowserWnd.Designer.cs

@@ -34,6 +34,7 @@
             this.filtersFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
             this.resultsGroupBox = new System.Windows.Forms.GroupBox();
             this.resultsListView = new System.Windows.Forms.ListView();
+            this.customQueryButton = new System.Windows.Forms.Button();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.histogramBtn = new System.Windows.Forms.Button();
             this.statisticsBtn = new System.Windows.Forms.Button();
@@ -84,6 +85,7 @@
             // 
             // vSplitContainer.Panel2
             // 
+            this.vSplitContainer.Panel2.Controls.Add(this.customQueryButton);
             this.vSplitContainer.Panel2.Controls.Add(this.groupBox1);
             this.vSplitContainer.Panel2.Controls.Add(this.outputGroupBox);
             this.vSplitContainer.Panel2.Controls.Add(this.printerConfigBtn);
@@ -158,6 +160,16 @@
             this.resultsListView.UseCompatibleStateImageBehavior = false;
             this.resultsListView.View = System.Windows.Forms.View.Details;
             // 
+            // customQueryButton
+            // 
+            this.customQueryButton.Location = new System.Drawing.Point(31, 437);
+            this.customQueryButton.Name = "customQueryButton";
+            this.customQueryButton.Size = new System.Drawing.Size(85, 23);
+            this.customQueryButton.TabIndex = 14;
+            this.customQueryButton.Text = "Custom query";
+            this.customQueryButton.UseVisualStyleBackColor = true;
+            this.customQueryButton.Click += new System.EventHandler(this.customQueryButton_Click);
+            // 
             // groupBox1
             // 
             this.groupBox1.Controls.Add(this.histogramBtn);
@@ -443,5 +455,6 @@
         private System.Windows.Forms.GroupBox groupBox1;
         private System.Windows.Forms.GroupBox outputGroupBox;
         private System.Windows.Forms.Button histogramBtn;
+        private System.Windows.Forms.Button customQueryButton;
     }
 }

ResultsBrowser/ResultsBrowserWnd.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2016-2020 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -12,6 +12,8 @@ using TBF.BenchControl.Generic;
 using TBF.BenchControl.GenericDevices;
 using ResultsBrowser.Filters;
 using ResultsBrowser.Resources;
+using Oracle;
+using Oracle.DataAccess.Client;
 
 namespace ResultsBrowser
 {
@@ -32,6 +34,8 @@ namespace ResultsBrowser
         static IList<IComponent> tbfComponents;
         static IList<IDevice> tbfDevices;
 
+        OracleConnection oracleConnection;    /// Oracle database connection
+
         public ResultsBrowserWnd(string[] args)
         {
             InitializeComponent();
@@ -543,5 +547,248 @@ namespace ResultsBrowser
 
 			return null;
 		}
+
+        private void customQueryButton_Click(object sender, EventArgs e)
+        {
+#if IPERL
+            try
+            {
+                string[] orders = new string[] { "3137303", "3137301", "3142304", "3137302", "3137300" };
+
+                IList<OraData> oraDatas = new List<OraData>();  /// List of water meters
+                IList<int> testBenches = new List<int>();       /// List of test benches used to produce water meters
+                
+                ///
+                /// Get list of water meters satisfying (custom) criteria
+                ///
+                Console.WriteLine("Collecting water meters");
+                foreach (var order in orders)
+                {
+                    oracleConnection = new OracleConnection("Data Source=STARA01.WORLD;User Id=deltachef;Password=deltachef;");
+                    oracleConnection.Open();
+
+                    OracleCommand cmd = new OracleCommand("select VT_FERNUM, MAX_PRUEFINDEX, ZAEHLERNUMMER from VT_ZAEHLER_PD where AUFTRAGSNUMMER = :1 AND ANBID = 4 order by ZAEHLERNUMMER", oracleConnection);
+                    cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Varchar2, Value = order });
+                    OracleDataReader dr = cmd.ExecuteReader();
+                    int count = 0;
+                    while (dr.Read())
+                    {
+                        int i = 0;
+                        string pcbNr = dr.GetString(i++);
+                        int maxPruefIx = dr.GetInt32(i++);
+                        int testBenchId = maxPruefIx / 100;
+                        maxPruefIx = maxPruefIx % 100;
+                        int sn = dr.GetInt32(i++);
+
+                        oraDatas.Add(new OraData() { PO = order, PcbNr = pcbNr, TestBenchId = testBenchId, MaxPruefIx = maxPruefIx, SN = sn });
+                        if (!testBenches.Contains(testBenchId)) testBenches.Add(testBenchId);
+                        count++;
+                    }
+                    dr.Close();
+
+                    Console.WriteLine(string.Format("Order = {0} ... {1} water meters found", order, count));
+                }
+                Console.WriteLine("Collecting water meters completed");
+                Console.WriteLine();
+
+                ///
+                /// Get required information about each water meter
+                ///
+                Console.WriteLine("Reading additional data from Oracle");
+                int counter = 0;
+                foreach (var oraD in oraDatas)
+                {
+                    Console.Write("{0} ", ++counter);
+                    if (counter % 40 == 0) Console.WriteLine();
+
+                    ///
+                    /// Read from  VT_ZAEHLER_PINDEX_PD: TestId(ID_WZPRUEFREIHE))
+                    ///
+                    OracleCommand cmd = new OracleCommand("select ID_PRUEFSTAND, ID_WZPRUEFREIHE, WT_PLATZ_NR, HYDR_PRUEFUNG from VT_ZAEHLER_PINDEX_PD where VT_FERNUM = :1 AND ANBID = 4 AND WZGUT = 1", oracleConnection);
+                    cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Varchar2, Value = oraD.PcbNr });
+                    OracleDataReader dr = cmd.ExecuteReader();
+                    while (dr.Read())
+                    {
+                        int i = 0;
+                        int testBenchId = dr.GetInt32(i++) % 100;
+                        oraD.TestId = dr.GetInt32(i++);
+                        oraD.WMPosition = dr.GetInt32(i++);
+                        oraD.HydrPruefung = dr.GetInt32(i++);
+                    }
+                    dr.Close();
+
+                    ///
+                    /// Read from  VT_IP_ZAEHLER_PINDEX_PD:  Q2CorrectionRl, Q2CorrectionLr
+                    ///
+                    cmd = new OracleCommand("select PRUEFINDEX, Q2CORRECTIONLEFT, Q2CORRECTIONRIGHT from VT_IP_ZAEHLER_PINDEX_PD where VT_FERNUM = :1 AND ANBID = 4", oracleConnection);
+                    ///                             pruefindex, Q2_correction_RL, Q2_correction_LR,  Q2_error_before_correction
+                    cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = oraD.PcbNr });
+                    dr = cmd.ExecuteReader();
+                    while (dr.Read())
+                    {
+                        int i = 0;
+                        int prfix = (dr.GetInt32(i++) % 100);
+                        if (prfix == oraD.MaxPruefIx)
+                        {
+                            oraD.Q2CorrectionRl = dr.GetInt32(i++);
+                            oraD.Q2CorrectionLr = dr.GetInt32(i++);
+                        }
+                    }
+                    dr.Close();
+
+                    ///
+                    /// Read data from  VT_PRUEFREIHE_IST_PD
+                    ///
+                    ///                             testID,      flow, rel.err., passed
+                    cmd = new OracleCommand("select PRUEFUNGSNR, Q_WZ, Q_FEHLER, Q_BEST from VT_PRUEFREIHE_IST_PD where VT_FERNUM = :1 AND PRUEFINDEX = :2 AND ANBID = 4", oracleConnection);
+                    cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = oraD.PcbNr });
+                    cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 100 * oraD.TestBenchId + oraD.MaxPruefIx });
+
+                    dr = cmd.ExecuteReader();
+                    while (dr.Read())
+                    {
+                        int i = 0;
+                        int testId = dr.GetInt32(i++);              /// PRUEFUNGSNR
+                        double flow = dr.GetDouble(i++);            /// Q_WZ
+                        double error = dr.GetDouble(i++);           /// Q_FEHLER
+                        bool testPassed = (dr.GetInt32(i++) != 0);
+
+                        /// SUEZ specific
+                        switch (testId)
+                        {
+                            case -2:
+                                oraD.AdjErrA4 = error;
+                                break;
+                            case -1:
+                                oraD.AdjErr = error;
+                                break;
+                            case 5:
+                                oraD.Q3LrErr = error;
+                                break;
+                            case 10:
+                                oraD.Q3RlErr = error;
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                    dr.Close();
+                }   /// end of foreach (var oraD in OraDatas)
+                Console.WriteLine();
+                Console.WriteLine("Reading additional data from Oracle completed");
+                Console.WriteLine();
+
+                oracleConnection.Close();
+
+                Console.WriteLine("Reading additional data from MySQL");
+                counter = 0;
+                foreach (var testBenchId in testBenches)
+                {
+                    Console.WriteLine((testBenchId == 8) ? "WR13" : (testBenchId == 9) ? "WR15" : (testBenchId == 10) ? "WR14" : "other");
+
+                    switch (testBenchId)
+                    {
+                        case 8:
+                            Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr13-r; UID=root; PASSWORD=kraken; CharSet=utf8;";
+                            break;
+                        case 9:
+                            Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr15-r; UID=root; PASSWORD=kraken; CharSet=utf8;";
+                            break;
+                        case 10:
+                            Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr14-r; UID=root; PASSWORD=kraken; CharSet=utf8;";
+                            break;
+                        default:
+                            Results.DB.ConnectionString = string.Empty;
+                            break;
+                    }
+
+                    if (!string.IsNullOrEmpty(Results.DB.ConnectionString))
+                    {
+                        ISession session = Results.DB.CreateSession();
+
+                        foreach (var oraD in oraDatas)
+                        {
+
+                            if (oraD.TestBenchId == testBenchId)
+                            {
+                                Console.Write("{0} ", ++counter);
+                                if (counter % 40 == 0) Console.WriteLine();
+
+                                IList<WaterMeter> wms = session.QueryOver<WaterMeter>()
+                                                               .Where(x => x.SerialNr == oraD.PcbNr)
+                                                               .And(x => x.Passed)
+                                                               .List();
+
+                                if (wms.Count == 1)
+                                {
+                                    oraD.CalibFactor = (int)Math.Round(wms[0].CalibFactor);
+                                    oraD.CalibFactorLNA = (int)Math.Round(wms[0].CalibFactorLNA);
+                                }
+                                else
+                                {
+                                    foreach (var wm in wms)
+                                    {
+                                        if (wm.Batch.BatchNr == oraD.TestId)
+                                        {
+                                            oraD.CalibFactor = (int)Math.Round(wm.CalibFactor);
+                                            oraD.CalibFactorLNA = (int)Math.Round(wm.CalibFactorLNA);
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        Console.WriteLine();
+
+                        session.Close();
+                    }       
+                }
+                Console.WriteLine("Reading additional data from MySQL");
+                Console.WriteLine();
+
+                Console.WriteLine("CSV data begin");
+                foreach (var oraD in oraDatas)
+                {
+                    //Console.WriteLine(string.Format("S/N={0} PCB={1} bench={2} Batch={3} Pos={4} AdjA0={5} AdjA4={6} Q3RL={7} Q3LR={8} CalF={9} CAlF_LNA={10} HP={11} Q2cRL={12} Q2cLR={13}",
+                    //                                oraD.SN,
+                    //                                oraD.PcbNr,
+                    //                                (oraD.TestBenchId == 8) ? "WR13" : (oraD.TestBenchId == 9) ? "WR15" : (oraD.TestBenchId == 10) ? "WR14" : "other",
+                    //                                oraD.TestId,
+                    //                                oraD.WMPosition,
+                    //                                oraD.AdjErr.ToString("F1"),
+                    //                                oraD.AdjErrA4.ToString("F1"),
+                    //                                oraD.Q3RlErr.ToString("F1"),
+                    //                                oraD.Q3LrErr.ToString("F1"),
+                    //                                oraD.CalibFactor,
+                    //                                oraD.CalibFactorLNA,
+                    //                                oraD.HydrPruefung,
+                    //                                oraD.Q2CorrectionRl,
+                    //                                oraD.Q2CorrectionLr));
+
+                    Console.WriteLine(string.Format("{0}; =(\"{1}\"); {2}; {3}; {4}; {5}; {6}; {7}; {8}; {9}; {10}; {12}; {13}",
+                                                    oraD.SN,
+                                                    oraD.PcbNr,
+                                                    (oraD.TestBenchId == 8) ? "WR13" : (oraD.TestBenchId == 9) ? "WR15" : (oraD.TestBenchId == 10) ? "WR14" : "other",
+                                                    oraD.TestId,
+                                                    oraD.WMPosition,
+                                                    oraD.AdjErr.ToString("F2"),
+                                                    oraD.AdjErrA4.ToString("F2"),
+                                                    oraD.Q3RlErr.ToString("F2"),
+                                                    oraD.Q3LrErr.ToString("F2"),
+                                                    oraD.CalibFactor,
+                                                    oraD.CalibFactorLNA,
+                                                    oraD.HydrPruefung,
+                                                    oraD.Q2CorrectionRl,
+                                                    oraD.Q2CorrectionLr));
+                }
+                Console.WriteLine("CSV data end");
+            }
+            catch (Exception exc)
+            {
+                MessageBox.Show(exc.Message);
+            }
+#endif
+        }
 	}
 }