Reconfigured for GELSENWASSER

.gitignore

@@ -22,8 +22,6 @@ GenCode128/bin
 GenCode128/obj
 GraphLib/bin
 GraphLib/obj
-MergeResultsDBs/bin
-MergeResultsDBs/obj
 TracingDB/bin
 TracingDB/obj
 ResetBatchNr/bin
@@ -34,8 +32,6 @@ Results/bin/
 Results/obj/
 ResultsBrowser/bin/
 ResultsBrowser/obj/
-SchematicDrawing/bin
-SchematicDrawing/obj
 Statistics/bin/
 Statistics/obj/
 TBF/bin/

Common/Common.csproj

@@ -42,7 +42,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="SerializableDictionary.cs" />
-    <Compile Include="Telegram.cs" />
     <Compile Include="UIControls\CoolButtonCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>

Common/SerializableDictionary.cs

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

Common/Utils.cs

@@ -1,7 +1,4 @@
-///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
-///
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -11,11 +8,5 @@ namespace Common
 {
     public class Utils
     {
-        public static string GetTestName(string name, int repeats, int repetitionNr)
-        {
-            if (name == null) return null;
-            if (repeats == 1) return name;
-            return string.Format("{0} ({1}/{2})", name, repetitionNr, repeats);
-        }
     }
 }

Config/Config.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;JUZNA_AFRIKA_NEW</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;GELSENWASSER;LANG_DE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -30,7 +30,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;JUZNA_AFRIKA_NEW</DefineConstants>
+    <DefineConstants>TRACE;GELSENWASSER;LANG_DE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -91,7 +91,6 @@
     <Compile Include="Entities\Profile.cs" />
     <Compile Include="Entities\PTest.cs" />
     <Compile Include="Entities\Test.cs" />
-    <Compile Include="Entities\TestInstance.cs" />
     <Compile Include="Entities\TransitionSequence.cs" />
     <Compile Include="Entities\TransitionStep.cs" />
     <Compile Include="Entities\Uncertainty.cs" />
@@ -142,10 +141,6 @@
     <EmbeddedResource Include="Resources\Strings.zh-CN.resx" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Common\Common.csproj">
-      <Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
-      <Name>Common</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Users\Users.csproj">
       <Project>{6E5CB0E9-E1B6-4E5D-AC6E-B1049E180F2B}</Project>
       <Name>Users</Name>

Config/Data.cs

@@ -8,19 +8,111 @@ namespace Config
 		public const string AdminPassword = "staratura";
 		public const string SQLiteDbFName = "SQLite.db";
 
-		public const int WMsCount = 20;
+#if MUNICH
+		public const int WMsCount = 3;
+		public const int LineSize = 3;
+		public const int CompoundWMsCount = 3;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = 3;
+#elif DN100 || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || CEVAK_200
+		public const int WMsCount = 3;
+		public const int LineSize = 3;
+		public const int CompoundWMsCount = 1;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
+#elif FUZHOU_300 || FUZHOU_150 || IZRAEL_200 || GENESIS || SLM_150 || PETERSBURG_200
+		public const int WMsCount = 6;
+		public const int LineSize = 6;
+		public const int CompoundWMsCount = 1;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = 3;
+#elif PUCHONG_200
+		public const int WMsCount = 6;
+		public const int LineSize = 6;
+		public const int CompoundWMsCount = 3;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = 3;
+#elif DEWA_300 || ROMA_200
+        public const int WMsCount = 10;
+        public const int LineSize = 10;
+        public const int CompoundWMsCount = 1;
+        public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
+#elif DUBAJ_50
+		public const int WMsCount = 10;
+		public const int LineSize = 5;
+		public const int CompoundWMsCount = 0;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
+#elif IZRAEL_50
+		public const int WMsCount = 40;
+		public const int LineSize = 10;
+		public const int CompoundWMsCount = 0;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
+#elif FUZHOU_100
+		public const int WMsCount = 10;
+		public const int LineSize = 10;
+		public const int CompoundWMsCount = 1;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
+#elif TORINO_50 || BADGER_MALA_TRAT || BERLIN || GELSENWASSER
+		public const int WMsCount = 6;
+		public const int LineSize = 6;
+		public const int CompoundWMsCount = 1;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = 1;
+#elif TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || ALZIR_25
+        public const int WMsCount = 20;
+		public const int LineSize = 10;
+		public const int CompoundWMsCount = 1;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
+#elif RUM_MOB
+        public const int WMsCount = 8;
+		public const int LineSize = 8;
+		public const int CompoundWMsCount = 1;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
+#elif TURA_IPERL || TURA_IPERL_NEW
+		public const int WMsCount = 40;
 		public const int LineSize = 20;
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = WMsCount / LineSize;
+#elif TURA_SPECIAL || SENTEC
+        public const int WMsCount = 6;
+		public const int LineSize = 6;
+		public const int CompoundWMsCount = 1;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
+#elif SLM_50
+		public const int WMsCount = 12;
+		public const int LineSize = 12;
+		public const int CompoundWMsCount = 1;
+		public const int HeatMetersCount = 6;
+        public const int MaxPartNr = WMsCount / LineSize;
+#elif SLM_END || WARSAW_END
+        public const int WMsCount = 10;
+		public const int LineSize = 5;
+		public const int CompoundWMsCount = 1;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = 4;
+#elif MALTA_WSD25
+		public const int WMsCount = 6;
+		public const int LineSize = 6;
+		public const int CompoundWMsCount = 0;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
+#endif
 
         ///
 		/// Database related: This object reference is set after a successful user login
 		///
 		public static DatabaseSettings CurrentBench;
 
-        public static double SampleDensity = 0; /// sample water density measured in an accredited labo [kg/m3]
-        public static double SampleTemp = 0;    /// sample temperature when density measured in an accredited labo [°C]
+        public static double RealDensity = 0;       /// true water density [kg/m3]
+        public static double AtTemperature = 0;     /// measured at temperature [°C]
         public static double Buoyancy = 0;
     }
 }

Config/Entities/BenchPath.cs

@@ -14,7 +14,6 @@ namespace Config.Entities
         public virtual string OriName { get; set; }         /// Not mapped to database
         public virtual float  Qfrom { get; set; }           /// Water flow in [m3/h]
         public virtual float  Qto { get; set; }             /// Water flow in [m3/h]
-        public virtual string Selector { get; set; }
         public virtual string TempMtrUp { get; set; }
         public virtual string TempMtrDown { get; set; }
         public virtual string PressMtrUp { get; set; }
@@ -47,8 +46,7 @@ namespace Config.Entities
 
 			result.Qfrom         = Qfrom;
             result.Qto           = Qto;
-            result.Selector      = Selector;
-            result.TempMtrUp     = TempMtrUp;
+			result.TempMtrUp     = TempMtrUp;
 			result.TempMtrDown   = TempMtrDown;
 			result.PressMtrUp    = PressMtrUp;
 			result.PressMtrDown  = PressMtrDown;

Config/Entities/Component.cs

@@ -13,9 +13,9 @@ namespace Config.Entities
 		public virtual int ItemNr { get; set; }
 		public virtual string Name { get; set; }
 		public virtual string ClassName { get; set; }
-		public virtual string Parent { get; set; }
-        public virtual DebugMode DebugMode { get; set; }
-		public virtual LogLevel LogLevel { get; set; }
+		public virtual string ParentName { get; set; }
+        public virtual DebugMode Mode { get; set; }
+		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; }
@@ -37,9 +37,9 @@ namespace Config.Entities
 			result.ItemNr = itemNr;
 			result.Name = name;
 			result.ClassName = className;
-			result.Parent = parentName;
-            result.DebugMode = debugLevel;
-			result.LogLevel = logLevel;
+			result.ParentName = parentName;
+            result.Mode = debugLevel;
+			result.Logging = logLevel;
 			result.Parameters = parameters;
 			return result;
 		}
@@ -51,9 +51,9 @@ namespace Config.Entities
 			result.ItemNr = ItemNr;
 			result.Name = Name;
             result.ClassName = ClassName;
-			result.Parent = Parent;
-            result.DebugMode = DebugMode;
-			result.LogLevel = LogLevel;
+			result.ParentName = ParentName;
+            result.Mode = Mode;
+			result.Logging = Logging;
 			result.Parameters = Parameters;
 			return result;
 		}
@@ -62,9 +62,9 @@ namespace Config.Entities
         {
             output.WriteLine(Name);
             output.WriteLine(ClassName);
-            output.WriteLine(Parent);
-            output.WriteLine(DebugMode.ToString());
-            output.WriteLine(LogLevel.ToString());
+            output.WriteLine(ParentName);
+            output.WriteLine(Mode.ToString());
+            output.WriteLine(Logging.ToString());
             output.Write(Parameters);
 
             output.Close();
@@ -76,28 +76,28 @@ namespace Config.Entities
 
             result.Name = input.ReadLine();
             result.ClassName = input.ReadLine();
-            result.Parent = input.ReadLine();
+            result.ParentName = input.ReadLine();
 
             string line = input.ReadLine();
-            if (line.Equals(DebugMode.DetectedOff.ToString())) result.DebugMode = DebugMode.DetectedOff;
-            else if (line.Equals(DebugMode.DetectedOn.ToString())) result.DebugMode = DebugMode.DetectedOn;
-            else if (line.Equals(DebugMode.Normal.ToString())) result.DebugMode = DebugMode.Normal;
-            else if (line.Equals(DebugMode.AutoDetect.ToString())) result.DebugMode = DebugMode.AutoDetect;
-            else if (line.Equals(DebugMode.FailureDuringOperation.ToString())) result.DebugMode = DebugMode.FailureDuringOperation;
-            else if (line.Equals(DebugMode.Off.ToString())) result.DebugMode = DebugMode.Off;
-            else if (line.Equals(DebugMode.Record.ToString())) result.DebugMode = DebugMode.Record;
-            else if (line.Equals(DebugMode.Reply.ToString())) result.DebugMode = DebugMode.Reply;
-            else if (line.Equals(DebugMode.Simulate.ToString())) result.DebugMode = DebugMode.Simulate;
-            else if (line.Equals(DebugMode.Inherit.ToString())) result.DebugMode = DebugMode.Inherit;
+            if (line.Equals(DebugMode.DetectedOff.ToString())) result.Mode = DebugMode.DetectedOff;
+            else if (line.Equals(DebugMode.DetectedOn.ToString())) result.Mode = DebugMode.DetectedOn;
+            else if (line.Equals(DebugMode.Normal.ToString())) result.Mode = DebugMode.Normal;
+            else if (line.Equals(DebugMode.AutoDetect.ToString())) result.Mode = DebugMode.AutoDetect;
+            else if (line.Equals(DebugMode.FailureDuringOperation.ToString())) result.Mode = DebugMode.FailureDuringOperation;
+            else if (line.Equals(DebugMode.Off.ToString())) result.Mode = DebugMode.Off;
+            else if (line.Equals(DebugMode.Record.ToString())) result.Mode = DebugMode.Record;
+            else if (line.Equals(DebugMode.Reply.ToString())) result.Mode = DebugMode.Reply;
+            else if (line.Equals(DebugMode.Simulate.ToString())) result.Mode = DebugMode.Simulate;
+            else if (line.Equals(DebugMode.Inherit.ToString())) result.Mode = DebugMode.Inherit;
 
             line = input.ReadLine();
-            if (line.Equals(LogLevel.Off.ToString())) result.LogLevel = LogLevel.Off;
-            else if (line.Equals(LogLevel.Fatal.ToString())) result.LogLevel = LogLevel.Fatal;
-            else if (line.Equals(LogLevel.Error.ToString())) result.LogLevel = LogLevel.Error;
-            else if (line.Equals(LogLevel.Warn.ToString())) result.LogLevel = LogLevel.Warn;
-            else if (line.Equals(LogLevel.Info.ToString())) result.LogLevel = LogLevel.Info;
-            else if (line.Equals(LogLevel.Debug.ToString())) result.LogLevel = LogLevel.Debug;
-            else if (line.Equals(LogLevel.All.ToString())) result.LogLevel = LogLevel.All;
+            if (line.Equals(LogLevel.Off.ToString())) result.Logging = LogLevel.Off;
+            else if (line.Equals(LogLevel.Fatal.ToString())) result.Logging = LogLevel.Fatal;
+            else if (line.Equals(LogLevel.Error.ToString())) result.Logging = LogLevel.Error;
+            else if (line.Equals(LogLevel.Warn.ToString())) result.Logging = LogLevel.Warn;
+            else if (line.Equals(LogLevel.Info.ToString())) result.Logging = LogLevel.Info;
+            else if (line.Equals(LogLevel.Debug.ToString())) result.Logging = LogLevel.Debug;
+            else if (line.Equals(LogLevel.All.ToString())) result.Logging = LogLevel.All;
 
             result.Parameters = string.Empty;
             line = input.ReadLine();
@@ -118,12 +118,12 @@ namespace Config.Entities
             result += indent + "ItemNr = " + (ItemNr + 1).ToString() + Environment.NewLine;
             result += indent + "Name = " + Name + Environment.NewLine;
 			result += indent + "ClassName = " + ClassName + Environment.NewLine;
-			if (Parent != null)
+			if (ParentName != null)
 			{
-				result += indent + "ParentName = " + Parent + Environment.NewLine;
+				result += indent + "ParentName = " + ParentName + Environment.NewLine;
 			}
-			result += indent + "DebugLevel = " + DebugMode.ToString() + Environment.NewLine;
-			result += indent + "LogLevel = " + LogLevel.ToString() + Environment.NewLine;
+			result += indent + "DebugLevel = " + Mode.ToString() + Environment.NewLine;
+			result += indent + "LogLevel = " + Logging.ToString() + Environment.NewLine;
 			result += indent + "Parameters = " + Parameters + Environment.NewLine;
 
 			return result;

Config/Entities/FeedingPath.cs

@@ -14,9 +14,8 @@ namespace Config.Entities
         public virtual string OriName { get; set; }         /// Not mapped to database
         public virtual float Qfrom { get; set; }            /// Water flow in [m3/h]
         public virtual float Qto { get; set; }              /// Water flow in [m3/h]
-        public virtual string Selector { get; set; }
 		public virtual string Pump { get; set; }
-        public virtual string RegVPositions { get; set; }	/// Positions of regulation valves in % separated by ';'
+        public virtual string RegulValvesPct { get; set; }	/// Positions of regulation valves in % separated by ';'
 
         /// Valves
 		public virtual string ValvesOpen { get; set; }
@@ -41,13 +40,12 @@ namespace Config.Entities
         {
 			FeedingPath result = new FeedingPath(name, itemNr);
 
-			result.Qfrom         = Qfrom;
-            result.Qto           = Qto;
-            result.Selector      = Selector;
-			result.Pump          = Pump;
-            result.RegVPositions = RegVPositions;
-            result.ValvesOpen    = ValvesOpen;
-			result.ValvesClose   = ValvesClose;
+			result.Qfrom = Qfrom;
+            result.Qto = Qto;
+			result.Pump = Pump;
+            result.RegulValvesPct = RegulValvesPct;
+            result.ValvesOpen = ValvesOpen;
+			result.ValvesClose = ValvesClose;
 
             return result;
         }

Config/Entities/IParamsProvider.cs

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

Config/Entities/OutputPath.cs

@@ -14,14 +14,14 @@ namespace Config.Entities
         public virtual string OriName { get; set; }         /// Not mapped to database
         public virtual float Qfrom { get; set; }			/// Water flow in [m3/h]
         public virtual float Qto { get; set; }				/// Water flow in [m3/h]
-        public virtual string Selector { get; set; }
-        public virtual string RegValve { get; set; }
+        public virtual string RegulValve { get; set; }
 		public virtual string FlowMeter { get; set; }
 		public virtual float PidCoef { get; set; }			/// PID coefficient for the regulation path
         public virtual string StartValve { get; set; }
         public virtual string Diverter { get; set; }
-		public virtual string TempMtrDiv { get; set; }
+		public virtual string TempDiv { get; set; }
 		public virtual string Scale { get; set; }
+		public virtual string EmptyTankValve { get; set; }	/// Not used anywhere
 
         /// Valves		
 		public virtual string ValvesOpen { get; set; }
@@ -46,18 +46,18 @@ namespace Config.Entities
         {
 			OutputPath result = new OutputPath(name, itemNr);
 
-			result.Name        = Name;
-			result.Qfrom       = Qfrom;
-            result.Qto         = Qto;
-            result.Selector    = Selector;
-            result.RegValve    = RegValve;
-			result.FlowMeter   = FlowMeter;
-			result.PidCoef     = PidCoef;
-            result.StartValve  = StartValve;
-			result.Diverter    = Diverter;
-			result.TempMtrDiv  = TempMtrDiv;
-			result.Scale       = Scale;
-			result.ValvesOpen  = ValvesOpen;
+			result.Name = Name;
+			result.Qfrom = Qfrom;
+            result.Qto = Qto;
+			result.RegulValve = RegulValve;
+			result.FlowMeter = FlowMeter;
+			result.PidCoef = PidCoef;
+            result.StartValve = StartValve;
+			result.Diverter = Diverter;
+			result.TempDiv = TempDiv;
+			result.Scale = Scale;
+			result.EmptyTankValve = EmptyTankValve;
+			result.ValvesOpen = ValvesOpen;
 			result.ValvesClose = ValvesClose;
 
             return result;

Config/Entities/Procedure.cs

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

Config/Entities/Test.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -25,7 +25,7 @@ namespace Config.Entities
         public virtual float Qfrom { get; set; }			/// Water flow low limit in [m3/h]
         public virtual float Qto { get; set; }				/// Water flow high limit in [m3/h]
 		public virtual float Volume { get; set; }			/// Test volume (target) in [l]
-        public virtual float TestTime { get; set; }			/// Test time (estimate) in [s]
+        public virtual float TstTime { get; set; }			/// Test time (estimate) in [s]
         public virtual string Method { get; set; }
         public virtual float ErrLimLo { get; set; }			/// in [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
         public virtual float ErrLimHi { get; set; }			/// in [%] usually > 0, in case of heat meters: -Qn in m3/h
@@ -44,7 +44,8 @@ namespace Config.Entities
         public virtual int TimeFlow2Mass { get; set; }		/// Delay time from the flow stable to the 1st mass measurement in [s]
         public virtual int TimePump2StartV { get; set; }	/// Delay time from the start of the pump to opening the start valve in [s]
         public virtual int TimeStop2Mass { get; set; }		/// Delay time from the test end (diverted) to the 2nd mass measuremen in [s]
-		public virtual int ShortPulses { get; set; }		/// Short pulses
+		public virtual double TolerRed { get; set; }		///  = Filter
+        public virtual string RedType { get; set; }
 		public virtual string FeedingPath { get; set; }
 		public virtual string BenchPath { get; set; }
 		public virtual string OutputPath { get; set; }
@@ -52,9 +53,9 @@ namespace Config.Entities
 #if HEAT_METERS
         public virtual string HeatMetersPath { get; set; }
 #endif
-        public virtual string TransBefore { get; set; }
-		public virtual string TransBetween { get; set; }
-		public virtual string TransAfter { get; set; }
+        public virtual string RelTransBefore { get; set; }
+		public virtual string RelTransBetween { get; set; }
+		public virtual string TransitionAfter { get; set; }
 
         public virtual bool IsOuterLoopStart { get; set; }  /// Not mapped to database
         public virtual bool IsOuterLoopEnd { get; set; }    /// Not mapped to database
@@ -88,15 +89,15 @@ namespace Config.Entities
             PumpPower = 60.0f;				/// [%]
             MassRepeats = 0;				/// default
             MassSpread = 0;					/// default
-            MassMethod = MassMethod.Scale;  /// default
+            MassMethod = MassMethod.Scale;     /// default
             TimeBeforeFlow = 10;			/// [s] time before the start of flow control in [s]
             TimeFlow2Mass = 5;				/// [s] time from the flow stable to the 1st mass measurement in [s]
             TimePump2StartV = 1;			/// [s] time from the 1st mass measurement to the test start in [s]
             TimeStop2Mass = 5;				/// [s] between the test end and the final mass measurement
-            ShortPulses = 0;				/// Short pulses parameter (0 or 1)
-			TransBefore = string.Empty;
-			TransBetween = string.Empty;
-			TransAfter = string.Empty;
+            TolerRed = 0;					/// = Filter parameter
+			RelTransBefore  = string.Empty;
+			RelTransBetween = string.Empty;
+			TransitionAfter = string.Empty;
 		}
 
 		public Test(string name, int itemNr, Procedure procedure)
@@ -107,22 +108,6 @@ namespace Config.Entities
 			Procedure = procedure;
 		}
 
-        public virtual bool IsRegular()
-        {
-            /// Irregular / event triggered test names have form "[event] TestName"
-            return (Name.Length > 0 && Name[0] != '[') || !Name.Contains("]");
-        }
-
-        public virtual bool BelongsTo(IList<string> autoTests)
-        {
-            if (IsRegular()) return true;
-
-            if (autoTests == null) return false;
-
-            string action = Name.Substring(1, Name.IndexOf(']') - 1);
-            return autoTests.Contains(action);
-        }
-
         // Makes a new copy of this object (not just a reference)
         public virtual Test Clone()
         {
@@ -136,7 +121,7 @@ namespace Config.Entities
 			result.Qfrom = Qfrom;
             result.Qto = Qto;
 			result.Volume = Volume;
-			result.TestTime = TestTime;
+			result.TstTime = TstTime;
 			result.Method = Method;
 			result.ErrLimLo = ErrLimLo;
 			result.ErrLimHi = ErrLimHi;
@@ -155,7 +140,8 @@ namespace Config.Entities
             result.TimeFlow2Mass = TimeFlow2Mass;
             result.TimePump2StartV = TimePump2StartV;
 			result.TimeStop2Mass = TimeStop2Mass;
-			result.ShortPulses = ShortPulses;
+			result.TolerRed = TolerRed;
+            result.RedType = RedType;
 			result.FeedingPath = FeedingPath;
 			result.BenchPath = BenchPath;
 			result.OutputPath = OutputPath;
@@ -163,9 +149,9 @@ namespace Config.Entities
 #if HEAT_METERS
             result.HeatMetersPath = HeatMetersPath;
 #endif
-			result.TransBefore = TransBefore;
-			result.TransBetween = TransBetween;
-			result.TransAfter = TransAfter;
+			result.RelTransBefore = RelTransBefore;
+			result.RelTransBetween = RelTransBetween;
+			result.TransitionAfter = TransitionAfter;
 			foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone()); }
 
             return result;
@@ -183,7 +169,7 @@ namespace Config.Entities
             output.WriteLine(Qfrom.ToString(ci));
             output.WriteLine(Qto.ToString(ci));
             output.WriteLine(Volume.ToString(ci));
-            output.WriteLine(TestTime.ToString(ci));
+            output.WriteLine(TstTime.ToString(ci));
             output.WriteLine(Method);
             output.WriteLine(ErrLimLo.ToString(ci));
             output.WriteLine(ErrLimHi.ToString(ci));
@@ -202,15 +188,14 @@ namespace Config.Entities
             output.WriteLine(TimeFlow2Mass.ToString(ci));
             output.WriteLine(TimePump2StartV.ToString(ci));
             output.WriteLine(TimeStop2Mass.ToString(ci));
-            output.WriteLine(ShortPulses.ToString(ci));
             output.WriteLine(FeedingPath);
             output.WriteLine(BenchPath);
             output.WriteLine(OutputPath);
             output.WriteLine(MetersPath);
-            output.WriteLine(TransBefore);
-            output.WriteLine(TransBetween);
+            output.WriteLine(RelTransBefore);
+            output.WriteLine(RelTransBetween);
             output.WriteLine(Profile);
-            output.WriteLine(TransAfter);
+            output.WriteLine(TransitionAfter);
 
             foreach (var prms in MoreParams) { prms.Export(output); }
             output.WriteLine();
@@ -235,7 +220,7 @@ namespace Config.Entities
             tst.Qfrom = float.Parse(input.ReadLine(), ci);
 			tst.Qto = float.Parse(input.ReadLine(), ci);
 			tst.Volume = float.Parse(input.ReadLine(), ci);
-			tst.TestTime = float.Parse(input.ReadLine(), ci);
+			tst.TstTime = float.Parse(input.ReadLine(), ci);
             tst.Method = input.ReadLine();
 			tst.ErrLimLo = float.Parse(input.ReadLine(), ci);
 			tst.ErrLimHi = float.Parse(input.ReadLine(), ci);
@@ -254,18 +239,17 @@ namespace Config.Entities
 			tst.TimeFlow2Mass = int.Parse(input.ReadLine(), ci);
 			tst.TimePump2StartV = int.Parse(input.ReadLine(), ci);
 			tst.TimeStop2Mass = int.Parse(input.ReadLine(), ci);
-            tst.ShortPulses = int.Parse(input.ReadLine(), ci);
             tst.FeedingPath = input.ReadLine();
             tst.BenchPath = input.ReadLine();
             tst.OutputPath = input.ReadLine();
             tst.MetersPath = input.ReadLine();
-            tst.TransBefore = input.ReadLine();
-            tst.TransBetween = input.ReadLine();
+            tst.RelTransBefore = input.ReadLine();
+            tst.RelTransBetween = input.ReadLine();
             string line = input.ReadLine();
             tst.Profile = line.Equals(TestProfile.ProtectedHeatMeter.ToString()) ? TestProfile.ProtectedHeatMeter
                           : line.Equals(TestProfile.UserDefinedHeatMeter.ToString()) ? TestProfile.UserDefinedHeatMeter
                           : line.Equals(TestProfile.Protected.ToString()) ? TestProfile.Protected : TestProfile.UserDefined;  /// UserDefined is the default
-            tst.TransAfter = input.ReadLine();
+            tst.TransitionAfter = input.ReadLine();
 
             while (true)
             {
@@ -298,14 +282,14 @@ namespace Config.Entities
             ln = inp.ReadLine(); if (ln != Qfrom.ToString(ci))              { diff.AppendFormat(fmt, "Qfrom", Qfrom.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Qto.ToString(ci))                { diff.AppendFormat(fmt, "Qto", Qto.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Volume.ToString(ci))             { diff.AppendFormat(fmt, "Volume", Volume.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != TestTime.ToString(ci))            { diff.AppendFormat(fmt, "TstTime", TestTime.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != TstTime.ToString(ci))            { diff.AppendFormat(fmt, "TstTime", TstTime.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Method)                          { diff.AppendFormat(fmt, "Method", Method, ln); };
             ln = inp.ReadLine(); if (ln != ErrLimLo.ToString(ci))           { diff.AppendFormat(fmt, "ErrLimLo", ErrLimLo.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != ErrLimHi.ToString(ci))           { diff.AppendFormat(fmt, "ErrLimHi", ErrLimHi.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Uncertainty.ToString(ci))        { diff.AppendFormat(fmt, "Uncertainty", Uncertainty.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Repeats.ToString(ci))            { diff.AppendFormat(fmt, "Repeats", Repeats.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != DoDraining.ToString(ci))         { diff.AppendFormat(fmt, "DoDraining", DoDraining.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != DoDrainingAfter.ToString(ci))    { diff.AppendFormat(fmt, "DoDrainingAfter", DoDrainingAfter.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != 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 != 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); };
@@ -321,10 +305,10 @@ namespace Config.Entities
             ln = inp.ReadLine(); if (ln != BenchPath)                       { diff.AppendFormat(fmt, "BenchPath", BenchPath, ln); };
             ln = inp.ReadLine(); if (ln != OutputPath)                      { diff.AppendFormat(fmt, "OutputPath", OutputPath, ln); };
             ln = inp.ReadLine(); if (ln != MetersPath)                      { diff.AppendFormat(fmt, "MetersPath", MetersPath, ln); };
-            ln = inp.ReadLine(); if (ln != TransBefore)                     { diff.AppendFormat(fmt, "TransBefore", TransBefore, ln); };
-            ln = inp.ReadLine(); if (ln != TransBetween)                    { diff.AppendFormat(fmt, "TransBetween", TransBetween, ln); };
-            ln = inp.ReadLine(); if (ln != Profile.ToString())              { diff.AppendFormat(fmt, "Profile", Profile, ln); };
-            ln = inp.ReadLine(); if (ln != TransAfter)                      { diff.AppendFormat(fmt, "TransAfter", TransAfter, ln); };
+            ln = inp.ReadLine(); if (ln != RelTransBefore)                  { diff.AppendFormat(fmt, "RelTransBefore", RelTransBefore, ln); };
+            ln = inp.ReadLine(); if (ln != RelTransBetween)                 { diff.AppendFormat(fmt, "RelTransBetween", RelTransBetween, ln); };
+            ln = inp.ReadLine(); if (ln != Profile.ToString())            { diff.AppendFormat(fmt, "RelTransAfter", Profile, ln); };
+            ln = inp.ReadLine(); if (ln != TransitionAfter)                 { diff.AppendFormat(fmt, "TransitionAfter", TransitionAfter, ln); };
 
             return diff.ToString();
         }

Config/Entities/TestInstance.cs

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

Config/Formulas.cs

@@ -15,8 +15,8 @@ namespace Config
         ///
         /// Wrappers
         ///
-        public static double RealDensity() { return Data.SampleDensity; }
-        public static double AtTemperature() { return Data.SampleTemp; }
+        public static double RealDensity() { return Data.RealDensity; }
+        public static double AtTemperature() { return Data.AtTemperature; }
         public static double Buoyancy() { return Data.Buoyancy; }
 
 

Config/Mappings/BenchPathMap.cs

@@ -15,11 +15,10 @@ namespace Config.Mappings
 			Map(x => x.Name);
 			Map(x => x.Qfrom);
 			Map(x => x.Qto);
-            Map(x => x.Selector);
-            Map(x => x.TempMtrUp);
-			Map(x => x.TempMtrDown);
-			Map(x => x.PressMtrUp);
-			Map(x => x.PressMtrDown);
+			Map(x => x.TempMtrUp).Column("TempIn");
+			Map(x => x.TempMtrDown).Column("TempOut");
+			Map(x => x.PressMtrUp).Column("PressIn");
+			Map(x => x.PressMtrDown).Column("PressOut");
 			Map(x => x.PressMtrDelta);
 			Map(x => x.StopBFValve);
 			Map(x => x.ValvesOpen)

Config/Mappings/ComponentMap.cs

@@ -13,10 +13,10 @@ namespace Config.Mappings
             Id(x => x.Id);
             Map(x => x.Name);
             Map(x => x.ClassName);
-            Map(x => x.Parent);
+            Map(x => x.ParentName);
             Map(x => x.ItemNr);
-			Map(x => x.DebugMode);
-			Map(x => x.LogLevel);
+			Map(x => x.Mode);
+			Map(x => x.Logging);
 			Map(x => x.Parameters)
 				.CustomType("StringClob")
 				.CustomSqlType("varchar(8000)");

Config/Mappings/FeedingPathMap.cs

@@ -15,9 +15,8 @@ namespace Config.Mappings
 			Map(x => x.Name);
 			Map(x => x.Qfrom);
 			Map(x => x.Qto);
-            Map(x => x.Selector);
 			Map(x => x.Pump);
-            Map(x => x.RegVPositions);
+            Map(x => x.RegulValvesPct);
 			Map(x => x.ValvesOpen)
 				.CustomType("StringClob")
 				.CustomSqlType("varchar(8000)");

Config/Mappings/OutputPathMap.cs

@@ -15,14 +15,15 @@ namespace Config.Mappings
 			Map(x => x.Name);
 			Map(x => x.Qfrom);
 			Map(x => x.Qto);
-            Map(x => x.Selector);
-            Map(x => x.RegValve);
+			Map(x => x.RegulValve);
 			Map(x => x.FlowMeter);
 			Map(x => x.PidCoef);
             Map(x => x.StartValve);
             Map(x => x.Diverter);
-			Map(x => x.TempMtrDiv);
-			Map(x => x.Scale);
+			Map(x => x.TempDiv);
+			Map(x => x.Scale)
+				.Column("Balance");
+			Map(x => x.EmptyTankValve);
 			Map(x => x.ValvesOpen)
 				.CustomType("StringClob")
 				.CustomSqlType("varchar(8000)");

Config/Mappings/TestMap.cs

@@ -16,15 +16,18 @@ namespace Config.Mappings
 			Map(x => x.Part);
             Map(x => x.Profile);
             Map(x => x.Publish);
-			Map(x => x.DoEvaluate);
+			Map(x => x.DoEvaluate)
+				.Column("Evaluate");
             Map(x => x.Qtg);
             Map(x => x.Qfrom);
 			Map(x => x.Qto);
 			Map(x => x.Volume);
-			Map(x => x.TestTime);
+			Map(x => x.TstTime);
 			Map(x => x.Repeats);
-            Map(x => x.DoDraining);
-            Map(x => x.DoDrainingAfter);
+            Map(x => x.DoDraining)
+				.Column("Emptying");
+            Map(x => x.DoDrainingAfter)
+				.Column("Zeroing");
             Map(x => x.DoControlWaterTemp);
             Map(x => x.TempLimLo);
 			Map(x => x.TempLimHi);
@@ -32,16 +35,19 @@ namespace Config.Mappings
             Map(x => x.MassRepeats);
             Map(x => x.MassSpread);
 			Map(x => x.MassMethod)
-                .CustomType<byte>();
+				.CustomType<byte>();
             Map(x => x.TimeBeforeFlow);
             Map(x => x.TimeFlow2Mass);
-            Map(x => x.TimePump2StartV);
+            Map(x => x.TimePump2StartV)
+				.Column("TimeMass2Start");
             Map(x => x.TimeStop2Mass);
 			Map(x => x.Method);
 			Map(x => x.ErrLimLo);
 			Map(x => x.ErrLimHi);
 			Map(x => x.Uncertainty);
-			Map(x => x.ShortPulses);
+			Map(x => x.TolerRed)
+                .Column("TolerRed");	/// ???
+			Map(x => x.RedType);
 			Map(x => x.FeedingPath);
 			Map(x => x.BenchPath);
 			Map(x => x.OutputPath);
@@ -49,9 +55,12 @@ namespace Config.Mappings
 #if HEAT_METERS
             Map(x => x.HeatMetersPath);
 #endif
-            Map(x => x.TransBefore);
-			Map(x => x.TransBetween);
-			Map(x => x.TransAfter);
+            Map(x => x.RelTransBefore)
+                .Column("RelTransBefore");
+			Map(x => x.RelTransBetween)
+                .Column("RelTransBetween");
+			Map(x => x.TransitionAfter)
+                .Column("TransitionAfter");
 
             HasMany(x => x.MoreParams)
 				.Cascade.All();

Config/Mappings/UserMap.cs

@@ -10,16 +10,14 @@ namespace Config.Mappings
         public UserMap()
         {
             Id(x => x.Id);
-            Map(x => x.UserName)
-                .Column("Name");
+            Map(x => x.UserName).Column("Name");
 			Map(x => x.Number);
             Map(x => x.Tag);
 			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.FullName).Column("Description");
             Map(x => x.LastPwChange);
             HasManyToMany(x => x.Groups)
                 .Cascade.SaveUpdate()

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("3.1.1464.0")]
-[assembly: AssemblyFileVersion("3.1.1464.0")]
+[assembly: AssemblyVersion("2.26.1458.0")]
+[assembly: AssemblyFileVersion("2.26.1458.0")]

Config/Units.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2016-2020 Sensus Slovensko a.s.
 ///
 using System;
 using System.Reflection;
@@ -17,26 +17,16 @@ namespace Config
 #else
         [Description("degree")]     degree,
 #endif
-        [Description("ml")]         ml,         ///   1 ml = 0.001 l
         [Description("l")]          l,          /// * 1 liter
-        [Description("dm3")]        dm3,        ///   1 dm3 = 1 l
-        [Description("US gal")]     USgal,      ///   1 US gallon = 3.78541178 l
-        [Description("imper.gal")]  UKgal,      ///   1 imperial gallon = 4.54609 l
-        [Description("cf")]         cf,         ///   1 cubic foot = 28.316846592 l
-        [Description("m3")]         m3,         ///   1 m3 = 1000 l
+        [Description("dm3")]        dm3,        ///   1 dm3 = 1 liter
+        [Description("m3")]         m3,         ///   1000 l
+        [Description("gal(UK)")]    gal_UK,     ///   1 gal(UK) = 4.54609 l
+        [Description("gal(US)")]    gal_US,     ///   1 gal(US) = 3.78541178 l
 
-        [Description("l/h")]        lph,        ///   1 l/h = 0.001 m3/h
-        [Description("cf/h")]       cfph,       ///   1 cf/h = 0.028316846592 m3/h
-        [Description("l/m")]        lpm,        ///   1 l/m = 60 l/h = 0.06 m3/h
-        [Description("US gal/m")]   USgalpm,    ///   1 US gallon per minute = 0.2271247068 m3/h
-        [Description("m3/h")]       m3ph,       /// * 1 m3/h
-        [Description("l/s")]        lps,        ///   1 liter/s = 3.6 m3/h
-        [Description("US gal/s")]   USgalps,    ///   1 US gallon per second = 13.627482408 m3/h
-        [Description("m3/m")]       m3pm,       ///   1 m3/m = 60 m3/h
-        [Description("cf/s")]       cfs,        ///   1 cubic foot per second = 101.9406477312 m3/h
+        [Description("l/h")]        lph,        ///   1 liter/h
+        [Description("m3/h")]       m3ph,       /// * 1 m3/h = 1000 l/h
 
         [Description("g")]          g,          ///   0.001 kg
-        [Description("oz")]         oz,         ///   0.0283495231 kg
         [Description("lb")]         lb,         ///   0.45359237 kg
         [Description("kg")]         kg,         /// * 1 kilogram
         [Description("t")]          t,          ///   1000 kg
@@ -53,7 +43,7 @@ namespace Config
         [Description("Pa")]         Pa,         ///   1 Pa = 0.01 hPa
         [Description("hPa")]        hPa,        ///   1 hPa = 100 Pa
         [Description("mbar")]       mbar,       ///   1 mbar = 1 hPa = 100 Pa
-        [Description("kPa")]        kPa,        ///   1 kPa = 10 hPa = 1000 Pa
+        [Description("kPa")]        kPa,        ///   1 kPa = 10 hPa = 10000 Pa
         [Description("inHg")]       inHg,       ///   1 inHg = 33.864 hPa
         [Description("psi")]        psi,        ///   1 psi = 0.0689475729 bar
         [Description("bar")]        bar,        /// * 1 Bar = 1000 mbar = 0.1 MPa = 100000 Pa
@@ -61,16 +51,13 @@ namespace Config
 
         [Description("R%")]         RPct,       /// * 1 R%
 
-        [Description("promile")]    Promile,    ///   1 promile = 0.1 %
         [Description("%")]          Pct,        /// * 1 %
+        [Description("promile")]    Promile,    ///   1 promile = 0.1 %
 
         [Description("mm")]         mm,         /// * 1 millimeter
         [Description("cm")]         cm,         ///   1 cm = 10 mm
-        [Description("in")]         inch,       ///   1 inch = 25.4 mm
-        [Description("dm")]         dm,         ///   1 dm = 100 mm
-        [Description("ft")]         foot,       ///   1 foot = 304.8 mm
-        [Description("yd")]         yard,       ///   1 yard = 914.4 mm
         [Description("m")]          m,          ///   1 m = 1000 mm
+        [Description("in")]         inch,       ///   1 inch = 25.4 mm
 
         [Description("kg/m3")]      kgpm3,		/// * 1 kg/m3 = 0.001 kg/l
         [Description("kg/l")]       kgpl,		///   1 kg/l = 1000 kg/m3
@@ -83,7 +70,6 @@ namespace Config
         [Description("MWh")]        MWh,		///   1 MWh = 3600000000 J
 
         [Description("uS/cm")]      uSpcm,      /// * 1 uS/cm
-        [Description("mS/m")]       mSpm,       ///   1 mS/m = 10 uS/cm
 
 #if LANG_PL
         [Description("imp/l")]       ppl,		/// * 1 pulse/l
@@ -96,17 +82,17 @@ namespace Config
         [Description("dm3/stopień")] dm3pdeg,	/// * 1 dm3/degree
 #else
         [Description("pulse/l")]    ppl,		/// * 1 pulse/l
-        [Description("pulse/dm3")]  ppdm3,		///   1 pulse/dm3
-        [Description("degree/l")]   degpl,		///   1 degree/l
-        [Description("degree/dm3")] degpdm3,	///   1 degree/dm3
-        [Description("l/pulse")]    lpp,		///   1 l/pulse
-        [Description("dm3/pulse")]  dm3pp,		///   1 dm3/pulse
-        [Description("l/degree")]   lpdeg,		///   1 l/degree
-        [Description("dm3/degree")] dm3pdeg,	///   1 dm3/degree
+        [Description("pulse/dm3")]  ppdm3,		/// * 1 pulse/dm3
+        [Description("degree/l")]   degpl,		/// * 1 degree/l
+        [Description("degree/dm3")] degpdm3,	/// * 1 degree/dm3
+        [Description("l/pulse")]    lpp,		/// * 1 l/pulse
+        [Description("dm3/pulse")]  dm3pp,		/// * 1 dm3/pulse
+        [Description("l/degree")]   lpdeg,		/// * 1 l/degree
+        [Description("dm3/degree")] dm3pdeg,	/// * 1 dm3/degree
 #endif
         /// 
         [Description("pulse/kWh")]  ppkWh,		/// * 1 pulse/kWh
-        [Description("kWh/pulse")]  kWhpp,		///   1 kWh/pulse
+        [Description("kWh/pulse")]  kWhpp,		/// * 1 kWh/pulse
                                                 
         Count
     }
@@ -242,9 +228,8 @@ namespace Config
 
         public static bool IsDefaultUnit(Unit unit)
         {
-            return unit == Unit.l || unit == Unit.m3ph || unit == Unit.kg || unit == Unit.s || unit == Unit.C ||
-                   unit == Unit.bar || unit == Unit.RPct || unit == Unit.Pct || unit == Unit.mm || unit == Unit.kgpm3 ||
-                   unit == Unit.J || unit == Unit.uSpcm || unit == Unit.ppl || unit == Unit.ppkWh;
+            return unit == Unit.l || unit == Unit.m3ph || unit == Unit.kg || unit == Unit.s || unit == Unit.C || unit == Unit.bar || unit == Unit.RPct ||
+                   unit == Unit.Pct || unit == Unit.mm || unit == Unit.kgpm3 || unit == Unit.J || unit == Unit.ppl || unit == Unit.ppkWh || unit == Unit.uSpcm;
         }
 
         public static bool IsQuantity(Unit units, Quantity quantity)
@@ -258,45 +243,35 @@ namespace Config
             {
                 case Unit.pulse:
                 case Unit.degree:
-                    return Quantity.Pulses;
+                    return Config.Quantity.Pulses;
 
-                case Unit.ml:
                 case Unit.l:
                 case Unit.dm3:
-                case Unit.USgal:
-                case Unit.UKgal:
-                case Unit.cf:
                 case Unit.m3:
-					return Quantity.Volume;
+                case Unit.gal_UK:
+                case Unit.gal_US:
+					return Config.Quantity.Volume;
 
                 case Unit.lph:
-                case Unit.cfph:
-                case Unit.lpm:
-                case Unit.USgalpm:
                 case Unit.m3ph:
-                case Unit.lps:
-                case Unit.USgalps:
-                case Unit.m3pm:
-                case Unit.cfs:
-                    return Quantity.Flow;
+					return Config.Quantity.Flow;
 
                 case Unit.g:
-                case Unit.oz:
-                case Unit.lb:
                 case Unit.kg:
                 case Unit.t:
-					return Quantity.Mass;
+                case Unit.lb:
+					return Config.Quantity.Mass;
 
-                case Unit.ms:
                 case Unit.s:
                 case Unit.min:
                 case Unit.hour:
-                    return Quantity.Time;
+                case Unit.ms:
+                    return Config.Quantity.Time;
 
                 case Unit.C:
                 case Unit.F:
                 case Unit.K:
-					return Quantity.Temperature;
+					return Config.Quantity.Temperature;
 
                 case Unit.Pa:
                 case Unit.hPa:
@@ -306,27 +281,24 @@ namespace Config
                 case Unit.psi:
                 case Unit.bar:
                 case Unit.MPa:
-                    return Quantity.Pressure;
+                    return Config.Quantity.Pressure;
 
                 case Unit.RPct:
-                    return Quantity.Humidity;
+                    return Config.Quantity.Humidity;
 
-                case Unit.Promile:
                 case Unit.Pct:
-					return Quantity.Error;
+                case Unit.Promile:
+					return Config.Quantity.Error;
 
                 case Unit.mm:
                 case Unit.cm:
-                case Unit.inch:
-                case Unit.dm:
-                case Unit.foot:
-                case Unit.yard:
                 case Unit.m:
-					return Quantity.Length;
+                case Unit.inch:
+					return Config.Quantity.Length;
 
 				case Unit.kgpm3:
 				case Unit.kgpl:
-					return Quantity.Density;
+					return Config.Quantity.Density;
 
 				case Unit.J:
 				case Unit.kJ:
@@ -334,11 +306,7 @@ namespace Config
                 case Unit.Wh:
 				case Unit.kWh:
                 case Unit.MWh:
-                    return Quantity.Energy;
-
-                case Unit.uSpcm:
-                case Unit.mSpm:
-                    return Quantity.Conductivity;
+                    return Config.Quantity.Energy;
 
                 case Unit.ppl:
                 case Unit.ppdm3:
@@ -348,14 +316,17 @@ namespace Config
                 case Unit.dm3pp:
                 case Unit.lpdeg:
                 case Unit.dm3pdeg:
-                    return Quantity.PulsePerLtr;
+                    return Config.Quantity.PulsePerLtr;
 
                 case Unit.ppkWh:
                 case Unit.kWhpp:
-                    return Quantity.PulsePerKWh;
+                    return Config.Quantity.PulsePerKWh;
+
+                case Unit.uSpcm:
+                    return Config.Quantity.Conductivity;
 
                 default:
-					return Quantity.Number;
+					return Config.Quantity.Number;
             }
 		}
 
@@ -376,83 +347,78 @@ namespace Config
         public static bool IsConductivity(Unit units) { return IsQuantity(units, Config.Quantity.Conductivity); }
 
 
+
 		public static double ConvertTo(Unit units, double v)
         {
             switch (units)
             {
                 /// Volume: internal representation in l
-                case Unit.ml:       return 1000 * v;            /// 1 ml = 0.001 l
-                case Unit.USgal:    return 0.26417205 * v;      /// 1 gal(US) = 3.78541178 l
-                case Unit.UKgal:    return 0.21996925 * v;      /// 1 gal(UK) = 4.54609 l
-                case Unit.cf:       return 0.0353146667215 * v; /// 1 cubic foot = 28.316846592 l
-                case Unit.m3:       return 0.001 * v;           /// 1 m3 = 1000 l
+                case Unit.dm3:
+                case Unit.l:        return v;               /// 1 liter
+                case Unit.m3:       return 0.001 * v;       /// 1 m3 = 1000 l
+                case Unit.gal_UK:   return 0.21996925 * v;  /// 1 gal(UK) = 4.54609 l
+                case Unit.gal_US:   return 0.26417205 * v;  /// 1 gal(US) = 3.78541178 l
 
                 /// Flow: internal representation in m3/h
-                case Unit.lph:      return 1000 * v;            /// 1 l/h
-                case Unit.cfph:     return 35.3146667214886 * v;/// 1 cf/h
-                case Unit.lpm:      return v / 0.06;            /// 1 l/m
-                case Unit.USgalpm:  return 4.40286754395493 * v;/// 1 US gallon per minute
-                case Unit.lps:      return v / 3.6;             /// 1 l/s
-                case Unit.USgalps:  return 0.0733811257326 * v; /// 1 US gallon per second
-                case Unit.m3pm:     return v / 60;              /// 1 m3/m
-                case Unit.cfs:      return 0.009809629644858 * v; /// 1 cubic foot per second
+                case Unit.lph:      return 1000 * v;        /// 1 liter/h
+                case Unit.m3ph:     return v;               /// 1 m3/h = 1000 l/h
 
                 /// Mass: internal representation in kg
-                case Unit.g:        return 1000 * v;            /// 1 g = 0.001 kg
-                case Unit.oz:       return 35.273962 * v;       /// 1 oz = 0.0283495231 kg
-                case Unit.lb:       return 2.2046226 * v;       /// 1 lb = 0.45359237 kg
-                case Unit.t:        return 0.001 * v;           /// 1 t = 1000 kg
+                case Unit.g:        return 1000 * v;        /// 1 g = 0.001 kg
+                case Unit.kg:       return v;               /// 1 kilogram
+                case Unit.t:        return 0.001 * v;       /// 1 t = 1000 kg
+                case Unit.lb:       return 2.2046226 * v;   /// 1 lb = 0.45359237 kg
 
                 /// Time or duration: internal representation in seconds [s] 
-                case Unit.ms:       return 1000 * v;
+                case Unit.s:        return v;
                 case Unit.min:      return v / 60;
                 case Unit.hour:     return v / 3600;
+                case Unit.ms:       return 1000 * v;
 
 				/// Temperature: internal representation in °C
-                case Unit.F:        return 1.8 * v + 32;        /// degree Fahrenheit
-                case Unit.K:        return v + 273.15;          /// degree Kelvin
+				case Unit.C:        return v;               /// degree Celsius (°C)
+                case Unit.F:        return 1.8 * v + 32;    /// degree Fahrenheit
+                case Unit.K:        return v + 273.15;      /// degree Kelvin
 
                 /// Pressure: internal representation in  bar = 0.1 MPa
-                case Unit.Pa:       return 100000 * v;          /// 1 hPa = 100 Pa
-                case Unit.hPa:      return 1000 * v;            /// 1 hPa = 100 Pa
-                case Unit.mbar:     return 1000 * v;            /// 1 mbar = 1 hPa = 100 Pa
-                case Unit.kPa:      return 100 * v;             /// 1 kPa = 10 HPa
-                case Unit.inHg:     return 29.53 * v;           /// 1 inHg =
-                case Unit.psi:      return 14.5037738 * v;      /// 1 psi =
-                case Unit.MPa:      return 0.1 * v;             /// 1 MPa = 10000 hPa
+                case Unit.Pa:       return 100000 * v;      /// 1 hPa = 100 Pa
+                case Unit.hPa:      return 1000 * v;        /// 1 hPa = 100 Pa
+                case Unit.mbar:     return 1000 * v;        /// 1 mbar = 1 hPa = 100 Pa
+                case Unit.kPa:      return 100 * v;         /// 1 kPa = 10 HPa
+                case Unit.inHg:     return 29.53 * v;       /// 1 inHg =
+                case Unit.psi:      return 14.50377378 * v; /// 1 psi =
+                case Unit.bar:      return v;               /// 1 bar = 1000 mbar = 100000 Pa
+                case Unit.MPa:      return 0.1 * v;         /// 1 MPa = 10000 hPa
 
-                /// Relative error: internal representation in %
-                case Unit.Promile:  return 10 * v;              /// 1 promile = 0.1 %
+                /// Error: internal representation in %
+                case Unit.Pct:      return v;               /// 1 %
+                case Unit.Promile:  return 10 * v;          /// 1 promile = 0.1 %
 
                 /// Diameter, length: internal representation in mm
-                case Unit.cm:       return 0.1 * v;             /// 1 cm = 10 mm
-                case Unit.inch:     return v / 25.4;            /// 1 inch = 25.4 mm
-                case Unit.dm:       return 0.01 * v;            /// 1 dm = 100 mm
-                case Unit.foot:     return v / 304.8;           /// 1 foot = 304.8 mm
-                case Unit.yard:     return v / 914.4;           /// 1 yard = 914,4 mm
-                case Unit.m:        return 0.001 * v;           /// 1 m = 1000 mm
-                                                                
+                case Unit.mm:       return v;               /// 1 mm
+                case Unit.cm:       return 0.1 * v;         /// 1 cm = 10 mm
+                case Unit.m:        return 0.001 * v;       /// 1 m = 1000 mm
+                case Unit.inch:     return v / 25.4;        /// 1 inch = 25.4 mm
+
 				/// Density: internal representation in kg/m3
+				case Unit.kgpm3:    return v;
 				case Unit.kgpl:     return 0.001 * v;
 
 				/// Energy, internal representation in Joul
-				case Unit.kJ:       return 0.001 * v;           /// 1 kJ = 1000 J
-                case Unit.MJ:       return 0.000001 * v;        /// 1 kJ = 1000000 J
-                case Unit.Wh:       return v / 3600.0;          /// 1 Wh = 3600 J
-				case Unit.kWh:      return v / 3600000.0;       /// 1 kWh = 3600000 J
-                case Unit.MWh:      return v / 3600000000.0;    /// 1 MWh = 3600000000 J
+				case Unit.J:        return v;               /// 1 Joul
+				case Unit.kJ:       return 0.001 * v;       /// 1 kJ = 1000 J
+                case Unit.MJ:       return 0.000001 * v;    /// 1 kJ = 1000000 J
+                case Unit.Wh:       return v / 3600.0;      /// 1 Wh = 3600 J
+				case Unit.kWh:      return v / 3600000.0;   /// 1 kWh = 3600000 J
+                case Unit.MWh:      return v / 3600000000.0;/// 1 MWh = 3600000000 J
 
-                /// Electrical conductivity
-                case Unit.mSpm:     return 0.1 * v;
-
-                /// Invert pulses
                 case Unit.kWhpp:
                 case Unit.lpp:
                 case Unit.dm3pp:
                 case Unit.lpdeg:
-                case Unit.dm3pdeg:  return (v <= float.Epsilon) ? 0 : 1/v;
+                case Unit.dm3pdeg:  return ((v <= float.Epsilon) ? 0 : 1 / v);
 
-                default:            return v;                   /// Do not convert
+                default:            return v;
             }
         }
 
@@ -461,78 +427,72 @@ namespace Config
             switch (units)
             {
                 /// Volume: internal representation in l
-                case Unit.ml:       return 0.001 * v;           /// 0.001 l
-                case Unit.USgal:    return 3.78541178 * v;      /// 1 gal(US) = 3.78541178 l
-                case Unit.UKgal:    return 4.54609 * v;         /// 1 gal(UK) = 4.54609 l
-                case Unit.cf:       return 28.316846592 * v;    /// 1 cubic foot = 28.316846592 l
-                case Unit.m3:       return 1000 * v;            /// 1000 l
+                case Unit.dm3:
+                case Unit.l:        return v;               /// 1 liter
+                case Unit.m3:       return 1000 * v;        /// 1000 l
+                case Unit.gal_UK:   return 4.54609 * v;     /// 1 gal(UK) = 4.54609 l
+                case Unit.gal_US:   return 3.78541178 * v;  /// 1 gal(US) = 3.78541178 l
 
                 /// Flow: internal representation in m3/h
-                case Unit.lph:      return 0.001 * v;           /// 1 l/h
-                case Unit.cfph:     return 0.028316846592 * v;  /// 1 cf/h
-                case Unit.lpm:      return 0.06 * v;            /// 1 l/m
-                case Unit.USgalpm:  return 0.2271247068 * v;    /// 1 US gallon per minute
-                case Unit.lps:      return 3.6 * v;             /// 1 l/s
-                case Unit.USgalps:  return 13.627482408 * v;    /// 1 US gallon per second
-                case Unit.m3pm:     return 60 * v;              /// 1 m3/m
-                case Unit.cfs:      return 101.9406477312 * v;  /// 1 cubic foot per second
+                case Unit.lph:      return 0.001 * v;       /// 1 liter/h
+                case Unit.m3ph:     return v;               /// 1 m3/h = 1000 l/h
 
                 /// Mass: internal representation in kg
-                case Unit.g:        return 0.001 * v;           /// 1 g = 0.001 kg
-                case Unit.oz:       return 0.0283495231 * v;    /// 1 oz = 0.0283495231 kg
-                case Unit.lb:       return 0.45359237 * v;      /// 1 lb = 0.45359237 kg
-                case Unit.t:        return 1000 * v;            /// 1 t = 1000 kg
+                case Unit.g:        return 0.001 * v;       /// 1 g = 0.001 kg
+                case Unit.kg:       return v;               /// 1 kilogram
+                case Unit.t:        return 1000 * v;        /// 1 t = 1000 kg
+                case Unit.lb:       return 0.45359237 * v;  /// 1 lb = 0.45359237 kg
 
                 /// Time or duration: internal representation in seconds [s] 
-                case Unit.ms:       return 0.001 * v;
+                case Unit.s:        return v;
                 case Unit.min:      return 60 * v;
                 case Unit.hour:     return 3600 * v;
+                case Unit.ms:       return v / 1000;
 
 				/// Temperature: internal representation in °C
-                case Unit.F:        return 5 * (v - 32) / 9;    /// degree Fahrenheit
-                case Unit.K:        return v - 273.15;          /// degree Kelvin
+				case Unit.C:        return v;               /// degree Celsius (°C)
+                case Unit.F:        return 5 * (v-32) / 9;  /// degree Fahrenheit
+                case Unit.K:        return v - 273.15;      /// degree Kelvin
 
                 /// Pressure: internal representation in  bar = 0.1 MPa
-                case Unit.Pa:       return 0.00001 * v;         /// 1 hPa = 100 Pa
-                case Unit.hPa:      return 0.001 * v;           /// 1 hPa = 100 Pa
-                case Unit.mbar:     return 0.001 * v;           /// 1 mbar = 1 hPa = 100 Pa
-                case Unit.kPa:      return 0.01 * v;            /// 1 kPa = 10 HPa
-                case Unit.inHg:     return 0.033864 * v;        /// 1 inHg = 33.864 hPa
-                case Unit.psi:      return 0.0689475729 * v;    /// 1 psi = 0.0689475729 bar
-                case Unit.MPa:      return 10 * v;              /// 1 MPa = 10000 hPa
+                case Unit.Pa:       return 0.00001 * v;     /// 1 hPa = 100 Pa
+                case Unit.hPa:      return 0.001 * v;       /// 1 hPa = 100 Pa
+                case Unit.mbar:     return 0.001 * v;       /// 1 mbar = 1 hPa = 100 Pa
+                case Unit.kPa:      return 0.01 * v;        /// 1 kPa = 10 HPa
+                case Unit.inHg:     return 0.033864 * v;    /// 1 inHg = 33.864 hPa
+                case Unit.psi:      return 0.0689475729 * v;/// 1 psi = 0.0689475729 bar
+                case Unit.bar:      return v;               /// 1 bar = 1000 mbar = 100000 Pa
+                case Unit.MPa:      return 10 * v;          /// 1 MPa = 10000 hPa
 
-                /// Relative error: internal representation in %
-                case Unit.Promile:  return 0.1 * v;             /// 1 promile = 0.1 %
+                /// Error: internal representation in %
+                case Unit.Pct:      return v;               /// 1 %
+                case Unit.Promile:  return 0.1 * v;         /// 1 promile = 0.1 %
 
                 /// Diameter, length: internal representation in mm
-                case Unit.cm:       return 10 * v;              /// 1 cm = 10 mm
-                case Unit.inch:     return 25.4 * v;            /// 1 inch = 25.4 mm
-                case Unit.dm:       return 100 * v;             /// 1 dm = 100 mm
-                case Unit.foot:     return 304.8 * v;           /// 1 foot = 304.8 mm
-                case Unit.yard:     return 914.4 * v;           /// 1 yard = 914,4 mm
-                case Unit.m:        return 1000 * v;            /// 1 m = 1000 mm
+                case Unit.mm:       return v;               /// 1 mm
+                case Unit.cm:       return 10 * v;          /// 1 cm = 10 mm
+                case Unit.m:        return 1000 * v;        /// 1 m = 1000 mm
+                case Unit.inch:     return 25.4 * v;        /// 1 inch = 25.4 mm
 
 				/// Density: internal representation in kg/m3
+				case Unit.kgpm3:    return v;
 				case Unit.kgpl:     return 1000 * v;
 
 				/// Energy, internal representation in Joul
-				case Unit.kJ:		return 1000 * v;            /// 1 kJ = 1000 J
-                case Unit.MJ:       return 1000000 * v;         /// 1 kJ = 1000000 J
-                case Unit.Wh:       return 3600 * v;            /// 1 Wh = 3600 J
-				case Unit.kWh:		return 3600000 * v;         /// 1 kWh = 3600000 J
-                case Unit.MWh:      return 3600000000 * v;      /// 1 kWh = 3600000000 J
+				case Unit.J:		return v;               /// 1 Joul
+				case Unit.kJ:		return 1000 * v;        /// 1 kJ = 1000 J
+                case Unit.MJ:       return 1000000 * v;     /// 1 kJ = 1000000 J
+                case Unit.Wh:       return 3600 * v;        /// 1 Wh = 3600 J
+				case Unit.kWh:		return 3600000 * v;     /// 1 kWh = 3600000 J
+                case Unit.MWh:      return 3600000000 * v;  /// 1 kWh = 3600000000 J
 
-                /// Electrical conductivity
-                case Unit.mSpm:     return 10 * v;
-
-                /// Invert
                 case Unit.kWhpp:
                 case Unit.lpp:
                 case Unit.dm3pp:
                 case Unit.lpdeg:
-                case Unit.dm3pdeg:  return (v <= float.Epsilon) ? 0 : 1/v;
+                case Unit.dm3pdeg:  return ((v == 0) ? 0 : 1 / v);
 
-                default:            return v;                   /// Do not convert
+                default:            return v;
             }
         }
 	}

DataStreamInterface/Enums.cs

@@ -13,28 +13,22 @@ namespace DataStreamInterface
         degree,
 
         /// Volume
-        ml,         ///   1 ml = 0.001 l
-        l,          /// * 1 liter
+        ml,         ///   0.001 l
+        l,          /// * 1 liter = 1 l
         dm3,        ///   1 dm3 = 1 l
-        USgal,      ///   1 US gallon = 3.78541178 l
-        UKgal,      ///   1 imperial gallon = 4.54609 l
-        cf,         ///   1 cubic foot = 28.316846592 l
-        m3,         ///   1 m3 = 1000 l
+        m3,         ///   1000 l
+        gal_UK,     ///   1 gal(UK) = 4.54609 l
+        gal_US,     ///   1 gal(US) = 3.78541178 l
 
         /// Flow
-        lph,        ///   1 l/h = 0.001 m3/h
-        lpm,        ///   1 l/m = 60 l/h = 0.06 m3/h
-        m3ph,       /// * 1 m3/h
-        lps,        ///   1 liter/s = 3.6 m3/h
-        USgalps,    ///   1 US gallon per second = 13.627482408 m3/h
-        m3pm,       ///   1 m3/m = 60 m3/h
-        cfs,        ///   1 cubic foot per second = 101.9406477312 m3/h
+        lph,        ///   1 liter/h
+        m3ph,       /// * 1 m3/h = 1000 l/h
 
         /// Mass
         g,          ///   0.001 kg
-        lb,         ///   0.45359237 kg
         kg,         /// * 1 kilogram
         t,          ///   1000 kg
+        lb,         ///   0.45359237 kg
 
         /// Time
         ms,         ///   1 ms = 0.001 s
@@ -53,7 +47,6 @@ namespace DataStreamInterface
         mbar,       ///   1 mbar = 1 hPa = 100 Pa
         kPa,        ///   1 kPa = 10 HPa
         inHg,       ///   1 inHg = 33.864 hPa
-        psi,        ///   1 psi = 0.0689475729 bar
         bar,        /// * 1 Bar = 1000 mbar = 0.1 MPa = 100000 Pa
         MPa,        ///   1 MPa = 10000 hPa
 
@@ -68,9 +61,7 @@ namespace DataStreamInterface
         mm,         /// * 1 millimeter
         cm,         ///   1 cm = 10 mm
         inch,       ///   1 inch = 25.4 mm
-        dm,         ///   1 dm = 100 mm
         foot,       ///   1 foot = 304.8 mm
-        yard,       ///   1 yard = 914.4 mm
         m,          ///   1 m = 1000 mm
 
         /// Density
@@ -85,317 +76,20 @@ namespace DataStreamInterface
         kWh,		///   1 kWh = 3600000 J
         MWh,		///   1 MWh = 3600000000 J
 
-        /// Electrical conductivity
-        uSpcm,      /// * 1 uS/cm
-        mSpm,       ///   1 mS/m = 10 uS/cm
-
         /// Meter coefficient - volume
         ppl,		/// * 1 pulse/l
-        ppdm3,		///   1 pulse/dm3
-        degpl,		///   1 degree/l
-        degpdm3,	///   1 degree/dm3
-        lpp,		///   1 l/pulse
-        dm3pp,		///   1 dm3/pulse
-        lpdeg,		///   1 l/degree
-        dm3pdeg,	///   1 dm3/degree
+        ppdm3,		/// * 1 pulse/dm3
+        degpl,		/// * 1 degree/l
+        degpdm3,	/// * 1 degree/dm3
+        lpp,		/// * 1 l/pulse
+        dm3pp,		/// * 1 dm3/pulse
+        lpdeg,		/// * 1 l/degree
+        dm3pdeg,	/// * 1 dm3/degree
 
         /// Meter coefficient - energy
         ppkWh,		/// * 1 pulse/kWh
-        kWhpp,		///   1 kWh/pulse
+        kWhpp,		/// * 1 kWh/pulse
+
+        Count
     }
-
-    public enum Quantity
-    {
-        /// Quantities with units and conversions (double -> double)
-        Volume,
-        Flow,
-        Mass,
-        Time,
-        Temperature,
-        Pressure,
-        Humidity,
-        Error,
-        Length,
-        Density,
-        Energy,
-        Pulses,
-        PulsePerLtr,
-        PulsePerKWh,
-        Conductivity,
-
-        /// Quantities without units and conversions
-        Number,
-        String,
-        Boolean,
-        DateTime,
-        Enumerated,
-    }
-
-    public static class Units
-    {
-        public static bool IsDefaultUnit(Unit unit)
-        {
-            return unit == Unit.l || unit == Unit.m3ph || unit == Unit.kg || unit == Unit.s || unit == Unit.C ||
-                   unit == Unit.bar || unit == Unit.RPct || unit == Unit.Pct || unit == Unit.mm || unit == Unit.kgpm3 ||
-                   unit == Unit.J || unit == Unit.uSpcm || unit == Unit.ppl || unit == Unit.ppkWh;
-        }
-
-        public static Quantity GetQuantity(Unit units)
-        {
-            switch (units)
-            {
-                case Unit.pulse:
-                case Unit.degree:
-                    return Quantity.Pulses;
-
-                case Unit.ml:
-                case Unit.l:
-                case Unit.dm3:
-                case Unit.USgal:
-                case Unit.UKgal:
-                case Unit.cf:
-                case Unit.m3:
-                    return Quantity.Volume;
-
-                case Unit.lph:
-                case Unit.lpm:
-                case Unit.m3ph:
-                case Unit.lps:
-                case Unit.USgalps:
-                case Unit.m3pm:
-                case Unit.cfs:
-                    return Quantity.Flow;
-
-                case Unit.g:
-                case Unit.lb:
-                case Unit.kg:
-                case Unit.t:
-                    return Quantity.Mass;
-
-                case Unit.ms:
-                case Unit.s:
-                case Unit.min:
-                case Unit.hour:
-                    return Quantity.Time;
-
-                case Unit.C:
-                case Unit.F:
-                case Unit.K:
-                    return Quantity.Temperature;
-
-                case Unit.Pa:
-                case Unit.hPa:
-                case Unit.mbar:
-                case Unit.kPa:
-                case Unit.inHg:
-                case Unit.psi:
-                case Unit.bar:
-                case Unit.MPa:
-                    return Quantity.Pressure;
-
-                case Unit.RPct:
-                    return Quantity.Humidity;
-
-                case Unit.Promile:
-                case Unit.Pct:
-                    return Quantity.Error;
-
-                case Unit.mm:
-                case Unit.cm:
-                case Unit.inch:
-                case Unit.dm:
-                case Unit.foot:
-                case Unit.yard:
-                case Unit.m:
-                    return Quantity.Length;
-
-                case Unit.kgpm3:
-                case Unit.kgpl:
-                    return Quantity.Density;
-
-                case Unit.J:
-                case Unit.kJ:
-                case Unit.MJ:
-                case Unit.Wh:
-                case Unit.kWh:
-                case Unit.MWh:
-                    return Quantity.Energy;
-
-                case Unit.uSpcm:
-                case Unit.mSpm:
-                    return Quantity.Conductivity;
-
-                case Unit.ppl:
-                case Unit.ppdm3:
-                case Unit.degpl:
-                case Unit.degpdm3:
-                case Unit.lpp:
-                case Unit.dm3pp:
-                case Unit.lpdeg:
-                case Unit.dm3pdeg:
-                    return Quantity.PulsePerLtr;
-
-                case Unit.ppkWh:
-                case Unit.kWhpp:
-                    return Quantity.PulsePerKWh;
-
-                default:
-                    return Quantity.Number;
-            }
-        }
-
-        public static double ConvertTo(Unit units, double v)
-        {
-            switch (units)
-            {
-                /// Volume: internal representation in l
-                case Unit.ml:       return 1000 * v;            /// 1 l = 1000 ml
-                case Unit.USgal:    return 0.26417205 * v;      /// 1 gal(US) = 3.78541178 l
-                case Unit.UKgal:    return 0.21996925 * v;      /// 1 gal(UK) = 4.54609 l
-                case Unit.cf:       return 0.0353146667215 * v; /// 1 cubic foot = 28.316846592 l
-                case Unit.m3:       return 0.001 * v;           /// 1 m3 = 1000 l
-
-                /// Flow: internal representation in m3/h
-                case Unit.lph:      return 1000 * v;            /// 1 l/h
-                case Unit.lpm:      return v / 0.06;            /// 1 l/m
-                case Unit.lps:      return v / 3.6;             /// 1 l/s
-                case Unit.USgalps:  return 0.0733811257326 * v; /// 1 US gallon per second
-                case Unit.m3pm:     return v / 60;              /// 1 m3/m
-                case Unit.cfs:      return 0.009809629644858 * v; /// 1 cubic foot per second
-
-                /// Mass: internal representation in kg
-                case Unit.g:        return 1000 * v;            /// 1 g = 0.001 kg
-                case Unit.lb:       return 2.2046226 * v;       /// 1 lb = 0.45359237 kg
-                case Unit.t:        return 0.001 * v;           /// 1 t = 1000 kg
-
-                /// Time or duration: internal representation in seconds [s] 
-                case Unit.ms:       return 1000 * v;
-                case Unit.min:      return v / 60;
-                case Unit.hour:     return v / 3600;
-
-                /// Temperature: internal representation in °C
-                case Unit.F:        return 1.8 * v + 32;        /// degree Fahrenheit
-                case Unit.K:        return v + 273.15;          /// degree Kelvin
-
-                /// Pressure: internal representation in  bar = 0.1 MPa
-                case Unit.Pa:       return 100000 * v;
-                case Unit.hPa:      return 1000 * v;            /// 1 hPa = 100 Pa
-                case Unit.mbar:     return 1000 * v;            /// 1 mbar = 1 hPa = 100 Pa
-                case Unit.kPa:      return 100 * v;             /// 1 kPa = 10 HPa
-                case Unit.inHg:     return 29.53 * v;           /// 1 inHg =
-                case Unit.psi:      return 14.5037738 * v;      /// 1 psi =
-                case Unit.MPa:      return 0.1 * v;             /// 1 MPa = 10000 hPa
-
-                /// Relative error: internal representation in %
-                case Unit.Promile:  return 10 * v;              /// 1 promile = 0.1 %
-
-                /// Diameter, length: internal representation in mm
-                case Unit.cm:       return 0.1 * v;             /// 1 cm = 10 mm
-                case Unit.inch:     return v / 25.4;            /// 1 inch = 25.4 mm
-                case Unit.dm:       return 0.01 * v;            /// 1 dm = 100 mm
-                case Unit.foot:     return v / 304.8;           /// 1 foot = 304.8 mm
-                case Unit.yard:     return v / 914.4;           /// 1 yard = 914,4 mm
-                case Unit.m:        return 0.001 * v;           /// 1 m = 1000 mm
-
-                /// Density: internal representation in kg/m3
-                case Unit.kgpl:     return 0.001 * v;
-
-                /// Energy, internal representation in Joul
-                case Unit.kJ:       return 0.001 * v;           /// 1 kJ = 1000 J
-                case Unit.MJ:       return 0.000001 * v;        /// 1 kJ = 1000000 J
-                case Unit.Wh:       return v / 3600.0;          /// 1 Wh = 3600 J
-                case Unit.kWh:      return v / 3600000.0;       /// 1 kWh = 3600000 J
-                case Unit.MWh:      return v / 3600000000.0;    /// 1 MWh = 3600000000 J
-
-                /// Electrical conductivity
-                case Unit.mSpm:     return 0.1 * v;
-
-                /// Invert pulses
-                case Unit.kWhpp:
-                case Unit.lpp:
-                case Unit.dm3pp:
-                case Unit.lpdeg:
-                case Unit.dm3pdeg:  return (v <= float.Epsilon) ? 0 : 1/v;
-
-                default:            return v;                   /// Do not convert
-            }
-        }
-
-        public static double ConvertFrom(Unit units, double v)
-        {
-            switch (units)
-            {
-                /// Volume: internal representation in l
-                case Unit.ml:       return 0.001 * v;           /// 0.001 l
-                case Unit.USgal:    return 3.78541178 * v;      /// 1 gal(US) = 3.78541178 l
-                case Unit.UKgal:    return 4.54609 * v;         /// 1 gal(UK) = 4.54609 l
-                case Unit.cf:       return 28.316846592 * v;    /// 1 cubic foot = 28.316846592 l
-                case Unit.m3:       return 1000 * v;            /// 1000 l
-
-                /// Flow: internal representation in m3/h
-                case Unit.lph:      return 0.001 * v;           /// 1 l/h
-                case Unit.lpm:      return 0.06 * v;            /// 1 l/m
-                case Unit.lps:      return 3.6 * v;             /// 1 l/s
-                case Unit.USgalps:  return 13.627482408 * v;    /// 1 US gallon per second
-                case Unit.m3pm:     return 60 * v;              /// 1 m3/m
-                case Unit.cfs:      return 101.9406477312 * v;  /// 1 cubic foot per second
-
-                /// Mass: internal representation in kg
-                case Unit.g:        return 0.001 * v;           /// 1 g = 0.001 kg
-                case Unit.lb:       return 0.45359237 * v;      /// 1 lb = 0.45359237 kg
-                case Unit.t:        return 1000 * v;            /// 1 t = 1000 kg
-
-                /// Time or duration: internal representation in seconds [s] 
-                case Unit.ms:       return 0.001 * v;
-                case Unit.min:      return 60 * v;
-                case Unit.hour:     return 3600 * v;
-
-                /// Temperature: internal representation in °C
-                case Unit.F:        return 5 * (v - 32) / 9;    /// degree Fahrenheit
-                case Unit.K:        return v - 273.15;          /// degree Kelvin
-
-                /// Pressure: internal representation in  bar = 0.1 MPa
-                case Unit.Pa:       return 0.00001 * v;         /// 1 hPa = 100 Pa
-                case Unit.hPa:      return 0.001 * v;           /// 1 hPa = 100 Pa
-                case Unit.mbar:     return 0.001 * v;           /// 1 mbar = 1 hPa = 100 Pa
-                case Unit.kPa:      return 0.01 * v;            /// 1 kPa = 10 HPa
-                case Unit.inHg:     return 0.033864 * v;        /// 1 inHg = 33.864 hPa
-                case Unit.psi:      return 0.0689475729 * v;    /// 1 psi = 0.0689475729 bar
-                case Unit.MPa:      return 10 * v;              /// 1 MPa = 10000 hPa
-
-                /// Relative error: internal representation in %
-                case Unit.Promile:  return 0.1 * v;             /// 1 promile = 0.1 %
-
-                /// Diameter, length: internal representation in mm
-                case Unit.cm:       return 10 * v;              /// 1 cm = 10 mm
-                case Unit.inch:     return 25.4 * v;            /// 1 inch = 25.4 mm
-                case Unit.dm:       return 100 * v;             /// 1 dm = 100 mm
-                case Unit.foot:     return 304.8 * v;           /// 1 foot = 304.8 mm
-                case Unit.yard:     return 914.4 * v;           /// 1 yard = 914,4 mm
-                case Unit.m:        return 1000 * v;            /// 1 m = 1000 mm
-
-                /// Density: internal representation in kg/m3
-                case Unit.kgpl:     return 1000 * v;
-
-                /// Energy, internal representation in Joul
-                case Unit.kJ:       return 1000 * v;            /// 1 kJ = 1000 J
-                case Unit.MJ:       return 1000000 * v;         /// 1 kJ = 1000000 J
-                case Unit.Wh:       return 3600 * v;            /// 1 Wh = 3600 J
-                case Unit.kWh:      return 3600000 * v;         /// 1 kWh = 3600000 J
-                case Unit.MWh:      return 3600000000 * v;      /// 1 kWh = 3600000000 J
-
-                /// Electrical conductivity
-                case Unit.mSpm:     return 10 * v;
-
-                /// Invert
-                case Unit.kWhpp:
-                case Unit.lpp:
-                case Unit.dm3pp:
-                case Unit.lpdeg:
-                case Unit.dm3pdeg:  return (v <= float.Epsilon) ? 0 : 1/v;
-
-                default:            return v;                   /// Do not convert
-            }
-        }
-	}
 }

DeviceTest/DeviceTest.csproj

@@ -94,10 +94,6 @@
       <Project>{743DF7DB-C7B6-42EB-986D-0F485E5588E4}</Project>
       <Name>Config</Name>
     </ProjectReference>
-    <ProjectReference Include="..\SchematicDrawing\SchematicDrawing.csproj">
-      <Project>{0f79ca69-9dbc-41f3-a6fc-5a2937365343}</Project>
-      <Name>SchematicDrawing</Name>
-    </ProjectReference>
     <ProjectReference Include="..\TBF\TBF.csproj">
       <Project>{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}</Project>
       <Name>TBF</Name>

DeviceTest/DeviceTestDlg.cs

@@ -5,10 +5,9 @@ using System.IO;
 using System.Text;
 using System.Threading;
 using System.Windows.Forms;
+using TBF.BenchControl;
+using TBF.BenchControl.Generic;
 using System.Xml.Serialization;
-using TBF.Rig;
-using TBF.Rig.Generic;
-using TBF.UI.Bench.Components;
 
 
 namespace DeviceTest
@@ -80,7 +79,7 @@ namespace DeviceTest
                 compClasses.Add(componentFactory.ClassName);
             }
 
-			tbfComponents = new List<TBF.Rig.Generic.IComponent>();
+			tbfComponents = new List<TBF.BenchControl.Generic.IComponent>();
 			tbfDevices = new List<IDevice>();
 		}
 
@@ -422,13 +421,13 @@ namespace DeviceTest
 			{
 				parentCfg = parentFactory.DefaultConfig();
 			}
-            ComponentParametersDlg cfgForm = new ComponentParametersDlg();
-            cfgForm.CmpntEntities = new List<Config.Entities.Component>();
-
-            IComponentCfgCtrl cfgControl = parentCfg.GetControl(cfgForm.CmpntEntities);
+			IComponentCfgCtrl cfgControl = parentCfg.GetControl();
 			cfgControl.Config = parentCfg;
 			cfgControl.Config.ItemNr = 0;
 
+			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+			cfgForm.TbfComponents = new List<Config.Entities.Component>();
+
 			cfgForm.ComponentCfgCtrl = cfgControl;
 			cfgForm.UnlockAfterStart = true;
 			DialogResult dr = cfgForm.ShowDialog();
@@ -451,17 +450,17 @@ namespace DeviceTest
 			{
 				component1Cfg = component1Factory.DefaultConfig();
 			}
+			IComponentCfgCtrl cfgControl = component1Cfg.GetControl();
+			cfgControl.Config = component1Cfg;
+			cfgControl.Config.ItemNr = 1;
+
 			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
 			///
-			var compEntities = new List<Config.Entities.Component>();
+			IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
-			cfgForm.CmpntEntities = compEntities;
+			cfgForm.TbfComponents = compEntities;
 
-            IComponentCfgCtrl cfgControl = component1Cfg.GetControl(compEntities);
-            cfgControl.Config = component1Cfg;
-            cfgControl.Config.ItemNr = 1;
-
-            cfgForm.ComponentCfgCtrl = cfgControl;
+			cfgForm.ComponentCfgCtrl = cfgControl;
 			cfgForm.UnlockAfterStart = true;
 			DialogResult dr = cfgForm.ShowDialog();
 			if (dr != DialogResult.OK) return;
@@ -485,18 +484,18 @@ namespace DeviceTest
 			{
 				component2Cfg = component2Factory.DefaultConfig();
 			}
+			IComponentCfgCtrl cfgControl = component2Cfg.GetControl();
+			cfgControl.Config = component2Cfg;
+			cfgControl.Config.ItemNr = 1;
+
 			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
 			///
-			var compEntities = new List<Config.Entities.Component>();
+			IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
 			if (component1Factory != null && component1Cfg != null) compEntities.Add(component1Cfg.CreateDbEntity());
-			cfgForm.CmpntEntities = compEntities;
+			cfgForm.TbfComponents = compEntities;
 
-            IComponentCfgCtrl cfgControl = component2Cfg.GetControl(compEntities);
-            cfgControl.Config = component2Cfg;
-            cfgControl.Config.ItemNr = 1;
-
-            cfgForm.ComponentCfgCtrl = cfgControl;
+			cfgForm.ComponentCfgCtrl = cfgControl;
 			cfgForm.UnlockAfterStart = true;
 			DialogResult dr = cfgForm.ShowDialog();
 			if (dr != DialogResult.OK) return;
@@ -520,19 +519,19 @@ namespace DeviceTest
 			{
 				component3Cfg = component3Factory.DefaultConfig();
 			}
+			IComponentCfgCtrl cfgControl = component3Cfg.GetControl();
+			cfgControl.Config = component3Cfg;
+			cfgControl.Config.ItemNr = 1;
+
 			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
 			///
-			var compEntities = new List<Config.Entities.Component>();
+			IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
 			if (component1Factory != null && component1Cfg != null) compEntities.Add(component1Cfg.CreateDbEntity());
 			if (component2Factory != null && component2Cfg != null) compEntities.Add(component2Cfg.CreateDbEntity());
-			cfgForm.CmpntEntities = compEntities;
+			cfgForm.TbfComponents = compEntities;
 
-            IComponentCfgCtrl cfgControl = component3Cfg.GetControl(compEntities);
-            cfgControl.Config = component3Cfg;
-            cfgControl.Config.ItemNr = 1;
-
-            cfgForm.ComponentCfgCtrl = cfgControl;
+			cfgForm.ComponentCfgCtrl = cfgControl;
 			cfgForm.UnlockAfterStart = true;
 			DialogResult dr = cfgForm.ShowDialog();
 			if (dr != DialogResult.OK) return;
@@ -569,7 +568,7 @@ namespace DeviceTest
 			{
 				if (parentFactory != null && parentCfg != null)
 				{
-					TBF.Rig.Generic.IComponent component = parentFactory.GetComponent(parentCfg, tbfComponents);
+					TBF.BenchControl.Generic.IComponent component = parentFactory.GetComponent(parentCfg, tbfComponents);
 					tbfComponents.Add(component);
 					IDevice dev = component as IDevice;
 					if (dev != null)
@@ -581,7 +580,7 @@ namespace DeviceTest
 				}
 				if (component1Factory != null && component1Cfg != null)
 				{
-					TBF.Rig.Generic.IComponent component = component1Factory.GetComponent(component1Cfg, tbfComponents);
+					TBF.BenchControl.Generic.IComponent component = component1Factory.GetComponent(component1Cfg, tbfComponents);
 					tbfComponents.Add(component);
 					tbfComponent1forOp = component;
 					IDevice dev = component as IDevice;
@@ -594,7 +593,7 @@ namespace DeviceTest
 				}
 				if (component2Factory != null && component2Cfg != null)
 				{
-					TBF.Rig.Generic.IComponent component2 = component2Factory.GetComponent(component2Cfg, tbfComponents);
+					TBF.BenchControl.Generic.IComponent component2 = component2Factory.GetComponent(component2Cfg, tbfComponents);
 					tbfComponents.Add(component2);
 					tbfComponent2forOp = component2;
 					IDevice dev = component2 as IDevice;
@@ -607,7 +606,7 @@ namespace DeviceTest
 				}
 				if (component3Factory != null && component3Cfg != null)
 				{
-					TBF.Rig.Generic.IComponent component3 = component3Factory.GetComponent(component3Cfg, tbfComponents);
+					TBF.BenchControl.Generic.IComponent component3 = component3Factory.GetComponent(component3Cfg, tbfComponents);
 					tbfComponents.Add(component3);
 					tbfComponent3forOp = component3;
 					IDevice dev = component3 as IDevice;
@@ -646,7 +645,6 @@ namespace DeviceTest
 								MessageBoxIcon.Exclamation);
 
 				foreach (var dev in tbfDevices) dev.StopDevice();
-                foreach (var dev in tbfDevices) dev.StopDevice2();
 				tbfDevices.Clear();
 
 				startButton.Enabled = true;
@@ -664,120 +662,120 @@ namespace DeviceTest
 			int previousOperation = 0;
 
 
-            if (tbfComponent1forOp is TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter)
+			if (tbfComponent1forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
 			{
-                operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref dblBox1);
+				operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
 			}
-			else if (tbfComponent1forOp is TBF.Rig.Network.Camera.CLP1611.Camera)
+			else if (tbfComponent1forOp is TBF.BenchControl.Network.Camera.CLP1611.Camera)
 			{
-				operation1 = (tbfComponent1forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
-				operation2 = (tbfComponent1forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
+				operation1 = (tbfComponent1forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
+				operation2 = (tbfComponent1forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
 			}
-			else if (tbfComponent1forOp is TBF.Rig.Network.Camera.Roi.Roi)
+			else if (tbfComponent1forOp is TBF.BenchControl.Network.Camera.Roi.Roi)
 			{
-				operation1 = (tbfComponent1forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
+				operation1 = (tbfComponent1forOp as TBF.BenchControl.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent1forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
+			else if (tbfComponent1forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
 			{
-				operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation2 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
-            else if (tbfComponent1forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
+            else if (tbfComponent1forOp is TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
-                operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
-                operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
+                operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
+                operation2 = (tbfComponent1forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
             }
-            else if (tbfComponent1forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent1forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
 			{
-				//operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(1);
-				//operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(2);
-				//operation3 = (tbfComponent1forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(3);
-				//operation4 = (tbfComponent1forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(0);
+				//operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(1);
+				//operation2 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(2);
+				//operation3 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(3);
+				//operation4 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(0);
 			}
-            else if (tbfComponent3forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
             {
-                operation1 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
-                operation2 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
-                operation3 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
-                operation4 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
+                operation1 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
+                operation2 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
+                operation3 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
+                operation4 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
             }
 
 
-            if (tbfComponent2forOp is TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter)
+			if (tbfComponent2forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
 			{
-                operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref dblBox2);
+				operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
 			}
-			else if (tbfComponent2forOp is TBF.Rig.Network.Camera.CLP1611.Camera)
+			else if (tbfComponent2forOp is TBF.BenchControl.Network.Camera.CLP1611.Camera)
 			{
-				operation21 = (tbfComponent2forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
-				operation22 = (tbfComponent2forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
+				operation21 = (tbfComponent2forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
+				operation22 = (tbfComponent2forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
 			}
-			else if (tbfComponent2forOp is TBF.Rig.Network.Camera.Roi.Roi)
+			else if (tbfComponent2forOp is TBF.BenchControl.Network.Camera.Roi.Roi)
 			{
-				operation21 = (tbfComponent2forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
+				operation21 = (tbfComponent2forOp as TBF.BenchControl.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent2forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
+			else if (tbfComponent2forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
 			{
-				operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation22 = (tbfComponent2forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
-            else if (tbfComponent2forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
+            else if (tbfComponent2forOp is TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
-                operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
-                operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
+                operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
+                operation22 = (tbfComponent2forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
             }
-            else if (tbfComponent2forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent2forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
 			{
-				//operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(1);
-                //operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(2);
-                //operation23 = (tbfComponent2forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(3);
-                //operation24 = (tbfComponent2forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(0);
+				//operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(1);
+                //operation22 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(2);
+                //operation23 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(3);
+                //operation24 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(0);
 			}
-            else if (tbfComponent3forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
             {
-                operation21 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
-                operation22 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
-                operation23 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
-                operation24 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
+                operation21 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
+                operation22 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
+                operation23 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
+                operation24 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
             }
 
 
-            if (tbfComponent3forOp is TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter)
+			if (tbfComponent3forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
 			{
-                operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref dblBox3);
+				operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
 			}
-			else if (tbfComponent3forOp is TBF.Rig.Network.Camera.CLP1611.Camera)
+			else if (tbfComponent3forOp is TBF.BenchControl.Network.Camera.CLP1611.Camera)
 			{
-				operation31 = (tbfComponent3forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
-				operation33 = (tbfComponent3forOp as TBF.Rig.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
+				operation31 = (tbfComponent3forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
+				operation33 = (tbfComponent3forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
 			}
-			else if (tbfComponent3forOp is TBF.Rig.Network.Camera.Roi.Roi)
+			else if (tbfComponent3forOp is TBF.BenchControl.Network.Camera.Roi.Roi)
 			{
-				operation31 = (tbfComponent3forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
+				operation31 = (tbfComponent3forOp as TBF.BenchControl.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent3forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
+			else if (tbfComponent3forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
 			{
-				operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
-            else if (tbfComponent3forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
+            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
-                operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
-                operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
+                operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
+                operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
             }
-            else if (tbfComponent3forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
 			{
-				//operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(1);
-				//operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(2);
-				//operation33 = (tbfComponent3forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(3);
-				//operation34 = (tbfComponent3forOp as TBF.Rig.Modbus.TankSelector.TankSelector).SelectTankOp(0);
+				//operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(1);
+				//operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(2);
+				//operation33 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(3);
+				//operation34 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(0);
 			}
-            else if (tbfComponent3forOp is TBF.Rig.Modbus.TankSelector.TankSelector)
+            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
             {
-                operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
-                operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
-                operation33 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
-                operation34 = (tbfComponent3forOp as TBF.Rig.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
+                operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
+                operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
+                operation33 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
+                operation34 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
             }
 
 
@@ -858,7 +856,6 @@ namespace DeviceTest
 			}
 
 			foreach (var d in tbfDevices) d.StopDevice();
-            foreach (var d in tbfDevices) d.StopDevice2();
 		}
 
 		private void stopButton_Click(object sender, EventArgs e)

Dirichlet.Numerics/UInt128.cs

@@ -183,7 +183,7 @@ namespace Dirichlet.Numerics
 
         public override string ToString()
         {
-            return ((BigInteger)this).ToString("x");
+            return ((BigInteger)this).ToString();
         }
 
         public string ToString(string format)

EventViewer/EventViewer.csproj

@@ -13,7 +13,7 @@
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -21,7 +21,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

EventViewer/LocalSettings.cs

@@ -147,7 +147,7 @@ namespace EventViewer
                     }
                 }
             }
-            catch (Exception)
+            catch (Exception e)
             {
                 //log.ErrorFormat("Failed to load from '{0}': {1}", fileName, e.Message);
                 return null;
@@ -203,7 +203,7 @@ namespace EventViewer
                 }
 #endif
             }
-            catch (Exception)
+            catch (Exception e)
             {
                 //log.ErrorFormat("Failed to save to '{0}': {1}", Program.LocalSettingsFileName, e.Message);
             }

EventViewer/Program.cs

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

GraphLib/DataSource.cs

@@ -193,7 +193,7 @@ namespace GraphLib
 				Samples = newSamples;
 				return samplesCount;
 			}
-			catch (Exception)
+			catch (Exception exc)
 			{
 				return 0;
 			}

MergeResultsDBs/App.config

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

MergeResultsDBs/MergeResultsDBs.csproj

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

MergeResultsDBs/Program.cs

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

MergeResultsDBs/Properties/AssemblyInfo.cs

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

ResetBatchNr/ResetBatchNr.csproj

@@ -13,7 +13,7 @@
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -21,7 +21,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

RestClient/BaseClient.cs

@@ -11,10 +11,13 @@ 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)

Results/BatchResults.cs

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

Results/Entities/Batch.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2020 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -26,10 +26,11 @@ namespace Results.Entities
 		public virtual string ProcedureDescription { get; set; }	/// CEVAK, not mapped to DB
 		public virtual int ProcedureRevision { get; set; }
 		public virtual string WatermetersStr { get; set; }			/// CEVAK, not mapped to DB
+		public virtual string ProtocolTitle { get; set; }
         public virtual string Remark { get; set; }
-        public virtual double SampleDensity { get; set; }			/// Sample denisty in [kg/m3]
-        public virtual double SampleTemp { get; set; }              /// Sample temperature when density measured [°C]
-		public virtual double Buoyancy { get; set; }
+        public virtual float DensityCorr { get; set; }				/// Density correction in [kg/m3]
+		public virtual float Custom2 { get; set; }
+		public virtual float Custom3 { get; set; }
         public virtual int Counter6 { get; set; }
         public virtual int Counter7 { get; set; }
         public virtual int Counter8 { get; set; }
@@ -40,11 +41,11 @@ namespace Results.Entities
         public virtual bool Dirty { get; set; }
         public virtual bool RsltsSent { get; set; }
 		public virtual bool RsltsPrinted { get; set; }
-        public virtual bool Compound { get; set; }					/// Not mapped to DB now
-        public virtual bool HeatMeter { get; set; }					/// Not mapped to DB now
-        public virtual IList<TestData> Tests { get; set; }
+		public virtual IList<TestData> Tests { get; set; }
 		public virtual IList<WaterMeter> WaterMeters { get; set; }
 		public virtual IList<TestRslt> TestRslts { get; set; }
+		public virtual bool Compound { get; set; }					/// Not mapped to DB now
+        public virtual bool HeatMeter { get; set; }					/// Not mapped to DB now
 
         public virtual IList<TestData> RegularTests()
         {
@@ -113,56 +114,11 @@ namespace Results.Entities
             IsRemoteProcedure = false;
             ProcedureDescription = string.Empty;
             WatermetersStr = string.Empty;
+            ProtocolTitle = string.Empty;
+            ProtocolTitle = string.Empty;
             Remark = string.Empty;
-            SampleDensity = Config.Data.SampleDensity;
-            SampleTemp = Config.Data.SampleTemp;
-            Buoyancy = Config.Data.Buoyancy;
 		}
 
-        /// <summary>
-        /// Copy constructor, copies all except of Id.
-        /// Lists Tests, WaterMeters and TestRslts are empty. Have to be copied elwhere.
-        /// </summary>
-        public Batch(Batch oriBatch)
-        {
-            BatchNr              = oriBatch.BatchNr;
-            ProgramVersion       = oriBatch.ProgramVersion;
-            TestBenchId          = oriBatch.TestBenchId;
-            TestBenchName        = oriBatch.TestBenchName;
-            Address1             = oriBatch.Address1;
-            Address2             = oriBatch.Address2;
-            Address3             = oriBatch.Address3;
-            Address4             = oriBatch.Address4;
-            Address5             = oriBatch.Address5;
-            UserName             = oriBatch.UserName;
-            UserNumber           = oriBatch.UserNumber;
-            ProcedureName        = oriBatch.ProcedureName;
-            IsRemoteProcedure    = oriBatch.IsRemoteProcedure;
-            ProcedureDescription = oriBatch.ProcedureDescription;
-            ProcedureRevision    = oriBatch.ProcedureRevision;
-            WatermetersStr       = oriBatch.WatermetersStr;
-            Remark               = oriBatch.Remark;
-            SampleDensity        = oriBatch.SampleDensity;
-            SampleTemp           = oriBatch.SampleTemp;
-            Buoyancy             = oriBatch.Buoyancy;
-            Counter6             = oriBatch.Counter6;
-            Counter7             = oriBatch.Counter7;
-            Counter8             = oriBatch.Counter8;
-            Counter9             = oriBatch.Counter9;
-            Counter10            = oriBatch.Counter10;
-            StartTime            = oriBatch.StartTime;
-            EndTime              = oriBatch.EndTime;
-            Dirty                = oriBatch.Dirty;
-            RsltsSent            = oriBatch.RsltsSent;
-            RsltsPrinted         = oriBatch.RsltsPrinted;
-            Compound             = oriBatch.Compound;
-            HeatMeter            = oriBatch.HeatMeter;
-
-            Tests       = new List<TestData>();
-            WaterMeters = new List<WaterMeter>();
-            TestRslts   = new List<TestRslt>();
-        }
-
         public virtual int PassedMetersCount()
         {
             int count = 0;
@@ -307,6 +263,24 @@ namespace Results.Entities
             return 0;
         }
 
+        public virtual double Buoyancy()
+        {
+            double timeSum = 0;
+            double sum = 0;
+
+            foreach (var tr in TestRslts)
+            {
+                if (tr.TestData.Evaluate && tr.TestDone)
+                {
+                    double duration = (tr.EndTime - tr.StartTime).TotalSeconds;
+                    timeSum += duration;
+                    sum += (tr.Buoyancy * duration);
+                }
+            }
+
+            return (timeSum == 0) ? 0 : (sum / timeSum);
+        }
+
 		public virtual TestRslt GetTestRslt(string name, int part)
 		{
 			foreach (var tr in TestRslts)
@@ -323,10 +297,11 @@ namespace Results.Entities
 
 		public virtual string ToString(int i)
 		{
-            return string.Format("Batch: BatchNr={0} ProgramVersion={1} TestBenchId={2} UserName={3} UserNumber={4} ProcedureName={5}{6} ProcRev={7} Remark={8} RealDensity={9} AtTemperature={10} Buoyancy={11} StartTime={12} EndTime={13} Dirty={14} RsltsSent={15} RsltsPrinted={16}",
+            return string.Format("Batch: BatchNr={0} ProgramVersion={1} TestBenchId={2} UserName={3} UserNumber={4} ProcedureName={5}{6} ProcRev={7} ProtocolTitle={8} Remark={9} DensityCorr={10} Custom2={11} Custom3={12} StartTime={13} EndTime={14} Dirty={15} RsltsSent={16} RsltsPrinted={17}",
                                 BatchNr, ProgramVersion, TestBenchId, UserName, UserNumber,
 								ProcedureName, (IsRemoteProcedure ? "(R)" : ""), ProcedureRevision,
-                                Remark, SampleDensity, SampleTemp, Buoyancy, StartTime, EndTime, Dirty, RsltsSent, RsltsPrinted);
+                                ProtocolTitle, Remark, DensityCorr, Custom2, Custom3,
+                                StartTime, EndTime, Dirty, RsltsSent, RsltsPrinted);
 		}
 
         public virtual void WriteBinary(BinaryWriter writer)
@@ -348,10 +323,11 @@ namespace Results.Entities
             writer.Write((ProcedureDescription != null) ? ProcedureDescription : string.Empty);
             writer.Write(ProcedureRevision);
             writer.Write((WatermetersStr != null) ? WatermetersStr : string.Empty);
+            writer.Write((ProtocolTitle != null) ? ProtocolTitle : string.Empty);
             writer.Write((Remark != null) ? Remark : string.Empty);
-            writer.Write(SampleDensity);
-            writer.Write(SampleTemp);
-            writer.Write(Buoyancy);
+            writer.Write(DensityCorr);
+            writer.Write(Custom2);
+            writer.Write(Custom3);
             writer.Write(Counter6);
             writer.Write(Counter7);
             writer.Write(Counter8);
@@ -414,10 +390,11 @@ namespace Results.Entities
             ProcedureDescription = reader.ReadString();
             ProcedureRevision = reader.ReadInt32();
             WatermetersStr = reader.ReadString();
+            ProtocolTitle = reader.ReadString();
             Remark = reader.ReadString();
-            SampleDensity = reader.ReadDouble();
-            SampleTemp = reader.ReadDouble();
-            Buoyancy = reader.ReadDouble();
+            DensityCorr = reader.ReadInt32();
+            Custom2 = reader.ReadInt32();
+            Custom3 = reader.ReadInt32();
             Counter6 = reader.ReadInt32();
             Counter7 = reader.ReadInt32();
             Counter8 = reader.ReadInt32();

Results/Entities/Components.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2016-2020 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -22,55 +22,35 @@ namespace Results.Entities
 		public virtual string Custom2 { get; set; }
 		public virtual string Custom3 { get; set; }
 
-        /// <summary>
-        /// Default constructor, safe values
-        /// </summary>
 		public Components()
 		{
 			TestBenchId   = 0;
 			TestBenchName = string.Empty;
-			Pump          = string.Empty;
-			RegValve      = string.Empty;
-			Flowmeter     = string.Empty;
-			Diverter      = string.Empty;
-			Scale         = string.Empty;
-			Custom1       = string.Empty;
-			Custom2       = string.Empty;
-			Custom3       = string.Empty;
+			Pump      = string.Empty;
+			RegValve  = string.Empty;
+			Flowmeter = string.Empty;
+			Diverter  = string.Empty;
+			Scale     = string.Empty;
+			Custom1   = string.Empty;
+			Custom2   = string.Empty;
+			Custom3   = string.Empty;
 		}
 
 		public Components(int benchId, string benchName, string pump, string flowmeter,
-						  string scale, string regValve, string diverter)
+							   string scale, string regValve, string diverter)
 		{
-			TestBenchId   = benchId;
+			TestBenchId = benchId;
 			TestBenchName = benchName;
-			Pump          = pump;
-			RegValve      = regValve;
-			Flowmeter     = flowmeter;
-			Diverter      = diverter;
-			Scale         = scale;
-			Custom1       = string.Empty;
-			Custom2       = string.Empty;
-			Custom3       = string.Empty;
+			Pump = pump;
+			RegValve = regValve;
+			Flowmeter = flowmeter;
+			Diverter = diverter;
+			Scale = scale;
+			Custom1 = string.Empty;
+			Custom2 = string.Empty;
+			Custom3 = string.Empty;
 		}
 
-        /// <summary>
-        /// Copy constructor, copies all except of Id
-        /// </summary>
-        public Components(Components oriComponents)
-        {
-            TestBenchId   = oriComponents.TestBenchId;
-            TestBenchName = oriComponents.TestBenchName;
-            Pump          = oriComponents.Pump;
-            RegValve      = oriComponents.RegValve;
-            Flowmeter     = oriComponents.Flowmeter;
-            Diverter      = oriComponents.Diverter;
-            Scale         = oriComponents.Scale;
-            Custom1       = oriComponents.Custom1;
-            Custom2       = oriComponents.Custom2;
-            Custom3       = oriComponents.Custom3;
-        }
-
 
 		/// <summary>
 		/// Method to compare the content of two entities

Results/Entities/MeterTestRslt.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -12,6 +12,7 @@ namespace Results.Entities
         public virtual int    Id { get; protected set; }
 		public virtual byte   CompoundMeterId { get; set; }		/// 0=single, 1=compound/main, 2=compound/aux., 3=compound/overal, 4=heat meter volume, 5=heat meter energy
         public virtual int    RegReaderType   { get; set; }     /// Not mapped to the DB, does not depend on localization and customer
+                                                                
 		public virtual double PulsesMeter     { get; set; }		/// # of water meter or heat meter pulses
 		public virtual double PulsesMaster	  { get; set; }		/// # of reference flowmeter pulses (gated by this water meter pulses)
         public virtual double PulsesPerLiter  { get; set; }		/// [l ^ -1], in case of heat meters (CompoundMeterId==5) pulses per kWh in [kWh ^ -1]
@@ -113,40 +114,29 @@ namespace Results.Entities
 			CompoundMeterId = (byte)compoundMeterId;
 		}
 
-        /// <summary>
-        /// Copy constructor, copies all except of Id
-        /// TestRslt and WaterMeter references arenot set.
-        /// They have to be copied/ser manually.
-        /// </summary>
-        public MeterTestRslt(MeterTestRslt oriMTR)
-        {
-            CopyContentFrom(oriMTR);
-        }
-
         public virtual void CopyContentFrom(MeterTestRslt src)
         {
             if (src == null) return;
 
             CompoundMeterId = src.CompoundMeterId;
-            RegReaderType   = src.RegReaderType;
-		    PulsesMeter     = src.PulsesMeter;
-		    PulsesMaster    = src.PulsesMaster;
-            PulsesPerLiter  = src.PulsesPerLiter;
-            VolumeStart     = src.VolumeStart;
-            VolumeEnd       = src.VolumeEnd;
-            VolumeMeter     = src.VolumeMeter;
-            VolumeRef       = src.VolumeRef;
-		    TimestampStart  = src.TimestampStart;
-		    TimestampEnd    = src.TimestampEnd;
-		    TestTime        = src.TestTime;
-		    Error           = src.Error;
+            RegReaderType = src.RegReaderType;
+		    PulsesMeter = src.PulsesMeter;
+		    PulsesMaster = src.PulsesMaster;
+            PulsesPerLiter = src.PulsesPerLiter;
+            VolumeStart = src.VolumeStart;
+            VolumeEnd = src.VolumeEnd;
+            VolumeMeter = src.VolumeMeter;
+            VolumeRef = src.VolumeRef;
+		    TimestampStart = src.TimestampStart;
+		    TimestampEnd = src.TimestampEnd;
+		    TestTime = src.TestTime;
+		    Error = src.Error;
             ErrorIndicators = src.ErrorIndicators;
-            InfoIndicators  = src.InfoIndicators;
-            KorrErrQ        = src.KorrErrQ;
-		    TestDone        = src.TestDone;
-            Passed          = src.Passed;
+            KorrErrQ = src.KorrErrQ;
+		    TestDone = src.TestDone;
+            Passed = src.Passed;
 #if ORACLE_DB
-            LastError       = src.LastError;
+            LastError = src.LastError;
 #endif
         }
 
@@ -180,7 +170,7 @@ namespace Results.Entities
             writer.Write(LastError);
 #endif
             writer.Write((TestRslt != null && TestRslt.Name() != null) ? TestRslt.Name() : string.Empty);
-            writer.Write(TestRslt != null ? TestRslt.Part : 0);
+            writer.Write(TestRslt.Part);
         }
 
         public virtual void ReadBinary(BinaryReader reader, IList<TestRslt> testResults)

Results/Entities/TestData.cs

@@ -1,11 +1,10 @@
 ///
-/// Copyright (c) 2016-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2016-2020 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.IO;
-using Config.Entities;
 
 namespace Results.Entities
 {
@@ -33,59 +32,33 @@ namespace Results.Entities
 		public virtual bool   Evaluate				{ get; set; }
 
 
-        /// <summary>
-        /// Default constructor, safe values
-        /// </summary>
-        public TestData()
+		public TestData()
         {
 			Name = string.Empty;
 			Method = string.Empty;
 		}
 
-		public TestData(Test test)
+		public TestData(Config.Entities.Test test)
 			: this()
 		{
-			Name               =         test.Name;
-			Repeats            =         test.Repeats;
-            Qtg                = (double)test.Qtg;
-            Qfrom              = (double)test.Qfrom;
-			Qto                = (double)test.Qto;
-			TargetVolume       = (double)test.Volume;
-			TargetTime         = (double)test.TestTime;
-			Method             =         test.Method;
-			ErrLimLo           = (double)test.ErrLimLo;
-			ErrLimHi           = (double)test.ErrLimHi;
-			ErrLimMargin       = (double)test.Uncertainty;
-			DoControlWaterTemp =         test.DoControlWaterTemp;
-			TempLimLo          =         test.TempLimLo;
-			TempLimHi          =         test.TempLimHi;
-			Publish            =         test.Publish;
-			Evaluate           =         test.DoEvaluate;
+			Name = test.Name;
+			Repeats = test.Repeats;
+            Qtg = (double)test.Qtg;
+            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;
+			DoControlWaterTemp = test.DoControlWaterTemp;
+			TempLimLo = test.TempLimLo;
+			TempLimHi = test.TempLimHi;
+			Publish = test.Publish;
+			Evaluate = test.DoEvaluate;
 		}
 
-        /// <summary>
-        /// Copy constructor, copies all except of Id
-        /// </summary>
-        public TestData(TestData oriTestData)
-        {
-            Name			   = oriTestData.Name;
-            Repeats			   = oriTestData.Repeats;
-            Qtg                = oriTestData.Qtg;
-            Qfrom              = oriTestData.Qfrom;
-            Qto				   = oriTestData.Qto;
-            TargetVolume	   = oriTestData.TargetVolume;
-            TargetTime		   = oriTestData.TargetTime;
-            Method			   = oriTestData.Method;
-            ErrLimLo           = oriTestData.ErrLimLo;
-            ErrLimHi           = oriTestData.ErrLimHi;
-            ErrLimMargin       = oriTestData.ErrLimMargin;
-            DoControlWaterTemp = oriTestData.DoControlWaterTemp;
-            TempLimLo		   = oriTestData.TempLimLo;
-            TempLimHi		   = oriTestData.TempLimHi;
-            Publish			   = oriTestData.Publish;
-            Evaluate           = oriTestData.Evaluate;
-        }
-
 
 		/// <summary>
 		/// Method to compare the content of two entities

Results/Entities/TestRslt.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2020 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -11,139 +11,138 @@ namespace Results.Entities
     public class TestRslt
     {
         /// Identity
-        public virtual int        Id                { get; protected set; }
-		public virtual Batch      Batch             { get; set; }
-		public virtual TestData   TestData          { get; set; }
-		public virtual Components Components        { get; set; }
-
-        public virtual int      Part                { get; set; }
-		public virtual int      RepetitionNr        { get; set; }   /// Repetition number from the set of repeated tests (1...)
-        public virtual string   MethodClass         { get; set; }   /// Not mapped to DB, does not depend on localization and customer
+        public virtual int Id { get; protected set; }
+		public virtual Batch Batch { get; set; }
+		public virtual TestData TestData { get; set; }
+		public virtual Components Components { get; set; }
+        public virtual int Part { get; set; }
+		public virtual int RepetitionNr { get; set; }           /// Repetition number from the set of repeated tests (1...)
+        public virtual string MethodClass { get; set; }         /// Not mapped to DB, does not depend on localization and customer
 
 		/// Main results
-		public virtual bool     TestDone            { get; set; }
-        public virtual string   Remark              { get; set; }
-		public virtual DateTime StartTime           { get; set; }   /// Date and time of the test start
-		public virtual DateTime EndTime             { get; set; }   /// Date and time of the test end
-		public virtual int      FlowSetTime         { get; set; }   /// [s]     Flow set time in seconds
-        public virtual int      TimeBtwnMassMsrmnts { get; set; }   /// [s]     Time between two mass measurements in seconds (if applicable)
-        public virtual double   TestTime            { get; set; }   /// [s]     Test time in seconds
-        public virtual double   TestTimeCorrection  { get; set; }   /// [s]     Correction of the test time due to diverter (0 for methods w/o diverter or when there is no correction table)
-		public virtual double   PulsesMaster        { get; set; }   /// [pls]   FlyingStartMassCollectionProlonged: MID pulses of the water to the tank 
-        public virtual double   TotalPulsesMstr     { get; set; }   /// [pls]   FlyingStartMassCollectionProlonged: MID pulses of the complete test (not mapped to DB)
-        public virtual double   ConstMasterRaw      { get; set; }   /// [l/pls] Liters per pulse of the master flow meter uncorrected.
-        public virtual double   ConstMasterCorr     { get; set; }   /// [l/pls] Liters per pulse of the master flow meter corrected by a correction table.
-        public virtual double   ConstMaster         { get; set; }   /// [l/pls] Liters per pulse of the master flow meter calculated from a mass measurement.
-                                                                    ///         When mass measurement is not available, corrected by a correction table.
-        public virtual double   MassStartRaw        { get; set; }	/// [kg]
-		public virtual double   MassStart           { get; set; }	/// [kg]
-		public virtual double   MassEndRaw          { get; set; }	/// [kg]
-		public virtual double   MassEnd             { get; set; }	/// [kg]
-		public virtual double   DensityIn           { get; set; }	/// [kg/m3]
-		public virtual double   DensityLine         { get; set; }	/// [kg/m3]
-		public virtual double   DensityDiv          { get; set; }	/// [kg/m3]
-		public virtual double   MassOfEvapWater     { get; set; }   /// [kg]
-		public virtual double   FlowMass            { get; set; }   /// [kg/h] calculated from conventional true value
-		public virtual double   FlowVolume          { get; set; }	/// [m3/h]
-		public virtual double   VolumeCTV           { get; set; }   /// [l]    Volume conventional true value
-		public virtual double   VolumeMaster        { get; set; }   /// [l]    Volume from the master flow meter
-		public virtual double   ErrorMaster         { get; set; }	/// [%]    Error of the master flow meter
+		public virtual bool TestDone { get; set; }
+        public virtual string Remark { get; set; }
+		public virtual DateTime StartTime { get; set; }         /// Date and time of the test start
+		public virtual DateTime EndTime { get; set; }           /// Date and time of the test end
+		public virtual int FlowSetTime { get; set; }            /// [s]     Flow set time in seconds
+        public virtual int TimeBtwnMassMsrmnts { get; set; }    /// [s]     Time between two mass measurements in seconds (if applicable)
+        public virtual double TestTime { get; set; }            /// [s]     Test time in seconds
+        public virtual double TestTimeCorrection { get; set; }  /// [s]     Correction of the test time due to diverter (0 for methods w/o diverter or when there is no correction table)
+		public virtual double PulsesMaster { get; set; }        /// [pls]   FlyingStartMassCollectionProlonged: MID pulses of the water to the tank 
+        public virtual double TotalPulsesMstr { get; set; }     /// [pls]   FlyingStartMassCollectionProlonged: MID pulses of the complete test (not mapped to DB)
+        public virtual double ConstMasterRaw { get; set; }      /// [l/pls] Liters per pulse of the master flow meter uncorrected.
+        public virtual double ConstMasterCorr { get; set; }     /// [l/pls] Liters per pulse of the master flow meter corrected by a correction table.
+        public virtual double ConstMaster { get; set; }         /// [l/pls] Liters per pulse of the master flow meter calculated from a mass measurement.
+                                                                ///         When mass measurement is not available, corrected by a correction table.
+        public virtual double MassStartRaw { get; set; }	/// [kg]
+		public virtual double MassStart { get; set; }		/// [kg]
+		public virtual double MassEndRaw { get; set; }		/// [kg]
+		public virtual double MassEnd { get; set; }			/// [kg]
+		public virtual double DensityIn { get; set; }		/// [kg/m3]
+		public virtual double DensityLine { get; set; }		/// [kg/m3]
+		public virtual double DensityDiv { get; set; }		/// [kg/m3]
+		public virtual double Buoyancy { get; set; }
+		public virtual double FlowMass { get; set; }        /// [kg/h] calculated from conventional true value
+		public virtual double FlowVolume { get; set; }		/// [m3/h]
+		public virtual double VolumeCTV { get; set; }       /// [l]    Volume conventional true value
+		public virtual double VolumeMaster { get; set; }    /// [l]    Volume from the master flow meter
+		public virtual double ErrorMaster { get; set; }		/// [%]    Error of the master flow meter
 
-        public virtual float    DiverterStart       { get; set; }   /// [s]    Diverter switch time when test starts
-        public virtual float    DivStart10          { get; set; }   /// [s]    Diverter switch time when test starts at level 10 (e.g. 10%) (not mapped to DB)
-        public virtual float    DivStart50          { get; set; }   /// [s]    Diverter switch time when test starts at level 50 (e.g. 50%) (not mapped to DB)
-        public virtual float    DivStart90          { get; set; }   /// [s]    Diverter switch time when test starts at level 90 (e.g. 90%) (not mapped to DB)
+        public virtual float  DiverterStart { get; set; }   /// [s]    Diverter switch time when test starts
+        public virtual float  DivStart10 { get; set; }      /// [s]    Diverter switch time when test starts at level 10 (e.g. 10%) (not mapped to DB)
+        public virtual float  DivStart50 { get; set; }      /// [s]    Diverter switch time when test starts at level 50 (e.g. 50%) (not mapped to DB)
+        public virtual float  DivStart90 { get; set; }      /// [s]    Diverter switch time when test starts at level 90 (e.g. 90%) (not mapped to DB)
         
-        public virtual float    DiverterEnd         { get; set; }   /// [s]    Diverter switch time when test ends
-        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 float  DiverterEnd { get; set; }     /// [s]    Diverter switch time when test ends
+        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 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.
 
 		/// Main results of heat meters
-		public virtual double   RefEnergy           { get; set; }	/// [J]    Joul
+		public virtual double RefEnergy { get; set; }		/// [J]    Joul
 
 		/// Auxiliary results
-        public virtual float    AmbTempMean         { get; set; }	/// [°C]   Average ambient air temperature
-		public virtual float    AmbTempStart        { get; set; }	/// [°C]   Ambient air temperature on test start
-		public virtual float    AmbTempEnd          { get; set; }	/// [°C]   Ambient air temperature on test end
-		public virtual float    AmbTempMin          { get; set; }	/// [°C]   Minimum ambient air temperature
-		public virtual float    AmbTempMax          { get; set; }	/// [°C]   Maximum ambient air temperature
-        public virtual float    AmbPressMean        { get; set; }	/// [bar]  Average ambient air pressure
-		public virtual float    AmbPressStart       { get; set; }	/// [bar]  Ambient air pressure on test start
-		public virtual float    AmbPressEnd         { get; set; }	/// [bar]  Ambient air pressure on test end
-		public virtual float    AmbPressMin         { get; set; }	/// [bar]  Minimum ambient air pressure
-		public virtual float    AmbPressMax         { get; set; }	/// [bar]  Maximum ambient air pressure
-		public virtual float    AmbHumiMean         { get; set; }	/// [%]    Average ambient air relative humidity
-		public virtual float    AmbHumiStart        { get; set; }	/// [%]    Ambient air relative humidity on test start
-		public virtual float    AmbHumiEnd          { get; set; }	/// [%]    Ambient air relative humidity on test end
-		public virtual float    AmbHumiMin          { get; set; }	/// [%]    Minimum ambient air relative humidity
-		public virtual float    AmbHumiMax          { get; set; }	/// [%]    Maximum ambient air relative humidity
-		public virtual float    PressUpMean         { get; set; }   /// [bar]  Input water pressure (average)
-		public virtual float    PressUpStart        { get; set; }   /// [bar]
-		public virtual float    PressUpEnd          { get; set; }   /// [bar]
-		public virtual float    PressUpMin          { get; set; }	/// [bar]
-		public virtual float    PressUpMax          { get; set; }   /// [bar]
-		public virtual float    PressDownMean       { get; set; }   /// [bar]
-		public virtual float    PressDownStart      { get; set; }   /// [bar]
-		public virtual float    PressDownEnd        { get; set; }   /// [bar]
-		public virtual float    PressDownMin        { get; set; }	/// [bar]
-		public virtual float    PressDownMax        { get; set; }   /// [bar]
-		public virtual float    PressDeltaMean      { get; set; }   /// [bar]
-		public virtual float    PressDeltaStart     { get; set; }   /// [bar]
-		public virtual float    PressDeltaEnd       { get; set; }   /// [bar]
-		public virtual float    PressDeltaMin       { get; set; }	/// [bar]
-		public virtual float    PressDeltaMax       { get; set; }   /// [bar]
-		public virtual float    TempUpMean          { get; set; }	/// [°C]
-        public virtual float    TempUpStart         { get; set; }	/// [°C]
-        public virtual float    TempUpEnd           { get; set; }	/// [°C]
-        public virtual float    TempUpMin           { get; set; }	/// [°C]
-        public virtual float    TempUpMax           { get; set; }	/// [°C]
-        public virtual float    TempDownMean        { get; set; }	/// [°C]
-        public virtual float    TempDownStart       { get; set; }	/// [°C]
-        public virtual float    TempDownEnd         { get; set; }	/// [°C]
-        public virtual float    TempDownMin         { get; set; }	/// [°C]
-        public virtual float    TempDownMax         { get; set; }	/// [°C]
-        public virtual float    TempDivMean         { get; set; }	/// [°C]
-        public virtual float    TempDivStart        { get; set; }	/// [°C]
-        public virtual float    TempDivEnd          { get; set; }	/// [°C]
-        public virtual float    TempDivMin          { get; set; }	/// [°C]
-        public virtual float    TempDivMax          { get; set; }	/// [°C]
-		public virtual float    FlowMean            { get; set; }	/// [m3/h] mean flow from the reference flowmeter
-		public virtual float    FlowStart           { get; set; }	/// [m3/h] flow at the start of test from the reference flowmeter
-		public virtual float    FlowEnd             { get; set; }	/// [m3/h] flow at the end of test from the reference flowmeter
-        public virtual float    FlowMin             { get; set; }	/// [m3/h]
-        public virtual float    FlowMax             { get; set; }	/// [m3/h] 
-        public virtual float    ConductMean         { get; set; }	/// [uS/cm]
-        public virtual float    ConductStart        { get; set; }	/// [uS/cm]
-        public virtual float    ConductEnd          { get; set; }	/// [uS/cm]
-        public virtual float    ConductMin          { get; set; }	/// [uS/cm]
-        public virtual float    ConductMax          { get; set; }	/// [uS/cm]
+        public virtual float AmbTempMean { get; set; }		/// [°C]   Average ambient air temperature
+		public virtual float AmbTempStart { get; set; }		/// [°C]   Ambient air temperature on test start
+		public virtual float AmbTempEnd { get; set; }		/// [°C]   Ambient air temperature on test end
+		public virtual float AmbTempMin { get; set; }		/// [°C]   Minimum ambient air temperature
+		public virtual float AmbTempMax { get; set; }		/// [°C]   Maximum ambient air temperature
+        public virtual float AmbPressMean { get; set; }		/// [bar]  Average ambient air pressure
+		public virtual float AmbPressStart { get; set; }	/// [bar]  Ambient air pressure on test start
+		public virtual float AmbPressEnd { get; set; }		/// [bar]  Ambient air pressure on test end
+		public virtual float AmbPressMin { get; set; }		/// [bar]  Minimum ambient air pressure
+		public virtual float AmbPressMax { get; set; }		/// [bar]  Maximum ambient air pressure
+		public virtual float AmbHumiMean { get; set; }		/// [%]    Average ambient air relative humidity
+		public virtual float AmbHumiStart { get; set; }		/// [%]    Ambient air relative humidity on test start
+		public virtual float AmbHumiEnd { get; set; }		/// [%]    Ambient air relative humidity on test end
+		public virtual float AmbHumiMin { get; set; }		/// [%]    Minimum ambient air relative humidity
+		public virtual float AmbHumiMax { get; set; }		/// [%]    Maximum ambient air relative humidity
+		public virtual float PressUpMean { get; set; }      /// [bar]  Input water pressure (average)
+		public virtual float PressUpStart { get; set; }     /// [bar]
+		public virtual float PressUpEnd { get; set; }       /// [bar]
+		public virtual float PressUpMin { get; set; }		/// [bar]
+		public virtual float PressUpMax { get; set; }       /// [bar]
+		public virtual float PressDownMean { get; set; }    /// [bar]
+		public virtual float PressDownStart { get; set; }   /// [bar]
+		public virtual float PressDownEnd { get; set; }     /// [bar]
+		public virtual float PressDownMin { get; set; }		/// [bar]
+		public virtual float PressDownMax { get; set; }     /// [bar]
+		public virtual float PressDeltaMean { get; set; }   /// [bar]
+		public virtual float PressDeltaStart { get; set; }  /// [bar]
+		public virtual float PressDeltaEnd { get; set; }    /// [bar]
+		public virtual float PressDeltaMin { get; set; }	/// [bar]
+		public virtual float PressDeltaMax { get; set; }    /// [bar]
+		public virtual float TempUpMean { get; set; }		/// [°C]
+        public virtual float TempUpStart { get; set; }		/// [°C]
+        public virtual float TempUpEnd { get; set; }		/// [°C]
+        public virtual float TempUpMin { get; set; }		/// [°C]
+        public virtual float TempUpMax { get; set; }		/// [°C]
+        public virtual float TempDownMean { get; set; }		/// [°C]
+        public virtual float TempDownStart { get; set; }	/// [°C]
+        public virtual float TempDownEnd { get; set; }		/// [°C]
+        public virtual float TempDownMin { get; set; }		/// [°C]
+        public virtual float TempDownMax { get; set; }		/// [°C]
+        public virtual float TempDivMean { get; set; }		/// [°C]
+        public virtual float TempDivStart { get; set; }		/// [°C]
+        public virtual float TempDivEnd { get; set; }		/// [°C]
+        public virtual float TempDivMin { get; set; }		/// [°C]
+        public virtual float TempDivMax { get; set; }		/// [°C]
+		public virtual float FlowMean { get; set; }			/// [m3/h] mean flow from the reference flowmeter
+		public virtual float FlowStart { get; set; }		/// [m3/h] flow at the start of test from the reference flowmeter
+		public virtual float FlowEnd { get; set; }			/// [m3/h] flow at the end of test from the reference flowmeter
+        public virtual float FlowMin { get; set; }			/// [m3/h]
+        public virtual float FlowMax { get; set; }			/// [m3/h] 
+        public virtual float ConductMean { get; set; }		/// [uS/cm]
+        public virtual float ConductStart { get; set; }		/// [uS/cm]
+        public virtual float ConductEnd { get; set; }		/// [uS/cm]
+        public virtual float ConductMin { get; set; }		/// [uS/cm]
+        public virtual float ConductMax { get; set; }		/// [uS/cm]
 
-        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 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
-		public virtual float    Custom4             { get; set; }	/// [°C] T ref hi min
-		public virtual float    Custom5             { get; set; }	/// [°C] T ref hi max
-		public virtual float    Custom6             { get; set; }	/// [°C] T ref lo mean
-		public virtual float    Custom7             { get; set; }	/// [°C] T ref lo start
-		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
+        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
+		public virtual float Custom4  { get; set; }			/// [°C] T ref hi min
+		public virtual float Custom5  { get; set; }			/// [°C] T ref hi max
+		public virtual float Custom6  { get; set; }			/// [°C] T ref lo mean
+		public virtual float Custom7  { get; set; }			/// [°C] T ref lo start
+		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
 
-        public virtual int      Counter1            { get; set; }
-        public virtual int      Counter2            { get; set; }
-        public virtual int      Counter3            { get; set; }
-        public virtual int      Counter4            { get; set; }
-        public virtual int      Counter5            { get; set; }
+        public virtual int Counter1 { get; set; }
+        public virtual int Counter2 { get; set; }
+        public virtual int Counter3 { get; set; }
+        public virtual int Counter4 { get; set; }
+        public virtual int Counter5 { get; set; }
 
 		/// Wrappers
 		public virtual string Name()		 { return Utils.GetTestName(TestData.Name, TestData.Repeats, RepetitionNr); }
@@ -153,10 +152,7 @@ namespace Results.Entities
 		public virtual double TargetVolume() { return TestData.TargetVolume; }
 		public virtual double TargetTime()	 { return TestData.TargetTime; }
 		public virtual string Method()		 { return TestData.Method; }
-        public virtual string RefFlowmeter() { return (Components != null && Components.Flowmeter != null) ? Components.Flowmeter : string.Empty; }
-        public virtual string Scale()        { return (Components != null && Components.Scale     != null) ? Components.Scale     : string.Empty; }
-        public virtual string Diverter()     { return (Components != null && Components.Diverter  != null) ? Components.Diverter  : string.Empty; }
-        public virtual string RegValve()     { return (Components != null && Components.RegValve  != null) ? Components.RegValve  : string.Empty; }
+        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 IsStartStop()    { return (MethodClass != null) ? MethodClass.Contains("FixedStart") : true; }
@@ -250,51 +246,46 @@ namespace Results.Entities
         {
             if (src == null) return;
 
-		    Components          = src.Components;    /// ???
-
-		    Part                = src.Part;
-		    RepetitionNr        = src.RepetitionNr;
-            MethodClass         = src.MethodClass;
-            TestDone            = src.TestDone;
-			Remark              = src.Remark;
-		    StartTime           = src.StartTime;
-		    EndTime             = src.EndTime;
-		    FlowSetTime         = src.FlowSetTime;
+		    Components = src.Components;    /// ???
+		    Part = src.Part;
+		    RepetitionNr = src.RepetitionNr;
+            MethodClass = src.MethodClass;
+            TestDone = src.TestDone;
+			Remark = src.Remark;
+		    StartTime = src.StartTime;
+		    EndTime = src.EndTime;
+		    FlowSetTime = src.FlowSetTime;
             TimeBtwnMassMsrmnts = src.TimeBtwnMassMsrmnts;
-		    TestTime            = src.TestTime;
-            TestTimeCorrection  = src.TestTimeCorrection;
-            PulsesMaster        = src.PulsesMaster;
-            TotalPulsesMstr     = src.TotalPulsesMstr;
-            ConstMasterRaw      = src.ConstMasterRaw;
-            ConstMasterCorr     = src.ConstMasterCorr;
-            ConstMaster         = src.ConstMaster;
-		    MassStartRaw        = src.MassStartRaw;
-		    MassStart           = src.MassStart;
-		    MassEndRaw          = src.MassEndRaw;
-		    MassEnd             = src.MassEnd;
-		    DensityIn           = src.DensityIn;
-		    DensityLine         = src.DensityLine;
-		    DensityDiv          = src.DensityDiv;
-		    MassOfEvapWater     = src.MassOfEvapWater;
-		    FlowMass            = src.FlowMass;
-		    FlowVolume          = src.FlowVolume;
-		    VolumeCTV           = src.VolumeCTV;
-		    VolumeMaster        = src.VolumeMaster;
-		    ErrorMaster         = src.ErrorMaster;
-            
+		    TestTime = src.TestTime;
+		    PulsesMaster = src.PulsesMaster;
+            TotalPulsesMstr = src.TotalPulsesMstr;
+            ConstMasterRaw = src.ConstMasterRaw;
+            ConstMasterCorr = src.ConstMasterCorr;
+            ConstMaster = src.ConstMaster;
+		    MassStartRaw = src.MassStartRaw;
+		    MassStart = src.MassStart;
+		    MassEndRaw = src.MassEndRaw;
+		    MassEnd = src.MassEnd;
+		    DensityIn = src.DensityIn;
+		    DensityLine = src.DensityLine;
+		    DensityDiv = src.DensityDiv;
+		    Buoyancy = src.Buoyancy;
+		    FlowMass = src.FlowMass;
+		    FlowVolume = src.FlowVolume;
+		    VolumeCTV = src.VolumeCTV;
+		    VolumeMaster = src.VolumeMaster;
+		    ErrorMaster = src.ErrorMaster;
             DiverterStart = src.DiverterStart;
-            DivStart10    = src.DivStart10;
-            DivStart50    = src.DivStart50;
-            DivStart90    = src.DivStart90;
-            DiverterEnd   = src.DiverterEnd;            
-            DivEnd10      = src.DivEnd10;
-            DivEnd50      = src.DivEnd50;
-            DivEnd90      = src.DivEnd90;
-
+            DivStart10 = src.DivStart10;
+            DivStart50 = src.DivStart50;
+            DivStart90 = src.DivStart90;
+            DiverterEnd = src.DiverterEnd;
+            DivEnd10 = src.DivEnd10;
+            DivEnd50 = src.DivEnd50;
+            DivEnd90 = src.DivEnd90;
 			ErrorFlags = src.ErrorFlags;
             InfoFlags = src.InfoFlags;
 		    RefEnergy = src.RefEnergy;
-
             AmbTempMean = src.AmbTempMean;
 		    AmbTempStart = src.AmbTempStart;
 		    AmbTempEnd = src.AmbTempEnd;
@@ -351,21 +342,15 @@ namespace Results.Entities
             ConductMin = src.ConductMin;
             ConductMax = src.ConductMax;
 
-            Uncertnt         = src.Uncertnt;
-            UncertntScale    = src.UncertntScale;
-            UncertntDensity  = src.UncertntDensity;
-            UncertntTemp     = src.UncertntTemp;
-            UncertntPressure = src.UncertntPressure;
-
-            Custom1  = src.Custom1;
-		    Custom2  = src.Custom2;
-		    Custom3  = src.Custom3;
-		    Custom4  = src.Custom4;
-		    Custom5  = src.Custom5;
-		    Custom6  = src.Custom6;
-		    Custom7  = src.Custom7;
-		    Custom8  = src.Custom8;
-		    Custom9  = src.Custom9;
+            Custom1 = src.Custom1;
+		    Custom2 = src.Custom2;
+		    Custom3 = src.Custom3;
+		    Custom4 = src.Custom4;
+		    Custom5 = src.Custom5;
+		    Custom6 = src.Custom6;
+		    Custom7 = src.Custom7;
+		    Custom8 = src.Custom8;
+		    Custom9 = src.Custom9;
 		    Custom10 = src.Custom10;
 
             Counter1 = src.Counter1;
@@ -386,12 +371,6 @@ namespace Results.Entities
 #endif
         }
 
-        /// <summary> Wrapper </summary>
-        public virtual string InfoFlagsStr()
-        {
-            return Utils.ErrorFlagsStr(InfoFlags);
-        }
-
 		public virtual bool IsPartCompatible(int waterMeterPartNr)
 		{
 			if ((this.Part == 0) || (waterMeterPartNr == 0)) return true;
@@ -411,10 +390,10 @@ 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} MassOfEvapWaater={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} 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}", 
 								Part, RepetitionNr, TestDone, Remark, StartTime, EndTime, FlowSetTime, TestTime,
 								PulsesMaster, ConstMaster, MassStartRaw, MassStart, MassEndRaw, MassEnd,
-								DensityIn, DensityLine, DensityDiv, MassOfEvapWater, FlowMass, FlowVolume,
+								DensityIn, DensityLine, DensityDiv, Buoyancy, FlowMass, FlowVolume,
 								VolumeCTV, VolumeMaster, ErrorMaster, ErrorFlags, InfoFlags, 
 								AmbTempMean, AmbTempStart, AmbTempEnd, AmbTempMin, AmbTempMax,
 								AmbPressMean, AmbPressStart, AmbPressEnd, AmbPressMin, AmbPressMax,
@@ -482,7 +461,7 @@ namespace Results.Entities
             writer.Write(DensityIn);
             writer.Write(DensityLine);
             writer.Write(DensityDiv);
-            writer.Write(MassOfEvapWater);
+            writer.Write(Buoyancy);
             writer.Write(FlowMass);
             writer.Write(FlowVolume);
             writer.Write(VolumeCTV);
@@ -623,7 +602,7 @@ namespace Results.Entities
             DensityIn = reader.ReadDouble();
             DensityLine = reader.ReadDouble();
             DensityDiv = reader.ReadDouble();
-            MassOfEvapWater = reader.ReadDouble();
+            Buoyancy = reader.ReadDouble();
             FlowMass = reader.ReadDouble();
             FlowVolume = reader.ReadDouble();
             VolumeCTV = reader.ReadDouble();

Results/Entities/WaterMeter.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2020 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -59,7 +59,7 @@ namespace Results.Entities
 		public virtual string Remark			{ get; set; }
 
 #if IPERL
-        public virtual double OrigCalibFactor   { get; set; }	/// Original iPerl calibration factor used during the test
+		public virtual double OrigCalibFactor   { get; set; }	/// Original iPerl calibration factor used during the test
         public virtual double CalibFactor       { get; set; }	/// iPerl calibration factor used during the test
         public virtual double OrigCalibFactorLNA{ get; set; }	/// Original iPerl LNA calibration factor used during the test
         public virtual double CalibFactorLNA    { get; set; }	/// iPerl LNA calibration factor used during the test
@@ -76,6 +76,8 @@ namespace Results.Entities
         /// <summary>
         /// Data from a production test bench (in case of tests on iPerl special)
         /// </summary>
+        public virtual int    AssignedSerialNr  { get; set; }
+        public virtual string CompleteSerialNr  { get; set; }
         public virtual string RadioAddress      { get; set; }
         public virtual int    PaletteNr         { get; set; }
         public virtual int    UmkartonNr        { get; set; }
@@ -89,17 +91,13 @@ namespace Results.Entities
         public virtual int    ProdQ2CorrLR      { get; set; }	/// iPerl Q2 correction for the L-flow written to iPerl
 #endif
 #if ORACLE_DB
-        public virtual int    AssignedSerialNr  { get; set; }
-        public virtual string Prefix            { get; set; }
-        public virtual string Suffix            { get; set; }
-        public virtual string CompleteSerialNr  { get; set; }
-        public virtual int    WMTypeRevision    { get; set; }
-        public virtual int    Pruefindex        { get; set; }	/// >= 1 ... pruefindex
+		public virtual int	  Pruefindex	    { get; set; }	/// >= 1 ... pruefindex
 		public virtual int	  HydrPruefung		{ get; set; }
+        public virtual int    WMTypeRevision    { get; set; }	/// Not mapped to DB !!!
         public virtual object RawTestInfos      { get; set; }	/// IList<SensusTestInfo> fetched from Oracle at the beginning of the cycle, not mapped to DB !!!
         public virtual object CompleteTestInfos { get; set; }	/// SensusTestInfo[] obtained as a best match at the beginning of the cycle, not mapped to DB !!!
 #endif
-        public virtual int	  ProcessId	        { get; set; }	/// Not mapped to DB !!!    Tracing DB Process ID
+		public virtual int	  ProcessId	        { get; set; }	/// Not mapped to DB !!!    Tracing DB Process ID
         public virtual int    SessionId         { get; set; }   /// Not mapped to DB !!!    1 (regular tracing DB session) or 2 (alternative tracing DB session)                                                 
         public virtual bool   LastRecordIsNok   { get; set; }	/// Not mapped to DB !!!    Previous record verification result
 
@@ -188,30 +186,6 @@ namespace Results.Entities
 #endif      
         }
 
-        public virtual long InfoFlagsFromTests()
-        {
-            long infoFlags = 0;
-            foreach (var mtr in MeterTestRslts)
-            {
-                if (mtr.Evaluate() && mtr.TestDone) infoFlags |= mtr.TestRslt.InfoFlags;
-            }
-            return infoFlags;
-        }
-
-        public virtual long InfoFlagsFromTestsAndWM()
-        {
-            return InfoFlagsFromTests() | InfoFlags;
-        }
-
-        /// <summary>
-        /// Convert combined errorFlags of all tests to string
-        /// </summary>
-        /// <returns>ErrorFlags string</returns>
-        public virtual string InfoFlagsStr()
-        {
-            return Utils.ErrorFlagsStr(InfoFlagsFromTestsAndWM());
-        }
-
         public virtual string PassedOrErrorFlagsStr()
         {
             string eFlags = Utils.ErrorFlagsStr(ErrorFlagsFromTestsAndWM());
@@ -421,13 +395,9 @@ namespace Results.Entities
 		{
 			MeterTestRslts = new List<MeterTestRslt>();
 #if ORACLE_DB
-            AssignedSerialNr = 0;
-            Prefix = string.Empty;
-            Suffix = string.Empty;
-            CompleteSerialNr = string.Empty;
-            WMTypeRevision = 0;
             Pruefindex = 1;
             HydrPruefung = 0;
+            WMTypeRevision = 0;
             RawTestInfos = null;
             CompleteTestInfos = null;
 #endif
@@ -445,6 +415,7 @@ namespace Results.Entities
             ArchivePath = string.Empty;
             Remark = string.Empty;
 #if TURA_SPECIAL
+            CompleteSerialNr = string.Empty;
             RadioAddress = string.Empty;
             ProdUserName = string.Empty;
             ProdPurchaseOrder = string.Empty;
@@ -459,36 +430,37 @@ namespace Results.Entities
         {
             if (src == null) return;
             
-            SerialNr           = src.SerialNr;
-		    SerialNrAux        = src.SerialNrAux;
-		    PurchaseOrder      = src.PurchaseOrder;
-		    YearOfProduction   = src.YearOfProduction;
-            WMPosition         = src.WMPosition;
-		    EndState           = src.EndState;
-		    EndStateAux        = src.EndStateAux;
-		    QRise              = src.QRise;
-		    QFall              = src.QFall;
-            ErrorFlags         = src.ErrorFlags;
-            InfoFlags          = src.InfoFlags;
-            Passed             = src.Passed;
-            ResultCode         = src.ResultCode;
-			ArchivePath        = src.ArchivePath;
-			Remark             = src.Remark;
+            SerialNr = src.SerialNr;
+		    SerialNrAux = src.SerialNrAux;
+		    PurchaseOrder = src.PurchaseOrder;
+		    YearOfProduction = src.YearOfProduction;
+            // WMPosition skipped
+		    EndState = src.EndState;
+		    EndStateAux = src.EndStateAux;
+		    QRise = src.QRise;
+		    QFall = src.QFall;
+            ErrorFlags = src.ErrorFlags;
+		    Passed = src.Passed;
+            ResultCode = src.ResultCode;
+			ArchivePath = src.ArchivePath;
+			Remark = src.Remark;
 #if IPERL
-		    OrigCalibFactor    = src.OrigCalibFactor;
-		    CalibFactor        = src.CalibFactor;
+		    OrigCalibFactor = src.OrigCalibFactor;
+		    CalibFactor = src.CalibFactor;
 		    OrigCalibFactorLNA = src.OrigCalibFactorLNA;
-		    CalibFactorLNA     = src.CalibFactorLNA;
-		    Q2ErrWOCorrection  = src.Q2ErrWOCorrection;
-            Q2CorrRL           = src.Q2CorrRL;
-            Q2CorrLR           = src.Q2CorrLR;
-            Q2CorrFlowRight    = src.Q2CorrFlowRight;
-		    Diff2Hz8Hz         = src.Diff2Hz8Hz;
-		    Hz2CorrectionDone  = src.Hz2CorrectionDone;
-		    Hz2Correction      = src.Hz2Correction;
-			FWVersion          = src.FWVersion;
+		    CalibFactorLNA = src.CalibFactorLNA;
+		    Q2ErrWOCorrection = src.Q2ErrWOCorrection;
+            Q2CorrRL = src.Q2CorrRL;
+            Q2CorrLR = src.Q2CorrLR;
+            Q2CorrFlowRight = src.Q2CorrFlowRight;
+		    Diff2Hz8Hz = src.Diff2Hz8Hz;
+		    Hz2CorrectionDone = src.Hz2CorrectionDone;
+		    Hz2Correction = src.Hz2Correction;
+			FWVersion = src.FWVersion;
 #endif
 #if TURA_SPECIAL
+            AssignedSerialNr = src.AssignedSerialNr;
+            CompleteSerialNr = src.CompleteSerialNr;
             RadioAddress = src.RadioAddress;
             PaletteNr = src.PaletteNr;
             UmkartonNr = src.UmkartonNr;
@@ -502,19 +474,15 @@ namespace Results.Entities
             ProdQ2CorrLR = src.ProdQ2CorrLR;
 #endif
 #if ORACLE_DB
-            AssignedSerialNr   = src.AssignedSerialNr;
-            Prefix             = src.Prefix;
-            Suffix             = src.Suffix;
-            CompleteSerialNr   = src.CompleteSerialNr;
-            WMTypeRevision     = src.WMTypeRevision;
-            Pruefindex         = src.Pruefindex;
-		    HydrPruefung       = src.HydrPruefung;
-            RawTestInfos       = src.RawTestInfos;      /// Not mapped to DB
-            CompleteTestInfos  = src.CompleteTestInfos; /// Not mapped to DB
+            Pruefindex = src.Pruefindex;
+		    HydrPruefung = src.HydrPruefung;
+            WMTypeRevision = src.WMTypeRevision;
+            RawTestInfos = src.RawTestInfos;
+            CompleteTestInfos = src.CompleteTestInfos;
 #endif
-            ProcessId          = src.ProcessId;         /// Not mapped to DB
-            SessionId          = src.SessionId;         /// Not mapped to DB
-            LastRecordIsNok    = src.LastRecordIsNok;   /// Not mapped to DB
+            ProcessId = src.ProcessId;
+            SessionId = src.SessionId;
+            LastRecordIsNok = src.LastRecordIsNok;
 
             foreach (var mtr in MeterTestRslts)
             {
@@ -670,6 +638,8 @@ namespace Results.Entities
             writer.Write((FWVersion != null) ? FWVersion : string.Empty);
 #endif
 #if TURA_SPECIAL
+            writer.Write(AssignedSerialNr);
+            writer.Write((CompleteSerialNr != null) ? CompleteSerialNr : string.Empty);
             writer.Write((RadioAddress != null) ? RadioAddress : string.Empty);
             writer.Write(PaletteNr);
             writer.Write(UmkartonNr);
@@ -683,13 +653,9 @@ namespace Results.Entities
             writer.Write(ProdQ2CorrLR);
 #endif
 #if ORACLE_DB
-            writer.Write(AssignedSerialNr);
-            writer.Write((Prefix != null) ? Prefix : string.Empty);
-            writer.Write((Suffix != null) ? Suffix : string.Empty);
-            writer.Write((CompleteSerialNr != null) ? CompleteSerialNr : string.Empty);
-            writer.Write(WMTypeRevision);
             writer.Write(Pruefindex);
             writer.Write(HydrPruefung);
+            writer.Write(WMTypeRevision);
 
             /// Write RawTestInfos
             IList<Results.Output.SensusTestInfo> rawTestInfos = RawTestInfos as IList<Results.Output.SensusTestInfo>;
@@ -765,6 +731,8 @@ namespace Results.Entities
             FWVersion = reader.ReadString();
 #endif
 #if TURA_SPECIAL
+            AssignedSerialNr = reader.ReadInt32();
+            CompleteSerialNr = reader.ReadString();
             RadioAddress = reader.ReadString();
             PaletteNr = reader.ReadInt32();
             UmkartonNr = reader.ReadInt32();
@@ -778,13 +746,9 @@ namespace Results.Entities
             ProdQ2CorrLR = reader.ReadInt32();
 #endif
 #if ORACLE_DB
-            AssignedSerialNr = reader.ReadInt32();
-            Prefix = reader.ReadString();
-            Suffix = reader.ReadString();
-            CompleteSerialNr = reader.ReadString();
-            WMTypeRevision = reader.ReadInt32();
             Pruefindex = reader.ReadInt32();
             HydrPruefung = reader.ReadInt32();
+            WMTypeRevision = reader.ReadInt32();
 
             /// Read RawTestInfos
             int rawTestInfosCount = reader.ReadInt32();

Results/Entities/WaterMeterData.cs

@@ -1,101 +1,65 @@
 ///
-/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2020 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.IO;
-using Config.Entities;
 
 namespace Results.Entities
 {
     public class WaterMeterData
 	{
-        public virtual int                         Id                          { get; protected set; }
-		public virtual string                      ProductName                 { get; set; }
-		public virtual string                      Producer                    { get; set; }
-        public virtual double                      DN                          { get; set; }	/// [mm]
-        public virtual double                      L                           { get; set; }	/// [mm]
-        public virtual Mounting                    Mounting                    { get; set; }	/// H / V / S / F
-		public virtual bool                        NewQnames                   { get; set; }	/// Yes = Q3...  No = Qn...
-        public virtual double                      Q4_Qmax                     { get; set; }	/// [m3/h]
-		public virtual double                      Q3_Qn                       { get; set; }	/// [m3/h]
-		public virtual double                      Q2_Qt                       { get; set; }	/// [m3/h]
-		public virtual double                      Q1_Qmin                     { get; set; }	/// [m3/h]
-        public virtual string                      MetrologicalClass           { get; set; }
-        public virtual TemperatureClass            TemperatureClass            { get; set; }
-        public virtual PressureLossClass           PressureLossClass           { get; set; }
-        public virtual MaxAdmissiblePressure       MaxAdmissiblePressure       { get; set; }
-        public virtual FlowProfileSensitivityClass FlowProfileSensitivityClass { get; set; }
-        public virtual string                      ApprovalInfo                { get; set; }
-        public virtual string                      Certificate                 { get; set; }
-        public virtual double                      PulsesPerLtr                { get; set; }
+        public virtual int Id { get; protected set; }
+		public virtual string ProductName { get; set; }
+		public virtual string Producer { get; set; }
+
+        public virtual double DN { get; set; }			                    /// [mm]
+        public virtual double L { get; set; }			                    /// [mm]
+        public virtual Config.Entities.Mounting Mounting { get; set; }	    /// H / V / S / F
+
+		public virtual bool NewQnames { get; set; }							/// Yes = Q3...  No = Qn...
+        public virtual double Q4_Qmax { get; set; }			                /// [m3/h]
+		public virtual double Q3_Qn { get; set; }			                /// [m3/h]
+		public virtual double Q2_Qt { get; set; }			                /// [m3/h]
+		public virtual double Q1_Qmin { get; set; }			                /// [m3/h]
+
+        public virtual string MetrologicalClass { get; set; }
+        public virtual Config.Entities.TemperatureClass TemperatureClass { get; set; }
+        public virtual Config.Entities.PressureLossClass PressureLossClass { get; set; }
+        public virtual Config.Entities.MaxAdmissiblePressure MaxAdmissiblePressure { get; set; }
+        public virtual Config.Entities.FlowProfileSensitivityClass FlowProfileSensitivityClass { get; set; }
+
+        public virtual string ApprovalInfo { get; set; }
+        public virtual string Certificate { get; set; }
+
+        public virtual double PulsesPerLtr { get; set; }
  
         ///  Concerns compound water meters
-        public virtual string                      ProducerAux                 { get; set; }
-        public virtual double                      Q3_Qn_Aux                   { get; set; }	/// [m3/h]
-        public virtual string                      MetrologicalClassAux        { get; set; }
-        public virtual string                      ApprovalInfoAux             { get; set; }
+        public virtual string ProducerAux { get; set; }
+        public virtual double Q3_Qn_Aux { get; set; }			            /// [m3/h]
+        public virtual string MetrologicalClassAux { get; set; }
+        public virtual string ApprovalInfoAux { get; set; }
+
+        public virtual Config.Entities.Medium Medium { get; set; }
+
+        public virtual string Text1 { get; set; }
+        public virtual string Text2 { get; set; }
+        public virtual string Text3 { get; set; }
+        public virtual string Text4 { get; set; }
+        public virtual string Text5 { get; set; }
+
+        public virtual bool Compound { get; set; }
+        public virtual bool HeatMeter { get; set; }
 
-        public virtual Medium                      Medium                      { get; set; }
-        public virtual string                      Text1                       { get; set; }
-        public virtual string                      Text2                       { get; set; }
-        public virtual string                      Text3                       { get; set; }
-        public virtual string                      Text4                       { get; set; }
-        public virtual string                      Text5                       { get; set; }
-        public virtual bool                        Compound                    { get; set; }
-        public virtual bool                        HeatMeter                   { get; set; }
 #if ORACLE_DB
-		public virtual int                         WMTypeId                    { get; set; }
+		public virtual int WMTypeId { get; set; }
 #endif
 
-        /// <summary>
-        /// Default constructor, safe values
-        /// </summary>
         public WaterMeterData()
 		{
 		}
 
-        /// <summary>
-        /// Copy constructor, copies all except of Id
-        /// </summary>
-        public WaterMeterData(WaterMeterData oriWMData)
-        {
-            ProductName                 = oriWMData.ProductName;
-            Producer                    = oriWMData.Producer;
-            DN                          = oriWMData.DN;
-            L                           = oriWMData.L;
-            Mounting                    = oriWMData.Mounting;
-            NewQnames                   = oriWMData.NewQnames;
-            Q4_Qmax                     = oriWMData.Q4_Qmax;
-            Q3_Qn                       = oriWMData.Q3_Qn;
-            Q2_Qt                       = oriWMData.Q2_Qt;
-            Q1_Qmin                     = oriWMData.Q1_Qmin;
-            MetrologicalClass           = oriWMData.MetrologicalClass;
-            TemperatureClass            = oriWMData.TemperatureClass;
-            PressureLossClass           = oriWMData.PressureLossClass;
-            MaxAdmissiblePressure       = oriWMData.MaxAdmissiblePressure;
-            FlowProfileSensitivityClass = oriWMData.FlowProfileSensitivityClass;
-            ApprovalInfo                = oriWMData.ApprovalInfo;
-            Certificate                 = oriWMData.Certificate;
-            PulsesPerLtr                = oriWMData.PulsesPerLtr;
-            ProducerAux                 = oriWMData.ProducerAux;
-            Q3_Qn_Aux                   = oriWMData.Q3_Qn_Aux;
-            MetrologicalClassAux        = oriWMData.MetrologicalClassAux;
-            ApprovalInfoAux             = oriWMData.ApprovalInfoAux;
-            Medium                      = oriWMData.Medium;
-            Text1                       = oriWMData.Text1;
-            Text2                       = oriWMData.Text2;
-            Text3                       = oriWMData.Text3;
-            Text4                       = oriWMData.Text4;
-            Text5                       = oriWMData.Text5;
-            Compound                    = oriWMData.Compound;
-            HeatMeter                   = oriWMData.HeatMeter;
-#if ORACLE_DB
-            WMTypeId                    = oriWMData.WMTypeId;
-#endif
-        }
-
 
 		/// <summary>
 		/// Method to compare the content of two entities
@@ -106,34 +70,44 @@ namespace Results.Entities
 		{
 			if (ProductName != wmd.ProductName) return false;
 			if (Producer != wmd.Producer) return false;
+
             if (DN != wmd.DN) return false;
             if (L != wmd.L) return false;
             if (Mounting != wmd.Mounting) return false;
+
 			if (NewQnames != wmd.NewQnames) return false;
             if (Q4_Qmax != wmd.Q4_Qmax) return false;
 			if (Q3_Qn   != wmd.Q3_Qn) return false;
 			if (Q2_Qt   != wmd.Q2_Qt) return false;
 			if (Q1_Qmin != wmd.Q1_Qmin) 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 != wmd.ApprovalInfo) return false;
             if (Certificate != wmd.Certificate) return false;
+
             if (PulsesPerLtr != wmd.PulsesPerLtr) return false;
+
             if (ProducerAux != wmd.ProducerAux) return false;
             if (Q3_Qn_Aux != wmd.Q3_Qn_Aux) return false;
             if (MetrologicalClassAux != wmd.MetrologicalClassAux) return false;
             if (ApprovalInfoAux != wmd.ApprovalInfoAux) return false;
+
             if (Medium != wmd.Medium) return false;
+
             if (Text1 != wmd.Text1) return false;
             if (Text2 != wmd.Text2) return false;
             if (Text3 != wmd.Text3) return false;
             if (Text4 != wmd.Text4) return false;
             if (Text5 != wmd.Text5) return false;
+
             if (Compound != wmd.Compound) return false;
 			if (HeatMeter != wmd.HeatMeter) return false;
+
 #if ORACLE_DB
             if (WMTypeId != wmd.WMTypeId) return false;
 #endif
@@ -204,17 +178,17 @@ namespace Results.Entities
             Producer = reader.ReadString();
             DN = reader.ReadDouble();
             L = reader.ReadDouble();
-            Mounting = (Mounting)reader.ReadInt32();
+            Mounting = (Config.Entities.Mounting)reader.ReadInt32();
             NewQnames = reader.ReadBoolean();
             Q4_Qmax = reader.ReadDouble();
             Q3_Qn = reader.ReadDouble();
             Q2_Qt = reader.ReadDouble();
             Q1_Qmin = reader.ReadDouble();
             MetrologicalClass = reader.ReadString();
-            TemperatureClass = (TemperatureClass)reader.ReadInt32();
-            PressureLossClass = (PressureLossClass)reader.ReadInt32();
-            MaxAdmissiblePressure = (MaxAdmissiblePressure)reader.ReadInt32();
-            FlowProfileSensitivityClass = (FlowProfileSensitivityClass)reader.ReadInt32();
+            TemperatureClass = (Config.Entities.TemperatureClass)reader.ReadInt32();
+            PressureLossClass = (Config.Entities.PressureLossClass)reader.ReadInt32();
+            MaxAdmissiblePressure = (Config.Entities.MaxAdmissiblePressure)reader.ReadInt32();
+            FlowProfileSensitivityClass = (Config.Entities.FlowProfileSensitivityClass)reader.ReadInt32();
             ApprovalInfo = reader.ReadString();
             Certificate = reader.ReadString();
             PulsesPerLtr = reader.ReadDouble();
@@ -222,7 +196,7 @@ namespace Results.Entities
             Q3_Qn_Aux = reader.ReadDouble();
             MetrologicalClassAux = reader.ReadString();
             ApprovalInfoAux = reader.ReadString();
-            Medium = (Medium)reader.ReadInt32();
+            Medium = (Config.Entities.Medium)reader.ReadInt32();
             Text1 = reader.ReadString();
             Text2 = reader.ReadString();
             Text3 = reader.ReadString();

Results/Forms/MoreWMResultsDlg.Designer.cs

@@ -153,6 +153,7 @@
         #endregion
 
         private System.Windows.Forms.TabControl tabControl1;
+        private OneWMResultsRowsCtrl oneWMResultsCtrl;
         private System.Windows.Forms.TabPage graphsTabPage;
         private System.Windows.Forms.TabPage productionTracingTabPage;
         private System.Windows.Forms.SplitContainer productionTracingSplitContainer;

Results/ItemID.cs

@@ -327,11 +327,6 @@ namespace Results
         Conduct_min,                    /// 277
         Conduct_max,                    /// 278
 
-        InfoFlags,						/// 279
-        Scale,                          /// 280
-        Diverter,                       /// 281
-        RegValve,                       /// 282
-
         Count,
     }
 }

Results/Mappings/BatchMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2019 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Results.Entities;
@@ -18,13 +18,14 @@ namespace Results.Mappings
 			Map(x => x.UserNumber);
 			Map(x => x.ProcedureName);
 			Map(x => x.ProcedureRevision);
+			Map(x => x.ProtocolTitle);
             Map(x => x.Remark)
 				.CustomType("StringClob")
 				.CustomSqlType("varchar(2000)");
-
-			Map(x => x.SampleDensity);
-			Map(x => x.SampleTemp);
-			Map(x => x.Buoyancy);
+			Map(x => x.DensityCorr)
+				.Column("Custom1"); ;
+			Map(x => x.Custom2);
+			Map(x => x.Custom3);
 
             Map(x => x.Counter6);
             Map(x => x.Counter7);

Results/Mappings/TestDataMap.cs

@@ -21,7 +21,7 @@ namespace Results.Mappings
 			Map(x => x.Method);
 			Map(x => x.ErrLimLo);
 			Map(x => x.ErrLimHi);
-            Map(x => x.ErrLimMargin);
+            Map(x => x.ErrLimMargin).Column("Uncertainty");
 			Map(x => x.Publish);
 			Map(x => x.Evaluate);
 		}

Results/Mappings/TestRsltMap.cs

@@ -37,10 +37,9 @@ namespace Results.Mappings
 			Map(x => x.MassEndRaw);
 			Map(x => x.MassEnd);
 			Map(x => x.DensityIn);
-            Map(x => x.DensityLine);
+            Map(x => x.DensityLine).Column("DensityOut");
 			Map(x => x.DensityDiv);
-			Map(x => x.MassOfEvapWater)
-                .Column("Buoyancy");
+			Map(x => x.Buoyancy);
 			Map(x => x.FlowMass);
 			Map(x => x.FlowVolume);
 			Map(x => x.VolumeCTV);
@@ -53,27 +52,27 @@ namespace Results.Mappings
 #if HEAT_METERS
 			Map(x => x.RefEnergy);
 #endif
-			Map(x => x.AmbTempMean);
+			Map(x => x.AmbTempMean).Column("AmbientTempAve");
 			Map(x => x.AmbTempStart);
 			Map(x => x.AmbTempEnd);
 			Map(x => x.AmbTempMin);
 			Map(x => x.AmbTempMax);
-			Map(x => x.AmbPressMean);
+			Map(x => x.AmbPressMean).Column("AmbientPressAve");
 			Map(x => x.AmbPressStart);
 			Map(x => x.AmbPressEnd);
 			Map(x => x.AmbPressMin);
 			Map(x => x.AmbPressMax);
-			Map(x => x.AmbHumiMean);
+			Map(x => x.AmbHumiMean).Column("AmbientHumiAve");
 			Map(x => x.AmbHumiStart);
 			Map(x => x.AmbHumiEnd);
 			Map(x => x.AmbHumiMin);
 			Map(x => x.AmbHumiMax);
-			Map(x => x.PressUpMean);
+			Map(x => x.PressUpMean).Column("PressUpAvrg");
 			Map(x => x.PressUpStart);
 			Map(x => x.PressUpEnd);
 			Map(x => x.PressUpMin);
 			Map(x => x.PressUpMax);
-			Map(x => x.PressDownMean);
+			Map(x => x.PressDownMean).Column("PressDownAvrg");
 			Map(x => x.PressDownStart);
 			Map(x => x.PressDownEnd);
 			Map(x => x.PressDownMin);
@@ -83,17 +82,17 @@ namespace Results.Mappings
 			Map(x => x.PressDeltaEnd);
 			Map(x => x.PressDeltaMin);
 			Map(x => x.PressDeltaMax);
-			Map(x => x.TempUpMean);
-			Map(x => x.TempUpStart);
-			Map(x => x.TempUpEnd);
-			Map(x => x.TempUpMin);
-			Map(x => x.TempUpMax);
-			Map(x => x.TempDownMean);
-			Map(x => x.TempDownStart);
-			Map(x => x.TempDownEnd);
-			Map(x => x.TempDownMin);
-			Map(x => x.TempDownMax);
-			Map(x => x.TempDivMean);
+			Map(x => x.TempUpMean).Column("TempInAvrg");
+			Map(x => x.TempUpStart).Column("TempInStart");
+			Map(x => x.TempUpEnd).Column("TempInEnd");
+			Map(x => x.TempUpMin).Column("TempInMin");
+			Map(x => x.TempUpMax).Column("TempInMax");
+			Map(x => x.TempDownMean).Column("TempOutAvrg");
+			Map(x => x.TempDownStart).Column("TempOutStart");
+			Map(x => x.TempDownEnd).Column("TempOutEnd");
+			Map(x => x.TempDownMin).Column("TempOutMin");
+			Map(x => x.TempDownMax).Column("TempOutMax");
+			Map(x => x.TempDivMean).Column("TempDivAvrg");
 			Map(x => x.TempDivStart);
 			Map(x => x.TempDivEnd);
 			Map(x => x.TempDivMin);

Results/Mappings/WaterMeterMap.cs

@@ -43,6 +43,8 @@ namespace Results.Mappings
 			Map(x => x.FWVersion);
 #endif
 #if TURA_SPECIAL
+            Map(x => x.AssignedSerialNr);
+            Map(x => x.CompleteSerialNr);
             Map(x => x.RadioAddress);
             Map(x => x.PaletteNr);
             Map(x => x.UmkartonNr);
@@ -56,13 +58,8 @@ namespace Results.Mappings
             Map(x => x.ProdQ2CorrLR);
 #endif
 #if ORACLE_DB
-            Map(x => x.AssignedSerialNr);
-            Map(x => x.Prefix);
-            Map(x => x.Suffix);
-            Map(x => x.CompleteSerialNr);
             Map(x => x.Pruefindex);
             Map(x => x.HydrPruefung);
-            Map(x => x.WMTypeRevision);
 #endif
             References(x => x.WaterMeterData);
 			References(x => x.Batch);

Results/Output/Printers/Munich/MunichPrintDocument.cs

@@ -0,0 +1,630 @@
+///
+/// Copyright (c) 2016-2018 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Printing;
+using Config.Entities;
+using System.IO;
+using Results.Resources;
+
+namespace Results.Output.Printers.Munich
+{
+	public class MunichPrintDocument : PrintDocument
+	{
+        const string FontFamilyName = "Arial";  ///"Times New Roman";
+
+		const int SpacingOne = 18;
+		const int SpacingOneAndHalf = 24;		/// was 27 before
+		const int TitleX = 240;
+		const int TitleY = 180;			/// Depends on the size of the header
+		const int FirstLineNr = 14;		/// Depends on the size of the header
+		const int Tab1 = 80;			/// Positions of columns above the table
+		const int Tab2 = 240;
+		const int Tab3 = 430;
+		const int Tab4 = 590;
+		const int BorderW = 1;			/// Table border line width
+		const int MarginTop = 7;		/// Margins of the text from table lines
+        const int MarginLeft = 4;		/// Margins of the text from table lines
+												
+		///
+		/// Data to print
+		///
+        readonly string docVersion;
+		readonly Results.Entities.WaterMeter wm;
+        string zaehlertyp;
+        string pruefvorlage;
+
+        readonly IList<Results.Entities.MeterTestRslt> results;
+        readonly int resultsCount;
+		readonly bool compound;			/// true when MetersKind is MetersKind.Combined												
+										
+		
+		int pageNr;         /// Current page number
+        int nrPages;        /// Total number of pages
+        float tableTop;     /// Top coordinate of the table
+
+        int[] firstTblRowsOnPage;
+        int[] secondTblRowsOnPage;
+
+        
+        PageOrientation pageOrientation;
+
+		/// <summary>
+		/// Property variable for the Font the user wishes to use
+		/// </summary>
+		Font font;
+        Font boldFont;
+        Font fontTitle;
+
+        ///
+        /// Table style
+        ///
+        static TableStyle tableStyle = new TableStyle
+        {
+            Font = new Font(FontFamilyName, 10, FontStyle.Regular),
+            HeaderFont = new Font(FontFamilyName, 10, FontStyle.Regular),
+            MarginX = 7,
+            MarginY = 5,
+            LineWidth = 1,
+            TopHeadersCount = 1,
+            HorizLines = TableLines.FirstSecondAndLast,
+            VertLines = TableLines.All,
+            ColumnWidths = new float[] { 150, 70, 75, 75, 70, 75, 75 },
+        };
+        static Alignment[] horizontalAlignment = new Alignment[]        /// Horizontal alignment of items of one row
+        {
+            Alignment.Left, Alignment.Left, Alignment.Left,
+            Alignment.Left, Alignment.Left, Alignment.Left, Alignment.Left
+        };
+        static VertAlignment[] verticalAlignment = new VertAlignment[]  /// Vertical alignment of items of one row
+        {
+            VertAlignment.Middle, VertAlignment.Middle, VertAlignment.Middle,
+            VertAlignment.Middle, VertAlignment.Middle, VertAlignment.Middle, VertAlignment.Middle
+        };
+
+
+        /// <summary>
+		/// Constructor
+		/// </summary>
+		/// <param name="textToPrint">Text to be printed</param>
+		public MunichPrintDocument(string docVersion,
+								   Results.Entities.WaterMeter wm,
+								   PageOrientation pageOrientation)
+		{
+            this.docVersion = docVersion;
+			this.wm = wm;
+			this.compound = wm.Compound();
+            this.pageOrientation = pageOrientation;
+
+            string[] info = wm.ProductName().Split(new char[] { ';' });
+            if (info.Length >= 2)
+            {
+                pruefvorlage = info[0];
+                zaehlertyp = info[1];
+            }
+            else if (info.Length == 1)
+            {
+                pruefvorlage = info[0];
+                zaehlertyp = compound ? "Verbundzähler" : "Einzelzähler";
+            }
+            else
+            {
+                pruefvorlage = wm.ProcedureName();
+                zaehlertyp = compound ? "Verbundzähler" : "Einzelzähler";
+            }
+
+            results = wm.RegularMeterTestRslts();
+
+			resultsCount = 0;
+            foreach (var mtr in wm.RegularMeterTestRslts())
+            {
+                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always) resultsCount++;
+            }
+
+			pageNr = 1;
+            if (compound)
+            {
+                /// Compound meter results
+                const int MaxOnFirstPage = 23;
+                const int MaxOnPage = 45;
+                if (resultsCount <= 7)
+                {
+                    nrPages = 1;
+                    firstTblRowsOnPage = new int[] { resultsCount };
+                    secondTblRowsOnPage = new int[] { resultsCount };
+                }
+                else if (resultsCount <= MaxOnFirstPage)
+                {
+                    nrPages = 2;
+                    firstTblRowsOnPage = new int[] { resultsCount, 0 };
+                    secondTblRowsOnPage = new int[] { 0, int.MaxValue };
+                }
+                else if (resultsCount <= MaxOnPage)
+                {
+                    nrPages = 3;
+                    firstTblRowsOnPage = new int[] { MaxOnFirstPage, (resultsCount - MaxOnFirstPage), 0 };
+                    int secondTblRowsOn2ndPage = Math.Max(0, MaxOnFirstPage + MaxOnPage - 2 - resultsCount);
+                    secondTblRowsOnPage = new int[] { 0, secondTblRowsOn2ndPage, resultsCount - secondTblRowsOn2ndPage };
+                }
+                else if (resultsCount <= MaxOnFirstPage + MaxOnPage)
+                {
+                    nrPages = 4;
+                    firstTblRowsOnPage = new int[] { MaxOnFirstPage, MaxOnPage, 0, 0 };
+                    secondTblRowsOnPage = new int[] { 0, 0, MaxOnPage, MaxOnFirstPage };
+                }
+                else
+                {
+                    nrPages = 5;
+                    firstTblRowsOnPage = new int[] { MaxOnFirstPage, MaxOnPage, (resultsCount - MaxOnFirstPage - MaxOnPage), 0 };
+                    secondTblRowsOnPage = new int[] { 0, 0, Math.Max(0, MaxOnFirstPage + 2 * MaxOnPage - 2 - resultsCount), MaxOnPage, MaxOnFirstPage };
+                }
+            }
+            else
+            {
+                /// Regular (single) meter results
+                const int MaxOnFirstPage = 27;
+                const int MaxOnPage = 45;
+                if (resultsCount <= 9)
+                {
+                    nrPages = 1;
+                    firstTblRowsOnPage = new int[] { resultsCount };
+                    secondTblRowsOnPage = new int[] { resultsCount };
+                }
+                else if (resultsCount <= MaxOnFirstPage)
+                {
+                    nrPages = 2;
+                    firstTblRowsOnPage = new int[] { resultsCount, 0 };
+                    secondTblRowsOnPage = new int[] { 0, int.MaxValue };
+                }
+                else if (resultsCount <= MaxOnPage)
+                {
+                    nrPages = 3;
+                    firstTblRowsOnPage = new int[] { MaxOnFirstPage, (resultsCount - MaxOnFirstPage), 0 };
+                    int secondTblRowsOn2ndPage = Math.Max(0, MaxOnFirstPage + MaxOnPage - 2 - resultsCount);
+                    secondTblRowsOnPage = new int[] { 0, secondTblRowsOn2ndPage, resultsCount - secondTblRowsOn2ndPage };
+                }
+                else if (resultsCount <= MaxOnFirstPage + MaxOnPage)
+                {
+                    nrPages = 4;
+                    firstTblRowsOnPage = new int[] { MaxOnFirstPage, MaxOnPage, 0, 0 };
+                    secondTblRowsOnPage = new int[] { 0, 0, MaxOnPage, MaxOnFirstPage };
+                }
+                else
+                {
+                    nrPages = 5;
+                    firstTblRowsOnPage = new int[] { MaxOnFirstPage, MaxOnPage, (resultsCount - MaxOnFirstPage - MaxOnPage), 0 };
+                    secondTblRowsOnPage = new int[] { 0, 0, Math.Max(0, MaxOnFirstPage + 2 * MaxOnPage - 2 - resultsCount), MaxOnPage, MaxOnFirstPage };
+                }
+            }
+
+			DefaultPageSettings.Landscape = (pageOrientation == PageOrientation.Landscape);
+		}
+
+		/// <summary>
+		/// Override the default onbeginPrint method of the PrintDocument Object.
+		/// </summary>
+		/// <param name=e></param>
+		/// <remarks></remarks>
+		protected override void OnBeginPrint(System.Drawing.Printing.PrintEventArgs e)
+		{
+			base.OnBeginPrint(e);
+
+            if (font == null) { font = new Font(FontFamilyName, 10, FontStyle.Regular); }
+            if (boldFont == null) { boldFont = new Font(FontFamilyName, 10, FontStyle.Bold); }
+            if (fontTitle == null) { fontTitle = new Font(FontFamilyName, 24, FontStyle.Bold); }
+        }
+
+		/// <summary>
+		/// Override the default OnPrintPage method of the PrintDocument.
+		/// </summary>
+		/// <param name=e></param>
+		/// <remarks>This provides the print logic for our document</remarks>
+		protected override void OnPrintPage(System.Drawing.Printing.PrintPageEventArgs e)
+		{
+			/// Run base code
+			base.OnPrintPage(e);
+
+            if (pageOrientation == PageOrientation.Portrait)
+            {
+                string[] templatePaths = new string[] { "C:\\TBF\\Templates\\MunichP.jpg", "C:\\TBF\\Templates\\MunichP.png", "C:\\TBF\\Templates\\MunichP.tif" };
+                foreach (var t in templatePaths)
+                {
+                    if (File.Exists(t))
+                    {
+                        e.Graphics.DrawImage(new Bitmap(Image.FromFile(t), 827, 1169), new Rectangle(0, 0, 827, 1169));
+                        break;
+                    }
+                }
+            }
+            else
+            {
+                string[] templatePaths = new string[] { "C:\\TBF\\Templates\\MunichL.jpg", "C:\\TBF\\Templates\\MunichL.png", "C:\\TBF\\Templates\\MunichL.tif" };
+                foreach (var t in templatePaths)
+                {
+                    if (File.Exists(t))
+                    {
+                        e.Graphics.DrawImage(new Bitmap(Image.FromFile(t), 1169, 827), new Rectangle(0, 0, 1169, 827));
+                        break;
+                    }
+                }
+            }
+
+			/// Set print area size and margins (in dots using 80 dpi)
+			int printHeight = base.DefaultPageSettings.PaperSize.Height - base.DefaultPageSettings.Margins.Top - base.DefaultPageSettings.Margins.Bottom;
+			int printWidth  = base.DefaultPageSettings.PaperSize.Width - base.DefaultPageSettings.Margins.Left - base.DefaultPageSettings.Margins.Right;
+			int leftMargin  = base.DefaultPageSettings.Margins.Left;	/// X
+			int topMargin = base.DefaultPageSettings.Margins.Top;		/// Y
+
+			/// Check if the user selected to print in Landscape mode
+			/// if they did then we need to swap height/width parameters
+			if (base.DefaultPageSettings.Landscape)
+			{
+				int tmp = printHeight;
+				printHeight = printWidth;
+				printWidth = tmp;
+			}
+
+			int x = leftMargin;
+			int y = topMargin;
+
+			/// Use the StringFormat class for the text layout of our document
+			StringFormat format = new StringFormat(StringFormatFlags.LineLimit);
+
+			int lineNr = FirstLineNr;
+
+			if (pageNr == 1)
+			{
+                /// This is the first page, drad the title, common part and the 1st table
+                
+                RectangleF printArea = new RectangleF(TitleX, TitleY, 667, 50);
+				e.Graphics.DrawString(wm.Batch.ProtocolTitle, this.fontTitle, Brushes.Black, printArea);
+
+                DrawCommonTop(e, ref lineNr, wm, pruefvorlage, docVersion);
+
+				lineNr += 2;
+				tableTop = SpacingOne * lineNr;
+			}
+			else
+			{
+                /// This appears on the top of the 2nd and every subsequent page.
+                /// 2nd table starts from the top of the page.
+				lineNr -= 3;
+
+				if (compound)
+				{
+					PrintBoldAt(e, Tab1, lineNr * SpacingOne, "Hauptzahler");
+					PrintBoldAt(e, Tab3, lineNr * SpacingOne, "Nebenzahler");
+					lineNr++;
+				}
+
+				PrintAt(e, Tab1, lineNr * SpacingOne, "Hersteller :");
+				PrintAt(e, Tab2, lineNr * SpacingOne, wm.Producer());
+				if (compound)
+				{
+					PrintAt(e, Tab3, lineNr * SpacingOne, "Hersteller :");
+					PrintAt(e, Tab4, lineNr * SpacingOne, wm.ProducerAux());
+				}
+				lineNr++;
+
+				PrintAt(e, Tab1, lineNr * SpacingOne, "Seriennummer :");
+				PrintAt(e, Tab2, lineNr * SpacingOne, wm.SerialNr);
+				if (compound)
+				{
+					PrintAt(e, Tab3, lineNr * SpacingOne, "Seriennummer :");
+					PrintAt(e, Tab4, lineNr * SpacingOne, wm.SerialNrAux);
+				}
+				lineNr += ((resultsCount + 2) * SpacingOneAndHalf) / SpacingOne + 2;
+
+                tableTop = TitleY + (compound ? 5 : 4) * SpacingOne;
+			}
+
+            if (firstTblRowsOnPage[pageNr - 1] > 0)
+            {
+                int from = 0;
+                for (int pN = 0; pN < pageNr - 1; pN++) from += firstTblRowsOnPage[pN];
+                Table table1 = PrepareTableOne(from, from + firstTblRowsOnPage[pageNr - 1] - 1);
+                tableTop = table1.Draw(e, Tab1, tableTop) + SpacingOneAndHalf;
+            }
+
+
+            if (secondTblRowsOnPage[pageNr - 1] > 0)
+            {
+                int from = 0;
+                for (int pN = 0; pN < pageNr - 1; pN++) from += secondTblRowsOnPage[pN];
+                Table table2 = PrepareTableTwo(from, from + secondTblRowsOnPage[pageNr - 1] - 1);
+                tableTop = table2.Draw(e, Tab1, tableTop) + SpacingOneAndHalf;
+            }
+
+            if (pageNr == nrPages)
+            {
+                int top = topMargin + printHeight - 8 * SpacingOne;
+                DrawCommonBottom(e, top, wm);
+            }
+            else
+            {
+                e.HasMorePages = true;
+            }
+
+            ///
+            ///  Draw a footer and increment the page number
+            ///
+            string pageNrText = string.Format("{0} {1}/{2}", Strings.Page, pageNr++, nrPages);
+            int pageNrWidth = (int)e.Graphics.MeasureString(pageNrText, font).Width;
+            PrintAt(e, leftMargin + (printWidth - pageNrWidth) / 2, topMargin + printHeight - SpacingOne, pageNrText);
+        }
+
+		/// <summary>
+		/// Prepares content and style of the first table.
+		/// </summary>
+        /// <param name="from">0-based index fo the first result to print</param>
+        /// <param name="to">0-based index fo the last result to print</param>
+        /// <returns>Prepared table</returns>
+        Table PrepareTableOne(int from = 0, int to = int.MaxValue)
+		{
+            Table table = new Table(7);
+            table.Style = tableStyle; 
+
+            string[] tableHeader = new string[]
+            {
+                "Prüflauf", 
+                "Q [l/h]", 
+                "Prüf-Vol.[l]",
+                compound ? "HZ-Vol.[l]" : "Z-Vol.[l]",
+                compound ? "NZ-Vol.[l]" : "-",
+                "Fehler [%]",
+                "Ergebnis",
+            };
+            table.AddRow(tableHeader, horizontalAlignment, verticalAlignment);
+
+            int rowCount = 0;
+            foreach (var mtr in wm.RegularMeterTestRslts()) 
+			{
+                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
+                {
+                    if (from <= rowCount && rowCount <= to)
+                    {
+                        double flow_ctv = (mtr.TestRslt.TestTime != 0) ? (3.6 * mtr.TestRslt.VolumeCTV / mtr.TestRslt.TestTime) : 0;
+
+                        if (compound)
+                        {
+                            Results.Entities.MeterTestRslt mainMtr = wm.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundMain);
+                            Results.Entities.MeterTestRslt auxMtr = wm.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundAux);
+
+                            table.AddRow(new string[] { mtr.Name(),
+                                                    Config.Units.ConvertTo(Config.Unit.lph, flow_ctv).ToString("F1"),
+					                                mtr.TestRslt.VolumeCTV.ToString("F2"),
+						                            mainMtr.VolumeMeter.ToString("F2"),
+						                            auxMtr.VolumeMeter.ToString("F2"),
+						                            mtr.Error.ToString("F2"),
+						                            mtr.Passed ? "iO" : "NiO" },
+                                         horizontalAlignment,
+                                         verticalAlignment);
+                        }
+                        else
+                        {
+                            table.AddRow(new string[] { mtr.Name(),
+                                                    Config.Units.ConvertTo(Config.Unit.lph, flow_ctv).ToString("F1"),
+					                                mtr.TestRslt.VolumeCTV.ToString("F2"),
+                                                    mtr.VolumeMeter.ToString("F2"),
+						                            "-",
+						                            mtr.Error.ToString("F2"),
+						                            mtr.Passed ? "iO" : "NiO" },
+
+                                         horizontalAlignment,
+                                         verticalAlignment);
+                        }
+                    }
+                    rowCount++;
+				}
+			}
+
+            return table;
+		}
+
+        /// <summary>
+        /// Prepares content and style of the second table.
+        /// </summary>
+        /// <param name="from">0-based index fo the first result to print</param>
+        /// <param name="to">0-based index fo the last result to print</param>
+        /// <returns>Prepared table</returns>
+        Table PrepareTableTwo(int from = 0, int to = int.MaxValue)
+		{
+            Table table = new Table(7);
+            table.Style = tableStyle;
+
+            string[] tableHeader = new string[]
+            {
+                "", 
+                "Q [l/h]", 
+                "Temperatur",
+                "Dichte",
+                "Prüfzeit",
+                "Druck Eing.",
+                "Druck Ausg.",
+            };
+            table.AddRow(tableHeader, horizontalAlignment, verticalAlignment);
+
+            int rowCount = 0;
+            foreach (var mtr in wm.RegularMeterTestRslts())
+			{
+                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
+                {
+                    if (from <= rowCount && rowCount <= to)
+                    {
+                        double flow_ctv = (mtr.TestRslt.TestTime != 0) ? (3.6 * mtr.TestRslt.VolumeCTV / mtr.TestRslt.TestTime) : 0;
+
+                        table.AddRow(new string[] { mtr.Name(),
+                                                Config.Units.ConvertTo(Config.Unit.lph, flow_ctv).ToString("F1"),
+                                                mtr.TestRslt.TempDownMean.ToString("F2"),
+					                            mtr.TestRslt.DensityDiv.ToString("F2"),
+					                            mtr.TestTime.ToString("F1"),
+					                            Config.Units.ConvertTo(Config.Unit.bar, mtr.TestRslt.PressUpMean).ToString("F3"),
+					                            Config.Units.ConvertTo(Config.Unit.bar, mtr.TestRslt.PressDownMean).ToString("F3") },
+                                     horizontalAlignment,
+                                     verticalAlignment);
+                    }
+                    rowCount++;
+                }
+			}
+
+            return table;
+		}
+
+        /// <summary>
+        /// Prints text on the top of the first page (title, common information).
+        /// </summary>
+        /// <param name="e"></param>
+        /// <param name="lineNr"></param>
+        /// <param name="wm"></param>
+        /// <param name="pruefvorlage"></param>
+        /// <param name="docVersion"></param>
+        void DrawCommonTop(PrintPageEventArgs e, ref int lineNr, Entities.WaterMeter wm, string pruefvorlage, string docVersion)
+        {
+            ///
+            /// 
+            ///
+            PrintAt(e, Tab1, lineNr * SpacingOne, docVersion);
+            lineNr++;
+            PrintBoldAt(e, Tab1, lineNr * SpacingOne, "Prüfstand Nr :");
+            PrintBoldAt(e, Tab2, lineNr * SpacingOne, wm.BenchId().ToString());
+            PrintBoldAt(e, Tab3, lineNr * SpacingOne, "Datum :");
+            PrintBoldAt(e, Tab4, lineNr * SpacingOne, wm.Batch.EndTime.Date.ToString("d"));
+            lineNr++;
+            PrintAt(e, Tab1, lineNr * SpacingOne, "Zählertyp :");
+            PrintAt(e, Tab2, lineNr * SpacingOne, zaehlertyp);
+            PrintAt(e, Tab3, lineNr * SpacingOne, "Eichjahr :");
+            PrintAt(e, Tab4, lineNr * SpacingOne, wm.YearOfProduction.ToString());
+            lineNr++;
+            PrintAt(e, Tab1, lineNr * SpacingOne, "Prüfvorlage :");
+            PrintAt(e, Tab2, lineNr * SpacingOne, pruefvorlage);
+            lineNr += 2;
+
+            if (compound)
+            {
+                PrintBoldAt(e, Tab1, lineNr * SpacingOne, "Hauptzahler");
+                PrintBoldAt(e, Tab3, lineNr * SpacingOne, "Nebenzahler");
+                lineNr++;
+            }
+
+            PrintAt(e, Tab1, lineNr * SpacingOne, "Hersteller :");
+            PrintAt(e, Tab2, lineNr * SpacingOne, wm.Producer());
+            if (compound)
+            {
+                PrintAt(e, Tab3, lineNr * SpacingOne, "Hersteller :");
+                PrintAt(e, Tab4, lineNr * SpacingOne, wm.ProducerAux());
+            }
+            lineNr++;
+
+            PrintAt(e, Tab1, lineNr * SpacingOne, "Seriennummer :");
+            PrintAt(e, Tab2, lineNr * SpacingOne, wm.SerialNr);
+            if (compound)
+            {
+                PrintAt(e, Tab3, lineNr * SpacingOne, "Seriennummer :");
+                PrintAt(e, Tab4, lineNr * SpacingOne, wm.SerialNrAux);
+            }
+            lineNr++;
+
+            PrintAt(e, Tab1, lineNr * SpacingOne, wm.NewQnames() ? "Q3 :" : "Qn :");
+            PrintAt(e, Tab2, lineNr * SpacingOne, wm.Q3_Qn().ToString());
+            if (compound)
+            {
+                PrintAt(e, Tab3, lineNr * SpacingOne, wm.NewQnames() ? "Q3 :" : "Qn :");
+                PrintAt(e, Tab4, lineNr * SpacingOne, wm.Q3_Qn_Aux().ToString());
+            }
+            lineNr++;
+
+            PrintAt(e, Tab1, lineNr * SpacingOne, "Zulassungszeichen :");
+            PrintAt(e, Tab2, lineNr * SpacingOne, wm.ApprovalInfo());
+            if (compound)
+            {
+                PrintAt(e, Tab3, lineNr * SpacingOne, "Zulassungszeichen :");
+                PrintAt(e, Tab4, lineNr * SpacingOne, wm.ApprovalInfoAux());
+            }
+            lineNr++;
+
+            PrintAt(e, Tab1, lineNr * SpacingOne, "Metr. klasse :");
+            PrintAt(e, Tab2, lineNr * SpacingOne, wm.MetrologicalClass());
+            if (compound)
+            {
+                PrintAt(e, Tab3, lineNr * SpacingOne, "Metr. klasse :");
+                PrintAt(e, Tab4, lineNr * SpacingOne, wm.MetrologicalClassAux());
+            }
+            lineNr++;
+
+            PrintAt(e, Tab1, lineNr * SpacingOne, "Stand :");
+            PrintAt(e, Tab2, lineNr * SpacingOne, wm.EndState);
+            if (compound)
+            {
+                PrintAt(e, Tab3, lineNr * SpacingOne, "Stand :");
+                PrintAt(e, Tab4, lineNr * SpacingOne, wm.EndStateAux);
+
+                lineNr += 2;
+                PrintAt(e, Tab1, lineNr * SpacingOne, "Umschaltpunkte :");
+                lineNr++;
+                PrintAt(e, Tab1, lineNr * SpacingOne, "Qsteig");
+                PrintAt(e, Tab2, lineNr * SpacingOne, (1000.0 * wm.QRise).ToString("F1") + " l/h");
+                lineNr++;
+                PrintAt(e, Tab1, lineNr * SpacingOne, "Qfall");
+                PrintAt(e, Tab2, lineNr * SpacingOne, (1000.0 * wm.QFall).ToString("F1") + " l/h");
+            }
+        }
+
+        /// <summary>
+        /// Prints text at the bottom of the last page (footer).
+        /// </summary>
+        /// <param name="e"></param>
+        /// <param name="lineNr"></param>
+        /// <param name="wm"></param>
+        void DrawCommonBottom(PrintPageEventArgs e, float top, Entities.WaterMeter wm)
+        {
+            int iTop = (int)top;
+
+            PrintAt(e, Tab1, iTop, "Temperatur");
+            PrintAt(e, Tab2, iTop, wm.Batch.AmbTempMean().ToString("F1") + " \x00b0C");
+            
+            iTop += SpacingOne;
+            
+            PrintAt(e, Tab1, iTop, "Feuchtigkeit");
+            PrintAt(e, Tab2, iTop, wm.Batch.AmbHumiMean().ToString("F0") + " %");
+            
+            iTop += SpacingOne;
+            
+            PrintAt(e, Tab1, iTop, "Luftdruck");
+            PrintAt(e, Tab2, iTop, Config.Units.ConvertTo(Config.Unit.mbar, wm.Batch.AmbPressMean()).ToString("F0") + " mbar");
+
+            iTop += SpacingOne;
+
+            PrintAt(e, Tab3, iTop, wm.Batch.EndTime.Date.ToString("d"));
+
+            iTop += SpacingOne;
+            
+            PrintAt(e, Tab3, iTop, "Datum");
+            PrintAt(e, Tab4, iTop, "Unterschrift");
+        }
+
+
+		void PrintAt(System.Drawing.Printing.PrintPageEventArgs e, Point p, string text)
+		{
+			PrintAt(e, p.X, p.Y, text);
+		}
+
+		void PrintAt(System.Drawing.Printing.PrintPageEventArgs e, int x, int y, string text)
+		{
+			RectangleF printArea = new RectangleF(x, y, 667, SpacingOne);
+			e.Graphics.DrawString(text, this.font, Brushes.Black, printArea);
+		}
+
+        void PrintBoldAt(System.Drawing.Printing.PrintPageEventArgs e, Point p, string text)
+        {
+            PrintBoldAt(e, p.X, p.Y, text);
+        }
+
+        void PrintBoldAt(System.Drawing.Printing.PrintPageEventArgs e, int x, int y, string text)
+        {
+            RectangleF printArea = new RectangleF(x, y, 667, SpacingOne);
+            e.Graphics.DrawString(text, this.boldFont, Brushes.Black, printArea);
+        }
+	}
+}

Results/Output/SensusTestInfo.cs

@@ -9,24 +9,20 @@ namespace Results.Output
 {
     public enum LogType
     {
-        Just_Q3Q2Q1,            /// pNrs = -1,3,2,1
-        Just_Q3Q2Q1_Alt,        /// pNrs = -1,5,2,1
-        Just_Q3Q2adjQ1,         /// pNrs = -1,3,2,1
-        Just_Q3Q2adjQ1_Alt,     /// pNrs = -1,5,2,1
-        JustA0A4_Q3Q2adjQ1,     /// pNrs = -2,-1,3,2,1 (Australia 169 MHz, raw data pNrs: -2,-1,4,3,2,1)
-        DEWA,           	    /// Q4, Q3, Q2adj, Q2, Q1
-        DEWA_wo_Q2,             /// Q4, Q3, Q2adj, Q1
-        Suez,           	    /// Two directions, with Q2 and Q2ac
-        Suez_smart,             /// There is only Q2ac in both directions
-        Suez_Repeatability,     /// 3xQ3, 3xQ2, 3xQ1 
-        Suez_EMP_DN15,          /// EMP: 12 flow rates
-        Suez_EMP_DN20,          /// EMP: 12 flow rates
-        Suez_EMP_DN32,          /// EMP: 12 flow rates
-        Suez_EMP_DN40,          /// EMP: 12 flow rates
-        Greece,                 /// Q3, Q2adj, Q2, Q1
-        S620,                   /// Q3, Q100, Q2, Q1
-        S620_Alt,               /// Q3, Q100, Q2, Q1
-        S620_Kiwa,
+        Just_Q3Q2Q1,        /// pNrs = 3,2,1
+        Just_Q3Q2Q1_Alt,    /// pNrs = 5,2,1
+        Just_Q3Q2adjQ1,     /// pNrs = 3,2,1
+        Just_Q3Q2adjQ1_Alt, /// pNrs = 5,2,1
+        DEWA,           	/// Q4, Q3, Q2adj, Q2, Q1
+        DEWA_wo_Q2,         /// Q4, Q3, Q2adj, Q1
+        Suez,           	/// Two directions, with Q2 and Q2ac
+        Suez_smart,         /// There is only Q2ac in both directions
+        Suez_Repeatability, /// 3xQ3, 3xQ2, 3xQ1 
+        Suez_EMP_DN15,      /// EMP: 12 flow rates
+        Suez_EMP_DN20,      /// EMP: 12 flow rates
+        Suez_EMP_DN32,      /// EMP: 12 flow rates
+        Suez_EMP_DN40,      /// EMP: 12 flow rates
+        Greece,             /// Q3, Q2adj, Q2, Q1
         Count,
         None,
     }
@@ -267,18 +263,6 @@ namespace Results.Output
                         new SensusTestInfo("Q1",           1,   "Q1",   1, "01",   1,   "Q1", Range.R100_110),
                     };
 
-                case LogType.JustA0A4_Q3Q2adjQ1:    /// Australia 169 MHz
-                    return new SensusTestInfo[]
-                    {
-                        ///                TBF            Oracle DB    Opto RAW   LU logfiles 
-                        new SensusTestInfo("Q2adj",        0,     "",   3, "03",   3,"Q2adj", Range.R100_110),
-                        new SensusTestInfo("Qjust_A0",    -1, "Just",  -1, "-1",  -1,  "Q-1", Range.R95_105),
-                        new SensusTestInfo("Qjust_A4",    -2, "Just",  -2, "-2",  -2,  "Q-2", Range.R95_105),
-                        new SensusTestInfo("Q3",           3,   "Q3",   4, "04",   4,   "Q3", Range.R90_100),
-                        new SensusTestInfo("Q2",           2,   "Q2",   2, "02",   2,   "Q2", Range.R100_110),
-                        new SensusTestInfo("Q1",           1,   "Q1",   1, "01",   1,   "Q1", Range.R100_110),
-                    };
-                
                 case LogType.DEWA:                  /// DEWA (with Q4 and Q2 after correction)
                     return new SensusTestInfo[]
                     {
@@ -430,33 +414,6 @@ namespace Results.Output
                         new SensusTestInfo("Q2",          2,    "Q2",   2, "02",   2,   "Q2", Range.R100_110),
                         new SensusTestInfo("Q1",          1,    "Q1",   1, "01",   1,   "Q1", Range.R100_110),
                     };
-
-                case LogType.S620:
-                    return new SensusTestInfo[]
-                    {
-                        ///                TBF           Oracle DB    Opto RAW   LU logfiles 
-                        new SensusTestInfo("Q3",          3,    "Q3",   3, "04",   3,   "Q3", Range.R90_100),
-                        new SensusTestInfo("Q2",          2,    "Q2",   2, "02",   2,   "Q2", Range.R100_110),
-                        new SensusTestInfo("Q1",          1,    "Q1",   1, "01",   1,   "Q1", Range.R100_110),
-                    };
-
-                case LogType.S620_Alt:
-                    return new SensusTestInfo[]
-                    {
-                        ///                TBF           Oracle DB    Opto RAW   LU logfiles 
-                        new SensusTestInfo("Q3",          5,    "Q3",   5, "04",   5,   "Q3", Range.R90_100),
-                        new SensusTestInfo("Q2",          2,    "Q2",   2, "02",   2,   "Q2", Range.R100_110),
-                        new SensusTestInfo("Q1",          1,    "Q1",   1, "01",   1,   "Q1", Range.R100_110),
-                    };
-
-                case LogType.S620_Kiwa:
-                    return new SensusTestInfo[]
-                    {
-                        ///                TBF           Oracle DB    Opto RAW   LU logfiles 
-                        new SensusTestInfo("Q4",          5,    "Q4",   5, "04",   5,   "Q4", Range.R90_100),
-                        new SensusTestInfo("Q2",          2,    "Q2",   2, "02",   2,   "Q2", Range.R100_110),
-                        new SensusTestInfo("Q1",          1,    "Q1",   1, "01",   1,   "Q1", Range.R100_110),
-                    };
             }
         }
 
@@ -515,7 +472,7 @@ namespace Results.Output
         /// 
         static bool TestShouldBeIncluded(Config.Entities.Test test)
         {
-            return test.DoEvaluate && test.IsRegular() && !test.Method.ToLower().Contains("iperlcommunication");
+            return test.DoEvaluate && !test.Method.ToLower().Contains("iperlcommunication");
         }
         /// 
         public static SensusTestInfo CreateFromTest(Config.Entities.Test test, int repetitionNr, int luID, string fullTestNameWoPart)
@@ -544,7 +501,7 @@ namespace Results.Output
                 QBezeichnungLog = fullTestNameWoPart,                       /// Flow name in Oracle database
                 Range = range,
                 Flow = (range == Range.R100_110) ? test.Qfrom : (range == Range.R90_100) ? test.Qto : (test.Qfrom + test.Qto) / 2,
-                TestTime = (int)Math.Round(test.TestTime),
+                TestTime = (int)Math.Round(test.TstTime),
                 ErrLimLoFromDB = test.ErrLimLo,
                 ErrLimHiFromDB = test.ErrLimHi,
                 Uncertainty = test.Uncertainty,

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("3.1.1464.0")]
-[assembly: AssemblyFileVersion("3.1.1464.0")]
+[assembly: AssemblyVersion("2.26.1458.0")]
+[assembly: AssemblyFileVersion("2.26.1458.0")]

Results/Resources/Strings.Designer.cs

@@ -510,15 +510,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Info flags.
-        /// </summary>
-        internal static string Info_flags {
-            get {
-                return ResourceManager.GetString("Info_flags", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Invalid Q2 correction factors.
         /// </summary>

Results/Resources/Strings.resx

@@ -828,7 +828,4 @@
   <data name="VName_Conduct" xml:space="preserve">
     <value>Conduct.</value>
   </data>
-  <data name="Info_flags" xml:space="preserve">
-    <value>Info flags</value>
-  </data>
 </root>

Results/Results.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;JUZNA_AFRIKA_NEW</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;GELSENWASSER;LANG_DE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -29,7 +29,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;JUZNA_AFRIKA_NEW</DefineConstants>
+    <DefineConstants>TRACE;GELSENWASSER;LANG_DE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -166,6 +166,9 @@
     <Compile Include="Output\Printers\PrintersCommon.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="Output\Printers\Munich\MunichPrintDocument.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="Output\Printers\OnePerMeter\OnePerMeterPrintDocument.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -192,10 +195,6 @@
     <Compile Include="WMeterRsltItemSpec.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Common\Common.csproj">
-      <Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
-      <Name>Common</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Config\Config.csproj">
       <Project>{743DF7DB-C7B6-42EB-986D-0F485E5588E4}</Project>
       <Name>Config</Name>

Results/Utils.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2016-2019 Sensus Slovensko a.s.
 ///
 using System;
 using System.Text;
@@ -11,7 +11,9 @@ namespace Results
 	{
 		public static string GetTestName(string name, int repeats, int repetitionNr)
 		{
-            return Common.Utils.GetTestName(name, repeats, repetitionNr);
+            if (name == null) return null;
+			if (repeats == 1) return name;
+			return string.Format("{0} ({1}/{2})", name, repetitionNr, repeats);
 		}
 
 		

Results/WMeterRsltItemSpec.cs

@@ -43,6 +43,13 @@ namespace Results
             return item2;
         }
 
+
+        /// 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;
+
+
 		///
 		/// Function to pick a MeterTestResult field and convert it into a string
 		/// 
@@ -175,9 +182,9 @@ namespace Results
 			/// Density
 			/// 
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Density,            Strings.Density + " ()",                         Quantity.Density, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetTestRslt(t).DensityLine)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Density_correction, Strings.Density_correction + " ()",              Quantity.Density, ItemCategory.BenchData,  (w, t, u, f, p) => FormatDbl(u, f, p, "V3", Config.Formulas.DensityCorrection(w.Batch.SampleDensity, w.Batch.SampleTemp))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Rho_Wa_calc,        string.Format("{0} of sample", Strings.Density), Quantity.Density, ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", w.Batch.SampleDensity)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.RhoDistilledWtrAtMeLineTemp, string.Format("{0} of distilled water at T line", Strings.Density), Quantity.Density, ItemCategory.BenchData, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", (w.GetTestRslt(t) == null) ? 0 : Config.Formulas.DistilledWaterDensityFromTemp((w.GetTestRslt(t).TempUpMean + w.GetTestRslt(t).TempDownMean) / 2))));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Density_correction, Strings.Density_correction + " ()",              Quantity.Density, ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", (w.Batch.DensityCorr))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Rho_Wa_calc,        string.Format("{0} of sample", Strings.Density), Quantity.Density, ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", RealDensity)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.RhoDistilledWtrAtMeLineTemp, string.Format("{0} of distilled water at T line", Strings.Density), Quantity.Density, ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", (w.GetTestRslt(t) == null) ? 0 : Config.Formulas.DistilledWaterDensityFromTemp((w.GetTestRslt(t).TempUpMean + w.GetTestRslt(t).TempDownMean) / 2))));
 
 			///
             /// Date and time 
@@ -203,22 +210,22 @@ namespace Results
             ///
             /// Flow
             ///
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_from,      string.Format("{0} {1}", Strings.VName_Flow, Strings.from),                   Quantity.Flow, ItemCategory.TestData,    (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).Qfrom())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_to,        string.Format("{0} {1}", Strings.VName_Flow, Strings.to),                     Quantity.Flow, ItemCategory.TestData,    (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).Qto())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow,        string.Format("{0} v r", Strings.VName_Flow),      Strings.Tooltip_Q_v_r,     Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowVolume)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_mean,  string.Format("{0} rim ()", Strings.VName_Flow),   Strings.Tooltip_Q_rim,     Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMean)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_min,   string.Format("{0} ref min ()", Strings.VName_Flow), Strings.Tooltip_Q_min,   Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMin)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_max,   string.Format("{0} ref max ()", Strings.VName_Flow), Strings.Tooltip_Q_max,   Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMax)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_start, string.Format("{0} ref start ()",Strings.VName_Flow),Strings.Tooltip_Q_start, Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowStart)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_end,   string.Format("{0} ref end ()", Strings.VName_Flow), Strings.Tooltip_Q_end,   Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowEnd)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Qc, string.Format("Qc"), "Calculated water meter flow",                                    Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V5", (w.GetMeterTestRslt(t).TestTime == 0 || w.GetTestRslt(t).PulsesMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV / w.GetMeterTestRslt(t).TestTime * 3.6 * w.GetMeterTestRslt(t).PulsesMaster / w.GetTestRslt(t).PulsesMaster)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv, string.Format("{0} ctv ()", Strings.VName_Flow), "CTV of the flow (mean val.)",  Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V5", (w.GetMeterTestRslt(t).TestTime == 0 || w.GetTestRslt(t).PulsesMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV / w.GetMeterTestRslt(t).TestTime * 3.6 * w.GetMeterTestRslt(t).PulsesMaster / w.GetTestRslt(t).PulsesMaster)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv_min, string.Format("{0} ctv min ()", Strings.VName_Flow), "Min. CTV of the flow", Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).VolumeMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV * w.GetTestRslt(t).FlowMin / w.GetTestRslt(t).VolumeMaster)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv_max, string.Format("{0} ctv max ()", Strings.VName_Flow), "Max. CTV of the flow", Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).VolumeMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV * w.GetTestRslt(t).FlowMax / w.GetTestRslt(t).VolumeMaster)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv_start, string.Format("{0} ctv start ()", Strings.VName_Flow), "Start flow CTV",   Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).VolumeMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV * w.GetTestRslt(t).FlowStart / w.GetTestRslt(t).VolumeMaster)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv_end, string.Format("{0} ctv end ()", Strings.VName_Flow), "End flow CTV",         Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).VolumeMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV * w.GetTestRslt(t).FlowEnd / w.GetTestRslt(t).VolumeMaster)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_rise, string.Format("{0} {1}", Strings.VName_Flow, Strings.rise),                        Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QRise == 0) ? "-" : FormatDbl(u, f, p, "V3", w.QRise)) : ""));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_fall,      string.Format("{0} {1}", Strings.VName_Flow, Strings.fall),                   Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QFall == 0) ? "-" : FormatDbl(u, f, p, "V3", w.QFall)) : ""));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_from,      string.Format("{0} {1}", Strings.VName_Flow, Strings.from),                   Quantity.Flow, ItemCategory.TestData,   (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).Qfrom())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_to,        string.Format("{0} {1}", Strings.VName_Flow, Strings.to),                     Quantity.Flow, ItemCategory.TestData,   (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).Qto())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow,        string.Format("{0} v r", Strings.VName_Flow),      Strings.Tooltip_Q_v_r,     Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowVolume)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_mean,  string.Format("{0} rim ()", Strings.VName_Flow),   Strings.Tooltip_Q_rim,     Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_min,   string.Format("{0} ref min ()", Strings.VName_Flow), Strings.Tooltip_Q_min,   Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMin)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_max,   string.Format("{0} ref max ()", Strings.VName_Flow), Strings.Tooltip_Q_max,   Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMax)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_start, string.Format("{0} ref start ()",Strings.VName_Flow),Strings.Tooltip_Q_start, Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_end,   string.Format("{0} ref end ()", Strings.VName_Flow), Strings.Tooltip_Q_end,   Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Qc,          string.Format("Qc"), "Calculated water meter flow",                           Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V5", w.GetTestRslt(t).FlowVolume)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv, string.Format("{0} ctv ()", Strings.VName_Flow), "CTV of the flow (mean val.)",  Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V5", w.GetTestRslt(t).FlowVolume)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv_min, string.Format("{0} ctv min ()", Strings.VName_Flow), "Min. CTV of the flow", Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).FlowMean == 0) ? w.GetTestRslt(t).FlowMin   : w.GetTestRslt(t).FlowVolume * w.GetTestRslt(t).FlowMin   / w.GetTestRslt(t).FlowMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv_max, string.Format("{0} ctv max ()", Strings.VName_Flow), "Max. CTV of the flow", Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).FlowMean == 0) ? w.GetTestRslt(t).FlowMax   : w.GetTestRslt(t).FlowVolume * w.GetTestRslt(t).FlowMax   / w.GetTestRslt(t).FlowMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv_start, string.Format("{0} ctv start ()", Strings.VName_Flow), "Start flow CTV",   Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).FlowMean == 0) ? w.GetTestRslt(t).FlowStart : w.GetTestRslt(t).FlowVolume * w.GetTestRslt(t).FlowStart / w.GetTestRslt(t).FlowMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv_end, string.Format("{0} ctv end ()", Strings.VName_Flow), "End flow CTV",         Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).FlowMean == 0) ? w.GetTestRslt(t).FlowEnd   : w.GetTestRslt(t).FlowVolume * w.GetTestRslt(t).FlowEnd   / w.GetTestRslt(t).FlowMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_rise,        string.Format("{0} {1}", Strings.VName_Flow, Strings.rise),                 Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QRise == 0) ? "-" : FormatDbl(u, f, p, "V3", w.QRise)) : ""));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_fall,        string.Format("{0} {1}", Strings.VName_Flow, Strings.fall),                 Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QFall == 0) ? "-" : FormatDbl(u, f, p, "V3", w.QFall)) : ""));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_sensitivity, string.Format("{0} {1}", Strings.VName_Flow, Strings.sensitivity),          Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QRise == 0) ? "-" : FormatDbl(u, f, p, "V3", w.QRise)) : ""));
 
             AllItems.Add(new WMeterRsltItemSpec(ItemID.ConstMaster,    string.Format("k MID ()"), "Const. of the reference flow meter",           Quantity.PulsePerLtr, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", ((w.GetTestRslt(t).ConstMaster < float.Epsilon) ? 0 : (1 / w.GetTestRslt(t).ConstMaster)))));
@@ -252,7 +259,7 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_avg,    string.Format("{0} DI avg ()", Strings.VName_Temp), Strings.Tooltip_T_di_avg, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempDivStart + w.GetTestRslt(t).TempDivEnd) / 2)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_min,    string.Format("{0} DI min ()", Strings.VName_Temp), Strings.Tooltip_T_di_min, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDivMin)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_max,    string.Format("{0} DI max ()", Strings.VName_Temp), Strings.Tooltip_T_di_max, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDivMax)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_rho_0,      string.Format("{0} RO0", Strings.VName_Temp),       Strings.Tooltip_T_rho_0,  Quantity.Temperature, ItemCategory.BenchData, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.Batch.SampleTemp)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_rho_0,      string.Format("{0} RO0",       Strings.VName_Temp), Strings.Tooltip_T_rho_0,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", AtTemperature)));
 #if HEAT_METERS
             AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Hi_mean,  string.Format("{0} hi me", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).Custom1)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Hi_start, string.Format("{0} hi st", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).Custom2)));
@@ -309,7 +316,7 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Amb_temp_start_end,  string.Format("{0} Amb ST/EN", Strings.VName_Temp),                           Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", (w.GetTestRslt(t) == null) ? w.Batch.AmbTempStart() : w.GetTestRslt(t).AmbTempStart,  (w.GetTestRslt(t) == null) ? w.Batch.AmbTempEnd()  : w.GetTestRslt(t).AmbTempEnd)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Amb_press_start_end, string.Format("{0} Amb ST/EN", Strings.VName_Press),                          Quantity.Pressure,    ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", (w.GetTestRslt(t) == null) ? w.Batch.AmbPressStart(): w.GetTestRslt(t).AmbPressStart, (w.GetTestRslt(t) == null) ? w.Batch.AmbPressEnd() : w.GetTestRslt(t).AmbPressEnd)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Amb_humi_start_end,  string.Format("{0} Amb ST/EN", Strings.VName_Humi),                           Quantity.Humidity,    ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V2", (w.GetTestRslt(t) == null) ? w.Batch.AmbHumiStart() : w.GetTestRslt(t).AmbHumiStart,  (w.GetTestRslt(t) == null) ? w.Batch.AmbHumiEnd()  : w.GetTestRslt(t).AmbHumiEnd)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Buoyancy,            "Buoyancy",                                                                   Quantity.Number,      ItemCategory.BenchData,  (w, t, u, f, p) => FormatDbl(u, f, p, "V6", w.Batch.Buoyancy)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Buoyancy, "Buoyancy ()", Quantity.Number, ItemCategory.TestResult, (w, t, u, f, p) => string.IsNullOrEmpty(t) ? FormatDbl(u, f, p, "V6", w.Batch.Buoyancy()) : ((w.GetTestRslt(t) != null) ? FormatDbl(u, f, p, "V6", (w.GetTestRslt(t).Buoyancy)) : "")));
 
             ///
             /// Error
@@ -331,11 +338,8 @@ namespace Results
 
             AllItems.Add(new WMeterRsltItemSpec(ItemID.ThreeState, "Three state result", Quantity.Enumerated, ItemCategory.MeterResult, (w, t, u, f, p) => FormatThreeState(f, w.ThreeStateFromTests())));
 
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.RefFlowmeter, "Ref. flowmeter", Quantity.String, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).RefFlowmeter()) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Scale,        "Scale",          Quantity.String, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).Scale())        : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Diverter,     "Diverter",       Quantity.String, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).Diverter())     : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.RegValve,     "Reg. valve",     Quantity.String, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).RegValve())     : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.ResultOrErrorFlags, "Winiki lub E", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.PassedOrErrorFlagsStr())));    /// PL specific result
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.RefFlowmeter,       "Ref. flowmeter", Quantity.String, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).RefFlowmeter()) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.ResultOrErrorFlags, "Winiki lub E",   Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.PassedOrErrorFlagsStr())));    /// PL specific result
 
             ///
             /// Water meter info
@@ -408,6 +412,7 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.User_description,    Strings.User_description,    Quantity.String,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, Users.Entities.User.EncodedStrToFullName(w.Batch.UserName))));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Legalizator,         Strings.Legalizator,         Quantity.String,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, Users.Entities.User.EncodedStrToLegalizator(w.Batch.UserName))));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Watermeters,         Strings.WMs,                 Quantity.String,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, w.Batch.WatermetersStr)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Protocol_title,      Strings.Protocol,            Quantity.String,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, w.Batch.ProtocolTitle)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_start_time,    Strings.Start,               Quantity.DateTime,    ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? w.Batch.StartTime.ToString() : string.Format(f, w.Batch.StartTime)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_end_time,      Strings.End,                 Quantity.DateTime,    ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? w.Batch.EndTime.ToString() : string.Format(f, w.Batch.EndTime)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Lite_per_pulse_Read, "1 / PlsPerLtr_Read",        Quantity.PulsePerLtr, ItemCategory.Other, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", (w.WaterMeterData.PulsesPerLtr != 0) ? 1/w.WaterMeterData.PulsesPerLtr : 0)));
@@ -446,12 +451,9 @@ namespace Results
   #endif
 #endif
 
-#if ORACLE_DB
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_AssignedSerialNr, "Assigned s/n",        Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.AssignedSerialNr)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_CompleteSerialNr, "Complete s/n",        Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.CompleteSerialNr)));
-#endif
-
 #if TURA_SPECIAL
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_AssignedSerialNr, "iPerl assigned s/n",        Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.AssignedSerialNr)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_CompleteSerialNr, "iPerl complete s/n",        Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.CompleteSerialNr)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_RadioAddress,     "iPerl radio address",       Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.RadioAddress)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_PaletteNr,        "iPerl palette nr.",         Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.PaletteNr)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_UmkartonNr,       "iPerl umkarton nr.",        Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.UmkartonNr)));
@@ -469,7 +471,6 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.TestPassed,   Strings.Test_passed + "()", Quantity.Boolean, ItemCategory.TestResult,  (w, t, u, f, p) => FormatBool(f, (w.GetMeterTestRslt(t) != null) && w.GetMeterTestRslt(t).Passed)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.ErrorFlags,   Strings.Error_flags + "()", Quantity.String,  ItemCategory.TestResult,  (w, t, u, f, p) => FormatStr(f, (w.GetTestRslt(t) != null) ? w.GetTestRslt(t).ErrorFlagsStr() : w.ErrorFlagsStr())));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.ErrorFlagsEx, Strings.Error_flags + "Ex", Quantity.String,  ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.ErrorFlagsStrEx())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.InfoFlags,    Strings.Info_flags + "()",  Quantity.String,  ItemCategory.TestResult,  (w, t, u, f, p) => FormatStr(f, (w.GetTestRslt(t) != null) ? w.GetTestRslt(t).InfoFlagsStr() : w.InfoFlagsStr())));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.E1, "E1 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E1) != 0) ? Strings.Yes : Strings.No));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.E2, "E2 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E2) != 0) ? Strings.Yes : Strings.No));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.E3, "E3 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E3) != 0) ? Strings.Yes : Strings.No));

ResultsBrowser/Filters/Factory.cs

@@ -20,6 +20,7 @@ namespace ResultsBrowser.Filters
                     DateFilter.GetFilterID(),
                     BatchNrFilter.GetFilterID(),
                     ProcedureFilter.GetFilterID(),
+                    ProtocolFilter.GetFilterID(),
                     QnFilter.GetFilterID(),
                     SerialNrFilter.GetFilterID(),
                     WMPositionFilter.GetFilterID(),
@@ -30,6 +31,7 @@ namespace ResultsBrowser.Filters
                     DateFilter.GetFilterName(),
                     BatchNrFilter.GetFilterName(),
                     ProcedureFilter.GetFilterName(),
+                    ProtocolFilter.GetFilterName(),
                     QnFilter.GetFilterName(),
                     SerialNrFilter.GetFilterName(),
                     WMPositionFilter.GetFilterName(),
@@ -44,6 +46,7 @@ namespace ResultsBrowser.Filters
             if (filterID == DateFilter.GetFilterID())            return new DateFilter();
             else if (filterID == BatchNrFilter.GetFilterID())    return new BatchNrFilter();
             else if (filterID == ProcedureFilter.GetFilterID())  return new ProcedureFilter();
+            else if (filterID == ProtocolFilter.GetFilterID())   return new ProtocolFilter();
             else if (filterID == QnFilter.GetFilterID())         return new QnFilter();
             else if (filterID == SerialNrFilter.GetFilterID())   return new SerialNrFilter();
             else if (filterID == WMPositionFilter.GetFilterID()) return new WMPositionFilter();
@@ -59,6 +62,7 @@ namespace ResultsBrowser.Filters
                 if (filterID == DateFilter.GetFilterID())            type = typeof(DateFilter);
                 else if (filterID == BatchNrFilter.GetFilterID())    type = typeof(BatchNrFilter);
                 else if (filterID == ProcedureFilter.GetFilterID())  type = typeof(ProcedureFilter);
+                else if (filterID == ProtocolFilter.GetFilterID())   type = typeof(ProtocolFilter);
                 else if (filterID == QnFilter.GetFilterID())         type = typeof(QnFilter);
                 else if (filterID == SerialNrFilter.GetFilterID())   type = typeof(SerialNrFilter);
                 else if (filterID == WMPositionFilter.GetFilterID()) type = typeof(WMPositionFilter);

ResultsBrowser/Filters/ProtocolFilter.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Windows.Forms;
+using System.Xml.Serialization;
+using NHibernate;
+using Results.Entities;
+using ResultsBrowser.Resources;
+
+namespace ResultsBrowser.Filters
+{
+    public class ProtocolFilter : IFilter
+    {
+        public static string GetFilterID() { return "Protocol"; }
+        public static string GetFilterName() { return Strings.Protocol; }
+
+        ///
+        /// Obligatory wrappers
+        ///
+        public string GetThisFilterID() { return GetFilterID(); }
+        public void Save(StringBuilder sb) { (new XmlSerializer(this.GetType())).Serialize(new StringWriter(sb), this); }
+        public void Data2UI() { userIface.Data2UI(); }
+        public void UI2Data() { userIface.UI2Data(); }
+        public UserControl GetFilterUI() { return userIface as UserControl; }
+
+        ///
+        /// Serialized filter data
+        ///
+        public string Protocol;
+
+
+        private ProtocolFilterUI userIface;
+
+        public ProtocolFilter()
+        {
+            userIface = new ProtocolFilterUI(this);
+        }
+
+        public IList<WaterMeter> ExecuteQuery(ISession[] sessions, IList<WaterMeter> waterMeters)
+        {
+            IList<WaterMeter> filteredWaterMeters = new List<WaterMeter>();
+
+            if (waterMeters == null)
+            {
+                foreach (var se in sessions)
+                {
+                    IList<Batch> batches = se.QueryOver<Batch>()
+                                             .Where(x => (x.ProtocolTitle == Protocol))
+                                             .List<Batch>();
+
+                    foreach (var b in batches)
+                    {
+                        foreach (var wm in b.WaterMeters) filteredWaterMeters.Add(wm);
+                    }
+                }
+            }
+            else
+            {
+                foreach (var wm in waterMeters)
+                {
+                    if (wm.Batch.ProtocolTitle == Protocol) filteredWaterMeters.Add(wm);
+                }
+            }
+
+            return filteredWaterMeters;
+        }
+    }
+}

ResultsBrowser/Filters/ProtocolFilterUI.Designer.cs

@@ -0,0 +1,72 @@
+namespace ResultsBrowser.Filters
+{
+    partial class ProtocolFilterUI
+    {
+        /// <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.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.protocolTextBox = new System.Windows.Forms.TextBox();
+            this.groupBox1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.protocolTextBox);
+            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.groupBox1.Location = new System.Drawing.Point(0, 0);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(835, 40);
+            this.groupBox1.TabIndex = 0;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Procedure";
+            // 
+            // procedureTextBox
+            // 
+            this.protocolTextBox.Location = new System.Drawing.Point(132, 13);
+            this.protocolTextBox.Name = "procedureTextBox";
+            this.protocolTextBox.Size = new System.Drawing.Size(138, 20);
+            this.protocolTextBox.TabIndex = 0;
+            // 
+            // ProcedureFilter
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.groupBox1);
+            this.Name = "ProcedureFilter";
+            this.Size = new System.Drawing.Size(835, 40);
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.TextBox protocolTextBox;
+    }
+}

ResultsBrowser/Filters/ProtocolFilterUI.cs

@@ -0,0 +1,39 @@
+using System.Windows.Forms;
+
+namespace ResultsBrowser.Filters
+{
+    public partial class ProtocolFilterUI : UserControl
+    {
+        ProtocolFilter data;
+
+        /// <summary> Used only by Designer </summary>
+        public ProtocolFilterUI()
+        {
+            InitializeComponent();
+            Localize();
+        }
+
+        /// <summary> Used to create the control aby a filter </summary>
+        public ProtocolFilterUI(ProtocolFilter data)
+        {
+            this.data = data;
+            InitializeComponent();
+            Localize();
+        }
+
+        void Localize()
+        {
+            groupBox1.Text = ProtocolFilter.GetFilterName();
+        }
+
+		public void Data2UI()
+		{
+            protocolTextBox.Text = (data.Protocol != null) ? data.Protocol : string.Empty;
+		}
+
+		public void UI2Data()
+		{
+            data.Protocol = protocolTextBox.Text;
+		}
+	}
+}

ResultsBrowser/Forms/PrinterConfigDlg.cs

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

ResultsBrowser/OraData.cs

@@ -20,11 +20,18 @@ namespace ResultsBrowser
         public DateTime End;
         public int HydrPruefung;
         public double AdjErr;
+        public double Q4Err;
+        public double Q3Err;
+        public double Q2AdjErr;
+        public double Q2Err;
+        public double Q1Err;
         public double AdjErrA4;
         public double Q3RlErr;
         public double Q3LrErr;
         public double Q2RlErr;
         public double Q2LrErr;
+        public double Q2acRlErr;
+        public double Q2acLrErr;
         public double Q1RlErr;
         public double Q1LrErr;
         public int CalibFactor;

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("3.1.1464.0")]
-[assembly: AssemblyFileVersion("3.1.1464.0")]
+[assembly: AssemblyVersion("2.26.1498.0")]
+[assembly: AssemblyFileVersion("2.26.1498.0")]

ResultsBrowser/Resources/Strings1.Designer.cs

@@ -19,7 +19,7 @@ namespace ResultsBrowser.Resources {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Strings {

ResultsBrowser/ResultsBrowser.csproj

@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;JUZNA_AFRIKA_NEW</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;GELSENWASSER;LANG_DE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -32,7 +32,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;JUZNA_AFRIKA_NEW</DefineConstants>
+    <DefineConstants>TRACE;GELSENWASSER;LANG_DE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -96,6 +96,13 @@
     <Compile Include="Filters\ProcedureFilterUI.Designer.cs">
       <DependentUpon>ProcedureFilterUI.cs</DependentUpon>
     </Compile>
+    <Compile Include="Filters\ProtocolFilter.cs" />
+    <Compile Include="Filters\ProtocolFilterUI.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Filters\ProtocolFilterUI.designer.cs">
+      <DependentUpon>ProtocolFilterUI.cs</DependentUpon>
+    </Compile>
     <Compile Include="Filters\QnFilter.cs" />
     <Compile Include="Filters\QnFilterUI.cs">
       <SubType>UserControl</SubType>
@@ -212,6 +219,9 @@
     <EmbeddedResource Include="Filters\ProcedureFilterUI.resx">
       <DependentUpon>ProcedureFilterUI.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Filters\ProtocolFilterUI.resx">
+      <DependentUpon>ProtocolFilterUI.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Filters\QnFilterUI.resx">
       <DependentUpon>QnFilterUI.cs</DependentUpon>
     </EmbeddedResource>

ResultsBrowser/ResultsBrowserWnd.cs

@@ -7,9 +7,9 @@ using System.IO;
 using System.Windows.Forms;
 using NHibernate;
 using Results.Entities;
-using TBF.Rig;
-using TBF.Rig.Generic;
-using TBF.Rig.GenericDevices;
+using TBF.BenchControl;
+using TBF.BenchControl.Generic;
+using TBF.BenchControl.GenericDevices;
 using ResultsBrowser.Filters;
 using ResultsBrowser.Resources;
 using Oracle;
@@ -33,9 +33,9 @@ namespace ResultsBrowser
 
         static IList<IComponent> tbfComponents;
         static IList<IDevice> tbfDevices;
-#if IPERL
+
         OracleConnection oracleConnection;    /// Oracle database connection
-#endif
+
         public ResultsBrowserWnd(string[] args)
         {
             InitializeComponent();
@@ -44,7 +44,7 @@ namespace ResultsBrowser
             filtersConfig = new FiltersConfig();
             this.args = args;
 
-            tbfComponents = new List<TBF.Rig.Generic.IComponent>();
+            tbfComponents = new List<TBF.BenchControl.Generic.IComponent>();
             tbfDevices = new List<IDevice>();
 
             timePeriodStart = new DateTime(0);
@@ -409,7 +409,12 @@ namespace ResultsBrowser
         {
             if (waterMeters == null || waterMeters.Count == 0) return;
 
-#if CEVAK_40
+#if MUNICH
+            foreach (var wm in waterMeters)
+            {
+                new Results.Output.Printers.Munich.MunichPrintDocument(string.Format("4/13 - {0}", BenchName()), wm, Config.Entities.PageOrientation.Portrait).Print();
+            }
+#elif CEVAK_40
 			IList<Results.Entities.Batch> batches = new List<Results.Entities.Batch>();
 			foreach (var wm in waterMeters)
 			{
@@ -604,12 +609,22 @@ namespace ResultsBrowser
                         while (dr.Read())
                         {
                             int i = 0;
-                            string queryResult = dr.GetString(i++);
+                            
+                            string queryResult;
+                            try { queryResult = dr.GetString(i++); }
+                            catch { queryResult = string.Empty; }
+                            
                             int maxPruefIx = dr.GetInt32(i++);
                             int testBenchId = maxPruefIx / 100;
                             maxPruefIx = maxPruefIx % 100;
-                            string prefix = dr.GetString(i++);
-                            int sn = dr.GetInt32(i++);
+                            
+                            string prefix;
+                            try { prefix = dr.GetString(i++); }
+                            catch { prefix = string.Empty; }
+                            
+                            int sn;
+                            try { sn = dr.GetInt32(i++); }
+                            catch { sn = -1; }
 
                             if (sn == -1) continue;
 
@@ -724,16 +739,35 @@ namespace ResultsBrowser
                             double flow = dr.GetDouble(i++);            /// Q_WZ
                             double error = dr.GetDouble(i++);           /// Q_FEHLER
                             bool testPassed = (dr.GetInt32(i++) != 0);
-
+#if true
                             /// SUEZ specific
                             switch (testId)
                             {
                                 case -2: oraD.AdjErrA4 = error; break;
                                 case -1: oraD.AdjErr = error; break;
-                                case 5: oraD.Q3LrErr = error; break;
+                                case 1:  oraD.Q1LrErr = error; break;
+                                case 2:  oraD.Q2acLrErr = error; break;
+                                case 3:  oraD.Q2LrErr = error; break;
+                                case 5:  oraD.Q3LrErr = error; break;
+                                case 6:  oraD.Q1RlErr = error; break;
+                                case 7:  oraD.Q2acRlErr = error; break;
+                                case 8:  oraD.Q2RlErr = error; break;
                                 case 10: oraD.Q3RlErr = error; break;
                                 default: break;
                             }
+
+#else                        /// DEWA specific
+                            switch (testId)
+                            {
+                                case -1: oraD.AdjErr = error; break;
+                                case 1:  oraD.Q1Err = error; break;
+                                case 2:  oraD.Q2Err = error; break;
+                                case 3:  oraD.Q2AdjErr = error; break;
+                                case 4:  oraD.Q3Err = error; break;
+                                case 5:  oraD.Q4Err = error; break;
+                                default: break;
+                            }
+#endif
                         }
                         dr.Close();
                     }   /// end of foreach (var oraD in OraDatas)
@@ -919,11 +953,12 @@ namespace ResultsBrowser
                 consoleTextBox.Text += "CSV data begin\r\n";
                 using (TextWriter writer = new StreamWriter(dlg.DestinationFile))
                 {
-                    writer.WriteLine(string.Format("PO; prefix; S/N; PcbNr; Bench; Batch; Start; Start; End; End; Pos; AdjA0; AdjA4; Q3RL; Q3LR; CalF; CAlF_LNA; HP; Q2cRL; Q2cLR"));
+#if true
+                    writer.WriteLine(string.Format("PO; prefix; S/N; PcbNr; Bench; Batch; Start; Start; End; End; Pos; AdjA0; AdjA4; Q3RL; Q3LR; Q2RL; Q2LR; Q2acRL; Q2acLR; Q1RL; Q1LR; CalF; CAlF_LNA; HP; Q2cRL; Q2cLR"));
                     //Console.WriteLine(string.Format("s/n;PCB nr.;bench;batch;position;Err. at 640 l/h;Err. LNA at 640 l/h;Err. Q3 RL;Err. Q3 LR;Cal.f.;Cal.f.LNA;Q2 corr.f. RL;Q2 corr.f. LR"));
                     foreach (var oraD in oraDatas)
                     {
-                        writer.WriteLine(string.Format("{0}; {1}; {2}; =(\"{3}\"); {4}; {5}; {7}; {8}; {9}; {10};{11};{12};{13};{14};{15};{16};{17};{18};{19};{20}",
+                        writer.WriteLine(string.Format("{0}; {1}; {2}; =(\"{3}\"); {4}; {5}; {7}; {8}; {9}; {10};{11};{12};{13};{14};{15};{16};{17};{18};{19};{20};{21};{22};{23};{24};{25};{26};{27};{28}",
                             //Console.WriteLine(string.Format("{2};=(\"{3}\"); {4};{5};{11};{12};{13};{14};{15};{16};{17};{19};{20}",
                             /*  0 */  oraD.PO,
                             /*  1 */  oraD.Prefix,
@@ -937,18 +972,57 @@ namespace ResultsBrowser
                             /*  9 */  oraD.End.ToShortDateString(),
                             /* 10 */  oraD.End.ToShortTimeString(),
                             /* 11 */  oraD.WMPosition,
-                            /* 12 */  oraD.AdjErr.ToString("F2"),
-                            /* 13 */  oraD.AdjErrA4.ToString("F2"),
-                            /* 14 */  oraD.Q3RlErr.ToString("F2"),
-                            /* 15 */  oraD.Q3LrErr.ToString("F2"),
-                            /* 16 */  oraD.CalibFactor,
-                            /* 17 */  oraD.CalibFactorLNA,
-                            /* 18 */  oraD.HydrPruefung,
-                            /* 19 */  oraD.Q2CorrectionRl,
-                            /* 20 */  oraD.Q2CorrectionLr,
-                            /* 21 */  oraD.WMTypeId,
-                            /* 22 */  oraD.WMTypeRev));
+                            /* 12 */  oraD.AdjErr.ToString("F3"),
+                            /* 13 */  oraD.AdjErrA4.ToString("F3"),
+                            /* 14 */  oraD.Q3RlErr.ToString("F3"),
+                            /* 15 */  oraD.Q3LrErr.ToString("F3"),
+                            /* 16 */  oraD.Q2RlErr.ToString("F3"),
+                            /* 17 */  oraD.Q2LrErr.ToString("F3"),
+                            /* 18 */  oraD.Q2acRlErr.ToString("F3"),
+                            /* 19 */  oraD.Q2acLrErr.ToString("F3"),
+                            /* 20 */  oraD.Q1RlErr.ToString("F3"),
+                            /* 21 */  oraD.Q1LrErr.ToString("F3"),
+                            /* 22 */  oraD.CalibFactor,
+                            /* 23 */  oraD.CalibFactorLNA,
+                            /* 24 */  oraD.HydrPruefung,
+                            /* 25 */  oraD.Q2CorrectionRl,
+                            /* 26 */  oraD.Q2CorrectionLr,
+                            /* 27 */  oraD.WMTypeId,
+                            /* 28 */  oraD.WMTypeRev));
                     }
+#else
+                    writer.WriteLine(string.Format("PO; prefix; S/N; PcbNr; Bench; Batch; Start; Start; End; End; Pos; AdjA0; Q4; Q3; Q2Adj; Q2; Q1; CalF; HP; Q2cRL; Q2cLR"));
+                    //Console.WriteLine(string.Format("s/n;PCB nr.;bench;batch;position;Err. at 640 l/h;Err. LNA at 640 l/h;Err. Q3 RL;Err. Q3 LR;Cal.f.;Cal.f.LNA;Q2 corr.f. RL;Q2 corr.f. LR"));
+                    foreach (var oraD in oraDatas)
+                    {
+                        writer.WriteLine(string.Format("{0}; {1}; {2}; =(\"{3}\"); {4}; {5}; {7}; {8}; {9}; {10};{11};{12};{13};{14};{15};{16};{17};{18};{19};{20};{21}",
+                            //Console.WriteLine(string.Format("{2};=(\"{3}\"); {4};{5};{11};{12};{13};{14};{15};{16};{17};{19};{20}",
+                            /*  0 */  oraD.PO,
+                            /*  1 */  oraD.Prefix,
+                            /*  2 */  oraD.SN,
+                            /*  3 */  oraD.PcbNr,
+                            /*  4 */  GetBenchName(oraD.TestBenchId),
+                            /*  5 */  oraD.BatchNr,
+                            /*  6 */  oraD.ProgramVer,
+                            /*  7 */  oraD.Start.ToShortDateString(),
+                            /*  8 */  oraD.Start.ToShortTimeString(),
+                            /*  9 */  oraD.End.ToShortDateString(),
+                            /* 10 */  oraD.End.ToShortTimeString(),
+                            /* 11 */  oraD.WMPosition,
+                            /* 12 */  oraD.AdjErr.ToString("F3"),
+                            /* 13 */  oraD.Q4Err.ToString("F3"),
+                            /* 14 */  oraD.Q3Err.ToString("F3"),
+                            /* 15 */  oraD.Q2AdjErr.ToString("F3"),
+                            /* 16 */  oraD.Q2Err.ToString("F3"),
+                            /* 17 */  oraD.Q1Err.ToString("F3"),
+                            /* 18 */  oraD.CalibFactor,
+                            /* 19 */  oraD.HydrPruefung,
+                            /* 20 */  oraD.Q2CorrectionRl,
+                            /* 21 */  oraD.Q2CorrectionLr,
+                            /* 22 */  oraD.WMTypeId,
+                            /* 23 */  oraD.WMTypeRev));
+                    }
+#endif
                 }
                 consoleTextBox.Text += "CSV data end\r\n";
 

SchematicDrawing/DrawingShape.cs

@@ -1,579 +0,0 @@
-///
-/// Copyright (c) 2020 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SchematicDrawing
-{
-    public class DrawingShape
-    {
-        public readonly Shape Shape;            /// see enum SchematicDrawing.Shape
-        public readonly Sz Sz;                  /// see enum SchematicDrawing.Sz
-        public readonly int SzX;                /// Size X in SchematicDrawing.Const.Step pixels
-        public readonly int SzY;                /// Size Y in SchematicDrawing.Const.Step pixels
-
-        public readonly int OffsX;              /// Offset of left/top coordinate of the bitmap when rendering
-        public readonly int OffsY;              /// Offset of left/top coordinate of the bitmap when rendering
-        public readonly int Wid;                /// Width of the bitmap when rendering, original bitmap is resized to this size
-        public readonly int Hgh;                /// Height of the bitmap when rendering, original bitmap is resized to this size
-
-        public readonly Node[] Nodes;           /// Nodes of this shape
-        public readonly Edge[] Edges;           /// Edges (in the open state in case there are two states: open/closed)
-
-        /// open (route bit = 1), wet
-        public readonly bool HasImg;            /// True when there is an image of this item to be displayed
-        public readonly Image ImgRight;         /// Bitmap to be drawn (in the open state in case there are two states: open/closed)
-        public readonly Image ImgUp;
-        public readonly Image ImgLeft;
-        public readonly Image ImgDown;
-        public readonly Image ImgRightFlipped;
-        public readonly Image ImgUpFlipped;
-        public readonly Image ImgLeftFlipped;
-        public readonly Image ImgDownFlipped;
-
-        /// open (route bit = 1), dry
-        public readonly bool HasOpenDry;         /// true = this shape can be displayed as dry in an open state
-        public readonly Image ImgRightOpenDry;   /// Optional bitmap in the closed state, size should be the same as the size of Bmp
-        public readonly Image ImgUpOpenDry;
-        public readonly Image ImgLeftOpenDry;
-        public readonly Image ImgDownOpenDry;
-        public readonly Image ImgRightFlippedOpenDry;
-        public readonly Image ImgUpFlippedOpenDry;
-        public readonly Image ImgLeftFlippedOpenDry;
-        public readonly Image ImgDownFlippedOpenDry;
-
-        /// closed (route bit = 0), wet
-        public readonly bool HasClosedWet;          /// true = This shape can be displayed as wet in a closed state
-        public readonly Image ImgRightClosedWet;    /// Optional bitmap in the closed state, size should be the same as the size of Bmp
-        public readonly Image ImgUpClosedWet;
-        public readonly Image ImgLeftClosedWet;
-        public readonly Image ImgDownClosedWet;
-        public readonly Image ImgRightFlippedClosedWet;
-        public readonly Image ImgUpFlippedClosedWet;
-        public readonly Image ImgLeftFlippedClosedWet;
-        public readonly Image ImgDownFlippedClosedWet;
-
-        /// closed (route bit = 0), dry
-        public readonly bool HasClosedDry;          /// true = This shape can be displayed as dry in a closed state
-        public readonly Image ImgRightClosedDry;    /// Optional bitmap in the closed state, size should be the same as the size of Bmp
-        public readonly Image ImgUpClosedDry;
-        public readonly Image ImgLeftClosedDry;
-        public readonly Image ImgDownClosedDry;
-        public readonly Image ImgRightFlippedClosedDry;
-        public readonly Image ImgUpFlippedClosedDry;
-        public readonly Image ImgLeftFlippedClosedDry;
-        public readonly Image ImgDownFlippedClosedDry;
-
-        public readonly bool HasVacuum;         /// true = This shape can display vacuum
-        public readonly Image ImgRightVacuum;   /// Optional bitmap in the closed state, size should be the same as the size of Bmp
-        public readonly Image ImgUpVacuum;
-        public readonly Image ImgLeftVacuum;
-        public readonly Image ImgDownVacuum;
-        public readonly Image ImgRightFlippedVacuum;
-        public readonly Image ImgUpFlippedVacuum;
-        public readonly Image ImgLeftFlippedVacuum;
-        public readonly Image ImgDownFlippedVacuum;
-
-
-        DrawingShape(Shape shape, Sz sz, int szX, int szY, Node[] nodes = null, Edge[] edges = null,
-                     int offsX = -10, int offsY = -10, int wid = 20, int hgh = 20,
-                     Bitmap bmp = null,             /// wet, open (route bit = 1)
-                     Bitmap bmpClosedDry = null,    /// dry (Dist == int.MaxValue), closed (route bit = 0)
-                     Bitmap bmpVacuum = null,       /// vacuum (int.MaxValue > Dist && Dist > Const.Vacuum)
-                     Bitmap bmpOpenDry = null,      /// dry (Dist == int.MaxValue), open (route bit = 1)
-                     Bitmap bmpClosedWet = null)    /// wet, closed (route bit = 0) ... diverter only
-        {
-            Shape = shape;
-            Sz = sz;
-            SzX = szX;
-            SzY = szY;
-            OffsX = offsX;
-            OffsY = offsY;
-            Wid = wid;
-            Hgh = hgh;
-            Nodes = (nodes != null) ? nodes : new Node[0];
-            Edges = (edges != null) ? edges : new Edge[0];
-
-            HasImg = (bmp != null);
-            if (HasImg)
-            {
-                ImgRight = bmp.Clone() as Image;
-                bmp.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgDown = bmp.Clone() as Image;
-                bmp.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgLeft = bmp.Clone() as Image;
-                bmp.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgUp = bmp.Clone() as Image;
-                bmp.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                bmp.RotateFlip(RotateFlipType.RotateNoneFlipY);
-                ImgRightFlipped = bmp.Clone() as Image;
-                bmp.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgDownFlipped = bmp.Clone() as Image;
-                bmp.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgLeftFlipped = bmp.Clone() as Image;
-                bmp.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgUpFlipped = bmp.Clone() as Image;
-                bmp.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                bmp.RotateFlip(RotateFlipType.RotateNoneFlipY);
-            }
-            HasClosedDry = (bmpClosedDry != null);
-            if (HasClosedDry)
-            {
-                ImgRightClosedDry = bmpClosedDry.Clone() as Image;
-                bmpClosedDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgDownClosedDry = bmpClosedDry.Clone() as Image;
-                bmpClosedDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgLeftClosedDry = bmpClosedDry.Clone() as Image;
-                bmpClosedDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgUpClosedDry = bmpClosedDry.Clone() as Image;
-                bmpClosedDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                bmpClosedDry.RotateFlip(RotateFlipType.RotateNoneFlipY);
-                ImgRightFlippedClosedDry = bmpClosedDry.Clone() as Image;
-                bmpClosedDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgDownFlippedClosedDry = bmpClosedDry.Clone() as Image;
-                bmpClosedDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgLeftFlippedClosedDry = bmpClosedDry.Clone() as Image;
-                bmpClosedDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgUpFlippedClosedDry = bmpClosedDry.Clone() as Image;
-                bmpClosedDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                bmpClosedDry.RotateFlip(RotateFlipType.RotateNoneFlipY);
-            }
-            HasVacuum = (bmpVacuum != null);
-            if (HasVacuum)
-            {
-                ImgRightVacuum = bmpVacuum.Clone() as Image;
-                bmpVacuum.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgDownVacuum = bmpVacuum.Clone() as Image;
-                bmpVacuum.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgLeftVacuum = bmpVacuum.Clone() as Image;
-                bmpVacuum.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgUpVacuum = bmpVacuum.Clone() as Image;
-                bmpVacuum.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                bmpVacuum.RotateFlip(RotateFlipType.RotateNoneFlipY);
-                ImgRightFlippedVacuum = bmpVacuum.Clone() as Image;
-                bmpVacuum.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgDownFlippedVacuum = bmpVacuum.Clone() as Image;
-                bmpVacuum.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgLeftFlippedVacuum = bmpVacuum.Clone() as Image;
-                bmpVacuum.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgUpFlippedVacuum = bmpVacuum.Clone() as Image;
-                bmpVacuum.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                bmpVacuum.RotateFlip(RotateFlipType.RotateNoneFlipY);
-            }
-            HasOpenDry = (bmpOpenDry != null);
-            if (HasOpenDry)
-            {
-                ImgRightOpenDry = bmpOpenDry.Clone() as Image;
-                bmpOpenDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgDownOpenDry = bmpOpenDry.Clone() as Image;
-                bmpOpenDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgLeftOpenDry = bmpOpenDry.Clone() as Image;
-                bmpOpenDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgUpOpenDry = bmpOpenDry.Clone() as Image;
-                bmpOpenDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                bmpOpenDry.RotateFlip(RotateFlipType.RotateNoneFlipY);
-                ImgRightFlippedOpenDry = bmpOpenDry.Clone() as Image;
-                bmpOpenDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgDownFlippedOpenDry = bmpOpenDry.Clone() as Image;
-                bmpOpenDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgLeftFlippedOpenDry = bmpOpenDry.Clone() as Image;
-                bmpOpenDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgUpFlippedOpenDry = bmpOpenDry.Clone() as Image;
-                bmpOpenDry.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                bmpOpenDry.RotateFlip(RotateFlipType.RotateNoneFlipY);
-            }
-            HasClosedWet = (bmpClosedWet != null);
-            if (HasClosedWet)
-            {
-                ImgRightClosedWet = bmpClosedWet.Clone() as Image;
-                bmpClosedWet.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgDownClosedWet = bmpClosedWet.Clone() as Image;
-                bmpClosedWet.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgLeftClosedWet = bmpClosedWet.Clone() as Image;
-                bmpClosedWet.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgUpClosedWet = bmpClosedWet.Clone() as Image;
-                bmpClosedWet.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                bmpClosedWet.RotateFlip(RotateFlipType.RotateNoneFlipY);
-                ImgRightFlippedClosedWet = bmpClosedWet.Clone() as Image;
-                bmpClosedWet.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgDownFlippedClosedWet = bmpClosedWet.Clone() as Image;
-                bmpClosedWet.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgLeftFlippedClosedWet = bmpClosedWet.Clone() as Image;
-                bmpClosedWet.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                ImgUpFlippedClosedWet = bmpClosedWet.Clone() as Image;
-                bmpClosedWet.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                bmpClosedWet.RotateFlip(RotateFlipType.RotateNoneFlipY);
-            }
-        }
-
-        public Rectangle GetRotatedFlippedImageRectangle(IDrawingItem item)
-        {
-            const int G = SchematicDrawing.Const.GridSize;
-
-            if (item.Flip)
-            {
-                /// Flipped (mirror) image
-                switch (item.Orient)
-                {
-                    default:
-                    case Orient.R:  return new Rectangle(item.X + OffsX,                 item.Y + G * SzY - Hgh - OffsY, Wid, Hgh);
-                    case Orient.Up: return new Rectangle(item.X + OffsY,                 item.Y + OffsX,                 Hgh, Wid);
-                    case Orient.L:  return new Rectangle(item.X + G * SzX - Wid - OffsX, item.Y + OffsY,                 Wid, Hgh);
-                    case Orient.Dn: return new Rectangle(item.X + G * SzY - Hgh - OffsY, item.Y + G * SzX - Wid - OffsX, Hgh, Wid);
-                }
-            }
-            else
-            {
-                /// Normal image
-                switch (item.Orient)
-                {
-                    default:
-                    case Orient.R:  return new Rectangle(item.X + OffsX,                 item.Y + OffsY,                 Wid, Hgh);
-                    case Orient.Up: return new Rectangle(item.X + OffsY,                 item.Y + G * SzX - Wid - OffsX, Hgh, Wid);
-                    case Orient.L:  return new Rectangle(item.X + G * SzX - Wid - OffsX, item.Y + G * SzY - Hgh - OffsY, Wid, Hgh);
-                    case Orient.Dn: return new Rectangle(item.X + G * SzY - Hgh - OffsY, item.Y + OffsX,                 Hgh, Wid);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Get coordinates and orientation of the rotated/flipped node
-        /// </summary>
-        /// <param name="item">Item</param>
-        /// <param name="nodeId">Node id</param>
-        /// <returns>Rotated/flipped node</returns>
-        public Node GetRotatedFlippedNode(IDrawingItem item, int nodeId)
-        {
-            if (Nodes == null || nodeId < 0 || nodeId >= Nodes.Length) return new Node(0, 0, Orient.R);
-            Node node = Nodes[nodeId];
-
-            if (item.Flip)
-            {
-                /// Flipped
-                int ori = (int)node.Orient;
-                if (ori % 2 == 1) ori += 2;
-                ori += (int)item.Orient;
-                switch (item.Orient)
-                {
-                    default:
-                    case Orient.R:  return new Node(node.X,       SzY - node.Y, (Orient)(ori % 4));
-                    case Orient.Up: return new Node(SzY - node.Y, SzX - node.X, (Orient)(ori % 4));
-                    case Orient.L:  return new Node(SzX - node.X, node.Y,       (Orient)(ori % 4));
-                    case Orient.Dn: return new Node(node.Y,       node.X,       (Orient)(ori % 4));
-                }
-            }
-            else
-            {
-                /// Normal
-                int ori = (int)item.Orient + (int)node.Orient;
-                switch (item.Orient)
-                {
-                    default:
-                    case Orient.R:  return new Node(node.X,       node.Y,       (Orient)(ori % 4));
-                    case Orient.Up: return new Node(node.Y,       SzX - node.X, (Orient)(ori % 4));
-                    case Orient.L:  return new Node(SzX - node.X, SzY - node.Y, (Orient)(ori % 4));
-                    case Orient.Dn: return new Node(SzY - node.Y, node.X,       (Orient)(ori % 4));
-                }
-            }
-        }
-
-
-        
-        public static DrawingShape[] Shapes;
-        /// 
-        public static int DrShIx(Shape shape, Sz sz) { return (int)shape * (int)Sz.Count + (int)sz; }
-        /// 
-        public static DrawingShape GetDrawingShape(Shape shape, Sz sz) { return Shapes[DrShIx(shape, sz)]; }
-        /// 
-        public static DrawingShape GetDrawingShape(IDrawingItem item) { return (item != null) ? Shapes[DrShIx(item.Shape, item.Sz)] : null; }
-
-        /// <summary>
-        /// Static constructor that initializes Shapes[] array
-        /// </summary>
-        static DrawingShape()
-        {
-            Shapes = new DrawingShape[(int)Shape.Count * (int)Sz.Count];
-
-            /// Ambient
-            Shapes[DrShIx(Shape.Ambient, Sz.S)] = new DrawingShape(Shape.Ambient, Sz.S, 0, 0);
-            Shapes[DrShIx(Shape.Ambient, Sz.M)] = new DrawingShape(Shape.Ambient, Sz.M, 0, 0);
-            Shapes[DrShIx(Shape.Ambient, Sz.L)] = new DrawingShape(Shape.Ambient, Sz.L, 0, 0);
-            Shapes[DrShIx(Shape.Ambient, Sz.XL)] = new DrawingShape(Shape.Ambient, Sz.XL, 0, 0);
-
-            /// Temperature meter
-            Shapes[DrShIx(Shape.TempM, Sz.S)]  = new DrawingShape(Shape.TempM, Sz.S, 0, 0);
-            Shapes[DrShIx(Shape.TempM, Sz.M)]  = new DrawingShape(Shape.TempM, Sz.M, 0, 0);
-            Shapes[DrShIx(Shape.TempM, Sz.L)]  = new DrawingShape(Shape.TempM, Sz.L, 0, 0);
-            Shapes[DrShIx(Shape.TempM, Sz.XL)] = new DrawingShape(Shape.TempM, Sz.XL, 0, 0);
-
-            /// Pressure meter
-            Shapes[DrShIx(Shape.PressM, Sz.S)]  = new DrawingShape(Shape.PressM, Sz.S, 0, 0);
-            Shapes[DrShIx(Shape.PressM, Sz.M)]  = new DrawingShape(Shape.PressM, Sz.M, 0, 0);
-            Shapes[DrShIx(Shape.PressM, Sz.L)]  = new DrawingShape(Shape.PressM, Sz.L, 0, 0);
-            Shapes[DrShIx(Shape.PressM, Sz.XL)] = new DrawingShape(Shape.PressM, Sz.XL, 0, 0);
-
-            /// Valve
-            Shapes[DrShIx(Shape.Valve, Sz.S)] = new DrawingShape(Shape.Valve, Sz.S, 2, 2,
-                                                                 new Node[] { new Node(0, 1, Orient.L), new Node(2, 1, Orient.R) },
-                                                                 new Edge[] { new Edge(0, 1, 20, RouteCouple.OpenWhen1), new Edge(1, 0, 20, RouteCouple.OpenWhen1) },
-                                                                 0, 0, 20, 20,
-                                                                 Properties.Resources.Valve_S_open,
-                                                                 Properties.Resources.Valve_S_closed,
-                                                                 Properties.Resources.Valve_S_vacuum,
-                                                                 Properties.Resources.Valve_S_open_dry);
-            Shapes[DrShIx(Shape.Valve, Sz.M)] = new DrawingShape(Shape.Valve, Sz.M, 3, 4,
-                                                                 new Node[] { new Node(0, 2, Orient.L), new Node(3, 2, Orient.R) },
-                                                                 new Edge[] { new Edge(0, 1, 30, RouteCouple.OpenWhen1), new Edge(1, 0, 30, RouteCouple.OpenWhen1) },
-                                                                 0, 5, 30, 30,
-                                                                 Properties.Resources.Valve_M_open,
-                                                                 Properties.Resources.Valve_M_closed,
-                                                                 Properties.Resources.Valve_M_vacuum,
-                                                                 Properties.Resources.Valve_M_open_dry);
-            Shapes[DrShIx(Shape.Valve, Sz.L)] = new DrawingShape(Shape.Valve, Sz.L, 4, 4,
-                                                                 new Node[] { new Node(0, 2, Orient.L), new Node(4, 2, Orient.R) },
-                                                                 new Edge[] { new Edge(0, 1, 40, RouteCouple.OpenWhen1), new Edge(1, 0, 40, RouteCouple.OpenWhen1) },
-                                                                 0, 0, 40, 40,
-                                                                 Properties.Resources.Valve_L_open,
-                                                                 Properties.Resources.Valve_L_closed,
-                                                                 Properties.Resources.Valve_L_vacuum,
-                                                                 Properties.Resources.Valve_L_open_dry);
-            Shapes[DrShIx(Shape.Valve, Sz.XL)] = new DrawingShape(Shape.Valve, Sz.XL, 5, 6,
-                                                                  new Node[] { new Node(0, 3, Orient.L), new Node(5, 3, Orient.R) },
-                                                                  new Edge[] { new Edge(0, 1, 50, RouteCouple.OpenWhen1), new Edge(1, 0, 50, RouteCouple.OpenWhen1) },
-                                                                  0, 5, 50, 50,
-                                                                  Properties.Resources.Valve_XL_open,
-                                                                  Properties.Resources.Valve_XL_closed,
-                                                                  Properties.Resources.Valve_XL_vacuum,
-                                                                  Properties.Resources.Valve_XL_open_dry);
-            /// Diverter
-            Shapes[DrShIx(Shape.Div, Sz.S)] = new DrawingShape(Shape.Div, Sz.S, 2, 2,
-                                                               new Node[] { new Node(2, 0, Orient.Up), new Node(1, 2, Orient.Dn), new Node(3, 2, Orient.Dn) },
-                                                               new Edge[] { new Edge(0, 1, 20), new Edge(0, 2, 20, RouteCouple.OpenWhen1) },
-                                                               0, 0, 40, 20,
-                                                               Properties.Resources.Div_S_tank_wet,
-                                                               Properties.Resources.Div_S_sink_dry,
-                                                               null,
-                                                               Properties.Resources.Div_S_tank_dry,
-                                                               Properties.Resources.Div_S_sink_wet);
-            Shapes[DrShIx(Shape.Div, Sz.M)] = new DrawingShape(Shape.Div, Sz.M, 3, 4,
-                                                               new Node[] { new Node(2, 0, Orient.Up), new Node(1, 3, Orient.Dn), new Node(3, 3, Orient.Dn) },
-                                                               new Edge[] { new Edge(0, 1, 30), new Edge(0, 2, 30, RouteCouple.OpenWhen1) },
-                                                               0, 0, 40, 30,
-                                                               Properties.Resources.Div_M_tank_wet,
-                                                               Properties.Resources.Div_M_sink_dry,
-                                                               null,
-                                                               Properties.Resources.Div_M_tank_dry,
-                                                               Properties.Resources.Div_M_sink_wet);
-            Shapes[DrShIx(Shape.Div, Sz.L)] = new DrawingShape(Shape.Div, Sz.L, 4, 4,
-                                                               new Node[] { new Node(3, 0, Orient.Up), new Node(1, 4, Orient.Dn), new Node(5, 4, Orient.Dn) },
-                                                               new Edge[] { new Edge(0, 1, 40), new Edge(0, 2, 40, RouteCouple.OpenWhen1) },
-                                                               0, 0, 60, 40,
-                                                               Properties.Resources.Div_L_tank_wet,
-                                                               Properties.Resources.Div_L_sink_dry,
-                                                               null,
-                                                               Properties.Resources.Div_L_tank_dry,
-                                                               Properties.Resources.Div_L_sink_wet);
-            Shapes[DrShIx(Shape.Div, Sz.XL)] = new DrawingShape(Shape.Div, Sz.XL, 5, 6,
-                                                                new Node[] { new Node(3, 0, Orient.Up), new Node(1, 5, Orient.Dn), new Node(5, 5, Orient.Dn) },
-                                                                new Edge[] { new Edge(0, 1, 50), new Edge(0, 2, 50, RouteCouple.OpenWhen1) },
-                                                                0, 0, 60, 50,
-                                                                Properties.Resources.Div_XL_tank_wet,
-                                                                Properties.Resources.Div_XL_sink_dry,
-                                                                null,
-                                                                Properties.Resources.Div_XL_tank_dry,
-                                                                Properties.Resources.Div_XL_sink_wet);
-            /// Regulation valve
-            Shapes[DrShIx(Shape.RegV, Sz.S)] = new DrawingShape(Shape.RegV, Sz.S, 2, 2,
-                                                                new Node[] { new Node(0, 1, Orient.L), new Node(2, 1, Orient.R) },
-                                                                new Edge[] { new Edge(0, 1, 20), new Edge(1, 0, 20) },
-                                                                0, 0, 20, 20,
-                                                                Properties.Resources.RegV_S);
-            Shapes[DrShIx(Shape.RegV, Sz.M)] = new DrawingShape(Shape.RegV, Sz.M, 3, 4,
-                                                                new Node[] { new Node(0, 2, Orient.L), new Node(3, 2, Orient.R) },
-                                                                new Edge[] { new Edge(0, 1, 30), new Edge(1, 0, 30) },
-                                                                0, 5, 30, 30,
-                                                                Properties.Resources.RegV_M);
-            Shapes[DrShIx(Shape.RegV, Sz.L)] = new DrawingShape(Shape.RegV, Sz.L, 4, 4,
-                                                                new Node[] { new Node(0, 2, Orient.L), new Node(4, 2, Orient.R) },
-                                                                new Edge[] { new Edge(0, 1, 40), new Edge(1, 0, 40) },
-                                                                0, 0, 40, 40,
-                                                                Properties.Resources.RegV_L);
-            Shapes[DrShIx(Shape.RegV, Sz.XL)] = new DrawingShape(Shape.RegV, Sz.XL, 5, 6,
-                                                                 new Node[] { new Node(0, 3, Orient.L), new Node(5, 3, Orient.R) },
-                                                                 new Edge[] { new Edge(0, 1, 50), new Edge(1, 0, 50) },
-                                                                 0, 5, 50, 50,
-                                                                 Properties.Resources.RegV_XL);
-            /// Pump
-            Shapes[DrShIx(Shape.Pump, Sz.S)] = new DrawingShape(Shape.Pump, Sz.S, 2, 2, 
-                                                                new Node[] { new Node(0, 1, Orient.L), new Node(2, 1, Orient.R) },
-                                                                new Edge[] { new Edge(0, 1, 20, RouteCouple.OpenWhen1) },
-                                                                0, 0, 20, 20,
-                                                                Properties.Resources.Pump_S_open,
-                                                                Properties.Resources.Pump_S_closed);
-            Shapes[DrShIx(Shape.Pump, Sz.M)] = new DrawingShape(Shape.Pump, Sz.M, 3, 4,
-                                                                new Node[] { new Node(0, 2, Orient.L), new Node(3, 2, Orient.R) },
-                                                                new Edge[] { new Edge(0, 1, 30, RouteCouple.OpenWhen1) },
-                                                                0, 5, 30, 30,
-                                                                Properties.Resources.Pump_M_open,
-                                                                Properties.Resources.Pump_M_closed);
-            Shapes[DrShIx(Shape.Pump, Sz.L)] = new DrawingShape(Shape.Pump, Sz.L, 4, 4,
-                                                                new Node[] { new Node(0, 2, Orient.L), new Node(4, 2, Orient.R) },
-                                                                new Edge[] { new Edge(0, 1, 40, RouteCouple.OpenWhen1) },
-                                                                0, 0, 40, 40,
-                                                                Properties.Resources.Pump_L_open,
-                                                                Properties.Resources.Pump_L_closed);
-            Shapes[DrShIx(Shape.Pump, Sz.XL)] = new DrawingShape(Shape.Pump, Sz.XL, 5, 6,
-                                                                 new Node[] { new Node(0, 3, Orient.L), new Node(5, 3, Orient.R) },
-                                                                 new Edge[] { new Edge(0, 1, 50, RouteCouple.OpenWhen1) },
-                                                                 0, 5, 50, 50,
-                                                                 Properties.Resources.Pump_XL_open,
-                                                                 Properties.Resources.Pump_XL_closed);
-            /// Pump with frequency inverter
-            Shapes[DrShIx(Shape.PumpFM, Sz.S)] = new DrawingShape(Shape.PumpFM, Sz.S, 2, 2, 
-                                                                  new Node[] { new Node(0, 1, Orient.L), new Node(2, 1, Orient.R) },
-                                                                  new Edge[] { new Edge(0, 1, 20, RouteCouple.OpenWhen1) },
-                                                                  0, 0, 20, 20,
-                                                                  Properties.Resources.Pump_S_open,
-                                                                  Properties.Resources.Pump_S_closed);
-            Shapes[DrShIx(Shape.PumpFM, Sz.M)] = new DrawingShape(Shape.PumpFM, Sz.M, 3, 4, 
-                                                                  new Node[] { new Node(0, 2, Orient.L), new Node(3, 2, Orient.R) },
-                                                                  new Edge[] { new Edge(0, 1, 30, RouteCouple.OpenWhen1) },
-                                                                  0, 5, 30, 30,
-                                                                  Properties.Resources.Pump_M_open,
-                                                                  Properties.Resources.Pump_M_closed);
-            Shapes[DrShIx(Shape.PumpFM, Sz.L)] = new DrawingShape(Shape.PumpFM, Sz.L, 4, 4, 
-                                                                  new Node[] { new Node(0, 2, Orient.L), new Node(4, 2, Orient.R) },
-                                                                  new Edge[] { new Edge(0, 1, 40, RouteCouple.OpenWhen1) },
-                                                                  0, 0, 40, 40,
-                                                                  Properties.Resources.Pump_L_open,
-                                                                  Properties.Resources.Pump_L_closed);
-            Shapes[DrShIx(Shape.PumpFM, Sz.XL)] = new DrawingShape(Shape.PumpFM, Sz.XL, 5, 6, 
-                                                                   new Node[] { new Node(0, 3, Orient.L), new Node(5, 3, Orient.R) },
-                                                                   new Edge[] { new Edge(0, 1, 50, RouteCouple.OpenWhen1) },
-                                                                   0, 5, 50, 50,
-                                                                   Properties.Resources.Pump_XL_open,
-                                                                   Properties.Resources.Pump_XL_closed);
-            /// Flow meter
-            Shapes[DrShIx(Shape.FlowM, Sz.S)] = new DrawingShape(Shape.FlowM, Sz.S, 2, 2,
-                                                                 new Node[] { new Node(0, 1, Orient.L), new Node(2, 1, Orient.R) },
-                                                                 new Edge[] { new Edge(0, 1, 20) },
-                                                                 0, 0, 20, 20,
-                                                                 Properties.Resources.FlowM_S);
-            Shapes[DrShIx(Shape.FlowM, Sz.M)] = new DrawingShape(Shape.FlowM, Sz.M, 3, 4,
-                                                                 new Node[] { new Node(0, 2, Orient.L), new Node(3, 2, Orient.R) },
-                                                                 new Edge[] { new Edge(0, 1, 30) },
-                                                                 0, 5, 30, 30,
-                                                                 Properties.Resources.FlowM_M);
-            Shapes[DrShIx(Shape.FlowM, Sz.L)] = new DrawingShape(Shape.FlowM, Sz.L, 4, 4,
-                                                                 new Node[] { new Node(0, 2, Orient.L), new Node(4, 2, Orient.R) },
-                                                                 new Edge[] { new Edge(0, 1, 40) },
-                                                                 0, 0, 40, 40,
-                                                                 Properties.Resources.FlowM_L);
-            Shapes[DrShIx(Shape.FlowM, Sz.XL)] = new DrawingShape(Shape.FlowM, Sz.XL, 5, 6,
-                                                                 new Node[] { new Node(0, 3, Orient.L), new Node(5, 3, Orient.R) },
-                                                                 new Edge[] { new Edge(0, 1, 50) },
-                                                                 0, 5, 50, 50,
-                                                                 Properties.Resources.FlowM_XL);
-            /// Water meter
-            Shapes[DrShIx(Shape.WaterM, Sz.L)] = new DrawingShape(Shape.WaterM, Sz.L, 4, 4,
-                                                                  new Node[] { new Node(0, 2, Orient.L), new Node(4, 2, Orient.R) },
-                                                                  new Edge[] { new Edge(0, 1, 40), new Edge(1, 0, 40) },
-                                                                  0, 0, 40, 40,
-                                                                  Properties.Resources.WaterM_L);
-            Shapes[DrShIx(Shape.WaterM, Sz.S)]  = Shapes[DrShIx(Shape.WaterM, Sz.L)];
-            Shapes[DrShIx(Shape.WaterM, Sz.M)]  = Shapes[DrShIx(Shape.WaterM, Sz.L)];
-            Shapes[DrShIx(Shape.WaterM, Sz.XL)] = Shapes[DrShIx(Shape.WaterM, Sz.L)];
-
-            /// Scale
-            Shapes[DrShIx(Shape.Scale, Sz.S)] = new DrawingShape(Shape.Scale, Sz.S, 6, 8, new Node[] { new Node(3, 8, Orient.Dn) }, null, 0, 0, 60, 80, Properties.Resources.Scale_S);
-            Shapes[DrShIx(Shape.Scale, Sz.M)] = new DrawingShape(Shape.Scale, Sz.M, 8, 9, new Node[] { new Node(4, 9, Orient.Dn) }, null, 0, 0, 80, 90, Properties.Resources.Scale_M);
-            Shapes[DrShIx(Shape.Scale, Sz.L)] = new DrawingShape(Shape.Scale, Sz.L, 12, 11, new Node[] { new Node(6, 11, Orient.Dn) }, null, 0, 0, 120, 110, Properties.Resources.Scale_L);
-            Shapes[DrShIx(Shape.Scale, Sz.XL)] = new DrawingShape(Shape.Scale, Sz.XL, 16, 13, new Node[] { new Node(8, 13, Orient.Dn) }, null, 0, 0, 160, 130, Properties.Resources.Scale_XL);
-
-            /// Tank
-            Shapes[DrShIx(Shape.Tank, Sz.S)] = new DrawingShape(Shape.Tank, Sz.S, 10, 8, new Node[] { new Node(0, 6, Orient.L) }, null, 0, 0, 100, 80, Properties.Resources.Tank_S);
-            Shapes[DrShIx(Shape.Tank, Sz.M)] = new DrawingShape(Shape.Tank, Sz.M, 12, 9, new Node[] { new Node(0, 7, Orient.L) }, null, 0, 0, 120, 90, Properties.Resources.Tank_M);
-            Shapes[DrShIx(Shape.Tank, Sz.L)] = new DrawingShape(Shape.Tank, Sz.L, 15, 11, new Node[] { new Node(0, 9, Orient.L) }, null, 0, 0, 150, 110, Properties.Resources.Tank_L);
-            Shapes[DrShIx(Shape.Tank, Sz.XL)] = new DrawingShape(Shape.Tank, Sz.XL, 20, 13, new Node[] { new Node(0, 11, Orient.L) }, null, 0, 0, 200, 130, Properties.Resources.Tank_XL);
-
-            /// Junction
-            Shapes[DrShIx(Shape.Junction, Sz.None)]  = new DrawingShape(Shape.Junction, Sz.None, 0, 0, new Node[] { new Node(0, 0, Orient.R) });
-            Shapes[DrShIx(Shape.Junction, Sz.S)] = new DrawingShape(Shape.Junction, Sz.S, 2, 2,
-                                                                    new Node[] { new Node(1, 1, Orient.R) }, null,
-                                                                    0, 0, 20, 20,
-                                                                    Properties.Resources.Junction_S_wet,
-                                                                    Properties.Resources.Junction_S_dry,
-                                                                    Properties.Resources.Junction_S_vacuum);
-            Shapes[DrShIx(Shape.Junction, Sz.M)] = new DrawingShape(Shape.Junction, Sz.M, 2, 2,
-                                                                    new Node[] { new Node(1, 1, Orient.R) }, null,
-                                                                    0, 0, 20, 20,
-                                                                    Properties.Resources.Junction_M_wet,
-                                                                    Properties.Resources.Junction_M_dry,
-                                                                    Properties.Resources.Junction_M_vacuum);
-            Shapes[DrShIx(Shape.Junction, Sz.L)] = new DrawingShape(Shape.Junction, Sz.L, 2, 2,
-                                                                    new Node[] { new Node(1, 1, Orient.R) }, null,
-                                                                    0, 0, 20, 20,
-                                                                    Properties.Resources.Junction_L_wet,
-                                                                    Properties.Resources.Junction_L_dry,
-                                                                    Properties.Resources.Junction_L_vacuum);
-            Shapes[DrShIx(Shape.Junction, Sz.XL)] = new DrawingShape(Shape.Junction, Sz.XL, 2, 2,
-                                                                     new Node[] { new Node(1, 1, Orient.R) }, null,
-                                                                     0, 0, 20, 20,
-                                                                     Properties.Resources.Junction_XL_wet,
-                                                                     Properties.Resources.Junction_XL_dry,
-                                                                     Properties.Resources.Junction_XL_vacuum);
-            /// Knee
-            Shapes[DrShIx(Shape.Knee, Sz.S)] = new DrawingShape(Shape.Knee, Sz.S, 2, 2, 
-                                                                new Node[] { new Node(0, 1, Orient.L), new Node(1, 0, Orient.Up) },
-                                                                new Edge[] { new Edge(0, 1, 18), new Edge(1, 0, 18) },
-                                                                0, 0, 20, 20,
-                                                                Properties.Resources.Knee_S_wet,
-                                                                Properties.Resources.Knee_S_dry,
-                                                                Properties.Resources.Knee_S_vacuum);
-            Shapes[DrShIx(Shape.Knee, Sz.M)] = new DrawingShape(Shape.Knee, Sz.M, 2, 2, 
-                                                                new Node[] { new Node(0, 1, Orient.L), new Node(1, 0, Orient.Up) },
-                                                                new Edge[] { new Edge(0, 1, 18), new Edge(1, 0, 18) },
-                                                                0, 0, 20, 20,
-                                                                Properties.Resources.Knee_M_wet,
-                                                                Properties.Resources.Knee_M_dry,
-                                                                Properties.Resources.Knee_M_vacuum);
-            Shapes[DrShIx(Shape.Knee, Sz.L)] = new DrawingShape(Shape.Knee, Sz.L, 2, 2, 
-                                                                new Node[] { new Node(0, 1, Orient.L), new Node(1, 0, Orient.Up) },
-                                                                new Edge[] { new Edge(0, 1, 17), new Edge(1, 0, 17) },
-                                                                0, 0, 20, 20,
-                                                                Properties.Resources.Knee_L_wet,
-                                                                Properties.Resources.Knee_L_dry,
-                                                                Properties.Resources.Knee_L_vacuum);
-            Shapes[DrShIx(Shape.Knee, Sz.XL)] = new DrawingShape(Shape.Knee, Sz.XL, 4, 4, 
-                                                                 new Node[] { new Node(0, 2, Orient.L), new Node(2, 0, Orient.Up) },
-                                                                 new Edge[] { new Edge(0, 1, 36), new Edge(1, 0, 36) },
-                                                                 0, 0, 40, 40,
-                                                                 Properties.Resources.Knee_XL_wet,
-                                                                 Properties.Resources.Knee_XL_dry,
-                                                                 Properties.Resources.Knee_XL_vacuum);
-            /// Vacuum
-            Shapes[DrShIx(Shape.Vacuum, Sz.L)] = new DrawingShape(Shape.Vacuum, Sz.L, 6, 2, 
-                                                                  new Node[] { new Node(0, 1, Orient.L), new Node(6, 1, Orient.R), new Node(4, 0, Orient.Up) },
-                                                                  new Edge[] { new Edge(0, 1, 60), new Edge(1, 0, 60), new Edge(0, 2, Const.Vacuum) },
-                                                                  0, 0, 60, 20,
-                                                                  Properties.Resources.Vacuum_L_wet,
-                                                                  Properties.Resources.Vacuum_L_dry);
-            Shapes[DrShIx(Shape.Vacuum, Sz.S)] = Shapes[DrShIx(Shape.Vacuum, Sz.L)];
-            Shapes[DrShIx(Shape.Vacuum, Sz.M)] = Shapes[DrShIx(Shape.Vacuum, Sz.L)];
-            Shapes[DrShIx(Shape.Vacuum, Sz.XL)] = Shapes[DrShIx(Shape.Vacuum, Sz.L)];
-
-            /// Control board UNI
-            Shapes[DrShIx(Shape.UniCB, Sz.L)] = new DrawingShape(Shape.UniCB, Sz.L, 2, 2, new Node[] { }, null, 0, 0, 20, 20,
-                                                                 Properties.Resources.UniCB_M_error,
-                                                                 Properties.Resources.UniCB_M_on);
-            Shapes[DrShIx(Shape.UniCB, Sz.S)] = Shapes[DrShIx(Shape.UniCB, Sz.L)];
-            Shapes[DrShIx(Shape.UniCB, Sz.M)] = Shapes[DrShIx(Shape.UniCB, Sz.L)];
-            Shapes[DrShIx(Shape.UniCB, Sz.XL)] = Shapes[DrShIx(Shape.UniCB, Sz.L)];
-        }
-    }
-}

SchematicDrawing/Edge.cs

@@ -1,23 +0,0 @@
-///
-/// Copyright (c) 2020 Sensus Slovensko a.s.
-///
-using System;
-
-namespace SchematicDrawing
-{
-    public class Edge
-    {
-        public readonly int NodeId1;
-        public readonly int NodeId2;
-        public readonly int DefaultDist;
-        public readonly RouteCouple RouteCouple;
-
-        public Edge(int nodeId1, int nodeId2, int defaultDist = 20, RouteCouple routeCouple = RouteCouple.None)
-        {
-            NodeId1 = nodeId1;
-            NodeId2 = nodeId2;
-            DefaultDist = defaultDist;
-            RouteCouple = routeCouple;
-        }
-    }
-}

SchematicDrawing/Enums.cs

@@ -1,136 +0,0 @@
-using Dirichlet.Numerics;
-///
-/// Copyright (c) 2020 Sensus Slovensko a.s.
-///
-using System;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-
-namespace SchematicDrawing
-{
-    public static class Const
-    {
-        public const int GridSize = 10;
-        public const int SecondaryStart = 10000;
-        public const int Vacuum = 1000000;
-    }
-
-    public enum Element
-    {
-        None = 0,
-        Body = 1,           /// Item body (component image)
-        Label = 2,          /// Item label
-        MeasuredVal = 4,    /// Item measured value
-        Setpoint = 8,       /// Item setpoint
-        Node = 16,          /// A node of an item
-        Pipe = 32,          /// Pipe between two nodes
-    }
-
-    public enum Shape
-    {
-        Ambient,
-        Cross,
-        Div,
-        FlowM,
-        Junction,
-        Knee,
-        PressM,
-        Pump,
-        PumpFM,
-        RegV,
-        Scale,
-        Sink,
-        Tank,
-        Tee,
-        TempM,
-        Vacuum,
-        Valve,
-        WaterM,
-        UniCB,
-        Count
-    }
-
-    public enum Sz
-    {
-        None,
-        S,
-        M,
-        L,
-        XL,
-        Count,
-    }
-
-    public enum Orient
-    {
-        R,
-        Dn,
-        L,
-        Up,
-        Count,
-    }
-
-    public enum RouteCouple
-    {
-        None,
-        OpenWhen1,
-        ClosedWhen1,
-    }
-
-    public static class Utils
-    {
-        /// <summary>
-        /// Return coordinates of the vector in direction Orient
-        /// </summary>
-        /// <param name="orient">Orient</param>
-        /// <returns>Vector</returns>
-        public static Point GetVect(Orient orient)
-        {
-            switch (orient)
-            {
-                default:
-                case Orient.R:  return new Point(1, 0);
-                case Orient.Up: return new Point(0, -1);
-                case Orient.L:  return new Point(-1, 0);
-                case Orient.Dn: return new Point(0, 1);
-            }
-        }
-
-        /// <summary>
-        /// Return coordinates of the vector perpendicular to Orient
-        /// </summary>
-        /// <param name="orient">Orient</param>
-        /// <returns>Perpendicular vector</returns>
-        public static Point GetNormalVect(Orient orient)
-        {
-            switch (orient)
-            {
-                default:
-                case Orient.R:  return new Point(0, 1);
-                case Orient.Up: return new Point(1, 0);
-                case Orient.L:  return new Point(0, -1);
-                case Orient.Dn: return new Point(-1, 0);
-            }
-        }
-
-        /// <summary>
-        /// Returns true when item is hidden (both X and Y coordinates are 0)
-        /// </summary>
-        /// <param name="item">Drawing item</param>
-        /// <returns>true when hidden</returns>
-        public static bool IsHidden(IDrawingItem item)
-        {
-            return (item.X == 0) && (item.Y == 0);
-        }
-
-        /// <summary>
-        /// Updates distances of graph edges of IRouteBasedDrewingItem (valve, pump, ...) after route chanage.
-        /// </summary>
-        /// <param name="route">Route</param>
-        /// <param name="item">Item</param>
-        public static void UpdateGraphEdges(UInt128 route, IRouteBasedDrawingItem item)
-        {
-            bool routeBit = (route & (((UInt128)1) << item.BitNr)) != 0;
-            foreach (var gedge in item.EdgesToSet) gedge.UpdateFromRoute(item.Inverted ? (!routeBit) : routeBit);
-        }
-    }
-}

SchematicDrawing/GEdge.cs

@@ -1,43 +0,0 @@
-///
-/// Copyright (c) 2020 Sensus Slovensko a.s.
-///
-using System;
-
-namespace SchematicDrawing
-{
-    public class GEdge
-    {
-        public readonly GNode StartNode;
-        public readonly GNode EndNode;
-        public readonly int DefaultDist;
-        public readonly RouteCouple RouteCouple;
-
-        public int Dist;
-
-        public GEdge(GNode startNode, GNode endNode, int defaultDist, RouteCouple routeCouple)
-        {
-            StartNode = startNode;
-            EndNode = endNode;
-            DefaultDist = defaultDist;
-            RouteCouple = routeCouple;
-
-            Dist = (routeCouple == RouteCouple.None || routeCouple == RouteCouple.ClosedWhen1) ? DefaultDist : int.MaxValue;
-        }
-
-        public void UpdateFromRoute(bool routeBit)
-        {
-            switch (RouteCouple)
-            {
-                case RouteCouple.OpenWhen1:
-                    Dist = routeBit ? DefaultDist : int.MaxValue; break;
-                case RouteCouple.ClosedWhen1:
-                    Dist = routeBit ? int.MaxValue : DefaultDist; break;
-            }
-        }
-
-        public override string ToString()
-        {
-            return string.Format("{0}/{1}-{2}/{3} dist={4}", StartNode.Item.Name, StartNode.NodeId, EndNode.Item.Name, EndNode.NodeId, Dist);
-        }
-    }
-}

SchematicDrawing/GNode.cs

@@ -1,52 +0,0 @@
-///
-/// Copyright (c) 2020 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-
-namespace SchematicDrawing
-{
-    public class GNode
-    {
-        /// Graph node properties
-        public IDrawingItem Item;
-        public int NodeId;
-        public readonly IList<GEdge> Edges;
-
-        /// Distance from a start node
-        public int Dist;
-
-        /// Minimal heap index
-        public int HeapIx;
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="item">Item</param>
-        /// <param name="nodeId"Node ID></param>
-        public GNode(IDrawingItem item, int nodeId)
-        {
-            Item = item;
-            NodeId = nodeId;
-            Edges = new List<GEdge>();
-            Dist = int.MaxValue;
-        }
-
-        public void AddEdge(GEdge edge)
-        {
-            Edges.Add(edge);
-        }
-
-        public GNode Reset(int heapIx, int dist = int.MaxValue)
-        {
-            HeapIx = heapIx;
-            Dist = dist;
-            return this;
-        }
-
-        public override string ToString()
-        {
-            return string.Format("{0}/{1} dist={2}", Item.Name, NodeId, Dist);
-        }
-    }
-}

SchematicDrawing/Graph.cs

@@ -1,106 +0,0 @@
-///
-/// Copyright (c) 2020 Sensus Slovensko a.s.
-///
-using System;
-using System.Diagnostics;
-using System.Collections.Generic;
-
-namespace SchematicDrawing
-{
-    public class Graph
-    {
-        public bool Completed;
-
-        IList<GNode> nodes;
-        GNode startNode;
-        int secondaryStartNodesCount;
-
-        MinHeap minHeap;
-        GNode currentNode;
-
-        public Graph()
-        {
-            nodes = new List<GNode>();
-            startNode = null;
-            secondaryStartNodesCount = 0;
-            minHeap = new MinHeap();
-            Completed = false;
-        }
-
-        public void Clear()
-        {
-            nodes.Clear();
-            startNode = null;
-            secondaryStartNodesCount = 0;
-            Completed = false;
-        }
-
-        /// <summary>
-        /// Add a node to the list of graph nodes
-        /// </summary>
-        /// <param name="node">Graph node</param>
-        public void AddNode(GNode node, bool isStartNode = false, bool isSecondaryStartNode = false)
-        {
-            if (isStartNode && startNode == null)
-            {
-                startNode = node;
-                nodes.Insert(0, node);
-            }
-            else if (isStartNode || isSecondaryStartNode)
-            {
-                secondaryStartNodesCount++;
-                nodes.Insert(startNode != null ? 1 : 0, node);
-            }
-            else
-            {
-                nodes.Add(node);
-            }
-        }
-
-        /// <summary>
-        /// Add an edge to the list of edges of node1.
-        /// </summary>
-        /// <param name="node1">Node 1 (start)</param>
-        /// <param name="node2">NOde 2 (end)</param>
-        /// <param name="defaultDist">Default distance (when closed)</param>
-        /// <param name="routeCouple">Way the route affects this edge</param>
-        /// <returns>Added graph edge</returns>
-        public GEdge AddEdge(GNode node1, GNode node2, int defaultDist, RouteCouple routeCouple = RouteCouple.None)
-        {
-            GEdge gedge = new GEdge(node1, node2, defaultDist, routeCouple);
-            node1.AddEdge(gedge);
-            return gedge;
-        }
-
-        /// <summary>
-        /// Run Dijkstra shortest path algorithm to determine schematic drawing coloring
-        /// </summary>
-        /// <param name="startNode">Start node</param>
-        /// <param name="secondaryStartNodes">List of secondary start nodes</param>
-        public void RunDijkstraAlgo()
-        {
-            if (nodes == null || startNode == null) return;
-
-            /// Reset all nodes
-            minHeap.ResetAndBuild(nodes, secondaryStartNodesCount);
-
-            currentNode = minHeap.ExtractMinNode();
-            do
-            {
-                /// Consider all unvisited neighbors of the current node
-                foreach (var e in currentNode.Edges)
-                {
-                    int distViaCurrNode = (e.Dist == int.MaxValue) ? int.MaxValue : currentNode.Dist + e.Dist;
-                    if (distViaCurrNode < e.EndNode.Dist)
-                    {
-                        e.EndNode.Dist = distViaCurrNode;
-                        minHeap.SiftUp(e.EndNode.HeapIx);
-                    }
-                }
-
-                currentNode = minHeap.ExtractMinNode();
-            }
-            while (currentNode.Dist < int.MaxValue && currentNode != null);
-        }
-    }
-}

SchematicDrawing/IDrawingItCmpnt.cs

@@ -1,10 +0,0 @@
-///
-/// Copyright (c) 2020 Sensus Slovensko a.s.
-///
-namespace SchematicDrawing
-{
-    public interface IDrawingItCmpnt
-    {
-        IDrawingItem DrawingItem { get; }
-    }
-}

SchematicDrawing/IDrawingItCmpntWithMeasuredVal.cs

@@ -1,12 +0,0 @@
-///
-/// Copyright (c) 2020-2021 Sensus Slovensko a.s.
-///
-namespace SchematicDrawing
-{
-    public interface IDrawingItCmpntWithMeasuredVal : IDrawingItCmpnt
-    {
-        bool MsrmntAvailable { get; }
-        double MeasuredVal { get; }
-        string AltString { get; }
-    }
-}

SchematicDrawing/IDrawingItCmpntWithSetpoint.cs

@@ -1,12 +0,0 @@
-///
-/// Copyright (c) 2020 Sensus Slovensko a.s.
-///
-namespace SchematicDrawing
-{
-    public interface IDrawingItCmpntWithSetpoint : IDrawingItCmpnt
-    {
-        double SetpointVal { get; set; }
-        void IncreaseSetpoint();
-        void DecreaseSetpoint();
-    }
-}

SchematicDrawing/IDrawingItem.cs

@@ -1,30 +0,0 @@
-///
-/// Copyright (c) 2020 Sensus Slovensko a.s.
-///
-using Config;
-using System.Collections.Generic;
-
-namespace SchematicDrawing
-{
-    public interface IDrawingItem
-    {
-        ///
-        /// Schematic drawing parameters
-        ///
-        string Name { get; }                /// Unique name
-        string ClassName { get; }
-
-        Shape Shape { get; set; }           /// Image
-        int X { get; set; }
-        int Y { get; set; }
-        Sz Sz { get; set; }
-        Orient Orient { get; set; }
-        bool Flip { get; set; }
-
-        int LblX { get; set; }              /// Label
-        int LblY { get; set; }
-        Orient LblOrient { get; set; }
-
-        IList<GNode> GNodes { get; set; }
-    }
-}

SchematicDrawing/IDrawingItemWithMeasuredVal.cs

@@ -1,17 +0,0 @@
-///
-/// Copyright (c) 2020-2021 Sensus Slovensko a.s.
-///
-namespace SchematicDrawing
-{
-    public interface IDrawingItemWithMeasuredVal : IDrawingItem
-    {
-        int MsrdX { get; set; }
-        int MsrdY { get; set; }
-        Orient MsrdOrient { get; set; }
-
-        string MsrdFormat { get; }
-        Config.Unit MsrdUnit { get; }
-        double MsrdValLimLo { get; }
-        double MsrdValLimHi { get; }
-    }
-}

SchematicDrawing/IDrawingItemWithSetpoint.cs

@@ -1,15 +0,0 @@
-///
-/// Copyright (c) 2020-2021 Sensus Slovensko a.s.
-///
-namespace SchematicDrawing
-{
-    public interface IDrawingItemWithSetpoint : IDrawingItem
-    {
-        int SetpX { get; set; }
-        int SetpY { get; set; }
-        Orient SetpOrient { get; set; }
-
-        string SetpFormat { get; }
-        Config.Unit SetpUnit { get; }
-    }
-}

SchematicDrawing/IRouteBasedDrawingItem.cs

@@ -1,14 +0,0 @@
-///
-/// Copyright (c) 2020 Sensus Slovensko a.s.
-///
-using System.Collections.Generic;
-namespace SchematicDrawing
-{
-    public interface IRouteBasedDrawingItem : IDrawingItem
-    {
-        int BitNr { get; }
-        bool Inverted { get; }
-
-        IList<GEdge> EdgesToSet { get; set; }
-    }
-}

SchematicDrawing/ItemElementRect.cs

@@ -1,21 +0,0 @@
-///
-/// Copyright (c) 2020 Sensus Slovensko a.s.
-///
-using System.Drawing;
-
-namespace SchematicDrawing
-{
-    public class ItemElementRect
-    {
-        public IDrawingItem Item;
-        public Element Element;
-        public Rectangle Rect;
-
-        public ItemElementRect(IDrawingItem item, Element element, Rectangle rect)
-        {
-            Item = item;
-            Element = element;
-            Rect = rect;
-        }
-    }
-}

SchematicDrawing/MinHeap.cs

@@ -1,134 +0,0 @@
-///
-/// Copyright (c) 2020 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-
-namespace SchematicDrawing
-{
-    public class MinHeap
-    {
-        GNode[] heap;   /// Minimum heap, a binary tree in form of an array
-        int heapSize;   /// Heap size (not necessarily a size of the array heap[])
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        public MinHeap()
-        {
-            heap = null;
-            heapSize = 0;
-        }
-
-        /// <summary>
-        /// Reset nodes and build the initial minimum heap tree.
-        /// 
-        /// First node on the list is the start node (mostly the main water tank),
-        /// followed by 'secondaryStartNodesCount' secondary start nodes (typically
-        /// tanks above scales), followed by all remaining nodes of the drawing.
-        /// In this way the heap is heapified from the beginning.
-        /// </summary>
-        /// <param name="nodes">Graph nodes</param>
-        /// <param name="secondaryStartNodesCount">Number of secondary start nodes</param>
-        public void ResetAndBuild(IList<GNode> nodes, int secondaryStartNodesCount)
-        {
-            if (nodes == null || nodes.Count == 0) return;
-
-            if (heapSize != nodes.Count)
-            {
-                heapSize = nodes.Count;
-                heap = new GNode[nodes.Count];
-            }
-
-            heap[0] = nodes[0].Reset(0, 0);
-            for (int i = 1; i <= secondaryStartNodesCount; i++)
-            {
-                heap[i] = nodes[i].Reset(i, Const.SecondaryStart);
-            }
-            for (int i = secondaryStartNodesCount + 1; i < nodes.Count; i++)
-            {
-                heap[i] = nodes[i].Reset(i, int.MaxValue);
-            }
-        }
-
-        /// <summary>
-        /// Returns the node with minimal distance at the top of the heap binary tree.
-        /// This node is removed from the heap, replaced by the last node and the heap is 'Heapified'.
-        /// </summary>
-        /// <returns>Node with minimal distance</returns>
-        public GNode ExtractMinNode()
-        {
-            GNode minNode = heap[0];
-            if (--heapSize > 0)
-            {
-                heap[0] = heap[heapSize];   /// Swap with the last one
-                heap[0].HeapIx = 0;
-                heap[heapSize] = minNode;
-                SiftDown(0);                /// Heapify the heap, sift down the swapped (formerly the last) item
-            }
-            return minNode;
-        }
-
-        /// <summary>
-        /// Sift up the node in the minimum heap binary tree.
-        /// Function is called when distance of a node in the graph is updated.
-        /// As the distance is always decreased, the node sifts up in the tree.
-        /// </summary>
-        /// <param name="heapIx">Index of the node to sift up</param>
-        public void SiftUp(int heapIx)
-        {
-            if (heapIx == 0) return;
-            int parentIx = (heapIx - 1) / 2;
-            if (heap[heapIx].Dist < heap[parentIx].Dist)
-            {
-                SwapNodes(heapIx, parentIx);
-                SiftUp(parentIx);
-            }
-        }
-
-        /// <summary>
-        /// Sift down the node in the minimum heap binary tree.
-        /// Function is called when node at the top of the tree is extracted and replaced
-        /// by the last node. This last node is then sift down according to its distance.
-        /// </summary>
-        /// <param name="heapIx">Index of the node to sift down</param>
-        void SiftDown(int heapIx)
-        {
-            int leftIx = 2 * heapIx + 1;
-            if (leftIx < heapSize)
-            {
-                int minIx = heapIx;
-                if (heap[leftIx].Dist < heap[minIx].Dist)
-                {
-                    minIx = leftIx;
-                }
-
-                int rightIx = 2 * heapIx + 2;
-                if (rightIx < heapSize && heap[rightIx].Dist < heap[minIx].Dist)
-                {
-                    minIx = rightIx;
-                }
-
-                if (minIx != heapIx)
-                {
-                    SwapNodes(heapIx, minIx);
-                    SiftDown(minIx);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Swap two nodes in the minimum heap binary tree.
-        /// </summary>
-        /// <param name="ix1">Index of the 1st node</param>
-        /// <param name="ix2">Index of the 2nd node</param>
-        void SwapNodes(int ix1, int ix2)
-        {
-            GNode swap = heap[ix1];
-            heap[ix1] = heap[ix2];
-            heap[ix1].HeapIx = ix1;
-            heap[ix2] = swap;
-            heap[ix2].HeapIx = ix2;
-        }
-    }
-}

SchematicDrawing/Node.cs

@@ -1,21 +0,0 @@
-///
-/// Copyright (c) 2020 Sensus Slovensko a.s.
-///
-using System;
-
-namespace SchematicDrawing
-{
-    public class Node
-    {
-        public int X;
-        public int Y;
-        public Orient Orient;
-
-        public Node(int x, int y, Orient orient)
-        {
-            X = x;
-            Y = y;
-            Orient = orient;
-        }
-    }
-}