Modbus : Fixed sending output messages from the queue.

.gitignore

@@ -4,10 +4,6 @@ Config/bin/
 Config/obj/
 DataStreamInterface/bin/
 DataStreamInterface/obj/
-DataStreamInterfaceTest/bin/
-DataStreamInterfaceTest/obj/
-DataStreamMeter/bin/
-DataStreamMeter/obj/
 Decrypt/bin/
 Decrypt/obj/
 DeviceTest/bin/
@@ -36,6 +32,8 @@ Results/bin/
 Results/obj/
 ResultsBrowser/bin/
 ResultsBrowser/obj/
+SchematicDrawing/bin
+SchematicDrawing/obj
 Statistics/bin/
 Statistics/obj/
 TBF/bin/

Common/Common.csproj

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

Common/SerializableDictionary.cs

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

Common/Telegram.cs

@@ -1,10 +1,10 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Metering Systems
+/// Copyright (c) 2013-2021 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
 
-namespace TBF.BenchControl
+namespace Common
 {
 	public class Telegram
 	{
@@ -39,13 +39,29 @@ namespace TBF.BenchControl
 		/// </summary>
 		/// <param name="data">Data telegram</param>
 		/// <returns>Calculated CRC</returns>
-		public static UInt16 ClaculateTelegramCRC(byte[] data)
+		public static UInt16 CalculateTelegramCRC(byte[] data, int enforcedLen = 0)
 		{
+            int len = (enforcedLen != 0) ? Math.Min(enforcedLen, data.Length) : data.Length;
 			UInt16 crc = crcSeed;
-			for (int i = 0; i < data.Length - 2; i++) UpdateCRC(data[i], ref crc);
+            for (int i = 0; i < len - 2; i++) UpdateCRC(data[i], ref crc);
 			return crc;
 		}
 
+        /// <summary>
+        /// Calculates the CRC from a data telegram (an array of bytes).
+        /// A complete telegram including two bytes reserved for the CRC
+        /// must be supplied as an argument.
+        /// </summary>
+        /// <param name="data">Data telegram</param>
+        /// <returns>Calculated CRC</returns>
+        public static UInt16 CalculateTelegramCRC(int offset, byte[] data, int enforcedLen = 0)
+        {
+            int len = (enforcedLen != 0) ? Math.Min(enforcedLen, data.Length - offset) : data.Length - offset;
+            UInt16 crc = crcSeed;
+            for (int i = 0; i < len - 2; i++) UpdateCRC(data[offset + i], ref crc);
+            return crc;
+        }
+
 		/// <summary>
 		/// This function modifies the last 2 bytes in the message buffer
 		/// by the CRC calculated from the remaining first (Lenght - 2) bytes.
@@ -58,7 +74,7 @@ namespace TBF.BenchControl
 			int len = data.Length;
 			if (len < 2) return;
 
-			UInt16 crc = ClaculateTelegramCRC(data);
+			UInt16 crc = CalculateTelegramCRC(data);
 
 			data[len - 2] = (byte)(crc & 0xFF);
 			data[len - 1] = (byte)(crc >> 8);
@@ -72,16 +88,38 @@ namespace TBF.BenchControl
 		/// </summary>
 		/// <param name="data">Data telegram</param>
 		/// <returns>true if the CRC in the telegram is correct</returns>
-		public static bool VerifyTelegramCRC(byte[] data)
+		public static bool VerifyTelegramCRC(byte[] data, int enforcedLen = 0)
 		{
-			int len = data.Length;
+            if (data == null || data.Length == 0 || enforcedLen > data.Length) return false;
+
+			int len = (enforcedLen != 0) ? enforcedLen : data.Length;
 			if (len < 2) return false;
 
-			UInt16 crc = ClaculateTelegramCRC(data);
+			UInt16 crc = CalculateTelegramCRC(data, len);
 
 			return (data[len - 2] == (byte)(crc & 0xFF)) && (data[len - 1] == (byte)(crc >> 8));
 		}
 
+        /// <summary>
+        /// This function compares the last 2 bytes in the message buffer
+        /// with the CRC calculated from the remaining first (Lenght - 2) bytes.
+        /// A complete telegram including two bytes reserved for the CRC
+        /// must be supplied as an argument.
+        /// </summary>
+        /// <param name="data">Data telegram</param>
+        /// <returns>true if the CRC in the telegram is correct</returns>
+        public static bool VerifyTelegramCRC(int offset, byte[] data, int enforcedLen = 0)
+        {
+            if (data == null || data.Length == 0 || enforcedLen > data.Length - offset) return false;
+
+            int len = (enforcedLen != 0) ? enforcedLen : data.Length - offset;
+            if (len < 2) return false;
+
+            UInt16 crc = CalculateTelegramCRC(offset, data, len);
+
+            return (data[offset + len - 2] == (byte)(crc & 0xFF)) && (data[offset + len - 1] == (byte)(crc >> 8));
+        }
+
 
 
 		/// <summary>
@@ -173,7 +211,6 @@ namespace TBF.BenchControl
 		}
 
 
-
 		public static string LogTelegram(string intro, byte[] data, int from = 0, int len = -1)
 		{
 			System.Text.StringBuilder sb = new System.Text.StringBuilder(256);
@@ -194,6 +231,7 @@ namespace TBF.BenchControl
 			return sb.ToString();
 		}
 
+
         public static string LogTelegram(string intro, IList<byte> data, int from = 0, int len = -1)
         {
             System.Text.StringBuilder sb = new System.Text.StringBuilder(256);
@@ -215,7 +253,6 @@ namespace TBF.BenchControl
         }
 
 
-
 		public static string LogTelegram(string intro, string data)
 		{
 			System.Text.StringBuilder sb = new System.Text.StringBuilder(80);

Common/Utils.cs

@@ -1,4 +1,7 @@
-using System;
+///
+/// Copyright (c) 2021 Sensus Slovensko a.s.
+///
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -8,5 +11,11 @@ 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;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;JUZNA_AFRIKA_NEW</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;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;JUZNA_AFRIKA_NEW</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -91,6 +91,7 @@
     <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" />
@@ -141,6 +142,10 @@
     <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,93 +8,19 @@ namespace Config
 		public const string AdminPassword = "staratura";
 		public const string SQLiteDbFName = "SQLite.db";
 
-#if DN100 || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || CEVAK_200
-		public const int WMsCount = 3;
-		public const int LineSize = 3;
-		public const int CompoundWMsCount = 1;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = 1;
-#elif MUNICH
-		public const int WMsCount = 3;
-		public const int LineSize = 3;
-		public const int CompoundWMsCount = 3;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = 3;
-#elif MALTA_WSD25
-		public const int WMsCount = 6;
-		public const int LineSize = 6;
-		public const int CompoundWMsCount = 0;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = 1;
-#elif BADGER_MALA_TRAT || BERLIN || FUZHOU_150 || FUZHOU_300 || GELSENWASSER || GENESIS || IZRAEL_200 || PETERSBURG_200 || SENTEC || SLM_150 || TORINO_50 || TURA_SPECIAL
-        public const int WMsCount = 6;
-        public const int LineSize = 6;
-        public const int CompoundWMsCount = 1;
-        public const int HeatMetersCount = 0;
-        public const int MaxPartNr = 1;
-#elif PUCHONG_200
-		public const int WMsCount = 6;
-		public const int LineSize = 6;
-		public const int CompoundWMsCount = 3;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = 3;
-#elif RUM_MOB
-        public const int WMsCount = 8;
-		public const int LineSize = 8;
-		public const int CompoundWMsCount = 1;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = WMsCount / LineSize;
-#elif DEWA_300 || FUZHOU_100 || ROMA_200 || LUXEMBURG_40
-        public const int WMsCount = 10;
-        public const int LineSize = 10;
-        public const int CompoundWMsCount = 1;
-        public const int HeatMetersCount = 0;
-        public const int MaxPartNr = WMsCount / LineSize;
-#elif DUBAJ_50
-		public const int WMsCount = 10;
-		public const int LineSize = 5;
-		public const int CompoundWMsCount = 0;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = WMsCount / LineSize;
-#elif SLM_END || WARSAW_END
-        public const int WMsCount = 10;
-		public const int LineSize = 5;
-		public const int CompoundWMsCount = 1;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = 4;
-#elif SLM_50
 		public const int WMsCount = 12;
 		public const int LineSize = 12;
 		public const int CompoundWMsCount = 1;
-		public const int HeatMetersCount = 6;
-        public const int MaxPartNr = WMsCount / LineSize;
-#elif ALZIR_25 || BAHRAIN_50 || CEVAK_40 || FEWA_50 || FILIPINY_50 || FUZHOU_50 || HONGKONG_50 || IZRAEL_25 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || MURES_40 || PETERSBURG_50 || TORUN_50 || ZAMBIA || ZODINO
-        public const int WMsCount = 20;
-		public const int LineSize = 10;
-		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = WMsCount / LineSize;
-#elif TURA_IPERL || TURA_IPERL_NEW
-		public const int WMsCount = 40;
-		public const int LineSize = 20;
-		public const int CompoundWMsCount = 1;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = WMsCount / LineSize;
-#elif IZRAEL_50
-		public const int WMsCount = 40;
-		public const int LineSize = 10;
-		public const int CompoundWMsCount = 0;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = WMsCount / LineSize;
-#endif
 
         ///
 		/// Database related: This object reference is set after a successful user login
 		///
 		public static DatabaseSettings CurrentBench;
 
-        public static double RealDensity = 0;       /// true water density [kg/m3]
-        public static double AtTemperature = 0;     /// measured at temperature [°C]
+        public static double SampleDensity = 0; /// sample water density measured in an accredited labo [kg/m3]
+        public static double SampleTemp = 0;    /// sample temperature when density measured in an accredited labo [°C]
         public static double Buoyancy = 0;
     }
 }

Config/Entities/BenchPath.cs

@@ -14,6 +14,7 @@ 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; }
@@ -46,7 +47,8 @@ namespace Config.Entities
 
 			result.Qfrom         = Qfrom;
             result.Qto           = Qto;
-			result.TempMtrUp     = TempMtrUp;
+            result.Selector      = Selector;
+            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 ParentName { get; set; }
-        public virtual DebugMode Mode { get; set; }
-		public virtual LogLevel Logging { get; set; }
+		public virtual string Parent { get; set; }
+        public virtual DebugMode DebugMode { get; set; }
+		public virtual LogLevel LogLevel { 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.ParentName = parentName;
-            result.Mode = debugLevel;
-			result.Logging = logLevel;
+			result.Parent = parentName;
+            result.DebugMode = debugLevel;
+			result.LogLevel = logLevel;
 			result.Parameters = parameters;
 			return result;
 		}
@@ -51,9 +51,9 @@ namespace Config.Entities
 			result.ItemNr = ItemNr;
 			result.Name = Name;
             result.ClassName = ClassName;
-			result.ParentName = ParentName;
-            result.Mode = Mode;
-			result.Logging = Logging;
+			result.Parent = Parent;
+            result.DebugMode = DebugMode;
+			result.LogLevel = LogLevel;
 			result.Parameters = Parameters;
 			return result;
 		}
@@ -62,9 +62,9 @@ namespace Config.Entities
         {
             output.WriteLine(Name);
             output.WriteLine(ClassName);
-            output.WriteLine(ParentName);
-            output.WriteLine(Mode.ToString());
-            output.WriteLine(Logging.ToString());
+            output.WriteLine(Parent);
+            output.WriteLine(DebugMode.ToString());
+            output.WriteLine(LogLevel.ToString());
             output.Write(Parameters);
 
             output.Close();
@@ -76,28 +76,28 @@ namespace Config.Entities
 
             result.Name = input.ReadLine();
             result.ClassName = input.ReadLine();
-            result.ParentName = input.ReadLine();
+            result.Parent = input.ReadLine();
 
             string line = input.ReadLine();
-            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;
+            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;
 
             line = input.ReadLine();
-            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;
+            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;
 
             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 (ParentName != null)
+			if (Parent != null)
 			{
-				result += indent + "ParentName = " + ParentName + Environment.NewLine;
+				result += indent + "ParentName = " + Parent + Environment.NewLine;
 			}
-			result += indent + "DebugLevel = " + Mode.ToString() + Environment.NewLine;
-			result += indent + "LogLevel = " + Logging.ToString() + Environment.NewLine;
+			result += indent + "DebugLevel = " + DebugMode.ToString() + Environment.NewLine;
+			result += indent + "LogLevel = " + LogLevel.ToString() + Environment.NewLine;
 			result += indent + "Parameters = " + Parameters + Environment.NewLine;
 
 			return result;

Config/Entities/FeedingPath.cs

@@ -14,8 +14,9 @@ namespace Config.Entities
         public virtual string OriName { get; set; }         /// Not mapped to database
         public virtual float Qfrom { get; set; }            /// Water flow in [m3/h]
         public virtual float Qto { get; set; }              /// Water flow in [m3/h]
+        public virtual string Selector { get; set; }
 		public virtual string Pump { get; set; }
-        public virtual string RegulValvesPct { get; set; }	/// Positions of regulation valves in % separated by ';'
+        public virtual string RegVPositions { get; set; }	/// Positions of regulation valves in % separated by ';'
 
         /// Valves
 		public virtual string ValvesOpen { get; set; }
@@ -40,12 +41,13 @@ namespace Config.Entities
         {
 			FeedingPath result = new FeedingPath(name, itemNr);
 
-			result.Qfrom = Qfrom;
-            result.Qto = Qto;
-			result.Pump = Pump;
-            result.RegulValvesPct = RegulValvesPct;
-            result.ValvesOpen = ValvesOpen;
-			result.ValvesClose = ValvesClose;
+			result.Qfrom         = Qfrom;
+            result.Qto           = Qto;
+            result.Selector      = Selector;
+			result.Pump          = Pump;
+            result.RegVPositions = RegVPositions;
+            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>
-        IList<string> ParamValues(int ix);
+        ICollection<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 RegulValve { get; set; }
+        public virtual string Selector { get; set; }
+        public virtual string RegValve { get; set; }
 		public virtual string FlowMeter { get; set; }
 		public virtual float PidCoef { get; set; }			/// PID coefficient for the regulation path
         public virtual string StartValve { get; set; }
         public virtual string Diverter { get; set; }
-		public virtual string TempDiv { get; set; }
+		public virtual string TempMtrDiv { 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.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.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.ValvesClose = ValvesClose;
 
             return result;

Config/Entities/Procedure.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2021 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,14 +53,13 @@ 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.Name.Length > 0 && t.Name[0] != '[') || !t.Name.Contains("]"))  rslt.Add(t);
-            }
+            foreach (var t in Tests) if (t.IsRegular()) rslt.Add(t);
             return rslt;
         }
 
@@ -70,6 +69,7 @@ namespace Config.Entities
         {
 			MoreParams = new List<ComponentProcedure>();
 			Tests = new List<Test>();
+            testInstances = null;
 
 			///
 			/// Default values
@@ -96,6 +96,70 @@ 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-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2021 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 TstTime { get; set; }			/// Test time (estimate) in [s]
+        public virtual float TestTime { get; set; }			/// Test time (estimate) in [s]
         public virtual string Method { get; set; }
         public virtual float ErrLimLo { get; set; }			/// in [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
         public virtual float ErrLimHi { get; set; }			/// in [%] usually > 0, in case of heat meters: -Qn in m3/h
@@ -44,8 +44,7 @@ namespace Config.Entities
         public virtual int TimeFlow2Mass { get; set; }		/// Delay time from the flow stable to the 1st mass measurement in [s]
         public virtual int TimePump2StartV { get; set; }	/// Delay time from the start of the pump to opening the start valve in [s]
         public virtual int TimeStop2Mass { get; set; }		/// Delay time from the test end (diverted) to the 2nd mass measuremen in [s]
-		public virtual double TolerRed { get; set; }		///  = Filter
-        public virtual string RedType { get; set; }
+		public virtual int ShortPulses { get; set; }		/// Short pulses
 		public virtual string FeedingPath { get; set; }
 		public virtual string BenchPath { get; set; }
 		public virtual string OutputPath { get; set; }
@@ -53,9 +52,9 @@ namespace Config.Entities
 #if HEAT_METERS
         public virtual string HeatMetersPath { get; set; }
 #endif
-        public virtual string RelTransBefore { get; set; }
-		public virtual string RelTransBetween { get; set; }
-		public virtual string TransitionAfter { get; set; }
+        public virtual string TransBefore { get; set; }
+		public virtual string TransBetween { get; set; }
+		public virtual string TransAfter { get; set; }
 
         public virtual bool IsOuterLoopStart { get; set; }  /// Not mapped to database
         public virtual bool IsOuterLoopEnd { get; set; }    /// Not mapped to database
@@ -89,15 +88,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
-            TolerRed = 0;					/// = Filter parameter
-			RelTransBefore  = string.Empty;
-			RelTransBetween = string.Empty;
-			TransitionAfter = string.Empty;
+            ShortPulses = 0;				/// Short pulses parameter (0 or 1)
+			TransBefore = string.Empty;
+			TransBetween = string.Empty;
+			TransAfter = string.Empty;
 		}
 
 		public Test(string name, int itemNr, Procedure procedure)
@@ -108,6 +107,22 @@ 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()
         {
@@ -121,7 +136,7 @@ namespace Config.Entities
 			result.Qfrom = Qfrom;
             result.Qto = Qto;
 			result.Volume = Volume;
-			result.TstTime = TstTime;
+			result.TestTime = TestTime;
 			result.Method = Method;
 			result.ErrLimLo = ErrLimLo;
 			result.ErrLimHi = ErrLimHi;
@@ -140,8 +155,7 @@ namespace Config.Entities
             result.TimeFlow2Mass = TimeFlow2Mass;
             result.TimePump2StartV = TimePump2StartV;
 			result.TimeStop2Mass = TimeStop2Mass;
-			result.TolerRed = TolerRed;
-            result.RedType = RedType;
+			result.ShortPulses = ShortPulses;
 			result.FeedingPath = FeedingPath;
 			result.BenchPath = BenchPath;
 			result.OutputPath = OutputPath;
@@ -149,9 +163,9 @@ namespace Config.Entities
 #if HEAT_METERS
             result.HeatMetersPath = HeatMetersPath;
 #endif
-			result.RelTransBefore = RelTransBefore;
-			result.RelTransBetween = RelTransBetween;
-			result.TransitionAfter = TransitionAfter;
+			result.TransBefore = TransBefore;
+			result.TransBetween = TransBetween;
+			result.TransAfter = TransAfter;
 			foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone()); }
 
             return result;
@@ -169,7 +183,7 @@ namespace Config.Entities
             output.WriteLine(Qfrom.ToString(ci));
             output.WriteLine(Qto.ToString(ci));
             output.WriteLine(Volume.ToString(ci));
-            output.WriteLine(TstTime.ToString(ci));
+            output.WriteLine(TestTime.ToString(ci));
             output.WriteLine(Method);
             output.WriteLine(ErrLimLo.ToString(ci));
             output.WriteLine(ErrLimHi.ToString(ci));
@@ -188,14 +202,15 @@ 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(RelTransBefore);
-            output.WriteLine(RelTransBetween);
+            output.WriteLine(TransBefore);
+            output.WriteLine(TransBetween);
             output.WriteLine(Profile);
-            output.WriteLine(TransitionAfter);
+            output.WriteLine(TransAfter);
 
             foreach (var prms in MoreParams) { prms.Export(output); }
             output.WriteLine();
@@ -220,7 +235,7 @@ namespace Config.Entities
             tst.Qfrom = float.Parse(input.ReadLine(), ci);
 			tst.Qto = float.Parse(input.ReadLine(), ci);
 			tst.Volume = float.Parse(input.ReadLine(), ci);
-			tst.TstTime = float.Parse(input.ReadLine(), ci);
+			tst.TestTime = float.Parse(input.ReadLine(), ci);
             tst.Method = input.ReadLine();
 			tst.ErrLimLo = float.Parse(input.ReadLine(), ci);
 			tst.ErrLimHi = float.Parse(input.ReadLine(), ci);
@@ -239,17 +254,18 @@ 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.RelTransBefore = input.ReadLine();
-            tst.RelTransBetween = input.ReadLine();
+            tst.TransBefore = input.ReadLine();
+            tst.TransBetween = input.ReadLine();
             string line = input.ReadLine();
             tst.Profile = line.Equals(TestProfile.ProtectedHeatMeter.ToString()) ? TestProfile.ProtectedHeatMeter
                           : line.Equals(TestProfile.UserDefinedHeatMeter.ToString()) ? TestProfile.UserDefinedHeatMeter
                           : line.Equals(TestProfile.Protected.ToString()) ? TestProfile.Protected : TestProfile.UserDefined;  /// UserDefined is the default
-            tst.TransitionAfter = input.ReadLine();
+            tst.TransAfter = input.ReadLine();
 
             while (true)
             {
@@ -282,14 +298,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 != TstTime.ToString(ci))            { diff.AppendFormat(fmt, "TstTime", TstTime.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != TestTime.ToString(ci))            { diff.AppendFormat(fmt, "TstTime", TestTime.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Method)                          { diff.AppendFormat(fmt, "Method", Method, ln); };
             ln = inp.ReadLine(); if (ln != ErrLimLo.ToString(ci))           { diff.AppendFormat(fmt, "ErrLimLo", ErrLimLo.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != ErrLimHi.ToString(ci))           { diff.AppendFormat(fmt, "ErrLimHi", ErrLimHi.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Uncertainty.ToString(ci))        { diff.AppendFormat(fmt, "Uncertainty", Uncertainty.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Repeats.ToString(ci))            { diff.AppendFormat(fmt, "Repeats", Repeats.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != DoDraining.ToString(ci))         { diff.AppendFormat(fmt, "Draining", DoDraining.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != DoDrainingAfter.ToString(ci))    { diff.AppendFormat(fmt, "Zeroing", DoDrainingAfter.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != DoDraining.ToString(ci))         { diff.AppendFormat(fmt, "DoDraining", DoDraining.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != DoDrainingAfter.ToString(ci))    { diff.AppendFormat(fmt, "DoDrainingAfter", DoDrainingAfter.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != DoControlWaterTemp.ToString())   { diff.AppendFormat(fmt, "DoControlWaterTemp", DoControlWaterTemp.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != 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); };
@@ -305,10 +321,10 @@ namespace Config.Entities
             ln = inp.ReadLine(); if (ln != BenchPath)                       { diff.AppendFormat(fmt, "BenchPath", BenchPath, ln); };
             ln = inp.ReadLine(); if (ln != OutputPath)                      { diff.AppendFormat(fmt, "OutputPath", OutputPath, ln); };
             ln = inp.ReadLine(); if (ln != MetersPath)                      { diff.AppendFormat(fmt, "MetersPath", MetersPath, ln); };
-            ln = inp.ReadLine(); if (ln != RelTransBefore)                  { diff.AppendFormat(fmt, "RelTransBefore", RelTransBefore, ln); };
-            ln = inp.ReadLine(); if (ln != RelTransBetween)                 { diff.AppendFormat(fmt, "RelTransBetween", RelTransBetween, ln); };
-            ln = inp.ReadLine(); if (ln != Profile.ToString())            { diff.AppendFormat(fmt, "RelTransAfter", Profile, ln); };
-            ln = inp.ReadLine(); if (ln != TransitionAfter)                 { diff.AppendFormat(fmt, "TransitionAfter", TransitionAfter, ln); };
+            ln = inp.ReadLine(); if (ln != 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); };
 
             return diff.ToString();
         }

Config/Entities/TestInstance.cs

@@ -0,0 +1,32 @@
+///
+/// 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.RealDensity; }
-        public static double AtTemperature() { return Data.AtTemperature; }
+        public static double RealDensity() { return Data.SampleDensity; }
+        public static double AtTemperature() { return Data.SampleTemp; }
         public static double Buoyancy() { return Data.Buoyancy; }
 
 

Config/Mappings/BenchPathMap.cs

@@ -15,10 +15,11 @@ namespace Config.Mappings
 			Map(x => x.Name);
 			Map(x => x.Qfrom);
 			Map(x => x.Qto);
-			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.Selector);
+            Map(x => x.TempMtrUp);
+			Map(x => x.TempMtrDown);
+			Map(x => x.PressMtrUp);
+			Map(x => x.PressMtrDown);
 			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.ParentName);
+            Map(x => x.Parent);
             Map(x => x.ItemNr);
-			Map(x => x.Mode);
-			Map(x => x.Logging);
+			Map(x => x.DebugMode);
+			Map(x => x.LogLevel);
 			Map(x => x.Parameters)
 				.CustomType("StringClob")
 				.CustomSqlType("varchar(8000)");

Config/Mappings/FeedingPathMap.cs

@@ -15,8 +15,9 @@ 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.RegulValvesPct);
+            Map(x => x.RegVPositions);
 			Map(x => x.ValvesOpen)
 				.CustomType("StringClob")
 				.CustomSqlType("varchar(8000)");

Config/Mappings/OutputPathMap.cs

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

Config/Mappings/TestMap.cs

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

Config/Mappings/UserMap.cs

@@ -10,14 +10,16 @@ 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("2.26.1519.0")]
-[assembly: AssemblyFileVersion("2.26.1519.0")]
+[assembly: AssemblyVersion("3.1.1464.0")]
+[assembly: AssemblyFileVersion("3.1.1464.0")]

Config/Units.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2016-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Reflection;
@@ -26,7 +26,9 @@ namespace Config
         [Description("m3")]         m3,         ///   1 m3 = 1000 l
 
         [Description("l/h")]        lph,        ///   1 l/h = 0.001 m3/h
+        [Description("cf/h")]       cfph,       ///   1 cf/h = 0.028316846592 m3/h
         [Description("l/m")]        lpm,        ///   1 l/m = 60 l/h = 0.06 m3/h
+        [Description("US gal/m")]   USgalpm,    ///   1 US gallon per minute = 0.2271247068 m3/h
         [Description("m3/h")]       m3ph,       /// * 1 m3/h
         [Description("l/s")]        lps,        ///   1 liter/s = 3.6 m3/h
         [Description("US gal/s")]   USgalps,    ///   1 US gallon per second = 13.627482408 m3/h
@@ -34,6 +36,7 @@ namespace Config
         [Description("cf/s")]       cfs,        ///   1 cubic foot per second = 101.9406477312 m3/h
 
         [Description("g")]          g,          ///   0.001 kg
+        [Description("oz")]         oz,         ///   0.0283495231 kg
         [Description("lb")]         lb,         ///   0.45359237 kg
         [Description("kg")]         kg,         /// * 1 kilogram
         [Description("t")]          t,          ///   1000 kg
@@ -267,7 +270,9 @@ namespace Config
 					return Quantity.Volume;
 
                 case Unit.lph:
+                case Unit.cfph:
                 case Unit.lpm:
+                case Unit.USgalpm:
                 case Unit.m3ph:
                 case Unit.lps:
                 case Unit.USgalps:
@@ -276,6 +281,7 @@ namespace Config
                     return Quantity.Flow;
 
                 case Unit.g:
+                case Unit.oz:
                 case Unit.lb:
                 case Unit.kg:
                 case Unit.t:
@@ -383,7 +389,9 @@ namespace Config
 
                 /// Flow: internal representation in m3/h
                 case Unit.lph:      return 1000 * v;            /// 1 l/h
+                case Unit.cfph:     return 35.3146667214886 * v;/// 1 cf/h
                 case Unit.lpm:      return v / 0.06;            /// 1 l/m
+                case Unit.USgalpm:  return 4.40286754395493 * v;/// 1 US gallon per minute
                 case Unit.lps:      return v / 3.6;             /// 1 l/s
                 case Unit.USgalps:  return 0.0733811257326 * v; /// 1 US gallon per second
                 case Unit.m3pm:     return v / 60;              /// 1 m3/m
@@ -391,6 +399,7 @@ namespace Config
 
                 /// 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
 
@@ -460,7 +469,9 @@ namespace Config
 
                 /// Flow: internal representation in m3/h
                 case Unit.lph:      return 0.001 * v;           /// 1 l/h
+                case Unit.cfph:     return 0.028316846592 * v;  /// 1 cf/h
                 case Unit.lpm:      return 0.06 * v;            /// 1 l/m
+                case Unit.USgalpm:  return 0.2271247068 * v;    /// 1 US gallon per minute
                 case Unit.lps:      return 3.6 * v;             /// 1 l/s
                 case Unit.USgalps:  return 13.627482408 * v;    /// 1 US gallon per second
                 case Unit.m3pm:     return 60 * v;              /// 1 m3/m
@@ -468,6 +479,7 @@ namespace Config
 
                 /// Mass: internal representation in kg
                 case Unit.g:        return 0.001 * v;           /// 1 g = 0.001 kg
+                case Unit.oz:       return 0.0283495231 * v;    /// 1 oz = 0.0283495231 kg
                 case Unit.lb:       return 0.45359237 * v;      /// 1 lb = 0.45359237 kg
                 case Unit.t:        return 1000 * v;            /// 1 t = 1000 kg
 

DataStreamInterface/DataFrame.cs

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

DataStreamInterface/DataStreamInterface.csproj

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

DataStreamInterface/IDataStreamMeter.cs

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

DataStreamInterfaceTest/ActivityLog.cs

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

DataStreamInterfaceTest/App.config

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

DataStreamInterfaceTest/DataStreamInterfaceTest.csproj

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

DataStreamInterfaceTest/DemoMainWnd.Designer.cs

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

DataStreamInterfaceTest/DemoMainWnd.cs

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

DataStreamInterfaceTest/GetDblValueDlg.Designer.cs

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

DataStreamInterfaceTest/GetDblValueDlg.cs

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

DataStreamInterfaceTest/GetFrameBoundariesDlg.Designer.cs

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

DataStreamInterfaceTest/GetFrameBoundariesDlg.cs

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

DataStreamInterfaceTest/GetIntegerNumberDlg.Designer.cs

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

DataStreamInterfaceTest/GetIntegerNumberDlg.cs

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

DataStreamInterfaceTest/GetStateDlg.Designer.cs

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

DataStreamInterfaceTest/GetStateDlg.cs

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

DataStreamInterfaceTest/LviIDComparer.cs

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

DataStreamInterfaceTest/Program.cs

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

DataStreamInterfaceTest/Properties/AssemblyInfo.cs

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

DataStreamInterfaceTest/Properties/Resources.Designer.cs

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

DataStreamInterfaceTest/Properties/Resources.resx

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

DataStreamInterfaceTest/Properties/Settings.Designer.cs

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

DataStreamInterfaceTest/Properties/Settings.settings

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

DataStreamMeter/DataStreamMeter.csproj

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

DataStreamMeter/GetDblValueDlg.Designer.cs

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

DataStreamMeter/GetDblValueDlg.cs

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

DataStreamMeter/MeterDataEventArgs.cs

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

DataStreamMeter/MeterSimulation.cs

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

DataStreamMeter/MeterSimulationDlg.Designer.cs

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

DataStreamMeter/MeterSimulationDlg.cs

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

DataStreamMeter/MeterSimulationDlg.resx

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

DataStreamMeter/Sample.cs

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

DeviceTest/DeviceTest.csproj

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

Dirichlet.Numerics/UInt128.cs

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

Results/BatchResults.cs

@@ -1,4 +1,7 @@
-using System;
+///
+/// Copyright (c) 2021 Sensus Slovensko a.s.
+///
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -40,7 +43,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 densityCorr)
+                                                    WaterMeterData[] waterMeterDatas, int[] waterMeterParts, double realDensity, double atTemperature, double buoyancy)
 		{
 			BatchResults d = new BatchResults(waterMeterDatas.Length);
             int year = DateTime.Now.Year;
@@ -63,10 +66,11 @@ namespace Results
 					ProcedureDescription = procedure.Description,
 					WatermetersStr = procedure.Watermeters,
 					ProcedureRevision = procedure.Revision,
-					ProtocolTitle = string.Empty,
 					StartTime = DateTime.Now,
-					DensityCorr = (float)densityCorr,
-					Compound = (procedure.MetersKind == Config.Entities.MetersKind.Combined),
+                    SampleDensity = realDensity,
+                    SampleTemp = atTemperature,
+                    Buoyancy = buoyancy,
+                    Compound = (procedure.MetersKind == Config.Entities.MetersKind.Combined),
 #if HEAT_METERS
                     HeatMeter = (procedure.MetersKind == Config.Entities.MetersKind.HeatMeter),
 #endif
@@ -156,10 +160,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-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -26,11 +26,10 @@ 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 float DensityCorr { get; set; }				/// Density correction in [kg/m3]
-		public virtual float Custom2 { get; set; }
-		public virtual float Custom3 { 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 int Counter6 { get; set; }
         public virtual int Counter7 { get; set; }
         public virtual int Counter8 { get; set; }
@@ -114,9 +113,10 @@ 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;
 		}
 
         public virtual int PassedMetersCount()
@@ -263,24 +263,6 @@ 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)
@@ -297,11 +279,10 @@ namespace Results.Entities
 
 		public virtual string ToString(int i)
 		{
-            return string.Format("Batch: BatchNr={0} ProgramVersion={1} TestBenchId={2} UserName={3} UserNumber={4} ProcedureName={5}{6} ProcRev={7} ProtocolTitle={8} Remark={9} DensityCorr={10} Custom2={11} Custom3={12} StartTime={13} EndTime={14} Dirty={15} RsltsSent={16} RsltsPrinted={17}",
+            return string.Format("Batch: BatchNr={0} ProgramVersion={1} TestBenchId={2} UserName={3} UserNumber={4} ProcedureName={5}{6} ProcRev={7} Remark={8} RealDensity={9} AtTemperature={10} Buoyancy={11} StartTime={12} EndTime={13} Dirty={14} RsltsSent={15} RsltsPrinted={16}",
                                 BatchNr, ProgramVersion, TestBenchId, UserName, UserNumber,
 								ProcedureName, (IsRemoteProcedure ? "(R)" : ""), ProcedureRevision,
-                                ProtocolTitle, Remark, DensityCorr, Custom2, Custom3,
-                                StartTime, EndTime, Dirty, RsltsSent, RsltsPrinted);
+                                Remark, SampleDensity, SampleTemp, Buoyancy, StartTime, EndTime, Dirty, RsltsSent, RsltsPrinted);
 		}
 
         public virtual void WriteBinary(BinaryWriter writer)
@@ -323,11 +304,10 @@ 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(DensityCorr);
-            writer.Write(Custom2);
-            writer.Write(Custom3);
+            writer.Write(SampleDensity);
+            writer.Write(SampleTemp);
+            writer.Write(Buoyancy);
             writer.Write(Counter6);
             writer.Write(Counter7);
             writer.Write(Counter8);
@@ -390,11 +370,10 @@ namespace Results.Entities
             ProcedureDescription = reader.ReadString();
             ProcedureRevision = reader.ReadInt32();
             WatermetersStr = reader.ReadString();
-            ProtocolTitle = reader.ReadString();
             Remark = reader.ReadString();
-            DensityCorr = reader.ReadInt32();
-            Custom2 = reader.ReadInt32();
-            Custom3 = reader.ReadInt32();
+            SampleDensity = reader.ReadDouble();
+            SampleTemp = reader.ReadDouble();
+            Buoyancy = reader.ReadDouble();
             Counter6 = reader.ReadInt32();
             Counter7 = reader.ReadInt32();
             Counter8 = reader.ReadInt32();

Results/Entities/TestData.cs

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

Results/Entities/TestRslt.cs

@@ -371,6 +371,12 @@ 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;

Results/Entities/WaterMeter.cs

@@ -186,6 +186,30 @@ 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());

Results/ItemID.cs

@@ -327,6 +327,8 @@ namespace Results
         Conduct_min,                    /// 277
         Conduct_max,                    /// 278
 
+        InfoFlags,						/// 279
+
         Count,
     }
 }

Results/Mappings/BatchMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Results.Entities;
@@ -18,14 +18,13 @@ 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.DensityCorr)
-				.Column("Custom1"); ;
-			Map(x => x.Custom2);
-			Map(x => x.Custom3);
+
+			Map(x => x.SampleDensity);
+			Map(x => x.SampleTemp);
+			Map(x => x.Buoyancy);
 
             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).Column("Uncertainty");
+            Map(x => x.ErrLimMargin);
 			Map(x => x.Publish);
 			Map(x => x.Evaluate);
 		}

Results/Mappings/TestRsltMap.cs

@@ -37,7 +37,7 @@ namespace Results.Mappings
 			Map(x => x.MassEndRaw);
 			Map(x => x.MassEnd);
 			Map(x => x.DensityIn);
-            Map(x => x.DensityLine).Column("DensityOut");
+            Map(x => x.DensityLine);
 			Map(x => x.DensityDiv);
 			Map(x => x.Buoyancy);
 			Map(x => x.FlowMass);
@@ -52,27 +52,27 @@ namespace Results.Mappings
 #if HEAT_METERS
 			Map(x => x.RefEnergy);
 #endif
-			Map(x => x.AmbTempMean).Column("AmbientTempAve");
+			Map(x => x.AmbTempMean);
 			Map(x => x.AmbTempStart);
 			Map(x => x.AmbTempEnd);
 			Map(x => x.AmbTempMin);
 			Map(x => x.AmbTempMax);
-			Map(x => x.AmbPressMean).Column("AmbientPressAve");
+			Map(x => x.AmbPressMean);
 			Map(x => x.AmbPressStart);
 			Map(x => x.AmbPressEnd);
 			Map(x => x.AmbPressMin);
 			Map(x => x.AmbPressMax);
-			Map(x => x.AmbHumiMean).Column("AmbientHumiAve");
+			Map(x => x.AmbHumiMean);
 			Map(x => x.AmbHumiStart);
 			Map(x => x.AmbHumiEnd);
 			Map(x => x.AmbHumiMin);
 			Map(x => x.AmbHumiMax);
-			Map(x => x.PressUpMean).Column("PressUpAvrg");
+			Map(x => x.PressUpMean);
 			Map(x => x.PressUpStart);
 			Map(x => x.PressUpEnd);
 			Map(x => x.PressUpMin);
 			Map(x => x.PressUpMax);
-			Map(x => x.PressDownMean).Column("PressDownAvrg");
+			Map(x => x.PressDownMean);
 			Map(x => x.PressDownStart);
 			Map(x => x.PressDownEnd);
 			Map(x => x.PressDownMin);
@@ -82,17 +82,17 @@ namespace Results.Mappings
 			Map(x => x.PressDeltaEnd);
 			Map(x => x.PressDeltaMin);
 			Map(x => x.PressDeltaMax);
-			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.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.TempDivStart);
 			Map(x => x.TempDivEnd);
 			Map(x => x.TempDivMin);

Results/Output/Printers/Munich/MunichPrintDocument.cs

@@ -1,630 +0,0 @@
-///
-/// 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

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

Results/Properties/AssemblyInfo.cs

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

Results/Resources/Strings.Designer.cs

@@ -510,6 +510,15 @@ 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,4 +828,7 @@
   <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;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;JUZNA_AFRIKA_NEW</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;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;JUZNA_AFRIKA_NEW</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -166,9 +166,6 @@
     <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>
@@ -195,6 +192,10 @@
     <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-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2016-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Text;
@@ -11,9 +11,7 @@ namespace Results
 	{
 		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);
+            return Common.Utils.GetTestName(name, repeats, repetitionNr);
 		}
 
 		

Results/WMeterRsltItemSpec.cs

@@ -43,13 +43,6 @@ 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
 		/// 
@@ -182,9 +175,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.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))));
+            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))));
 
 			///
             /// Date and time 
@@ -210,22 +203,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.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_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_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)))));
@@ -259,7 +252,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.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", AtTemperature)));
+            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)));
 #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)));
@@ -316,7 +309,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.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)) : "")));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Buoyancy,            "Buoyancy",                                                                   Quantity.Number,      ItemCategory.BenchData,  (w, t, u, f, p) => FormatDbl(u, f, p, "V6", w.Batch.Buoyancy)));
 
             ///
             /// Error
@@ -412,7 +405,6 @@ 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)));
@@ -451,9 +443,12 @@ namespace Results
   #endif
 #endif
 
+#if ORACLE_DB
+            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)));
+#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)));
@@ -471,6 +466,7 @@ 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,7 +20,6 @@ namespace ResultsBrowser.Filters
                     DateFilter.GetFilterID(),
                     BatchNrFilter.GetFilterID(),
                     ProcedureFilter.GetFilterID(),
-                    ProtocolFilter.GetFilterID(),
                     QnFilter.GetFilterID(),
                     SerialNrFilter.GetFilterID(),
                     WMPositionFilter.GetFilterID(),
@@ -31,7 +30,6 @@ namespace ResultsBrowser.Filters
                     DateFilter.GetFilterName(),
                     BatchNrFilter.GetFilterName(),
                     ProcedureFilter.GetFilterName(),
-                    ProtocolFilter.GetFilterName(),
                     QnFilter.GetFilterName(),
                     SerialNrFilter.GetFilterName(),
                     WMPositionFilter.GetFilterName(),
@@ -46,7 +44,6 @@ 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();
@@ -62,7 +59,6 @@ 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

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

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

@@ -1,39 +0,0 @@
-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/CustomQuerySpecificationForm.Designer.cs

@@ -181,7 +181,7 @@
             // 
             // parameterValueTextBox
             // 
-            this.parameterValueTextBox.Location = new System.Drawing.Point(612, 13);
+            this.parameterValueTextBox.Location = new System.Drawing.Point(325, 14);
             this.parameterValueTextBox.Name = "parameterValueTextBox";
             this.parameterValueTextBox.Size = new System.Drawing.Size(68, 20);
             this.parameterValueTextBox.TabIndex = 1;
@@ -189,7 +189,7 @@
             // parameterNameLabel
             // 
             this.parameterNameLabel.AutoSize = true;
-            this.parameterNameLabel.Location = new System.Drawing.Point(121, 17);
+            this.parameterNameLabel.Location = new System.Drawing.Point(128, 17);
             this.parameterNameLabel.Name = "parameterNameLabel";
             this.parameterNameLabel.Size = new System.Drawing.Size(0, 13);
             this.parameterNameLabel.TabIndex = 0;

ResultsBrowser/Forms/CustomQuerySpecificationForm.cs

@@ -83,7 +83,7 @@ namespace ResultsBrowser.Forms
             else if (CQCriteria == CQCriteria.BenchAndBatchNr)
             {
                 parameterGroupBox.Enabled = true;
-                parameterNameLabel.Text = "wr10=5, wr11=6, wr13=8, wr14=10, wr15=9, wr18=11, wr19=12, wr20=13, wr21=14";
+                parameterNameLabel.Text = "Test bench number (e.g. 10 for WR10)";
             }
             else
             {

ResultsBrowser/Forms/PrinterConfigDlg.cs

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

ResultsBrowser/OraData.cs

@@ -20,18 +20,11 @@ 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 - 2020 Sensus Slovensko a.s.")]
+[assembly: AssemblyCopyright("Copyright ©  2015 - 2018 Sensus Slovensko a.s.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.26.1498.0")]
-[assembly: AssemblyFileVersion("2.26.1498.0")]
+[assembly: AssemblyVersion("3.1.1464.0")]
+[assembly: AssemblyFileVersion("3.1.1464.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", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.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;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;JUZNA_AFRIKA_NEW</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;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;JUZNA_AFRIKA_NEW</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -96,13 +96,6 @@
     <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>
@@ -219,9 +212,6 @@
     <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.BenchControl;
-using TBF.BenchControl.Generic;
-using TBF.BenchControl.GenericDevices;
+using TBF.Rig;
+using TBF.Rig.Generic;
+using TBF.Rig.GenericDevices;
 using ResultsBrowser.Filters;
 using ResultsBrowser.Resources;
 using Oracle;
@@ -44,7 +44,7 @@ namespace ResultsBrowser
             filtersConfig = new FiltersConfig();
             this.args = args;
 
-            tbfComponents = new List<TBF.BenchControl.Generic.IComponent>();
+            tbfComponents = new List<TBF.Rig.Generic.IComponent>();
             tbfDevices = new List<IDevice>();
 
             timePeriodStart = new DateTime(0);
@@ -409,12 +409,7 @@ namespace ResultsBrowser
         {
             if (waterMeters == null || waterMeters.Count == 0) return;
 
-#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
+#if CEVAK_40
 			IList<Results.Entities.Batch> batches = new List<Results.Entities.Batch>();
 			foreach (var wm in waterMeters)
 			{
@@ -609,22 +604,12 @@ namespace ResultsBrowser
                         while (dr.Read())
                         {
                             int i = 0;
-                            
-                            string queryResult;
-                            try { queryResult = dr.GetString(i++); }
-                            catch { queryResult = string.Empty; }
-                            
+                            string queryResult = dr.GetString(i++);
                             int maxPruefIx = dr.GetInt32(i++);
                             int testBenchId = maxPruefIx / 100;
                             maxPruefIx = maxPruefIx % 100;
-                            
-                            string prefix;
-                            try { prefix = dr.GetString(i++); }
-                            catch { prefix = string.Empty; }
-                            
-                            int sn;
-                            try { sn = dr.GetInt32(i++); }
-                            catch { sn = -1; }
+                            string prefix = dr.GetString(i++);
+                            int sn = dr.GetInt32(i++);
 
                             if (sn == -1) continue;
 
@@ -739,35 +724,16 @@ 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  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;
+                                case -2: oraD.AdjErrA4 = error; break;
+                                case -1: oraD.AdjErr = error; break;
+                                case 5: oraD.Q3LrErr = error; break;
+                                case 10: oraD.Q3RlErr = error; break;
                                 default: break;
                             }
-
-#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)
@@ -779,27 +745,15 @@ namespace ResultsBrowser
                 {
                     switch (dlg.IntParameter)
                     {
-#if LOCAL
-                        case 5:  Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr10-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break;
-                        case 6:  Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr11-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break;
-                        case 8:  Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr13-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break;
-                        case 9:  Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr15-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break;
-                        case 10: Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr14-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break;
-                        case 11: Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr18-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break;
-                        case 12: Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr19-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break;
-                        case 13: Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr20-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break;
-                        case 14: Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr21-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break;
-#else
-                        case 5:  Results.DB.ConnectionString = "SERVER=10.42.130.69;  DATABASE=st-wr10-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
-                        case 6:  Results.DB.ConnectionString = "SERVER=10.42.129.27;  DATABASE=st-wr11-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
-                        case 8:  Results.DB.ConnectionString = "SERVER=10.42.130.52;  DATABASE=st-wr13-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
-                        case 9:  Results.DB.ConnectionString = "SERVER=10.42.130.71;  DATABASE=st-wr15-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
-                        case 10: Results.DB.ConnectionString = "SERVER=10.42.130.72;  DATABASE=st-wr14-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
-                        case 11: Results.DB.ConnectionString = "SERVER=10.42.130.165; DATABASE=st-wr18-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
-                        case 12: Results.DB.ConnectionString = "SERVER=10.42.128.159; DATABASE=st-wr19-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
-                        case 13: Results.DB.ConnectionString = "SERVER=10.42.130.76;  DATABASE=st-wr20-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
-                        case 14: Results.DB.ConnectionString = "SERVER=10.42.128.201; DATABASE=st-wr21-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
-#endif
+                        case 10: Results.DB.ConnectionString = "SERVER=10.42.130.69;  DATABASE=st-wr10-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 11: Results.DB.ConnectionString = "SERVER=10.42.129.27;  DATABASE=st-wr11-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 13: Results.DB.ConnectionString = "SERVER=10.42.130.52;  DATABASE=st-wr13-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 15: Results.DB.ConnectionString = "SERVER=10.42.130.71;  DATABASE=st-wr15-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 14: Results.DB.ConnectionString = "SERVER=10.42.130.72;  DATABASE=st-wr14-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 18: Results.DB.ConnectionString = "SERVER=10.42.130.165; DATABASE=st-wr18-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 19: Results.DB.ConnectionString = "SERVER=10.42.128.159; DATABASE=st-wr19-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 20: Results.DB.ConnectionString = "SERVER=10.42.130.76;  DATABASE=st-wr20-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 21: Results.DB.ConnectionString = "SERVER=10.42.128.201; DATABASE=st-wr21-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
                         default: Results.DB.ConnectionString = string.Empty; break;
                     }
                     Results.DB.DbType = Users.Entities.DBType.MySql;
@@ -872,14 +826,14 @@ namespace ResultsBrowser
                 counter = 0;
                 foreach (var testBenchId in testBenches)
                 {
-                    if (testBenchId == 4 || (dlg.CQCriteria == CQCriteria.BenchAndBatchNr && testBenchId != dlg.IntParameter))
+                    if (testBenchId == 4)
                     {
-                        /// Skip WR9 or other test benches
+                        /// Skip WR9
                         continue;
                     }
 
                     consoleTextBox.Text += string.Format("{0}\r\n", GetBenchName(testBenchId));
-#if LOCAL
+#if false
                     /// Local database copies
                     switch (testBenchId)
                     {
@@ -898,10 +852,10 @@ namespace ResultsBrowser
                     /// Test bench databases
                     switch (testBenchId)
                     {
-                        case 5:  Results.DB.ConnectionString = "SERVER=10.42.130.69;  DATABASE=st-wr10-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
-                        case 6:  Results.DB.ConnectionString = "SERVER=10.42.129.27;  DATABASE=st-wr11-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
-                        case 8:  Results.DB.ConnectionString = "SERVER=10.42.130.52;  DATABASE=st-wr13-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
-                        case 9:  Results.DB.ConnectionString = "SERVER=10.42.130.71;  DATABASE=st-wr15-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 5: Results.DB.ConnectionString = "SERVER=10.42.130.69;  DATABASE=st-wr10-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 6: Results.DB.ConnectionString = "SERVER=10.42.129.27;  DATABASE=st-wr11-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 8: Results.DB.ConnectionString = "SERVER=10.42.130.52;  DATABASE=st-wr13-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 9: Results.DB.ConnectionString = "SERVER=10.42.130.71;  DATABASE=st-wr15-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
                         case 10: Results.DB.ConnectionString = "SERVER=10.42.130.72;  DATABASE=st-wr14-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
                         case 11: Results.DB.ConnectionString = "SERVER=10.42.130.165; DATABASE=st-wr18-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
                         case 12: Results.DB.ConnectionString = "SERVER=10.42.128.159; DATABASE=st-wr19-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
@@ -965,12 +919,11 @@ namespace ResultsBrowser
                 consoleTextBox.Text += "CSV data begin\r\n";
                 using (TextWriter writer = new StreamWriter(dlg.DestinationFile))
                 {
-#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"));
+                    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"));
                     //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};{22};{23};{24};{25};{26};{27};{28}",
+                        writer.WriteLine(string.Format("{0}; {1}; {2}; =(\"{3}\"); {4}; {5}; {7}; {8}; {9}; {10};{11};{12};{13};{14};{15};{16};{17};{18};{19};{20}",
                             //Console.WriteLine(string.Format("{2};=(\"{3}\"); {4};{5};{11};{12};{13};{14};{15};{16};{17};{19};{20}",
                             /*  0 */  oraD.PO,
                             /*  1 */  oraD.Prefix,
@@ -984,57 +937,18 @@ namespace ResultsBrowser
                             /*  9 */  oraD.End.ToShortDateString(),
                             /* 10 */  oraD.End.ToShortTimeString(),
                             /* 11 */  oraD.WMPosition,
-                            /* 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));
+                            /* 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));
                     }
-#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";
 
@@ -1053,11 +967,11 @@ namespace ResultsBrowser
         {
             switch (testBenchId)
             {
-                case 4:  return "WR9";
-                case 5:  return "WR10";
-                case 6:  return "WR11";
-                case 8:  return "WR13";
-                case 9:  return "WR15";
+                case 4: return "WR9";
+                case 5: return "WR10";
+                case 6: return "WR11";
+                case 8: return "WR13";
+                case 9: return "WR15";
                 case 10: return "WR14";
                 case 11: return "WR18";
                 case 12: return "WR19";

SchematicDrawing/DrawingShape.cs

@@ -0,0 +1,579 @@
+///
+/// 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

@@ -0,0 +1,23 @@
+///
+/// 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

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

@@ -0,0 +1,43 @@
+///
+/// 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

@@ -0,0 +1,52 @@
+///
+/// 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

@@ -0,0 +1,106 @@
+///
+/// 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

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

SchematicDrawing/IDrawingItCmpntWithMeasuredVal.cs

@@ -0,0 +1,12 @@
+///
+/// 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

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