Reconfigured for Munich with camera

Somariny, ver. 2 17.750
2017-11-24 16:26:45 +01:00 · 2017-11-24 16:24:13 +01:00
1430 changed files with 13285 additions and 26362 deletions
@@ -6,14 +6,12 @@ Dirichlet.Numerics/bin
 Dirichlet.Numerics/obj
 GraphLib/bin
 GraphLib/obj
-MonitoringDB/bin
-MonitoringDB/obj
 Results/bin/
 Results/obj/
 ResultsBrowser/bin/
 ResultsBrowser/obj/
-TBF/bin/
-TBF/obj/
+TestBenchFramework/bin/
+TestBenchFramework/obj/
 TBFSetup/Debug/
 TBFSetup/Release/
 Users/bin/
@@ -18,7 +18,7 @@
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;BADGER_STREDNA_TRAT;LANG_CS</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;MUNICH;LANG_DE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -28,7 +28,7 @@
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;BADGER_STREDNA_TRAT;LANG_CS</DefineConstants>
+    <DefineConstants>TRACE;MUNICH;LANG_DE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
@@ -14,7 +14,7 @@ namespace Config
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
        public const int MaxPartNr = 3;
-#elif DN100 || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT
+#elif DN100 || BADGER_VELKA_TRAT
 		public const int WMsCount = 3;
 		public const int LineSize = 3;
 		public const int CompoundWMsCount = 1;
@@ -76,7 +76,7 @@ namespace Config
        public const int MaxPartNr = WMsCount / LineSize;
 #endif

-        ///
+		///
 		/// Database related: This object reference is set after a successful user login
 		///
 		public static DatabaseSettings CurrentBench;
@@ -3,8 +3,6 @@
 ///
 using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.IO;

 namespace Config.Entities
 {
@@ -55,59 +53,6 @@ namespace Config.Entities
 			return result;
 		}

-        public virtual void Export(StreamWriter output)
-        {
-            output.WriteLine(Name);
-            output.WriteLine(ClassName);
-            output.WriteLine(ParentName);
-            output.WriteLine(Mode.ToString());
-            output.WriteLine(Logging.ToString());
-            output.Write(Parameters);
-
-            output.Close();
-        }
-
-        public static Component Import(StreamReader input)
-        {
-            Component result = new Component();
-
-            result.Name = input.ReadLine();
-            result.ClassName = input.ReadLine();
-            result.ParentName = 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;
-
-            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;
-
-            result.Parameters = string.Empty;
-            line = input.ReadLine();
-            while (line != null)
-            {
-                result.Parameters += line;
-                result.Parameters += Environment.NewLine;
-                line = input.ReadLine();
-            }
-
-            return result;
-        }
-
 		public virtual string ToString(string indent)
 		{
 			string result = string.Empty;
@@ -374,13 +374,6 @@ namespace Config.Entities
        Count
    }

-    public enum VertAlignment
-    {
-        [Description("Top")]        Top,
-        [Description("Middle")]     Middle,
-        [Description("Bottom")]     Bottom,
-    }
-
 	public enum ImageRotation
 	{
 		[Description("0 deg")]		None,
@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
 using System;

@@ -8,15 +8,7 @@ namespace Config.Entities
 	public class MeasurementCorrection
 	{
 		public virtual int Id { get; protected set; }
-        public virtual int RangeIx { get; set; }        /// 0..5
 		public virtual float Measurement { get; set; }
 		public virtual float Correction { get; set; }
-
-        public MeasurementCorrection() { }
-
-        public MeasurementCorrection(int rangeIx)
-        {
-            RangeIx = rangeIx;
-        }
 	}
 }
@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
 using FluentNHibernate.Mapping;
 using Config.Entities;
@@ -11,7 +11,6 @@ namespace Config.Mappings
 		public MeasurementCorrectionMap()
 		{
 			Id(x => x.Id);
-            Map(x => x.RangeIx);
 			Map(x => x.Measurement);
 			Map(x => x.Correction);
 		}
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Sensus")]
 [assembly: AssemblyProduct("Config")]
-[assembly: AssemblyCopyright("Copyright ©  2013 - 2018 Sensus Slovensko a.s.")]
+[assembly: AssemblyCopyright("Copyright ©  2013 - 2016 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.18.827.0")]
-[assembly: AssemblyFileVersion("2.18.827.0")]
+[assembly: AssemblyVersion("2.17.742.0")]
+[assembly: AssemblyFileVersion("2.17.742.0")]
@@ -30,7 +30,7 @@ namespace Config
        [Description("hr")]         hour,       ///   1 hour = 60 min = 3600 s
        [Description("ms")]         ms,         ///   1 ms = 0.001 s

-		[Description("°C")]         C,          /// * degree Celsius (°C)
+        [Description("°C")]         C,          /// * degree Celsius
        [Description("°F")]         F,          ///   degree Fahrenheit
        [Description("K")]          K,          ///   degree Kelvin

@@ -293,8 +293,8 @@ namespace Config
                case Unit.hour:     return v / 3600;
                case Unit.ms:       return 1000 * v;

-				/// Temperature: internal representation in °C
-				case Unit.C:        return v;               /// degree Celsius (°C)
+                /// Temperature: internal representation in degree C 
+                case Unit.C:        return v;               /// degree Celsius
                case Unit.F:        return 1.8 * v + 32;    /// degree Fahrenheit
                case Unit.K:        return v + 273.15;      /// degree Kelvin

@@ -360,8 +360,8 @@ namespace Config
                case Unit.hour:     return 3600 * v;
                case Unit.ms:       return v / 1000;

-				/// Temperature: internal representation in °C
-				case Unit.C:        return v;               /// degree Celsius (°C)
+                /// Temperature: internal representation in degree C 
+                case Unit.C:        return v;               /// degree Celsius
                case Unit.F:        return 5 * (v-32) / 9;  /// degree Fahrenheit
                case Unit.K:        return v - 273.15;      /// degree Kelvin

@@ -92,7 +92,7 @@
      <Project>{743DF7DB-C7B6-42EB-986D-0F485E5588E4}</Project>
      <Name>Config</Name>
    </ProjectReference>
-    <ProjectReference Include="..\TBF\TBF.csproj">
+    <ProjectReference Include="..\TestBenchFramework\TBF.csproj">
      <Project>{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}</Project>
      <Name>TBF</Name>
    </ProjectReference>
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
@@ -160,46 +159,7 @@ namespace GraphLib
        {           
            grid_off_y = off_y;
        }
-
-
-		/// <summary>
-		/// Load Samples from a file. Returns loaded points count.
-		/// </summary>
-		/// <param name="pathName">File pathname</param>
-		/// <returns>Loaded points count</returns>
-		public int LoadSamples(string pathName, out float yMin, out float yMax)
-		{
-			yMin = float.MaxValue;
-			yMax = float.MinValue;
-			try
-			{
-				Int64 size = new FileInfo(pathName).Length;
-				if ((size % 8) != 0) return 0;
-				int samplesCount = (int)(size / 8L) - 1;
-				if (samplesCount <= 0) return 0;
-
-				PointF[] newSamples = new PointF[samplesCount];
-				using (BinaryReader reader = new BinaryReader(File.Open(pathName, FileMode.Open)))
-				{
-					for (int i = 0; i < samplesCount; i++)
-					{
-						newSamples[i].X = reader.ReadSingle();
-						newSamples[i].Y = reader.ReadSingle();
-					}
-					yMin = reader.ReadSingle();
-					yMax = reader.ReadSingle();
-				}
-
-				Samples = newSamples;
-				return samplesCount;
-			}
-			catch (Exception exc)
-			{
-				return 0;
-			}
-		}
-
-
+      
        [Category("Properties")] // Take this out, and you will soon have problems with serialization;
        [DefaultValue(typeof(string), "")]
        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
@@ -374,14 +374,7 @@ namespace GraphLib
            if (gPane.Sources.Count > 0)
            {
                int val = hScrollBar1.Value;
-
-                int maxLen = 0;
-                foreach (var s in DataSources)
-                {
-                    if (s.Length > maxLen) maxLen = s.Length;
-                }
-
-                gPane.starting_idx = (int)(maxLen * (float)val / 10000.0f);
+                gPane.starting_idx = (int)(gPane.Sources[0].Length * (float)val / 10000.0f);
                gPane.Invalidate();
            }
        }
@@ -56,7 +56,6 @@ namespace GraphLib
 			this.tb1.ShowToolTips = true;
 			this.tb1.Size = new System.Drawing.Size(80, 26);
 			this.tb1.TabIndex = 1;
-			this.tb1.Visible = false;
 			this.tb1.ButtonClick += new System.Windows.Forms.ToolBarButtonClickEventHandler(this.tb1_ButtonClick);
 			// 
 			// tbbSave
@@ -125,64 +125,64 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACI
-        DgAAAk1TRnQBSQFMAgEBBAEAARQBAAEUAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
-        AwABIAMAAQEBAAEgBgABIP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AKgADAQECwAABtgGV
-        AU8B/QHKAZgBWQH/AcoBlwFZAf8BygGXAVkB/wHKAZcBWQH/AcoBlwFYAf8ByQGXAVgB/wHJAZcBWAH/
-        AcoBmAFZAf8BtgGUAU8B/RQAAxQBHAMRARcDAgEDrAADTgGZA10B0gNMAf8BxwGVAVUB/wH5AfcB9gH/
+        DgAAAk1TRnQBSQFMAgEBBAEAAQwBAAEMAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        AwABIAMAAQEBAAEgBgABIP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AKgADAQECwAABtwGV
+        AVAB/QHKAZgBWgH/AcoBlwFaAf8BygGXAVoB/wHKAZcBWgH/AcoBlwFZAf8ByQGXAVkB/wHJAZcBWQH/
+        AcoBmAFaAf8BtwGUAVAB/RQAAxQBHAMRARcDAgEDrAADTgGZA10B0gNNAf8BxwGVAVYB/wH5AfcB9gH/
        AfkB8QHsAf8B+QHxAesB/wH4AfAB6QH/AfcB7QHmAf8B9AHqAeEB/wHyAegB3gH/AfoB+AH2Af8BxwGU
-        AVUB/wMYAf8DWAHRA0QBeggAAxUBHQFiAlgB6QM6AWEDDQESAwABASwAAxsBJgMbASYDGwEmAxsBJgMb
+        AVYB/wMZAf8DWAHRA0QBeggAAxUBHQFiAlgB6QM6AWEDDQESAwABASwAAxsBJgMbASYDGwEmAxsBJgMb
        ASYDGwEmAxsBJgMbASYDGwEmAxsBJgMbASYDGwEmEAADGwEmAxsBJgMbASYDGwEmAxsBJgMbASYDGwEm
-        AxsBJgMbASYDGwEmAxsBJgMbASYIAANUAf0DpwH/A7UB/wOBAf8BrwGsAaoB/wHFAcABvQH/AcUBwAG9
-        Af8BxQHAAb0B/wHFAcABvQH/AcUBwAG9Af8BxQHAAb0B/wGtAaoBqAH/AyAB/wO1Af8DmwH/AxcB/wgA
-        AxUBHQNNAfoBOgIrAfwDXwHgAysBQgMNARIoAAMbASYDKwH8AYACgQH/AYACgQH/AYACgQH/AYACgQH/
+        AxsBJgMbASYDGwEmAxsBJgMbASYIAANVAf0DpwH/A7UB/wOBAf8BrwGsAaoB/wHFAcABvQH/AcUBwAG9
+        Af8BxQHAAb0B/wHFAcABvQH/AcUBwAG9Af8BxQHAAb0B/wGtAaoBqAH/AyEB/wO1Af8DmwH/AxgB/wgA
+        AxUBHQNNAfoBOwIrAfwDXwHgAysBQgMNARIoAAMbASYDKwH8AYACgQH/AYACgQH/AYACgQH/AYACgQH/
        AYACgQH/AYACgQH/AYACgQH/AYACgQH/AYACgQH/AxsBJhAAAxsBJgMrAfwBgAKBAf8BgAKBAf8BgAKB
-        Af8DIwE0AxsBJgMrAfwBgAKBAf8BgAKBAf8BgAKBAf8DIwE0CAADZAH/A7UB/wO1Af8DlQH/A4EB/wOB
-        Af8DbQH/A2IB/wNVAf8DRgH/AzcB/wM2Af8DYgH/A7UB/wO1Af8DGQH/CAADFQEdAV8CSgH7AfkB+gH5
+        Af8DIwE0AxsBJgMrAfwBgAKBAf8BgAKBAf8BgAKBAf8DIwE0CAADZQH/A7UB/wO1Af8DlQH/A4EB/wOB
+        Af8DbgH/A2MB/wNWAf8DRwH/AzgB/wM3Af8DYwH/A7UB/wO1Af8DGgH/CAADFQEdAV8CSgH7AfkB+gH5
        Af8DfwH+AV8BUwFSAfsDVQGyAx0BKgMIAQsgAAMbASYDQAH9IP8DQAH9AxsBJgMAAQEMAAMbASYDQAH9
-        AfwB/QH8Bf8DQAH9AxsBJgMbASYDQAH9AfwB/QH8Bf8DQAH9AxsBJgMAAQEEAANpAf8DuwH/A7sB/wON
-        Af8D1AH/A7kB/wO5Af8DuQH/A7kB/wO5Af8DuQH/A9MB/wODAf8DuwH/A7sB/wMeAf8IAAMVAR0DKwH8
-        AfoC+wH/AfUC9gH/AfkC+gH/ATsBLgEtAfwBbQJRAfcDQgF2AxYBHgMFAQcYAAMbASYDQAH9BP8B1QHb
+        AfwB/QH8Bf8DQAH9AxsBJgMbASYDQAH9AfwB/QH8Bf8DQAH9AxsBJgMAAQEEAANqAf8DuwH/A7sB/wON
+        Af8D1AH/A7kB/wO5Af8DuQH/A7kB/wO5Af8DuQH/A9MB/wODAf8DuwH/A7sB/wMfAf8IAAMVAR0DKwH8
+        AfoC+wH/AfUC9gH/AfkC+gH/ATwBLwEuAfwBbQJRAfcDQgF2AxYBHgMFAQcYAAMbASYDQAH9BP8B1QHb
        AdgB/wHUAdsB1wH/AdQB2wHYAf8B0wHbAdcB/wHRAdkB1QH/Ac8B1wHTBf8DQAH9AxsBJgMBAQIMAAMb
        ASYDQAH9AeIB5QHkAf8B2AHfAdwB/wNAAf0DGwEmAxsBJgNAAf0D8wH/AfcB+AH3Af8DQAH9AxsBJgMB
-        AQIEAANuAf8D1wH/A9cB/wOXAf8D2AH/A78B/wO/Af8DvwH/A78B/wO/Af8DvwH/A9cB/wOOAf8D1wH/
-        A9cB/wMzAf8IAAMWAR4DKwH8A/sB/wHTAdoB1wH/AdoB3wHcAf8B9gH3AfYB/wHyAvMB/wE6AisB/AFg
+        AQIEAANvAf8D1wH/A9cB/wOXAf8D2AH/A78B/wO/Af8DvwH/A78B/wO/Af8DvwH/A9cB/wOOAf8D1wH/
+        A9cB/wM0Af8IAAMWAR4DKwH8A/sB/wHTAdoB1wH/AdoB3wHcAf8B9gH3AfYB/wHyAvMB/wE7AisB/AFg
        AlkB6wMzAVMDEgEZAwQBBRAAAxsBJgNAAf0E/wHaAeAB3QH/AdsB4QHeAf8B3QHiAeAB/wHdAeIB4AH/
        AdsB4QHeAf8B2AHeAdsF/wNAAf0DGwEmAwEBAgwAAxsBJgNAAf0B4gHmAeQB/wHcAeIB3wH/A0AB/QMb
-        ASYDGwEmA0AB/QHvAfEB8AH/AfAB8wHxAf8DQAH9AxsBJgMBAQIEAANyAf8D+QH/A/kB/wOrAf8D3wH/
-        A8sB/wPLAf8DywH/A8sB/wPLAf8DywH/A98B/wOjAf8D+QH/A/kB/wNVAf8IAAMWAR4DKwH8A/sB/wHf
+        ASYDGwEmA0AB/QHvAfEB8AH/AfAB8wHxAf8DQAH9AxsBJgMBAQIEAANzAf8D+QH/A/kB/wOrAf8D3wH/
+        A8sB/wPLAf8DywH/A8sB/wPLAf8DywH/A98B/wOjAf8D+QH/A/kB/wNWAf8IAAMWAR4DKwH8A/sB/wHf
        AeQB4QH/Ad4B4wHhAf8B3gHjAeAB/wHjAecB5QH/AfQC9QH/A38B/gGRAkAB/QNWAbYDJgE5AxABFQwA
        AxsBJgNAAf0E/wHdAeMB4AH/AeEB5gHjAf8B5AHpAecB/wHmAeoB6AH/AeUB6QHnAf8B4gHnAeQF/wNA
        Af0DGwEmAwEBAgwAAxsBJgNAAf0B5AHoAeUB/wHeAeMB4QH/A0AB/QMbASYDGwEmA0AB/QHsAe8B7gH/
        AecB6wHpAf8DQAH9AxsBJgMBAQIEAANqAfkD/AH/A/wB/wPLAf8D8gH/A/IB/wPyAf8D8gH/A/IB/wPy
        Af8D8gH/A/IB/wPGAf8D/AH/A/wB/wNwAf4IAAMWAR4DKwH8A/sB/wHqAe4B7AH/AewB7wHuAf8B7AHv
-        Ae4B/wHrAe4B7QH/AekB7AHrAf8DfwH+AToCKwH8AVgCVgG7Ax0BKgMGAQgMAAMbASYDQAH9BP8B3wHk
+        Ae4B/wHrAe4B7QH/AekB7AHrAf8DfwH+ATsCKwH8AVgCVgG7Ax0BKgMGAQgMAAMbASYDQAH9BP8B3wHk
        AeEB/wHkAekB5gH/AeoB7QHrAf8B7gHxAe8B/wHvAfEB8AH/AewB7wHuBf8DQAH9AxsBJgMBAQIMAAMb
        ASYDQAH9AesB7QHsAf8B3QHjAeAB/wNAAf0DGwEmAxsBJgNAAf0B7QHwAe8B/wHfAeQB4QH/A0AB/QMb
-        ASYDAQECBAADXQTSAf8D6AH/A3EB/wNxAf8DcQH/A3EB/wNxAf8DcQH/A3EB/wNxAf8DcQH/A3EB/wPo
+        ASYDAQECBAADXQTSAf8D6AH/A3IB/wNyAf8DcgH/A3IB/wNyAf8DcgH/A3IB/wNyAf8DcgH/A3IB/wPo
        Af8DxAH/A1wB3AgAAxYBHgMrAfwD+wH/AfUC9gH/AfoB+wH6Af8D+QH/Ad0C3gH/AWoCRwH5A10B7QE6
        AjkBYAMNAREUAAMbASYDQAH9BP8B3AHiAd8B/wHkAegB5gH/AesB7gHtAf8B8gH0AfMB/wH3AvgB/wH2
        AfgB9wX/A0AB/QMbASYDAQECDAADGwEmA0AB/QHyAfQB8wH/AdoB3wHdAf8DQAH9AxsBJgMcASgDQAH9
-        AfMB9QH0Af8B1gHdAdkB/wNAAf0DGwEmAwEBAgQAAy0BRQOaAf8DzAH/AccBiwFCAf8B+QH0Ae0B/wH+
-        AegB2AH/Af4B6AHXAf8B/QHlAdMB/wH8AeQB0QH/AfoB4AHHAf8B+QHdAcMB/wH6AfQB7QH/AccBhQE+
-        Af8DwwH/A2gB/wMtAUUIAAMWAR4DKwH8A/sB/wHwAfMB8gH/AeYC6AH/A00B+gFiAlIB9AFRAk8BpQMU
+        AfMB9QH0Af8B1gHdAdkB/wNAAf0DGwEmAwEBAgQAAy0BRQOaAf8DzAH/AccBiwFDAf8B+QH0Ae0B/wH+
+        AegB2AH/Af4B6AHXAf8B/QHlAdMB/wH8AeQB0QH/AfoB4AHHAf8B+QHdAcMB/wH6AfQB7QH/AccBhQE/
+        Af8DwwH/A2kB/wMtAUUIAAMWAR4DKwH8A/sB/wHwAfMB8gH/AeYC6AH/A00B+gFiAlIB9AFRAk8BpQMU
        ARwDAAEBGAADGwEmA0AB/QT/AdgB3wHcAf8B4AHlAeMB/wHoAesB6gH/Ae8B8gHwAf8B9wH4AfcB/wP9
        Bf8DQAH9AxsBJgMBAQIMAAMbASYDQAH9A/wB/wHVAdsB2AH/A0AB/QMbASYDHAEoA0AB/QP8Af8B0gHa
-        AdYB/wNAAf0DGwEmAwEBAggAAzsBYwNqAfMBxQGJAUAB/wH5AfQB7wH/Af4B5wHXAf8B/QHnAdUB/wH8
-        AeYB0gH/AfsB4QHMAf8B+AHcAcIB/wH2AdoBvQH/AfoB9AHvAf8BxAGDATwB/wNdAfMDOwFjDAADFgEe
-        AysB/AP7Af8BPgIyAfwDTQH6AVoCVwG9AxgBIgMCAQMgAAMbASYDQAH9IP8DQAH9AxsBJgMBAQIMAAMb
-        ASYDQAH9CP8DQAH9AxsBJgMcASgDQAH9CP8DQAH9AxsBJgMBAQIMAAMHAQkBlgF6AUcC+QH0AfAB/wH8
-        AeYB0wH/Af0B5wHTAf8B+wHjAc0B/wH6AeAByAH/AfUB1gG7Af8B8wHUAbUB/wH4AfQB8AH/AZUBagFH
-        AfkDBwEJEAADFgEeA0AB/QFbAjIB+wFgAlwB1AMjATMDBwEKKAADGwEmAysB/AEpAS0BKwH/ASkBLQEr
-        Af8BKQEtASsB/wEpAS0BKwH/ASkBLQErAf8BKQEtASsB/wEpAS0BKwH/ASkBLQErAf8BKQEtASsB/wMb
-        ASYDAQECDAADGwEmAWMBVwFVAf4BKQEtASsB/wEpAS0BKwH/ASkBLQErAf8DGwEmAxwBKAFjAVcBVQH+
-        ASkBLQErAf8BKQEtASsB/wEpAS0BKwH/AxsBJgMBAQIQAAGSAXoBUQH3AfkB9QHxAf8B/AHjAc8B/wH8
-        AeQBzwH/AfoB4QHKAf8B+QHdAcQB/wH0AekB3wH/AfcB8gHsAf8B9QHvAekB/wGZAV8BRQH7FAADFgEf
+        AdYB/wNAAf0DGwEmAwEBAggAAzsBYwNrAfMBxQGJAUEB/wH5AfQB7wH/Af4B5wHXAf8B/QHnAdUB/wH8
+        AeYB0gH/AfsB4QHMAf8B+AHcAcIB/wH2AdoBvQH/AfoB9AHvAf8BxAGDAT0B/wNdAfMDOwFjDAADFgEe
+        AysB/AP7Af8BPwIzAfwDTQH6AVoCVwG9AxgBIgMCAQMgAAMbASYDQAH9IP8DQAH9AxsBJgMBAQIMAAMb
+        ASYDQAH9CP8DQAH9AxsBJgMcASgDQAH9CP8DQAH9AxsBJgMBAQIMAAMHAQkBmgF9AUcC+QH0AfAB/wH8
+        AeYB0wH/Af0B5wHTAf8B+wHjAc0B/wH6AeAByAH/AfUB1gG7Af8B8wHUAbUB/wH4AfQB8AH/AZkBagFH
+        AfkDBwEJEAADFgEeA0AB/QFbAjIB+wFgAlwB1AMjATMDBwEKKAADGwEmAysB/AEqAS4BLAH/ASoBLgEs
+        Af8BKgEuASwB/wEqAS4BLAH/ASoBLgEsAf8BKgEuASwB/wEqAS4BLAH/ASoBLgEsAf8BKgEuASwB/wMb
+        ASYDAQECDAADGwEmAWMBVwFVAf4BKgEuASwB/wEqAS4BLAH/ASoBLgEsAf8DGwEmAxwBKAFjAVcBVQH+
+        ASoBLgEsAf8BKgEuASwB/wEqAS4BLAH/AxsBJgMBAQIQAAGWAX0BUQH3AfkB9QHxAf8B/AHjAc8B/wH8
+        AeQBzwH/AfoB4QHKAf8B+QHdAcQB/wH0AekB3wH/AfcB8gHsAf8B9QHvAekB/wGbAWABRQH7FAADFgEf
        AV4CWgHYAygBPQMNAREwAAMbASYDGwEmAxsBJgMbASYDGwEmAxsBJgMbASYDGwEmAxsBJgMbASYDGwEm
        AxsBJgMAAQEMAAMbASYDGwEmAxsBJgMbASYDGwEmAxsBJgMbASYDGwEmAxsBJgMbASYDGwEmAxsBJgMA
-        AQEQAAGJAWoBSQH2AfkB9QHxAf8B/AHjAc0B/wH7AeMBzQH/AfkB4AHIAf8B+AHcAcIB/wH9AfsB+AH/
-        AfwB5gHNAf8B4gG2AYQB/wJUAVIBphQAAxYBHwMRARcDAgEDuAABngF1AU0B+gH3AfIB7AH/AfgB9AHu
-        Af8B+AHzAe0B/wH4AfMB7QH/AfgB8gHsAf8B8gHmAdcB/wHiAbIBcQH/AZABcQFiAfYDBQEHFAADAwEE
-        wAADOgFgAlgBVgG7AbEBfwFPAf4ByAGMAUMB/wGSAX8BUQH3AZIBfwFRAfcBrgF/AUwB/gNOAZQUAAFC
+        AQEQAAGNAW0BSQH2AfkB9QHxAf8B/AHjAc0B/wH7AeMBzQH/AfkB4AHIAf8B+AHcAcIB/wH9AfsB+AH/
+        AfwB5gHNAf8B4gG2AYQB/wJUAVIBphQAAxYBHwMRARcDAgEDuAABoAF2AU0B+gH3AfIB7AH/AfgB9AHu
+        Af8B+AHzAe0B/wH4AfMB7QH/AfgB8gHsAf8B8gHmAdcB/wHiAbIBcgH/AZMBcwFiAfYDBQEHFAADAwEE
+        wAADOgFgAlgBVgG7AbMBfwFPAf4ByAGMAUQB/wGWAYABUQH3AZYBgAFRAfcBsAF/AUwB/gNOAZQUAAFC
        AU0BPgcAAT4DAAEoAwABQAMAASADAAEBAQABAQYAAQEWAAP/gQAB3wX/AeABBwHHBf8CAAHBAf8BwAED
        AcABAwIAAcAB/wHAAQMBwAEDAgABwAE/AcABAQHAAQECAAHAAQ8BwAEBAcABAQIAAcABAwHAAQEBwAEB
        AgABwAEBAcABAQHAAQECAAHAAQEBwAEBAcABAQIAAcABBwHAAQEBwAEBAgABwAEPAcABAQHAAQEBgAEB
@@ -84,7 +84,7 @@ namespace GraphLib
        
        public float CurXD1 = 0;

-        public float grid_distance_x = 60;  // grid distance in samples ( draw a vertical line every 60 samples )
+        public float grid_distance_x = 200;       // grid distance in samples ( draw a vertical line every 200 samples )
        public float grid_off_x = 0;
        public float GraphCaptionLineHeight = 28;

@@ -452,7 +452,7 @@ namespace GraphLib
                    
                    if (layout == LayoutMode.NORMAL)
                    {
-                        DrawGraphCaption(CurGraphics, source, marker_pos, CurOffX + CurGraphIdx * (50 + yLabelAreaWidth) + (CurGraphIdx==0 ? 0 : 50), curOffY);
+                        DrawGraphCaption(CurGraphics, source, marker_pos, CurOffX + CurGraphIdx * (10 + yLabelAreaWidth), curOffY);

                        if (CurGraphIdx == 0)
                        {
@@ -600,7 +600,7 @@ namespace GraphLib

                    List<int> marker_pos = DrawGraphCurve(CurGraphics, source, CurOffX, curOffY + GraphCaptionLineHeight / 2);

-                    DrawGraphCaption(CurGraphics, source, marker_pos, CurOffX + CurGraphIdx * (50 + yLabelAreaWidth) + (CurGraphIdx == 0 ? 0 : 50), pad_top);
+                    DrawGraphCaption(CurGraphics, source, marker_pos, CurOffX + CurGraphIdx * (10 + yLabelAreaWidth), pad_top);
                  
                    DrawYLabels(CurGraphics, source, marker_pos, CurOffX, curOffY);

@@ -776,15 +776,12 @@ namespace GraphLib
 						float y0 = (float)(source.grid_off_y * source.CurGraphHeight / source.DY + source.off_Y);

 						// draw horizontal zero grid lines
-						if (0 >= source.YD0 && 0 <= source.YD1)
-						{
-							g.DrawLine(p2, new Point((int)CurrOffX, (int)(CurOffY + y0 + 0.5f)), new Point((int)(CurrOffX + source.CurGraphWidth + 0.5f), (int)(CurOffY + y0 + 0.5f)));
-						}
+						g.DrawLine(p2, new Point((int)CurrOffX, (int)(CurOffY + y0 + 0.5f)), new Point((int)(CurrOffX + source.CurGraphWidth + 0.5f), (int)(CurOffY + y0 + 0.5f)));

 						// draw horizontal grid lines
-						for (float idy = source.grid_off_y; idy > source.YD0; idy -= source.grid_distance_y)
+						for (Idx = (int)(source.grid_off_y);Idx > (int)(source.YD0 ); Idx -= (int)source.grid_distance_y)
 						{
-							float y = (idy * source.CurGraphHeight) / source.DY + source.off_Y;
+							float y = (float)(Idx * source.CurGraphHeight) / source.DY + source.off_Y;

 							if (y >= 0 && y < source.CurGraphHeight)
 							{
@@ -795,9 +792,9 @@ namespace GraphLib
 						}

 						// draw horizontal grid lines
-						for (float idy = source.grid_off_y; idy < source.YD1; idy += source.grid_distance_y)
+						for (Idx = (int)(source.grid_off_y); Idx < (int)(source.YD1  ); Idx += (int)source.grid_distance_y)
 						{
-							float y = (idy * source.CurGraphHeight) / source.DY + source.off_Y;
+							float y = (float)Idx * source.CurGraphHeight / source.DY + source.off_Y;

 							if (y >= 0 && y < source.CurGraphHeight)
 							{
@@ -971,58 +968,71 @@ namespace GraphLib
                using (Pen pen = new Pen(b))
                {
                    pen.DashPattern = new float[] { 2, 2 };
-
-					float GridDistY = source.grid_distance_y;
-					///
-					if (source.AutoScaleY)
-					{
-						// calculate a matching grid distance                            
-						GridDistY = -Utilities.MostSignificantDigit(source.DY);
-
-						if (GridDistY == 0)
-						{
-							GridDistY = source.grid_distance_y;
-						}
-					}
                     
                    // draw labels for horizontal lines
                    if (source.DY != 0)
                    {
-						float y0 = (float)(source.grid_off_y * source.CurGraphHeight / source.DY + source.off_Y);
-						if (y0 >= 0 && y0 < source.CurGraphHeight)
-						{
-							String value = (source.OnRenderYAxisLabel == null) ? "0" : source.OnRenderYAxisLabel(source, 0);
-							SizeF dim = g.MeasureString(value, legendFont);
-							g.DrawString(value, legendFont, b, new PointF((int)offset_x - dim.Width, (int)(offset_y + y0 + 0.5f + dim.Height / 2)));
-						}
+                        float Idx = 0;

-						for (float Idx = source.grid_off_y; Idx > source.YD0; Idx -= GridDistY)
+                        float y0 = (float)(source.grid_off_y * source.CurGraphHeight / source.DY + source.off_Y);
+
+                        String value = "" + Idx;
+
+                        if (source.OnRenderYAxisLabel != null)
                        {
-                            if (Idx != 0)
-                            {
-                                float y1 = (float)(Idx * source.CurGraphHeight) / source.DY + source.off_Y;
+                            value = source.OnRenderYAxisLabel(source, Idx);
+                        }

-								if (y1 >= 0 && y1 < source.CurGraphHeight)
-								{
-									string value = (source.OnRenderYAxisLabel == null) ? Idx.ToString() : source.OnRenderYAxisLabel(source, Idx);
-									SizeF dim = g.MeasureString(value, legendFont);
-									g.DrawString(value, legendFont, b, new PointF((int)offset_x - dim.Width, (int)(offset_y + y1 + 0.5f + dim.Height / 2)));
-								}
+                        SizeF dim = g.MeasureString(value, legendFont);
+                        g.DrawString(value, legendFont, b, new PointF((int)offset_x - dim.Width, (int)(offset_y + y0 + 0.5f + dim.Height / 2)));
+
+                        float GridDistY = source.grid_distance_y;
+
+                        if (source.AutoScaleY)
+                        {
+                            // calculate a matching grid distance                            
+                            GridDistY = - Utilities.MostSignificantDigit(source.DY );
+
+                            if (GridDistY == 0)
+                            {
+                                GridDistY =  source.grid_distance_y;
+                                 
                            }
                        }

-						for (float Idx = source.grid_off_y; Idx < source.YD1; Idx += GridDistY)
+                        for (Idx =  (source.grid_off_y); Idx >  (source.Cur_YD0); Idx -=  GridDistY)
                        {
                            if (Idx != 0)
                            {
-                                float y2 = (float)(Idx * source.CurGraphHeight) / source.DY + source.off_Y;
+                                float y1 = (float)((Idx) * source.CurGraphHeight) / source.DY + source.off_Y;

-								if (y2 >= 0 && y2 < source.CurGraphHeight)
-								{
-									string value = (source.OnRenderYAxisLabel == null) ? Idx.ToString() : source.OnRenderYAxisLabel(source, Idx);
-									SizeF dim = g.MeasureString(value, legendFont);
-									g.DrawString(value, legendFont, b, new PointF((int)offset_x - dim.Width, (int)(offset_y + y2 + 0.5f + dim.Height / 2)));
-								}
+                                value = "" + (Idx);
+
+                                if (source.OnRenderYAxisLabel != null)
+                                {
+                                    value = source.OnRenderYAxisLabel(source, Idx);
+                                }
+
+                                dim = g.MeasureString(value, legendFont);
+                                g.DrawString(value, legendFont, b, new PointF((int)offset_x - dim.Width, (int)(offset_y + y1 + 0.5f + dim.Height / 2)));                                
+                            }
+                        }
+
+                        for (Idx =  (source.grid_off_y); Idx <  (source.Cur_YD1); Idx +=  GridDistY)
+                        {
+                            if (Idx != 0)
+                            {
+                                float y2 = (float)((Idx) * source.CurGraphHeight) / source.DY + source.off_Y;
+
+                                value = "" + (Idx);
+
+                                if (source.OnRenderYAxisLabel != null)
+                                {
+                                    value = source.OnRenderYAxisLabel(source, Idx);
+                                }                               
+
+                                dim = g.MeasureString(value, legendFont);
+                                g.DrawString(value, legendFont, b, new PointF((int)offset_x - dim.Width, (int)(offset_y + y2 + 0.5f + dim.Height / 2)));
                            }
                        }                             
                    }
@@ -1,68 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MonitoringDB.Entities
-{
-    public class Part
-    {
-        public virtual int Id { get; protected set; }
-        public virtual string Name { get; set; }
-        public virtual string OraDBType { get; set; }
-        public virtual string Description { get; set; }
-		public virtual CodeType CodeType { get; set; }
-        public virtual CodeForm CodeForm { get; set; }
-		public virtual CodeLocation CodeLocation { get; set; }
-		public virtual LifetimeManagement LifetimeManagement { get; set; }
-		public virtual int StepNumber { get; set; }
-
-		public virtual Process Process { get; set; }
-		public virtual Workstep Workstep { get; set; }
-
-
-		protected Part()
-		{
-            Name = string.Empty;
-            Description = string.Empty;
-        }
-
-		/// <summary>
-		/// Constructor used when the part is added to a process
-		/// </summary>
-		/// <param name="name"></param>
-		/// <param name="codeType"></param>
-		/// <param name="codeForm"></param>
-		/// <param name="process"></param>
-		public Part(string name, Process process, CodeType codeType, CodeForm codeForm, CodeLocation codeLocation)
-		{
-            Name = name;
-            OraDBType = string.Empty;
-			Description = string.Empty;
-			CodeType = codeType;
-			CodeForm = codeForm;
-			CodeLocation = codeLocation;
-			StepNumber = 0;
-
-			Process = process;
-			Workstep = null;
-		}
-
-        /// <summary>
-        /// Create a copy of a part (1) belongig to another process, (2) not assigned to any workstep yet.
-        /// </summary>
-        /// <param name="process">Process owning the cloned part</param>
-        /// <returns>Cloned part</returns>
-		public virtual Part Clone(Process owningProcess)
-		{
-			Part rslt = new Part(Name, owningProcess, CodeType, CodeForm, CodeLocation);
-            rslt.OraDBType = OraDBType;
-            rslt.Description = Description;
-			rslt.LifetimeManagement = LifetimeManagement;
-			return rslt;
-		}
-
-		public override string ToString()
-		{
-            return string.Format("{0} step={1} ({2})", Name, StepNumber, Description);
-		}
-    }
-}
@@ -1,68 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MonitoringDB.Entities
-{
-    public class Process
-    {
-        public virtual int Id { get; protected set; }
-        public virtual int ItemNr { get; set; }
-        public virtual string Name { get; set; }
-		public virtual string Description { get; set; }
-		public virtual ReleaseStatus ReleaseStatus { get; set; }
-		public virtual DateTime TimeStamp { get; set; }
-		public virtual string UserName { get; set; }
-
-		public virtual IList<Part> Parts { get; set; }
-		public virtual IList<Workstep> Worksteps { get; set; }
-
-		/// <summary>
-		/// Default (private) constructor inicializing lists
-		/// </summary>
-		protected Process()
-		{
-			Parts = new List<Part>();
-			Worksteps = new List<Workstep>();
-		}
-
-		/// <summary>
-		/// Constructor used when this process is created
-		/// </summary>
-		/// <param name="name"></param>
-		public Process(string name)
-			: this()
-		{
-			Name = name;
-			Description = string.Empty;
-			ReleaseStatus = ReleaseStatus.In_preparation;
-			TimeStamp = DateTime.Now;
-			UserName = "admin";
-		}
-
-        /// <summary>
-        /// Create a copy of a process with a new name
-        /// </summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-		public virtual Process Clone(string name)
-		{
-			Process rslt = new Process(name);
-			rslt.Description = Description;
-
-			foreach (var part in Parts) rslt.Parts.Add(part.Clone(rslt));
-			foreach (var workstep in Worksteps) rslt.Worksteps.Add(workstep.Clone(rslt));
-
-			return rslt;
-		}
-
-		public override string ToString()
-		{
-			return string.Format("{0} '{1}' ({2}) {3} {4}",
-								 ItemNr,
-								 Name,
-								 TimeStamp.Date.ToShortDateString(),
-								 (Description == null) ? string.Empty : Description,
-								 ReleaseStatus);
-		}
-    }
-}
@@ -1,61 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MonitoringDB.Entities
-{
-    public class Record
-    {
-        public virtual int Id { get; protected set; }
-        public virtual string Code { get; set; }
-		public virtual DateTime TimeStamp { get; set; }
-
-		public virtual Part Part { get; set; }
-		public virtual ReferenceRecord ReferenceRecord { get; set; }
-
-
-		protected Record()
-		{
-		}
-
-		/// <summary>
-		/// Constructor used when a part barcode is scanned
-		/// </summary>
-		/// <param name="partId">Part</param>
-		/// <param name="referenceRecordId">Reference record</param>
-		/// <param name="code">Scanned barcode</param>
-		public Record(Part part, ReferenceRecord referenceRecord, string code)
-		{
-			Part = part;
-			ReferenceRecord = referenceRecord;
-			Code = code;
-			TimeStamp = DateTime.Now;
-		}
-
-        /// <summary>
-        /// Create a copy of a process with a new name
-        /// </summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        public virtual Record Clone(Process newProcess, ReferenceRecord newRR)
-        {
-            Part newPart = null;
-            foreach (var pt in newProcess.Parts)
-            {
-                if (Part.Name == pt.Name)
-                {
-                    newPart = pt;
-                    break;
-                }
-            }
-            Record rslt = new Record(newPart, newRR, Code);
-            rslt.TimeStamp = TimeStamp;
-
-            return rslt;
-        }
-
-		public override string ToString()
-		{
-            return string.Format("code={0}  part={1}  description='{2}'", Code, Part.Name, Part.Description);
-		}
-	}
-}
@@ -1,88 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MonitoringDB.Entities
-{
-    public class ReferenceRecord
-    {
-        public virtual int Id { get; protected set; }
-		public virtual string Code { get; set; }
-		public virtual DateTime TimeStamp { get; set; }
-		public virtual string UserName { get; set; }
-		public virtual string Workplace { get; set; }
-		public virtual int Result { get; set; }			/// 0 = No error (OK), >0 = Error code
-
-		public virtual Process Process { get; set; }
-		public virtual Workstep Workstep { get; set; }
-		public virtual IList<Record> Records { get; set; }
-
-
-		/// <summary>
-		/// Default (private) constructor inicializing lists
-		/// </summary>
-		protected ReferenceRecord()
-		{
-			Records = new List<Record>();
-		}
-
-		/// <summary>
-		/// Constructor used when reference barcode is scanned
-		/// </summary>
-		/// <param name="process">Process</param>
-		/// <param name="workstep">Workstep</param>
-		/// <param name="code">Scanned barcode</param>
-		public ReferenceRecord(Process process, Workstep workstep, string code,
-							   string userName, string workplace, int result)
-		{
-			Process = process;
-			Workstep = workstep;
-			Code = code;
-			TimeStamp = DateTime.Now;
-			UserName = userName;
-			Workplace = workplace;
-			Result = result;
-        }
-
-        /// <summary>
-        /// Create a copy of a process with a new name
-        /// </summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        public virtual ReferenceRecord Clone(Process newProcess)
-        {
-            Workstep newWorkstep = null;
-            foreach (var ws in newProcess.Worksteps)
-            {
-                if (Workstep.Name == ws.Name)
-                {
-                    newWorkstep = ws;
-                    break;
-                }
-            }
-
-            ReferenceRecord rslt = new ReferenceRecord(newProcess, newWorkstep,
-                                                       Code, UserName, Workplace, Result);
-            rslt.TimeStamp = TimeStamp;
-
-            rslt.Records = new List<Record>();
-            foreach (var record in Records)
-            {
-                rslt.Records.Add(record.Clone(newProcess, rslt));
-            }
-
-            return rslt;
-        }
-
-		public override string ToString()
-		{
-            return string.Format("code={0}  part={1}  description='{2}'  step='{3}'  workplace='{4}'  user={5}  time={6:dd.MM.yyyy HH:mm:ss}",
-                                 (Code != null) ? Code : "<none>",
-                                 Workstep.ReferencePart.Name,
-                                 Workstep.ReferencePart.Description,
-                                 Workstep.Name,
-                                 Workplace,
-                                 UserName,
-                                 TimeStamp);
-		}
-    }
-}
@@ -1,82 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MonitoringDB.Entities
-{
-    public class Workstep
-    {
-        public virtual int Id { get; protected set; }
-        public virtual int WorkstepNr { get; set; }
-        public virtual string Name { get; set; }
-		public virtual string Description { get; set; }
-        public virtual int CheckPartNr { get; set; }
-        public virtual bool AllowRepairs { get; set; }
-
-		public virtual Process Process { get; set; }
-		public virtual Part ReferencePart { get; set; }
-		public virtual IList<Part> Parts { get; set; }
-
-
-		/// <summary>
-		/// Default (private) constructor inicializing a list
-		/// </summary>
-		protected Workstep()
-		{
-			Parts = new List<Part>();
-		}
-
-		/// <summary>
-		/// Constructor used when this workstep is added to a process
-		/// </summary>
-		/// <param name="name">Workstep name</param>
-		/// <param name="process">Process to be referenced</param>
-		public Workstep(int workstepNr, string name, Process process)
-			: this()
-		{
-            WorkstepNr = workstepNr;
-			Name = name;
-			Description = string.Empty;
-            CheckPartNr = 0;
-            AllowRepairs = false;
-			Process = process;
-			ReferencePart = null;
-		}
-
-		public virtual Workstep Clone(Process owningProcess)
-		{
-			Workstep rslt = new Workstep(WorkstepNr, Name, owningProcess);
-			rslt.Description = Description;
-            rslt.CheckPartNr = CheckPartNr;
-            rslt.AllowRepairs = AllowRepairs;
-
-			if (ReferencePart != null)
-			{
-				foreach (var p in owningProcess.Parts)
-				{
-					if (p.Name == ReferencePart.Name) rslt.ReferencePart = p;
-				}
-			}
-
-			foreach (var srcP in Parts)
-			{
-				foreach (var p in owningProcess.Parts)
-				{
-					if (p.Name == srcP.Name)
-					{
-						rslt.Parts.Add(p);
-						p.StepNumber = srcP.StepNumber;
-						p.Workstep = rslt;
-					}
-				}
-			}
-
-			return rslt;
-		}
-
-		public override string ToString()
-		{
-			//return string.Format("{0} {1} ({2}) Ref: {3}", WorkstepNr, Name, Description, (ReferencePart != null) ? ReferencePart.Name : "none");
-            return string.Format("{0}: {1}", WorkstepNr, Name);
-        }
-    }
-}
@@ -1,94 +0,0 @@
-namespace MonitoringDB
-{
-    public enum CodeType
-    {
-        UniqueNr,
-        FlowtubeNr,                 /// prvé 3 znaky sa zhodujú s poslednými 3 znakmi názvu
-        FlowtubeNrLU,               /// začiatok kódu sa zhoduje s názvom
-        BatchNr,
-        BatchNrContainingPartName,
-        DateMMYY,
-		QualityCheck,
-    }
-
-    public enum CodeForm
-    {
-        Barcode,
-        QRCode,
-		Keyboard,
-		OkNok,
-    }
-
-	public enum CodeLocation
-	{
-		OnPart,
-		OnPallet,
-	}
-
-	public enum LifetimeManagement
-	{
-		None,
-		OneYear,
-		Count,
-	}
-
-	public enum ReleaseStatus
-	{
-		In_preparation,
-		Released,
-		ReleasedActive,
-		Deactivated,
-		Count,
-	}
-
-	public enum Mode
-	{
-		Debug,			// Debug mode - no Oracle database used
-		Test,			// Test database used
-		Production,		// Production database used
-		Count,
-	}
-
-    public enum LoginLevel
-    {
-        None,
-        TeamLeader,
-        Administrator,
-        MH,
-        Count,
-    }
-
-    public enum ItemSpecID
-    {
-        RefRecordID = 0,
-
-        TimeStamp,
-        Workstep,
-        Workplace,
-        UserName,
-        Barcode,
-        PartBarcode,
-
-        TimeStamp2,
-        Workstep2,
-        Workplace2,
-        UserName2,
-        Barcode2,
-        PartBarcode2,
-
-        SerialNr,
-        PurchaseOrder,
-        TestResult,
-        MaxPruefindex,
-        
-        Process,
-    }
-
-    public enum ItemSpecCaps
-    {
-        None = 0,
-        ReferenceRecord = 1,
-        AssociatedRecord = 2,
-        OracleQuery = 4,
-    }
-}
@@ -1,212 +0,0 @@
-using System;
-using System.Collections.Generic;
-using FluentNHibernate.Cfg;
-using FluentNHibernate.Cfg.Db;
-using NHibernate;
-using NHibernate.Cfg;
-using NHibernate.Tool.hbm2ddl;
-
-namespace MonitoringDB
-{
-    public static class FluentNH
-    {
-		/// <summary>
-		/// Current session factory for the last used connection string or null
-		/// </summary>
-		public static ISessionFactory SessionFactory;
-
-
-        /// <summary> Connection string for all sessions </summary>
-        static string connectionString;
-        /// 
-        public static string ConnectionString
-        {
-            get { return connectionString; }
-            set
-            {
-                if (value != connectionString)
-                {
-                    connectionString = value;
-                    SessionFactory = null;          /// Clear SessionFactory on connection string change
-                }
-            }
-        }
-
-
-        /// <summary>
-        /// NHibernate session factory (to create the database session 'SessionFactory')
-        /// </summary>
-        /// <returns>A database session</returns>
-		static ISessionFactory CreateSessionFactory()
-        {
-			return CreateSessionFactory(false);
-		}
-
-        /// <summary>
-        /// NHibernate session factory (to create the database session 'SessionFactory')
-        /// </summary>
-        /// <returns>A database session</returns>
-		public static ISessionFactory CreateSessionFactory(bool createDB)
-        {
-			FluentConfiguration cfg = Fluently
-				.Configure()
-				.Database(MySQLConfiguration.Standard.ConnectionString(connectionString))
-				.Mappings(m => m.FluentMappings.AddFromAssemblyOf<Entities.Process>());
-
-			if (createDB)
-            {
-                return cfg.ExposeConfiguration(BuildSchemaCreate).BuildSessionFactory();
-            }
-            else
-            {
-                return cfg.ExposeConfiguration(BuildSchema).BuildSessionFactory();
-            }
-        }
-
-        public delegate void BuildSchemaDlgt(Configuration config);
-
-        public static void BuildSchema(Configuration config)
-        {
-            /// This NHibernate tool takes a configuration (with mapping info in)
-            /// and exports a database schema from it
-            new SchemaExport(config).SetOutputFile("db_schema");
-        }
-
-        static void BuildSchemaCreate(Configuration config)
-        {
-            /// This NHibernate tool takes a configuration (with mapping info in)
-            /// and exports a database schema from it
-            new SchemaExport(config).Create(true, true);
-        }
-
-		/// Create a NHibernate session for the given database
-		public static ISession CreateSession(string connectionString)
-		{
-            ConnectionString = connectionString;    /// Clears session factory on connction string change
-
-			if (SessionFactory == null)
-                SessionFactory = CreateSessionFactory();
-
-			return SessionFactory.OpenSession();
-		}
-
-
-        /// <summary>
-        /// Create an empty database.
-		/// Database contains only the user 'admin' and the control board component 'CB'.
-        /// </summary>
-        /// <param name="dbType">DBType.SQLite or DBType.MySql</param>
-        /// <param name="connectionString">Connection string</param>
-        /// <returns>true=success, false=error</returns>
-        public static bool CreateEmptyDB(string connectionString)
-        {
-            ConnectionString = connectionString;
-
-			ISessionFactory sessionFactory = CreateSessionFactory(true);
-            if (sessionFactory == null) return false;
-
-            /// Populate the database
-            using (var session = sessionFactory.OpenSession())
-            {
-				//using (var transaction = session.BeginTransaction())
-				//{
-				//    var part1 = new MonitoringDB.Entities.Part("flow tube", CodeType.UniqueNr, CodeForm.QRCode, 0);
-				//    session.SaveOrUpdate(part1);
-				//    transaction.Commit();
-				//}
-            }
-
-            return true;
-        }
-
-
-		public static IList<WMPart> FindWMParts(string pcbNumber, string connString)
-		{
-			IList<WMPart> foundParts = new List<WMPart>();				/// initially empty
-
-			if (string.IsNullOrEmpty(pcbNumber)) return foundParts;		/// return an empty list
-
-			try
-			{
-				ISession session = CreateSession(connString);
-
-				IList<Entities.ReferenceRecord> referenceRecords = session
-					.QueryOver<Entities.ReferenceRecord>()
-					.Where(x => (x.Code == pcbNumber))
-					.OrderBy(x => x.TimeStamp).Desc
-					.List<Entities.ReferenceRecord>();
-
-				if (referenceRecords.Count == 0) return foundParts;
-
-				foundParts.Add(new WMPart(referenceRecords[0]));
-				Entities.Process process = referenceRecords[0].Process;
-				///
-				foreach (var refR in referenceRecords)
-				{
-					if (process != refR.Process)
-					{
-						continue;	/// skip records obtained by another process
-					}
-
-					IList<Entities.Record> relatedRecords = session
-						.QueryOver<Entities.Record>()
-						.Where(x => (x.ReferenceRecord == refR))
-						.List<Entities.Record>();
-
-
-					foreach (var relR in relatedRecords)
-					{
-						foundParts.Add(new WMPart(relR));
-						foreach (var ws in process.Worksteps)
-						{
-							if (ws.ReferencePart == relR.Part)
-							{
-								FindWMPartsRecursively(process, ws.ReferencePart, relR.Code, session, ref foundParts);
-							}
-						}
-					}
-				}
-			}
-			catch
-			{
-			}
-
-			return foundParts;
-		}
-
-
-		static void FindWMPartsRecursively(Entities.Process process, Entities.Part refPart, string code, ISession session, ref IList<WMPart> foundParts)
-		{
-			IList<Entities.ReferenceRecord> referenceRecords = session
-				.QueryOver<Entities.ReferenceRecord>()
-				.Where(x => (x.Workstep.ReferencePart == refPart))
-				.Where(x => (x.Code == code))
-				.OrderBy(x => x.TimeStamp).Desc
-				.List<Entities.ReferenceRecord>();
-
-			if (referenceRecords.Count == 0) return;
-
-			foreach (var refR in referenceRecords)
-			{
-				IList<Entities.Record> relatedRecords = session
-					.QueryOver<Entities.Record>()
-					.Where(x => (x.ReferenceRecord == refR))
-					.List<Entities.Record>();
-
-
-				foreach (var relR in relatedRecords)
-				{
-					foundParts.Add(new WMPart(relR));
-
-					foreach (var ws in process.Worksteps)
-					{
-						if (ws.ReferencePart == relR.Part)
-						{
-							FindWMPartsRecursively(process, ws.ReferencePart, relR.Code, session, ref foundParts);
-						}
-					}
-				}
-			}
-		}
-    }
-}
@@ -1,456 +0,0 @@
-///
-/// Copyright (c) 2016 Sensus Metering Systems
-///
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Windows.Forms;
-using System.Runtime.InteropServices;
-
-namespace MonitoringDB.Forms
-{
-	/// <summary>
-	/// Event Handler for SubItem events
-	/// </summary>
-	public delegate void SubItemEventHandler(object sender, SubItemEventArgs e);
-	/// <summary>
-	/// Event Handler for SubItemEndEditing events
-	/// </summary>
-	public delegate void SubItemEndEditingEventHandler(object sender, SubItemEndEditingEventArgs e);
-
-
-	///	<summary>
-	///	Inherited ListView to allow in-place editing of subitems
-	///	</summary>
-	public class ListViewEx	: System.Windows.Forms.ListView
-	{
-		#region Interop structs, imports and constants
-		/// <summary>
-		/// MessageHeader for WM_NOTIFY
-		/// </summary>
-		private struct NMHDR 
-		{ 
-#pragma warning disable
-			public IntPtr hwndFrom; 
-			public Int32  idFrom; 
-			public Int32  code;
-#pragma warning restore
-        }
-
-
-		[DllImport("user32.dll")]
-		private	static extern IntPtr SendMessage(IntPtr hWnd, int msg,	IntPtr wPar, IntPtr	lPar);
-		[DllImport("user32.dll", CharSet=CharSet.Ansi)]
-		private	static extern IntPtr SendMessage(IntPtr	hWnd, int msg, int len,	ref	int	[] order);
-
-		// ListView messages
-		private const int LVM_FIRST					= 0x1000;
-		private const int LVM_GETCOLUMNORDERARRAY	= (LVM_FIRST + 59);
-
-		// Windows Messages that will abort editing
-		private	const int WM_HSCROLL = 0x114;
-		private	const int WM_VSCROLL = 0x115;
-		private const int WM_SIZE	 = 0x05;
-		private const int WM_NOTIFY	 = 0x4E;
-
-		private const int HDN_FIRST = -300;
-		private const int HDN_BEGINDRAG = (HDN_FIRST-10);
-		private const int HDN_ITEMCHANGINGA = (HDN_FIRST-0);
-		private const int HDN_ITEMCHANGINGW = (HDN_FIRST-20);
-		#endregion
-
-		///	<summary>
-		///	Required designer variable.
-		///	</summary>
-		private	System.ComponentModel.Container	components = null;
-
-		public event SubItemEventHandler SubItemClicked;
-		public event SubItemEventHandler SubItemBeginEditing;
-		public event SubItemEndEditingEventHandler SubItemEndEditing;
-
-		public ListViewEx()
-		{
-			// This	call is	required by	the	Windows.Forms Form Designer.
-			InitializeComponent();
-
-			base.FullRowSelect = true;
-			base.View = View.Details;
-			base.AllowColumnReorder = true;
-		}
-
-		///	<summary>
-		///	Clean up any resources being used.
-		///	</summary>
-		protected override void	Dispose( bool disposing	)
-		{
-			if(	disposing )
-			{
-				if(	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()
-		{
-			components = new System.ComponentModel.Container();
-		}
-	  #endregion
-
-		private bool _doubleClickActivation = false;
-		/// <summary>
-		/// Is a double click required to start editing a cell?
-		/// </summary>
-		public bool DoubleClickActivation
-		{
-			get {  return _doubleClickActivation; }
-			set { _doubleClickActivation = value; }    
-		}
-
-
-		/// <summary>
-		/// Retrieve the order in which columns appear
-		/// </summary>
-		/// <returns>Current display order of column indices</returns>
-		public int[] GetColumnOrder()
-		{
-			IntPtr lPar	= Marshal.AllocHGlobal(Marshal.SizeOf(typeof(int)) * Columns.Count);
-
-			IntPtr res = SendMessage(Handle, LVM_GETCOLUMNORDERARRAY, new IntPtr(Columns.Count), lPar);
-			if (res.ToInt32() == 0)	// Something went wrong
-			{
-				Marshal.FreeHGlobal(lPar);
-				return null;
-			}
-
-			int	[] order = new int[Columns.Count];
-			Marshal.Copy(lPar, order, 0, Columns.Count);
-
-			Marshal.FreeHGlobal(lPar);
-
-			return order;
-		}
-
-
-		/// <summary>
-		/// Find ListViewItem and SubItem Index at position (x,y)
-		/// </summary>
-		/// <param name="x">relative to ListView</param>
-		/// <param name="y">relative to ListView</param>
-		/// <param name="item">Item at position (x,y)</param>
-		/// <returns>SubItem index</returns>
-		public int GetSubItemAt(int x, int y, out ListViewItem item)
-		{
-			item = this.GetItemAt(x, y);
-		
-			if (item !=	null)
-			{
-				int[] order = GetColumnOrder();
-				Rectangle lviBounds;
-				int	subItemX;
-
-				lviBounds =	item.GetBounds(ItemBoundsPortion.Entire);
-				subItemX = lviBounds.Left;
-				for (int i=0; i<order.Length; i++)
-				{
-					ColumnHeader h = this.Columns[order[i]];
-					if (x <	subItemX+h.Width)
-					{
-						return h.Index;
-					}
-					subItemX += h.Width;
-				}
-			}
-			
-			return -1;
-		}
-
-
-		/// <summary>
-		/// Get bounds for a SubItem
-		/// </summary>
-		/// <param name="Item">Target ListViewItem</param>
-		/// <param name="SubItem">Target SubItem index</param>
-		/// <returns>Bounds of SubItem (relative to ListView)</returns>
-		public Rectangle GetSubItemBounds(ListViewItem Item, int SubItem)
-		{
-			int[] order = GetColumnOrder();
-
-			Rectangle subItemRect = Rectangle.Empty;
-			if (SubItem >= order.Length)
-				throw new IndexOutOfRangeException("SubItem "+SubItem+" out of range");
-
-			if (Item == null)
-				throw new ArgumentNullException("Item");
-			
-			Rectangle lviBounds = Item.GetBounds(ItemBoundsPortion.Entire);
-			int	subItemX = lviBounds.Left;
-
-			ColumnHeader col;
-			int i;
-			for (i=0; i<order.Length; i++)
-			{
-				col = this.Columns[order[i]];
-				if (col.Index == SubItem)
-					break;
-				subItemX += col.Width;
-			} 
-			subItemRect	= new Rectangle(subItemX, lviBounds.Top, this.Columns[order[i]].Width, lviBounds.Height);
-			return subItemRect;
-		}
-
-
-		protected override void	WndProc(ref	Message	msg)
-		{
-			switch (msg.Msg)
-			{
-				// Look	for	WM_VSCROLL,WM_HSCROLL or WM_SIZE messages.
-				case WM_VSCROLL:
-				case WM_HSCROLL:
-				case WM_SIZE:
-					EndEditing(false);
-					break;
-				case WM_NOTIFY:
-					// Look for WM_NOTIFY of events that might also change the
-					// editor's position/size: Column reordering or resizing
-					NMHDR h = (NMHDR)Marshal.PtrToStructure(msg.LParam, typeof(NMHDR));
-					if (h.code == HDN_BEGINDRAG ||
-						h.code == HDN_ITEMCHANGINGA ||
-						h.code == HDN_ITEMCHANGINGW)
-						EndEditing(false);
-					break;
-			}
-
-			base.WndProc(ref msg);
-		}
-
-
-		#region Initialize editing depending of DoubleClickActivation property
-		protected override void OnMouseUp(System.Windows.Forms.MouseEventArgs e)
-		{
-			base.OnMouseUp(e);
-
-			if (DoubleClickActivation)
-			{
-				return;
-			} 
-
-			EditSubitemAt(new Point(e.X, e.Y));
-		}
-		
-		protected override void OnDoubleClick(EventArgs e)
-		{
-			base.OnDoubleClick (e);
-
-			if (!DoubleClickActivation)
-			{
-				return;
-			} 
-
-			Point pt = this.PointToClient(Cursor.Position);
-		
-			EditSubitemAt(pt);
-		}
-
-		///<summary>
-		/// Fire SubItemClicked
-		///</summary>
-		///<param name="p">Point of click/doubleclick</param>
-		private void EditSubitemAt(Point p)
-		{
-			ListViewItem item;
-			int idx = GetSubItemAt(p.X, p.Y, out item);
-			if (idx >= 0)
-			{
-				OnSubItemClicked(new SubItemEventArgs(item, idx));
-			}
-		}
-
-		#endregion
-
-		#region In-place editing functions
-		// The control performing the actual editing
-		private Control _editingControl;
-		// The LVI being edited
-		private ListViewItem _editItem;
-		// The SubItem being edited
-		private int _editSubItem;
-
-		protected void OnSubItemBeginEditing(SubItemEventArgs e)
-		{
-			if (SubItemBeginEditing != null) SubItemBeginEditing(this, e);
-		}
-
-		protected void OnSubItemEndEditing(SubItemEndEditingEventArgs e)
-		{
-			if (SubItemEndEditing != null) SubItemEndEditing(this, e);
-		}
-
-		protected void OnSubItemClicked(SubItemEventArgs e)
-		{
-			if (SubItemClicked != null) SubItemClicked(this, e);
-		}
-
-
-		/// <summary>
-		/// Begin in-place editing of given cell
-		/// </summary>
-		/// <param name="c">Control used as cell editor</param>
-		/// <param name="Item">ListViewItem to edit</param>
-		/// <param name="SubItem">SubItem index to edit</param>
-		public void StartEditing(Control c, ListViewItem Item, int SubItem)
-		{
-			OnSubItemBeginEditing(new SubItemEventArgs(Item, SubItem));
-
-			Rectangle rcSubItem = GetSubItemBounds(Item, SubItem);
-
-			if (rcSubItem.X < 0)
-			{
-				// Left edge of SubItem not visible - adjust rectangle position and width
-				rcSubItem.Width += rcSubItem.X;
-				rcSubItem.X=0;
-			}
-			if (rcSubItem.X+rcSubItem.Width > this.Width)
-			{
-				// Right edge of SubItem not visible - adjust rectangle width
-				rcSubItem.Width = this.Width-rcSubItem.Left;
-			}
-
-			// Subitem bounds are relative to the location of the ListView!
-			rcSubItem.Offset(Left, Top);
-
-			// In case the editing control and the listview are on different parents,
-			// account for different origins
-			Point origin = new Point(0,0);
-			Point lvOrigin  = this.Parent.PointToScreen(origin);
-			Point ctlOrigin  = c.Parent.PointToScreen(origin);
-
-			rcSubItem.Offset(lvOrigin.X-ctlOrigin.X, lvOrigin.Y-ctlOrigin.Y);
-
-			// Position and show editor
-			c.Bounds = rcSubItem;
-			c.Text = Item.SubItems[SubItem].Text;
-			c.Visible = true;
-			c.BringToFront();
-			c.Focus();
-
-			_editingControl = c;
-			_editingControl.Leave += new EventHandler(_editControl_Leave);
-			_editingControl.KeyPress += new KeyPressEventHandler(_editControl_KeyPress);
-
-			_editItem = Item;
-			_editSubItem = SubItem;
-		}
-
-
-		private void _editControl_Leave(object sender, EventArgs e)
-		{
-			// cell editor losing focus
-			EndEditing(true);
-		}
-
-		private void _editControl_KeyPress(object sender, System.Windows.Forms.KeyPressEventArgs e)
-		{
-			switch (e.KeyChar)
-			{
-				case (char)(int)Keys.Escape:
-				{
-					EndEditing(false);
-					break;
-				}
-
-				case (char)(int)Keys.Enter:
-				{  
-					EndEditing(true);
-					break;
-				}
-			}
-		}
-
-		/// <summary>
-		/// Accept or discard current value of cell editor control
-		/// </summary>
-		/// <param name="AcceptChanges">Use the _editingControl's Text as new SubItem text or discard changes?</param>
-		public void EndEditing(bool AcceptChanges)
-		{
-			if (_editingControl == null)
-				return;
-
-			SubItemEndEditingEventArgs e = new SubItemEndEditingEventArgs(
-				_editItem,		// The item being edited
-				_editSubItem,	// The subitem index being edited
-				AcceptChanges ?
-					_editingControl.Text :	// Use editControl text if changes are accepted
-					_editItem.SubItems[_editSubItem].Text,	// or the original subitem's text, if changes are discarded
-				!AcceptChanges	// Cancel?
-			);
-
-			OnSubItemEndEditing(e);
-
-			_editItem.SubItems[_editSubItem].Text = e.DisplayText;
-
-			_editingControl.Leave -= new EventHandler(_editControl_Leave);
-			_editingControl.KeyPress -= new KeyPressEventHandler(_editControl_KeyPress);
-
-			_editingControl.Visible = false;
-
-			_editingControl = null;
-			_editItem = null;
-			_editSubItem = -1;
-		}
-		#endregion
-	}
-
-	
-	/// <summary>
-	/// Event Args for SubItemClicked event
-	/// </summary>
-	public class SubItemEventArgs : EventArgs
-	{
-        int subItem = -1;     /// Sub-item index
-        ListViewItem item = null;
-
-        public int SubItem { get { return subItem; } }
-        public ListViewItem Item { get { return item; } }
-
-        public SubItemEventArgs(ListViewItem item, int subItem)
-		{
-			this.subItem = subItem;
-			this.item = item;
-		}
-	}
-
-
-	/// <summary>
-	/// Event Args for SubItemEndEditingClicked event
-	/// </summary>
-	public class SubItemEndEditingEventArgs : SubItemEventArgs
-	{
-		string displayText = string.Empty;
-		bool cancel = true;
-
-		public SubItemEndEditingEventArgs(ListViewItem item, int subItem, string displayText, bool cancel) :
-			base(item, subItem)
-		{
-			this.displayText = displayText;
-			this.cancel = cancel;
-		}
-		public string DisplayText
-		{
-			get { return displayText; }
-			set { displayText = value; }
-		}
-		public bool Cancel
-		{
-			get { return cancel; }
-			set { cancel = value; }
-		}
-	}
-}
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<root>
-	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-		<xsd:element name="root" msdata:IsDataSet="true">
-			<xsd:complexType>
-				<xsd:choice maxOccurs="unbounded">
-					<xsd:element name="data">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" />
-							<xsd:attribute name="type" type="xsd:string" />
-							<xsd:attribute name="mimetype" type="xsd:string" />
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="resheader">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" use="required" />
-						</xsd:complexType>
-					</xsd:element>
-				</xsd:choice>
-			</xsd:complexType>
-		</xsd:element>
-	</xsd:schema>
-	<resheader name="ResMimeType">
-		<value>text/microsoft-resx</value>
-	</resheader>
-	<resheader name="Version">
-		<value>1.0.0.0</value>
-	</resheader>
-	<resheader name="Reader">
-		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-	<resheader name="Writer">
-		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-</root>
@@ -1,64 +0,0 @@
-namespace MonitoringDB.Forms
-{
-    partial class ModelessForm
-    {
-        /// <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.label1 = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(47, 29);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(35, 13);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "label1";
-            // 
-            // ModelessForm
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(191, 56);
-            this.Controls.Add(this.label1);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.Name = "ModelessForm";
-            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "ModelessForm";
-            this.Load += new System.EventHandler(this.ModelessForm_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Label label1;
-    }
-}
@@ -1,68 +0,0 @@
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace MonitoringDB.Forms
-{
-    public partial class ModelessForm : Form
-    {
-        /// <summary>
-        /// Called from the state machine when an operation forces a modeless dialog close.
-        /// </summary>
-        public static void CloseForm()
-        {
-            if (CloseFormHandler == null) return;
-            try { CloseFormHandler(null, null); }
-            catch (Exception) { }
-        }
-        public static event EventHandler<EventArgs> CloseFormHandler;
-
-        void OnCloseForm(object sender, EventArgs args)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-
-
-        public string Title;
-        public string Message;
-        public Color BackgroundColor;
-        public Color TextColor;
-        public Font TextFont;
-        public string FontFamily;
-        public int FontSize;
-        public FontStyle FontStyle;
-
-
-        /// <summary>
-        /// Constructor to be used by the application
-        /// </summary>
-        /// <param name="title">Window title</param>
-        /// <param name="message">Displayed message</param>
-        public ModelessForm()
-        {
-            InitializeComponent();
-            ControlBox = false;
-
-            CloseFormHandler += delegate(object sender, EventArgs args)
-            {
-                if (InvokeRequired) { Invoke(new EventHandler<EventArgs>(OnCloseForm), sender, args); }
-                else OnCloseForm(sender, args);
-            };
-        }
-
-        private void ModelessForm_Load(object sender, EventArgs e)
-        {
-            if (Title != null) Text = Title;
-            if (Message != null) label1.Text = Message;
-            if (BackgroundColor != null) BackColor = BackgroundColor;
-            if (TextColor != null) ForeColor = TextColor;
-            if (FontFamily != null) label1.Font = new Font(FontFamily, FontSize, FontStyle);
-
-            float textWidth = Graphics.FromImage(new Bitmap(1, 1)).MeasureString(label1.Text, label1.Font).Width;
-            float textHeight = Graphics.FromImage(new Bitmap(1, 1)).MeasureString(label1.Text, label1.Font).Height;
-            Width = (int)textWidth + 120;		/// Form width calculated from the text width
-            Height += (int)textHeight;		    /// Form height calculated from the text height
-        }
-    }
-}
@@ -1,299 +0,0 @@
-///
-/// Copyright (c) 2016 Sensus Metering Systems
-///
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-using log4net;
-using MonitoringDB.Entities;
-using MonitoringDB.Resources;
-
-namespace MonitoringDB.Forms
-{
-	public partial class ResultsConfigDlg : Form
-	{
-        /// <summary>
-        /// ListViewEx columns
-        /// </summary>
-        enum Column
-        {
-            Item,
-            Caption,
-            Format,
-            Precision,
-            Width,
-            Count,
-        }
-        Control[] editors;
-        
-
-        public IList<ItemSpec> AvailableItems;
-        public IList<ItemSpec> SelectedItems;
-
-
-		public bool Compound;			/// false = single meter items, true = combined meter items
-
-		public ResultsConfigDlg()
-		{
-			InitializeComponent();
-		}
-
-		void Localize()
-		{
-			Text = Strings.Configuration;
-			availableResultsLabel.Text = Strings.Available_results;
-			selectedResultsLabel.Text = Strings.Selected_results;
-			addButton.Text = Strings.Add;
-			removeButton.Text = Strings.Remove;
-			removeAllButton.Text = Strings.Remove_all;
-			okButton.Text = Strings.OkBtnText;
-			cancelButton.Text = Strings.CancelBtnText;
-            upButton.Text = Strings.UpBtnText;
-            downButton.Text = Strings.DownBtnText;
-		}
-
-		void ResultsConfig_Load(object sender, EventArgs e)
-		{
-			Localize();
-
-            /// Add columns to ListViewEx
-            selectedResultsListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Item, Width = 120 });
-            selectedResultsListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Caption });
-            selectedResultsListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Format });
-            selectedResultsListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Precision });
-            selectedResultsListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Width });
-
-            editors = new Control[]
-                {
-                    null,
-                    new TextBox(),
-                    new TextBox(),
-                    new TextBox(),
-                    new TextBox(),
-                };
-            foreach (var edi in editors)
-            {
-                if (edi != null)
-                {
-                    edi.Visible = false;
-                    Controls.Add(edi);
-                }
-            }
-
-            selectedResultsListViewEx.SubItemClicked += new SubItemEventHandler(selectedResultsListViewEx_SubItemClicked);
-            selectedResultsListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(selectedResultsListViewEx_SubItemEndEditing);
-			
-            RedrawAvailable();
-			RedrawSelected();
-		}
-
-        void selectedResultsListViewEx_SubItemClicked(object sender, SubItemEventArgs e)
-        {
-            if ((e.SubItem > 0) && (e.SubItem < (int)Column.Count))
-            {
-                selectedResultsListViewEx.StartEditing(editors[e.SubItem], e.Item, e.SubItem);
-            }
-        }
-
-        void selectedResultsListViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e)
-        {
-            ListViewItem lvi = e.Item;
-            ItemSpec item = lvi.Tag as ItemSpec;
-
-            switch ((Column)e.SubItem)
-            {
-                case Column.Caption:    item.Caption = e.DisplayText;   return;
-                case Column.Format:     item.Format = e.DisplayText;    return;
-                case Column.Precision:  item.Precision = e.DisplayText; return;
-                                    
-                case Column.Width:
-                    {
-                        int width;
-                        if (Int32.TryParse(editors[e.SubItem].Text, out width) && width >= 0)
-                        {
-                            item.Width = width;
-                            return;     /// OK
-                        }
-                        break;          /// Error
-                    }
-                default:
-                    return;             /// OK
-            }
-
-            e.DisplayText = e.Item.SubItems[e.SubItem].Text;
-            e.Cancel = true;
-            return;
-        }
-
-		/// <summary>
-		/// Redraw selected items (right hand side)
-		/// </summary>
-		void RedrawAvailable()
-		{
-			availableResultsListBox.Items.Clear();
-            AvailableItems = new List<ItemSpec>();
-            foreach (var item in ItemSpec.AllItems)
-			{
-				AvailableItems.Add(item);
-				availableResultsListBox.Items.Add(item.Name);
-			}
-		}
-
-		/// <summary>
-		/// Redraw selected items (right hand side)
-		/// </summary>
-		void RedrawSelected()
-		{
-			selectedResultsListViewEx.Items.Clear();
-			foreach (var item in SelectedItems)
-			{
-                ListViewItem lvi = new ListViewItem(item.Name);                                     /// Item
-                lvi.Tag = item;
-                lvi.SubItems.Add(item.Caption);                                                     /// Header
-                lvi.SubItems.Add(item.Format);                                                      /// Format
-                lvi.SubItems.Add(item.Precision);                                                   /// Precision
-                lvi.SubItems.Add(item.Width.ToString());                                            /// Width
-
-				selectedResultsListViewEx.Items.Add(lvi);
-			}
-		}
-
-        void UpdateSelectedFromView()
-        {
-        }
-
-		void availableResultsListBox_DoubleClick(object sender, EventArgs e)
-		{
-			/// Double click works when just one item is selected
-			if (availableResultsListBox.SelectedIndices.Count == 1)
-			{
-				var oriItem = AvailableItems[availableResultsListBox.SelectedIndices[0]];
-                SelectedItems.Add(oriItem.Clone());
-				RedrawAvailable();
-				RedrawSelected();
-
-                /// Select the last item
-                selectedResultsListViewEx.Focus();
-                selectedResultsListViewEx.Items[SelectedItems.Count - 1].Selected = true;
-                selectedResultsListViewEx.Items[SelectedItems.Count - 1].EnsureVisible();
-            }
-		}
-
-		void addButton_Click(object sender, EventArgs e)
-		{
-			/// Append at the end, this code supports multiple selected items,
-			/// although ListBox control settings may limit the max.number of selected items to one.
-
-			for (int i = availableResultsListBox.SelectedIndices.Count - 1; i >= 0; i--)
-			{
-                var oriItem = AvailableItems[availableResultsListBox.SelectedIndices[i]];
-                SelectedItems.Add(oriItem.Clone());
-			}
-			RedrawAvailable();
-			RedrawSelected();
-
-            /// Select the last item
-            selectedResultsListViewEx.Focus();
-            selectedResultsListViewEx.Items[SelectedItems.Count - 1].Selected = true;
-            selectedResultsListViewEx.Items[SelectedItems.Count - 1].EnsureVisible();
-        }
-
-		private void selectedResultsListBox_DoubleClick(object sender, EventArgs e)
-		{
-			/// Double click works when just one item is selected
-
-			if (selectedResultsListViewEx.SelectedIndices.Count == 1)
-			{
-				SelectedItems.RemoveAt(selectedResultsListViewEx.SelectedIndices[0]);
-				RedrawAvailable();
-				RedrawSelected();
-			}
-		}
-
-		void removeButton_Click(object sender, EventArgs e)
-		{
-			/// Remove from the list (the last selected item first so that the indexes are not affected)
-
-			for (int i = selectedResultsListViewEx.SelectedIndices.Count - 1; i >= 0; i--)
-			{
-				SelectedItems.RemoveAt(selectedResultsListViewEx.SelectedIndices[i]);
-			}
-			RedrawAvailable();
-			RedrawSelected();
-		}
-
-		void removeAllButton_Click(object sender, EventArgs e)
-		{
-			/// Remove all items from 'Selected' list
-
-			SelectedItems.Clear();
-			RedrawAvailable();
-			RedrawSelected();
-		}
-
-		void okButton_Click(object sender, EventArgs e)
-		{
-            DialogResult = DialogResult.OK;
-			Close();
-		}
-
-        private void ResultsConfigDlg_KeyPress(object sender, KeyPressEventArgs e)
-        {
-            e.Handled = true;
-        }
-
-        private void upButton_Click(object sender, EventArgs e)
-        {
-            if (selectedResultsListViewEx.SelectedIndices.Count != 1) return;
-
-            int selIdx = selectedResultsListViewEx.SelectedIndices[0];
-            if (selIdx == 0)
-            {
-                /// Cannot move up
-                selectedResultsListViewEx.Focus();
-                selectedResultsListViewEx.Items[0].Selected = true;
-                return;
-            }
-
-            ItemSpec tmp = SelectedItems[selIdx - 1];
-            SelectedItems[selIdx - 1] = SelectedItems[selIdx];
-            SelectedItems[selIdx] = tmp;
-
-            RedrawSelected();
-
-            selectedResultsListViewEx.Focus();
-            selectedResultsListViewEx.Items[selIdx - 1].Selected = true;
-            selectedResultsListViewEx.Items[selIdx - 1].EnsureVisible();
-        }
-
-        private void downButton_Click(object sender, EventArgs e)
-        {
-            if (selectedResultsListViewEx.SelectedIndices.Count != 1) return;
-
-            int selIdx = selectedResultsListViewEx.SelectedIndices[0];
-            if (selIdx == SelectedItems.Count - 1)
-            {
-                /// Cannot move down
-                selectedResultsListViewEx.Focus();
-                selectedResultsListViewEx.Items[SelectedItems.Count - 1].Selected = true;
-                return;
-            }
-
-            ItemSpec tmp = SelectedItems[selIdx + 1];
-            SelectedItems[selIdx + 1] = SelectedItems[selIdx];
-            SelectedItems[selIdx] = tmp;
-            
-            RedrawSelected();
-
-            selectedResultsListViewEx.Focus();
-            selectedResultsListViewEx.Items[selIdx + 1].Selected = true;
-            selectedResultsListViewEx.Items[selIdx + 1].EnsureVisible();
-        }
-
-        private void cancelButton_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-	}
-}
@@ -1,201 +0,0 @@
-///
-/// Copyright (c) 2016 Sensus Metering Systems
-///
-namespace MonitoringDB.Forms
-{
-	partial class ResultsConfigDlg
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-            this.okButton = new System.Windows.Forms.Button();
-            this.cancelButton = new System.Windows.Forms.Button();
-            this.availableResultsListBox = new System.Windows.Forms.ListBox();
-            this.availableResultsLabel = new System.Windows.Forms.Label();
-            this.selectedResultsLabel = new System.Windows.Forms.Label();
-            this.removeAllButton = new System.Windows.Forms.Button();
-            this.removeButton = new System.Windows.Forms.Button();
-            this.addButton = new System.Windows.Forms.Button();
-            this.selectedResultsListViewEx = new MonitoringDB.Forms.ListViewEx();
-            this.upButton = new System.Windows.Forms.Button();
-            this.downButton = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // okButton
-            // 
-            this.okButton.Location = new System.Drawing.Point(344, 401);
-            this.okButton.Name = "okButton";
-            this.okButton.Size = new System.Drawing.Size(104, 30);
-            this.okButton.TabIndex = 4;
-            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(465, 401);
-            this.cancelButton.Name = "cancelButton";
-            this.cancelButton.Size = new System.Drawing.Size(104, 30);
-            this.cancelButton.TabIndex = 5;
-            this.cancelButton.Text = "Cancel";
-            this.cancelButton.UseVisualStyleBackColor = true;
-            this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
-            // 
-            // availableResultsListBox
-            // 
-            this.availableResultsListBox.FormattingEnabled = true;
-            this.availableResultsListBox.Location = new System.Drawing.Point(12, 31);
-            this.availableResultsListBox.Name = "availableResultsListBox";
-            this.availableResultsListBox.Size = new System.Drawing.Size(162, 355);
-            this.availableResultsListBox.TabIndex = 6;
-            this.availableResultsListBox.DoubleClick += new System.EventHandler(this.availableResultsListBox_DoubleClick);
-            // 
-            // availableResultsLabel
-            // 
-            this.availableResultsLabel.AutoSize = true;
-            this.availableResultsLabel.Location = new System.Drawing.Point(12, 9);
-            this.availableResultsLabel.Name = "availableResultsLabel";
-            this.availableResultsLabel.Size = new System.Drawing.Size(86, 13);
-            this.availableResultsLabel.TabIndex = 8;
-            this.availableResultsLabel.Text = "Available results:";
-            // 
-            // selectedResultsLabel
-            // 
-            this.selectedResultsLabel.AutoSize = true;
-            this.selectedResultsLabel.Location = new System.Drawing.Point(284, 9);
-            this.selectedResultsLabel.Name = "selectedResultsLabel";
-            this.selectedResultsLabel.Size = new System.Drawing.Size(85, 13);
-            this.selectedResultsLabel.TabIndex = 9;
-            this.selectedResultsLabel.Text = "Selected results:";
-            // 
-            // removeAllButton
-            // 
-            this.removeAllButton.Location = new System.Drawing.Point(184, 144);
-            this.removeAllButton.Name = "removeAllButton";
-            this.removeAllButton.Size = new System.Drawing.Size(94, 30);
-            this.removeAllButton.TabIndex = 46;
-            this.removeAllButton.Text = "<< R&emove all";
-            this.removeAllButton.UseVisualStyleBackColor = true;
-            this.removeAllButton.Click += new System.EventHandler(this.removeAllButton_Click);
-            // 
-            // removeButton
-            // 
-            this.removeButton.Location = new System.Drawing.Point(184, 109);
-            this.removeButton.Name = "removeButton";
-            this.removeButton.Size = new System.Drawing.Size(93, 30);
-            this.removeButton.TabIndex = 45;
-            this.removeButton.Text = "< &Remove";
-            this.removeButton.UseVisualStyleBackColor = true;
-            this.removeButton.Click += new System.EventHandler(this.removeButton_Click);
-            // 
-            // addButton
-            // 
-            this.addButton.Location = new System.Drawing.Point(184, 74);
-            this.addButton.Name = "addButton";
-            this.addButton.Size = new System.Drawing.Size(93, 30);
-            this.addButton.TabIndex = 44;
-            this.addButton.Text = "&Add >";
-            this.addButton.UseVisualStyleBackColor = true;
-            this.addButton.Click += new System.EventHandler(this.addButton_Click);
-            // 
-            // selectedResultsListViewEx
-            // 
-            this.selectedResultsListViewEx.AllowColumnReorder = true;
-            this.selectedResultsListViewEx.DoubleClickActivation = false;
-            this.selectedResultsListViewEx.FullRowSelect = true;
-            this.selectedResultsListViewEx.Location = new System.Drawing.Point(287, 31);
-            this.selectedResultsListViewEx.Name = "selectedResultsListViewEx";
-            this.selectedResultsListViewEx.Size = new System.Drawing.Size(594, 355);
-            this.selectedResultsListViewEx.TabIndex = 47;
-            this.selectedResultsListViewEx.UseCompatibleStateImageBehavior = false;
-            this.selectedResultsListViewEx.View = System.Windows.Forms.View.Details;
-            this.selectedResultsListViewEx.SubItemClicked += new MonitoringDB.Forms.SubItemEventHandler(this.selectedResultsListViewEx_SubItemClicked);
-            this.selectedResultsListViewEx.SubItemEndEditing += new MonitoringDB.Forms.SubItemEndEditingEventHandler(this.selectedResultsListViewEx_SubItemEndEditing);
-            // 
-            // upButton
-            // 
-            this.upButton.Location = new System.Drawing.Point(184, 236);
-            this.upButton.Name = "upButton";
-            this.upButton.Size = new System.Drawing.Size(93, 30);
-            this.upButton.TabIndex = 48;
-            this.upButton.Text = "Up";
-            this.upButton.UseVisualStyleBackColor = true;
-            this.upButton.Click += new System.EventHandler(this.upButton_Click);
-            // 
-            // downButton
-            // 
-            this.downButton.Location = new System.Drawing.Point(184, 272);
-            this.downButton.Name = "downButton";
-            this.downButton.Size = new System.Drawing.Size(93, 30);
-            this.downButton.TabIndex = 49;
-            this.downButton.Text = "Down";
-            this.downButton.UseVisualStyleBackColor = true;
-            this.downButton.Click += new System.EventHandler(this.downButton_Click);
-            // 
-            // ResultsConfigDlg
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(893, 445);
-            this.Controls.Add(this.downButton);
-            this.Controls.Add(this.upButton);
-            this.Controls.Add(this.selectedResultsListViewEx);
-            this.Controls.Add(this.removeAllButton);
-            this.Controls.Add(this.removeButton);
-            this.Controls.Add(this.addButton);
-            this.Controls.Add(this.selectedResultsLabel);
-            this.Controls.Add(this.availableResultsLabel);
-            this.Controls.Add(this.availableResultsListBox);
-            this.Controls.Add(this.cancelButton);
-            this.Controls.Add(this.okButton);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.Name = "ResultsConfigDlg";
-            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "ResultsConfig";
-            this.Load += new System.EventHandler(this.ResultsConfig_Load);
-            this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.ResultsConfigDlg_KeyPress);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Button okButton;
-		private System.Windows.Forms.Button cancelButton;
-        private System.Windows.Forms.ListBox availableResultsListBox;
-		private System.Windows.Forms.Label availableResultsLabel;
-		private System.Windows.Forms.Label selectedResultsLabel;
-		private System.Windows.Forms.Button removeAllButton;
-		private System.Windows.Forms.Button removeButton;
-		private System.Windows.Forms.Button addButton;
-        private ListViewEx selectedResultsListViewEx;
-        private System.Windows.Forms.Button upButton;
-        private System.Windows.Forms.Button downButton;
-	}
-}
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
@@ -1,263 +0,0 @@
-namespace MonitoringDB.Forms
-{
-	partial class SettingsDlg
-	{
-		/// <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.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.connectionStringTextBox = new System.Windows.Forms.TextBox();
-            this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.radioButton2 = new System.Windows.Forms.RadioButton();
-            this.radioButton1 = new System.Windows.Forms.RadioButton();
-            this.groupBox3 = new System.Windows.Forms.GroupBox();
-            this.workplaceNameTextBox = new System.Windows.Forms.TextBox();
-            this.saveButton = new System.Windows.Forms.Button();
-            this.cancelButton = new System.Windows.Forms.Button();
-            this.groupBox4 = new System.Windows.Forms.GroupBox();
-            this.extraBatteryLifetimeTextBox = new System.Windows.Forms.TextBox();
-            this.oracleGroupBox = new System.Windows.Forms.GroupBox();
-            this.checkPcbIsInOracleCheckBox = new System.Windows.Forms.CheckBox();
-            this.oracleBatteryCheckBox = new System.Windows.Forms.CheckBox();
-            this.groupBox5 = new System.Windows.Forms.GroupBox();
-            this.usersDBConnStringTextBox = new System.Windows.Forms.TextBox();
-            this.groupBox1.SuspendLayout();
-            this.groupBox2.SuspendLayout();
-            this.groupBox3.SuspendLayout();
-            this.groupBox4.SuspendLayout();
-            this.oracleGroupBox.SuspendLayout();
-            this.groupBox5.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // groupBox1
-            // 
-            this.groupBox1.Controls.Add(this.connectionStringTextBox);
-            this.groupBox1.Location = new System.Drawing.Point(12, 69);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(622, 50);
-            this.groupBox1.TabIndex = 1;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "Connection string pre záznamy z výroby";
-            // 
-            // connectionStringTextBox
-            // 
-            this.connectionStringTextBox.Location = new System.Drawing.Point(17, 18);
-            this.connectionStringTextBox.Name = "connectionStringTextBox";
-            this.connectionStringTextBox.Size = new System.Drawing.Size(586, 20);
-            this.connectionStringTextBox.TabIndex = 0;
-            // 
-            // groupBox2
-            // 
-            this.groupBox2.Controls.Add(this.radioButton2);
-            this.groupBox2.Controls.Add(this.radioButton1);
-            this.groupBox2.Location = new System.Drawing.Point(12, 250);
-            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(268, 70);
-            this.groupBox2.TabIndex = 4;
-            this.groupBox2.TabStop = false;
-            this.groupBox2.Text = "Režim činnosti";
-            // 
-            // radioButton2
-            // 
-            this.radioButton2.AutoSize = true;
-            this.radioButton2.Location = new System.Drawing.Point(101, 41);
-            this.radioButton2.Name = "radioButton2";
-            this.radioButton2.Size = new System.Drawing.Size(58, 17);
-            this.radioButton2.TabIndex = 1;
-            this.radioButton2.TabStop = true;
-            this.radioButton2.Text = "Výroba";
-            this.radioButton2.UseVisualStyleBackColor = true;
-            // 
-            // radioButton1
-            // 
-            this.radioButton1.AutoSize = true;
-            this.radioButton1.Location = new System.Drawing.Point(101, 20);
-            this.radioButton1.Name = "radioButton1";
-            this.radioButton1.Size = new System.Drawing.Size(46, 17);
-            this.radioButton1.TabIndex = 0;
-            this.radioButton1.TabStop = true;
-            this.radioButton1.Text = "Test";
-            this.radioButton1.UseVisualStyleBackColor = true;
-            // 
-            // groupBox3
-            // 
-            this.groupBox3.Controls.Add(this.workplaceNameTextBox);
-            this.groupBox3.Location = new System.Drawing.Point(12, 12);
-            this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(622, 50);
-            this.groupBox3.TabIndex = 0;
-            this.groupBox3.TabStop = false;
-            this.groupBox3.Text = "Meno pracoviska";
-            // 
-            // workplaceNameTextBox
-            // 
-            this.workplaceNameTextBox.Location = new System.Drawing.Point(17, 18);
-            this.workplaceNameTextBox.Name = "workplaceNameTextBox";
-            this.workplaceNameTextBox.Size = new System.Drawing.Size(586, 20);
-            this.workplaceNameTextBox.TabIndex = 0;
-            // 
-            // saveButton
-            // 
-            this.saveButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.saveButton.Location = new System.Drawing.Point(348, 270);
-            this.saveButton.Name = "saveButton";
-            this.saveButton.Size = new System.Drawing.Size(104, 42);
-            this.saveButton.TabIndex = 6;
-            this.saveButton.Text = "Uložiť";
-            this.saveButton.UseVisualStyleBackColor = true;
-            this.saveButton.Click += new System.EventHandler(this.saveButton_Click);
-            // 
-            // cancelButton
-            // 
-            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.cancelButton.Location = new System.Drawing.Point(488, 270);
-            this.cancelButton.Name = "cancelButton";
-            this.cancelButton.Size = new System.Drawing.Size(104, 42);
-            this.cancelButton.TabIndex = 7;
-            this.cancelButton.Text = "Zrušiť";
-            this.cancelButton.UseVisualStyleBackColor = true;
-            this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
-            // 
-            // groupBox4
-            // 
-            this.groupBox4.Controls.Add(this.extraBatteryLifetimeTextBox);
-            this.groupBox4.Location = new System.Drawing.Point(12, 182);
-            this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Size = new System.Drawing.Size(268, 62);
-            this.groupBox4.TabIndex = 3;
-            this.groupBox4.TabStop = false;
-            this.groupBox4.Text = "Predĺženie životnosti baterky v mesiacoch";
-            // 
-            // extraBatteryLifetimeTextBox
-            // 
-            this.extraBatteryLifetimeTextBox.Location = new System.Drawing.Point(17, 25);
-            this.extraBatteryLifetimeTextBox.Name = "extraBatteryLifetimeTextBox";
-            this.extraBatteryLifetimeTextBox.Size = new System.Drawing.Size(230, 20);
-            this.extraBatteryLifetimeTextBox.TabIndex = 0;
-            // 
-            // oracleGroupBox
-            // 
-            this.oracleGroupBox.Controls.Add(this.checkPcbIsInOracleCheckBox);
-            this.oracleGroupBox.Controls.Add(this.oracleBatteryCheckBox);
-            this.oracleGroupBox.Location = new System.Drawing.Point(297, 182);
-            this.oracleGroupBox.Name = "oracleGroupBox";
-            this.oracleGroupBox.Size = new System.Drawing.Size(337, 74);
-            this.oracleGroupBox.TabIndex = 5;
-            this.oracleGroupBox.TabStop = false;
-            this.oracleGroupBox.Text = "Oracle";
-            this.oracleGroupBox.Visible = false;
-            // 
-            // checkPcbIsInOracleCheckBox
-            // 
-            this.checkPcbIsInOracleCheckBox.AutoSize = true;
-            this.checkPcbIsInOracleCheckBox.Location = new System.Drawing.Point(18, 45);
-            this.checkPcbIsInOracleCheckBox.Name = "checkPcbIsInOracleCheckBox";
-            this.checkPcbIsInOracleCheckBox.Size = new System.Drawing.Size(213, 17);
-            this.checkPcbIsInOracleCheckBox.TabIndex = 0;
-            this.checkPcbIsInOracleCheckBox.Text = "Skontrolovať či PCB už bola overovaná";
-            this.checkPcbIsInOracleCheckBox.UseVisualStyleBackColor = true;
-            // 
-            // oracleBatteryCheckBox
-            // 
-            this.oracleBatteryCheckBox.AutoSize = true;
-            this.oracleBatteryCheckBox.Location = new System.Drawing.Point(18, 19);
-            this.oracleBatteryCheckBox.Name = "oracleBatteryCheckBox";
-            this.oracleBatteryCheckBox.Size = new System.Drawing.Size(193, 17);
-            this.oracleBatteryCheckBox.TabIndex = 0;
-            this.oracleBatteryCheckBox.Text = "Uložiť informácie o batérii do Oracle";
-            this.oracleBatteryCheckBox.UseVisualStyleBackColor = true;
-            // 
-            // groupBox5
-            // 
-            this.groupBox5.Controls.Add(this.usersDBConnStringTextBox);
-            this.groupBox5.Location = new System.Drawing.Point(12, 125);
-            this.groupBox5.Name = "groupBox5";
-            this.groupBox5.Size = new System.Drawing.Size(622, 50);
-            this.groupBox5.TabIndex = 2;
-            this.groupBox5.TabStop = false;
-            this.groupBox5.Text = "Connection string pre centrálnu databázu používateľov";
-            // 
-            // usersDBConnStringTextBox
-            // 
-            this.usersDBConnStringTextBox.Location = new System.Drawing.Point(17, 18);
-            this.usersDBConnStringTextBox.Name = "usersDBConnStringTextBox";
-            this.usersDBConnStringTextBox.Size = new System.Drawing.Size(586, 20);
-            this.usersDBConnStringTextBox.TabIndex = 0;
-            // 
-            // SettingsDlg
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(648, 333);
-            this.Controls.Add(this.groupBox5);
-            this.Controls.Add(this.oracleGroupBox);
-            this.Controls.Add(this.groupBox4);
-            this.Controls.Add(this.cancelButton);
-            this.Controls.Add(this.saveButton);
-            this.Controls.Add(this.groupBox3);
-            this.Controls.Add(this.groupBox2);
-            this.Controls.Add(this.groupBox1);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-            this.MaximizeBox = false;
-            this.Name = "SettingsDlg";
-            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
-            this.Text = "SettingsDlg";
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox1.PerformLayout();
-            this.groupBox2.ResumeLayout(false);
-            this.groupBox2.PerformLayout();
-            this.groupBox3.ResumeLayout(false);
-            this.groupBox3.PerformLayout();
-            this.groupBox4.ResumeLayout(false);
-            this.groupBox4.PerformLayout();
-            this.oracleGroupBox.ResumeLayout(false);
-            this.oracleGroupBox.PerformLayout();
-            this.groupBox5.ResumeLayout(false);
-            this.groupBox5.PerformLayout();
-            this.ResumeLayout(false);
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.GroupBox groupBox1;
-		private System.Windows.Forms.TextBox connectionStringTextBox;
-		private System.Windows.Forms.GroupBox groupBox2;
-		private System.Windows.Forms.GroupBox groupBox3;
-		private System.Windows.Forms.TextBox workplaceNameTextBox;
-		private System.Windows.Forms.Button saveButton;
-		private System.Windows.Forms.Button cancelButton;
-		private System.Windows.Forms.RadioButton radioButton2;
-		private System.Windows.Forms.RadioButton radioButton1;
-        private System.Windows.Forms.GroupBox groupBox4;
-        private System.Windows.Forms.TextBox extraBatteryLifetimeTextBox;
-        private System.Windows.Forms.GroupBox oracleGroupBox;
-        private System.Windows.Forms.CheckBox oracleBatteryCheckBox;
-        private System.Windows.Forms.CheckBox checkPcbIsInOracleCheckBox;
-        private System.Windows.Forms.GroupBox groupBox5;
-        private System.Windows.Forms.TextBox usersDBConnStringTextBox;
-	}
-}
@@ -1,87 +0,0 @@
-using System;
-using System.Windows.Forms;
-
-namespace MonitoringDB.Forms
-{
-	public partial class SettingsDlg : Form
-	{
-		public string WorkplaceName
-		{
-			set { workplaceNameTextBox.Text = value; }
-			get { return workplaceNameTextBox.Text; }
-		}
-
-		public string ConnectionString
-		{
-			set { connectionStringTextBox.Text = value; }
-			get { return connectionStringTextBox.Text; }
-		}
-
-        public string UsersDBConnString
-        {
-            set { usersDBConnStringTextBox.Text = value; }
-            get { return usersDBConnStringTextBox.Text; }
-        }
-
-        public bool OracleBattery
-        {
-            set { oracleBatteryCheckBox.Checked = value; }
-            get { return oracleBatteryCheckBox.Checked; }
-        }
-
-        public bool CheckPcbIsInOracle
-        {
-            set { checkPcbIsInOracleCheckBox.Checked = value; }
-            get { return checkPcbIsInOracleCheckBox.Checked; }
-        }
-
-        public int ExtraBatterLifetime
-        {
-            get
-            {
-                int extraLifetime;
-                if (int.TryParse(extraBatteryLifetimeTextBox.Text, out extraLifetime) && extraLifetime >= 0) return extraLifetime;
-                return 0;
-            }
-        }
-
-        public MonitoringDB.Mode Mode
-		{
-			set
-			{
-                radioButton1.Checked = (value == MonitoringDB.Mode.Test);
-                radioButton2.Checked = (value == MonitoringDB.Mode.Production);
-			}
-			get
-			{
-                return radioButton1.Checked ? MonitoringDB.Mode.Test : MonitoringDB.Mode.Production;
-			}
-		}
-
-        /// <summary>
-        /// Basic configuration dialog
-        /// </summary>
-        /// <param name="isWorkplace">false = Konfiguracia pracovisk, true = Pracovisko</param>
-		public SettingsDlg(bool isWorkplace)
-		{
-			InitializeComponent();
-            if (isWorkplace)
-            {
-                oracleGroupBox.Visible = true;
-            }
-            extraBatteryLifetimeTextBox.Text = "0";
-		}
-
-		private void saveButton_Click(object sender, EventArgs e)
-		{
-			DialogResult = DialogResult.OK;
-			Close();
-		}
-
-		private void cancelButton_Click(object sender, EventArgs e)
-		{
-			DialogResult = DialogResult.Cancel;
-			Close();
-		}
-	}
-}
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
@@ -1,49 +0,0 @@
-using System;
-using System.Windows.Forms;
-
-namespace MonitoringDB.Forms
-{
-	public partial class TrivialLoginDlg : Form
-	{
-        public LoginLevel LoginLevel;
-
-        public TrivialLoginDlg()
-		{
-			InitializeComponent();
-            LoginLevel = LoginLevel.None;
-		}
-
-		private void okButton_Click(object sender, EventArgs e)
-		{
-			if (passwordTextBox.Text.ToLower().Equals("barcode"))
-			{
-                LoginLevel = LoginLevel.Administrator;
-				DialogResult = DialogResult.OK;
-				Close();
-			}
-            else if (passwordTextBox.Text.ToLower().Equals("teamleader"))
-            {
-                LoginLevel = LoginLevel.TeamLeader;
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            else if (passwordTextBox.Text.ToLower().Equals("kremik"))
-            {
-                LoginLevel = LoginLevel.MH;
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            else
-			{
-				DialogResult = DialogResult.Cancel;
-				Close();
-			}
-		}
-
-		private void cancelButton_Click(object sender, EventArgs e)
-		{
-			DialogResult = DialogResult.Cancel;
-			Close();
-		}
-	}
-}
@@ -1,105 +0,0 @@
-namespace MonitoringDB.Forms
-{
-	partial class TrivialLoginDlg
-	{
-		/// <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.passwordGroupBox = new System.Windows.Forms.GroupBox();
-			this.passwordTextBox = new System.Windows.Forms.TextBox();
-			this.okButton = new System.Windows.Forms.Button();
-			this.cancelButton = new System.Windows.Forms.Button();
-			this.passwordGroupBox.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// passwordGroupBox
-			// 
-			this.passwordGroupBox.Controls.Add(this.passwordTextBox);
-			this.passwordGroupBox.Location = new System.Drawing.Point(12, 10);
-			this.passwordGroupBox.Name = "passwordGroupBox";
-			this.passwordGroupBox.Size = new System.Drawing.Size(200, 49);
-			this.passwordGroupBox.TabIndex = 0;
-			this.passwordGroupBox.TabStop = false;
-			this.passwordGroupBox.Text = "Heslo";
-			// 
-			// passwordTextBox
-			// 
-			this.passwordTextBox.Location = new System.Drawing.Point(51, 18);
-			this.passwordTextBox.Name = "passwordTextBox";
-			this.passwordTextBox.PasswordChar = '*';
-			this.passwordTextBox.Size = new System.Drawing.Size(100, 20);
-			this.passwordTextBox.TabIndex = 0;
-			// 
-			// okButton
-			// 
-			this.okButton.Location = new System.Drawing.Point(237, 18);
-			this.okButton.Name = "okButton";
-			this.okButton.Size = new System.Drawing.Size(75, 39);
-			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(330, 18);
-			this.cancelButton.Name = "cancelButton";
-			this.cancelButton.Size = new System.Drawing.Size(75, 39);
-			this.cancelButton.TabIndex = 2;
-			this.cancelButton.Text = "Cancel";
-			this.cancelButton.UseVisualStyleBackColor = true;
-			this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
-			// 
-			// LoginDlg
-			// 
-			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(426, 73);
-			this.Controls.Add(this.cancelButton);
-			this.Controls.Add(this.okButton);
-			this.Controls.Add(this.passwordGroupBox);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-			this.MaximizeBox = false;
-			this.MinimizeBox = false;
-			this.Name = "LoginDlg";
-			this.Text = "LoginDlg";
-			this.passwordGroupBox.ResumeLayout(false);
-			this.passwordGroupBox.PerformLayout();
-			this.ResumeLayout(false);
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.GroupBox passwordGroupBox;
-		private System.Windows.Forms.TextBox passwordTextBox;
-		private System.Windows.Forms.Button okButton;
-		private System.Windows.Forms.Button cancelButton;
-	}
-}
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
@@ -1,306 +0,0 @@
-///
-/// Copyright (c) 2016-2017 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using MonitoringDB.Entities;
-using MonitoringDB.Resources;
-using NHibernate;
-using NHibernate.Criterion;
-
-namespace MonitoringDB
-{
-	public class ItemSpec
-	{
-        ///
-        /// Function delegate to pick a reference record and convert it to a string
-        /// 
-        public delegate string PrintDlgt(object x, string format, string precision, int width);
-
-        ///
-		/// Public fields
-		///
-        public readonly ItemSpecID Uid;         /// Unique Uid used to distinguish items
-        public readonly string Name;	        /// Name that can be localized to identify the item in a list
-        public readonly PrintDlgt PrintFn;      /// Function used to convert the result to a text
-                                                
-        public string Caption;	                /// User defined text printed in the column header
-        public string Format;                   /// Specifies the text generation
-        public string Precision;                /// Specifies the text generation
-        public int Width;                       /// Specifies the text generation
-
-        readonly ItemSpecCaps itemSpecCaps;
-
-        /// <summary> Public parameterless constructor </summary>
-        public ItemSpec()
-        {
-        }
-
-        /// <summary> Constructor to specify all items </summary>
-        public ItemSpec(ItemSpecID uid, string name, PrintDlgt printFn, ItemSpecCaps itemSpecCaps)
-		{
-            Uid = uid;
-            Name = name;
-            PrintFn = printFn;
-            this.itemSpecCaps = itemSpecCaps;
-            ///
-            Caption = name;
-            Format = "{0}";
-            Precision = string.Empty;
-            Width = 0;
-		}
-
-        /// <summary> Copy constructor </summary>
-        public ItemSpec Clone()
-        {
-            ItemSpec newItem = new ItemSpec(Uid, Name, PrintFn, itemSpecCaps);
-            newItem.Caption = Caption;
-            newItem.Format = Format;
-            newItem.Precision = Precision;
-            newItem.Width = Width;
-            return newItem;
-        }
-
-
-        /// <summary> Safe wrapper which replaces null-s by empty strings </summary>
-        public string Print(object x)
-        {
-            string str = PrintFn(x, Format, Precision, Width);
-            return (str == null) ? string.Empty : str;
-        }
-
-
-        /// <summary> Similar to Print(), in addition embeds text into "" </summary>
-        public string Export(object x)
-        {
-            string str = PrintFn(x, Format, Precision, Width);
-            if (str == null) str = string.Empty;
-
-            if (Uid == ItemSpecID.Barcode || Uid == ItemSpecID.PartBarcode || Uid == ItemSpecID.SerialNr || Uid == ItemSpecID.PurchaseOrder)
-            {
-                return string.Format("=\"{0}\"", str);
-            }
-            return str;
-        }
-
-
-		/// Static list of all available items
-		public static readonly IList<ItemSpec> AllItems;
-
-        ///
-		/// Static constructor that initializes the list of all items
-        ///
-		static ItemSpec()
-		{
-			AllItems = new List<ItemSpec>();
-
-            AllItems.Add(new ItemSpec(ItemSpecID.RefRecordID,   Strings.RefRecordID,    (x, f, p, w) => ((int)x).ToString(), ItemSpecCaps.ReferenceRecord));
-            
-            AllItems.Add(new ItemSpec(ItemSpecID.TimeStamp,     Strings.Time_stamp,     (x, f, p, w) => string.IsNullOrEmpty(f) ? ((DateTime)x).ToString() : string.Format(f, (DateTime)x), ItemSpecCaps.ReferenceRecord));
-            AllItems.Add(new ItemSpec(ItemSpecID.Workstep,      Strings.Workstep,       (x, f, p, w) => string.IsNullOrEmpty(f) ? ((Workstep)x).Name : string.Format(f, ((Workstep)x).Name), ItemSpecCaps.ReferenceRecord));
-            AllItems.Add(new ItemSpec(ItemSpecID.Workplace,     Strings.Workplace,      (x, f, p, w) => string.IsNullOrEmpty(f) ? (string)x : string.Format(f, x), ItemSpecCaps.ReferenceRecord));
-            AllItems.Add(new ItemSpec(ItemSpecID.UserName,      Strings.User_name,      (x, f, p, w) => string.IsNullOrEmpty(f) ? (string)x : string.Format(f, x), ItemSpecCaps.ReferenceRecord));
-            AllItems.Add(new ItemSpec(ItemSpecID.Barcode,       Strings.Barcode,        (x, f, p, w) => string.IsNullOrEmpty(f) ? (string)x : string.Format(f, x), ItemSpecCaps.ReferenceRecord));
-            AllItems.Add(new ItemSpec(ItemSpecID.PartBarcode,   Strings.Part_barcode,   (x, f, p, w) => string.IsNullOrEmpty(f) ? (string)x : string.Format(f, x), ItemSpecCaps.ReferenceRecord | ItemSpecCaps.AssociatedRecord));
-            
-            AllItems.Add(new ItemSpec(ItemSpecID.TimeStamp2,    Strings.Time_stamp+"2", (x, f, p, w) => string.IsNullOrEmpty(f) ? ((DateTime)x).ToString() : string.Format(f, (DateTime)x), ItemSpecCaps.ReferenceRecord));
-            AllItems.Add(new ItemSpec(ItemSpecID.Workstep2,     Strings.Workstep+"2",   (x, f, p, w) => string.IsNullOrEmpty(f) ? ((Workstep)x).Name : string.Format(f, ((Workstep)x).Name), ItemSpecCaps.ReferenceRecord));
-            AllItems.Add(new ItemSpec(ItemSpecID.Workplace2,    Strings.Workplace+"2",  (x, f, p, w) => string.IsNullOrEmpty(f) ? (string)x : string.Format(f, x), ItemSpecCaps.ReferenceRecord));
-            AllItems.Add(new ItemSpec(ItemSpecID.UserName2,     Strings.User_name+"2",  (x, f, p, w) => string.IsNullOrEmpty(f) ? (string)x : string.Format(f, x), ItemSpecCaps.ReferenceRecord));
-            AllItems.Add(new ItemSpec(ItemSpecID.Barcode2,      Strings.Barcode+"2",    (x, f, p, w) => string.IsNullOrEmpty(f) ? (string)x : string.Format(f, x), ItemSpecCaps.ReferenceRecord));
-            AllItems.Add(new ItemSpec(ItemSpecID.PartBarcode2,  Strings.Part_barcode+"2",(x, f, p, w)=> string.IsNullOrEmpty(f) ? (string)x : string.Format(f, x), ItemSpecCaps.ReferenceRecord | ItemSpecCaps.AssociatedRecord));
-            
-            AllItems.Add(new ItemSpec(ItemSpecID.SerialNr,      Strings.Serial_nr,      (x, f, p, w) => x as string, ItemSpecCaps.ReferenceRecord | ItemSpecCaps.OracleQuery));
-            AllItems.Add(new ItemSpec(ItemSpecID.PurchaseOrder, Strings.Purchase_order, (x, f, p, w) => x as string, ItemSpecCaps.ReferenceRecord | ItemSpecCaps.OracleQuery));
-			AllItems.Add(new ItemSpec(ItemSpecID.TestResult,	Strings.Test_result,	(x, f, p, w) => x as string, ItemSpecCaps.ReferenceRecord | ItemSpecCaps.OracleQuery));
-            AllItems.Add(new ItemSpec(ItemSpecID.MaxPruefindex, Strings.Max_pruefindex, (x, f, p, w) => x as string, ItemSpecCaps.ReferenceRecord | ItemSpecCaps.OracleQuery));
-            
-            AllItems.Add(new ItemSpec(ItemSpecID.Process,       Strings.Process,        (x, f, p, w) => string.IsNullOrEmpty(f) ? ((Process)x).Name : string.Format(f, ((Process)x).Name), ItemSpecCaps.ReferenceRecord));
-        }
-
-        public PropertyProjection GetProperty(ReferenceRecord refRecord, Record record)
-        {
-            switch (Uid)
-            {
-                case ItemSpecID.RefRecordID:    return Projections.Property(() => refRecord.Id);
-                
-                case ItemSpecID.TimeStamp:      return Projections.Property(() => refRecord.TimeStamp);
-                case ItemSpecID.Workstep:       return Projections.Property(() => refRecord.Workstep);
-                case ItemSpecID.Workplace:      return Projections.Property(() => refRecord.Workplace);
-                case ItemSpecID.UserName:       return Projections.Property(() => refRecord.UserName);
-                case ItemSpecID.Barcode:        return Projections.Property(() => refRecord.Code);
-                case ItemSpecID.PartBarcode:    return Projections.Property(() => record.Code);
-
-                case ItemSpecID.TimeStamp2:     return null;
-                case ItemSpecID.Workstep2:      return null;
-                case ItemSpecID.Workplace2:     return null;
-                case ItemSpecID.UserName2:      return null;
-                case ItemSpecID.Barcode2:       return null;
-                case ItemSpecID.PartBarcode2:   return null;
-
-                case ItemSpecID.SerialNr:       return null;
-                case ItemSpecID.PurchaseOrder:  return null;
-				case ItemSpecID.TestResult:     return null;
-                case ItemSpecID.MaxPruefindex:  return null;
-                
-                case ItemSpecID.Process:        return Projections.Property(() => refRecord.Process);
-                
-                default: return null;
-            }
-        }
-
-        public PropertyProjection GetProperty2(ReferenceRecord refRecord2, Record record2)
-        {
-            switch (Uid)
-            {
-                case ItemSpecID.RefRecordID:    return null;
-
-                case ItemSpecID.TimeStamp:      return null;
-                case ItemSpecID.Workstep:       return null;
-                case ItemSpecID.Workplace:      return null;
-                case ItemSpecID.UserName:       return null;
-                case ItemSpecID.Barcode:        return null;
-                case ItemSpecID.PartBarcode:    return null;
-
-                case ItemSpecID.TimeStamp2:     return Projections.Property(() => refRecord2.TimeStamp);
-                case ItemSpecID.Workstep2:      return Projections.Property(() => refRecord2.Workstep);
-                case ItemSpecID.Workplace2:     return Projections.Property(() => refRecord2.Workplace);
-                case ItemSpecID.UserName2:      return Projections.Property(() => refRecord2.UserName);
-                case ItemSpecID.Barcode2:       return Projections.Property(() => refRecord2.Code);
-                case ItemSpecID.PartBarcode2:   return Projections.Property(() => record2.Code);
-
-                case ItemSpecID.SerialNr:       return null;
-                case ItemSpecID.PurchaseOrder:  return null;
-                case ItemSpecID.TestResult:     return null;
-                case ItemSpecID.MaxPruefindex:  return null;
-
-                case ItemSpecID.Process:        return Projections.Property(() => refRecord2.Process);
-
-                default: return null;
-            }
-        }
-
-        public ItemSpecCaps GetCaps()
-        {
-            return itemSpecCaps;
-        }
-
-
-        public static ItemSpec GetItem(ItemSpecID id)
-        {
-            foreach (var item in AllItems)
-                if (item.Uid == id)
-                    return item.Clone();
-
-            return null;
-        }
-
-        public static ItemSpec GetItem(string uidName)
-        {
-            foreach (var item in AllItems)
-                if (item.Uid.ToString() == uidName)
-                    return item.Clone();
-
-            return null;
-        }
-
-
-        public static ProjectionList GetProjections(IList<ItemSpec> items, ReferenceRecord refRecord, Record record)
-        {
-            ProjectionList projections = Projections.ProjectionList();
-            foreach (var item in items)
-            {
-                PropertyProjection projection = item.GetProperty(refRecord, record);
-                if (projection != null)
-                    projections.Add(projection);
-            }
-
-            return projections;
-        }
-
-        public static IList<object[]> Expand(IList<object[]> data, IList<ItemSpec> items)
-        {
-            if (data.Count == 0) return data;
-
-            int iSize = data[0].Length;
-            int oSize = items.Count;
-            for (int i = 0; i < data.Count; i++)
-            {
-                object[] inArr = data[i];
-
-                object[] outArr = new object[oSize];
-                int srcIx = 0;
-                for (int dstIx = 0; dstIx < oSize; dstIx++)
-                {
-                    outArr[dstIx] = ((items[dstIx].GetCaps() & ItemSpecCaps.OracleQuery) == ItemSpecCaps.OracleQuery) ? string.Empty : inArr[srcIx++];
-                }
-
-                data[i] = outArr;
-            }
-
-            return data;
-        }
-
-
-        //static string GetPartCode(ReferenceRecord refRecord, string partName)
-        //{
-        //    if (refRecord != null && refRecord.Records != null)
-        //    {
-        //        foreach (var record in refRecord.Records)
-        //        {
-        //            if (record.Part.Name.Equals(partName))
-        //            {
-        //                return record.Code;
-        //            }
-        //        }
-        //    }
-
-        //    return string.Empty;
-        //}
-
-		public static string[] ToStrArray(IList<ItemSpec> items)
-		{
-			int count = (items != null) ? items.Count : 0;
-			string[] result = new string[count];
-            for (int i = 0; i < count; i++)
-            {
-                result[i] = string.Format("{0}~{1}~{2}~{3}~{4}",
-                                          items[i].Uid,
-                                          items[i].Caption,
-                                          items[i].Format,
-                                          items[i].Precision,
-                                          items[i].Width);
-            }
-			return result;
-		}
-
-		public static IList<ItemSpec> FromStrArray(string[] strArray)
-		{
-			IList<ItemSpec> result = new List<ItemSpec>();
-            if (strArray != null)
-			{
-				for (int i = 0; i < strArray.Length; i++)
-				{
-                    string[] field = strArray[i].Split(new char[] { '~' });
-                    try
-                    {
-                        ItemSpec item = GetItem(field[0]);
-                        item.Caption = field[1];
-                        item.Format = field[2];
-                        item.Precision = field[3];
-                        item.Width = int.Parse(field[4]);
-
-                        result.Add(item);
-                    }
-                    catch
-                    {
-                        ItemSpec item = GetItem(ItemSpecID.RefRecordID);
-                        item.Format = string.Format("Parse error: {0}", strArray[i]);
-                        result.Add(item);
-                    }
-                }
-			}
-			return result;
-		}
-    }
-}
@@ -1,23 +0,0 @@
-using FluentNHibernate.Mapping;
-
-namespace MonitoringDB.Mappings
-{
-    class PartMap : ClassMap<Entities.Part>
-    {
-        public PartMap()
-        {
-            Id(x => x.Id);
-            Map(x => x.Name);
-            Map(x => x.OraDBType);
-            Map(x => x.Description);
-			Map(x => x.CodeType);
-            Map(x => x.CodeForm);
-			Map(x => x.CodeLocation);
-			Map(x => x.LifetimeManagement);
-			Map(x => x.StepNumber);
-
-			References(x => x.Process);
-			References(x => x.Workstep);
-		}
-    }
-}
@@ -1,25 +0,0 @@
-using FluentNHibernate.Mapping;
-
-namespace MonitoringDB.Mappings
-{
-    class ProcessMap : ClassMap<Entities.Process>
-    {
-        public ProcessMap()
-        {
-            Id(x => x.Id);
-            Map(x => x.ItemNr);
-            Map(x => x.Name);
-			Map(x => x.Description);
-			Map(x => x.ReleaseStatus);
-			Map(x => x.TimeStamp);
-			Map(x => x.UserName);
-
-			HasMany(x => x.Parts)
-				.OrderBy("Name")
-				.Cascade.All();
-			HasMany(x => x.Worksteps)
-				.OrderBy("WorkstepNr")
-				.Cascade.All();
-		}
-    }
-}
@@ -1,17 +0,0 @@
-using FluentNHibernate.Mapping;
-
-namespace MonitoringDB.Mappings
-{
-    class RecordMap : ClassMap<Entities.Record>
-    {
-        public RecordMap()
-        {
-            Id(x => x.Id);
-			Map(x => x.Code);
-			Map(x => x.TimeStamp);
-
-			References(x => x.Part);
-			References(x => x.ReferenceRecord);
-		}
-    }
-}
@@ -1,22 +0,0 @@
-using FluentNHibernate.Mapping;
-
-namespace MonitoringDB.Mappings
-{
-    class ReferenceRecordMap : ClassMap<Entities.ReferenceRecord>
-    {
-        public ReferenceRecordMap()
-        {
-            Id(x => x.Id);
-			Map(x => x.Code);
-			Map(x => x.TimeStamp);
-			Map(x => x.UserName);
-			Map(x => x.Workplace);
-			Map(x => x.Result);
-
-			References(x => x.Process);
-			References(x => x.Workstep);
-			HasMany(x => x.Records)
-				.Cascade.All();
-		}
-    }
-}
@@ -1,23 +0,0 @@
-using FluentNHibernate.Mapping;
-
-namespace MonitoringDB.Mappings
-{
-    class WorkstepMap : ClassMap<Entities.Workstep>
-    {
-        public WorkstepMap()
-        {
-            Id(x => x.Id);
-            Map(x => x.WorkstepNr);
-            Map(x => x.Name);
-			Map(x => x.Description);
-            Map(x => x.CheckPartNr);
-            Map(x => x.AllowRepairs);
-
-			References(x => x.Process);
-			References(x => x.ReferencePart);
-			HasMany(x => x.Parts)
-				.OrderBy("StepNumber")
-				.Cascade.All();
-		}
-    }
-}
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MonitoringDB</RootNamespace>
-    <AssemblyName>MonitoringDB</AssemblyName>
-    <TargetFrameworkVersion>v4.0</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="FluentNHibernate, Version=2.0.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="log4net">
-      <HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="MySql.Data, Version=6.6.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <HintPath>..\packages\NHibernate.4.0.4.4000\lib\net40\NHibernate.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <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="Forms\ListViewEx.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Forms\TrivialLoginDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\TrivialLoginDlg.designer.cs">
-      <DependentUpon>TrivialLoginDlg.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\ModelessForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\ModelessForm.designer.cs">
-      <DependentUpon>ModelessForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\ResultsConfigDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\ResultsConfigDlg.designer.cs">
-      <DependentUpon>ResultsConfigDlg.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\SettingsDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\SettingsDlg.designer.cs">
-      <DependentUpon>SettingsDlg.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ItemSpec.cs" />
-    <Compile Include="QuitAppException.cs" />
-    <Compile Include="Resources\Strings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Strings.resx</DependentUpon>
-    </Compile>
-    <Compile Include="ScanVerificationInfo.cs" />
-    <Compile Include="SerializableDictionary.cs" />
-    <Compile Include="WMPart.cs" />
-    <Compile Include="Entities\Part.cs" />
-    <Compile Include="Entities\Process.cs" />
-    <Compile Include="Entities\Record.cs" />
-    <Compile Include="Entities\ReferenceRecord.cs" />
-    <Compile Include="Entities\Workstep.cs" />
-    <Compile Include="Enums.cs" />
-    <Compile Include="FluentNH.cs" />
-    <Compile Include="Mappings\PartMap.cs" />
-    <Compile Include="Mappings\ProcessMap.cs" />
-    <Compile Include="Mappings\RecordMap.cs" />
-    <Compile Include="Mappings\ReferenceRecordMap.cs" />
-    <Compile Include="Mappings\WorkstepMap.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Forms\ListViewEx.resx">
-      <DependentUpon>ListViewEx.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\TrivialLoginDlg.resx">
-      <DependentUpon>TrivialLoginDlg.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\ModelessForm.resx">
-      <DependentUpon>ModelessForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\ResultsConfigDlg.resx">
-      <DependentUpon>ResultsConfigDlg.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\SettingsDlg.resx">
-      <DependentUpon>SettingsDlg.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\Strings.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
-  </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>
@@ -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("Common")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Common")]
-[assembly: AssemblyCopyright("Copyright ©  2015-2017")]
-[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("b182c80f-8670-40ab-ad26-6fb8de86552e")]
-
-// 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.5.57.0")]
-[assembly: AssemblyFileVersion("1.5.57.0")]
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace MonitoringDB.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MonitoringDB.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;
-            }
-        }
-    }
-}
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
@@ -1,12 +0,0 @@
-using System;
-
-namespace MonitoringDB
-{
-    public class QuitAppException : Exception
-    {
-        public QuitAppException(string message)
-            : base(message)
-        {
-        }
-    }
-}
@@ -1,333 +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 MonitoringDB.Resources {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Strings {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Strings() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MonitoringDB.Resources.Strings", typeof(Strings).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;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Add  &gt;.
-        /// </summary>
-        internal static string Add {
-            get {
-                return ResourceManager.GetString("Add", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Available results.
-        /// </summary>
-        internal static string Available_results {
-            get {
-                return ResourceManager.GetString("Available_results", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Barcode.
-        /// </summary>
-        internal static string Barcode {
-            get {
-                return ResourceManager.GetString("Barcode", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cancel.
-        /// </summary>
-        internal static string CancelBtnText {
-            get {
-                return ResourceManager.GetString("CancelBtnText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Caption.
-        /// </summary>
-        internal static string Caption {
-            get {
-                return ResourceManager.GetString("Caption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Configuration.
-        /// </summary>
-        internal static string Configuration {
-            get {
-                return ResourceManager.GetString("Configuration", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Down.
-        /// </summary>
-        internal static string DownBtnText {
-            get {
-                return ResourceManager.GetString("DownBtnText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Format.
-        /// </summary>
-        internal static string Format {
-            get {
-                return ResourceManager.GetString("Format", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Item.
-        /// </summary>
-        internal static string Item {
-            get {
-                return ResourceManager.GetString("Item", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Max. prüfindex.
-        /// </summary>
-        internal static string Max_pruefindex {
-            get {
-                return ResourceManager.GetString("Max_pruefindex", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to OK.
-        /// </summary>
-        internal static string OkBtnText {
-            get {
-                return ResourceManager.GetString("OkBtnText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Another part barcode.
-        /// </summary>
-        internal static string Part_barcode {
-            get {
-                return ResourceManager.GetString("Part_barcode", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Precision.
-        /// </summary>
-        internal static string Precision {
-            get {
-                return ResourceManager.GetString("Precision", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Process.
-        /// </summary>
-        internal static string Process {
-            get {
-                return ResourceManager.GetString("Process", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Purchase order.
-        /// </summary>
-        internal static string Purchase_order {
-            get {
-                return ResourceManager.GetString("Purchase_order", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Record ID.
-        /// </summary>
-        internal static string RefRecordID {
-            get {
-                return ResourceManager.GetString("RefRecordID", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &lt;  Remove.
-        /// </summary>
-        internal static string Remove {
-            get {
-                return ResourceManager.GetString("Remove", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Remove all.
-        /// </summary>
-        internal static string Remove_all {
-            get {
-                return ResourceManager.GetString("Remove_all", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Selected results.
-        /// </summary>
-        internal static string Selected_results {
-            get {
-                return ResourceManager.GetString("Selected_results", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Serial nr..
-        /// </summary>
-        internal static string Serial_nr {
-            get {
-                return ResourceManager.GetString("Serial_nr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Serial_number.
-        /// </summary>
-        internal static string Serial_number {
-            get {
-                return ResourceManager.GetString("Serial_number", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Summary.
-        /// </summary>
-        internal static string Summary {
-            get {
-                return ResourceManager.GetString("Summary", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Test result.
-        /// </summary>
-        internal static string Test_result {
-            get {
-                return ResourceManager.GetString("Test_result", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Text.
-        /// </summary>
-        internal static string Text {
-            get {
-                return ResourceManager.GetString("Text", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Time stamp.
-        /// </summary>
-        internal static string Time_stamp {
-            get {
-                return ResourceManager.GetString("Time_stamp", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Up.
-        /// </summary>
-        internal static string UpBtnText {
-            get {
-                return ResourceManager.GetString("UpBtnText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to User name.
-        /// </summary>
-        internal static string User_name {
-            get {
-                return ResourceManager.GetString("User_name", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Width.
-        /// </summary>
-        internal static string Width {
-            get {
-                return ResourceManager.GetString("Width", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Workplace.
-        /// </summary>
-        internal static string Workplace {
-            get {
-                return ResourceManager.GetString("Workplace", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Workstep.
-        /// </summary>
-        internal static string Workstep {
-            get {
-                return ResourceManager.GetString("Workstep", resourceCulture);
-            }
-        }
-    }
-}
@@ -1,25 +0,0 @@
-using MonitoringDB.Entities;
-
-namespace MonitoringDB
-{
-    public class ScanVerificationInfo
-    {
-        public Workstep Workstep;           /// null = verification is disabled
-        public bool VerifyReferencePart;    /// true = verify current workstep ReferencePart with another part
-                                            /// false = verify Part from current workstep parts with ReferencePart of another Workstep
-        public Part Part;                   /// Applicable when VerifyReferencePart == false
-
-        /// Constructor that disables verification
-        public ScanVerificationInfo()
-        {
-            Workstep = null;
-        }
-
-        public ScanVerificationInfo(Workstep workstep, bool verifyReferencePart, Part part)
-        {
-            Workstep = workstep;
-            VerifyReferencePart = verifyReferencePart;
-            Part = part;
-        }
-    }
-}
@@ -1,69 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Xml.Serialization;
-
-namespace MonitoringDB
-{
-    [XmlRoot("dictionary")]
-    public class SerializableDictionary<TKey, TValue>
-        : Dictionary<TKey, TValue>, IXmlSerializable
-    {
-        public System.Xml.Schema.XmlSchema GetSchema()
-        {
-            return null;
-        }
-
-        public void ReadXml(System.Xml.XmlReader reader)
-        {
-            XmlSerializer keySerializer = new XmlSerializer(typeof(TKey));
-            XmlSerializer valueSerializer = new XmlSerializer(typeof(TValue));
-
-            bool wasEmpty = reader.IsEmptyElement;
-            reader.Read();
-
-            if (wasEmpty)
-                return;
-
-            while (reader.NodeType != System.Xml.XmlNodeType.EndElement)
-            {
-                reader.ReadStartElement("item");
-
-                reader.ReadStartElement("key");
-                TKey key = (TKey)keySerializer.Deserialize(reader);
-                reader.ReadEndElement();
-
-                reader.ReadStartElement("value");
-                TValue value = (TValue)valueSerializer.Deserialize(reader);
-                reader.ReadEndElement();
-
-                this.Add(key, value);
-
-                reader.ReadEndElement();
-                reader.MoveToContent();
-            }
-            reader.ReadEndElement();
-        }
-
-        public void WriteXml(System.Xml.XmlWriter writer)
-        {
-            XmlSerializer keySerializer = new XmlSerializer(typeof(TKey));
-            XmlSerializer valueSerializer = new XmlSerializer(typeof(TValue));
-
-            foreach (TKey key in this.Keys)
-            {
-                writer.WriteStartElement("item");
-
-                writer.WriteStartElement("key");
-                keySerializer.Serialize(writer, key);
-                writer.WriteEndElement();
-
-                writer.WriteStartElement("value");
-                TValue value = this[key];
-                valueSerializer.Serialize(writer, value);
-                writer.WriteEndElement();
-
-                writer.WriteEndElement();
-            }
-        }
-    }
-}
@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using MonitoringDB.Entities;
-
-namespace MonitoringDB
-{
-	public class WMPart
-	{
-		public string Name;
-        public Process Process;
-        public string OraDBType;
-        public string Description;
-		public string Code;
-		public DateTime TimeStamp;
-		public CodeType CodeType;
-		public CodeForm CodeForm;
-		public CodeLocation CodeLocation;
-		public string UserName;
-		public string Workplace;
-
-		public WMPart(ReferenceRecord rr)
-		{
-			Name = rr.Workstep.ReferencePart.Name;
-            Process = rr.Process;
-            OraDBType = rr.Workstep.ReferencePart.OraDBType;
-            Description = rr.Workstep.ReferencePart.Description;
-			Code = rr.Code;
-			TimeStamp = rr.TimeStamp;
-			CodeType = rr.Workstep.ReferencePart.CodeType;
-			CodeForm = rr.Workstep.ReferencePart.CodeForm;
-			CodeLocation = rr.Workstep.ReferencePart.CodeLocation;
-			UserName = rr.UserName;
-			Workplace = rr.Workplace;
-		}
-
-		public WMPart(Record r)
-		{
-			Name = r.Part.Name;
-            Process = r.Part.Process;
-            OraDBType = r.Part.OraDBType;
-			Description = r.Part.Description;
-			Code = r.Code;
-			TimeStamp = r.TimeStamp;
-			CodeType = r.Part.CodeType;
-			CodeForm = r.Part.CodeForm;
-			CodeLocation = r.Part.CodeLocation;
-			UserName = r.ReferenceRecord.UserName;
-			Workplace = r.ReferenceRecord.Workplace;
-		}
-	}
-}
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.4000" newVersion="4.0.0.4000" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Iesi.Collections" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FluentNHibernate" version="2.0.3.0" targetFramework="net40" />
-  <package id="Iesi.Collections" version="4.0.0.4000" targetFramework="net40" />
-  <package id="NHibernate" version="4.0.4.4000" targetFramework="net40" />
-</packages>
@@ -21,19 +21,12 @@ namespace Results
 		public static ISessionFactory SessionFactory;

 		/// <summary> Connection string for all sessions </summary>
-		static string connectionString;
+		private static string connectionString;
 		/// 
 		public static string ConnectionString
 		{
 			get { return connectionString; }
-            set
-            {
-                if (value != connectionString)
-                {
-                    connectionString = value;
-                    SessionFactory = null;          /// Clear SessionFactory on connection string change
-                }
-            }
+			set { connectionString = value; SessionFactory = null; }
 		}

 		/// <summary> Database type (MySQL or SQLite) for all sessions </summary>
@@ -107,61 +107,13 @@ namespace Results.Entities
            return (timeSum == 0) ? 0 : (sum / timeSum);
        }

-        public virtual double AmbTempStart()
-        {
-            for (int i = 0; i < TestRslts.Count; i++)
-            {
-                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
-                    return TestRslts[i].AmbTempStart;
-            }
-            return 0;
-        }
-        public virtual double AmbPressStart()
-        {
-            for (int i = 0; i < TestRslts.Count; i++)
-            {
-                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
-                    return TestRslts[i].AmbPressStart;
-            }
-            return 0;
-        }
-        public virtual double AmbHumiStart()
-        {
-            for (int i = 0; i < TestRslts.Count; i++)
-            {
-                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
-                    return TestRslts[i].AmbHumiStart;
-            }
-            return 0;
-        }
+        public virtual double AmbTempStart() { return (TestRslts.Count > 0) ? TestRslts[0].AmbTempStart : 0; }
+        public virtual double AmbPressStart() { return (TestRslts.Count > 0) ? TestRslts[0].AmbPressStart : 0; }
+        public virtual double AmbHumiStart() { return (TestRslts.Count > 0) ? TestRslts[0].AmbHumiStart : 0; }

-        public virtual double AmbTempEnd()
-        {
-            for (int i = TestRslts.Count - 1; i >= 0; i++)
-            {
-                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
-                    return TestRslts[i].AmbTempEnd;
-            }
-            return 0;
-        }
-        public virtual double AmbPressEnd()
-        {
-            for (int i = TestRslts.Count - 1; i >= 0; i++)
-            {
-                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
-                    return TestRslts[i].AmbPressEnd;
-            }
-            return 0;
-        }
-        public virtual double AmbHumiEnd()
-        {
-            for (int i = TestRslts.Count - 1; i >= 0; i++)
-            {
-                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
-                    return TestRslts[i].AmbHumiEnd;
-            }
-            return 0;
-        }
+        public virtual double AmbTempEnd() { return (TestRslts.Count > 0) ? TestRslts[TestRslts.Count - 1].AmbTempEnd : 0; }
+        public virtual double AmbPressEnd() { return (TestRslts.Count > 0) ? TestRslts[TestRslts.Count - 1].AmbPressEnd : 0; }
+        public virtual double AmbHumiEnd() { return (TestRslts.Count > 0) ? TestRslts[TestRslts.Count - 1].AmbHumiEnd : 0; }

        public virtual double Buoyancy()
        {
@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2016 Sensus Metering Systems
 ///
 using System;

@@ -10,8 +10,6 @@ namespace Results.Entities
        public virtual int Id { get; protected set; }

 		public virtual byte   CompoundMeterId { get; set; }		/// 0=single, 1=compound/main, 2=compound/aux., 3=compound/overal, 4=heat meter volume, 5=heat meter energy
-        public virtual string RegReaderClass  { get; set; }     /// Not mapped to the DB, does not depent on localisation and customer
-                                                                
 		public virtual double PulsesMeter     { get; set; }		/// # of water meter or heat meter pulses
 		public virtual double PulsesMaster	  { get; set; }		/// # of reference flowmeter pulses (gated by this water meter pulses)
        public virtual double PulsesPerLiter  { get; set; }		/// [l ^ -1], in case of heat meters (CompoundMeterId==5) pulses per kWh in [kWh ^ -1]
@@ -40,7 +38,7 @@ namespace Results.Entities
 		public virtual double   FlowMass()    { return TestRslt.FlowMass; }			/// [kg/h]
 		public virtual double   FlowVolume()  { return TestRslt.FlowVolume; }		/// [m3/h]
 		public virtual double   ErrorMaster() { return TestRslt.ErrorMaster; }		/// [%]
-		public virtual double   DensityLine() { return TestRslt.DensityLine; }
+		public virtual double   DensityOut()  { return TestRslt.DensityOut; }
 		public virtual Components Components(){ return TestRslt.Components; }
 		/// 
 		public virtual TestData TestData()    { return TestRslt.TestData; }
@@ -77,7 +75,19 @@ namespace Results.Entities

 		public virtual string PassedColorStr()
        {
-            return Utils.PassedColorStr(Passed, Evaluate());
+#if PUCHONG_PT200
+			if (!Evaluate())	return Passed ? "OK|White" : "NG|White";
+			else				return Passed ? "OK|Green" : "NG|Red";
+#elif LANG_PL
+			if (!Evaluate())	return Passed ? "+|White" : "-|White";
+            else                return Passed ? "+|Green" : "-|Red";
+#elif LANG_RU
+            if (!Evaluate())    return Passed ? "годен|White" : "негоден|White";
+            else                return Passed ? "годен|Green" : "негоден|Red";
+#else
+            if (!Evaluate())    return Passed ? "OK|White" : "NOK|White";
+            else                return Passed ? "OK|Green" : "NOK|Red";
+#endif
 		}

        public MeterTestRslt()
@@ -98,8 +108,6 @@ namespace Results.Entities
        {
            if (src == null) return;

-            CompoundMeterId = src.CompoundMeterId;
-            RegReaderClass = src.RegReaderClass;
 		    PulsesMeter = src.PulsesMeter;
 		    PulsesMaster = src.PulsesMaster;
            PulsesPerLiter = src.PulsesPerLiter;
@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -14,13 +14,12 @@ namespace Results.Entities
 		public virtual Batch Batch { get; set; }
 		public virtual TestData TestData { get; set; }
 		public virtual Components Components { get; set; }
-        public virtual int Part { get; set; }
+		public virtual int Part { get; set; }
 		public virtual int RepetitionNr { get; set; }       /// Repetition number from the set of repeated tests (1...)
-        public virtual string MethodClass { get; set; }     /// Not mapped to the DB, does not depent on localisation and customer

 		/// Main results
 		public virtual bool TestDone { get; set; }
-        public virtual string Remark { get; set; }
+		public virtual string Remark { get; set; }
 		public virtual DateTime StartTime { get; set; }     /// Date and time of the test start
 		public virtual DateTime EndTime { get; set; }       /// Date and time of the test end
 		public virtual int FlowSetTime { get; set; }        /// [s]     Measurement time in seconds
@@ -32,7 +31,7 @@ namespace Results.Entities
 		public virtual double MassEndRaw { get; set; }		/// [kg]
 		public virtual double MassEnd { get; set; }			/// [kg]
 		public virtual double DensityIn { get; set; }		/// [kg/m3]
-		public virtual double DensityLine { get; set; }		/// [kg/m3]
+		public virtual double DensityOut { get; set; }		/// [kg/m3]
 		public virtual double DensityDiv { get; set; }		/// [kg/m3]
 		public virtual double Buoyancy { get; set; }
 		public virtual double FlowMass { get; set; }        /// [kg/h] calculated from conventional true value
@@ -110,7 +109,7 @@ namespace Results.Entities
        public virtual float FlowMax { get; set; }			/// [m3/h] 

        public virtual float Custom1  { get; set; }			/// [°C] T ref hi mean
-		public virtual float Custom2  { get; set; }			/// [°C] T ref hi start
+		public virtual float Custom2  { get; set; }			/// [°C] T ref hi start			
 		public virtual float Custom3  { get; set; }			/// [°C] T ref hi end
 		public virtual float Custom4  { get; set; }			/// [°C] T ref hi min
 		public virtual float Custom5  { get; set; }			/// [°C] T ref hi max
@@ -204,8 +203,7 @@ namespace Results.Entities
 		    Components = src.Components;    /// ???
 		    Part = src.Part;
 		    RepetitionNr = src.RepetitionNr;
-            MethodClass = src.MethodClass;
-            TestDone = src.TestDone;
+			TestDone = src.TestDone;
 			Remark = src.Remark;
 		    StartTime = src.StartTime;
 		    EndTime = src.EndTime;
@@ -218,7 +216,7 @@ namespace Results.Entities
 		    MassEndRaw = src.MassEndRaw;
 		    MassEnd = src.MassEnd;
 		    DensityIn = src.DensityIn;
-		    DensityLine = src.DensityLine;
+		    DensityOut = src.DensityOut;
 		    DensityDiv = src.DensityDiv;
 		    Buoyancy = src.Buoyancy;
 		    FlowMass = src.FlowMass;
@@ -315,7 +313,7 @@ namespace Results.Entities
 			return string.Format("TestRslt: Part={0} RepetitionNr={1} TestDone={2} Remark={3} StartTime={4} EndTime={5} FlowSetTime={6} TestTime={7} PulsesMaster={8} ConstMaster={9} MassStartRaw={10} MassStart={11} MassEndRaw={12} MassEnd={13} DensityIn={14} DensityOut={15} DensityDiv={16} Buoyancy={17} FlowMass={18} FlowVolume={19} VolumeCTV={20} VolumeMaster={21} ErrorMaster={22} DiverterStart={85} DiverterEnd={86} ErrorFlags={23} ErrorFlagsMd={24} AmbTempMean={25} AmbTempStart={26} AmbTempEnd={27} AmbTempMin={28} AmbTempMax={29} AmbPressMean={30} AmbPressStart={31} AmbPressEnd={32} AmbPressMin={33}  AmbPressMax={34} AmbHumiMean={35} AmbHumiStart={36} AmbHumiEnd={37} AmbHumiMin={38} AmbHumiMax={39} PressUpMean={40} PressUpStart={41} PressUpEnd={42} PressUpMin={43} PressUpMax={44} PressDownMean={45} PressDownStart={46} PressDownEnd={47} PressDownMin={48} PressDownMax={49} PressDeltaMean={50} PressDeltaStart={51} PressDeltaEnd={52} PressDeltaMin={53} PressDeltaMax={54} TempUpMean={55} TempUpStart={56} TempUpEnd={57} TempUpMin={58} TempUpMax={59} TempDownMean={60} TempDownStart={61} TempDownEnd={62} TempDownMin={63} TempDownMax={64} TempDivMean={65} TempDivStart={66} TempDivEnd={67} TempDivMin={68} TempDivMax={69} FlowMean={70} FlowStart={71} FlowEnd={72} FlowMin={73} FlowMax={74} Custom1={75} Custom2={76} Custom3={77} Custom4={78} Custom5={79} Custom6={80} Custom7={81} Custom8={82} Custom9={83} Custom10={84}", 
 								Part, RepetitionNr, TestDone, Remark, StartTime, EndTime, FlowSetTime, TestTime,
 								PulsesMaster, ConstMaster, MassStartRaw, MassStart, MassEndRaw, MassEnd,
-								DensityIn, DensityLine, DensityDiv, Buoyancy, FlowMass, FlowVolume,
+								DensityIn, DensityOut, DensityDiv, Buoyancy, FlowMass, FlowVolume,
 								VolumeCTV, VolumeMaster, ErrorMaster, ErrorFlags, ErrorFlagsMd, 
 								AmbTempMean, AmbTempStart, AmbTempEnd, AmbTempMin, AmbTempMax,
 								AmbPressMean, AmbPressStart, AmbPressEnd, AmbPressMin, AmbPressMax,
@@ -173,7 +173,15 @@ namespace Results.Entities

        public virtual string PassedColorStr()
        {
-            return Utils.PassedColorStr(Passed, true);
+#if PUCHONG_PT200
+			return Passed ? "OK|Green" : "NG|Red";
+#elif LANG_PL
+            return Passed ? "+|Green" : "-|Red";
+#elif LANG_RU
+            return Passed ? "годен|Green" : "негоден|Red";
+#else
+            return Passed ? "OK|Green" : "NOK|Red";
+#endif
        }


@@ -150,17 +150,17 @@ namespace Results.Forms
                {
                    if (results.WaterMeters[i] != null && !results.WaterMeters[i].Disabled)
                    {
-                        ListView lview = (TestsArrangement == TestsArrangement.Rows)
-                                       ? GetResultsTestsAreRows(results.WaterMeters[i], i + 1)
-                                       : GetResultsTestsAreColumns(results.WaterMeters[i], i + 1);
-                        if (lview != null)
+                        if (TestsArrangement == TestsArrangement.Rows)
                        {
-                            flowLayoutPanel.Controls.Add(lview);
-                            if (first)
-                            {
-                                firstListView = lview;
-                                first = false;
-                            }
+                            ListView lview = GetResultsTestsAreRows(results.WaterMeters[i], i + 1);
+                            if (first) { firstListView = lview; first = false; }
+                            if (lview != null) flowLayoutPanel.Controls.Add(lview);
+                        }
+                        else
+                        {
+                            ListView lview = GetResultsTestsAreColumns(results.WaterMeters[i], i + 1);
+                            if (first) { firstListView = lview; first = false; }
+                            if (lview != null) flowLayoutPanel.Controls.Add(lview);
                        }
                    }
                }
@@ -318,7 +318,7 @@ namespace Results.Forms
                    if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Config.Entities.Publish.Never &&
 																			mtr.Publish() != Config.Entities.Publish.Internal)
                    {
-                        string str = item.Print(wMtr, mtr.Name());
+                        string str = items[i].Print(wMtr, mtr.Name());

                        string[] texts = str.Split(new char[] { '|' });
                        if (texts.Length == 1)
@@ -28,211 +28,210 @@
        /// </summary>
        private void InitializeComponent()
        {
-            this.availableTabControl = new System.Windows.Forms.TabControl();
-            this.tabPage1 = new System.Windows.Forms.TabPage();
-            this.availableByQuantityTreeView = new System.Windows.Forms.TreeView();
-            this.tabPage2 = new System.Windows.Forms.TabPage();
-            this.availableByCategoryTreeView = new System.Windows.Forms.TreeView();
-            this.tabPage3 = new System.Windows.Forms.TabPage();
-            this.availableAlphabeticTreeView = new System.Windows.Forms.TreeView();
-            this.downButton = new System.Windows.Forms.Button();
-            this.upButton = new System.Windows.Forms.Button();
-            this.selectedResultsListViewEx = new Results.Forms.ListViewEx();
-            this.removeAllButton = new System.Windows.Forms.Button();
-            this.removeButton = new System.Windows.Forms.Button();
-            this.addButton = new System.Windows.Forms.Button();
-            this.selectedResultsLabel = new System.Windows.Forms.Label();
-            this.availableResultsLabel = new System.Windows.Forms.Label();
-            this.availableTabControl.SuspendLayout();
-            this.tabPage1.SuspendLayout();
-            this.tabPage2.SuspendLayout();
-            this.tabPage3.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // availableTabControl
-            // 
-            this.availableTabControl.Controls.Add(this.tabPage1);
-            this.availableTabControl.Controls.Add(this.tabPage2);
-            this.availableTabControl.Controls.Add(this.tabPage3);
-            this.availableTabControl.Enabled = false;
-            this.availableTabControl.Location = new System.Drawing.Point(9, 33);
-            this.availableTabControl.Name = "availableTabControl";
-            this.availableTabControl.SelectedIndex = 0;
-            this.availableTabControl.Size = new System.Drawing.Size(206, 453);
-            this.availableTabControl.TabIndex = 59;
-            // 
-            // tabPage1
-            // 
-            this.tabPage1.Controls.Add(this.availableByQuantityTreeView);
-            this.tabPage1.Location = new System.Drawing.Point(4, 22);
-            this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(198, 427);
-            this.tabPage1.TabIndex = 0;
-            this.tabPage1.Text = "A...Z";
-            this.tabPage1.UseVisualStyleBackColor = true;
-            // 
-            // availableByQuantityTreeView
-            // 
-            this.availableByQuantityTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.availableByQuantityTreeView.Location = new System.Drawing.Point(3, 3);
-            this.availableByQuantityTreeView.Name = "availableByQuantityTreeView";
-            this.availableByQuantityTreeView.Size = new System.Drawing.Size(192, 421);
-            this.availableByQuantityTreeView.TabIndex = 0;
-            this.availableByQuantityTreeView.DoubleClick += new System.EventHandler(this.availableByQuantityTreeView_DoubleClick);
-            // 
-            // tabPage2
-            // 
-            this.tabPage2.Controls.Add(this.availableByCategoryTreeView);
-            this.tabPage2.Location = new System.Drawing.Point(4, 22);
-            this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage2.Size = new System.Drawing.Size(198, 427);
-            this.tabPage2.TabIndex = 1;
-            this.tabPage2.Text = "by quantity";
-            this.tabPage2.UseVisualStyleBackColor = true;
-            // 
-            // availableByCategoryTreeView
-            // 
-            this.availableByCategoryTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.availableByCategoryTreeView.Location = new System.Drawing.Point(3, 3);
-            this.availableByCategoryTreeView.Name = "availableByCategoryTreeView";
-            this.availableByCategoryTreeView.Size = new System.Drawing.Size(192, 421);
-            this.availableByCategoryTreeView.TabIndex = 0;
-            this.availableByCategoryTreeView.DoubleClick += new System.EventHandler(this.availableByCategoryTreeView_DoubleClick);
-            // 
-            // tabPage3
-            // 
-            this.tabPage3.Controls.Add(this.availableAlphabeticTreeView);
-            this.tabPage3.Location = new System.Drawing.Point(4, 22);
-            this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Size = new System.Drawing.Size(198, 427);
-            this.tabPage3.TabIndex = 2;
-            this.tabPage3.Text = "by category";
-            this.tabPage3.UseVisualStyleBackColor = true;
-            // 
-            // availableAlphabeticTreeView
-            // 
-            this.availableAlphabeticTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.availableAlphabeticTreeView.Location = new System.Drawing.Point(0, 0);
-            this.availableAlphabeticTreeView.Name = "availableAlphabeticTreeView";
-            this.availableAlphabeticTreeView.Size = new System.Drawing.Size(198, 427);
-            this.availableAlphabeticTreeView.TabIndex = 0;
-            this.availableAlphabeticTreeView.DoubleClick += new System.EventHandler(this.availableAlphabeticTreeView_DoubleClick);
-            // 
-            // downButton
-            // 
-            this.downButton.Enabled = false;
-            this.downButton.Location = new System.Drawing.Point(221, 351);
-            this.downButton.Name = "downButton";
-            this.downButton.Size = new System.Drawing.Size(93, 30);
-            this.downButton.TabIndex = 58;
-            this.downButton.Text = "Down";
-            this.downButton.UseVisualStyleBackColor = true;
-            this.downButton.Click += new System.EventHandler(this.downButton_Click);
-            // 
-            // upButton
-            // 
-            this.upButton.Enabled = false;
-            this.upButton.Location = new System.Drawing.Point(221, 315);
-            this.upButton.Name = "upButton";
-            this.upButton.Size = new System.Drawing.Size(93, 30);
-            this.upButton.TabIndex = 57;
-            this.upButton.Text = "Up";
-            this.upButton.UseVisualStyleBackColor = true;
-            this.upButton.Click += new System.EventHandler(this.upButton_Click);
-            // 
-            // selectedResultsListViewEx
-            // 
-            this.selectedResultsListViewEx.AllowColumnReorder = true;
-            this.selectedResultsListViewEx.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.selectedResultsListViewEx.DoubleClickActivation = false;
-            this.selectedResultsListViewEx.Enabled = false;
-            this.selectedResultsListViewEx.FullRowSelect = true;
-            this.selectedResultsListViewEx.GridLines = true;
-            this.selectedResultsListViewEx.Location = new System.Drawing.Point(322, 33);
-            this.selectedResultsListViewEx.Name = "selectedResultsListViewEx";
-            this.selectedResultsListViewEx.Size = new System.Drawing.Size(594, 453);
-            this.selectedResultsListViewEx.TabIndex = 56;
-            this.selectedResultsListViewEx.UseCompatibleStateImageBehavior = false;
-            this.selectedResultsListViewEx.View = System.Windows.Forms.View.Details;
-            this.selectedResultsListViewEx.DoubleClick += new System.EventHandler(this.selectedResultsListViewEx_DoubleClick);
-            // 
-            // removeAllButton
-            // 
-            this.removeAllButton.Enabled = false;
-            this.removeAllButton.Location = new System.Drawing.Point(221, 223);
-            this.removeAllButton.Name = "removeAllButton";
-            this.removeAllButton.Size = new System.Drawing.Size(94, 30);
-            this.removeAllButton.TabIndex = 55;
-            this.removeAllButton.Text = "<< R&emove all";
-            this.removeAllButton.UseVisualStyleBackColor = true;
-            this.removeAllButton.Visible = false;
-            this.removeAllButton.Click += new System.EventHandler(this.removeAllButton_Click);
-            // 
-            // removeButton
-            // 
-            this.removeButton.Enabled = false;
-            this.removeButton.Location = new System.Drawing.Point(221, 188);
-            this.removeButton.Name = "removeButton";
-            this.removeButton.Size = new System.Drawing.Size(93, 30);
-            this.removeButton.TabIndex = 54;
-            this.removeButton.Text = "< &Remove";
-            this.removeButton.UseVisualStyleBackColor = true;
-            this.removeButton.Click += new System.EventHandler(this.removeButton_Click);
-            // 
-            // addButton
-            // 
-            this.addButton.Enabled = false;
-            this.addButton.Location = new System.Drawing.Point(221, 153);
-            this.addButton.Name = "addButton";
-            this.addButton.Size = new System.Drawing.Size(93, 30);
-            this.addButton.TabIndex = 53;
-            this.addButton.Text = "&Add >";
-            this.addButton.UseVisualStyleBackColor = true;
-            this.addButton.Click += new System.EventHandler(this.addButton_Click);
-            // 
-            // selectedResultsLabel
-            // 
-            this.selectedResultsLabel.AutoSize = true;
-            this.selectedResultsLabel.Location = new System.Drawing.Point(321, 11);
-            this.selectedResultsLabel.Name = "selectedResultsLabel";
-            this.selectedResultsLabel.Size = new System.Drawing.Size(85, 13);
-            this.selectedResultsLabel.TabIndex = 52;
-            this.selectedResultsLabel.Text = "Selected results:";
-            // 
-            // availableResultsLabel
-            // 
-            this.availableResultsLabel.AutoSize = true;
-            this.availableResultsLabel.Location = new System.Drawing.Point(11, 11);
-            this.availableResultsLabel.Name = "availableResultsLabel";
-            this.availableResultsLabel.Size = new System.Drawing.Size(86, 13);
-            this.availableResultsLabel.TabIndex = 51;
-            this.availableResultsLabel.Text = "Available results:";
-            // 
-            // ResultsConfigCtrl
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.availableTabControl);
-            this.Controls.Add(this.downButton);
-            this.Controls.Add(this.upButton);
-            this.Controls.Add(this.selectedResultsListViewEx);
-            this.Controls.Add(this.removeAllButton);
-            this.Controls.Add(this.removeButton);
-            this.Controls.Add(this.addButton);
-            this.Controls.Add(this.selectedResultsLabel);
-            this.Controls.Add(this.availableResultsLabel);
-            this.Name = "ResultsConfigCtrl";
-            this.Size = new System.Drawing.Size(925, 496);
-            this.Load += new System.EventHandler(this.ResultsConfigCtrl_Load);
-            this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.ResultsConfigCtrl_KeyPress);
-            this.availableTabControl.ResumeLayout(false);
-            this.tabPage1.ResumeLayout(false);
-            this.tabPage2.ResumeLayout(false);
-            this.tabPage3.ResumeLayout(false);
-            this.ResumeLayout(false);
-            this.PerformLayout();
+			this.availableTabControl = new System.Windows.Forms.TabControl();
+			this.tabPage1 = new System.Windows.Forms.TabPage();
+			this.availableByQuantityTreeView = new System.Windows.Forms.TreeView();
+			this.tabPage2 = new System.Windows.Forms.TabPage();
+			this.availableByCategoryTreeView = new System.Windows.Forms.TreeView();
+			this.tabPage3 = new System.Windows.Forms.TabPage();
+			this.availableAlphabeticTreeView = new System.Windows.Forms.TreeView();
+			this.downButton = new System.Windows.Forms.Button();
+			this.upButton = new System.Windows.Forms.Button();
+			this.selectedResultsListViewEx = new Results.Forms.ListViewEx();
+			this.removeAllButton = new System.Windows.Forms.Button();
+			this.removeButton = new System.Windows.Forms.Button();
+			this.addButton = new System.Windows.Forms.Button();
+			this.selectedResultsLabel = new System.Windows.Forms.Label();
+			this.availableResultsLabel = new System.Windows.Forms.Label();
+			this.availableTabControl.SuspendLayout();
+			this.tabPage1.SuspendLayout();
+			this.tabPage2.SuspendLayout();
+			this.tabPage3.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// availableTabControl
+			// 
+			this.availableTabControl.Controls.Add(this.tabPage1);
+			this.availableTabControl.Controls.Add(this.tabPage2);
+			this.availableTabControl.Controls.Add(this.tabPage3);
+			this.availableTabControl.Enabled = false;
+			this.availableTabControl.Location = new System.Drawing.Point(9, 33);
+			this.availableTabControl.Name = "availableTabControl";
+			this.availableTabControl.SelectedIndex = 0;
+			this.availableTabControl.Size = new System.Drawing.Size(206, 453);
+			this.availableTabControl.TabIndex = 59;
+			// 
+			// tabPage1
+			// 
+			this.tabPage1.Controls.Add(this.availableByQuantityTreeView);
+			this.tabPage1.Location = new System.Drawing.Point(4, 22);
+			this.tabPage1.Name = "tabPage1";
+			this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+			this.tabPage1.Size = new System.Drawing.Size(198, 427);
+			this.tabPage1.TabIndex = 0;
+			this.tabPage1.Text = "A...Z";
+			this.tabPage1.UseVisualStyleBackColor = true;
+			// 
+			// availableAlphabeticTreeView
+			// 
+			this.availableByQuantityTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.availableByQuantityTreeView.Location = new System.Drawing.Point(3, 3);
+			this.availableByQuantityTreeView.Name = "availableAlphabeticTreeView";
+			this.availableByQuantityTreeView.Size = new System.Drawing.Size(192, 421);
+			this.availableByQuantityTreeView.TabIndex = 0;
+			this.availableByQuantityTreeView.DoubleClick += new System.EventHandler(this.availableByQuantityTreeView_DoubleClick);
+			// 
+			// tabPage2
+			// 
+			this.tabPage2.Controls.Add(this.availableByCategoryTreeView);
+			this.tabPage2.Location = new System.Drawing.Point(4, 22);
+			this.tabPage2.Name = "tabPage2";
+			this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+			this.tabPage2.Size = new System.Drawing.Size(198, 427);
+			this.tabPage2.TabIndex = 1;
+			this.tabPage2.Text = "by quantity";
+			this.tabPage2.UseVisualStyleBackColor = true;
+			// 
+			// availableByQuantityTreeView
+			// 
+			this.availableByCategoryTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.availableByCategoryTreeView.Location = new System.Drawing.Point(3, 3);
+			this.availableByCategoryTreeView.Name = "availableByQuantityTreeView";
+			this.availableByCategoryTreeView.Size = new System.Drawing.Size(192, 421);
+			this.availableByCategoryTreeView.TabIndex = 0;
+			this.availableByCategoryTreeView.DoubleClick += new System.EventHandler(this.availableByCategoryTreeView_DoubleClick);
+			// 
+			// tabPage3
+			// 
+			this.tabPage3.Controls.Add(this.availableAlphabeticTreeView);
+			this.tabPage3.Location = new System.Drawing.Point(4, 22);
+			this.tabPage3.Name = "tabPage3";
+			this.tabPage3.Size = new System.Drawing.Size(198, 427);
+			this.tabPage3.TabIndex = 2;
+			this.tabPage3.Text = "by category";
+			this.tabPage3.UseVisualStyleBackColor = true;
+			// 
+			// availableByCategoryTreeView
+			// 
+			this.availableAlphabeticTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.availableAlphabeticTreeView.Location = new System.Drawing.Point(0, 0);
+			this.availableAlphabeticTreeView.Name = "availableByCategoryTreeView";
+			this.availableAlphabeticTreeView.Size = new System.Drawing.Size(198, 427);
+			this.availableAlphabeticTreeView.TabIndex = 0;
+			this.availableAlphabeticTreeView.DoubleClick += new System.EventHandler(this.availableAlphabeticTreeView_DoubleClick);
+			// 
+			// downButton
+			// 
+			this.downButton.Enabled = false;
+			this.downButton.Location = new System.Drawing.Point(221, 351);
+			this.downButton.Name = "downButton";
+			this.downButton.Size = new System.Drawing.Size(93, 30);
+			this.downButton.TabIndex = 58;
+			this.downButton.Text = "Down";
+			this.downButton.UseVisualStyleBackColor = true;
+			this.downButton.Click += new System.EventHandler(this.downButton_Click);
+			// 
+			// upButton
+			// 
+			this.upButton.Enabled = false;
+			this.upButton.Location = new System.Drawing.Point(221, 315);
+			this.upButton.Name = "upButton";
+			this.upButton.Size = new System.Drawing.Size(93, 30);
+			this.upButton.TabIndex = 57;
+			this.upButton.Text = "Up";
+			this.upButton.UseVisualStyleBackColor = true;
+			this.upButton.Click += new System.EventHandler(this.upButton_Click);
+			// 
+			// selectedResultsListViewEx
+			// 
+			this.selectedResultsListViewEx.AllowColumnReorder = true;
+			this.selectedResultsListViewEx.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.selectedResultsListViewEx.DoubleClickActivation = false;
+			this.selectedResultsListViewEx.Enabled = false;
+			this.selectedResultsListViewEx.FullRowSelect = true;
+			this.selectedResultsListViewEx.GridLines = true;
+			this.selectedResultsListViewEx.Location = new System.Drawing.Point(322, 33);
+			this.selectedResultsListViewEx.Name = "selectedResultsListViewEx";
+			this.selectedResultsListViewEx.Size = new System.Drawing.Size(594, 453);
+			this.selectedResultsListViewEx.TabIndex = 56;
+			this.selectedResultsListViewEx.UseCompatibleStateImageBehavior = false;
+			this.selectedResultsListViewEx.View = System.Windows.Forms.View.Details;
+			this.selectedResultsListViewEx.DoubleClick += new System.EventHandler(this.selectedResultsListViewEx_DoubleClick);
+			// 
+			// removeAllButton
+			// 
+			this.removeAllButton.Enabled = false;
+			this.removeAllButton.Location = new System.Drawing.Point(221, 223);
+			this.removeAllButton.Name = "removeAllButton";
+			this.removeAllButton.Size = new System.Drawing.Size(94, 30);
+			this.removeAllButton.TabIndex = 55;
+			this.removeAllButton.Text = "<< R&emove all";
+			this.removeAllButton.UseVisualStyleBackColor = true;
+			this.removeAllButton.Click += new System.EventHandler(this.removeAllButton_Click);
+			// 
+			// removeButton
+			// 
+			this.removeButton.Enabled = false;
+			this.removeButton.Location = new System.Drawing.Point(221, 188);
+			this.removeButton.Name = "removeButton";
+			this.removeButton.Size = new System.Drawing.Size(93, 30);
+			this.removeButton.TabIndex = 54;
+			this.removeButton.Text = "< &Remove";
+			this.removeButton.UseVisualStyleBackColor = true;
+			this.removeButton.Click += new System.EventHandler(this.removeButton_Click);
+			// 
+			// addButton
+			// 
+			this.addButton.Enabled = false;
+			this.addButton.Location = new System.Drawing.Point(221, 153);
+			this.addButton.Name = "addButton";
+			this.addButton.Size = new System.Drawing.Size(93, 30);
+			this.addButton.TabIndex = 53;
+			this.addButton.Text = "&Add >";
+			this.addButton.UseVisualStyleBackColor = true;
+			this.addButton.Click += new System.EventHandler(this.addButton_Click);
+			// 
+			// selectedResultsLabel
+			// 
+			this.selectedResultsLabel.AutoSize = true;
+			this.selectedResultsLabel.Location = new System.Drawing.Point(321, 11);
+			this.selectedResultsLabel.Name = "selectedResultsLabel";
+			this.selectedResultsLabel.Size = new System.Drawing.Size(85, 13);
+			this.selectedResultsLabel.TabIndex = 52;
+			this.selectedResultsLabel.Text = "Selected results:";
+			// 
+			// availableResultsLabel
+			// 
+			this.availableResultsLabel.AutoSize = true;
+			this.availableResultsLabel.Location = new System.Drawing.Point(11, 11);
+			this.availableResultsLabel.Name = "availableResultsLabel";
+			this.availableResultsLabel.Size = new System.Drawing.Size(86, 13);
+			this.availableResultsLabel.TabIndex = 51;
+			this.availableResultsLabel.Text = "Available results:";
+			// 
+			// ResultsConfigCtrl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.Controls.Add(this.availableTabControl);
+			this.Controls.Add(this.downButton);
+			this.Controls.Add(this.upButton);
+			this.Controls.Add(this.selectedResultsListViewEx);
+			this.Controls.Add(this.removeAllButton);
+			this.Controls.Add(this.removeButton);
+			this.Controls.Add(this.addButton);
+			this.Controls.Add(this.selectedResultsLabel);
+			this.Controls.Add(this.availableResultsLabel);
+			this.Name = "ResultsConfigCtrl";
+			this.Size = new System.Drawing.Size(925, 496);
+			this.Load += new System.EventHandler(this.ResultsConfigCtrl_Load);
+			this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.ResultsConfigCtrl_KeyPress);
+			this.availableTabControl.ResumeLayout(false);
+			this.tabPage1.ResumeLayout(false);
+			this.tabPage2.ResumeLayout(false);
+			this.tabPage3.ResumeLayout(false);
+			this.ResumeLayout(false);
+			this.PerformLayout();

        }

@@ -193,32 +193,21 @@ namespace Results

        ResultOrErrorFlags,             /// 169, PL specific result

-        T_up_min,                       /// 170
-        T_up_max,                       /// 171
-        T_down_min,                     /// 172
-        T_down_max,                     /// 173
-        T_div_min,                      /// 174
-        T_div_max,                      /// 175
-        P_up_min,                       /// 176
-        P_up_max,                       /// 177
-        P_down_min,                     /// 178
-        P_down_max,                     /// 179
-        P_delta_min,                    /// 180
-        P_delta_max,                    /// 181
+        T_up_min,
+        T_up_max,
+        T_down_min,
+        T_down_max,
+        T_div_min,
+        T_div_max,
+        P_up_min,
+        P_up_max,
+        P_down_min,
+        P_down_max,
+        P_delta_min,
+        P_delta_max,

-        T_rho_0,                        /// 182
-        Rho_Wa_calc,                    /// 183
-
-        Formatted_WM_ID,                /// 184, Formated WM ID string:
-                                        ///      {0}=start DateTime {1}-end DateTime, {2}=batch nr., {3}=wm pos.(1..max), {4}=s/n string
-        E21,							/// 185
-
-        T_line_mean,					/// 186
-        T_line_start,					/// 187
-        T_line_end,						/// 188
-        T_line_avg,						/// 189
-        T_line_min,					    /// 190
-        T_line_max,					    /// 191
+        T_rho_0,
+        Rho_Wa_calc,

        Count,
    }
@@ -99,7 +99,7 @@ namespace Results
 			AllItems.Add(new ItemSpec("Procedure name", Strings.Procedure, x => x.ProcedureName(), (x, y, z) => z.ProcedureName(), (x, z) => z.ProcedureName()));
 			AllItems.Add(new ItemSpec("Batch number", Strings.Batch_nr, x => x.BatchNr().ToString(), (x, y, z) => z.BatchNr().ToString(), (x, z) => z.BatchNr().ToString()));
 			AllItems.Add(new ItemSpec("Test method", Strings.Test_method, x => x.Method(), (x, y, z) => z.Method(), (x, z) => z.Method()));
-			AllItems.Add(new ItemSpec("Density", Strings.Density, x => x.DensityLine().ToString("F1"), (x, y, z) => z.DensityLine().ToString("F1"), (x, z) => z.DensityLine().ToString("F1")));	/// [kg/m3]
+			AllItems.Add(new ItemSpec("Density", Strings.Density, x => x.DensityOut().ToString("F1"), (x, y, z) => z.DensityOut().ToString("F1"), (x, z) => z.DensityOut().ToString("F1")));	/// [kg/m3]

 			/// Target values
 			AllItems.Add(new ItemSpec("Q from", Strings.Q_from + " [m3/h]", x => x.Qfrom().ToString("F3"), (x, y, z) => z.Qfrom().ToString("F3"), (x, z) => z.Qfrom().ToString("F3")));
@@ -32,7 +32,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.DensityOut);
 			Map(x => x.DensityDiv);
 			Map(x => x.Buoyancy);
 			Map(x => x.FlowMass);
@@ -27,9 +27,7 @@ namespace Results.Output.Printers.Enhanced
 		readonly int SpacingOneAndHalf;
 		readonly int SpacingOne4Header;
 		readonly int SpacingOneAndHalf4Header;
-
-        readonly int SpacingOne4Footer;
-
+		
 		int CommonTop;			/// = TitleY + 60
 		int BodyTop;			/// = HdrTop + 160
 										/// 
@@ -39,10 +37,9 @@ namespace Results.Output.Printers.Enhanced
 		/// <summary>
 		/// Property variable for the Font the user wishes to use
 		/// </summary>
-        Font titleFont;
-        Font headerFont;
-        Font font;
-        Font footerFont;
+		Font font;
+		Font headerFont;
+		Font titleFont;

 		///
 		/// Data to print
@@ -73,12 +70,11 @@ namespace Results.Output.Printers.Enhanced
 		/// Constructor
 		/// </summary>
 		/// <param name="textToPrint">Text to be printed</param>
-		public EnhancedPrintDocument(Results.Entities.Batch batch, EnhancedPrinterCfg cfg, string documentName)
+		public EnhancedPrintDocument(Results.Entities.Batch batch, EnhancedPrinterCfg cfg)
 		{
 			this.batch = batch;
-			this.cfg = cfg;
-            DocumentName = documentName;

+			this.cfg = cfg;
 			topMargin = cfg.TopMargin;
 			bottomMargin = cfg.BottomMargin;
 			leftMargin = cfg.LeftMargin;
@@ -92,7 +88,6 @@ namespace Results.Output.Printers.Enhanced
 			titleFont = new Font((cfg.TitFntFml != null ? cfg.TitFntFml : "Arial"), (cfg.TitFntSz > 0 ? cfg.TitFntSz : 10), (FontStyle)cfg.TitFntSty);
 			headerFont = new Font((cfg.HdrFntFml != null ? cfg.HdrFntFml : "Arial"), (cfg.HdrFntSz > 0 ? cfg.HdrFntSz : 10), (FontStyle)cfg.HdrFntSty);
 			font = new Font((cfg.BodyFntFml != null ? cfg.BodyFntFml : "Arial"), (cfg.BodyFntSz > 0 ? cfg.BodyFntSz : 10), (FontStyle)cfg.BodyFntSty);
-            footerFont = new Font((cfg.FooterFntFml != null ? cfg.FooterFntFml : "Arial"), (cfg.FooterFntSz > 0 ? cfg.FooterFntSz : 10), (FontStyle)cfg.FooterFntSty);

 			/// Set print area size and margins (in dots using 100 dpi)
 			DefaultPageSettings.Landscape = (cfg.PageOrientation == PageOrientation.Landscape);
@@ -112,7 +107,6 @@ namespace Results.Output.Printers.Enhanced
 			SpacingOneAndHalf = (3 * SpacingOne) / 2;
 			SpacingOne4Header = System.Windows.Forms.TextRenderer.MeasureText("Abcgq", headerFont).Height;
 			SpacingOneAndHalf4Header = (3 * SpacingOne4Header) / 2;
-            SpacingOne4Footer = System.Windows.Forms.TextRenderer.MeasureText("Abcgq", footerFont).Height;

 			/// Calculate the tests count
 			int testsCount = 0;
@@ -166,17 +160,11 @@ namespace Results.Output.Printers.Enhanced
 			/// Run base code
 			base.OnPrintPage(e);

-            if (!string.IsNullOrEmpty(cfg.Template))
-            {
-                string templatePath = Path.Combine("C:\\TBF\\Templates\\", cfg.Template);
-                if (File.Exists(templatePath))
-                {
-                    if (cfg.PageOrientation == PageOrientation.Portrait)
-                        e.Graphics.DrawImage(new Bitmap(Image.FromFile(templatePath), 827, 1169), new Rectangle(0, 0, 827, 1169));
-                    else
-                        e.Graphics.DrawImage(new Bitmap(Image.FromFile(templatePath), 1169, 827), new Rectangle(0, 0, 1169, 827));
-                }
-            }
+			if (File.Exists("C:\\TBF\\header.png"))
+			{
+				Image img = Image.FromFile("C:\\TBF\\header.png");
+				e.Graphics.DrawImage(new Bitmap(img), new Rectangle(0, 0, 827, 1169));
+			}

 			/// Use the StringFormat class for the text layout of our document
 			StringFormat format = new StringFormat(StringFormatFlags.LineLimit);
@@ -238,8 +226,8 @@ namespace Results.Output.Printers.Enhanced
 			///----------
 			///  Footer
 			///----------
-            int footerWidth = (int)e.Graphics.MeasureString(footer, footerFont).Width;
-            PrintFooterAt(e, leftMargin + (printWidth - footerWidth) / 2, topMargin + printHeight - 2 * SpacingOne, footer);
+            int footerWidth = (int)e.Graphics.MeasureString(footer, font).Width;
+            PrintAt(e, leftMargin + (printWidth - footerWidth) / 2, topMargin + printHeight - 2 * SpacingOne, footer);
            
            string pageNrText = string.Format("{0} {1}/{2}", Strings.Page, pageNr++, nrPages);
 			int pageNrWidth = (int)e.Graphics.MeasureString(pageNrText, font).Width;
@@ -343,6 +331,8 @@ namespace Results.Output.Printers.Enhanced
 		{
 			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, 2000, SpacingOne);
@@ -354,21 +344,12 @@ namespace Results.Output.Printers.Enhanced
 		{
 			PrintHeaderAt(e, p.X, p.Y, text);
 		}
+
+
 		void PrintHeaderAt(System.Drawing.Printing.PrintPageEventArgs e, int x, int y, string text)
 		{
 			RectangleF printArea = new RectangleF(x, y, 2000, SpacingOne4Header);
 			e.Graphics.DrawString(text, this.headerFont, Brushes.Black, printArea);
 		}
-
-
-        void PrintFooterAt(System.Drawing.Printing.PrintPageEventArgs e, Point p, string text)
-        {
-            PrintFooterAt(e, p.X, p.Y, text);
-        }
-        void PrintFooterAt(System.Drawing.Printing.PrintPageEventArgs e, int x, int y, string text)
-        {
-            RectangleF printArea = new RectangleF(x, y, 2000, SpacingOne4Footer);
-            e.Graphics.DrawString(text, this.footerFont, Brushes.Black, printArea);
-        }
-    }
+	}
 }
@@ -1,14 +1,17 @@
 ///
-/// Copyright (c) 2017 Sensus Slovensko a.s.
+/// Copyright (c) 2017 Sensus Metering Systems
 ///
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;

 namespace Results.Output.Printers.Enhanced
 {
 	public class EnhancedPrinterCfg
 	{
 		public Config.Entities.PageOrientation PageOrientation;
-        public string Template;
-        public int TopMargin;
+		public int TopMargin;
 		public int BottomMargin;
 		public int LeftMargin;
 		public string TitFntFml;
@@ -20,15 +23,11 @@ namespace Results.Output.Printers.Enhanced
 		public string BodyFntFml;
 		public int BodyFntSz;
 		public int BodyFntSty;
-        public string FooterFntFml;
-        public int FooterFntSz;
-        public int FooterFntSty;
-        public bool GoodOnly;
-        public bool SupressPrinting;		/// Bypass printing when true
+		public bool SupressPrinting;		/// Bypass printing when true
 		public System.Globalization.CultureInfo CultureInfo;
-        public string Header;				/// =Title
-        public string[] CommonItems;
+		public string[] CommonItems;
 		public string[] TestItems;
+		public string Header;				/// =Title
 		public string Footer;
 	}
 }
@@ -11,7 +11,7 @@ using Results.Resources;

 namespace Results.Output.Printers.OnePerMeter
 {
-	public class OnePerMeterPrintDocument : PrintersCommon
+	public class OnePerMeterPrintDocument : PrintDocument
 	{
        const float GapBetweenTableColumns = 10;
        const float GapBetweenCommonColumns = 10;
@@ -38,10 +38,9 @@ namespace Results.Output.Printers.OnePerMeter
 		/// <summary>
 		/// Property variable for the Font the user wishes to use
 		/// </summary>
-        Font titleFont;
-        Font headerFont;
-        Font font;
-        Font footerFont;
+		Font font;
+		Font headerFont;
+		Font titleFont;

 		///
 		/// Data to print
@@ -66,12 +65,11 @@ namespace Results.Output.Printers.OnePerMeter
 		/// Constructor
 		/// </summary>
 		/// <param name="textToPrint">Text to be printed</param>
-        public OnePerMeterPrintDocument(Results.Entities.Batch batch, OnePerMeterPrinterCfg cfg, Results.Entities.WaterMeter wm, string documentName)
+        public OnePerMeterPrintDocument(Results.Entities.Batch batch, OnePerMeterPrinterCfg cfg, Results.Entities.WaterMeter wm)
 		{
 			this.batch = batch;
 			this.cfg = cfg;
            this.wm = wm;
-            DocumentName = documentName;

 			topMargin = cfg.TopMargin;
 			bottomMargin = cfg.BottomMargin;
@@ -87,7 +85,6 @@ namespace Results.Output.Printers.OnePerMeter
 			titleFont = new Font((cfg.TitFntFml != null ? cfg.TitFntFml : "Arial"), (cfg.TitFntSz > 0 ? cfg.TitFntSz : 10), (FontStyle)cfg.TitFntSty);
 			headerFont = new Font((cfg.HdrFntFml != null ? cfg.HdrFntFml : "Arial"), (cfg.HdrFntSz > 0 ? cfg.HdrFntSz : 10), (FontStyle)cfg.HdrFntSty);
 			font = new Font((cfg.BodyFntFml != null ? cfg.BodyFntFml : "Arial"), (cfg.BodyFntSz > 0 ? cfg.BodyFntSz : 10), (FontStyle)cfg.BodyFntSty);
-            footerFont = new Font((cfg.FooterFntFml != null ? cfg.FooterFntFml : "Arial"), (cfg.FooterFntSz > 0 ? cfg.FooterFntSz : 10), (FontStyle)cfg.FooterFntSty);

 			/// Set print area size and margins (in dots using 100 dpi)
 			DefaultPageSettings.Landscape = (cfg.PageOrientation == PageOrientation.Landscape);
@@ -134,39 +131,26 @@ namespace Results.Output.Printers.OnePerMeter
            /// Run base code
            base.OnPrintPage(e);

-            if (!string.IsNullOrEmpty(cfg.Template))
-            {
-                string templatePath = Path.Combine("C:\\TBF\\Templates\\", cfg.Template);
-                if (File.Exists(templatePath))
-                {
-                    if (cfg.PageOrientation == PageOrientation.Portrait)
-                        e.Graphics.DrawImage(new Bitmap(Image.FromFile(templatePath), 827, 1169), new Rectangle(0, 0, 827, 1169));
-                    else
-                        e.Graphics.DrawImage(new Bitmap(Image.FromFile(templatePath), 1169, 827), new Rectangle(0, 0, 1169, 827));
-                }
-            }
-
            if (pageNr == 1)
            {
-                ///
-                ///  Print water meter picture
-                ///
-                if (cfg.ImgWid != 0 && cfg.ImgHgh != 0 && cfg.ImgFullPathName != null)
-                {
-                    try
-                    {
-                        e.Graphics.DrawImage(new Bitmap(Image.FromFile(cfg.ImgFullPathName), cfg.ImgWid, cfg.ImgHgh),
-                                             new Rectangle(cfg.ImgLeft, cfg.ImgTop, cfg.ImgWid, cfg.ImgHgh));
-                    }
-                    catch (Exception) { }       /// Cope with situations when file is missing or is not correct
-                }
-
                titleHeight = System.Windows.Forms.TextRenderer.MeasureText(header, titleFont).Height;
                commonTop = TitleY + titleHeight + spacingOne4Header;

                commonHeight = commonItems.Count * spacingOne;
                bodyTop = commonTop + commonHeight + spacingOne4Header;
+            }

+			if (File.Exists("C:\\TBF\\header.png"))
+			{
+				Image img = Image.FromFile("C:\\TBF\\header.png");
+				e.Graphics.DrawImage(new Bitmap(img), new Rectangle(0, 0, 827, 1169));
+			}
+
+			/// Use the StringFormat class for the text layout of our document
+			StringFormat format = new StringFormat(StringFormatFlags.LineLimit);
+
+			if (pageNr == 1)
+			{
 				///
 				///  Title
 				///
@@ -198,92 +182,53 @@ namespace Results.Output.Printers.OnePerMeter
 				/// Write aligned columns
 				for (int i = 0; i < Math.Min(leftColumn.Length, rightColumn.Length); i++)
 				{
-                    PrintAt(e, leftColumn[i], font, leftMargin, commonTop + spacingOne * i, maxWidth, 0, Alignment.Left, VertAlignment.Top);
-                    PrintAt(e, rightColumn[i], font, leftMargin + maxWidth + GapBetweenCommonColumns, commonTop + spacingOne * i, 0, 0, Alignment.Left, VertAlignment.Top);
+                    PrintAt(e, leftMargin, commonTop + spacingOne * i, maxWidth, leftColumn[i], font, Alignment.Left);
+                    PrintAt(e, leftMargin + maxWidth + GapBetweenCommonColumns, commonTop + spacingOne * i, 0, rightColumn[i], font, Alignment.Left);
 				}
 			}

 			///
 			///  Body
 			///
-            IList<string[]> tableRows;
-            IList<Alignment[]> horizAlignment;
-            IList<VertAlignment[]> vertAlignment;
            if (pageNr == 1)
            {
+                string[] tableHeader;
+                IList<string[]> tableRows;
+                Alignment[] itemAlignment;
+
                ///
                /// Prepare table content: tableHeader + tableRows + itemAlignment
                ///
                if (cfg.TestsAreRows)
                {
-                    GetContentTestsAreRows(wm, testItems, out tableRows, out horizAlignment, out vertAlignment);
-                    DrawTable(e, (float)leftMargin, bodyTop, tableRows, horizAlignment, vertAlignment,
-                                new TableStyle
-                                {
-                                    Font = font,
-                                    HeaderFont = headerFont,
-                                    MarginX = 5,
-                                    MarginY = 3,
-                                    LineWidth = 1,
-                                    TopHeadersCount = 1,
-                                    HorizLines = TableLines.All,
-                                    VertLines = TableLines.All
-                                });
+                    GetContentTestsAreRows(wm, testItems, out tableHeader, out tableRows, out itemAlignment);
                }
                else
                {
-                    GetContentTestsAreColumns(wm, testItems, out tableRows, out horizAlignment, out vertAlignment);
-                    DrawTable(e, (float)leftMargin, bodyTop, tableRows, horizAlignment, vertAlignment,
-                                new TableStyle
-                                {
-                                    Font = font,
-                                    HeaderFont = headerFont,
-                                    MarginX = 5,
-                                    MarginY = 3,
-                                    LineWidth = 1,
-                                    LeftHeadersCount = 1,
-                                    HorizLines = TableLines.All,
-                                    VertLines = TableLines.All
-                                });
+                    GetContentTestsAreColumns(wm, testItems, out tableHeader, out tableRows, out itemAlignment);
                }
+
+                DrawTable(e, (float)leftMargin, bodyTop, tableHeader, tableRows, itemAlignment);
            }
            else
            {
+                string[] tableHeader;
+                IList<string[]> tableRows;
+                Alignment[] itemAlignment;
+
                ///
                /// Prepare table content: tableHeader + tableRows + itemAlignment
                ///
                if (cfg.TestsAreRows2)
                {
-                    GetContentTestsAreRows(wm, testItems2, out tableRows, out horizAlignment, out vertAlignment);
-                    DrawTable(e, (float)leftMargin, bodyTop, tableRows, horizAlignment, vertAlignment,
-                                new TableStyle
-                                {
-                                    Font = font,
-                                    HeaderFont = headerFont,
-                                    MarginX = 5,
-                                    MarginY = 3,
-                                    LineWidth = 1,
-                                    TopHeadersCount = 1,
-                                    HorizLines = TableLines.All,
-                                    VertLines = TableLines.All
-                                });
+                    GetContentTestsAreRows(wm, testItems2, out tableHeader, out tableRows, out itemAlignment);
                }
                else
                {
-                    GetContentTestsAreColumns(wm, testItems2, out tableRows, out horizAlignment, out vertAlignment);
-                    DrawTable(e, (float)leftMargin, bodyTop, tableRows, horizAlignment, vertAlignment,
-                                new TableStyle
-                                {
-                                    Font = font,
-                                    HeaderFont = headerFont,
-                                    MarginX = 5,
-                                    MarginY = 3,
-                                    LineWidth = 1,
-                                    LeftHeadersCount = 1,
-                                    HorizLines = TableLines.All,
-                                    VertLines = TableLines.All
-                                });
+                    GetContentTestsAreColumns(wm, testItems2, out tableHeader, out tableRows, out itemAlignment);
                }
+
+                DrawTable(e, (float)leftMargin, (float)topMargin, tableHeader, tableRows, itemAlignment);
            }

            if (pageNr == nrPages)
@@ -291,8 +236,8 @@ namespace Results.Output.Printers.OnePerMeter
 				///
                ///  Footer on the last page
 				///
-                float footerWidth = e.Graphics.MeasureString(footer, footerFont).Width;
-                PrintAt(e, footer, footerFont, leftMargin, topMargin + printHeight - 2 * spacingOne, 0, 0, Alignment.Left, VertAlignment.Top);
+                float footerWidth = e.Graphics.MeasureString(footer, font).Width;
+	            PrintAt(e, leftMargin, topMargin + printHeight - 2 * spacingOne, 0, footer, font, Alignment.Left);
            }

            ///
@@ -300,7 +245,7 @@ namespace Results.Output.Printers.OnePerMeter
            ///
            string pageNrText = string.Format("{0} {1}/{2}", Strings.Page, pageNr, nrPages);
            float pageNrWidth = e.Graphics.MeasureString(pageNrText, font).Width;
-            PrintAt(e, pageNrText, font, leftMargin + (printWidth - pageNrWidth) / 2, topMargin + printHeight - spacingOne, 0, 0, Alignment.Left, VertAlignment.Top);
+            PrintAt(e, leftMargin + (printWidth - pageNrWidth) / 2, topMargin + printHeight - spacingOne, 0, pageNrText, font, Alignment.Left);

            e.HasMorePages = !(pageNr == nrPages);

@@ -308,104 +253,75 @@ namespace Results.Output.Printers.OnePerMeter
 		}


-        void GetContentTestsAreRows(Results.Entities.WaterMeter wm, IList<WMeterRsltItemSpec> items,
-                                    out IList<string[]> tableRows, out IList<Alignment[]> horizAlignments, out IList<VertAlignment[]> vertAlignments)
+        void GetContentTestsAreRows(Results.Entities.WaterMeter wm, IList<WMeterRsltItemSpec> items, out string[] tableHeader, out IList<string[]> tableRows, out Alignment[] itemAlignment)
        {
-            /// Top row contains column captions
-            
            int tableColumnsCount = items.Count;

            tableRows = new List<string[]>();
-            horizAlignments = new List<Alignment[]>();
-            vertAlignments = new List<VertAlignment[]>();
+            tableHeader = new string[tableColumnsCount];
+            itemAlignment = new Alignment[tableColumnsCount];

-
-            string[] tableHeader = new string[tableColumnsCount];
-            Alignment[] horizAlignment = new Alignment[tableColumnsCount];
-            VertAlignment[] vertAlignment = new VertAlignment[tableColumnsCount];
            for (int i = 0; i < tableColumnsCount; i++)
            {
                tableHeader[i] = items[i].Caption;
-                horizAlignment[i] = Alignment.Center;
-                vertAlignment[i] = VertAlignment.Middle;
+                itemAlignment[i] = items[i].Alignment;
            }
-            tableRows.Add(tableHeader);
-            horizAlignments.Add(horizAlignment);
-            vertAlignments.Add(vertAlignment);

-            WMeterRsltItemSpec.TableRowNr = 1;
+            WMeterRsltItemSpec.TableRowNr = 0;
            foreach (var mtr in wm.MeterTestRslts)
            {
                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
                {
                    string[] oneTableRow = new string[tableColumnsCount];
-                    horizAlignment = new Alignment[tableColumnsCount];
-                    vertAlignment = new VertAlignment[tableColumnsCount];
+                    WMeterRsltItemSpec.TableRowNr++;

                    for (int i = 0; i < tableColumnsCount; i++)
                    {
                        WMeterRsltItemSpec.TableColumnNr = i + 1;
                        oneTableRow[i] = items[i].Print(wm, mtr.Name()).Split(new char[] { '|' })[0];
-                        horizAlignment[i] = items[i].Alignment;
-                        vertAlignment[i] = VertAlignment.Middle;
                    }

                    tableRows.Add(oneTableRow);
-                    horizAlignments.Add(horizAlignment);
-                    vertAlignments.Add(vertAlignment);
-
-                    WMeterRsltItemSpec.TableRowNr++;
                }
            }
        }


-        void GetContentTestsAreColumns(Results.Entities.WaterMeter wm, IList<WMeterRsltItemSpec> items,
-                                       out IList<string[]> tableRows, out IList<Alignment[]> horizAlignments, out IList<VertAlignment[]> vertAlignments)
+        void GetContentTestsAreColumns(Results.Entities.WaterMeter wm, IList<WMeterRsltItemSpec> items, out string[] tableHeader, out IList<string[]> tableRows, out Alignment[] itemAlignment)
        {
-            /// Left column contains row captions
-
-            ///
-            /// Calculate columns count
-            ///
-            int tableColumnsCount = 1;          /// Left column contains item caption                         
+            int tableColumnsCount = 1;
            foreach (var mtr in wm.MeterTestRslts)
            {
                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
                {
-                    tableColumnsCount++;        /// One additional column for each test to be published
+                    tableColumnsCount++;
                }
            }

-            ///
-            /// Alignment of columns
-            ///
            tableRows = new List<string[]>();
-            horizAlignments = new List<Alignment[]>();
-            vertAlignments = new List<VertAlignment[]>();
-
+            tableHeader = new string[tableColumnsCount];
+            itemAlignment = new Alignment[tableColumnsCount];
+            
+            tableHeader[0] = string.Empty;
+            itemAlignment[0] = Alignment.Left;
            int columnsCount = 1;
            foreach (var mtr in wm.MeterTestRslts)
            {
                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
                {
+                    tableHeader[columnsCount] = mtr.Name();
+                    itemAlignment[columnsCount] = Alignment.Left;
                    columnsCount++;
                }
            }
            
-            ///
-            /// Table content
-            ///
-            WMeterRsltItemSpec.TableRowNr = 1;
+            WMeterRsltItemSpec.TableRowNr = 0;
            for (int i = 0; i < items.Count; i++)
            {
                string[] oneTableRow = new string[tableColumnsCount];
-                Alignment[] horizAlignment = new Alignment[tableColumnsCount];
-                VertAlignment[] vertAlignment = new VertAlignment[tableColumnsCount];
+                WMeterRsltItemSpec.TableRowNr++;

                oneTableRow[0] = items[i].Caption;
-                horizAlignment[0] = Alignment.Center;
-                vertAlignment[0] = VertAlignment.Middle;

                WMeterRsltItemSpec.TableColumnNr = 1;
                foreach (var mtr in wm.MeterTestRslts)
@@ -415,18 +331,130 @@ namespace Results.Output.Printers.OnePerMeter
                        /// Strip color information
                        oneTableRow[WMeterRsltItemSpec.TableColumnNr] =
                            items[i].Print(wm, mtr.Name()).Split(new char[] { '|' })[0];
-                        horizAlignment[WMeterRsltItemSpec.TableColumnNr] = items[i].Alignment;
-                        vertAlignment[WMeterRsltItemSpec.TableColumnNr] = VertAlignment.Middle;
-
                        WMeterRsltItemSpec.TableColumnNr++;
                    }
                }

                tableRows.Add(oneTableRow);
-                horizAlignments.Add(horizAlignment);
-                vertAlignments.Add(vertAlignment);
+            }
+        }

-                WMeterRsltItemSpec.TableRowNr++;
+
+        float DrawTable(System.Drawing.Printing.PrintPageEventArgs e, float left, float top, string[] header, IList<string[]> rows, Alignment[] alignment)
+        {
+            int tblColumnsCount = header.Length;
+
+            float[] columnWidth = new float[tblColumnsCount];
+            float[] columnPos = new float[tblColumnsCount + 1];
+            columnPos[0] = left;
+
+            ///
+            /// Measure table column widths and header height
+            /// 
+            float headerHeight = 0;
+            for (int i = 0; i < tblColumnsCount; i++)
+            {
+                SizeF size = e.Graphics.MeasureString(header[i], headerFont);
+                columnWidth[i] = (int)(size.Width + 0.99f);
+                if (size.Height > headerHeight) headerHeight = (int)(size.Height + 0.99f);
+
+                foreach (var tableRow in rows)
+                {
+                    int width = (int)(e.Graphics.MeasureString(tableRow[i], font).Width + 0.99f);
+                    if (width > columnWidth[i]) columnWidth[i] = width;
+                }
+                columnPos[i + 1] = columnPos[i] + columnWidth[i] + GapBetweenTableColumns;
+            }
+
+            float tableLeftX = columnPos[0];
+            float tableRightX = columnPos[tblColumnsCount] - GapBetweenTableColumns;
+
+            /// Horizontal line
+            float horY = top + 1.5f * spacingOne4Header;
+            e.Graphics.DrawLine(new Pen(Color.Black, 2), new PointF(tableLeftX, horY), new PointF(tableRightX, horY));
+
+            ///
+            /// Draw table header
+            ///
+            for (int i = 0; i < tblColumnsCount; i++)
+            {
+                PrintAt(e, columnPos[i],
+                           top + 1.7f * spacingOne4Header,
+                           columnWidth[i],
+                           header[i],
+                           headerFont,
+                           Alignment.Center);
+            }
+            /// Horizontal line
+            horY = top + 2.1f * spacingOne4Header + headerHeight;
+            e.Graphics.DrawLine(new Pen(Color.Black, 2), new PointF(tableLeftX, horY), new PointF(tableRightX, horY));
+
+            ///
+            /// Draw table body
+            ///
+            int rowsCount = 0;
+            foreach (var oneTableRow in rows)
+            {
+                for (int i = 0; i < tblColumnsCount; i++)
+                {
+                    PrintAt(e, columnPos[i],
+                               horY + 0.2f * spacingOne4Header + spacingOne * rowsCount,
+                               columnWidth[i],
+                               oneTableRow[i],
+                               font,
+                               alignment[i]);
+                }
+                rowsCount++;
+            }
+
+            /// Horizontal line
+            horY = horY + spacingOne * rowsCount + (3 * spacingOne4Header / 10);
+            e.Graphics.DrawLine(new Pen(Color.Black, 2), new PointF(tableLeftX, horY), new PointF(tableRightX, horY));
+
+            return horY - top + spacingOne;
+        }
+
+
+        static Font lastFont = null;
+        static float lastSpacing = 0;
+
+        SizeF Measure(System.Drawing.Printing.PrintPageEventArgs e, string paragraph, Font font)
+        {
+            if (font != lastFont)
+            {
+                lastFont = font;
+                lastSpacing = e.Graphics.MeasureString("Abcgq", font).Height;
+            }
+
+            string[] lines = paragraph.Split(new char[] { '~' });
+            float width = 0;
+            foreach (var line in lines)
+            {
+                float lineWid = e.Graphics.MeasureString(line, font).Width;
+                if (lineWid > width) width = lineWid;
+            }
+
+            return new SizeF(width, 0.8f * lines.Length * lastSpacing + 0.2f);
+        }
+
+
+        void PrintAt(System.Drawing.Printing.PrintPageEventArgs e, float x, float y, float width, string paragraph, Font font, Alignment alignment)
+        {
+            SizeF size = Measure(e, paragraph, font);
+
+            string[] lines = paragraph.Split(new char[] { '~' });
+            foreach (var line in lines)
+            {
+                float xx;
+                switch (alignment)
+                {
+                    default:
+                    case Alignment.Left: xx = x; break;
+                    case Alignment.Center: xx = x + (width - e.Graphics.MeasureString(line, font).Width) / 2; break;
+                    case Alignment.Right: xx = x + width - e.Graphics.MeasureString(line, font).Width; break;
+                }
+                e.Graphics.DrawString(line, font, Brushes.Black, new PointF(xx, y));
+                y += 0.8f * lastSpacing;
            }
        }
    }
@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2017 Sensus Slovensko a.s.
+/// Copyright (c) 2017 Sensus Metering Systems
 ///

 namespace Results.Output.Printers.OnePerMeter
@@ -7,7 +7,6 @@ namespace Results.Output.Printers.OnePerMeter
 	public class OnePerMeterPrinterCfg
 	{
 		public Config.Entities.PageOrientation PageOrientation;
-        public string Template;
 		public int TopMargin;
 		public int BottomMargin;
 		public int LeftMargin;
@@ -20,9 +19,6 @@ namespace Results.Output.Printers.OnePerMeter
 		public string BodyFntFml;
 		public int BodyFntSz;
 		public int BodyFntSty;
-        public string FooterFntFml;
-        public int FooterFntSz;
-        public int FooterFntSty;
        public bool GoodOnly;
        public bool SupressPrinting;		/// Bypass printing when true
 		public System.Globalization.CultureInfo CultureInfo;
@@ -33,10 +29,5 @@ namespace Results.Output.Printers.OnePerMeter
 		public string Footer;
        public bool TestsAreRows;
        public bool TestsAreRows2;
-        public string ImgFullPathName;
-        public int ImgLeft;
-        public int ImgTop;
-        public int ImgWid;
-        public int ImgHgh;
    }
 }
@@ -1,225 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Printing;
-using Config.Entities;
-
-namespace Results.Output.Printers
-{
-    public enum TableLines
-    {
-        None,
-        FirstAndLast,
-        FirstSecondAndLast,
-        All,
-    }
-
-    public class TableStyle
-    {
-        public float MarginX;
-        public float MarginY;
-        public Font Font;
-        public Font HeaderFont;
-        public int TopHeadersCount;
-        public int LeftHeadersCount;
-        public float LineWidth;
-        public TableLines HorizLines;
-        public TableLines VertLines;
-    }
-
-    public class PrintersCommon : PrintDocument
-    {
-        protected SizeF MeasureTable(System.Drawing.Printing.PrintPageEventArgs e, IList<string[]> rows, TableStyle tableStyle)
-        {
-            SizeF retVal = new SizeF(0, 0);
-
-            if (rows == null || rows.Count == 0) return retVal;
-
-            int tblColumnsCount = rows[0].Length;
-
-            float[] columnWidth = new float[tblColumnsCount];
-            float[] rowHeight = new float[rows.Count];
-
-            ///
-            /// Measure table column widths and header height
-            /// 
-            for (int colIx = 0; colIx < tblColumnsCount; colIx++)
-            {
-                for (int rowIx = 0; rowIx < rows.Count; rowIx++)
-                {
-                    bool isHeader = (colIx < tableStyle.LeftHeadersCount) || (rowIx < tableStyle.TopHeadersCount);
-                    SizeF size = Measure(e, rows[rowIx][colIx], isHeader ? tableStyle.HeaderFont : tableStyle.Font);
-                    if (size.Width > columnWidth[colIx]) columnWidth[colIx] = size.Width;
-                    if (size.Height > rowHeight[rowIx]) rowHeight[rowIx] = size.Height;
-                }
-                retVal.Width += columnWidth[colIx] + 2 * tableStyle.MarginX;
-            }
-            for (int rowIx = 0; rowIx < rows.Count; rowIx++)
-            {
-                retVal.Height += rowHeight[rowIx] + 2 * tableStyle.MarginY;
-            }
-
-            return retVal;
-        }
-
-
-        protected float DrawTable(System.Drawing.Printing.PrintPageEventArgs e, float left, float top, IList<string[]> rows,
-                                  IList<Alignment[]> horizAlignments, IList<VertAlignment[]> vertAlignments, TableStyle tableStyle)
-        {
-            if (rows == null || rows.Count == 0) return top;
-
-            int tblColumnsCount = rows[0].Length;
-            float[] columnWidth = new float[tblColumnsCount];
-            float[] columnPos = new float[tblColumnsCount + 1];
-            float[] rowHeight = new float[rows.Count];
-            float[] rowPos = new float[rows.Count + 1];
-
-            ///
-            /// Measure table column widths and header height
-            /// 
-            columnPos[0] = left;
-            rowPos[0] = top;
-            for (int colIx = 0; colIx < tblColumnsCount; colIx++)
-            {
-                for (int rowIx = 0; rowIx < rows.Count; rowIx++)
-                {
-                    bool isHeader = (colIx < tableStyle.LeftHeadersCount) || (rowIx < tableStyle.TopHeadersCount);
-                    SizeF size = Measure(e, rows[rowIx][colIx], isHeader ? tableStyle.HeaderFont : tableStyle.Font);
-                    if (size.Width > columnWidth[colIx]) columnWidth[colIx] = size.Width;
-                    if (size.Height > rowHeight[rowIx]) rowHeight[rowIx] = size.Height;
-                }
-                columnPos[colIx + 1] = columnPos[colIx] + columnWidth[colIx] + 2 * tableStyle.MarginX + tableStyle.LineWidth;
-            }
-            for (int rowIx = 0; rowIx < rows.Count; rowIx++)
-            {
-                rowPos[rowIx + 1] = rowPos[rowIx] + rowHeight[rowIx] + 2 * tableStyle.MarginY + tableStyle.LineWidth;
-            }
-
-            /// Horizontal lines
-            float tableLeftX = left;
-            float tableRightX = columnPos[tblColumnsCount] + tableStyle.LineWidth;
-            if (tableStyle.HorizLines != TableLines.None)
-            {
-                for (int rowIx = 0; rowIx <= rows.Count; rowIx++)
-                {
-                    if (tableStyle.HorizLines == TableLines.All || rowIx == 0 || rowIx == rows.Count || (tableStyle.HorizLines == TableLines.FirstSecondAndLast && rowIx == 1))
-                    {
-                        e.Graphics.DrawLine(new Pen(Color.Black, tableStyle.LineWidth), new PointF(tableLeftX, rowPos[rowIx] + tableStyle.LineWidth / 2), new PointF(tableRightX, rowPos[rowIx] + tableStyle.LineWidth / 2));
-                    }
-                }
-            }
-
-            /// Vertical lines
-            float tableTopY = top;
-            float tableBottomY = rowPos[rows.Count] + tableStyle.LineWidth;
-            if (tableStyle.VertLines != TableLines.None)
-            {
-                for (int colIx = 0; colIx <= tblColumnsCount; colIx++)
-                {
-                    if (tableStyle.VertLines == TableLines.All || colIx == 0 || colIx == rows.Count || (tableStyle.VertLines == TableLines.FirstSecondAndLast && colIx == 1))
-                    {
-                        e.Graphics.DrawLine(new Pen(Color.Black, tableStyle.LineWidth), new PointF(columnPos[colIx] + tableStyle.LineWidth / 2, tableTopY), new PointF(columnPos[colIx] + tableStyle.LineWidth / 2, tableBottomY));
-                    }
-                }
-            }
-
-            ///
-            /// Draw table body
-            ///
-            for (int rowIndex = 0; rowIndex < rows.Count; rowIndex++)
-            {
-                string[] oneTableRow = rows[rowIndex];
-                Alignment[] horizAlignment = horizAlignments[(horizAlignments.Count > rowIndex) ? rowIndex : 0];
-                VertAlignment[] vertAlignment = vertAlignments[(vertAlignments.Count > rowIndex) ? rowIndex : 0];
-                for (int colIndex = 0; colIndex < tblColumnsCount; colIndex++)
-                {
-                    bool isHeader = (colIndex < tableStyle.LeftHeadersCount) || (rowIndex < tableStyle.TopHeadersCount);
-                    PrintAt(e, oneTableRow[colIndex],
-                               isHeader ? tableStyle.HeaderFont : tableStyle.Font,
-                               columnPos[colIndex] + tableStyle.MarginX + tableStyle.LineWidth,
-                               rowPos[rowIndex] + tableStyle.MarginY,
-                               columnWidth[colIndex],
-                               rowHeight[rowIndex],
-                               horizAlignment[colIndex],
-                               vertAlignment[colIndex]);
-                }
-            }
-
-            return tableBottomY;
-        }
-
-
-        static Font lastFont = null;
-        static float lastSpacing = 0;
-
-        /// <summary>
-        /// Measure the size of a paragraph of text, lines are separated by '~'.
-        /// </summary>
-        /// <param name="e">PrintPageEventArgs</param>
-        /// <param name="text">Text, lines are separated by '~'</param>
-        /// <param name="font">Font</param>
-        /// <returns>Size of the paragraph of text</returns>
-        protected SizeF Measure(System.Drawing.Printing.PrintPageEventArgs e, string text, Font font)
-        {
-            if (font != lastFont)
-            {
-                lastFont = font;
-                lastSpacing = e.Graphics.MeasureString("Abcgq", font).Height;
-            }
-
-            string[] lines = text.Split(new char[] { '~' });
-            float width = 0;
-            foreach (var line in lines)
-            {
-                float lineWid = e.Graphics.MeasureString(line, font).Width;
-                if (lineWid > width) width = lineWid;
-            }
-
-            return new SizeF(width, 0.8f * lines.Length * lastSpacing + 0.2f);
-        }
-
-        /// <summary>
-        /// Print a paragraph of text, lines are separated by '~'.
-        /// </summary>
-        /// <param name="e">PrintPageEventArgs</param>
-        /// <param name="text">Text, lines are separated by '~'</param>
-        /// <param name="font">Font</param>
-        /// <param name="x">Position x</param>
-        /// <param name="y">Position y</param>
-        /// <param name="width">Width (required when alignment=Alignment.Center or alignment=Aligmenr.Right</param>
-        /// <param name="height">Height, 0 = no vertical centering</param>
-        /// <param name="horizAlignment">Horizontal alignment</param>
-        /// <param name="vertAlignment">Vertical alignment</param>
-        protected void PrintAt(System.Drawing.Printing.PrintPageEventArgs e, string text, Font font,
-                               float x, float y, float width, float height, Alignment horizAlignment, VertAlignment vertAlignment)
-        {
-            SizeF size = Measure(e, text, font);
-
-            string[] lines = text.Split(new char[] { '~' });
-
-            if (height <= size.Height) vertAlignment = VertAlignment.Top;
-            float y0;
-            switch (vertAlignment)
-            {
-                default:
-                case VertAlignment.Top:     y0 = y; break;
-                case VertAlignment.Middle:  y0 = y + (height - size.Height) / 2; break;
-                case VertAlignment.Bottom:  y0 = y + (height - size.Height); break;
-            }
-                     
-            foreach (var line in lines)
-            {
-                float x0;
-                switch (horizAlignment)
-                {
-                    default:
-                    case Alignment.Left:    x0 = x; break;
-                    case Alignment.Center:  x0 = x + (width - e.Graphics.MeasureString(line, font).Width) / 2; break;
-                    case Alignment.Right:   x0 = x + width - e.Graphics.MeasureString(line, font).Width; break;
-                }
-                e.Graphics.DrawString(line, font, Brushes.Black, new PointF(x0, y0));
-                y0 += 0.8f * lastSpacing;
-            }
-        }
-    }
-}
@@ -44,10 +44,9 @@ namespace Results.Output.Printers.Zapiska
 		/// <summary>
 		/// Property variable for the Font the user wishes to use
 		/// </summary>
-        Font titleFont;
-        Font headerFont;
-        Font font;
-        Font footerFont;
+		Font font;
+		Font headerFont;
+		Font titleFont;

 		///
 		/// Data to print
@@ -82,10 +81,9 @@ namespace Results.Output.Printers.Zapiska
 		/// Constructor
 		/// </summary>
 		/// <param name="textToPrint">Text to be printed</param>
-		public ZapiskaPrintDocument(Results.Entities.Batch batch, ZapiskaPrinterCfg cfg, string documentName)
+		public ZapiskaPrintDocument(Results.Entities.Batch batch, ZapiskaPrinterCfg cfg)
 		{
 			this.batch = batch;
-            DocumentName = documentName;

 			this.cfg = cfg;
 			topMargin = cfg.TopMargin;
@@ -106,7 +104,6 @@ namespace Results.Output.Printers.Zapiska
 			titleFont = new Font((cfg.TitFntFml != null ? cfg.TitFntFml : "Arial"), (cfg.TitFntSz > 0 ? cfg.TitFntSz : 10), (FontStyle)cfg.TitFntSty);
 			headerFont = new Font((cfg.HdrFntFml != null ? cfg.HdrFntFml : "Arial"), (cfg.HdrFntSz > 0 ? cfg.HdrFntSz : 10), (FontStyle)cfg.HdrFntSty);
 			font = new Font((cfg.BodyFntFml != null ? cfg.BodyFntFml : "Arial"), (cfg.BodyFntSz > 0 ? cfg.BodyFntSz : 10), (FontStyle)cfg.BodyFntSty);
-            footerFont = new Font((cfg.FooterFntFml != null ? cfg.FooterFntFml : "Arial"), (cfg.FooterFntSz > 0 ? cfg.FooterFntSz : 10), (FontStyle)cfg.FooterFntSty);

 			/// Set print area size and margins (in dots using 100 dpi)
 			DefaultPageSettings.Landscape = (cfg.PageOrientation == PageOrientation.Landscape);
@@ -153,23 +150,8 @@ namespace Results.Output.Printers.Zapiska
 		/// <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 (pageNr == 1)
            {
-                if (!string.IsNullOrEmpty(cfg.Template))
-                {
-                    string templatePath = Path.Combine("C:\\TBF\\Templates\\", cfg.Template);
-                    if (File.Exists(templatePath))
-                    {
-                        if (cfg.PageOrientation == PageOrientation.Portrait)
-                            e.Graphics.DrawImage(new Bitmap(Image.FromFile(templatePath), 827, 1169), new Rectangle(0, 0, 827, 1169));
-                        else
-                            e.Graphics.DrawImage(new Bitmap(Image.FromFile(templatePath), 1169, 827), new Rectangle(0, 0, 1169, 827));
-                    }
-                }
-
                /// Calculate the table rows count
                int tableRowsCount = 0;
                foreach (var wm in batch.WaterMeters)
@@ -196,6 +178,15 @@ namespace Results.Output.Printers.Zapiska
                    nrPages = 2;
            }

+			/// Run base code
+			base.OnPrintPage(e);
+
+			if (File.Exists("C:\\TBF\\header.png"))
+			{
+				Image img = Image.FromFile("C:\\TBF\\header.png");
+				e.Graphics.DrawImage(new Bitmap(img), new Rectangle(0, 0, 827, 1169));
+			}
+
 			/// Use the StringFormat class for the text layout of our document
 			StringFormat format = new StringFormat(StringFormatFlags.LineLimit);

@@ -327,8 +318,8 @@ namespace Results.Output.Printers.Zapiska
 			///----------
 			///  Footer
 			///----------
-            float footerWidth = Measure(e, footer, footerFont).Width;
-            PrintAt(e, leftMargin + (printWidth - footerWidth) / 2, topMargin + printHeight - 2 * spacingOne, 0, footer, footerFont, Alignment.Left);
+            float footerWidth = Measure(e, footer, font).Width;
+            PrintAt(e, leftMargin + (printWidth - footerWidth) / 2, topMargin + printHeight - 2 * spacingOne, 0, footer, font, Alignment.Left);
            
            string pageNrText = string.Format("{0} {1}/{2}", Strings.Page, pageNr++, nrPages);
 			float pageNrWidth = e.Graphics.MeasureString(pageNrText, font).Width;
@@ -1,14 +1,17 @@
 ///
-/// Copyright (c) 2017 Sensus Slovensko a.s.
+/// Copyright (c) 2017 Sensus Metering Systems
 ///
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;

 namespace Results.Output.Printers.Zapiska
 {
 	public class ZapiskaPrinterCfg
 	{
 		public Config.Entities.PageOrientation PageOrientation;
-        public string Template;
-        public int TopMargin;
+		public int TopMargin;
 		public int BottomMargin;
 		public int LeftMargin;
 		public string TitFntFml;
@@ -20,10 +23,7 @@ namespace Results.Output.Printers.Zapiska
 		public string BodyFntFml;
 		public int BodyFntSz;
 		public int BodyFntSty;
-        public string FooterFntFml;
-        public int FooterFntSz;
-        public int FooterFntSty;
-        public bool SupressPrinting;		/// Bypass printing when true
+		public bool SupressPrinting;		/// Bypass printing when true
        public bool GoodOnly;
 		public System.Globalization.CultureInfo CultureInfo;

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Sensus")]
 [assembly: AssemblyProduct("Results")]
-[assembly: AssemblyCopyright("Copyright © 2013 - 2018 Sensus Slovensko, a.s.")]
+[assembly: AssemblyCopyright("Copyright © 2013 - 2017 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.18.825.0")]
-[assembly: AssemblyFileVersion("2.18.825.0")]
+[assembly: AssemblyVersion("2.17.741.0")]
+[assembly: AssemblyFileVersion("2.17.741.0")]
@@ -1411,7 +1411,7 @@ namespace Results.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Temperature at the diverter at start of the test – first 4 measurements after the start.
+        ///   Looks up a localized string similar to Temperature at the diverter at start of the test – first 4 measurements from the start.
        /// </summary>
        internal static string Tooltip_T_di_st {
            get {
@@ -1474,7 +1474,7 @@ namespace Results.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Temperature at the outlet at start of the test – first 4 measurements after the start.
+        ///   Looks up a localized string similar to Temperature at the outlet at start of the test – first 4 measurements from the start.
        /// </summary>
        internal static string Tooltip_T_dw_st {
            get {
@@ -1482,69 +1482,6 @@ namespace Results.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Actual temperature in the line.
-        /// </summary>
-        internal static string Tooltip_T_ln_ac {
-            get {
-                return ResourceManager.GetString("Tooltip_T_ln_ac", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Average temperature in the line during a test.
-        /// </summary>
-        internal static string Tooltip_T_ln_avg {
-            get {
-                return ResourceManager.GetString("Tooltip_T_ln_avg", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Temperature in the line at end of the test – last 4 measurement before the end.
-        /// </summary>
-        internal static string Tooltip_T_ln_en {
-            get {
-                return ResourceManager.GetString("Tooltip_T_ln_en", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Maximum temperature in the line during the test.
-        /// </summary>
-        internal static string Tooltip_T_ln_max {
-            get {
-                return ResourceManager.GetString("Tooltip_T_ln_max", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Mean temperature in the line during a test.
-        /// </summary>
-        internal static string Tooltip_T_ln_me {
-            get {
-                return ResourceManager.GetString("Tooltip_T_ln_me", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Minimum temperature in the line during the test.
-        /// </summary>
-        internal static string Tooltip_T_ln_min {
-            get {
-                return ResourceManager.GetString("Tooltip_T_ln_min", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Temperature in the line at start of the test – first 4 measurements after the start.
-        /// </summary>
-        internal static string Tooltip_T_ln_st {
-            get {
-                return ResourceManager.GetString("Tooltip_T_ln_st", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Temperature of water sample at water density calibration.
        /// </summary>
@@ -1609,7 +1546,7 @@ namespace Results.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Temperature at the inlet at start of the test – first 4 measurements after the start.
+        ///   Looks up a localized string similar to Temperature at the inlet at start of the test – first 4 measurements from the start.
        /// </summary>
        internal static string Tooltip_T_up_st {
            get {
@@ -529,7 +529,7 @@
    <value>Mean temperature at diverter</value>
  </data>
  <data name="Tooltip_T_di_st" xml:space="preserve">
-    <value>Temperature at the diverter at start of the test – first 4 measurements after the start</value>
+    <value>Temperature at the diverter at start of the test – first 4 measurements from the start</value>
  </data>
  <data name="Tooltip_T_dw_ac" xml:space="preserve">
    <value>Actual temperature at the outlet</value>
@@ -544,7 +544,7 @@
    <value>Mean temperature at outlet</value>
  </data>
  <data name="Tooltip_T_dw_st" xml:space="preserve">
-    <value>Temperature at the outlet at start of the test – first 4 measurements after the start</value>
+    <value>Temperature at the outlet at start of the test – first 4 measurements from the start</value>
  </data>
  <data name="Tooltip_T_up_ac" xml:space="preserve">
    <value>Actual temperature at the inlet</value>
@@ -559,7 +559,7 @@
    <value>Mean temperature at inlet during a test</value>
  </data>
  <data name="Tooltip_T_up_st" xml:space="preserve">
-    <value>Temperature at the inlet at start of the test – first 4 measurements after the start</value>
+    <value>Temperature at the inlet at start of the test – first 4 measurements from the start</value>
  </data>
  <data name="aux" xml:space="preserve">
    <value>aux.</value>
@@ -699,25 +699,4 @@
  <data name="Tooltip_T_rho_0" xml:space="preserve">
    <value>Temperature of water sample at water density calibration</value>
  </data>
-  <data name="Tooltip_T_ln_ac" xml:space="preserve">
-    <value>Actual temperature in the line</value>
-  </data>
-  <data name="Tooltip_T_ln_avg" xml:space="preserve">
-    <value>Average temperature in the line during a test</value>
-  </data>
-  <data name="Tooltip_T_ln_en" xml:space="preserve">
-    <value>Temperature in the line at end of the test – last 4 measurement before the end</value>
-  </data>
-  <data name="Tooltip_T_ln_max" xml:space="preserve">
-    <value>Maximum temperature in the line during the test</value>
-  </data>
-  <data name="Tooltip_T_ln_me" xml:space="preserve">
-    <value>Mean temperature in the line during a test</value>
-  </data>
-  <data name="Tooltip_T_ln_min" xml:space="preserve">
-    <value>Minimum temperature in the line during the test</value>
-  </data>
-  <data name="Tooltip_T_ln_st" xml:space="preserve">
-    <value>Temperature in the line at start of the test – first 4 measurements after the start</value>
-  </data>
 </root>
@@ -18,7 +18,7 @@
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;BADGER_STREDNA_TRAT;LANG_CS</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;MUNICH;LANG_DE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <PlatformTarget>x86</PlatformTarget>
@@ -27,7 +27,7 @@
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;BADGER_STREDNA_TRAT;LANG_CS</DefineConstants>
+    <DefineConstants>TRACE;MUNICH;LANG_DE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
@@ -104,9 +104,6 @@
      <SubType>Component</SubType>
    </Compile>
    <Compile Include="Output\Printers\Enhanced\EnhancedPrinterCfg.cs" />
-    <Compile Include="Output\Printers\PrintersCommon.cs">
-      <SubType>Component</SubType>
-    </Compile>
    <Compile Include="Output\Printers\Munich\MunichPrintDocument.cs">
      <SubType>Component</SubType>
    </Compile>
@@ -156,20 +156,5 @@ namespace Results
            return sb.ToString().TrimEnd();
        }

-        public static string PassedColorStr(bool passed, bool useRedGreenColor)
-        {
-#if PUCHONG_PT200
-            return (useRedGreenColor) ? (passed ? "OK|Green" : "NG|Red")         : (passed ? "OK|White" : "NG|White");
-#elif BAHRAIN_50
-            return (useRedGreenColor) ? (passed ? "PASSED|Green" : "FAILED|Red") : (passed ? "PASSED|White" : "FAILED|White");
-#elif LANG_PL
-			return (useRedGreenColor) ? (passed ? "+|Green" : "-|Red")           : (passed ? "+|White" : "-|White");
-#elif LANG_RU
-            return (useRedGreenColor) ? (passed ? "годен|Green" : "негоден|Red") : (passed ? "годен|White" : "негоден|White");
-#else
-            return (useRedGreenColor) ? (passed ? "OK|Green" : "NOK|Red")        : (passed ? "OK|White" : "NOK|White");
-#endif
-        }
-
    }
 }
@@ -172,7 +172,7 @@ 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,            Strings.Density + " ()",                         Quantity.Density, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetTestRslt(t).DensityOut)));
 			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)));

@@ -213,12 +213,6 @@ namespace Results
            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_avg,     string.Format("{0} UP avg ()", Strings.VName_Temp), Strings.Tooltip_T_up_avg, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempUpStart + w.GetTestRslt(t).TempUpEnd) / 2)));
            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_min,     string.Format("{0} UP min ()", Strings.VName_Temp), Strings.Tooltip_T_up_min, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempUpMin)));
            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_max,     string.Format("{0} UP max ()", Strings.VName_Temp), Strings.Tooltip_T_up_max, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempUpMax)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_mean,  string.Format("{0} LN ME ()",  Strings.VName_Temp), Strings.Tooltip_T_ln_me,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempUpMean + w.GetTestRslt(t).TempDownMean) / 2)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_start, string.Format("{0} LN ST ()",  Strings.VName_Temp), Strings.Tooltip_T_ln_st,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempUpStart + w.GetTestRslt(t).TempDownStart) / 2)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_end,   string.Format("{0} LN EN ()",  Strings.VName_Temp), Strings.Tooltip_T_ln_en,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempUpEnd + w.GetTestRslt(t).TempDownEnd) / 2)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_avg,   string.Format("{0} LN avg ()", Strings.VName_Temp), Strings.Tooltip_T_ln_avg, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempUpStart + w.GetTestRslt(t).TempDownStart + w.GetTestRslt(t).TempUpEnd + w.GetTestRslt(t).TempDownEnd) / 4)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_min,   string.Format("{0} LN min ()", Strings.VName_Temp), Strings.Tooltip_T_ln_min, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempUpMin + w.GetTestRslt(t).TempDownMin) / 2)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_max,   string.Format("{0} LN max ()", Strings.VName_Temp), Strings.Tooltip_T_ln_max, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempUpMax + w.GetTestRslt(t).TempDownMax) / 2)));
            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_down_mean,  string.Format("{0} DW ME ()",  Strings.VName_Temp), Strings.Tooltip_T_dw_me,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDownMean)));
            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_down_start, string.Format("{0} DW ST ()",  Strings.VName_Temp), Strings.Tooltip_T_dw_st,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDownStart)));
            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_down_end,   string.Format("{0} DW EN ()",  Strings.VName_Temp), Strings.Tooltip_T_dw_en,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDownEnd)));
@@ -268,12 +262,12 @@ namespace Results
            ///
            /// Ambient temperature/pressure/humidity/Buoyancy
            ///
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Ambient_temperature, string.Format("{0} Amb M", Strings.VName_Temp),     Strings.Tooltip_T_Amb_M,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", (w.GetTestRslt(t) == null) ? w.Batch.AmbTempMean()  : w.GetTestRslt(t).AmbTempMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Ambient_temperature, string.Format("{0} Amb M", Strings.VName_Temp),     Strings.Tooltip_T_Amb_M,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", (w.GetTestRslt(t) == null) ? w.Batch.AmbTempMean() : w.GetTestRslt(t).AmbTempMean)));
            AllItems.Add(new WMeterRsltItemSpec(ItemID.Ambient_pressure,    string.Format("{0} Amb M", Strings.VName_Press),    Strings.Tooltip_P_Amb_M,  Quantity.Pressure,    ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", (w.GetTestRslt(t) == null) ? w.Batch.AmbPressMean() : w.GetTestRslt(t).AmbPressMean)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Ambient_humidity,    string.Format("{0} Amb M", Strings.VName_Humi),     Strings.Tooltip_Hu_Amb_M, Quantity.Humidity,    ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V2", (w.GetTestRslt(t) == null) ? w.Batch.AmbHumiMean()  : w.GetTestRslt(t).AmbHumiMean)));
-            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.Ambient_humidity,    string.Format("{0} Amb M", Strings.VName_Humi),     Strings.Tooltip_Hu_Amb_M, Quantity.Humidity,    ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V2", (w.GetTestRslt(t) == null) ? w.Batch.AmbHumiMean() :  w.GetTestRslt(t).AmbHumiMean)));
+            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)) : "")));

            ///
@@ -327,7 +321,6 @@ namespace Results
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Purchase_order,     Strings.PO,                     Quantity.String, ItemCategory.Other,       (w, t, u, f, p) => FormatStr(f, w.PurchaseOrder)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Year_of_production, Strings.Year,                   Quantity.Number, ItemCategory.Other,       (w, t, u, f, p) => FormatInt(f, w.YearOfProduction)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.WM_Position,        Strings.Pos,                    Quantity.Number, ItemCategory.Other,       (w, t, u, f, p) => FormatInt(f, w.WMPosition)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Formatted_WM_ID,    "Formatted WM ID",              Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? string.Format("{0}-{1}", w.BatchNr(), w.WMPosition) : string.Format(f, w.StartTime(), w.EndTime(), w.BatchNr(), w.WMPosition, w.SerialNr)));

            /// Water meters results (single)
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state,        Strings.End_state,          Quantity.String,      ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.EndState)));
@@ -398,7 +391,6 @@ namespace Results
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.E14, "E14 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x2000) != 0) ? Strings.Yes : Strings.No));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.E15, "E15 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x4000) != 0) ? Strings.Yes : Strings.No));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.E16, "E16 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x8000) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E21, "E21 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x100000) != 0) ? Strings.Yes : Strings.No));

 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Table_row_nr, "Table row #", Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? TableRowNr.ToString() : string.Format(f, TableRowNr)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Table_column_nr, "Table column #", Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? TableColumnNr.ToString() : string.Format(f, TableColumnNr)));
@@ -465,7 +457,7 @@ namespace Results
        public static string FormatDbl(Config.Unit units, string format, string precisionOrEmpty, string dfltPrecision, double v1, double v2, CultureInfo ci)
        {
            double val1 = Config.Units.ConvertTo(units, v1);
-            double val2 = Config.Units.ConvertTo(units, v2);
+            double val2 = Config.Units.ConvertTo(units, v1);

            string precision = string.IsNullOrEmpty(precisionOrEmpty) ? dfltPrecision : precisionOrEmpty;

@@ -632,13 +624,5 @@ namespace Results
        {
            return GetItem((int)itemId);
        }
-
-        public override string ToString()
-        {
-            if (!string.IsNullOrEmpty(Caption))
-                return Caption;
-            else
-                return ((ItemID)Uid).ToString();
-        }
    }
 }
@@ -0,0 +1,237 @@
+///
+/// Copyright (c) 2013-2015 Sensus Metering Systems
+///
+namespace ResultsBrowser.Forms
+{
+	partial class ResultsConfig
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.okButton = new System.Windows.Forms.Button();
+			this.cancelButton = new System.Windows.Forms.Button();
+			this.availableResultsListBox = new System.Windows.Forms.ListBox();
+			this.selectedResultsListBox = new System.Windows.Forms.ListBox();
+			this.availableResultsLabel = new System.Windows.Forms.Label();
+			this.selectedResultsLabel = new System.Windows.Forms.Label();
+			this.removeAllButton = new System.Windows.Forms.Button();
+			this.removeButton = new System.Windows.Forms.Button();
+			this.addButton = new System.Windows.Forms.Button();
+			this.unlockButton = new System.Windows.Forms.Button();
+			this.singleRadioButton = new System.Windows.Forms.RadioButton();
+			this.combinedRadioButton = new System.Windows.Forms.RadioButton();
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.groupBox1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// okButton
+			// 
+			this.okButton.Location = new System.Drawing.Point(283, 57);
+			this.okButton.Name = "okButton";
+			this.okButton.Size = new System.Drawing.Size(104, 30);
+			this.okButton.TabIndex = 4;
+			this.okButton.Text = "Close";
+			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(283, 94);
+			this.cancelButton.Name = "cancelButton";
+			this.cancelButton.Size = new System.Drawing.Size(104, 30);
+			this.cancelButton.TabIndex = 5;
+			this.cancelButton.Text = "Cancel";
+			this.cancelButton.UseVisualStyleBackColor = true;
+			this.cancelButton.Visible = false;
+			// 
+			// availableResultsListBox
+			// 
+			this.availableResultsListBox.Enabled = false;
+			this.availableResultsListBox.FormattingEnabled = true;
+			this.availableResultsListBox.Location = new System.Drawing.Point(12, 162);
+			this.availableResultsListBox.Name = "availableResultsListBox";
+			this.availableResultsListBox.Size = new System.Drawing.Size(135, 186);
+			this.availableResultsListBox.TabIndex = 6;
+			this.availableResultsListBox.DoubleClick += new System.EventHandler(this.availableResultsListBox_DoubleClick);
+			// 
+			// selectedResultsListBox
+			// 
+			this.selectedResultsListBox.Enabled = false;
+			this.selectedResultsListBox.FormattingEnabled = true;
+			this.selectedResultsListBox.Location = new System.Drawing.Point(252, 162);
+			this.selectedResultsListBox.Name = "selectedResultsListBox";
+			this.selectedResultsListBox.Size = new System.Drawing.Size(135, 186);
+			this.selectedResultsListBox.TabIndex = 7;
+			this.selectedResultsListBox.DoubleClick += new System.EventHandler(this.selectedResultsListBox_DoubleClick);
+			// 
+			// availableResultsLabel
+			// 
+			this.availableResultsLabel.AutoSize = true;
+			this.availableResultsLabel.Location = new System.Drawing.Point(12, 140);
+			this.availableResultsLabel.Name = "availableResultsLabel";
+			this.availableResultsLabel.Size = new System.Drawing.Size(86, 13);
+			this.availableResultsLabel.TabIndex = 8;
+			this.availableResultsLabel.Text = "Available results:";
+			// 
+			// selectedResultsLabel
+			// 
+			this.selectedResultsLabel.AutoSize = true;
+			this.selectedResultsLabel.Location = new System.Drawing.Point(249, 140);
+			this.selectedResultsLabel.Name = "selectedResultsLabel";
+			this.selectedResultsLabel.Size = new System.Drawing.Size(85, 13);
+			this.selectedResultsLabel.TabIndex = 9;
+			this.selectedResultsLabel.Text = "Selected results:";
+			// 
+			// removeAllButton
+			// 
+			this.removeAllButton.Anchor = System.Windows.Forms.AnchorStyles.None;
+			this.removeAllButton.Enabled = false;
+			this.removeAllButton.Location = new System.Drawing.Point(153, 273);
+			this.removeAllButton.Name = "removeAllButton";
+			this.removeAllButton.Size = new System.Drawing.Size(94, 30);
+			this.removeAllButton.TabIndex = 46;
+			this.removeAllButton.Text = "<< R&emove all";
+			this.removeAllButton.UseVisualStyleBackColor = true;
+			this.removeAllButton.Click += new System.EventHandler(this.removeAllButton_Click);
+			// 
+			// removeButton
+			// 
+			this.removeButton.Anchor = System.Windows.Forms.AnchorStyles.None;
+			this.removeButton.Enabled = false;
+			this.removeButton.Location = new System.Drawing.Point(153, 238);
+			this.removeButton.Name = "removeButton";
+			this.removeButton.Size = new System.Drawing.Size(93, 30);
+			this.removeButton.TabIndex = 45;
+			this.removeButton.Text = "< &Remove";
+			this.removeButton.UseVisualStyleBackColor = true;
+			this.removeButton.Click += new System.EventHandler(this.removeButton_Click);
+			// 
+			// addButton
+			// 
+			this.addButton.Anchor = System.Windows.Forms.AnchorStyles.None;
+			this.addButton.Enabled = false;
+			this.addButton.Location = new System.Drawing.Point(153, 203);
+			this.addButton.Name = "addButton";
+			this.addButton.Size = new System.Drawing.Size(93, 30);
+			this.addButton.TabIndex = 44;
+			this.addButton.Text = "&Add >";
+			this.addButton.UseVisualStyleBackColor = true;
+			this.addButton.Click += new System.EventHandler(this.addButton_Click);
+			// 
+			// unlockButton
+			// 
+			this.unlockButton.Location = new System.Drawing.Point(283, 21);
+			this.unlockButton.Name = "unlockButton";
+			this.unlockButton.Size = new System.Drawing.Size(104, 30);
+			this.unlockButton.TabIndex = 47;
+			this.unlockButton.Text = "Unlock";
+			this.unlockButton.UseVisualStyleBackColor = true;
+			this.unlockButton.Click += new System.EventHandler(this.unlockButton_Click);
+			// 
+			// singleRadioButton
+			// 
+			this.singleRadioButton.Appearance = System.Windows.Forms.Appearance.Button;
+			this.singleRadioButton.AutoSize = true;
+			this.singleRadioButton.Checked = true;
+			this.singleRadioButton.Location = new System.Drawing.Point(19, 24);
+			this.singleRadioButton.Name = "singleRadioButton";
+			this.singleRadioButton.Size = new System.Drawing.Size(46, 23);
+			this.singleRadioButton.TabIndex = 48;
+			this.singleRadioButton.TabStop = true;
+			this.singleRadioButton.Text = "Single";
+			this.singleRadioButton.UseVisualStyleBackColor = true;
+			this.singleRadioButton.CheckedChanged += new System.EventHandler(this.singleRadioButton_CheckedChanged);
+			// 
+			// combinedRadioButton
+			// 
+			this.combinedRadioButton.Appearance = System.Windows.Forms.Appearance.Button;
+			this.combinedRadioButton.AutoSize = true;
+			this.combinedRadioButton.Location = new System.Drawing.Point(71, 24);
+			this.combinedRadioButton.Name = "combinedRadioButton";
+			this.combinedRadioButton.Size = new System.Drawing.Size(64, 23);
+			this.combinedRadioButton.TabIndex = 49;
+			this.combinedRadioButton.Text = "Combined";
+			this.combinedRadioButton.UseVisualStyleBackColor = true;
+			this.combinedRadioButton.CheckedChanged += new System.EventHandler(this.combinedRadioButton_CheckedChanged);
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Controls.Add(this.combinedRadioButton);
+			this.groupBox1.Controls.Add(this.singleRadioButton);
+			this.groupBox1.Location = new System.Drawing.Point(12, 21);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(153, 60);
+			this.groupBox1.TabIndex = 52;
+			this.groupBox1.TabStop = false;
+			this.groupBox1.Text = "Water Meter";
+			// 
+			// ResultsConfig
+			// 
+			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(399, 358);
+			this.Controls.Add(this.groupBox1);
+			this.Controls.Add(this.unlockButton);
+			this.Controls.Add(this.removeAllButton);
+			this.Controls.Add(this.removeButton);
+			this.Controls.Add(this.addButton);
+			this.Controls.Add(this.selectedResultsLabel);
+			this.Controls.Add(this.availableResultsLabel);
+			this.Controls.Add(this.selectedResultsListBox);
+			this.Controls.Add(this.availableResultsListBox);
+			this.Controls.Add(this.cancelButton);
+			this.Controls.Add(this.okButton);
+			this.Name = "ResultsConfig";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "ResultsConfig";
+			this.Load += new System.EventHandler(this.ResultsConfig_Load);
+			this.groupBox1.ResumeLayout(false);
+			this.groupBox1.PerformLayout();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button okButton;
+		private System.Windows.Forms.Button cancelButton;
+		private System.Windows.Forms.ListBox availableResultsListBox;
+		private System.Windows.Forms.ListBox selectedResultsListBox;
+		private System.Windows.Forms.Label availableResultsLabel;
+		private System.Windows.Forms.Label selectedResultsLabel;
+		private System.Windows.Forms.Button removeAllButton;
+		private System.Windows.Forms.Button removeButton;
+		private System.Windows.Forms.Button addButton;
+		private System.Windows.Forms.Button unlockButton;
+		private System.Windows.Forms.RadioButton singleRadioButton;
+		private System.Windows.Forms.RadioButton combinedRadioButton;
+		private System.Windows.Forms.GroupBox groupBox1;
+	}
+}
@@ -0,0 +1,219 @@
+///
+/// Copyright (c) 2015 Sensus Metering Systems
+///
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using Results.Entities;
+using ResultsBrowser.Resources;
+
+namespace ResultsBrowser.Forms
+{
+	public partial class ResultsConfig : Form
+	{
+		/// <summary>
+		/// Required access rights to make changes with this form
+		/// </summary>
+		const Users.Grp.GID RequiredGroupMembership = Users.Grp.GID.Metrologists;
+		public Config.Entities.TestsArrangement TestsArrangement;
+		public Config.Entities.MetersArrangement MetersArrangement;
+		public int NrMetersInOneGroup;
+
+		public IList<Results.ItemSpec> currentlyAvailableItems;
+		public IList<Results.ItemSpec> ReportItems_Single;
+		public IList<Results.ItemSpec> ReportItems_Compound;
+
+		bool combined;					/// false = single meter items, true = combined meter items
+		Config.Entities.Device device;	/// Screen, Printer or Disk
+		bool unlocked;					/// true = changes enabled
+
+		public ResultsConfig(bool combined)
+		{
+			InitializeComponent();
+
+			this.combined = combined;
+			device = Config.Entities.Device.Screen;
+			unlocked = false;
+			cancelButton.Visible = false;
+		}
+
+		void Localize()
+		{
+			Text = Strings.Configuration;
+			groupBox1.Text = Strings.Water_Meter;
+			singleRadioButton.Text = Strings.SingleBtnText;
+			combinedRadioButton.Text = Strings.CombinedBtnText;
+			availableResultsLabel.Text = Strings.Available_results;
+			selectedResultsLabel.Text = Strings.Selected_results;
+			addButton.Text = Strings.Add;
+			removeButton.Text = Strings.Remove;
+			removeAllButton.Text = Strings.Remove_all;
+			unlockButton.Text = Strings.UnlockBtnText;
+			okButton.Text = Strings.CloseBtnText;
+			cancelButton.Text = Strings.CancelBtnText;
+		}
+
+		void ResultsConfig_Load(object sender, EventArgs e)
+		{
+			Localize();
+
+			singleRadioButton.Checked = !combined;
+			combinedRadioButton.Checked = combined;
+
+			RedrawAvailable();
+			RedrawSelected();
+		}
+
+		/// <summary>
+		/// Gets the list of selected items based on watermeter type and device selections
+		/// </summary>
+		/// <returns>List of selected result items</returns>
+		IList<Results.ItemSpec> GetSelectedItems()
+		{
+			if (combined)
+			{
+				return ReportItems_Compound;
+			}
+			else
+			{
+				return ReportItems_Single;
+			}
+		}
+
+		/// <summary>
+		/// Redraw selected items (right hand side)
+		/// </summary>
+		void RedrawAvailable()
+		{
+			availableResultsListBox.Items.Clear();
+			currentlyAvailableItems = new List<Results.ItemSpec>();
+			foreach (var item in Results.ItemSpec.AllItems)
+			{
+				if (!GetSelectedItems().Contains(item) && (combined ? item.CanPrintCompoundMeter : item.CanPrintSingle))
+				{
+					currentlyAvailableItems.Add(item);
+					availableResultsListBox.Items.Add(item.Name);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Redraw selected items (right hand side)
+		/// </summary>
+		void RedrawSelected()
+		{
+			selectedResultsListBox.Items.Clear();
+			foreach (var item in GetSelectedItems())
+			{
+				selectedResultsListBox.Items.Add(item.Name);
+			}
+		}
+
+		void unlockButton_Click(object sender, EventArgs e)
+		{
+			if (!unlocked)
+			{
+				//if (!User.CurrentUser.IsMemberOf(RequiredGroupMembership))
+				//{
+				//    if ((new LoginDlg(RequiredGroupMembership)).ShowDialog() != DialogResult.OK) return;
+				//}
+
+				unlocked = true;
+
+				///
+				/// Unlock user interface controls
+				/// 
+				unlockButton.Enabled = false;
+				okButton.Text = Strings.OkBtnText;
+				cancelButton.Visible = true;
+				availableResultsListBox.Enabled = true;
+				selectedResultsListBox.Enabled = true;
+				addButton.Enabled = true;
+				removeButton.Enabled = true;
+				removeAllButton.Enabled = true;
+			}
+		}
+
+		void okButton_Click(object sender, EventArgs e)
+		{
+			DialogResult = DialogResult.OK;
+			Close();
+		}
+
+		void availableResultsListBox_DoubleClick(object sender, EventArgs e)
+		{
+			/// Double click works when just one item is selected
+			IList<Results.ItemSpec> itemsToRemove = new List<Results.ItemSpec>();
+			if (availableResultsListBox.SelectedIndices.Count == 1)
+			{
+				var item = currentlyAvailableItems[availableResultsListBox.SelectedIndices[0]];
+				GetSelectedItems().Add(item);
+				RedrawAvailable();
+				RedrawSelected();
+			}
+		}
+
+		void addButton_Click(object sender, EventArgs e)
+		{
+			/// Append at the end, this code supports multiple selected items,
+			/// although ListBox control settings may limit the max.number of selected items to one.
+
+			for (int i = availableResultsListBox.SelectedIndices.Count - 1; i >= 0; i--)
+			{
+				var item = currentlyAvailableItems[availableResultsListBox.SelectedIndices[i]];
+				GetSelectedItems().Add(item);
+			}
+			RedrawAvailable();
+			RedrawSelected();
+		}
+
+		private void selectedResultsListBox_DoubleClick(object sender, EventArgs e)
+		{
+			/// Double click works when just one item is selected
+
+			if (selectedResultsListBox.SelectedIndices.Count == 1)
+			{
+				GetSelectedItems().RemoveAt(selectedResultsListBox.SelectedIndices[0]);
+				RedrawAvailable();
+				RedrawSelected();
+			}
+		}
+
+		void removeButton_Click(object sender, EventArgs e)
+		{
+			/// Remove from the list (the last selected item first so that the indexes are not affected)
+
+			for (int i = selectedResultsListBox.SelectedIndices.Count - 1; i >= 0; i--)
+			{
+				GetSelectedItems().RemoveAt(selectedResultsListBox.SelectedIndices[i]);
+			}
+			RedrawAvailable();
+			RedrawSelected();
+		}
+
+		void removeAllButton_Click(object sender, EventArgs e)
+		{
+			/// Remove all items from 'Selected' list
+
+			GetSelectedItems().Clear();
+			RedrawAvailable();
+			RedrawSelected();
+		}
+
+		private void singleRadioButton_CheckedChanged(object sender, EventArgs e)
+		{
+		}
+
+		private void combinedRadioButton_CheckedChanged(object sender, EventArgs e)
+		{
+			combined = combinedRadioButton.Checked;
+			RedrawAvailable();
+			RedrawSelected();
+		}
+	}
+}
@@ -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.18.796.0")]
-[assembly: AssemblyFileVersion("2.18.796.0")]
+[assembly: AssemblyVersion("2.17.748.0")]
+[assembly: AssemblyFileVersion("2.17.748.0")]
@@ -21,7 +21,7 @@
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;BADGER_STREDNA_TRAT;LANG_CS</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;MUNICH;LANG_DE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -31,7 +31,7 @@
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;BADGER_STREDNA_TRAT;LANG_CS</DefineConstants>
+    <DefineConstants>TRACE;MUNICH;LANG_DE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
@@ -125,6 +125,12 @@
    <Compile Include="Forms\NoBenchOrDatabaseDlg.designer.cs">
      <DependentUpon>NoBenchOrDatabaseDlg.cs</DependentUpon>
    </Compile>
+    <Compile Include="Forms\ResultsConfig.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\ResultsConfig.designer.cs">
+      <DependentUpon>ResultsConfig.cs</DependentUpon>
+    </Compile>
    <Compile Include="Forms\StatisticsDlg.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -182,6 +188,9 @@
    <EmbeddedResource Include="Forms\NoBenchOrDatabaseDlg.resx">
      <DependentUpon>NoBenchOrDatabaseDlg.cs</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\ResultsConfig.resx">
+      <DependentUpon>ResultsConfig.cs</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="Forms\StatisticsDlg.resx">
      <DependentUpon>StatisticsDlg.cs</DependentUpon>
    </EmbeddedResource>
@@ -1,126 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using Config.Entities;
-using TBF.BenchControl;
-
-namespace TBF.BenchControl.Configs
-{
-    public class ConfigCtrlUtils : UserControl
-    {
-        protected PageOrientation GetOrientation(string str)
-        {
-            if (str.Equals(PageOrientation.Landscape.ToString())) return PageOrientation.Landscape;
-            if (str.Equals(PageOrientation.Portrait.ToString())) return PageOrientation.Portrait;
-            return (PageOrientation)(-1);
-        }
-
-        /// <summary>
-        /// Updates destination variable when its value differes from the source value.
-        /// Returns appropriate flags
-        /// </summary>
-        /// <param name="cfgVar">Reference to destination variable</param>
-        /// <param name="intVal">Source value</param>
-        /// <param name="flagsWhenUpdated">Flags returned when an update occurs</param>
-        /// <returns>Flags or 0</returns>
-        protected CfgUpdateFlags UpdateDifferent(ref int cfgVar, int intVal, CfgUpdateFlags flagsWhenUpdated)
-        {
-            if (cfgVar != intVal) { cfgVar = intVal; return flagsWhenUpdated; } else return 0;
-        }
-
-        /// <summary>
-        /// Updates destination variable when its value differes from the source value.
-        /// Returns appropriate flags
-        /// </summary>
-        /// <param name="cfgVar">Reference to destination variable</param>
-        /// <param name="toBeParsedString">Source integer value is obtained by parsing this string</param>
-        /// <param name="flagsWhenUpdated">Flags returned when an update occurs</param>
-        /// <returns>Flags or 0</returns>
-        protected CfgUpdateFlags UpdateDifferent(ref int cfgVar, string toBeParsedString, CfgUpdateFlags flagsWhenUpdated)
-        {
-            int itmp = int.Parse(toBeParsedString);
-            if (cfgVar != itmp) { cfgVar = itmp; return flagsWhenUpdated; } else return 0;
-        }
-
-        /// <summary>
-        /// Updates destination variable when its value differes from the source value.
-        /// Returns appropriate flags
-        /// </summary>
-        /// <param name="cfgVar">Reference to destination variable</param>
-        /// <param name="toBeParsedString">Source integer value is obtained by parsing this string</param>
-        /// <param name="flagsWhenUpdated">Flags returned when an update occurs</param>
-        /// <returns>Flags or 0</returns>
-        protected CfgUpdateFlags UpdateDifferent(ref float cfgVar, string toBeParsedString, CfgUpdateFlags flagsWhenUpdated)
-        {
-            float ftmp = Utils.ParseSFloat(toBeParsedString);
-            if (cfgVar != ftmp) { cfgVar = ftmp; return flagsWhenUpdated; } else return 0;
-        }
-
-        /// <summary>
-        /// Updates destination variable when its value differes from the source value.
-        /// Returns appropriate flags
-        /// </summary>
-        /// <param name="cfgVar">Reference to destination variable</param>
-        /// <param name="toBeParsedString">Source integer value is obtained by parsing this string</param>
-        /// <param name="flagsWhenUpdated">Flags returned when an update occurs</param>
-        /// <returns>Flags or 0</returns>
-        protected CfgUpdateFlags UpdateDifferent(ref double cfgVar, string toBeParsedString, CfgUpdateFlags flagsWhenUpdated)
-        {
-            double dtmp = Utils.ParseSDouble(toBeParsedString);
-            if (cfgVar != dtmp) { cfgVar = dtmp; return flagsWhenUpdated; } else return 0;
-        }
-
-        /// <summary>
-        /// Updates destination variable when its value differes from the source value.
-        /// Returns appropriate flags
-        /// </summary>
-        /// <param name="cfgVar">Reference to destination variable</param>
-        /// <param name="boolVal">Source value</param>
-        /// <param name="flagsWhenUpdated">Flags returned when an update occurs</param>
-        /// <returns>Flags or 0</returns>
-        protected CfgUpdateFlags UpdateDifferent(ref bool cfgVar, bool boolVal, CfgUpdateFlags flagsWhenUpdated)
-        {
-            if (cfgVar != boolVal) { cfgVar = boolVal; return flagsWhenUpdated; } else return 0;
-        }
-
-        /// <summary>
-        /// Updates destination variable when its value differes from the source value.
-        /// Returns appropriate flags
-        /// </summary>
-        /// <param name="cfgVar">Reference to destination variable</param>
-        /// <param name="stringVal">Source value</param>
-        /// <param name="flagsWhenUpdated">Flags returned when an update occurs</param>
-        /// <returns>Flags or 0</returns>
-        protected CfgUpdateFlags UpdateDifferent(ref string cfgVar, string stringVal, CfgUpdateFlags flagsWhenUpdated)
-        {
-            if (cfgVar != stringVal) { cfgVar = stringVal; return flagsWhenUpdated; } else return 0;
-        }
-
-        /// <summary>
-        /// Updates destination variable when its value differes from the source value.
-        /// Returns appropriate flags
-        /// </summary>
-        /// <param name="cfgVar">Reference to destination array</param>
-        /// <param name="stringArrVal">Source array of strings</param>
-        /// <param name="flagsWhenUpdated">Flags returned when an update occurs</param>
-        /// <returns>Flags or 0</returns>
-        protected CfgUpdateFlags UpdateDifferent(ref string[] cfgVar, string[] stringArrVal, CfgUpdateFlags flagsWhenUpdated)
-        {
-            if (cfgVar == null && stringArrVal == null)
-            {
-                return 0;
-            }
-            else if (cfgVar == null || stringArrVal == null || !cfgVar.SequenceEqual<string>(stringArrVal))
-            {
-                cfgVar = stringArrVal;
-                return flagsWhenUpdated;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-    }
-}
@@ -1,364 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Slovensko a.s.
-///
-namespace TBF.BenchControl.DataEntry.Standard12
-{
-    partial class CycleEndForm
-    {
-        /// <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.textBox2 = new System.Windows.Forms.TextBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.textBox1 = new System.Windows.Forms.TextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.okButton = new System.Windows.Forms.Button();
-            this.textBox3 = new System.Windows.Forms.TextBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.textBox4 = new System.Windows.Forms.TextBox();
-            this.label4 = new System.Windows.Forms.Label();
-            this.textBox5 = new System.Windows.Forms.TextBox();
-            this.label5 = new System.Windows.Forms.Label();
-            this.textBox6 = new System.Windows.Forms.TextBox();
-            this.label6 = new System.Windows.Forms.Label();
-            this.textBox7 = new System.Windows.Forms.TextBox();
-            this.label7 = new System.Windows.Forms.Label();
-            this.textBox8 = new System.Windows.Forms.TextBox();
-            this.label8 = new System.Windows.Forms.Label();
-            this.textBox9 = new System.Windows.Forms.TextBox();
-            this.label9 = new System.Windows.Forms.Label();
-            this.textBox10 = new System.Windows.Forms.TextBox();
-            this.label10 = new System.Windows.Forms.Label();
-            this.textBox11 = new System.Windows.Forms.TextBox();
-            this.label11 = new System.Windows.Forms.Label();
-            this.textBox12 = new System.Windows.Forms.TextBox();
-            this.label12 = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // textBox2
-            // 
-            this.textBox2.Location = new System.Drawing.Point(205, 66);
-            this.textBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(169, 27);
-            this.textBox2.TabIndex = 1;
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(38, 71);
-            this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(62, 18);
-            this.label2.TabIndex = 0;
-            this.label2.Text = "Stand:";
-            // 
-            // textBox1
-            // 
-            this.textBox1.Location = new System.Drawing.Point(205, 30);
-            this.textBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(169, 27);
-            this.textBox1.TabIndex = 1;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(38, 35);
-            this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(62, 18);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "Stand:";
-            // 
-            // okButton
-            // 
-            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.okButton.ForeColor = System.Drawing.Color.Black;
-            this.okButton.Location = new System.Drawing.Point(415, 30);
-            this.okButton.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.okButton.Name = "okButton";
-            this.okButton.Size = new System.Drawing.Size(90, 60);
-            this.okButton.TabIndex = 7;
-            this.okButton.Text = "OK";
-            this.okButton.UseVisualStyleBackColor = true;
-            this.okButton.Click += new System.EventHandler(this.okButton_Click);
-            // 
-            // textBox3
-            // 
-            this.textBox3.Location = new System.Drawing.Point(205, 102);
-            this.textBox3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox3.Name = "textBox3";
-            this.textBox3.Size = new System.Drawing.Size(169, 27);
-            this.textBox3.TabIndex = 1;
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(38, 107);
-            this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(62, 18);
-            this.label3.TabIndex = 0;
-            this.label3.Text = "Stand:";
-            // 
-            // textBox4
-            // 
-            this.textBox4.Location = new System.Drawing.Point(205, 138);
-            this.textBox4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox4.Name = "textBox4";
-            this.textBox4.Size = new System.Drawing.Size(169, 27);
-            this.textBox4.TabIndex = 1;
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(38, 143);
-            this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(62, 18);
-            this.label4.TabIndex = 0;
-            this.label4.Text = "Stand:";
-            // 
-            // textBox5
-            // 
-            this.textBox5.Location = new System.Drawing.Point(205, 174);
-            this.textBox5.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox5.Name = "textBox5";
-            this.textBox5.Size = new System.Drawing.Size(169, 27);
-            this.textBox5.TabIndex = 1;
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(38, 179);
-            this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(62, 18);
-            this.label5.TabIndex = 0;
-            this.label5.Text = "Stand:";
-            // 
-            // textBox6
-            // 
-            this.textBox6.Location = new System.Drawing.Point(205, 210);
-            this.textBox6.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox6.Name = "textBox6";
-            this.textBox6.Size = new System.Drawing.Size(169, 27);
-            this.textBox6.TabIndex = 1;
-            // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(38, 215);
-            this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(62, 18);
-            this.label6.TabIndex = 0;
-            this.label6.Text = "Stand:";
-            // 
-            // textBox7
-            // 
-            this.textBox7.Location = new System.Drawing.Point(205, 246);
-            this.textBox7.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox7.Name = "textBox7";
-            this.textBox7.Size = new System.Drawing.Size(169, 27);
-            this.textBox7.TabIndex = 9;
-            // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(38, 251);
-            this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(62, 18);
-            this.label7.TabIndex = 8;
-            this.label7.Text = "Stand:";
-            // 
-            // textBox8
-            // 
-            this.textBox8.Location = new System.Drawing.Point(205, 282);
-            this.textBox8.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox8.Name = "textBox8";
-            this.textBox8.Size = new System.Drawing.Size(169, 27);
-            this.textBox8.TabIndex = 11;
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(38, 287);
-            this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(62, 18);
-            this.label8.TabIndex = 10;
-            this.label8.Text = "Stand:";
-            // 
-            // textBox9
-            // 
-            this.textBox9.Location = new System.Drawing.Point(205, 318);
-            this.textBox9.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox9.Name = "textBox9";
-            this.textBox9.Size = new System.Drawing.Size(169, 27);
-            this.textBox9.TabIndex = 13;
-            // 
-            // label9
-            // 
-            this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(38, 323);
-            this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(62, 18);
-            this.label9.TabIndex = 12;
-            this.label9.Text = "Stand:";
-            // 
-            // textBox10
-            // 
-            this.textBox10.Location = new System.Drawing.Point(205, 354);
-            this.textBox10.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox10.Name = "textBox10";
-            this.textBox10.Size = new System.Drawing.Size(169, 27);
-            this.textBox10.TabIndex = 15;
-            // 
-            // label10
-            // 
-            this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(38, 359);
-            this.label10.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(62, 18);
-            this.label10.TabIndex = 14;
-            this.label10.Text = "Stand:";
-            // 
-            // textBox11
-            // 
-            this.textBox11.Location = new System.Drawing.Point(205, 390);
-            this.textBox11.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox11.Name = "textBox11";
-            this.textBox11.Size = new System.Drawing.Size(169, 27);
-            this.textBox11.TabIndex = 17;
-            // 
-            // label11
-            // 
-            this.label11.AutoSize = true;
-            this.label11.Location = new System.Drawing.Point(38, 395);
-            this.label11.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(62, 18);
-            this.label11.TabIndex = 16;
-            this.label11.Text = "Stand:";
-            // 
-            // textBox12
-            // 
-            this.textBox12.Location = new System.Drawing.Point(205, 426);
-            this.textBox12.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox12.Name = "textBox12";
-            this.textBox12.Size = new System.Drawing.Size(169, 27);
-            this.textBox12.TabIndex = 19;
-            // 
-            // label12
-            // 
-            this.label12.AutoSize = true;
-            this.label12.Location = new System.Drawing.Point(38, 431);
-            this.label12.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(62, 18);
-            this.label12.TabIndex = 18;
-            this.label12.Text = "Stand:";
-            // 
-            // CycleEndForm
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 18F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = System.Drawing.Color.DarkGoldenrod;
-            this.ClientSize = new System.Drawing.Size(542, 489);
-            this.Controls.Add(this.textBox12);
-            this.Controls.Add(this.label12);
-            this.Controls.Add(this.textBox11);
-            this.Controls.Add(this.label11);
-            this.Controls.Add(this.textBox10);
-            this.Controls.Add(this.label10);
-            this.Controls.Add(this.textBox9);
-            this.Controls.Add(this.label9);
-            this.Controls.Add(this.textBox8);
-            this.Controls.Add(this.label8);
-            this.Controls.Add(this.textBox7);
-            this.Controls.Add(this.label7);
-            this.Controls.Add(this.textBox6);
-            this.Controls.Add(this.label6);
-            this.Controls.Add(this.textBox5);
-            this.Controls.Add(this.label5);
-            this.Controls.Add(this.textBox4);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.textBox3);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.textBox2);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.textBox1);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.okButton);
-            this.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-            this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.Name = "CycleEndForm";
-            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
-            this.Text = "Daten";
-            this.TopMost = true;
-            this.Load += new System.EventHandler(this.CycleEndForm_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TextBox textBox2;
-        private System.Windows.Forms.Label label2;
-		private System.Windows.Forms.TextBox textBox1;
-		private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Button okButton;
-        private System.Windows.Forms.TextBox textBox3;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.TextBox textBox4;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.TextBox textBox5;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.TextBox textBox6;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.TextBox textBox7;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.TextBox textBox8;
-        private System.Windows.Forms.Label label8;
-        private System.Windows.Forms.TextBox textBox9;
-        private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.TextBox textBox10;
-        private System.Windows.Forms.Label label10;
-        private System.Windows.Forms.TextBox textBox11;
-        private System.Windows.Forms.Label label11;
-        private System.Windows.Forms.TextBox textBox12;
-        private System.Windows.Forms.Label label12;
-
-	}
-}
@@ -1,652 +0,0 @@
-///
-/// Copyright (c) 2015 Sensus Metering Systems
-///
-namespace TBF.BenchControl.DataEntry.Standard24
-{
-    partial class CycleEndForm
-    {
-        /// <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.textBox2 = new System.Windows.Forms.TextBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.textBox1 = new System.Windows.Forms.TextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.okButton = new System.Windows.Forms.Button();
-            this.textBox3 = new System.Windows.Forms.TextBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.textBox4 = new System.Windows.Forms.TextBox();
-            this.label4 = new System.Windows.Forms.Label();
-            this.textBox5 = new System.Windows.Forms.TextBox();
-            this.label5 = new System.Windows.Forms.Label();
-            this.textBox6 = new System.Windows.Forms.TextBox();
-            this.label6 = new System.Windows.Forms.Label();
-            this.textBox7 = new System.Windows.Forms.TextBox();
-            this.label7 = new System.Windows.Forms.Label();
-            this.textBox8 = new System.Windows.Forms.TextBox();
-            this.label8 = new System.Windows.Forms.Label();
-            this.textBox9 = new System.Windows.Forms.TextBox();
-            this.label9 = new System.Windows.Forms.Label();
-            this.textBox10 = new System.Windows.Forms.TextBox();
-            this.label10 = new System.Windows.Forms.Label();
-            this.textBox11 = new System.Windows.Forms.TextBox();
-            this.label11 = new System.Windows.Forms.Label();
-            this.textBox12 = new System.Windows.Forms.TextBox();
-            this.label12 = new System.Windows.Forms.Label();
-            this.textBox13 = new System.Windows.Forms.TextBox();
-            this.label13 = new System.Windows.Forms.Label();
-            this.textBox14 = new System.Windows.Forms.TextBox();
-            this.label14 = new System.Windows.Forms.Label();
-            this.textBox15 = new System.Windows.Forms.TextBox();
-            this.label15 = new System.Windows.Forms.Label();
-            this.textBox16 = new System.Windows.Forms.TextBox();
-            this.label16 = new System.Windows.Forms.Label();
-            this.textBox17 = new System.Windows.Forms.TextBox();
-            this.label17 = new System.Windows.Forms.Label();
-            this.textBox18 = new System.Windows.Forms.TextBox();
-            this.label18 = new System.Windows.Forms.Label();
-            this.textBox19 = new System.Windows.Forms.TextBox();
-            this.label19 = new System.Windows.Forms.Label();
-            this.textBox20 = new System.Windows.Forms.TextBox();
-            this.label20 = new System.Windows.Forms.Label();
-            this.textBox21 = new System.Windows.Forms.TextBox();
-            this.label21 = new System.Windows.Forms.Label();
-            this.textBox22 = new System.Windows.Forms.TextBox();
-            this.label22 = new System.Windows.Forms.Label();
-            this.textBox23 = new System.Windows.Forms.TextBox();
-            this.label23 = new System.Windows.Forms.Label();
-            this.textBox24 = new System.Windows.Forms.TextBox();
-            this.label24 = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // textBox2
-            // 
-            this.textBox2.Location = new System.Drawing.Point(205, 66);
-            this.textBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(169, 27);
-            this.textBox2.TabIndex = 1;
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(38, 71);
-            this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(62, 18);
-            this.label2.TabIndex = 0;
-            this.label2.Text = "Stand:";
-            // 
-            // textBox1
-            // 
-            this.textBox1.Location = new System.Drawing.Point(205, 30);
-            this.textBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(169, 27);
-            this.textBox1.TabIndex = 1;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(38, 35);
-            this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(62, 18);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "Stand:";
-            // 
-            // okButton
-            // 
-            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.okButton.ForeColor = System.Drawing.Color.Black;
-            this.okButton.Location = new System.Drawing.Point(832, 30);
-            this.okButton.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.okButton.Name = "okButton";
-            this.okButton.Size = new System.Drawing.Size(90, 60);
-            this.okButton.TabIndex = 7;
-            this.okButton.Text = "OK";
-            this.okButton.UseVisualStyleBackColor = true;
-            this.okButton.Click += new System.EventHandler(this.okButton_Click);
-            // 
-            // textBox3
-            // 
-            this.textBox3.Location = new System.Drawing.Point(205, 102);
-            this.textBox3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox3.Name = "textBox3";
-            this.textBox3.Size = new System.Drawing.Size(169, 27);
-            this.textBox3.TabIndex = 1;
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(38, 107);
-            this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(62, 18);
-            this.label3.TabIndex = 0;
-            this.label3.Text = "Stand:";
-            // 
-            // textBox4
-            // 
-            this.textBox4.Location = new System.Drawing.Point(205, 138);
-            this.textBox4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox4.Name = "textBox4";
-            this.textBox4.Size = new System.Drawing.Size(169, 27);
-            this.textBox4.TabIndex = 1;
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(38, 143);
-            this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(62, 18);
-            this.label4.TabIndex = 0;
-            this.label4.Text = "Stand:";
-            // 
-            // textBox5
-            // 
-            this.textBox5.Location = new System.Drawing.Point(205, 174);
-            this.textBox5.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox5.Name = "textBox5";
-            this.textBox5.Size = new System.Drawing.Size(169, 27);
-            this.textBox5.TabIndex = 1;
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(38, 179);
-            this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(62, 18);
-            this.label5.TabIndex = 0;
-            this.label5.Text = "Stand:";
-            // 
-            // textBox6
-            // 
-            this.textBox6.Location = new System.Drawing.Point(205, 210);
-            this.textBox6.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox6.Name = "textBox6";
-            this.textBox6.Size = new System.Drawing.Size(169, 27);
-            this.textBox6.TabIndex = 1;
-            // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(38, 215);
-            this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(62, 18);
-            this.label6.TabIndex = 0;
-            this.label6.Text = "Stand:";
-            // 
-            // textBox7
-            // 
-            this.textBox7.Location = new System.Drawing.Point(205, 246);
-            this.textBox7.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox7.Name = "textBox7";
-            this.textBox7.Size = new System.Drawing.Size(169, 27);
-            this.textBox7.TabIndex = 9;
-            // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(38, 251);
-            this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(62, 18);
-            this.label7.TabIndex = 8;
-            this.label7.Text = "Stand:";
-            // 
-            // textBox8
-            // 
-            this.textBox8.Location = new System.Drawing.Point(205, 282);
-            this.textBox8.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox8.Name = "textBox8";
-            this.textBox8.Size = new System.Drawing.Size(169, 27);
-            this.textBox8.TabIndex = 11;
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(38, 287);
-            this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(62, 18);
-            this.label8.TabIndex = 10;
-            this.label8.Text = "Stand:";
-            // 
-            // textBox9
-            // 
-            this.textBox9.Location = new System.Drawing.Point(205, 318);
-            this.textBox9.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox9.Name = "textBox9";
-            this.textBox9.Size = new System.Drawing.Size(169, 27);
-            this.textBox9.TabIndex = 13;
-            // 
-            // label9
-            // 
-            this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(38, 323);
-            this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(62, 18);
-            this.label9.TabIndex = 12;
-            this.label9.Text = "Stand:";
-            // 
-            // textBox10
-            // 
-            this.textBox10.Location = new System.Drawing.Point(205, 354);
-            this.textBox10.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox10.Name = "textBox10";
-            this.textBox10.Size = new System.Drawing.Size(169, 27);
-            this.textBox10.TabIndex = 15;
-            // 
-            // label10
-            // 
-            this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(38, 359);
-            this.label10.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(62, 18);
-            this.label10.TabIndex = 14;
-            this.label10.Text = "Stand:";
-            // 
-            // textBox11
-            // 
-            this.textBox11.Location = new System.Drawing.Point(205, 390);
-            this.textBox11.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox11.Name = "textBox11";
-            this.textBox11.Size = new System.Drawing.Size(169, 27);
-            this.textBox11.TabIndex = 17;
-            // 
-            // label11
-            // 
-            this.label11.AutoSize = true;
-            this.label11.Location = new System.Drawing.Point(38, 395);
-            this.label11.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(62, 18);
-            this.label11.TabIndex = 16;
-            this.label11.Text = "Stand:";
-            // 
-            // textBox12
-            // 
-            this.textBox12.Location = new System.Drawing.Point(205, 426);
-            this.textBox12.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox12.Name = "textBox12";
-            this.textBox12.Size = new System.Drawing.Size(169, 27);
-            this.textBox12.TabIndex = 19;
-            // 
-            // label12
-            // 
-            this.label12.AutoSize = true;
-            this.label12.Location = new System.Drawing.Point(38, 431);
-            this.label12.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(62, 18);
-            this.label12.TabIndex = 18;
-            this.label12.Text = "Stand:";
-            // 
-            // textBox13
-            // 
-            this.textBox13.Location = new System.Drawing.Point(623, 30);
-            this.textBox13.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox13.Name = "textBox13";
-            this.textBox13.Size = new System.Drawing.Size(169, 27);
-            this.textBox13.TabIndex = 21;
-            // 
-            // label13
-            // 
-            this.label13.AutoSize = true;
-            this.label13.Location = new System.Drawing.Point(456, 35);
-            this.label13.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(62, 18);
-            this.label13.TabIndex = 20;
-            this.label13.Text = "Stand:";
-            // 
-            // textBox14
-            // 
-            this.textBox14.Location = new System.Drawing.Point(623, 66);
-            this.textBox14.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox14.Name = "textBox14";
-            this.textBox14.Size = new System.Drawing.Size(169, 27);
-            this.textBox14.TabIndex = 23;
-            // 
-            // label14
-            // 
-            this.label14.AutoSize = true;
-            this.label14.Location = new System.Drawing.Point(456, 71);
-            this.label14.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(62, 18);
-            this.label14.TabIndex = 22;
-            this.label14.Text = "Stand:";
-            // 
-            // textBox15
-            // 
-            this.textBox15.Location = new System.Drawing.Point(623, 102);
-            this.textBox15.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox15.Name = "textBox15";
-            this.textBox15.Size = new System.Drawing.Size(169, 27);
-            this.textBox15.TabIndex = 25;
-            // 
-            // label15
-            // 
-            this.label15.AutoSize = true;
-            this.label15.Location = new System.Drawing.Point(456, 107);
-            this.label15.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(62, 18);
-            this.label15.TabIndex = 24;
-            this.label15.Text = "Stand:";
-            // 
-            // textBox16
-            // 
-            this.textBox16.Location = new System.Drawing.Point(623, 138);
-            this.textBox16.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox16.Name = "textBox16";
-            this.textBox16.Size = new System.Drawing.Size(169, 27);
-            this.textBox16.TabIndex = 27;
-            // 
-            // label16
-            // 
-            this.label16.AutoSize = true;
-            this.label16.Location = new System.Drawing.Point(456, 143);
-            this.label16.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label16.Name = "label16";
-            this.label16.Size = new System.Drawing.Size(62, 18);
-            this.label16.TabIndex = 26;
-            this.label16.Text = "Stand:";
-            // 
-            // textBox17
-            // 
-            this.textBox17.Location = new System.Drawing.Point(623, 174);
-            this.textBox17.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox17.Name = "textBox17";
-            this.textBox17.Size = new System.Drawing.Size(169, 27);
-            this.textBox17.TabIndex = 29;
-            // 
-            // label17
-            // 
-            this.label17.AutoSize = true;
-            this.label17.Location = new System.Drawing.Point(456, 179);
-            this.label17.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(62, 18);
-            this.label17.TabIndex = 28;
-            this.label17.Text = "Stand:";
-            // 
-            // textBox18
-            // 
-            this.textBox18.Location = new System.Drawing.Point(623, 210);
-            this.textBox18.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox18.Name = "textBox18";
-            this.textBox18.Size = new System.Drawing.Size(169, 27);
-            this.textBox18.TabIndex = 31;
-            // 
-            // label18
-            // 
-            this.label18.AutoSize = true;
-            this.label18.Location = new System.Drawing.Point(456, 215);
-            this.label18.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label18.Name = "label18";
-            this.label18.Size = new System.Drawing.Size(62, 18);
-            this.label18.TabIndex = 30;
-            this.label18.Text = "Stand:";
-            // 
-            // textBox19
-            // 
-            this.textBox19.Location = new System.Drawing.Point(623, 246);
-            this.textBox19.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox19.Name = "textBox19";
-            this.textBox19.Size = new System.Drawing.Size(169, 27);
-            this.textBox19.TabIndex = 33;
-            // 
-            // label19
-            // 
-            this.label19.AutoSize = true;
-            this.label19.Location = new System.Drawing.Point(456, 251);
-            this.label19.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label19.Name = "label19";
-            this.label19.Size = new System.Drawing.Size(62, 18);
-            this.label19.TabIndex = 32;
-            this.label19.Text = "Stand:";
-            // 
-            // textBox20
-            // 
-            this.textBox20.Location = new System.Drawing.Point(623, 282);
-            this.textBox20.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox20.Name = "textBox20";
-            this.textBox20.Size = new System.Drawing.Size(169, 27);
-            this.textBox20.TabIndex = 35;
-            // 
-            // label20
-            // 
-            this.label20.AutoSize = true;
-            this.label20.Location = new System.Drawing.Point(456, 287);
-            this.label20.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label20.Name = "label20";
-            this.label20.Size = new System.Drawing.Size(62, 18);
-            this.label20.TabIndex = 34;
-            this.label20.Text = "Stand:";
-            // 
-            // textBox21
-            // 
-            this.textBox21.Location = new System.Drawing.Point(623, 318);
-            this.textBox21.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox21.Name = "textBox21";
-            this.textBox21.Size = new System.Drawing.Size(169, 27);
-            this.textBox21.TabIndex = 37;
-            // 
-            // label21
-            // 
-            this.label21.AutoSize = true;
-            this.label21.Location = new System.Drawing.Point(456, 323);
-            this.label21.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label21.Name = "label21";
-            this.label21.Size = new System.Drawing.Size(62, 18);
-            this.label21.TabIndex = 36;
-            this.label21.Text = "Stand:";
-            // 
-            // textBox22
-            // 
-            this.textBox22.Location = new System.Drawing.Point(623, 354);
-            this.textBox22.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox22.Name = "textBox22";
-            this.textBox22.Size = new System.Drawing.Size(169, 27);
-            this.textBox22.TabIndex = 39;
-            // 
-            // label22
-            // 
-            this.label22.AutoSize = true;
-            this.label22.Location = new System.Drawing.Point(456, 359);
-            this.label22.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(62, 18);
-            this.label22.TabIndex = 38;
-            this.label22.Text = "Stand:";
-            // 
-            // textBox23
-            // 
-            this.textBox23.Location = new System.Drawing.Point(623, 390);
-            this.textBox23.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox23.Name = "textBox23";
-            this.textBox23.Size = new System.Drawing.Size(169, 27);
-            this.textBox23.TabIndex = 41;
-            // 
-            // label23
-            // 
-            this.label23.AutoSize = true;
-            this.label23.Location = new System.Drawing.Point(456, 395);
-            this.label23.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label23.Name = "label23";
-            this.label23.Size = new System.Drawing.Size(62, 18);
-            this.label23.TabIndex = 40;
-            this.label23.Text = "Stand:";
-            // 
-            // textBox24
-            // 
-            this.textBox24.Location = new System.Drawing.Point(623, 426);
-            this.textBox24.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox24.Name = "textBox24";
-            this.textBox24.Size = new System.Drawing.Size(169, 27);
-            this.textBox24.TabIndex = 43;
-            // 
-            // label24
-            // 
-            this.label24.AutoSize = true;
-            this.label24.Location = new System.Drawing.Point(456, 431);
-            this.label24.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label24.Name = "label24";
-            this.label24.Size = new System.Drawing.Size(62, 18);
-            this.label24.TabIndex = 42;
-            this.label24.Text = "Stand:";
-            // 
-            // CycleEndForm
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 18F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = System.Drawing.Color.DarkGoldenrod;
-            this.ClientSize = new System.Drawing.Size(959, 489);
-            this.Controls.Add(this.textBox24);
-            this.Controls.Add(this.label24);
-            this.Controls.Add(this.textBox23);
-            this.Controls.Add(this.label23);
-            this.Controls.Add(this.textBox22);
-            this.Controls.Add(this.label22);
-            this.Controls.Add(this.textBox21);
-            this.Controls.Add(this.label21);
-            this.Controls.Add(this.textBox20);
-            this.Controls.Add(this.label20);
-            this.Controls.Add(this.textBox19);
-            this.Controls.Add(this.label19);
-            this.Controls.Add(this.textBox18);
-            this.Controls.Add(this.label18);
-            this.Controls.Add(this.textBox17);
-            this.Controls.Add(this.label17);
-            this.Controls.Add(this.textBox16);
-            this.Controls.Add(this.label16);
-            this.Controls.Add(this.textBox15);
-            this.Controls.Add(this.label15);
-            this.Controls.Add(this.textBox14);
-            this.Controls.Add(this.label14);
-            this.Controls.Add(this.textBox13);
-            this.Controls.Add(this.label13);
-            this.Controls.Add(this.textBox12);
-            this.Controls.Add(this.label12);
-            this.Controls.Add(this.textBox11);
-            this.Controls.Add(this.label11);
-            this.Controls.Add(this.textBox10);
-            this.Controls.Add(this.label10);
-            this.Controls.Add(this.textBox9);
-            this.Controls.Add(this.label9);
-            this.Controls.Add(this.textBox8);
-            this.Controls.Add(this.label8);
-            this.Controls.Add(this.textBox7);
-            this.Controls.Add(this.label7);
-            this.Controls.Add(this.textBox6);
-            this.Controls.Add(this.label6);
-            this.Controls.Add(this.textBox5);
-            this.Controls.Add(this.label5);
-            this.Controls.Add(this.textBox4);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.textBox3);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.textBox2);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.textBox1);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.okButton);
-            this.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-            this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.Name = "CycleEndForm";
-            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
-            this.Text = "Daten";
-            this.TopMost = true;
-            this.Load += new System.EventHandler(this.CycleEndForm_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TextBox textBox2;
-        private System.Windows.Forms.Label label2;
-		private System.Windows.Forms.TextBox textBox1;
-		private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Button okButton;
-        private System.Windows.Forms.TextBox textBox3;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.TextBox textBox4;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.TextBox textBox5;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.TextBox textBox6;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.TextBox textBox7;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.TextBox textBox8;
-        private System.Windows.Forms.Label label8;
-        private System.Windows.Forms.TextBox textBox9;
-        private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.TextBox textBox10;
-        private System.Windows.Forms.Label label10;
-        private System.Windows.Forms.TextBox textBox11;
-        private System.Windows.Forms.Label label11;
-        private System.Windows.Forms.TextBox textBox12;
-        private System.Windows.Forms.Label label12;
-        private System.Windows.Forms.TextBox textBox13;
-        private System.Windows.Forms.Label label13;
-        private System.Windows.Forms.TextBox textBox14;
-        private System.Windows.Forms.Label label14;
-        private System.Windows.Forms.TextBox textBox15;
-        private System.Windows.Forms.Label label15;
-        private System.Windows.Forms.TextBox textBox16;
-        private System.Windows.Forms.Label label16;
-        private System.Windows.Forms.TextBox textBox17;
-        private System.Windows.Forms.Label label17;
-        private System.Windows.Forms.TextBox textBox18;
-        private System.Windows.Forms.Label label18;
-        private System.Windows.Forms.TextBox textBox19;
-        private System.Windows.Forms.Label label19;
-        private System.Windows.Forms.TextBox textBox20;
-        private System.Windows.Forms.Label label20;
-        private System.Windows.Forms.TextBox textBox21;
-        private System.Windows.Forms.Label label21;
-        private System.Windows.Forms.TextBox textBox22;
-        private System.Windows.Forms.Label label22;
-        private System.Windows.Forms.TextBox textBox23;
-        private System.Windows.Forms.Label label23;
-        private System.Windows.Forms.TextBox textBox24;
-        private System.Windows.Forms.Label label24;
-
-	}
-}
@@ -1,155 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Slovensko a.s.
-///
-using System;
-using System.Windows.Forms;
-using log4net;
-using TBF.Resources;
-
-namespace TBF.BenchControl.DataEntry.Standard24
-{
-	public partial class CycleEndForm : Form, GenericDevices.IHasCompleted
-    {
-		private static readonly ILog log = LogManager.GetLogger(typeof(CycleEndForm));
-
-		/// <summary> Number of text boxes for serial numbers </summary>
-        public readonly int WaterMetersCount;
-        readonly int lineSize;
-
- 		// To be retrieved after the form closes
-        public string[] EndStateText;
-
-		// Set to 'true' when the form closes
-        public bool Completed { get { return completed; } }
-		bool completed;
-
-        int textBoxesCount;
-        Label[] labels;
-        TextBox[] textBoxes;
-
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
-        public CycleEndForm()
-        {
-            InitializeComponent();
-			ControlBox = false;
-
-            labels = new Label[]
-				{
-					label1,  label2,  label3,  label4,  label5,  label6,  label7,  label8,  label9,  label10,
-					label11, label12, label13, label14, label15, label16, label17, label18, label19, label20,
-					label21, label22, label23, label24,
-				};
-            textBoxes = new TextBox[]
-				{
-					textBox1,  textBox2,  textBox3,  textBox4,  textBox5,  textBox6,
-					textBox7,  textBox8,  textBox9,  textBox10, textBox11, textBox12,
-					textBox13, textBox14, textBox15, textBox16, textBox17, textBox18,
-					textBox19, textBox20, textBox21, textBox22, textBox23, textBox24,
-				};
-            textBoxesCount = textBoxes.Length;
-            this.WaterMetersCount = textBoxesCount;
-            this.lineSize = textBoxesCount / 2;
-
-            completed = false;
-			StartForceCloseHandler();
-		}
-
-        /// <summary> Parameterless constructor for 3 watermeters </summary>
-        public CycleEndForm(int waterMetersCount, int lineSize)
-            : this()
-        {
-            this.WaterMetersCount = waterMetersCount;
-            this.lineSize = lineSize;
-            ShuffleTextBoxes(waterMetersCount, lineSize);
-            EndStateText = new string[WaterMetersCount];
-        }
-
-        /// <summary>
-        /// Make sure the layout of labels/text boxes on the screen
-        /// corresponds to the layout of watermeters of the test bench.
-        /// </summary>
-        /// <param name="wmsCount">Number of watermeters</param>
-        /// <param name="lineSize">Number of watermeters in one line</param>
-        void ShuffleTextBoxes(int wmsCount, int lineSize)
-        {
-            if (wmsCount < textBoxesCount && lineSize > 0)
-            {
-                int nrLines = (wmsCount + lineSize - 1) / lineSize;
-                int gap = (textBoxesCount - wmsCount) / nrLines;
-
-                int dest = 0;
-                for (int l = 0; l < nrLines; l++)
-                {
-                    for (int i = 0; i < lineSize; i++)
-                    {
-                        labels[dest] = labels[l * lineSize + l * gap + i];
-                        textBoxes[dest] = textBoxes[l * lineSize + l * gap + i];
-                        dest++;
-                    }
-                }
-                textBoxesCount = wmsCount;
-            }
-        }
-
-		private void CycleEndForm_Load(object sender, EventArgs e)
-		{
-			Localize();
-
-            Height = 60 + 36 * lineSize;
-
-            for (int i = 0; i < textBoxesCount; i++)
-            {
-                if (i >= WaterMetersCount)
-                {
-                    labels[i].Visible = false;
-                    textBoxes[i].Visible = false;
-                }
-            }
-		}
-
-		void Localize()
-		{
-			Text = Strings.Data;
-            okButton.Text = Strings.OkBtnText;
-
-            for (int i = 0; i < WaterMetersCount; i++)
-            {
-                labels[i].Text = string.Format("{0} {1}:", Strings.Water_Meter, (i + 1).ToString());
-            }
-		}
-
-		private void okButton_Click(object sender, EventArgs e)
-		{
-            for (int i = 0; i < WaterMetersCount; i++)
-            {
-                EndStateText[i] = textBoxes[i].Text;
-            }
-
-			completed = true;
-			Close();
-		}
-
-		#region Forced close handling
-
-		public void StartForceCloseHandler()
-		{
-			UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args)
-			{
-				if (InvokeRequired) { Invoke(new EventHandler<EventArgs>(OnForceClose), sender, args); }
-				else OnForceClose(sender, args);
-			};
-		}
-
-		void OnForceClose(object sender, EventArgs args)
-		{
-			DialogResult = DialogResult.Cancel;
-			Close();
-		}
-
-		#endregion
-	}
-}
@@ -1,327 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Slovensko a.s.
-///
-namespace TBF.BenchControl.DataEntry.Standard6
-{
-    partial class CycleEndForm
-    {
-        /// <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.textBox2 = new System.Windows.Forms.TextBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.textBox1 = new System.Windows.Forms.TextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.okButton = new System.Windows.Forms.Button();
-            this.textBox3 = new System.Windows.Forms.TextBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.textBox4 = new System.Windows.Forms.TextBox();
-            this.label4 = new System.Windows.Forms.Label();
-            this.textBox5 = new System.Windows.Forms.TextBox();
-            this.label5 = new System.Windows.Forms.Label();
-            this.textBox6 = new System.Windows.Forms.TextBox();
-            this.label6 = new System.Windows.Forms.Label();
-            this.remarkTextBox1 = new System.Windows.Forms.TextBox();
-            this.stateLabel = new System.Windows.Forms.Label();
-            this.remarkLabel = new System.Windows.Forms.Label();
-            this.remarkTextBox2 = new System.Windows.Forms.TextBox();
-            this.remarkTextBox3 = new System.Windows.Forms.TextBox();
-            this.remarkTextBox4 = new System.Windows.Forms.TextBox();
-            this.remarkTextBox5 = new System.Windows.Forms.TextBox();
-            this.remarkTextBox6 = new System.Windows.Forms.TextBox();
-            this.batchRemarkButton = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // textBox2
-            // 
-            this.textBox2.Location = new System.Drawing.Point(200, 107);
-            this.textBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
-            this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(159, 31);
-            this.textBox2.TabIndex = 1;
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(26, 110);
-            this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(147, 23);
-            this.label2.TabIndex = 0;
-            this.label2.Text = "Water meter 2";
-            // 
-            // textBox1
-            // 
-            this.textBox1.Location = new System.Drawing.Point(200, 61);
-            this.textBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(159, 31);
-            this.textBox1.TabIndex = 1;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(26, 64);
-            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(147, 23);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "Water meter 1";
-            // 
-            // okButton
-            // 
-            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.okButton.ForeColor = System.Drawing.Color.Black;
-            this.okButton.Location = new System.Drawing.Point(858, 32);
-            this.okButton.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
-            this.okButton.Name = "okButton";
-            this.okButton.Size = new System.Drawing.Size(108, 60);
-            this.okButton.TabIndex = 7;
-            this.okButton.Text = "OK";
-            this.okButton.UseVisualStyleBackColor = true;
-            this.okButton.Click += new System.EventHandler(this.okButton_Click);
-            // 
-            // textBox3
-            // 
-            this.textBox3.Location = new System.Drawing.Point(200, 153);
-            this.textBox3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
-            this.textBox3.Name = "textBox3";
-            this.textBox3.Size = new System.Drawing.Size(159, 31);
-            this.textBox3.TabIndex = 1;
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(26, 156);
-            this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(147, 23);
-            this.label3.TabIndex = 0;
-            this.label3.Text = "Water meter 3";
-            // 
-            // textBox4
-            // 
-            this.textBox4.Location = new System.Drawing.Point(200, 199);
-            this.textBox4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
-            this.textBox4.Name = "textBox4";
-            this.textBox4.Size = new System.Drawing.Size(159, 31);
-            this.textBox4.TabIndex = 1;
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(26, 202);
-            this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(147, 23);
-            this.label4.TabIndex = 0;
-            this.label4.Text = "Water meter 4";
-            // 
-            // textBox5
-            // 
-            this.textBox5.Location = new System.Drawing.Point(200, 245);
-            this.textBox5.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
-            this.textBox5.Name = "textBox5";
-            this.textBox5.Size = new System.Drawing.Size(159, 31);
-            this.textBox5.TabIndex = 1;
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(26, 248);
-            this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(147, 23);
-            this.label5.TabIndex = 0;
-            this.label5.Text = "Water meter 5";
-            // 
-            // textBox6
-            // 
-            this.textBox6.Location = new System.Drawing.Point(200, 291);
-            this.textBox6.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
-            this.textBox6.Name = "textBox6";
-            this.textBox6.Size = new System.Drawing.Size(159, 31);
-            this.textBox6.TabIndex = 1;
-            // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(26, 294);
-            this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(147, 23);
-            this.label6.TabIndex = 0;
-            this.label6.Text = "Water meter 6";
-            // 
-            // remarkTextBox1
-            // 
-            this.remarkTextBox1.Location = new System.Drawing.Point(400, 61);
-            this.remarkTextBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
-            this.remarkTextBox1.Name = "remarkTextBox1";
-            this.remarkTextBox1.Size = new System.Drawing.Size(421, 31);
-            this.remarkTextBox1.TabIndex = 8;
-            // 
-            // stateLabel
-            // 
-            this.stateLabel.AutoSize = true;
-            this.stateLabel.Location = new System.Drawing.Point(196, 24);
-            this.stateLabel.Name = "stateLabel";
-            this.stateLabel.Size = new System.Drawing.Size(68, 23);
-            this.stateLabel.TabIndex = 9;
-            this.stateLabel.Text = "State:";
-            // 
-            // remarkLabel
-            // 
-            this.remarkLabel.AutoSize = true;
-            this.remarkLabel.Location = new System.Drawing.Point(396, 24);
-            this.remarkLabel.Name = "remarkLabel";
-            this.remarkLabel.Size = new System.Drawing.Size(211, 23);
-            this.remarkLabel.TabIndex = 10;
-            this.remarkLabel.Text = "Water meter remark:";
-            // 
-            // remarkTextBox2
-            // 
-            this.remarkTextBox2.Location = new System.Drawing.Point(400, 107);
-            this.remarkTextBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
-            this.remarkTextBox2.Name = "remarkTextBox2";
-            this.remarkTextBox2.Size = new System.Drawing.Size(421, 31);
-            this.remarkTextBox2.TabIndex = 11;
-            // 
-            // remarkTextBox3
-            // 
-            this.remarkTextBox3.Location = new System.Drawing.Point(400, 153);
-            this.remarkTextBox3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
-            this.remarkTextBox3.Name = "remarkTextBox3";
-            this.remarkTextBox3.Size = new System.Drawing.Size(421, 31);
-            this.remarkTextBox3.TabIndex = 12;
-            // 
-            // remarkTextBox4
-            // 
-            this.remarkTextBox4.Location = new System.Drawing.Point(400, 199);
-            this.remarkTextBox4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
-            this.remarkTextBox4.Name = "remarkTextBox4";
-            this.remarkTextBox4.Size = new System.Drawing.Size(421, 31);
-            this.remarkTextBox4.TabIndex = 13;
-            // 
-            // remarkTextBox5
-            // 
-            this.remarkTextBox5.Location = new System.Drawing.Point(400, 245);
-            this.remarkTextBox5.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
-            this.remarkTextBox5.Name = "remarkTextBox5";
-            this.remarkTextBox5.Size = new System.Drawing.Size(421, 31);
-            this.remarkTextBox5.TabIndex = 14;
-            // 
-            // remarkTextBox6
-            // 
-            this.remarkTextBox6.Location = new System.Drawing.Point(400, 291);
-            this.remarkTextBox6.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
-            this.remarkTextBox6.Name = "remarkTextBox6";
-            this.remarkTextBox6.Size = new System.Drawing.Size(421, 31);
-            this.remarkTextBox6.TabIndex = 15;
-            // 
-            // batchRemarkButton
-            // 
-            this.batchRemarkButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.batchRemarkButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.batchRemarkButton.ForeColor = System.Drawing.Color.Black;
-            this.batchRemarkButton.Location = new System.Drawing.Point(858, 107);
-            this.batchRemarkButton.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
-            this.batchRemarkButton.Name = "batchRemarkButton";
-            this.batchRemarkButton.Size = new System.Drawing.Size(108, 60);
-            this.batchRemarkButton.TabIndex = 16;
-            this.batchRemarkButton.Text = "Batch remark";
-            this.batchRemarkButton.UseVisualStyleBackColor = true;
-            this.batchRemarkButton.Click += new System.EventHandler(this.batchRemarkButton_Click);
-            // 
-            // CycleEndForm
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 23F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = System.Drawing.Color.DarkGoldenrod;
-            this.ClientSize = new System.Drawing.Size(1001, 349);
-            this.Controls.Add(this.batchRemarkButton);
-            this.Controls.Add(this.remarkTextBox6);
-            this.Controls.Add(this.remarkTextBox5);
-            this.Controls.Add(this.remarkTextBox4);
-            this.Controls.Add(this.remarkTextBox3);
-            this.Controls.Add(this.remarkTextBox2);
-            this.Controls.Add(this.remarkLabel);
-            this.Controls.Add(this.stateLabel);
-            this.Controls.Add(this.remarkTextBox1);
-            this.Controls.Add(this.textBox6);
-            this.Controls.Add(this.label6);
-            this.Controls.Add(this.textBox5);
-            this.Controls.Add(this.label5);
-            this.Controls.Add(this.textBox4);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.textBox3);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.textBox2);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.textBox1);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.okButton);
-            this.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-            this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
-            this.Name = "CycleEndForm";
-            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
-            this.Text = "Daten";
-            this.TopMost = true;
-            this.Load += new System.EventHandler(this.CycleEndForm_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TextBox textBox2;
-        private System.Windows.Forms.Label label2;
-		private System.Windows.Forms.TextBox textBox1;
-		private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Button okButton;
-        private System.Windows.Forms.TextBox textBox3;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.TextBox textBox4;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.TextBox textBox5;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.TextBox textBox6;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.TextBox remarkTextBox1;
-        private System.Windows.Forms.Label stateLabel;
-        private System.Windows.Forms.Label remarkLabel;
-        private System.Windows.Forms.TextBox remarkTextBox2;
-        private System.Windows.Forms.TextBox remarkTextBox3;
-        private System.Windows.Forms.TextBox remarkTextBox4;
-        private System.Windows.Forms.TextBox remarkTextBox5;
-        private System.Windows.Forms.TextBox remarkTextBox6;
-        private System.Windows.Forms.Button batchRemarkButton;
-
-	}
-}
@@ -1,144 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Slovensko a.s.
-///
-using System;
-using System.Windows.Forms;
-using log4net;
-using TBF.Resources;
-
-namespace TBF.BenchControl.DataEntry.Standard6
-{
-	public partial class CycleEndForm : Form, GenericDevices.IHasCompleted
-    {
-		private static readonly ILog log = LogManager.GetLogger(typeof(CycleEndForm));
-
-		/// <summary> Number of text boxes for serial numbers </summary>
-        public readonly int WaterMetersCount;
-        public readonly bool RemarkEnabled;
-
- 		// To be retrieved after the form closes
-        public string[] EndStateText;
-        public string[] Remark;
-        public string BatchRemark;
-
-		// Set to 'true' when the form closes
-        public bool Completed { get { return completed; } }
-		bool completed;
-
-        int textBoxesCount;
-        Label[] labels;
-        TextBox[] stateBoxes;
-        TextBox[] remarkBoxes;
-
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
-        public CycleEndForm()
-        {
-            InitializeComponent();
-			ControlBox = false;
-
-            labels = new Label[] { label1,  label2,  label3,  label4,  label5,  label6 };
-            stateBoxes = new TextBox[] { textBox1,  textBox2,  textBox3,  textBox4,  textBox5,  textBox6 };
-            remarkBoxes = new TextBox[] { remarkTextBox1, remarkTextBox2, remarkTextBox3,
-                                          remarkTextBox4, remarkTextBox5, remarkTextBox6 };
-            textBoxesCount = stateBoxes.Length;
-            this.WaterMetersCount = textBoxesCount;
-
-            completed = false;
-			StartForceCloseHandler();
-		}
-
-        /// <summary> Parameterless constructor for 3 watermeters </summary>
-        public CycleEndForm(int waterMetersCount, bool remarkEnabled)
-            : this()
-        {
-            this.WaterMetersCount = waterMetersCount;
-            this.RemarkEnabled = remarkEnabled;
-            EndStateText = new string[WaterMetersCount];
-            Remark = new string[WaterMetersCount];
-        }
-
-		private void CycleEndForm_Load(object sender, EventArgs e)
-		{
-			Localize();
-
-            Height = 100 + 46 * WaterMetersCount;
-
-            if (!RemarkEnabled)
-            {
-                remarkLabel.Visible = false;
-                batchRemarkButton.Visible = false;
-                Width -= remarkTextBox1.Width;
-            }
-
-            for (int i = 0; i < textBoxesCount; i++)
-            {
-                if (!RemarkEnabled) remarkBoxes[i].Visible = false;
-
-                if (i >= WaterMetersCount)
-                {
-                    labels[i].Visible = false;
-                    stateBoxes[i].Visible = false;
-                    remarkBoxes[i].Visible = false;
-                }
-            }
-		}
-
-		void Localize()
-		{
-			Text = Strings.Data;
-            okButton.Text = Strings.OkBtnText;
-
-            for (int i = 0; i < WaterMetersCount; i++)
-            {
-                labels[i].Text = string.Format("{0} {1}:", Strings.Water_Meter, i + 1);
-            }
-
-            stateLabel.Text = string.Format("{0}:", Strings.State);
-            remarkLabel.Text = string.Format("{0} {1}:", Strings.Water_Meter, Strings.Remark);
-		}
-
-		private void okButton_Click(object sender, EventArgs e)
-		{
-            for (int i = 0; i < WaterMetersCount; i++)
-            {
-                EndStateText[i] = stateBoxes[i].Text;
-                Remark[i] = remarkBoxes[i].Text;
-            }
-
-			completed = true;
-			Close();
-		}
-
-		#region Forced close handling
-
-		public void StartForceCloseHandler()
-		{
-			UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args)
-			{
-				if (InvokeRequired) { Invoke(new EventHandler<EventArgs>(OnForceClose), sender, args); }
-				else OnForceClose(sender, args);
-			};
-		}
-
-		void OnForceClose(object sender, EventArgs args)
-		{
-			DialogResult = DialogResult.Cancel;
-			Close();
-		}
-
-		#endregion
-
-        private void batchRemarkButton_Click(object sender, EventArgs e)
-        {
-            TBF.Forms.RemarkDlg dlg = new TBF.Forms.RemarkDlg() { Remark = ((BatchRemark == null) ? string.Empty : BatchRemark) };
-            if (dlg.ShowDialog() == DialogResult.OK)
-            {
-                BatchRemark = dlg.Remark;
-            }
-        }
-	}
-}
@@ -1,652 +0,0 @@
-///
-/// Copyright (c) 2015 Sensus Metering Systems
-///
-namespace TBF.BenchControl.DataEntry.StandardCamera
-{
-    partial class CycleEndForm
-    {
-        /// <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.textBox2 = new System.Windows.Forms.TextBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.textBox1 = new System.Windows.Forms.TextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.okButton = new System.Windows.Forms.Button();
-            this.textBox3 = new System.Windows.Forms.TextBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.textBox4 = new System.Windows.Forms.TextBox();
-            this.label4 = new System.Windows.Forms.Label();
-            this.textBox5 = new System.Windows.Forms.TextBox();
-            this.label5 = new System.Windows.Forms.Label();
-            this.textBox6 = new System.Windows.Forms.TextBox();
-            this.label6 = new System.Windows.Forms.Label();
-            this.textBox7 = new System.Windows.Forms.TextBox();
-            this.label7 = new System.Windows.Forms.Label();
-            this.textBox8 = new System.Windows.Forms.TextBox();
-            this.label8 = new System.Windows.Forms.Label();
-            this.textBox9 = new System.Windows.Forms.TextBox();
-            this.label9 = new System.Windows.Forms.Label();
-            this.textBox10 = new System.Windows.Forms.TextBox();
-            this.label10 = new System.Windows.Forms.Label();
-            this.textBox11 = new System.Windows.Forms.TextBox();
-            this.label11 = new System.Windows.Forms.Label();
-            this.textBox12 = new System.Windows.Forms.TextBox();
-            this.label12 = new System.Windows.Forms.Label();
-            this.textBox13 = new System.Windows.Forms.TextBox();
-            this.label13 = new System.Windows.Forms.Label();
-            this.textBox14 = new System.Windows.Forms.TextBox();
-            this.label14 = new System.Windows.Forms.Label();
-            this.textBox15 = new System.Windows.Forms.TextBox();
-            this.label15 = new System.Windows.Forms.Label();
-            this.textBox16 = new System.Windows.Forms.TextBox();
-            this.label16 = new System.Windows.Forms.Label();
-            this.textBox17 = new System.Windows.Forms.TextBox();
-            this.label17 = new System.Windows.Forms.Label();
-            this.textBox18 = new System.Windows.Forms.TextBox();
-            this.label18 = new System.Windows.Forms.Label();
-            this.textBox19 = new System.Windows.Forms.TextBox();
-            this.label19 = new System.Windows.Forms.Label();
-            this.textBox20 = new System.Windows.Forms.TextBox();
-            this.label20 = new System.Windows.Forms.Label();
-            this.textBox21 = new System.Windows.Forms.TextBox();
-            this.label21 = new System.Windows.Forms.Label();
-            this.textBox22 = new System.Windows.Forms.TextBox();
-            this.label22 = new System.Windows.Forms.Label();
-            this.textBox23 = new System.Windows.Forms.TextBox();
-            this.label23 = new System.Windows.Forms.Label();
-            this.textBox24 = new System.Windows.Forms.TextBox();
-            this.label24 = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // textBox2
-            // 
-            this.textBox2.Location = new System.Drawing.Point(205, 66);
-            this.textBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(169, 27);
-            this.textBox2.TabIndex = 1;
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(38, 71);
-            this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(62, 18);
-            this.label2.TabIndex = 0;
-            this.label2.Text = "Stand:";
-            // 
-            // textBox1
-            // 
-            this.textBox1.Location = new System.Drawing.Point(205, 30);
-            this.textBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(169, 27);
-            this.textBox1.TabIndex = 1;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(38, 35);
-            this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(62, 18);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "Stand:";
-            // 
-            // okButton
-            // 
-            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.okButton.ForeColor = System.Drawing.Color.Black;
-            this.okButton.Location = new System.Drawing.Point(832, 30);
-            this.okButton.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.okButton.Name = "okButton";
-            this.okButton.Size = new System.Drawing.Size(90, 60);
-            this.okButton.TabIndex = 7;
-            this.okButton.Text = "OK";
-            this.okButton.UseVisualStyleBackColor = true;
-            this.okButton.Click += new System.EventHandler(this.okButton_Click);
-            // 
-            // textBox3
-            // 
-            this.textBox3.Location = new System.Drawing.Point(205, 102);
-            this.textBox3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox3.Name = "textBox3";
-            this.textBox3.Size = new System.Drawing.Size(169, 27);
-            this.textBox3.TabIndex = 1;
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(38, 107);
-            this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(62, 18);
-            this.label3.TabIndex = 0;
-            this.label3.Text = "Stand:";
-            // 
-            // textBox4
-            // 
-            this.textBox4.Location = new System.Drawing.Point(205, 138);
-            this.textBox4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox4.Name = "textBox4";
-            this.textBox4.Size = new System.Drawing.Size(169, 27);
-            this.textBox4.TabIndex = 1;
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(38, 143);
-            this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(62, 18);
-            this.label4.TabIndex = 0;
-            this.label4.Text = "Stand:";
-            // 
-            // textBox5
-            // 
-            this.textBox5.Location = new System.Drawing.Point(205, 174);
-            this.textBox5.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox5.Name = "textBox5";
-            this.textBox5.Size = new System.Drawing.Size(169, 27);
-            this.textBox5.TabIndex = 1;
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(38, 179);
-            this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(62, 18);
-            this.label5.TabIndex = 0;
-            this.label5.Text = "Stand:";
-            // 
-            // textBox6
-            // 
-            this.textBox6.Location = new System.Drawing.Point(205, 210);
-            this.textBox6.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox6.Name = "textBox6";
-            this.textBox6.Size = new System.Drawing.Size(169, 27);
-            this.textBox6.TabIndex = 1;
-            // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(38, 215);
-            this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(62, 18);
-            this.label6.TabIndex = 0;
-            this.label6.Text = "Stand:";
-            // 
-            // textBox7
-            // 
-            this.textBox7.Location = new System.Drawing.Point(205, 246);
-            this.textBox7.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox7.Name = "textBox7";
-            this.textBox7.Size = new System.Drawing.Size(169, 27);
-            this.textBox7.TabIndex = 9;
-            // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(38, 251);
-            this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(62, 18);
-            this.label7.TabIndex = 8;
-            this.label7.Text = "Stand:";
-            // 
-            // textBox8
-            // 
-            this.textBox8.Location = new System.Drawing.Point(205, 282);
-            this.textBox8.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox8.Name = "textBox8";
-            this.textBox8.Size = new System.Drawing.Size(169, 27);
-            this.textBox8.TabIndex = 11;
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(38, 287);
-            this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(62, 18);
-            this.label8.TabIndex = 10;
-            this.label8.Text = "Stand:";
-            // 
-            // textBox9
-            // 
-            this.textBox9.Location = new System.Drawing.Point(205, 318);
-            this.textBox9.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox9.Name = "textBox9";
-            this.textBox9.Size = new System.Drawing.Size(169, 27);
-            this.textBox9.TabIndex = 13;
-            // 
-            // label9
-            // 
-            this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(38, 323);
-            this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(62, 18);
-            this.label9.TabIndex = 12;
-            this.label9.Text = "Stand:";
-            // 
-            // textBox10
-            // 
-            this.textBox10.Location = new System.Drawing.Point(205, 354);
-            this.textBox10.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox10.Name = "textBox10";
-            this.textBox10.Size = new System.Drawing.Size(169, 27);
-            this.textBox10.TabIndex = 15;
-            // 
-            // label10
-            // 
-            this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(38, 359);
-            this.label10.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(62, 18);
-            this.label10.TabIndex = 14;
-            this.label10.Text = "Stand:";
-            // 
-            // textBox11
-            // 
-            this.textBox11.Location = new System.Drawing.Point(205, 390);
-            this.textBox11.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox11.Name = "textBox11";
-            this.textBox11.Size = new System.Drawing.Size(169, 27);
-            this.textBox11.TabIndex = 17;
-            // 
-            // label11
-            // 
-            this.label11.AutoSize = true;
-            this.label11.Location = new System.Drawing.Point(38, 395);
-            this.label11.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(62, 18);
-            this.label11.TabIndex = 16;
-            this.label11.Text = "Stand:";
-            // 
-            // textBox12
-            // 
-            this.textBox12.Location = new System.Drawing.Point(205, 426);
-            this.textBox12.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox12.Name = "textBox12";
-            this.textBox12.Size = new System.Drawing.Size(169, 27);
-            this.textBox12.TabIndex = 19;
-            // 
-            // label12
-            // 
-            this.label12.AutoSize = true;
-            this.label12.Location = new System.Drawing.Point(38, 431);
-            this.label12.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(62, 18);
-            this.label12.TabIndex = 18;
-            this.label12.Text = "Stand:";
-            // 
-            // textBox13
-            // 
-            this.textBox13.Location = new System.Drawing.Point(623, 30);
-            this.textBox13.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox13.Name = "textBox13";
-            this.textBox13.Size = new System.Drawing.Size(169, 27);
-            this.textBox13.TabIndex = 21;
-            // 
-            // label13
-            // 
-            this.label13.AutoSize = true;
-            this.label13.Location = new System.Drawing.Point(456, 35);
-            this.label13.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(62, 18);
-            this.label13.TabIndex = 20;
-            this.label13.Text = "Stand:";
-            // 
-            // textBox14
-            // 
-            this.textBox14.Location = new System.Drawing.Point(623, 66);
-            this.textBox14.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox14.Name = "textBox14";
-            this.textBox14.Size = new System.Drawing.Size(169, 27);
-            this.textBox14.TabIndex = 23;
-            // 
-            // label14
-            // 
-            this.label14.AutoSize = true;
-            this.label14.Location = new System.Drawing.Point(456, 71);
-            this.label14.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(62, 18);
-            this.label14.TabIndex = 22;
-            this.label14.Text = "Stand:";
-            // 
-            // textBox15
-            // 
-            this.textBox15.Location = new System.Drawing.Point(623, 102);
-            this.textBox15.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox15.Name = "textBox15";
-            this.textBox15.Size = new System.Drawing.Size(169, 27);
-            this.textBox15.TabIndex = 25;
-            // 
-            // label15
-            // 
-            this.label15.AutoSize = true;
-            this.label15.Location = new System.Drawing.Point(456, 107);
-            this.label15.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(62, 18);
-            this.label15.TabIndex = 24;
-            this.label15.Text = "Stand:";
-            // 
-            // textBox16
-            // 
-            this.textBox16.Location = new System.Drawing.Point(623, 138);
-            this.textBox16.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox16.Name = "textBox16";
-            this.textBox16.Size = new System.Drawing.Size(169, 27);
-            this.textBox16.TabIndex = 27;
-            // 
-            // label16
-            // 
-            this.label16.AutoSize = true;
-            this.label16.Location = new System.Drawing.Point(456, 143);
-            this.label16.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label16.Name = "label16";
-            this.label16.Size = new System.Drawing.Size(62, 18);
-            this.label16.TabIndex = 26;
-            this.label16.Text = "Stand:";
-            // 
-            // textBox17
-            // 
-            this.textBox17.Location = new System.Drawing.Point(623, 174);
-            this.textBox17.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox17.Name = "textBox17";
-            this.textBox17.Size = new System.Drawing.Size(169, 27);
-            this.textBox17.TabIndex = 29;
-            // 
-            // label17
-            // 
-            this.label17.AutoSize = true;
-            this.label17.Location = new System.Drawing.Point(456, 179);
-            this.label17.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(62, 18);
-            this.label17.TabIndex = 28;
-            this.label17.Text = "Stand:";
-            // 
-            // textBox18
-            // 
-            this.textBox18.Location = new System.Drawing.Point(623, 210);
-            this.textBox18.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox18.Name = "textBox18";
-            this.textBox18.Size = new System.Drawing.Size(169, 27);
-            this.textBox18.TabIndex = 31;
-            // 
-            // label18
-            // 
-            this.label18.AutoSize = true;
-            this.label18.Location = new System.Drawing.Point(456, 215);
-            this.label18.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label18.Name = "label18";
-            this.label18.Size = new System.Drawing.Size(62, 18);
-            this.label18.TabIndex = 30;
-            this.label18.Text = "Stand:";
-            // 
-            // textBox19
-            // 
-            this.textBox19.Location = new System.Drawing.Point(623, 246);
-            this.textBox19.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox19.Name = "textBox19";
-            this.textBox19.Size = new System.Drawing.Size(169, 27);
-            this.textBox19.TabIndex = 33;
-            // 
-            // label19
-            // 
-            this.label19.AutoSize = true;
-            this.label19.Location = new System.Drawing.Point(456, 251);
-            this.label19.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label19.Name = "label19";
-            this.label19.Size = new System.Drawing.Size(62, 18);
-            this.label19.TabIndex = 32;
-            this.label19.Text = "Stand:";
-            // 
-            // textBox20
-            // 
-            this.textBox20.Location = new System.Drawing.Point(623, 282);
-            this.textBox20.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox20.Name = "textBox20";
-            this.textBox20.Size = new System.Drawing.Size(169, 27);
-            this.textBox20.TabIndex = 35;
-            // 
-            // label20
-            // 
-            this.label20.AutoSize = true;
-            this.label20.Location = new System.Drawing.Point(456, 287);
-            this.label20.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label20.Name = "label20";
-            this.label20.Size = new System.Drawing.Size(62, 18);
-            this.label20.TabIndex = 34;
-            this.label20.Text = "Stand:";
-            // 
-            // textBox21
-            // 
-            this.textBox21.Location = new System.Drawing.Point(623, 318);
-            this.textBox21.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox21.Name = "textBox21";
-            this.textBox21.Size = new System.Drawing.Size(169, 27);
-            this.textBox21.TabIndex = 37;
-            // 
-            // label21
-            // 
-            this.label21.AutoSize = true;
-            this.label21.Location = new System.Drawing.Point(456, 323);
-            this.label21.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label21.Name = "label21";
-            this.label21.Size = new System.Drawing.Size(62, 18);
-            this.label21.TabIndex = 36;
-            this.label21.Text = "Stand:";
-            // 
-            // textBox22
-            // 
-            this.textBox22.Location = new System.Drawing.Point(623, 354);
-            this.textBox22.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox22.Name = "textBox22";
-            this.textBox22.Size = new System.Drawing.Size(169, 27);
-            this.textBox22.TabIndex = 39;
-            // 
-            // label22
-            // 
-            this.label22.AutoSize = true;
-            this.label22.Location = new System.Drawing.Point(456, 359);
-            this.label22.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(62, 18);
-            this.label22.TabIndex = 38;
-            this.label22.Text = "Stand:";
-            // 
-            // textBox23
-            // 
-            this.textBox23.Location = new System.Drawing.Point(623, 390);
-            this.textBox23.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox23.Name = "textBox23";
-            this.textBox23.Size = new System.Drawing.Size(169, 27);
-            this.textBox23.TabIndex = 41;
-            // 
-            // label23
-            // 
-            this.label23.AutoSize = true;
-            this.label23.Location = new System.Drawing.Point(456, 395);
-            this.label23.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label23.Name = "label23";
-            this.label23.Size = new System.Drawing.Size(62, 18);
-            this.label23.TabIndex = 40;
-            this.label23.Text = "Stand:";
-            // 
-            // textBox24
-            // 
-            this.textBox24.Location = new System.Drawing.Point(623, 426);
-            this.textBox24.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.textBox24.Name = "textBox24";
-            this.textBox24.Size = new System.Drawing.Size(169, 27);
-            this.textBox24.TabIndex = 43;
-            // 
-            // label24
-            // 
-            this.label24.AutoSize = true;
-            this.label24.Location = new System.Drawing.Point(456, 431);
-            this.label24.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label24.Name = "label24";
-            this.label24.Size = new System.Drawing.Size(62, 18);
-            this.label24.TabIndex = 42;
-            this.label24.Text = "Stand:";
-            // 
-            // CycleEndForm
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 18F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = System.Drawing.Color.DarkGoldenrod;
-            this.ClientSize = new System.Drawing.Size(959, 489);
-            this.Controls.Add(this.textBox24);
-            this.Controls.Add(this.label24);
-            this.Controls.Add(this.textBox23);
-            this.Controls.Add(this.label23);
-            this.Controls.Add(this.textBox22);
-            this.Controls.Add(this.label22);
-            this.Controls.Add(this.textBox21);
-            this.Controls.Add(this.label21);
-            this.Controls.Add(this.textBox20);
-            this.Controls.Add(this.label20);
-            this.Controls.Add(this.textBox19);
-            this.Controls.Add(this.label19);
-            this.Controls.Add(this.textBox18);
-            this.Controls.Add(this.label18);
-            this.Controls.Add(this.textBox17);
-            this.Controls.Add(this.label17);
-            this.Controls.Add(this.textBox16);
-            this.Controls.Add(this.label16);
-            this.Controls.Add(this.textBox15);
-            this.Controls.Add(this.label15);
-            this.Controls.Add(this.textBox14);
-            this.Controls.Add(this.label14);
-            this.Controls.Add(this.textBox13);
-            this.Controls.Add(this.label13);
-            this.Controls.Add(this.textBox12);
-            this.Controls.Add(this.label12);
-            this.Controls.Add(this.textBox11);
-            this.Controls.Add(this.label11);
-            this.Controls.Add(this.textBox10);
-            this.Controls.Add(this.label10);
-            this.Controls.Add(this.textBox9);
-            this.Controls.Add(this.label9);
-            this.Controls.Add(this.textBox8);
-            this.Controls.Add(this.label8);
-            this.Controls.Add(this.textBox7);
-            this.Controls.Add(this.label7);
-            this.Controls.Add(this.textBox6);
-            this.Controls.Add(this.label6);
-            this.Controls.Add(this.textBox5);
-            this.Controls.Add(this.label5);
-            this.Controls.Add(this.textBox4);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.textBox3);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.textBox2);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.textBox1);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.okButton);
-            this.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-            this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.Name = "CycleEndForm";
-            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
-            this.Text = "Daten";
-            this.TopMost = true;
-            this.Load += new System.EventHandler(this.CycleEndForm_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TextBox textBox2;
-        private System.Windows.Forms.Label label2;
-		private System.Windows.Forms.TextBox textBox1;
-		private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Button okButton;
-        private System.Windows.Forms.TextBox textBox3;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.TextBox textBox4;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.TextBox textBox5;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.TextBox textBox6;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.TextBox textBox7;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.TextBox textBox8;
-        private System.Windows.Forms.Label label8;
-        private System.Windows.Forms.TextBox textBox9;
-        private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.TextBox textBox10;
-        private System.Windows.Forms.Label label10;
-        private System.Windows.Forms.TextBox textBox11;
-        private System.Windows.Forms.Label label11;
-        private System.Windows.Forms.TextBox textBox12;
-        private System.Windows.Forms.Label label12;
-        private System.Windows.Forms.TextBox textBox13;
-        private System.Windows.Forms.Label label13;
-        private System.Windows.Forms.TextBox textBox14;
-        private System.Windows.Forms.Label label14;
-        private System.Windows.Forms.TextBox textBox15;
-        private System.Windows.Forms.Label label15;
-        private System.Windows.Forms.TextBox textBox16;
-        private System.Windows.Forms.Label label16;
-        private System.Windows.Forms.TextBox textBox17;
-        private System.Windows.Forms.Label label17;
-        private System.Windows.Forms.TextBox textBox18;
-        private System.Windows.Forms.Label label18;
-        private System.Windows.Forms.TextBox textBox19;
-        private System.Windows.Forms.Label label19;
-        private System.Windows.Forms.TextBox textBox20;
-        private System.Windows.Forms.Label label20;
-        private System.Windows.Forms.TextBox textBox21;
-        private System.Windows.Forms.Label label21;
-        private System.Windows.Forms.TextBox textBox22;
-        private System.Windows.Forms.Label label22;
-        private System.Windows.Forms.TextBox textBox23;
-        private System.Windows.Forms.Label label23;
-        private System.Windows.Forms.TextBox textBox24;
-        private System.Windows.Forms.Label label24;
-
-	}
-}
@@ -1,165 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Slovensko a.s.
-///
-using System;
-using System.Windows.Forms;
-using log4net;
-using TBF.Resources;
-
-namespace TBF.BenchControl.DataEntry.StandardCamera
-{
-	public partial class CycleEndForm : Form, GenericDevices.IHasCompleted
-    {
-		private static readonly ILog log = LogManager.GetLogger(typeof(CycleEndForm));
-
-		/// <summary> Number of text boxes for serial numbers </summary>
-        public readonly int WaterMetersCount;
-        readonly int lineSize;
-
- 		// To be retrieved after the form closes
-        public string[] EndStateText;
-
-		// Set to 'true' when the form closes
-        public bool Completed { get { return completed; } }
-		bool completed;
-
-        int textBoxesCount;
-        Label[] labels;
-        TextBox[] textBoxes;
-
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
-        public CycleEndForm()
-        {
-            InitializeComponent();
-			ControlBox = false;
-
-            labels = new Label[]
-				{
-					label1,  label2,  label3,  label4,  label5,  label6,  label7,  label8,  label9,  label10,
-					label11, label12, label13, label14, label15, label16, label17, label18, label19, label20,
-					label21, label22, label23, label24,
-				};
-            textBoxes = new TextBox[]
-				{
-					textBox1,  textBox2,  textBox3,  textBox4,  textBox5,  textBox6,
-					textBox7,  textBox8,  textBox9,  textBox10, textBox11, textBox12,
-					textBox13, textBox14, textBox15, textBox16, textBox17, textBox18,
-					textBox19, textBox20, textBox21, textBox22, textBox23, textBox24,
-				};
-            textBoxesCount = textBoxes.Length;
-            this.WaterMetersCount = textBoxesCount;
-            this.lineSize = textBoxesCount / 2;
-
-            completed = false;
-			StartForceCloseHandler();
-		}
-
-        /// <summary> Parameterless constructor for 3 watermeters </summary>
-        public CycleEndForm(int waterMetersCount, int lineSize)
-            : this()
-        {
-            this.WaterMetersCount = waterMetersCount;
-            this.lineSize = lineSize;
-            ShuffleTextBoxes(waterMetersCount, lineSize);
-            EndStateText = new string[WaterMetersCount];
-        }
-
-        /// <summary>
-        /// Make sure the layout of labels/text boxes on the screen
-        /// corresponds to the layout of watermeters of the test bench.
-        /// </summary>
-        /// <param name="wmsCount">Number of watermeters</param>
-        /// <param name="lineSize">Number of watermeters in one line</param>
-        void ShuffleTextBoxes(int wmsCount, int lineSize)
-        {
-            for (int i = 0; i < textBoxesCount; i++)
-            {
-                labels[i].Visible = false;
-                textBoxes[i].Visible = false;
-            }
-
-            if (wmsCount < textBoxesCount && lineSize > 0)
-            {
-                int nrLines;
-                int realLineSize;
-                if (WaterMetersCount <= 6)
-                {
-                    realLineSize = WaterMetersCount;
-                    nrLines = 1;
-                }
-                else
-                {
-                    nrLines = (wmsCount + lineSize - 1) / lineSize;
-                    realLineSize = lineSize;
-                }
-                int gap = (textBoxesCount - wmsCount) / nrLines;
-
-                int dest = 0;
-                for (int l = 0; l < nrLines; l++)
-                {
-                    for (int i = 0; i < realLineSize; i++)
-                    {
-                        labels[dest] = labels[l * lineSize + l * gap + i];
-                        textBoxes[dest] = textBoxes[l * lineSize + l * gap + i];
-                        labels[dest].Visible = true;
-                        textBoxes[dest].Visible = true;
-                        dest++;
-                    }
-                }
-                textBoxesCount = wmsCount;
-
-                Height = 60 + 36 * realLineSize;
-            }
-        }
-
-		private void CycleEndForm_Load(object sender, EventArgs e)
-		{
-			Localize();
-		}
-
-		void Localize()
-		{
-			Text = Strings.Data;
-            okButton.Text = Strings.OkBtnText;
-
-            for (int i = 0; i < WaterMetersCount; i++)
-            {
-                labels[i].Text = string.Format("{0} {1}:", Strings.Water_Meter, (i + 1).ToString());
-            }
-		}
-
-		private void okButton_Click(object sender, EventArgs e)
-		{
-            for (int i = 0; i < WaterMetersCount; i++)
-            {
-                EndStateText[i] = textBoxes[i].Text;
-            }
-
-			completed = true;
-			Close();
-		}
-
-		#region Forced close handling
-
-		public void StartForceCloseHandler()
-		{
-			UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args)
-			{
-				if (InvokeRequired) { Invoke(new EventHandler<EventArgs>(OnForceClose), sender, args); }
-				else OnForceClose(sender, args);
-			};
-		}
-
-		void OnForceClose(object sender, EventArgs args)
-		{
-			DialogResult = DialogResult.Cancel;
-			Close();
-		}
-
-		#endregion
-	}
-}
@@ -1,88 +0,0 @@
-///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using log4net;
-using TBF.Boxes;
-
-namespace TBF.BenchControl.Elde.FlowMeter
-{
-	public class FlowMeter : ComponentBase, GenericDevices.IFlowMeter
-	{
-		private static readonly ILog log = LogManager.GetLogger(typeof(FlowMeter));
-        public override string ToString() { return string.Format("FlowMeter({0})", Cfg.ToString(1)); }
-
-		readonly FlowMeterCfg flowMeterCfg;
-        readonly ControlBoardDev controlBoard;
-
-        public int Idx1 { get { return flowMeterCfg.Idx1; } }		
-        public float NominalFlow { get { return flowMeterCfg.NominalFlow; } }
-        public float LtrPerPulse { get { return flowMeterCfg.NominalFlow / 7200.0f; } } /// Nominal frequency is 2000 Hz
-
-        public float LtrPerPulseCorrected(double flow, int rangeIx)
-        {
-            if (flow < 0.1 * NominalFlow) return LtrPerPulse;     /// No correction for small flow   
-
-            /// Apply correction
-            var rangeCorrections = new List<Config.Entities.MeasurementCorrection>();
-            foreach (var corr in Corrections)
-            {
-                if (corr.RangeIx == rangeIx) rangeCorrections.Add(corr);
-            }
-            double correctedFlow = BenchControl.Formulas.CorrectedValue(flow, rangeCorrections);
-            return (float)(LtrPerPulse * correctedFlow / flow);
-        }
-
-
-        public bool RangeEnabled(int ix) { return flowMeterCfg.RangeEnabled(ix); }
-        public double GetTempLo(int ix) { return flowMeterCfg.GetTempLo(ix); }
-        public double GetTempHi(int ix) { return flowMeterCfg.GetTempHi(ix); }
-        public double GetPressLo(int ix) { return flowMeterCfg.GetPressLo(ix); }
-        public double GetPressHi(int ix) { return flowMeterCfg.GetPressHi(ix); }
-
-
-		public FlowMeter()
-		{
-		}
-
-		public FlowMeter(Generic.IComponentCfg cfg, IList<Generic.IComponent> components)
-			: base(cfg)
-		{
-			flowMeterCfg = cfg as FlowMeterCfg;
-
-			controlBoard = (ControlBoardDev)TbfComponents.FindComponent(cfg.ParentName, components);
-			if (controlBoard == null) throw new Exception("Cannot find " + Name + " parent");
-
-			/// Prepare data for SendCalibData() control board component method
-			if (Idx1 >= controlBoard.EtCalib.Length) throw new Exception("Flowmeter " + Name + " parameter 'Idx1' is out of range");
-			controlBoard.EtCalib[Idx1] = flowMeterCfg.NominalFlow;
-
-			log.Debug(this.ToString());
-		}
-
-        public double ReadFlow()      { return controlBoard.ReferenceFlow; }
-        public double ReadFrequency() { return controlBoard.ReferenceFreq; }
-
-		/// <summary>
-		/// Events:  FlowDone, Error
-		/// </summary>
-		/// <param name="flow">Reference to a variable for the flow in Bar</param>
-		/// <returns>ReadFlowOp instance reference casted to IOperaton</returns>
-		public IOperation ReadFlowOp(ref DoubleBox flow)
-		{
-			return new ReadFlowOp(this, controlBoard, ref flow);
-		}
-
-		/// <summary>
-		/// Events:  flowDone, Error
-		/// </summary>
-		/// <param name="flow">Reference to a variable for the flow in Bar</param>
-		/// <param name="flowDone">Event returned when measurement done</param>
-		/// <returns>ReadFlowOp instance reference casted to IOperaton</returns>
-		public IOperation ReadFlowOp(ref DoubleBox flow, Event flowDone)
-		{
-			return new ReadFlowOp(this, controlBoard, ref flow, flowDone);
-		}
-	}
-}
@@ -1,250 +0,0 @@
-///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml.Serialization;
-using TBF.BenchControl.Generic;
-
-namespace TBF.BenchControl.Elde.FlowMeter
-{
-    public class FlowMeterCfg : ComponentCfgBase, GenericDevices.ICalibInfoCfg, IChildComponentCfg
-	{
-		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(FlowMeterCfg) })[0];
-		protected override XmlSerializer GetSerializer() { return Serializer; }
-
-		public IComponentCfgCtrl GetControl() { return new FlowMeterCfgCtrl(); }
-
-		///
-		/// Serialized parameters 
-		///
-		public int Idx1;	    		/// 1..7
-        public float NominalFlow;       /// Nominal flow in m3/h at output frequency 2000 Hz
-
-        public double Temp1Lo;          /// 4x zero means the range is disabled
-        public double Temp1Hi;
-        public double Press1Lo;
-        public double Press1Hi;
-
-        public double Temp2Lo;          /// 4x zero means the range is disabled
-        public double Temp2Hi;
-        public double Press2Lo;
-        public double Press2Hi;
-
-        public double Temp3Lo;          /// 4x zero means the range is disabled
-        public double Temp3Hi;
-        public double Press3Lo;
-        public double Press3Hi;
-
-        public double Temp4Lo;          /// 4x zero means the range is disabled
-        public double Temp4Hi;
-        public double Press4Lo;
-        public double Press4Hi;
-
-        public double Temp5Lo;          /// 4x zero means the range is disabled
-        public double Temp5Hi;
-        public double Press5Lo;
-        public double Press5Hi;
-
-
-        public bool RangeEnabled(int rangeIx1)
-        {
-            switch (rangeIx1)
-            {
-                default:
-                case 0: return !(RangeEnabled(1) || RangeEnabled(2) || RangeEnabled(3) || RangeEnabled(4) || RangeEnabled(5));
-                case 1: return (Temp1Lo != 0) || (Temp1Hi != 0) || (Press1Lo != 0) || (Press1Hi != 0);
-                case 2: return (Temp2Lo != 0) || (Temp2Hi != 0) || (Press2Lo != 0) || (Press2Hi != 0);
-                case 3: return (Temp3Lo != 0) || (Temp3Hi != 0) || (Press3Lo != 0) || (Press3Hi != 0);
-                case 4: return (Temp4Lo != 0) || (Temp4Hi != 0) || (Press4Lo != 0) || (Press4Hi != 0);
-                case 5: return (Temp5Lo != 0) || (Temp5Hi != 0) || (Press5Lo != 0) || (Press5Hi != 0);
-            }
-        }
-
-        public double GetTempLo(int rangeIx1)
-        {
-            switch (rangeIx1)
-            {
-                default:
-                case 0: return 5.0;         /// °C
-                case 1: return Temp1Lo;
-                case 2: return Temp2Lo;
-                case 3: return Temp3Lo;
-                case 4: return Temp4Lo;
-                case 5: return Temp5Lo;
-            }
-        }
-
-        public double GetTempHi(int rangeIx1)
-        {
-            switch (rangeIx1)
-            {
-                default:
-                case 0: return 95.0;        /// °C
-                case 1: return Temp1Hi;
-                case 2: return Temp2Hi;
-                case 3: return Temp3Hi;
-                case 4: return Temp4Hi;
-                case 5: return Temp5Hi;
-            }
-        }
-
-        public double GetPressLo(int rangeIx1)
-        {
-            switch (rangeIx1)
-            {
-                default:
-                case 0: return 0;           /// bar
-                case 1: return Press1Lo;
-                case 2: return Press2Lo;
-                case 3: return Press3Lo;
-                case 4: return Press4Lo;
-                case 5: return Press5Lo;
-            }
-        }
-
-        public double GetPressHi(int rangeIx1)
-        {
-            switch (rangeIx1)
-            {
-                default:
-                case 0: return 16.0;        /// bar
-                case 1: return Press1Hi;
-                case 2: return Press2Hi;
-                case 3: return Press3Hi;
-                case 4: return Press4Hi;
-                case 5: return Press5Hi;
-            }
-        }
-
-        /// Calibration info serialized parameters displayed in Metrology tab page
-        public string CalibCertificateNr;
-        public string CalibCertificate1;
-        public string CalibCertificate2;
-        public string CalibCertificate3;
-        public string CalibCertificate4;
-        public string CalibCertificate5;
-        public DateTime CalibDate;
-        public DateTime CalibDate1;
-        public DateTime CalibDate2;
-        public DateTime CalibDate3;
-        public DateTime CalibDate4;
-        public DateTime CalibDate5;
-        public DateTime CalibValidDate;
-        public DateTime CalibValidDate1;
-        public DateTime CalibValidDate2;
-        public DateTime CalibValidDate3;
-        public DateTime CalibValidDate4;
-        public DateTime CalibValidDate5;
-
-        public string GetCalibCertificate(int rangeIx1)
-        {
-            switch (rangeIx1)
-            {
-                default:
-                case 0: return CalibCertificateNr;
-                case 1: return CalibCertificate1;
-                case 2: return CalibCertificate2;
-                case 3: return CalibCertificate3;
-                case 4: return CalibCertificate4;
-                case 5: return CalibCertificate5;
-            }
-        }
-
-        public void SetCalibCertificate(int rangeIx1, string certificate)
-        {
-            switch (rangeIx1)
-            {
-                default:
-                case 0: CalibCertificateNr  = certificate; return;
-                case 1: CalibCertificate1 = certificate; return;
-                case 2: CalibCertificate2 = certificate; return;
-                case 3: CalibCertificate3 = certificate; return;
-                case 4: CalibCertificate4 = certificate; return;
-                case 5: CalibCertificate5 = certificate; return;
-            }
-        }
-
-        public DateTime GetCalibDate(int rangeIx1)
-        {
-            switch (rangeIx1)
-            {
-                default:
-                case 0: return CalibDate;
-                case 1: return CalibDate1;
-                case 2: return CalibDate2;
-                case 3: return CalibDate3;
-                case 4: return CalibDate4;
-                case 5: return CalibDate5;
-            }
-        }
-
-        public void SetCalibDate(int rangeIx1, DateTime calibDate)
-        {
-            switch (rangeIx1)
-            {
-                default:
-                case 0: CalibDate  = calibDate; return;
-                case 1: CalibDate1 = calibDate; return;
-                case 2: CalibDate2 = calibDate; return;
-                case 3: CalibDate3 = calibDate; return;
-                case 4: CalibDate4 = calibDate; return;
-                case 5: CalibDate5 = calibDate; return;
-            }
-        }
-
-        public DateTime GetCalibValidDate(int rangeIx1)
-        {
-            switch (rangeIx1)
-            {
-                default:
-                case 0: return CalibValidDate;
-                case 1: return CalibValidDate1;
-                case 2: return CalibValidDate2;
-                case 3: return CalibValidDate3;
-                case 4: return CalibValidDate4;
-                case 5: return CalibValidDate5;
-            }
-        }
-
-        public void SetCalibValidDate(int rangeIx1, DateTime calibValidDate)
-        {
-            switch (rangeIx1)
-            {
-                default:
-                case 0: CalibValidDate  = calibValidDate; return;
-                case 1: CalibValidDate1 = calibValidDate; return;
-                case 2: CalibValidDate2 = calibValidDate; return;
-                case 3: CalibValidDate3 = calibValidDate; return;
-                case 4: CalibValidDate4 = calibValidDate; return;
-                case 5: CalibValidDate5 = calibValidDate; return;
-            }
-        }
-
-
-		/// Private parameterless constructor invoked by all other (public) constructors
-		FlowMeterCfg()
-		{
-            Name = "FlowMeter";
-            ParentName = "CB";
-            Idx1 = 1;
-            NominalFlow = 1;
-		}
-
-        public FlowMeterCfg(IComponentFactory factory)
-            : this()
-        {
-            this.Factory = factory;
-        }
-
-		public string ToString(int i)
-		{
-            return string.Format("Name={0}, Parent={1}, Idx1={2}, NominalFlow={3}",
-                                 Name,
-                                 (string.IsNullOrEmpty(ParentName) ? "-" : ParentName),
-                                 Idx1,
-                                 NominalFlow);
-		}
-	}
-}
@@ -1,504 +0,0 @@
-///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
-///
-namespace TBF.BenchControl.Elde.FlowMeter
-{
-	partial class FlowMeterCfgCtrl
-	{
-		/// <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.positionTextBox = new System.Windows.Forms.TextBox();
-            this.positionLabel = new System.Windows.Forms.Label();
-            this.parentNameLabel = new System.Windows.Forms.Label();
-            this.nameTextBox = new System.Windows.Forms.TextBox();
-            this.nameLabel = new System.Windows.Forms.Label();
-            this.classNameLabel = new System.Windows.Forms.Label();
-            this.nominalFlowTextBox = new System.Windows.Forms.TextBox();
-            this.nominalFlowLabel = new System.Windows.Forms.Label();
-            this.parentNameComboBox = new System.Windows.Forms.ComboBox();
-            this.tempLo1TextBox = new System.Windows.Forms.TextBox();
-            this.tempHi1TextBox = new System.Windows.Forms.TextBox();
-            this.pressLo1TextBox = new System.Windows.Forms.TextBox();
-            this.pressHi1TextBox = new System.Windows.Forms.TextBox();
-            this.pressHi2TextBox = new System.Windows.Forms.TextBox();
-            this.pressLo2TextBox = new System.Windows.Forms.TextBox();
-            this.tempHi2TextBox = new System.Windows.Forms.TextBox();
-            this.tempLo2TextBox = new System.Windows.Forms.TextBox();
-            this.pressHi3TextBox = new System.Windows.Forms.TextBox();
-            this.pressLo3TextBox = new System.Windows.Forms.TextBox();
-            this.tempHi3TextBox = new System.Windows.Forms.TextBox();
-            this.tempLo3TextBox = new System.Windows.Forms.TextBox();
-            this.pressHi4TextBox = new System.Windows.Forms.TextBox();
-            this.pressLo4TextBox = new System.Windows.Forms.TextBox();
-            this.tempHi4TextBox = new System.Windows.Forms.TextBox();
-            this.tempLo4TextBox = new System.Windows.Forms.TextBox();
-            this.pressHi5TextBox = new System.Windows.Forms.TextBox();
-            this.pressLo5TextBox = new System.Windows.Forms.TextBox();
-            this.tempHi5TextBox = new System.Windows.Forms.TextBox();
-            this.tempLo5TextBox = new System.Windows.Forms.TextBox();
-            this.rangeCheckBox1 = new System.Windows.Forms.CheckBox();
-            this.rangeCheckBox2 = new System.Windows.Forms.CheckBox();
-            this.rangeCheckBox3 = new System.Windows.Forms.CheckBox();
-            this.rangeCheckBox4 = new System.Windows.Forms.CheckBox();
-            this.rangeCheckBox5 = new System.Windows.Forms.CheckBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // positionTextBox
-            // 
-            this.positionTextBox.Enabled = false;
-            this.positionTextBox.Location = new System.Drawing.Point(224, 113);
-            this.positionTextBox.Name = "positionTextBox";
-            this.positionTextBox.Size = new System.Drawing.Size(46, 20);
-            this.positionTextBox.TabIndex = 6;
-            // 
-            // positionLabel
-            // 
-            this.positionLabel.AutoSize = true;
-            this.positionLabel.Location = new System.Drawing.Point(30, 116);
-            this.positionLabel.Name = "positionLabel";
-            this.positionLabel.Size = new System.Drawing.Size(44, 13);
-            this.positionLabel.TabIndex = 5;
-            this.positionLabel.Text = "Position";
-            // 
-            // parentNameLabel
-            // 
-            this.parentNameLabel.AutoSize = true;
-            this.parentNameLabel.Location = new System.Drawing.Point(30, 90);
-            this.parentNameLabel.Name = "parentNameLabel";
-            this.parentNameLabel.Size = new System.Drawing.Size(69, 13);
-            this.parentNameLabel.TabIndex = 3;
-            this.parentNameLabel.Text = "Parent Name";
-            // 
-            // nameTextBox
-            // 
-            this.nameTextBox.Enabled = false;
-            this.nameTextBox.Location = new System.Drawing.Point(140, 61);
-            this.nameTextBox.Name = "nameTextBox";
-            this.nameTextBox.Size = new System.Drawing.Size(130, 20);
-            this.nameTextBox.TabIndex = 2;
-            // 
-            // nameLabel
-            // 
-            this.nameLabel.AutoSize = true;
-            this.nameLabel.Location = new System.Drawing.Point(30, 64);
-            this.nameLabel.Name = "nameLabel";
-            this.nameLabel.Size = new System.Drawing.Size(35, 13);
-            this.nameLabel.TabIndex = 1;
-            this.nameLabel.Text = "Name";
-            // 
-            // classNameLabel
-            // 
-            this.classNameLabel.AutoSize = true;
-            this.classNameLabel.Location = new System.Drawing.Point(137, 37);
-            this.classNameLabel.Name = "classNameLabel";
-            this.classNameLabel.Size = new System.Drawing.Size(83, 13);
-            this.classNameLabel.TabIndex = 0;
-            this.classNameLabel.Text = "ComonentName";
-            // 
-            // nominalFlowTextBox
-            // 
-            this.nominalFlowTextBox.Enabled = false;
-            this.nominalFlowTextBox.Location = new System.Drawing.Point(224, 138);
-            this.nominalFlowTextBox.Name = "nominalFlowTextBox";
-            this.nominalFlowTextBox.Size = new System.Drawing.Size(46, 20);
-            this.nominalFlowTextBox.TabIndex = 8;
-            // 
-            // nominalFlowLabel
-            // 
-            this.nominalFlowLabel.AutoSize = true;
-            this.nominalFlowLabel.Location = new System.Drawing.Point(30, 141);
-            this.nominalFlowLabel.Name = "nominalFlowLabel";
-            this.nominalFlowLabel.Size = new System.Drawing.Size(140, 13);
-            this.nominalFlowLabel.TabIndex = 7;
-            this.nominalFlowLabel.Text = "Nominal flow [m3/h @2kHz]";
-            // 
-            // parentNameComboBox
-            // 
-            this.parentNameComboBox.Enabled = false;
-            this.parentNameComboBox.FormattingEnabled = true;
-            this.parentNameComboBox.Location = new System.Drawing.Point(140, 87);
-            this.parentNameComboBox.Name = "parentNameComboBox";
-            this.parentNameComboBox.Size = new System.Drawing.Size(130, 21);
-            this.parentNameComboBox.TabIndex = 4;
-            // 
-            // tempLo1TextBox
-            // 
-            this.tempLo1TextBox.Enabled = false;
-            this.tempLo1TextBox.Location = new System.Drawing.Point(140, 205);
-            this.tempLo1TextBox.Name = "tempLo1TextBox";
-            this.tempLo1TextBox.Size = new System.Drawing.Size(68, 20);
-            this.tempLo1TextBox.TabIndex = 10;
-            // 
-            // tempHi1TextBox
-            // 
-            this.tempHi1TextBox.Enabled = false;
-            this.tempHi1TextBox.Location = new System.Drawing.Point(220, 205);
-            this.tempHi1TextBox.Name = "tempHi1TextBox";
-            this.tempHi1TextBox.Size = new System.Drawing.Size(68, 20);
-            this.tempHi1TextBox.TabIndex = 11;
-            // 
-            // pressLo1TextBox
-            // 
-            this.pressLo1TextBox.Enabled = false;
-            this.pressLo1TextBox.Location = new System.Drawing.Point(300, 205);
-            this.pressLo1TextBox.Name = "pressLo1TextBox";
-            this.pressLo1TextBox.Size = new System.Drawing.Size(68, 20);
-            this.pressLo1TextBox.TabIndex = 12;
-            // 
-            // pressHi1TextBox
-            // 
-            this.pressHi1TextBox.Enabled = false;
-            this.pressHi1TextBox.Location = new System.Drawing.Point(380, 205);
-            this.pressHi1TextBox.Name = "pressHi1TextBox";
-            this.pressHi1TextBox.Size = new System.Drawing.Size(68, 20);
-            this.pressHi1TextBox.TabIndex = 13;
-            // 
-            // pressHi2TextBox
-            // 
-            this.pressHi2TextBox.Enabled = false;
-            this.pressHi2TextBox.Location = new System.Drawing.Point(380, 228);
-            this.pressHi2TextBox.Name = "pressHi2TextBox";
-            this.pressHi2TextBox.Size = new System.Drawing.Size(68, 20);
-            this.pressHi2TextBox.TabIndex = 18;
-            // 
-            // pressLo2TextBox
-            // 
-            this.pressLo2TextBox.Enabled = false;
-            this.pressLo2TextBox.Location = new System.Drawing.Point(300, 228);
-            this.pressLo2TextBox.Name = "pressLo2TextBox";
-            this.pressLo2TextBox.Size = new System.Drawing.Size(68, 20);
-            this.pressLo2TextBox.TabIndex = 17;
-            // 
-            // tempHi2TextBox
-            // 
-            this.tempHi2TextBox.Enabled = false;
-            this.tempHi2TextBox.Location = new System.Drawing.Point(220, 228);
-            this.tempHi2TextBox.Name = "tempHi2TextBox";
-            this.tempHi2TextBox.Size = new System.Drawing.Size(68, 20);
-            this.tempHi2TextBox.TabIndex = 16;
-            // 
-            // tempLo2TextBox
-            // 
-            this.tempLo2TextBox.Enabled = false;
-            this.tempLo2TextBox.Location = new System.Drawing.Point(140, 228);
-            this.tempLo2TextBox.Name = "tempLo2TextBox";
-            this.tempLo2TextBox.Size = new System.Drawing.Size(68, 20);
-            this.tempLo2TextBox.TabIndex = 15;
-            // 
-            // pressHi3TextBox
-            // 
-            this.pressHi3TextBox.Enabled = false;
-            this.pressHi3TextBox.Location = new System.Drawing.Point(380, 251);
-            this.pressHi3TextBox.Name = "pressHi3TextBox";
-            this.pressHi3TextBox.Size = new System.Drawing.Size(68, 20);
-            this.pressHi3TextBox.TabIndex = 23;
-            // 
-            // pressLo3TextBox
-            // 
-            this.pressLo3TextBox.Enabled = false;
-            this.pressLo3TextBox.Location = new System.Drawing.Point(300, 251);
-            this.pressLo3TextBox.Name = "pressLo3TextBox";
-            this.pressLo3TextBox.Size = new System.Drawing.Size(68, 20);
-            this.pressLo3TextBox.TabIndex = 22;
-            // 
-            // tempHi3TextBox
-            // 
-            this.tempHi3TextBox.Enabled = false;
-            this.tempHi3TextBox.Location = new System.Drawing.Point(220, 251);
-            this.tempHi3TextBox.Name = "tempHi3TextBox";
-            this.tempHi3TextBox.Size = new System.Drawing.Size(68, 20);
-            this.tempHi3TextBox.TabIndex = 21;
-            // 
-            // tempLo3TextBox
-            // 
-            this.tempLo3TextBox.Enabled = false;
-            this.tempLo3TextBox.Location = new System.Drawing.Point(140, 251);
-            this.tempLo3TextBox.Name = "tempLo3TextBox";
-            this.tempLo3TextBox.Size = new System.Drawing.Size(68, 20);
-            this.tempLo3TextBox.TabIndex = 20;
-            // 
-            // pressHi4TextBox
-            // 
-            this.pressHi4TextBox.Enabled = false;
-            this.pressHi4TextBox.Location = new System.Drawing.Point(380, 274);
-            this.pressHi4TextBox.Name = "pressHi4TextBox";
-            this.pressHi4TextBox.Size = new System.Drawing.Size(68, 20);
-            this.pressHi4TextBox.TabIndex = 28;
-            // 
-            // pressLo4TextBox
-            // 
-            this.pressLo4TextBox.Enabled = false;
-            this.pressLo4TextBox.Location = new System.Drawing.Point(300, 274);
-            this.pressLo4TextBox.Name = "pressLo4TextBox";
-            this.pressLo4TextBox.Size = new System.Drawing.Size(68, 20);
-            this.pressLo4TextBox.TabIndex = 27;
-            // 
-            // tempHi4TextBox
-            // 
-            this.tempHi4TextBox.Enabled = false;
-            this.tempHi4TextBox.Location = new System.Drawing.Point(220, 274);
-            this.tempHi4TextBox.Name = "tempHi4TextBox";
-            this.tempHi4TextBox.Size = new System.Drawing.Size(68, 20);
-            this.tempHi4TextBox.TabIndex = 26;
-            // 
-            // tempLo4TextBox
-            // 
-            this.tempLo4TextBox.Enabled = false;
-            this.tempLo4TextBox.Location = new System.Drawing.Point(140, 274);
-            this.tempLo4TextBox.Name = "tempLo4TextBox";
-            this.tempLo4TextBox.Size = new System.Drawing.Size(68, 20);
-            this.tempLo4TextBox.TabIndex = 25;
-            // 
-            // pressHi5TextBox
-            // 
-            this.pressHi5TextBox.Enabled = false;
-            this.pressHi5TextBox.Location = new System.Drawing.Point(380, 297);
-            this.pressHi5TextBox.Name = "pressHi5TextBox";
-            this.pressHi5TextBox.Size = new System.Drawing.Size(68, 20);
-            this.pressHi5TextBox.TabIndex = 33;
-            // 
-            // pressLo5TextBox
-            // 
-            this.pressLo5TextBox.Enabled = false;
-            this.pressLo5TextBox.Location = new System.Drawing.Point(300, 297);
-            this.pressLo5TextBox.Name = "pressLo5TextBox";
-            this.pressLo5TextBox.Size = new System.Drawing.Size(68, 20);
-            this.pressLo5TextBox.TabIndex = 32;
-            // 
-            // tempHi5TextBox
-            // 
-            this.tempHi5TextBox.Enabled = false;
-            this.tempHi5TextBox.Location = new System.Drawing.Point(220, 297);
-            this.tempHi5TextBox.Name = "tempHi5TextBox";
-            this.tempHi5TextBox.Size = new System.Drawing.Size(68, 20);
-            this.tempHi5TextBox.TabIndex = 31;
-            // 
-            // tempLo5TextBox
-            // 
-            this.tempLo5TextBox.Enabled = false;
-            this.tempLo5TextBox.Location = new System.Drawing.Point(140, 297);
-            this.tempLo5TextBox.Name = "tempLo5TextBox";
-            this.tempLo5TextBox.Size = new System.Drawing.Size(68, 20);
-            this.tempLo5TextBox.TabIndex = 30;
-            // 
-            // rangeCheckBox1
-            // 
-            this.rangeCheckBox1.AutoSize = true;
-            this.rangeCheckBox1.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.rangeCheckBox1.Enabled = false;
-            this.rangeCheckBox1.Location = new System.Drawing.Point(32, 207);
-            this.rangeCheckBox1.Name = "rangeCheckBox1";
-            this.rangeCheckBox1.Size = new System.Drawing.Size(67, 17);
-            this.rangeCheckBox1.TabIndex = 34;
-            this.rangeCheckBox1.Text = "Range 1";
-            this.rangeCheckBox1.UseVisualStyleBackColor = true;
-            this.rangeCheckBox1.CheckedChanged += new System.EventHandler(this.rangeCheckBox1_CheckedChanged);
-            // 
-            // rangeCheckBox2
-            // 
-            this.rangeCheckBox2.AutoSize = true;
-            this.rangeCheckBox2.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.rangeCheckBox2.Enabled = false;
-            this.rangeCheckBox2.Location = new System.Drawing.Point(32, 230);
-            this.rangeCheckBox2.Name = "rangeCheckBox2";
-            this.rangeCheckBox2.Size = new System.Drawing.Size(67, 17);
-            this.rangeCheckBox2.TabIndex = 35;
-            this.rangeCheckBox2.Text = "Range 2";
-            this.rangeCheckBox2.UseVisualStyleBackColor = true;
-            this.rangeCheckBox2.CheckedChanged += new System.EventHandler(this.rangeCheckBox2_CheckedChanged);
-            // 
-            // rangeCheckBox3
-            // 
-            this.rangeCheckBox3.AutoSize = true;
-            this.rangeCheckBox3.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.rangeCheckBox3.Enabled = false;
-            this.rangeCheckBox3.Location = new System.Drawing.Point(32, 253);
-            this.rangeCheckBox3.Name = "rangeCheckBox3";
-            this.rangeCheckBox3.Size = new System.Drawing.Size(67, 17);
-            this.rangeCheckBox3.TabIndex = 36;
-            this.rangeCheckBox3.Text = "Range 3";
-            this.rangeCheckBox3.UseVisualStyleBackColor = true;
-            this.rangeCheckBox3.CheckedChanged += new System.EventHandler(this.rangeCheckBox3_CheckedChanged);
-            // 
-            // rangeCheckBox4
-            // 
-            this.rangeCheckBox4.AutoSize = true;
-            this.rangeCheckBox4.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.rangeCheckBox4.Enabled = false;
-            this.rangeCheckBox4.Location = new System.Drawing.Point(32, 276);
-            this.rangeCheckBox4.Name = "rangeCheckBox4";
-            this.rangeCheckBox4.Size = new System.Drawing.Size(67, 17);
-            this.rangeCheckBox4.TabIndex = 37;
-            this.rangeCheckBox4.Text = "Range 4";
-            this.rangeCheckBox4.UseVisualStyleBackColor = true;
-            this.rangeCheckBox4.CheckedChanged += new System.EventHandler(this.rangeCheckBox4_CheckedChanged);
-            // 
-            // rangeCheckBox5
-            // 
-            this.rangeCheckBox5.AutoSize = true;
-            this.rangeCheckBox5.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.rangeCheckBox5.Enabled = false;
-            this.rangeCheckBox5.Location = new System.Drawing.Point(32, 299);
-            this.rangeCheckBox5.Name = "rangeCheckBox5";
-            this.rangeCheckBox5.Size = new System.Drawing.Size(67, 17);
-            this.rangeCheckBox5.TabIndex = 38;
-            this.rangeCheckBox5.Text = "Range 5";
-            this.rangeCheckBox5.UseVisualStyleBackColor = true;
-            this.rangeCheckBox5.CheckedChanged += new System.EventHandler(this.rangeCheckBox5_CheckedChanged);
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(149, 186);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(52, 13);
-            this.label1.TabIndex = 39;
-            this.label1.Text = "Temp. Lo";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(229, 186);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(50, 13);
-            this.label2.TabIndex = 40;
-            this.label2.Text = "Temp. Hi";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(309, 186);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(51, 13);
-            this.label3.TabIndex = 41;
-            this.label3.Text = "Press. Lo";
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(389, 186);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(49, 13);
-            this.label4.TabIndex = 42;
-            this.label4.Text = "Press. Hi";
-            // 
-            // FlowMeterCfgCtrl
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.rangeCheckBox5);
-            this.Controls.Add(this.rangeCheckBox4);
-            this.Controls.Add(this.rangeCheckBox3);
-            this.Controls.Add(this.rangeCheckBox2);
-            this.Controls.Add(this.rangeCheckBox1);
-            this.Controls.Add(this.pressHi5TextBox);
-            this.Controls.Add(this.pressLo5TextBox);
-            this.Controls.Add(this.tempHi5TextBox);
-            this.Controls.Add(this.tempLo5TextBox);
-            this.Controls.Add(this.pressHi4TextBox);
-            this.Controls.Add(this.pressLo4TextBox);
-            this.Controls.Add(this.tempHi4TextBox);
-            this.Controls.Add(this.tempLo4TextBox);
-            this.Controls.Add(this.pressHi3TextBox);
-            this.Controls.Add(this.pressLo3TextBox);
-            this.Controls.Add(this.tempHi3TextBox);
-            this.Controls.Add(this.tempLo3TextBox);
-            this.Controls.Add(this.pressHi2TextBox);
-            this.Controls.Add(this.pressLo2TextBox);
-            this.Controls.Add(this.tempHi2TextBox);
-            this.Controls.Add(this.tempLo2TextBox);
-            this.Controls.Add(this.pressHi1TextBox);
-            this.Controls.Add(this.pressLo1TextBox);
-            this.Controls.Add(this.tempHi1TextBox);
-            this.Controls.Add(this.tempLo1TextBox);
-            this.Controls.Add(this.parentNameComboBox);
-            this.Controls.Add(this.nominalFlowTextBox);
-            this.Controls.Add(this.nominalFlowLabel);
-            this.Controls.Add(this.positionTextBox);
-            this.Controls.Add(this.positionLabel);
-            this.Controls.Add(this.parentNameLabel);
-            this.Controls.Add(this.nameTextBox);
-            this.Controls.Add(this.nameLabel);
-            this.Controls.Add(this.classNameLabel);
-            this.Name = "FlowMeterCfgCtrl";
-            this.Size = new System.Drawing.Size(492, 350);
-            this.Load += new System.EventHandler(this.FlowMeterCfgCtrl_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.TextBox positionTextBox;
-		private System.Windows.Forms.Label positionLabel;
-		private System.Windows.Forms.Label parentNameLabel;
-		private System.Windows.Forms.TextBox nameTextBox;
-		private System.Windows.Forms.Label nameLabel;
-		private System.Windows.Forms.Label classNameLabel;
-        private System.Windows.Forms.TextBox nominalFlowTextBox;
-        private System.Windows.Forms.Label nominalFlowLabel;
-		private System.Windows.Forms.ComboBox parentNameComboBox;
-        private System.Windows.Forms.TextBox tempLo1TextBox;
-        private System.Windows.Forms.TextBox tempHi1TextBox;
-        private System.Windows.Forms.TextBox pressLo1TextBox;
-        private System.Windows.Forms.TextBox pressHi1TextBox;
-        private System.Windows.Forms.TextBox pressHi2TextBox;
-        private System.Windows.Forms.TextBox pressLo2TextBox;
-        private System.Windows.Forms.TextBox tempHi2TextBox;
-        private System.Windows.Forms.TextBox tempLo2TextBox;
-        private System.Windows.Forms.TextBox pressHi3TextBox;
-        private System.Windows.Forms.TextBox pressLo3TextBox;
-        private System.Windows.Forms.TextBox tempHi3TextBox;
-        private System.Windows.Forms.TextBox tempLo3TextBox;
-        private System.Windows.Forms.TextBox pressHi4TextBox;
-        private System.Windows.Forms.TextBox pressLo4TextBox;
-        private System.Windows.Forms.TextBox tempHi4TextBox;
-        private System.Windows.Forms.TextBox tempLo4TextBox;
-        private System.Windows.Forms.TextBox pressHi5TextBox;
-        private System.Windows.Forms.TextBox pressLo5TextBox;
-        private System.Windows.Forms.TextBox tempHi5TextBox;
-        private System.Windows.Forms.TextBox tempLo5TextBox;
-        private System.Windows.Forms.CheckBox rangeCheckBox1;
-        private System.Windows.Forms.CheckBox rangeCheckBox2;
-        private System.Windows.Forms.CheckBox rangeCheckBox3;
-        private System.Windows.Forms.CheckBox rangeCheckBox4;
-        private System.Windows.Forms.CheckBox rangeCheckBox5;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Label label4;
-	}
-}
@@ -1,347 +0,0 @@
-///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
-///
-using System;
-using System.Globalization;
-using System.Windows.Forms;
-using log4net;
-using TBF.BenchControl.Configs;
-using TBF.BenchControl.Generic;
-
-namespace TBF.BenchControl.Elde.FlowMeter
-{
-    public partial class FlowMeterCfgCtrl : ConfigCtrlUtils, IComponentCfgCtrl
-	{
-        static readonly ILog log = LogManager.GetLogger(typeof(FlowMeterCfgCtrl));
-
-		ComponentParametersDlg parent;
-
-		public bool ShowMore { get { return false; } }
-
-		FlowMeterCfg config;
-		public IComponentCfg Config
-		{
-			get { return config as IComponentCfg; }
-			set
-			{
-				config = value as FlowMeterCfg;
-				Redraw();
-			}
-		}
-
-
-		public FlowMeterCfgCtrl()
-		{
-			InitializeComponent();
-		}
-
-		private void FlowMeterCfgCtrl_Load(object sender, EventArgs e)
-		{
-			parent = ParentForm as ComponentParametersDlg;
-			if (parent == null) return;
-
-			if (parent.TbfComponents != null)
-			{
-				foreach (var cmpnt in parent.TbfComponents)
-				{
-					if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.ControlBoardFactory)
-					{
-						parentNameComboBox.Items.Add(cmpnt.Name);
-					}
-				}
-			}
-
-			Redraw();
-		}
-
-		public void Closing()
-		{
-		}
-
-		void Redraw()
-		{
-			if (config == null) return;			/// Control was not loaded, settings were not changed
-												
-			classNameLabel.Text = config.Factory.ClassName;
-			nameTextBox.Text = config.Name;
-			parentNameComboBox.Text = string.IsNullOrEmpty(config.ParentName) ? "---" : config.ParentName;
-			positionTextBox.Text = config.Idx1.ToString();
-            nominalFlowTextBox.Text = config.NominalFlow.ToString();
-
-            rangeCheckBox1.Checked = config.RangeEnabled(1);
-            tempLo1TextBox.Text = config.Temp1Lo.ToString();
-            tempHi1TextBox.Text = config.Temp1Hi.ToString();
-            pressLo1TextBox.Text = config.Press1Lo.ToString();
-            pressHi1TextBox.Text = config.Press1Hi.ToString();
-
-            rangeCheckBox2.Checked = config.RangeEnabled(2);
-            tempLo2TextBox.Text = config.Temp2Lo.ToString();
-            tempHi2TextBox.Text = config.Temp2Hi.ToString();
-            pressLo2TextBox.Text = config.Press2Lo.ToString();
-            pressHi2TextBox.Text = config.Press2Hi.ToString();
-
-            rangeCheckBox3.Checked = config.RangeEnabled(3);
-            tempLo3TextBox.Text = config.Temp3Lo.ToString();
-            tempHi3TextBox.Text = config.Temp3Hi.ToString();
-            pressLo3TextBox.Text = config.Press3Lo.ToString();
-            pressHi3TextBox.Text = config.Press3Hi.ToString();
-
-            rangeCheckBox4.Checked = config.RangeEnabled(4);
-            tempLo4TextBox.Text = config.Temp4Lo.ToString();
-            tempHi4TextBox.Text = config.Temp4Hi.ToString();
-            pressLo4TextBox.Text = config.Press4Lo.ToString();
-            pressHi4TextBox.Text = config.Press4Hi.ToString();
-
-            rangeCheckBox5.Checked = config.RangeEnabled(5);
-            tempLo5TextBox.Text = config.Temp5Lo.ToString();
-            tempHi5TextBox.Text = config.Temp5Hi.ToString();
-            pressLo5TextBox.Text = config.Press5Lo.ToString();
-            pressHi5TextBox.Text = config.Press5Hi.ToString();
-        }
-
-		public void Unlock()
-		{
-			nameTextBox.Enabled = true;
-			parentNameComboBox.Enabled = true;
-			positionTextBox.Enabled = true;
-			nominalFlowTextBox.Enabled = true;
-
-            rangeCheckBox1.Enabled = true;
-            tempLo1TextBox.Enabled = rangeCheckBox1.Checked;
-            tempHi1TextBox.Enabled = rangeCheckBox1.Checked;
-            pressLo1TextBox.Enabled = rangeCheckBox1.Checked;
-            pressHi1TextBox.Enabled = rangeCheckBox1.Checked;
-
-            rangeCheckBox2.Enabled = true;
-            tempLo2TextBox.Enabled = rangeCheckBox2.Checked;
-            tempHi2TextBox.Enabled = rangeCheckBox2.Checked;
-            pressLo2TextBox.Enabled = rangeCheckBox2.Checked;
-            pressHi2TextBox.Enabled = rangeCheckBox2.Checked;
-
-            rangeCheckBox3.Enabled = true;
-            tempLo3TextBox.Enabled = rangeCheckBox3.Checked;
-            tempHi3TextBox.Enabled = rangeCheckBox3.Checked;
-            pressLo3TextBox.Enabled = rangeCheckBox3.Checked;
-            pressHi3TextBox.Enabled = rangeCheckBox3.Checked;
-
-            rangeCheckBox4.Enabled = true;
-            tempLo4TextBox.Enabled = rangeCheckBox4.Checked;
-            tempHi4TextBox.Enabled = rangeCheckBox4.Checked;
-            pressLo4TextBox.Enabled = rangeCheckBox4.Checked;
-            pressHi4TextBox.Enabled = rangeCheckBox4.Checked;
-
-            rangeCheckBox5.Enabled = true;
-            tempLo5TextBox.Enabled = rangeCheckBox5.Checked;
-            tempHi5TextBox.Enabled = rangeCheckBox5.Checked;
-            pressLo5TextBox.Enabled = rangeCheckBox5.Checked;
-            pressHi5TextBox.Enabled = rangeCheckBox5.Checked;
-        }
-
-		public CfgUpdateFlags VerifyCfg(ref string message)
-		{
-            CfgUpdateFlags flags = CfgUpdateFlags.None;
-
-			int dummy;
-			if (!parentNameComboBox.Items.Contains(parentNameComboBox.Text))
-			{
-				flags |= CfgUpdateFlags.Error;
-				message += Environment.NewLine + "Invalid 'Parent Name'";
-			}
-#if MALTA_WSD25
-			if (!int.TryParse(positionTextBox.Text, out dummy) || dummy < 0 || dummy > 8)
-			{
-				flags |= CfgUpdateFlags.Error;
-				message += Environment.NewLine + "'Idx1' should be between 0 and 8";
-			}
-#else
-			if (!int.TryParse(positionTextBox.Text, out dummy) || dummy < 1 || dummy > 7)
-			{
-				flags |= CfgUpdateFlags.Error;
-				message += Environment.NewLine + "'Idx1' should be between 1 and 7";
-			}
-#endif
-            float fdummy;
-            if (!Utils.TryParseUFloat(nominalFlowTextBox.Text, out fdummy) || fdummy < 0.01 || fdummy > 1600)
-            {
-                flags |= CfgUpdateFlags.Error;
-                message += Environment.NewLine + "'Nominal flow' should be between 0.01 and 1600";
-            }
-
-            double ddummy;
-            if (rangeCheckBox1.Checked)
-            {
-                if (!Utils.TryParseUDouble(tempLo1TextBox.Text, out ddummy) || !Utils.TryParseUDouble(tempHi1TextBox.Text, out ddummy) ||
-                    !Utils.TryParseUDouble(pressLo1TextBox.Text, out ddummy) || !Utils.TryParseUDouble(pressHi1TextBox.Text, out ddummy))
-                {
-                    flags |= CfgUpdateFlags.Error;
-                    message += Environment.NewLine + "Ivalid 'Range 1'";
-                }
-            }
-            if (rangeCheckBox2.Checked)
-            {
-                if (!Utils.TryParseUDouble(tempLo2TextBox.Text, out ddummy) || !Utils.TryParseUDouble(tempHi2TextBox.Text, out ddummy) ||
-                    !Utils.TryParseUDouble(pressLo2TextBox.Text, out ddummy) || !Utils.TryParseUDouble(pressHi2TextBox.Text, out ddummy))
-                {
-                    flags |= CfgUpdateFlags.Error;
-                    message += Environment.NewLine + "Ivalid 'Range 2'";
-                }
-            }
-            if (rangeCheckBox3.Checked)
-            {
-                if (!Utils.TryParseUDouble(tempLo3TextBox.Text, out ddummy) || !Utils.TryParseUDouble(tempHi3TextBox.Text, out ddummy) ||
-                    !Utils.TryParseUDouble(pressLo3TextBox.Text, out ddummy) || !Utils.TryParseUDouble(pressHi3TextBox.Text, out ddummy))
-                {
-                    flags |= CfgUpdateFlags.Error;
-                    message += Environment.NewLine + "Ivalid 'Range 3'";
-                }
-            }
-            if (rangeCheckBox4.Checked)
-            {
-                if (!Utils.TryParseUDouble(tempLo4TextBox.Text, out ddummy) || !Utils.TryParseUDouble(tempHi4TextBox.Text, out ddummy) ||
-                    !Utils.TryParseUDouble(pressLo4TextBox.Text, out ddummy) || !Utils.TryParseUDouble(pressHi4TextBox.Text, out ddummy))
-                {
-                    flags |= CfgUpdateFlags.Error;
-                    message += Environment.NewLine + "Ivalid 'Range 4'";
-                }
-            }
-            if (rangeCheckBox5.Checked)
-            {
-                if (!Utils.TryParseUDouble(tempLo5TextBox.Text, out ddummy) || !Utils.TryParseUDouble(tempHi5TextBox.Text, out ddummy) ||
-                    !Utils.TryParseUDouble(pressLo5TextBox.Text, out ddummy) || !Utils.TryParseUDouble(pressHi5TextBox.Text, out ddummy))
-                {
-                    flags |= CfgUpdateFlags.Error;
-                    message += Environment.NewLine + "Ivalid 'Range 5'";
-                }
-            }
-
-            return flags;
-		}
-
-		public CfgUpdateFlags UpdateCfg()
-		{
-            CfgUpdateFlags flags = CfgUpdateFlags.None;
-
-			if (config == null) return CfgUpdateFlags.Error;	/// Control was not loaded, settings were not changed
-
-            if (config.Name != nameTextBox.Text)
-            {
-                config.Name = nameTextBox.Text;
-                flags |= (CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-            }
-
-            string parentName = parentNameComboBox.Text.Equals("---") ? string.Empty : parentNameComboBox.Text;
-            if (config.ParentName != parentName)
-            {
-                config.ParentName = parentName;
-                flags |= (CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-            }
-
-            flags |= UpdateDifferent(ref config.Idx1, positionTextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-            flags |= UpdateDifferent(ref config.NominalFlow, nominalFlowTextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-
-            if (rangeCheckBox1.Checked)
-            {
-                flags |= UpdateDifferent(ref config.Temp1Lo, tempLo1TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Temp1Hi, tempHi1TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Press1Lo, pressLo1TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Press1Hi, pressHi1TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-            }
-            else
-            {
-                flags |= UpdateDifferent(ref config.Temp1Lo, "0", CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Temp1Hi, "0", CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Press1Lo, "0", CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Press1Hi, "0", CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-            }
-
-            if (rangeCheckBox2.Checked)
-            {
-                flags |= UpdateDifferent(ref config.Temp2Lo, tempLo2TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Temp2Hi, tempHi2TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Press2Lo, pressLo2TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Press2Hi, pressHi2TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-            }
-            else
-            {
-                flags |= UpdateDifferent(ref config.Temp2Lo, "0", CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Temp2Hi, "0", CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Press2Lo, "0", CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Press2Hi, "0", CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-            }
-
-            if (rangeCheckBox3.Checked)
-            {
-                flags |= UpdateDifferent(ref config.Temp3Lo, tempLo3TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Temp3Hi, tempHi3TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Press3Lo, pressLo3TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Press3Hi, pressHi3TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-            }
-            else
-            {
-                flags |= UpdateDifferent(ref config.Temp3Lo, "0", CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Temp3Hi, "0", CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Press3Lo, "0", CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Press3Hi, "0", CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-            }
-
-            if (rangeCheckBox4.Checked)
-            {
-                flags |= UpdateDifferent(ref config.Temp4Lo, tempLo4TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Temp4Hi, tempHi4TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Press4Lo, pressLo4TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Press4Hi, pressHi4TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-            }
-            else
-            {
-                flags |= UpdateDifferent(ref config.Temp4Lo, "0", CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Temp4Hi, "0", CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Press4Lo, "0", CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Press4Hi, "0", CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-            }
-
-            if (rangeCheckBox5.Checked)
-            {
-                flags |= UpdateDifferent(ref config.Temp5Lo, tempLo5TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Temp5Hi, tempHi5TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Press5Lo, pressLo5TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Press5Hi, pressHi5TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-            }
-            else
-            {
-                flags |= UpdateDifferent(ref config.Temp5Lo, "0", CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Temp5Hi, "0", CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Press5Lo, "0", CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-                flags |= UpdateDifferent(ref config.Press5Hi, "0", CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-            }
-
-			return flags;
-		}
-
-
-        private void rangeCheckBox1_CheckedChanged(object sender, EventArgs e)
-        {
-            tempLo1TextBox.Enabled = tempHi1TextBox.Enabled = pressLo1TextBox.Enabled = pressHi1TextBox.Enabled =
-                (rangeCheckBox1.Enabled && rangeCheckBox1.Checked);
-        }
-        private void rangeCheckBox2_CheckedChanged(object sender, EventArgs e)
-        {
-            tempLo2TextBox.Enabled = tempHi2TextBox.Enabled = pressLo2TextBox.Enabled = pressHi2TextBox.Enabled =
-                (rangeCheckBox2.Enabled && rangeCheckBox2.Checked);
-        }
-        private void rangeCheckBox3_CheckedChanged(object sender, EventArgs e)
-        {
-            tempLo3TextBox.Enabled = tempHi3TextBox.Enabled = pressLo3TextBox.Enabled = pressHi3TextBox.Enabled =
-                (rangeCheckBox3.Enabled && rangeCheckBox3.Checked);
-        }
-        private void rangeCheckBox4_CheckedChanged(object sender, EventArgs e)
-        {
-            tempLo4TextBox.Enabled = tempHi4TextBox.Enabled = pressLo4TextBox.Enabled = pressHi4TextBox.Enabled =
-                (rangeCheckBox4.Enabled && rangeCheckBox4.Checked);
-        }
-        private void rangeCheckBox5_CheckedChanged(object sender, EventArgs e)
-        {
-            tempLo5TextBox.Enabled = tempHi5TextBox.Enabled = pressLo5TextBox.Enabled = pressHi5TextBox.Enabled =
-                (rangeCheckBox5.Enabled && rangeCheckBox5.Checked);
-        }
-	}
-}
@@ -1,156 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Slovensko a.s.
-///
-namespace TBF.BenchControl.Elde.FlowMeterTriplet
-{
-	partial class FlowMeterCfgCtrl
-	{
-		/// <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.positionTextBox = new System.Windows.Forms.TextBox();
-            this.positionLabel = new System.Windows.Forms.Label();
-            this.parentNameLabel = new System.Windows.Forms.Label();
-            this.nameTextBox = new System.Windows.Forms.TextBox();
-            this.nameLabel = new System.Windows.Forms.Label();
-            this.classNameLabel = new System.Windows.Forms.Label();
-            this.nominalFlowTextBox = new System.Windows.Forms.TextBox();
-            this.nominalFlowLabel = new System.Windows.Forms.Label();
-            this.parentNameComboBox = new System.Windows.Forms.ComboBox();
-            this.SuspendLayout();
-            // 
-            // positionTextBox
-            // 
-            this.positionTextBox.Enabled = false;
-            this.positionTextBox.Location = new System.Drawing.Point(224, 113);
-            this.positionTextBox.Name = "positionTextBox";
-            this.positionTextBox.Size = new System.Drawing.Size(46, 20);
-            this.positionTextBox.TabIndex = 6;
-            // 
-            // positionLabel
-            // 
-            this.positionLabel.AutoSize = true;
-            this.positionLabel.Location = new System.Drawing.Point(30, 116);
-            this.positionLabel.Name = "positionLabel";
-            this.positionLabel.Size = new System.Drawing.Size(44, 13);
-            this.positionLabel.TabIndex = 5;
-            this.positionLabel.Text = "Position";
-            // 
-            // parentNameLabel
-            // 
-            this.parentNameLabel.AutoSize = true;
-            this.parentNameLabel.Location = new System.Drawing.Point(30, 90);
-            this.parentNameLabel.Name = "parentNameLabel";
-            this.parentNameLabel.Size = new System.Drawing.Size(69, 13);
-            this.parentNameLabel.TabIndex = 3;
-            this.parentNameLabel.Text = "Parent Name";
-            // 
-            // nameTextBox
-            // 
-            this.nameTextBox.Enabled = false;
-            this.nameTextBox.Location = new System.Drawing.Point(140, 61);
-            this.nameTextBox.Name = "nameTextBox";
-            this.nameTextBox.Size = new System.Drawing.Size(130, 20);
-            this.nameTextBox.TabIndex = 2;
-            // 
-            // nameLabel
-            // 
-            this.nameLabel.AutoSize = true;
-            this.nameLabel.Location = new System.Drawing.Point(30, 64);
-            this.nameLabel.Name = "nameLabel";
-            this.nameLabel.Size = new System.Drawing.Size(35, 13);
-            this.nameLabel.TabIndex = 1;
-            this.nameLabel.Text = "Name";
-            // 
-            // classNameLabel
-            // 
-            this.classNameLabel.AutoSize = true;
-            this.classNameLabel.Location = new System.Drawing.Point(137, 37);
-            this.classNameLabel.Name = "classNameLabel";
-            this.classNameLabel.Size = new System.Drawing.Size(83, 13);
-            this.classNameLabel.TabIndex = 0;
-            this.classNameLabel.Text = "ComonentName";
-            // 
-            // nominalFlowTextBox
-            // 
-            this.nominalFlowTextBox.Enabled = false;
-            this.nominalFlowTextBox.Location = new System.Drawing.Point(224, 138);
-            this.nominalFlowTextBox.Name = "nominalFlowTextBox";
-            this.nominalFlowTextBox.Size = new System.Drawing.Size(46, 20);
-            this.nominalFlowTextBox.TabIndex = 8;
-            // 
-            // nominalFlowLabel
-            // 
-            this.nominalFlowLabel.AutoSize = true;
-            this.nominalFlowLabel.Location = new System.Drawing.Point(30, 141);
-            this.nominalFlowLabel.Name = "nominalFlowLabel";
-            this.nominalFlowLabel.Size = new System.Drawing.Size(174, 13);
-            this.nominalFlowLabel.TabIndex = 7;
-            this.nominalFlowLabel.Text = "Nominal flow (=sum) [m3/h @6kHz]";
-            // 
-            // parentNameComboBox
-            // 
-            this.parentNameComboBox.Enabled = false;
-            this.parentNameComboBox.FormattingEnabled = true;
-            this.parentNameComboBox.Location = new System.Drawing.Point(140, 87);
-            this.parentNameComboBox.Name = "parentNameComboBox";
-            this.parentNameComboBox.Size = new System.Drawing.Size(130, 21);
-            this.parentNameComboBox.TabIndex = 4;
-            // 
-            // FlowMeterCfgCtrl
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.parentNameComboBox);
-            this.Controls.Add(this.nominalFlowTextBox);
-            this.Controls.Add(this.nominalFlowLabel);
-            this.Controls.Add(this.positionTextBox);
-            this.Controls.Add(this.positionLabel);
-            this.Controls.Add(this.parentNameLabel);
-            this.Controls.Add(this.nameTextBox);
-            this.Controls.Add(this.nameLabel);
-            this.Controls.Add(this.classNameLabel);
-            this.Name = "FlowMeterCfgCtrl";
-            this.Size = new System.Drawing.Size(300, 200);
-            this.Load += new System.EventHandler(this.FlowMeterCfgCtrl_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.TextBox positionTextBox;
-		private System.Windows.Forms.Label positionLabel;
-		private System.Windows.Forms.Label parentNameLabel;
-		private System.Windows.Forms.TextBox nameTextBox;
-		private System.Windows.Forms.Label nameLabel;
-		private System.Windows.Forms.Label classNameLabel;
-        private System.Windows.Forms.TextBox nominalFlowTextBox;
-        private System.Windows.Forms.Label nominalFlowLabel;
-		private System.Windows.Forms.ComboBox parentNameComboBox;
-	}
-}
@@ -1,26 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Slovensko a.s.
-///
-using System.Collections.Generic;
-using TBF.BenchControl.Generic;
-
-namespace TBF.BenchControl.Elde.FlowMeterTriplet
-{
-	public class FlowMeterFactory : IComponentFactory
-	{
-		public string ClassName { get { return "FlowMeterTriplet"; } }
-
-		public void ResetStaticProperties() { FlowMeter.ResetStaticProperties(); }
-
-		public IComponent DummyComponent() { return new FlowMeter(); }
-
-		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new FlowMeter(cfg, components); }
-
-		public IComponentCfg DefaultConfig() { return new FlowMeterCfg(this); }
-
-		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
-		{
-			return ComponentCfgBase.CreateFromDbEntity(FlowMeterCfg.Serializer, component, this);
-		}
-	}
-}
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
@@ -1,70 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Slovensko a.s.
-///
-using System;
-using log4net;
-using TBF.Boxes;
-
-namespace TBF.BenchControl.Elde
-{
-	public class ReadFlowOp : IOperation
-	{
-		private static readonly ILog log = LogManager.GetLogger(typeof(ReadFlowOp));
-        public override string ToString() { return string.Format("ReadFlowOp({0},.,.,{1})", flowMeter.Idx1, eventDone); }
-
-		/// Set by the constructor
-        readonly GenericDevices.IFlowMeter flowMeter;
-		readonly ControlBoardDev controlBoard;
-		readonly DoubleBox flowBox;
-		readonly Event eventDone;
-
-		/// <summary>
-		/// Events:  FlowInDone, FlowOutDone or Error
-		/// </summary>
-		/// <param name="flowMeter">Flow meter reference</param>
-		/// <param name="flowBox">Reference to the measured flow variable, value is in bar</param>
-		/// <param name="eventDone">Event to be returned by Run() when completed OK</param>
-        public ReadFlowOp(GenericDevices.IFlowMeter flowMeter, ControlBoardDev controlBoard, ref DoubleBox flowBox, Event eventDone)
-        {
-            if (flowMeter == null || controlBoard == null) throw new ArgumentNullException();
-
-            this.flowMeter = flowMeter;
-			this.controlBoard = controlBoard;
-			this.eventDone = eventDone;
-			this.flowBox = flowBox;
-
-			log.Debug(this.ToString());
-        }
-        public ReadFlowOp(GenericDevices.IFlowMeter flowMeter, ControlBoardDev controlBoard, ref DoubleBox flowBox)
-			: this(flowMeter, controlBoard, ref flowBox, Event.FlowMeasurementDone)
-		{
-		}
-
-		/// <summary>Start this operation</summary>
-		public void Start()
-        {
-		}
-
-		/// <summary>Run this operation</summary>
-		/// <returns>
-		///		Event.FlowInDone or Event.FlowOutDone
-		/// </returns>
-		public Event Run()
-		{
-			if ((int)(controlBoard.StatusP & StatusP.RefFlowMeterMask) == flowMeter.Idx1)
-			{
-                flowBox.Val = flowMeter.ReadFlow();
-				return eventDone;
-			}
-			else
-			{
-				return Event.Error;
-			}
-		}
-
-		/// <summary>Stop this operation</summary>
-		public void Stop()
-		{
-		}
-	}
-}
@@ -1,204 +0,0 @@
-///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
-///
-using System;
-using log4net;
-
-namespace TBF.BenchControl.Elde
-{
-	public class StartMeasurementOp : IOperation
-	{
-		private static readonly ILog log = LogManager.GetLogger(typeof(StartMeasurementOp));
-        public override string ToString() { return string.Format("StartMeasurementOp(ref={0},pulses={1})", flowMeterNr, totalRefPulses); }
-
-		/// Set by the constructor
-		readonly ControlBoardDev controlBoard;
-		readonly Elde.RegulValve.RegulValve regulValve;
-		readonly int regulValveNr;
-		readonly int flowMeterNr;
-		readonly float nominalFlow;
-		readonly float reqFlowLo;
-		readonly float reqFlowHi;
-		readonly float reqFlowAve;
-		readonly float pidCoef;
-		readonly int totalRefPulses;        /// Number of reference pulses for a complete test
-        readonly int massRefPulses;         /// Number of reference pulses for mass collection
-        readonly TestMethods testMethod;
-        readonly float filterConstant;
-        readonly int diverterNr;
-
-        bool started = false;
-
-		///
-		///  Internal states of this operation
-		///
-		enum OpState
-		{
-			StartingTest,
-            ResendCommand,
-			TestStarted,
-			ValveMoveToFlow,
-			OpCompleted,
-		}
-		OpState opState;
-
-
-        /// <summary>
-        /// Starts the measurement.
-        /// Events:  MeasurementStarted
-        /// </summary>
-        /// <param name="controlBoard">Control board component reference</param>
-		/// <param name="outputPath">Specifies used components</param>
-		/// <param name="method">Test method</param>
-		/// <param name="totalRefPulses">Test duration in number of reference flowmeter pulses</param>
-		/// <param name="filterConstant">Specifies filter for watermeter pulses</param>
-        public StartMeasurementOp(ControlBoardDev controlBoard, OutputPath outputPath, TestMethods method,
-                                  float requiredFlowLo, float requiredFlowHi,
-                                  int refPulses, float filterConstant)
-            : this(controlBoard, outputPath, method, requiredFlowLo, requiredFlowHi, refPulses, refPulses, filterConstant)
-        {
-        }
-
-        /// <summary>
-        /// Starts the measurement.
-        /// Events:  MeasurementStarted
-        /// </summary>
-        /// <param name="controlBoard">Control board component reference</param>
-		/// <param name="outputPath">Specifies used components</param>
-		/// <param name="method">Test method</param>
-		/// <param name="refPulses">Test duration in number of reference flowmeter pulses</param>
-		/// <param name="filterConstant">Specifies filter for watermeter pulses</param>
-		public StartMeasurementOp(ControlBoardDev controlBoard, OutputPath outputPath, TestMethods method,
-								  float requiredFlowLo, float requiredFlowHi,
-                                  int totalRefPulses, int massRefPulses, float filterConstant)
-        {
-			if (controlBoard == null) throw new ArgumentNullException("controlBoardDev");
-			this.controlBoard = controlBoard;
-
-            if (outputPath.FlowMeter == null) throw new ArgumentNullException("Flow meter is missing");
-			flowMeterNr = outputPath.FlowMeter.Idx1;
-
-			if (outputPath.RegulValve is Elde.RegulValve.RegulValve)
-			{
-				regulValve = outputPath.RegulValve as Elde.RegulValve.RegulValve;
-				regulValveNr = this.regulValve.Idx1;
-			}
-			else if (!(outputPath.RegulValve is Dummy.RegulValve.RegulValve))
-			{
-				throw new ArgumentNullException("Regulation valve is not compatible with Elde Control Board");
-			}
-
-			if (outputPath.Diverter is Elde.Diverter.Diverter)
-            {
-                diverterNr = (outputPath.Diverter as Elde.Diverter.Diverter).DiverterNr;
-            }
-
-			nominalFlow = outputPath.FlowMeter.NominalFlow;
-
-			this.reqFlowLo = requiredFlowLo;
-			this.reqFlowHi = requiredFlowHi;
-			this.reqFlowAve = (reqFlowLo + reqFlowHi) / 2.0f;
-			this.pidCoef = outputPath.PidCoef;
-
-            this.totalRefPulses = totalRefPulses;
-            this.massRefPulses = massRefPulses;
-            this.testMethod = method;
-            this.filterConstant = filterConstant;
-
-			log.Debug(this.ToString());
-        }
-
-        void SendStartCommand()
-        {
-            controlBoard.SyncRoute();
-#if TURA_IPERL || TURA_SPECIAL || BADGER_VELKA_TRAT || SLM_50
-			int flowMeterIdxAndDiv = flowMeterNr + 16 * diverterNr;
-#elif BADGER_STREDNA_TRAT
-			int flowMeterIdxAndDiv = flowMeterNr + 8 * (diverterNr - 1);
-#else
-            int flowMeterIdxAndDiv = flowMeterNr;
-#endif
-            log.InfoFormat("Start() : SendCommand(Cmd.Start, {0}, route, {1}, {1}, {2}, {3}, {4}, 0, Stop.None)",
-                            flowMeterIdxAndDiv, totalRefPulses, testMethod, filterConstant, (int)pidCoef);
-
-            controlBoard.SendCommand(Command.Start, flowMeterIdxAndDiv, controlBoard.Route,
-                                     totalRefPulses, massRefPulses, testMethod,
-                                     filterConstant, (int)pidCoef, 0, StopDevs.None);
-        }
-
-		/// <summary>Start this operation</summary>
-		public void Start()
-        {
-            SendStartCommand();
-			opState = OpState.StartingTest;
-        }
-
-		/// <summary>Run this operation</summary>
-		/// <returns>
-		///		Event.FlowInDone or Event.FlowOutDone
-		/// </returns>
-		public Event Run()
-		{
-			if (opState == OpState.StartingTest)
-			{
-				StatusP statusP = controlBoard.StatusP;
-				log.DebugFormat("statusP = {0} {1} {2} {3}",
-								(((ulong)statusP >> 48) & 0xFFFF).ToString("X4"),
-								(((ulong)statusP >> 32) & 0xFFFF).ToString("X4"),
-								(((ulong)statusP >> 16) & 0xFFFF).ToString("X4"),
-								((ulong)statusP & 0xFFFF).ToString("X4"));
-
-                if ((statusP & StatusP.TestInProgress) != 0)
-                {
-                    log.Info("Test started");
-                    opState = OpState.TestStarted;
-                }
-                else
-                {
-                    //opState = OpState.ResendCommand;
-                }
-
-				return Event.None;
-			}
-            else if (opState == OpState.ResendCommand)
-            {
-                SendStartCommand();
-                opState = OpState.StartingTest;
-                return Event.None;
-            }
-            else if (opState == OpState.TestStarted)
-            {
-                ///
-                /// Done once, issues an appropriate ValveMove(...) command
-                ///
-                if (reqFlowLo >= reqFlowHi || reqFlowLo > nominalFlow || reqFlowHi <= 0)
-                {
-                    return Event.OpArgumentError;
-                }
-
-                log.InfoFormat("Run(): rv#={0} flowMtr#={1} TARGET: flowLo={2} flowHi={3}",
-                                regulValveNr, flowMeterNr, reqFlowLo, reqFlowHi);
-
-                float freqLo = 2000.0f * reqFlowLo / nominalFlow;
-                float freqHi = 2000.0f * reqFlowHi / nominalFlow;
-                controlBoard.ValveMove(regulValveNr, RegulValveMode.TargetFrequency,
-                                       new float[2] { freqLo, freqHi },
-                                       regulValve.StableTime);
-
-                opState = OpState.OpCompleted;
-                return Event.None;
-            }
-            else if (opState == OpState.OpCompleted)
-            {
-                return Event.MeasurementStarted;
-            }
-
-			return Event.None;
-		}
-
-		/// <summary>Stop this operation</summary>
-		public void Stop()
-		{
-		}
-	}
-}
@@ -1,30 +0,0 @@
-///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
-///
-using System;
-using TBF.BenchControl.Generic;
-
-namespace TBF.BenchControl.GenericDevices
-{
-	public interface ICalibInfoCfg : IComponentCfg
-	{
-        ///
-		/// Access to parameters displayed in Metrology tab page
-        ///
-        
-        bool RangeEnabled(int rangeIx1);
-
-        double GetTempLo(int rangeIx1);
-        double GetTempHi(int rangeIx1);
-        double GetPressLo(int rangeIx1);
-        double GetPressHi(int rangeIx1);
-
-        string GetCalibCertificate(int rangeIx1);                   /// Get calibration certificate number
-        DateTime GetCalibDate(int rangeIx1);                        /// Get the date of calibration
-        DateTime GetCalibValidDate(int rangeIx1);                   /// Get calibration valid until (date)
-
-        void SetCalibCertificate(int rangeIx1, string certificate); /// Set calibration certificate number
-        void SetCalibDate(int rangeIx1, DateTime date);             /// Get the date of calibration
-        void SetCalibValidDate(int rangeIx1, DateTime date);        /// Get calibration valid until (date)
-    }
-}
@@ -1,16 +0,0 @@
-///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
-///
-using System;
-
-namespace TBF.BenchControl.GenericDevices
-{
-	public interface IPlotter
-	{
-		int StartGraph(int batchNr, string testName, int repetition);
-
-		void UpdateGraph(int graphId, float x, float y);
-
-		void StopGraph(int graphId, float ymin, float ymax);
-	}
-}
@@ -1,438 +0,0 @@
-///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
-///
-namespace TBF.BenchControl.MettlerToledo.Multi
-{
-	partial class BalanceCfgCtrl
-	{
-		/// <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.handshakeComboBox = new System.Windows.Forms.ComboBox();
-            this.stopBitsComboBox = new System.Windows.Forms.ComboBox();
-            this.parityComboBox = new System.Windows.Forms.ComboBox();
-            this.nameTextBox = new System.Windows.Forms.TextBox();
-            this.nameLabel = new System.Windows.Forms.Label();
-            this.classNameLabel = new System.Windows.Forms.Label();
-            this.handshakeLabel = new System.Windows.Forms.Label();
-            this.stopBitsLabel = new System.Windows.Forms.Label();
-            this.dataBitsTextBox = new System.Windows.Forms.TextBox();
-            this.dataBitsLabel = new System.Windows.Forms.Label();
-            this.parityLabel = new System.Windows.Forms.Label();
-            this.baudRateTextBox = new System.Windows.Forms.TextBox();
-            this.baudRateLabel = new System.Windows.Forms.Label();
-            this.comPortNrTextBox = new System.Windows.Forms.TextBox();
-            this.comPortNrLabel = new System.Windows.Forms.Label();
-            this.capacityLabel = new System.Windows.Forms.Label();
-            this.capacityTextBox = new System.Windows.Forms.TextBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.emptyTextBox = new System.Windows.Forms.TextBox();
-            this.emptyLabel = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
-            this.emptyTimeTextBox = new System.Windows.Forms.TextBox();
-            this.label5 = new System.Windows.Forms.Label();
-            this.formatTextBox = new System.Windows.Forms.TextBox();
-            this.formatLabel = new System.Windows.Forms.Label();
-            this.idNrTextBox = new System.Windows.Forms.TextBox();
-            this.idNrLabel = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.resolutionTextBox = new System.Windows.Forms.TextBox();
-            this.resolutionLabel = new System.Windows.Forms.Label();
-            this.drainValveComboBox = new System.Windows.Forms.ComboBox();
-            this.drainingValveLabel = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // handshakeComboBox
-            // 
-            this.handshakeComboBox.Enabled = false;
-            this.handshakeComboBox.FormattingEnabled = true;
-            this.handshakeComboBox.Location = new System.Drawing.Point(236, 256);
-            this.handshakeComboBox.Name = "handshakeComboBox";
-            this.handshakeComboBox.Size = new System.Drawing.Size(43, 21);
-            this.handshakeComboBox.TabIndex = 32;
-            // 
-            // stopBitsComboBox
-            // 
-            this.stopBitsComboBox.Enabled = false;
-            this.stopBitsComboBox.FormattingEnabled = true;
-            this.stopBitsComboBox.Location = new System.Drawing.Point(236, 235);
-            this.stopBitsComboBox.Name = "stopBitsComboBox";
-            this.stopBitsComboBox.Size = new System.Drawing.Size(43, 21);
-            this.stopBitsComboBox.TabIndex = 30;
-            // 
-            // parityComboBox
-            // 
-            this.parityComboBox.Enabled = false;
-            this.parityComboBox.FormattingEnabled = true;
-            this.parityComboBox.Location = new System.Drawing.Point(100, 256);
-            this.parityComboBox.Name = "parityComboBox";
-            this.parityComboBox.Size = new System.Drawing.Size(43, 21);
-            this.parityComboBox.TabIndex = 26;
-            // 
-            // nameTextBox
-            // 
-            this.nameTextBox.Enabled = false;
-            this.nameTextBox.Location = new System.Drawing.Point(150, 26);
-            this.nameTextBox.Name = "nameTextBox";
-            this.nameTextBox.Size = new System.Drawing.Size(143, 20);
-            this.nameTextBox.TabIndex = 2;
-            // 
-            // nameLabel
-            // 
-            this.nameLabel.AutoSize = true;
-            this.nameLabel.Location = new System.Drawing.Point(26, 29);
-            this.nameLabel.Name = "nameLabel";
-            this.nameLabel.Size = new System.Drawing.Size(35, 13);
-            this.nameLabel.TabIndex = 1;
-            this.nameLabel.Text = "Name";
-            // 
-            // classNameLabel
-            // 
-            this.classNameLabel.AutoSize = true;
-            this.classNameLabel.Location = new System.Drawing.Point(147, 7);
-            this.classNameLabel.Name = "classNameLabel";
-            this.classNameLabel.Size = new System.Drawing.Size(89, 13);
-            this.classNameLabel.TabIndex = 0;
-            this.classNameLabel.Text = "ComponentName";
-            // 
-            // handshakeLabel
-            // 
-            this.handshakeLabel.AutoSize = true;
-            this.handshakeLabel.Location = new System.Drawing.Point(162, 259);
-            this.handshakeLabel.Name = "handshakeLabel";
-            this.handshakeLabel.Size = new System.Drawing.Size(62, 13);
-            this.handshakeLabel.TabIndex = 31;
-            this.handshakeLabel.Text = "Handshake";
-            // 
-            // stopBitsLabel
-            // 
-            this.stopBitsLabel.AutoSize = true;
-            this.stopBitsLabel.Location = new System.Drawing.Point(162, 238);
-            this.stopBitsLabel.Name = "stopBitsLabel";
-            this.stopBitsLabel.Size = new System.Drawing.Size(49, 13);
-            this.stopBitsLabel.TabIndex = 29;
-            this.stopBitsLabel.Text = "Stop Bits";
-            // 
-            // dataBitsTextBox
-            // 
-            this.dataBitsTextBox.Enabled = false;
-            this.dataBitsTextBox.Location = new System.Drawing.Point(236, 213);
-            this.dataBitsTextBox.Name = "dataBitsTextBox";
-            this.dataBitsTextBox.Size = new System.Drawing.Size(43, 20);
-            this.dataBitsTextBox.TabIndex = 28;
-            // 
-            // dataBitsLabel
-            // 
-            this.dataBitsLabel.AutoSize = true;
-            this.dataBitsLabel.Location = new System.Drawing.Point(162, 216);
-            this.dataBitsLabel.Name = "dataBitsLabel";
-            this.dataBitsLabel.Size = new System.Drawing.Size(50, 13);
-            this.dataBitsLabel.TabIndex = 27;
-            this.dataBitsLabel.Text = "Data Bits";
-            // 
-            // parityLabel
-            // 
-            this.parityLabel.AutoSize = true;
-            this.parityLabel.Location = new System.Drawing.Point(26, 261);
-            this.parityLabel.Name = "parityLabel";
-            this.parityLabel.Size = new System.Drawing.Size(33, 13);
-            this.parityLabel.TabIndex = 25;
-            this.parityLabel.Text = "Parity";
-            // 
-            // baudRateTextBox
-            // 
-            this.baudRateTextBox.Enabled = false;
-            this.baudRateTextBox.Location = new System.Drawing.Point(100, 235);
-            this.baudRateTextBox.Name = "baudRateTextBox";
-            this.baudRateTextBox.Size = new System.Drawing.Size(43, 20);
-            this.baudRateTextBox.TabIndex = 24;
-            // 
-            // baudRateLabel
-            // 
-            this.baudRateLabel.AutoSize = true;
-            this.baudRateLabel.Location = new System.Drawing.Point(26, 238);
-            this.baudRateLabel.Name = "baudRateLabel";
-            this.baudRateLabel.Size = new System.Drawing.Size(58, 13);
-            this.baudRateLabel.TabIndex = 23;
-            this.baudRateLabel.Text = "Baud Rate";
-            // 
-            // comPortNrTextBox
-            // 
-            this.comPortNrTextBox.Enabled = false;
-            this.comPortNrTextBox.Location = new System.Drawing.Point(100, 213);
-            this.comPortNrTextBox.Name = "comPortNrTextBox";
-            this.comPortNrTextBox.Size = new System.Drawing.Size(43, 20);
-            this.comPortNrTextBox.TabIndex = 22;
-            // 
-            // comPortNrLabel
-            // 
-            this.comPortNrLabel.AutoSize = true;
-            this.comPortNrLabel.Location = new System.Drawing.Point(26, 216);
-            this.comPortNrLabel.Name = "comPortNrLabel";
-            this.comPortNrLabel.Size = new System.Drawing.Size(68, 13);
-            this.comPortNrLabel.TabIndex = 21;
-            this.comPortNrLabel.Text = "Serial Port #:";
-            // 
-            // capacityLabel
-            // 
-            this.capacityLabel.AutoSize = true;
-            this.capacityLabel.Location = new System.Drawing.Point(25, 71);
-            this.capacityLabel.Name = "capacityLabel";
-            this.capacityLabel.Size = new System.Drawing.Size(76, 13);
-            this.capacityLabel.TabIndex = 5;
-            this.capacityLabel.Text = "Tank Capacity";
-            // 
-            // capacityTextBox
-            // 
-            this.capacityTextBox.Enabled = false;
-            this.capacityTextBox.Location = new System.Drawing.Point(151, 68);
-            this.capacityTextBox.Name = "capacityTextBox";
-            this.capacityTextBox.Size = new System.Drawing.Size(43, 20);
-            this.capacityTextBox.TabIndex = 6;
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(200, 71);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(19, 13);
-            this.label2.TabIndex = 7;
-            this.label2.Text = "kg";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(200, 113);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(19, 13);
-            this.label3.TabIndex = 13;
-            this.label3.Text = "kg";
-            // 
-            // emptyTextBox
-            // 
-            this.emptyTextBox.Enabled = false;
-            this.emptyTextBox.Location = new System.Drawing.Point(151, 110);
-            this.emptyTextBox.Name = "emptyTextBox";
-            this.emptyTextBox.Size = new System.Drawing.Size(43, 20);
-            this.emptyTextBox.TabIndex = 12;
-            // 
-            // emptyLabel
-            // 
-            this.emptyLabel.AutoSize = true;
-            this.emptyLabel.Location = new System.Drawing.Point(25, 113);
-            this.emptyLabel.Name = "emptyLabel";
-            this.emptyLabel.Size = new System.Drawing.Size(109, 13);
-            this.emptyLabel.TabIndex = 11;
-            this.emptyLabel.Text = "Tank empty threshold";
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(200, 155);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(24, 13);
-            this.label4.TabIndex = 18;
-            this.label4.Text = "sec";
-            // 
-            // emptyTimeTextBox
-            // 
-            this.emptyTimeTextBox.Enabled = false;
-            this.emptyTimeTextBox.Location = new System.Drawing.Point(151, 152);
-            this.emptyTimeTextBox.Name = "emptyTimeTextBox";
-            this.emptyTimeTextBox.Size = new System.Drawing.Size(43, 20);
-            this.emptyTimeTextBox.TabIndex = 17;
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(26, 155);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(58, 13);
-            this.label5.TabIndex = 16;
-            this.label5.Text = "Drain Time";
-            // 
-            // formatTextBox
-            // 
-            this.formatTextBox.Enabled = false;
-            this.formatTextBox.Location = new System.Drawing.Point(151, 131);
-            this.formatTextBox.Name = "formatTextBox";
-            this.formatTextBox.Size = new System.Drawing.Size(43, 20);
-            this.formatTextBox.TabIndex = 15;
-            // 
-            // formatLabel
-            // 
-            this.formatLabel.AutoSize = true;
-            this.formatLabel.Location = new System.Drawing.Point(26, 134);
-            this.formatLabel.Name = "formatLabel";
-            this.formatLabel.Size = new System.Drawing.Size(76, 13);
-            this.formatLabel.TabIndex = 14;
-            this.formatLabel.Text = "Decimal points";
-            // 
-            // idNrTextBox
-            // 
-            this.idNrTextBox.Enabled = false;
-            this.idNrTextBox.Location = new System.Drawing.Point(151, 47);
-            this.idNrTextBox.Name = "idNrTextBox";
-            this.idNrTextBox.Size = new System.Drawing.Size(43, 20);
-            this.idNrTextBox.TabIndex = 4;
-            this.idNrTextBox.TextChanged += new System.EventHandler(this.idNrTextBox_TextChanged);
-            // 
-            // idNrLabel
-            // 
-            this.idNrLabel.AutoSize = true;
-            this.idNrLabel.Location = new System.Drawing.Point(25, 50);
-            this.idNrLabel.Name = "idNrLabel";
-            this.idNrLabel.Size = new System.Drawing.Size(85, 13);
-            this.idNrLabel.TabIndex = 3;
-            this.idNrLabel.Text = "ID Number (1..3)";
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(200, 92);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(19, 13);
-            this.label1.TabIndex = 10;
-            this.label1.Text = "kg";
-            // 
-            // resolutionTextBox
-            // 
-            this.resolutionTextBox.Enabled = false;
-            this.resolutionTextBox.Location = new System.Drawing.Point(151, 89);
-            this.resolutionTextBox.Name = "resolutionTextBox";
-            this.resolutionTextBox.Size = new System.Drawing.Size(43, 20);
-            this.resolutionTextBox.TabIndex = 9;
-            // 
-            // resolutionLabel
-            // 
-            this.resolutionLabel.AutoSize = true;
-            this.resolutionLabel.Location = new System.Drawing.Point(25, 92);
-            this.resolutionLabel.Name = "resolutionLabel";
-            this.resolutionLabel.Size = new System.Drawing.Size(57, 13);
-            this.resolutionLabel.TabIndex = 8;
-            this.resolutionLabel.Text = "Resolution";
-            // 
-            // drainValveComboBox
-            // 
-            this.drainValveComboBox.Enabled = false;
-            this.drainValveComboBox.FormattingEnabled = true;
-            this.drainValveComboBox.Location = new System.Drawing.Point(150, 173);
-            this.drainValveComboBox.Name = "drainValveComboBox";
-            this.drainValveComboBox.Size = new System.Drawing.Size(143, 21);
-            this.drainValveComboBox.TabIndex = 20;
-            // 
-            // drainingValveLabel
-            // 
-            this.drainingValveLabel.AutoSize = true;
-            this.drainingValveLabel.Location = new System.Drawing.Point(25, 176);
-            this.drainingValveLabel.Name = "drainingValveLabel";
-            this.drainingValveLabel.Size = new System.Drawing.Size(61, 13);
-            this.drainingValveLabel.TabIndex = 19;
-            this.drainingValveLabel.Text = "Drain valve";
-            // 
-            // BalanceCfgCtrl
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.drainValveComboBox);
-            this.Controls.Add(this.drainingValveLabel);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.resolutionTextBox);
-            this.Controls.Add(this.resolutionLabel);
-            this.Controls.Add(this.idNrTextBox);
-            this.Controls.Add(this.idNrLabel);
-            this.Controls.Add(this.formatTextBox);
-            this.Controls.Add(this.formatLabel);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.emptyTimeTextBox);
-            this.Controls.Add(this.label5);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.emptyTextBox);
-            this.Controls.Add(this.emptyLabel);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.capacityTextBox);
-            this.Controls.Add(this.capacityLabel);
-            this.Controls.Add(this.handshakeComboBox);
-            this.Controls.Add(this.stopBitsComboBox);
-            this.Controls.Add(this.parityComboBox);
-            this.Controls.Add(this.nameTextBox);
-            this.Controls.Add(this.nameLabel);
-            this.Controls.Add(this.classNameLabel);
-            this.Controls.Add(this.handshakeLabel);
-            this.Controls.Add(this.stopBitsLabel);
-            this.Controls.Add(this.dataBitsTextBox);
-            this.Controls.Add(this.dataBitsLabel);
-            this.Controls.Add(this.parityLabel);
-            this.Controls.Add(this.baudRateTextBox);
-            this.Controls.Add(this.baudRateLabel);
-            this.Controls.Add(this.comPortNrTextBox);
-            this.Controls.Add(this.comPortNrLabel);
-            this.Name = "BalanceCfgCtrl";
-            this.Size = new System.Drawing.Size(450, 300);
-            this.Load += new System.EventHandler(this.BalanceCfgCtrl_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.ComboBox handshakeComboBox;
-		private System.Windows.Forms.ComboBox stopBitsComboBox;
-		private System.Windows.Forms.ComboBox parityComboBox;
-		private System.Windows.Forms.TextBox nameTextBox;
-		private System.Windows.Forms.Label nameLabel;
-		private System.Windows.Forms.Label classNameLabel;
-		private System.Windows.Forms.Label handshakeLabel;
-		private System.Windows.Forms.Label stopBitsLabel;
-		private System.Windows.Forms.TextBox dataBitsTextBox;
-		private System.Windows.Forms.Label dataBitsLabel;
-		private System.Windows.Forms.Label parityLabel;
-		private System.Windows.Forms.TextBox baudRateTextBox;
-		private System.Windows.Forms.Label baudRateLabel;
-		private System.Windows.Forms.TextBox comPortNrTextBox;
-		private System.Windows.Forms.Label comPortNrLabel;
-		private System.Windows.Forms.Label capacityLabel;
-		private System.Windows.Forms.TextBox capacityTextBox;
-		private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.TextBox emptyTextBox;
-        private System.Windows.Forms.Label emptyLabel;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.TextBox emptyTimeTextBox;
-        private System.Windows.Forms.Label label5;
-		private System.Windows.Forms.TextBox formatTextBox;
-		private System.Windows.Forms.Label formatLabel;
-		private System.Windows.Forms.TextBox idNrTextBox;
-		private System.Windows.Forms.Label idNrLabel;
-		private System.Windows.Forms.Label label1;
-		private System.Windows.Forms.TextBox resolutionTextBox;
-		private System.Windows.Forms.Label resolutionLabel;
-        private System.Windows.Forms.ComboBox drainValveComboBox;
-        private System.Windows.Forms.Label drainingValveLabel;
-	}
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Milan Hanajik	b8944f72a0	Reconfigured for Munich with camera	2017-11-24 16:26:45 +01:00
Milan Hanajik	c1d78273b8	Somariny, ver. 2 17.750	2017-11-24 16:24:13 +01:00