Reconfigured for GENESIS

.gitignore

@@ -4,12 +4,16 @@ DeviceTest/bin/
 DeviceTest/obj/
 Dirichlet.Numerics/bin
 Dirichlet.Numerics/obj
+GraphLib/bin
+GraphLib/obj
+MonitoringDB/bin
+MonitoringDB/obj
 Results/bin/
 Results/obj/
 ResultsBrowser/bin/
 ResultsBrowser/obj/
-TestBenchFramework/bin/
-TestBenchFramework/obj/
+TBF/bin/
+TBF/obj/
 TBFSetup/Debug/
 TBFSetup/Release/
 Users/bin/

Config/Config.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;GENESIS;IPERL;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;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;GENESIS;IPERL;LANG_DE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

Config/Data.cs

@@ -14,7 +14,7 @@ namespace Config
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = 3;
-#elif DN100 || BADGER_VELKA_TRAT
+#elif DN100 || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT
 		public const int WMsCount = 3;
 		public const int LineSize = 3;
 		public const int CompoundWMsCount = 1;
@@ -32,12 +32,18 @@ namespace Config
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = 1;
-#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50
+#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50
         public const int WMsCount = 20;
 		public const int LineSize = 10;
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = WMsCount / LineSize;
+#elif RUM_MOB
+        public const int WMsCount = 8;
+		public const int LineSize = 8;
+		public const int CompoundWMsCount = 1;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
 #elif TURA_IPERL
 		public const int WMsCount = 40;
 		public const int LineSize = 20;

Config/Entities/Component.cs

@@ -3,6 +3,8 @@
 ///
 using System;
 using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
 
 namespace Config.Entities
 {
@@ -53,6 +55,59 @@ 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;

Config/Entities/Enums.cs

@@ -56,8 +56,12 @@ namespace Config.Entities
 		[Description("Vodoměry")]				Single,
 		[Description("Kombinované vodoměry")]	Combined,
 		[Description("Měřiče tepla")]			HeatMeter,
+#elif LANG_RU
+        [Description("Счетчик")]                 Single,
+        [Description("Комбинированный счетчик")] Combined,
+        [Description("Счетчик тепла")]           HeatMeter,
 #else
-		[Description("Water meters")]			Single,
+        [Description("Water meters")]			Single,
 		[Description("Compound water meters")]	Combined,
 		[Description("Heat meters")]			HeatMeter,
 #endif
@@ -84,14 +88,13 @@ namespace Config.Entities
 
     public enum Mounting
     {
+        [Description("")]       NotSpecified,
 #if LANG_DE
-        [Description("")]  NotSpecified,
-        [Description("H")] H,              /// horizontal
-        [Description("V")] V,              /// vertical
-        [Description("STR")] S,            /// standrohre
-        [Description("F")] F,              /// fall
+        [Description("H")]      H,         /// horizontal
+        [Description("V")]      V,         /// vertical
+        [Description("STR")]    S,         /// standrohre
+        [Description("F")]      F,         /// fall
 #else
-        [Description("")]  NotSpecified,
         [Description("H")] H,              /// horizontal
         [Description("V")] V,              /// vertical
         [Description("S")] S,              /// steig
@@ -370,4 +373,48 @@ namespace Config.Entities
 #endif
         Count
     }
+
+	public enum ImageRotation
+	{
+		[Description("0 deg")]		None,
+		[Description("90 deg")]		Deg90,
+		[Description("180 deg")]	Deg180,
+		[Description("270 deg")]	Deg270,
+		Count
+	}
+
+    public enum CameraDisplayResolution
+    {
+        Small,
+        Medium,
+        Large,
+        // FullScreen,
+        Count,
+    }
+
+	public enum ErrorFlagsMode : sbyte
+	{
+#if LANG_DE
+		[Description("aus")]		Off,
+		[Description("info")]		Info,
+		[Description("ein")]		On,
+#elif LANG_CS
+		[Description("vypnuto")]	Off,
+		[Description("info")]		Info,
+		[Description("zapnuto")]	On,
+#elif LANG_RU
+        [Description("выкл")]       Off,
+        [Description("инфо")]       Info,
+        [Description("вкл")]        On,
+#elif LANG_PL
+		[Description("nie")]		Off,
+		[Description("info")]		Info,
+		[Description("tak")]		On,
+#else // LANG_EN
+        [Description("off")]		Off,
+		[Description("info")]		Info,
+		[Description("on")]			On,
+#endif
+		Count
+	}
 }

Config/Entities/MeasurementCorrection.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
 ///
 using System;
 
@@ -8,7 +8,15 @@ 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;
+        }
 	}
 }

Config/Entities/Test.cs

@@ -25,8 +25,8 @@ namespace Config.Entities
 		public virtual float Volume { get; set; }			/// Test volume (target) in [l]
         public virtual float TstTime { get; set; }			/// Test time (estimate) in [s]
         public virtual string Method { get; set; }
-        public virtual float ErrLimLo { get; set; }			/// in [%] (usually < 0)
-        public virtual float ErrLimHi { get; set; }			/// in [%] (usually > 0)
+        public virtual float ErrLimLo { get; set; }			/// in [%] (usually < 0) or 1=class1, 2=class2, 3=class3
+        public virtual float ErrLimHi { get; set; }			/// in [%] (usually > 0) or -Qn in m3/h
         public virtual float Uncertainty { get; set; }		///	int [%] makes error limits tighter: 0 <= Uncertainty <= abs(ErrLimXx)
         public virtual int Repeats { get; set; }
         public virtual bool DoDraining { get; set; }
@@ -115,6 +115,10 @@ namespace Config.Entities
             result.Qto = Qto;
 			result.Volume = Volume;
 			result.TstTime = TstTime;
+			result.Method = Method;
+			result.ErrLimLo = ErrLimLo;
+			result.ErrLimHi = ErrLimHi;
+			result.Uncertainty = Uncertainty;
 			result.Repeats = Repeats;
             result.DoDraining = DoDraining;
             result.DoZeroing = DoZeroing;
@@ -129,10 +133,6 @@ namespace Config.Entities
             result.TimeFlow2Mass = TimeFlow2Mass;
             result.TimePump2StartV = TimePump2StartV;
 			result.TimeStop2Mass = TimeStop2Mass;
-			result.Method = Method;
-			result.ErrLimLo = ErrLimLo;
-            result.ErrLimHi = ErrLimHi;
-			result.Uncertainty = Uncertainty;
 			result.TolerRed = TolerRed;
             result.RedType = RedType;
 			result.FeedingPath = FeedingPath;
@@ -301,6 +301,55 @@ namespace Config.Entities
             return diff.ToString();
         }
 
+        public virtual float GetErrLimLo(float flow)
+        {
+            if (ErrLimLo <= ErrLimHi)
+            {
+                return ErrLimLo;        /// Error limit of a water meter
+            }
+            else
+            {
+                /// Metrological class and nominal flow of a heat meter
+                int metrClass = (int)Math.Round(ErrLimLo);
+                float Qp = Math.Abs(ErrLimHi);
+                float Q = Math.Max(flow, 0.00001f);     /// to avoid division by zero
+
+                /// Calculate the error limit of a heat meter
+                switch (metrClass)
+                {
+                    default:
+                    case 1: return -Math.Min(3.5f, 1.0f + 0.01f * Qp / Q);
+                    case 2: return -Math.Min(5.0f, 2.0f + 0.02f * Qp / Q);
+                    case 3: return -Math.Min(5.0f, 3.0f + 0.05f * Qp / Q);
+                }
+            }
+        }
+
+        public virtual float GetErrLimHi(float flow)
+        {
+            if (ErrLimLo <= ErrLimHi)
+            {
+                return ErrLimHi;        /// Error limit of a water meter
+            }
+            else
+            {
+                /// Metrological class and nominal flow of a heat meter
+                int metrClass = (int)Math.Round(ErrLimLo);
+                float Qp = Math.Abs(ErrLimHi);
+                float Q = Math.Max(flow, 0.00001f);     /// to avoid division by zero
+
+                /// Calculate the error limit of a heat meter
+                switch (metrClass)
+                {
+                    default:
+                    case 1: return +Math.Min(3.5f, 1.0f + 0.01f * Qp / Q);
+                    case 2: return +Math.Min(5.0f, 2.0f + 0.02f * Qp / Q);
+                    case 3: return +Math.Min(5.0f, 3.0f + 0.05f * Qp / Q);
+                }
+            }
+        }
+
+
 		public override string ToString()
 		{
 			string partStr = (Part > 0) ? string.Format(", part {0}", Part) : string.Empty;

Config/Mappings/MeasurementCorrectionMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Config.Entities;
@@ -11,6 +11,7 @@ namespace Config.Mappings
 		public MeasurementCorrectionMap()
 		{
 			Id(x => x.Id);
+            Map(x => x.RangeIx);
 			Map(x => x.Measurement);
 			Map(x => x.Correction);
 		}

Config/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Sensus")]
 [assembly: AssemblyProduct("Config")]
-[assembly: AssemblyCopyright("Copyright ©  2013 - 2016 Sensus Slovensko a.s.")]
+[assembly: AssemblyCopyright("Copyright ©  2013 - 2018 Sensus Slovensko a.s.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.14.595.0")]
-[assembly: AssemblyFileVersion("2.14.595.0")]
+[assembly: AssemblyVersion("2.18.797.0")]
+[assembly: AssemblyFileVersion("2.18.797.0")]

Config/Units.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016 Sensus Metering Systems
+/// Copyright (c) 2016-2017 Sensus Slovensko a.s.
 ///
 using System;
 using System.Reflection;
@@ -12,6 +12,7 @@ namespace Config
 		[Description("---")]		None,
 
         [Description("l")]          l,          /// * 1 liter
+        [Description("dm3")]        dm3,        ///   1 dm3 = 1 liter
         [Description("m3")]         m3,         ///   1000 l
         [Description("gal(UK)")]    gal_UK,     ///   1 gal(UK) = 4.54609 l
         [Description("gal(US)")]    gal_US,     ///   1 gal(US) = 3.78541178 l
@@ -178,6 +179,7 @@ namespace Config
             switch (units)
             {
                 case Unit.l:
+                case Unit.dm3:
                 case Unit.m3:
                 case Unit.gal_UK:
                 case Unit.gal_US:
@@ -269,6 +271,7 @@ namespace Config
             switch (units)
             {
                 /// Volume: internal representation in l
+                case Unit.dm3:
                 case Unit.l:        return v;               /// 1 liter
                 case Unit.m3:       return 0.001 * v;       /// 1 m3 = 1000 l
                 case Unit.gal_UK:   return 0.21996925 * v;  /// 1 gal(UK) = 4.54609 l
@@ -335,6 +338,7 @@ namespace Config
             switch (units)
             {
                 /// Volume: internal representation in l
+                case Unit.dm3:
                 case Unit.l:        return v;               /// 1 liter
                 case Unit.m3:       return 1000 * v;        /// 1000 l
                 case Unit.gal_UK:   return 4.54609 * v;     /// 1 gal(UK) = 4.54609 l

DeviceTest/DeviceTest.csproj

@@ -92,7 +92,7 @@
       <Project>{743DF7DB-C7B6-42EB-986D-0F485E5588E4}</Project>
       <Name>Config</Name>
     </ProjectReference>
-    <ProjectReference Include="..\TestBenchFramework\TBF.csproj">
+    <ProjectReference Include="..\TBF\TBF.csproj">
       <Project>{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}</Project>
       <Name>TBF</Name>
     </ProjectReference>

GraphLib/BackBuffer.cs

@@ -0,0 +1,87 @@
+using System;
+using System.Drawing;
+
+ 
+
+/* Copyright (c) 2008-2014 DI Zimmermann Stephan (stefan.zimmermann@tele2.at)
+ *   
+ * Permission is hereby granted, free of charge, to any person obtaining a copy 
+ * of this software and associated documentation files (the "Software"), to 
+ * deal in the Software without restriction, including without limitation the 
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or 
+ * sell copies of the Software, and to permit persons to whom the Software is 
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in 
+ * all copies or substantial portions of the Software. 
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
+ * THE SOFTWARE.
+ */
+
+ 
+namespace GraphLib
+{    
+    public class BackBuffer
+    {
+        private Graphics graphics;
+        private Bitmap memoryBitmap;
+        private int width;
+        private int height;
+        
+        public BackBuffer()
+        {
+            width = 0;
+            height = 0;
+        }
+       
+        public bool Init(Graphics g, int width, int height)
+        {
+            if (memoryBitmap != null)
+            {
+                memoryBitmap.Dispose();
+                memoryBitmap = null;
+            }
+
+            if (graphics != null)
+            {
+                graphics.Dispose();
+                graphics = null;
+            }
+
+            if (width == 0 || height == 0)
+                return false;
+
+            if ((width != this.width) || (height != this.height) || graphics == null)
+            {
+                this.width = width;
+                this.height = height;
+
+                memoryBitmap = new Bitmap(width, height);
+                graphics = Graphics.FromImage(memoryBitmap);
+            }
+
+            return true;
+        }
+        
+        public void Render(Graphics g)
+        {
+            if (memoryBitmap != null)
+            {
+                g.DrawImage(memoryBitmap, 
+                            new Rectangle(0, 0, width, height),
+                            0, 0, width, height, 
+                            GraphicsUnit.Pixel);
+            }
+        }
+       
+        public bool CanDoubleBuffer() { return graphics != null; }
+        
+        public Graphics Graphics { get { return graphics; } }
+    }
+}

GraphLib/DataSource.cs

@@ -0,0 +1,214 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.ComponentModel;
+using System.Drawing;
+
+/* Copyright (c) 2008-2014 DI Zimmermann Stephan (stefan.zimmermann@tele2.at)
+ *   
+ * Permission is hereby granted, free of charge, to any person obtaining a copy 
+ * of this software and associated documentation files (the "Software"), to 
+ * deal in the Software without restriction, including without limitation the 
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or 
+ * sell copies of the Software, and to permit persons to whom the Software is 
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in 
+ * all copies or substantial portions of the Software. 
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
+ * THE SOFTWARE.
+ */
+
+namespace GraphLib
+{
+    public class DataSource  
+    {
+        public delegate String OnDrawXAxisLabelEvent(DataSource src, int idx);
+        public delegate String OnDrawYAxisLabelEvent(DataSource src, float value);
+
+        public OnDrawXAxisLabelEvent OnRenderXAxisLabel = null;
+        public OnDrawYAxisLabelEvent OnRenderYAxisLabel = null;
+
+        private PointF[] samples = null;
+        private int length = 0;
+
+        private String name = String.Empty;
+        private int downSample = 1;
+        private Color color = Color.Black;
+
+        public float VisibleDataRange_X = 0;
+        public float DY = 0;      
+        public float YD0 = -200;
+        public float YD1 = 200;
+        public float Cur_YD0 = -200;
+        public float Cur_YD1 = 200;
+
+        public float grid_distance_y = 200;       // grid distance in units ( draw a horizontal line every 200 units )       
+
+        public float off_Y = 0;
+        public float grid_off_y = 0;
+        
+        public bool yFlip = true;      
+        
+        public bool Active = true;
+                        
+        public float XAutoScaleOffset = 100;
+        
+        public float CurGraphHeight = 1.0f;
+        
+        public float CurGraphWidth = 1.0f;
+
+		private bool autoScaleY = false;
+		private bool autoScaleX = false;
+
+
+        public bool AutoScaleY
+        {
+            get { return autoScaleY; }
+            set { autoScaleY = value; }
+        }
+
+        public bool AutoScaleX
+        {
+            get { return autoScaleX; }
+            set { autoScaleX = value; }
+        }
+
+        public PointF[] Samples
+        {
+            get  { return samples; }
+            set 
+            {
+                samples = value;
+                length = samples.Length;
+            }
+        }
+
+        public float  XMin
+        {
+            get
+            {
+                float x_min = float.MaxValue;
+				if (samples != null && samples.Length > 0)
+                {
+                    foreach (PointF p in samples) if (p.X < x_min)  x_min=p.X;
+                }
+                return x_min;
+            }
+        }
+
+        public float XMax
+        {
+            get
+            {
+                float x_max = float.MinValue;
+				if (samples != null && samples.Length > 0)
+                {
+                    foreach (PointF p in samples) if (p.X > x_max) x_max = p.X;
+                }
+                return x_max;
+            }
+        }
+
+        public float YMin
+        {
+            get
+            {
+                float y_min = float.MaxValue;
+				if (samples != null && samples.Length > 0)
+                {
+                    foreach (PointF p in samples) if (p.Y < y_min) y_min = p.Y;
+                }
+                return y_min;
+            }
+        }
+
+        public float YMax
+        {
+            get
+            {
+                float y_max = float.MinValue;
+                if (samples.Length > 0)
+                {
+                    foreach (PointF p in samples) if (p.Y > y_max) y_max = p.Y;
+                }
+                return y_max;
+            }
+        }
+
+        public void SetDisplayRangeY(float y_start, float y_end)
+        {            
+            YD0 = y_start;
+            YD1 = y_end;
+        }
+         
+        public void SetGridDistanceY(float grid_dist_y_units)
+        {
+            grid_distance_y = grid_dist_y_units;
+        }
+
+        public void SetGridOriginY(float off_y)
+        {           
+            grid_off_y = off_y;
+        }
+      
+        [Category("Properties")] // Take this out, and you will soon have problems with serialization;
+        [DefaultValue(typeof(string), "")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public String Name
+        {
+            get { return name; }
+            set { name = value; }
+        }
+
+        [Category("Properties")] // Take this out, and you will soon have problems with serialization;
+        [DefaultValue(typeof(Color), "")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public Color GraphColor
+        {
+            get { return color; }
+            set { color = value; }
+        }
+
+        [Category("Properties")] // Take this out, and you will soon have problems with serialization;
+        [DefaultValue(typeof(int), "0")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public int Length
+        {
+            get { return length; }
+            set 
+            { 
+                length = value;
+                if (length != 0)
+                {
+                    samples = new PointF[length];
+                }
+                else
+                {
+                    // length is 0
+                    if (samples != null)
+                    {
+                        samples = null;
+                    }
+                }
+            }
+        }
+        
+        [Category("Properties")] // Take this out, and you will soon have problems with serialization;
+        [DefaultValue(typeof(int), "1")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public int Downsampling
+        {
+            get { return downSample; }
+            set { downSample = value; }
+        }
+    } 
+}

GraphLib/GraphLib.csproj

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{0C0A1F4D-1363-4544-A7C5-196C76D26CCA}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ClassLibrary1</RootNamespace>
+    <AssemblyName>GraphLib</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>2.0</OldToolsVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Design" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="PlotterGraphPaneEx.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="PlotterGraphPaneEx.Designer.cs">
+      <DependentUpon>PlotterGraphPaneEx.cs</DependentUpon>
+    </Compile>
+    <Compile Include="PlotterDisplayEx.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="PlotterDisplayEx.designer.cs">
+      <DependentUpon>PlotterDisplayEx.cs</DependentUpon>
+    </Compile>
+    <Compile Include="BackBuffer.cs" />
+    <Compile Include="PlotterGraphSelectCurvesForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="PlotterGraphSelectCurvesForm.Designer.cs">
+      <DependentUpon>PlotterGraphSelectCurvesForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DataSource.cs" />
+    <Compile Include="PrintPreviewForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="PrintPreviewForm.Designer.cs">
+      <DependentUpon>PrintPreviewForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="PrecisionTimer.cs" />
+    <Compile Include="Utils.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="PlotterGraphPaneEx.resx">
+      <DependentUpon>PlotterGraphPaneEx.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="PlotterDisplayEx.resx">
+      <DependentUpon>PlotterDisplayEx.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="PlotterGraphSelectCurvesForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>PlotterGraphSelectCurvesForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="PrintPreviewForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>PrintPreviewForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <SubType>Designer</SubType>
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\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>
+  -->
+  <PropertyGroup>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>

GraphLib/GraphLib.sln

@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphLib", "GraphLib.csproj", "{0C0A1F4D-1363-4544-A7C5-196C76D26CCA}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0C0A1F4D-1363-4544-A7C5-196C76D26CCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C0A1F4D-1363-4544-A7C5-196C76D26CCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C0A1F4D-1363-4544-A7C5-196C76D26CCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C0A1F4D-1363-4544-A7C5-196C76D26CCA}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

GraphLib/PlotterDisplayEx.cs

@@ -0,0 +1,397 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+using System.Threading;
+using System.ComponentModel.Design;
+using System.Drawing.Drawing2D;
+
+ 
+/* Copyright (c) 2008-2014 DI Zimmermann Stephan (stefan.zimmermann@tele2.at)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy 
+ * of this software and associated documentation files (the "Software"), to 
+ * deal in the Software without restriction, including without limitation the 
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or 
+ * sell copies of the Software, and to permit persons to whom the Software is 
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in 
+ * all copies or substantial portions of the Software. 
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
+ * THE SOFTWARE.
+ */
+
+ 
+namespace GraphLib
+{        
+    public partial class PlotterDisplayEx : UserControl
+    {         
+        #region MEMBERS
+
+        delegate void InvokeVoidFuncDelegate();
+
+        PlotterGraphSelectCurvesForm GraphPropertiesForm = null;
+        PrintPreviewForm printPreviewForm = null;
+
+        private PrecisionTimer.Timer mTimer = null;
+        private float play_speed = 0.5f;
+        private float play_speed_max = 10f;
+        private float play_speed_min = 0.5f;
+
+        private bool paused = false;
+        private bool isRunning = false;
+
+        #endregion
+
+        #region CONSTRUCTOR
+
+        public PlotterDisplayEx()
+        {
+            InitializeComponent();
+            mTimer = new PrecisionTimer.Timer();
+            mTimer.Period = 50;                         // 20 fps
+            mTimer.Tick += new EventHandler(OnTimerTick);
+            play_speed = 0.5f; // 20x10 = 200 values per second == sample frequency     
+            mTimer.Start();
+            isRunning = false;
+        }
+       
+        void contextMenuStrip1_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
+        {
+            String text = e.ClickedItem.Text;
+            foreach (DataSource s in gPane.Sources)
+            {
+                if (s.Name == text)
+                {
+                    s.Active ^= true;
+                    gPane.Invalidate();
+                    break;
+                }
+            }
+        }
+         
+        #endregion
+
+        #region PROPERTIES
+
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [Editor(typeof(System.ComponentModel.Design.CollectionEditor),
+               typeof(System.Drawing.Design.UITypeEditor))]
+        public IList<DataSource> DataSources
+        {
+            get { return gPane.Sources; }
+        }
+
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [Editor(typeof(System.ComponentModel.Design.CollectionEditor),
+               typeof(System.Drawing.Design.UITypeEditor))]
+        public PlotterGraphPaneEx.LayoutMode PanelLayout
+        {
+            get { return gPane.layout; }
+            set { gPane.layout = value; }
+        }
+
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [Editor(typeof(System.ComponentModel.Design.CollectionEditor),
+               typeof(System.Drawing.Design.UITypeEditor))]
+        public SmoothingMode Smoothing
+        {
+            get { return gPane.smoothing; }
+            set { gPane.smoothing = value; }
+        }
+
+        [Category("Playback")]
+        [DefaultValue(typeof(bool), "true")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public bool ShowMovingGrid
+        {
+            get { return gPane.hasMovingGrid; }
+            set { gPane.hasMovingGrid = value; }
+        }
+
+
+        [Category("Properties")]   
+        [DefaultValue(typeof(Color), "")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public Color BackgroundColorTop
+        {
+            get { return gPane.BgndColorTop; }
+            set { gPane.BgndColorTop = value; }
+        }
+
+        [Category("Properties")]  
+        [DefaultValue(typeof(Color), "")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public Color BackgroundColorBot
+        {
+            get { return gPane.BgndColorBot; }
+            set { gPane.BgndColorBot = value; }
+        }
+
+        [Category("Properties")]  
+        [DefaultValue(typeof(Color), "")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public Color DashedGridColor
+        {
+            get { return gPane.MinorGridColor; }
+            set { gPane.MinorGridColor = value; }
+        }
+
+        [Category("Properties")]
+        [DefaultValue(typeof(Color), "")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public Color SolidGridColor
+        {
+            get { return gPane.MajorGridColor; }
+            set { gPane.MajorGridColor = value; }
+        }
+                
+      
+        public bool DoubleBuffering
+        {
+            get { return gPane.useDoubleBuffer; }
+            set { gPane.useDoubleBuffer = value; }
+        }
+
+        #endregion
+
+        #region PUBLIC METHODS
+
+        public void SetDisplayRangeX(float x_start, float x_end )
+        {
+            gPane.XD0 = x_start;
+            gPane.XD1 = x_end;
+            gPane.CurXD0 = gPane.XD0;
+            gPane.CurXD1 = gPane.XD1;
+        }
+       
+        public void SetGridDistanceX(float grid_dist_x_samples)
+        {
+            gPane.grid_distance_x = grid_dist_x_samples;           
+        }
+      
+        public void SetGridOriginX(float off_x)
+        {
+            gPane.grid_off_x = off_x;          
+        }
+
+        
+        #endregion
+
+        #region PRIVATE METHODS
+
+        protected override void Dispose(bool disposing)
+        {
+            paused = true;
+
+            if (mTimer.IsRunning)
+            {
+                mTimer.Stop();
+                mTimer.Dispose();
+            }
+            
+            base.Dispose(disposing);
+        }
+
+        public void Start()
+        {
+            if (isRunning == false && paused == false)
+            {
+                gPane.starting_idx = 0;
+                paused = false;
+                isRunning = true;
+               // mTimer.Start();                
+                tb1.Buttons[0].ImageIndex = 2;                
+            }
+            else
+            {
+                if (paused == false)
+                {
+                    //mTimer.Stop();
+                    paused = true;
+                }
+                else
+                {
+                   // mTimer.Start();
+                    paused = false;
+                }
+
+                if (paused)
+                {
+                    
+                    tb1.Buttons[0].ImageIndex = 0;  
+                }
+                else
+                {
+                   
+                    tb1.Buttons[0].ImageIndex = 2;  
+                }
+            }
+        }
+
+        public void Stop()
+        {
+            if (isRunning)
+            {
+               // mTimer.Stop();
+                isRunning = false;
+                paused = false;
+                hScrollBar1.Value = 0;
+                tb1.Buttons[0].ImageIndex = 0;
+            }
+        }
+
+       
+        private void tb1_ButtonClick(object sender, ToolBarButtonClickEventArgs e)
+        {
+            bool pushed = e.Button.Pushed;
+            switch (e.Button.Tag.ToString().ToLower())
+            {
+                case "play":
+
+                    Start();
+                      
+                    break;
+
+                case "stop":
+
+                    Stop();
+                   
+                    break;       
+            }
+        }
+
+        private void SetPlayPanelVisible()
+        {
+            panel1.Visible = true;          
+            tb1.Buttons[0].Visible = true;
+            tb1.Buttons[1].Visible = true;
+        }
+
+        private void SetPlayPanelInvisible()
+        {
+            panel1.Visible = false;
+            tb1.Buttons[0].Visible = false;
+            tb1.Buttons[1].Visible = false;
+            
+        }
+
+        private void UpdateControl()
+        {
+            try
+            {
+                bool AllAutoscaled = true;
+
+                foreach (DataSource s in gPane.Sources)
+                {
+                    AllAutoscaled &= s.AutoScaleX;
+                }
+
+           
+                if (AllAutoscaled == true)
+                {
+                    if (panel1.Visible == true)
+                    {
+                        this.Invoke(new MethodInvoker(SetPlayPanelInvisible));
+                    }
+                }
+                else
+                {
+                    if (panel1.Visible == false)
+                    {
+                        this.Invoke(new MethodInvoker(SetPlayPanelVisible));
+                    }
+                }
+            }
+            catch
+            {
+            }
+        }
+
+        private void UpdatePlayback()
+        {
+            if (!paused && isRunning == true)
+            {
+                try
+                {
+                    gPane.starting_idx += play_speed;
+                    UpdateScrollBar();
+                    gPane.Invalidate();
+                }
+                catch { }
+            }
+        }
+
+        private void OnTimerTick(object sender, EventArgs e)
+        {
+            UpdateControl();
+
+            UpdatePlayback();
+        }
+        
+        private void UpdateScrollBar()
+        {
+            if (InvokeRequired)
+            {
+                Invoke(new MethodInvoker(UpdateScrollBar));
+            }
+            else
+            {
+                if (gPane.Sources.Count > 0)
+                {
+                    if (gPane.starting_idx > gPane.Sources[0].Length)
+                    {
+                        hScrollBar1.Value = 10000;
+                    }
+                    else if (gPane.starting_idx >= 0)
+                    {
+                        hScrollBar1.Value = 10000 * (int)gPane.starting_idx / gPane.Sources[0].Length;
+                    }
+                    else
+                    {
+                        hScrollBar1.Value = 0;
+                    }
+                }
+                else
+                {
+                    hScrollBar1.Value = 0;
+                }
+            }
+        }
+         
+        private void OnScrollbarScroll(object sender, ScrollEventArgs e)
+        {
+            if (gPane.Sources.Count > 0)
+            {
+                int val = hScrollBar1.Value;
+                gPane.starting_idx = (int)(gPane.Sources[0].Length * (float)val / 10000.0f);
+                gPane.Invalidate();
+            }
+        }
+
+        #endregion
+
+        private void selectGraphsToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (GraphPropertiesForm == null)
+            {
+                GraphPropertiesForm = new PlotterGraphSelectCurvesForm();              
+            }
+                      
+            GraphPropertiesForm.GraphPanel = this.gPane;            
+            GraphPropertiesForm.Show();            
+          //  GraphPropertiesForm.BringToFront();
+
+        }
+    }
+}

GraphLib/PlotterDisplayEx.designer.cs

@@ -0,0 +1,200 @@
+namespace GraphLib
+{
+    partial class PlotterDisplayEx
+    {
+       
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+      
+
+        #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.components = new System.ComponentModel.Container();
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PlotterDisplayEx));
+			this.tb1 = new System.Windows.Forms.ToolBar();
+			this.tbbSave = new System.Windows.Forms.ToolBarButton();
+			this.tbbOpen = new System.Windows.Forms.ToolBarButton();
+			this.imgList1 = new System.Windows.Forms.ImageList(this.components);
+			this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+			this.panel1 = new System.Windows.Forms.Panel();
+			this.lb_Position = new System.Windows.Forms.Label();
+			this.hScrollBar1 = new System.Windows.Forms.HScrollBar();
+			this.gPane = new GraphLib.PlotterGraphPaneEx();
+			this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+			this.selectGraphsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+			((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+			this.splitContainer1.Panel1.SuspendLayout();
+			this.splitContainer1.Panel2.SuspendLayout();
+			this.splitContainer1.SuspendLayout();
+			this.panel1.SuspendLayout();
+			this.contextMenuStrip1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// tb1
+			// 
+			this.tb1.Appearance = System.Windows.Forms.ToolBarAppearance.Flat;
+			this.tb1.Buttons.AddRange(new System.Windows.Forms.ToolBarButton[] {
+            this.tbbSave,
+            this.tbbOpen});
+			this.tb1.ButtonSize = new System.Drawing.Size(16, 16);
+			this.tb1.Divider = false;
+			this.tb1.Dock = System.Windows.Forms.DockStyle.None;
+			this.tb1.DropDownArrows = true;
+			this.tb1.ImageList = this.imgList1;
+			this.tb1.Location = new System.Drawing.Point(11, 5);
+			this.tb1.Name = "tb1";
+			this.tb1.ShowToolTips = true;
+			this.tb1.Size = new System.Drawing.Size(80, 26);
+			this.tb1.TabIndex = 1;
+			this.tb1.ButtonClick += new System.Windows.Forms.ToolBarButtonClickEventHandler(this.tb1_ButtonClick);
+			// 
+			// tbbSave
+			// 
+			this.tbbSave.ImageIndex = 0;
+			this.tbbSave.Name = "tbbSave";
+			this.tbbSave.Tag = "play";
+			// 
+			// tbbOpen
+			// 
+			this.tbbOpen.ImageIndex = 1;
+			this.tbbOpen.Name = "tbbOpen";
+			this.tbbOpen.Tag = "stop";
+			// 
+			// imgList1
+			// 
+			this.imgList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imgList1.ImageStream")));
+			this.imgList1.TransparentColor = System.Drawing.Color.Transparent;
+			this.imgList1.Images.SetKeyName(0, "media-playback-start.png");
+			this.imgList1.Images.SetKeyName(1, "media-playback-stop.png");
+			this.imgList1.Images.SetKeyName(2, "media-playback-pause.png");
+			this.imgList1.Images.SetKeyName(3, "printer.png");
+			// 
+			// splitContainer1
+			// 
+			this.splitContainer1.BackColor = System.Drawing.SystemColors.Control;
+			this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+			this.splitContainer1.IsSplitterFixed = true;
+			this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+			this.splitContainer1.Name = "splitContainer1";
+			this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
+			// 
+			// splitContainer1.Panel1
+			// 
+			this.splitContainer1.Panel1.BackColor = System.Drawing.SystemColors.ControlDarkDark;
+			this.splitContainer1.Panel1.Controls.Add(this.tb1);
+			this.splitContainer1.Panel1.Controls.Add(this.panel1);
+			// 
+			// splitContainer1.Panel2
+			// 
+			this.splitContainer1.Panel2.BackColor = System.Drawing.Color.Transparent;
+			this.splitContainer1.Panel2.Controls.Add(this.gPane);
+			this.splitContainer1.Size = new System.Drawing.Size(598, 339);
+			this.splitContainer1.SplitterDistance = 34;
+			this.splitContainer1.TabIndex = 2;
+			this.splitContainer1.TabStop = false;
+			// 
+			// panel1
+			// 
+			this.panel1.Controls.Add(this.lb_Position);
+			this.panel1.Controls.Add(this.hScrollBar1);
+			this.panel1.Location = new System.Drawing.Point(99, 3);
+			this.panel1.Name = "panel1";
+			this.panel1.Size = new System.Drawing.Size(496, 28);
+			this.panel1.TabIndex = 7;
+			// 
+			// lb_Position
+			// 
+			this.lb_Position.AutoSize = true;
+			this.lb_Position.ForeColor = System.Drawing.SystemColors.ControlLightLight;
+			this.lb_Position.Location = new System.Drawing.Point(6, 8);
+			this.lb_Position.Name = "lb_Position";
+			this.lb_Position.Size = new System.Drawing.Size(44, 13);
+			this.lb_Position.TabIndex = 3;
+			this.lb_Position.Text = "Position";
+			// 
+			// hScrollBar1
+			// 
+			this.hScrollBar1.Location = new System.Drawing.Point(57, 10);
+			this.hScrollBar1.Maximum = 10000;
+			this.hScrollBar1.Name = "hScrollBar1";
+			this.hScrollBar1.Size = new System.Drawing.Size(118, 10);
+			this.hScrollBar1.TabIndex = 4;
+			this.hScrollBar1.Scroll += new System.Windows.Forms.ScrollEventHandler(this.OnScrollbarScroll);
+			// 
+			// gPane
+			// 
+			this.gPane.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.gPane.Location = new System.Drawing.Point(0, 0);
+			this.gPane.Name = "gPane";
+			this.gPane.Size = new System.Drawing.Size(598, 301);
+			this.gPane.TabIndex = 1;
+			// 
+			// contextMenuStrip1
+			// 
+			this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.selectGraphsToolStripMenuItem,
+            this.toolStripSeparator1});
+			this.contextMenuStrip1.Name = "contextMenuStrip1";
+			this.contextMenuStrip1.Size = new System.Drawing.Size(117, 32);
+			// 
+			// selectGraphsToolStripMenuItem
+			// 
+			this.selectGraphsToolStripMenuItem.Name = "selectGraphsToolStripMenuItem";
+			this.selectGraphsToolStripMenuItem.Size = new System.Drawing.Size(116, 22);
+			this.selectGraphsToolStripMenuItem.Text = "Options";
+			this.selectGraphsToolStripMenuItem.Click += new System.EventHandler(this.selectGraphsToolStripMenuItem_Click);
+			// 
+			// toolStripSeparator1
+			// 
+			this.toolStripSeparator1.Name = "toolStripSeparator1";
+			this.toolStripSeparator1.Size = new System.Drawing.Size(113, 6);
+			// 
+			// PlotterDisplayEx
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.BackColor = System.Drawing.Color.Transparent;
+			this.ContextMenuStrip = this.contextMenuStrip1;
+			this.Controls.Add(this.splitContainer1);
+			this.Name = "PlotterDisplayEx";
+			this.Size = new System.Drawing.Size(598, 339);
+			this.splitContainer1.Panel1.ResumeLayout(false);
+			this.splitContainer1.Panel1.PerformLayout();
+			this.splitContainer1.Panel2.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+			this.splitContainer1.ResumeLayout(false);
+			this.panel1.ResumeLayout(false);
+			this.panel1.PerformLayout();
+			this.contextMenuStrip1.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+		private System.Windows.Forms.ToolBar tb1;
+        private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.ToolBarButton tbbSave;
+        private System.Windows.Forms.ToolBarButton tbbOpen;
+        private System.Windows.Forms.HScrollBar hScrollBar1;
+		private PlotterGraphPaneEx gPane;
+		private System.Windows.Forms.Label lb_Position;
+        public System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
+        private System.Windows.Forms.ToolStripMenuItem selectGraphsToolStripMenuItem;
+        private System.Windows.Forms.ImageList imgList1;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+        private System.Windows.Forms.Panel panel1;
+
+    }
+}

GraphLib/PlotterDisplayEx.resx

@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="imgList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="imgList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACI
+        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
+        AVYB/wMZAf8DWAHRA0QBeggAAxUBHQFiAlgB6QM6AWEDDQESAwABASwAAxsBJgMbASYDGwEmAxsBJgMb
+        ASYDGwEmAxsBJgMbASYDGwEmAxsBJgMbASYDGwEmEAADGwEmAxsBJgMbASYDGwEmAxsBJgMbASYDGwEm
+        AxsBJgMbASYDGwEmAxsBJgMbASYIAANVAf0DpwH/A7UB/wOBAf8BrwGsAaoB/wHFAcABvQH/AcUBwAG9
+        Af8BxQHAAb0B/wHFAcABvQH/AcUBwAG9Af8BxQHAAb0B/wGtAaoBqAH/AyEB/wO1Af8DmwH/AxgB/wgA
+        AxUBHQNNAfoBOwIrAfwDXwHgAysBQgMNARIoAAMbASYDKwH8AYACgQH/AYACgQH/AYACgQH/AYACgQH/
+        AYACgQH/AYACgQH/AYACgQH/AYACgQH/AYACgQH/AxsBJhAAAxsBJgMrAfwBgAKBAf8BgAKBAf8BgAKB
+        Af8DIwE0AxsBJgMrAfwBgAKBAf8BgAKBAf8BgAKBAf8DIwE0CAADZQH/A7UB/wO1Af8DlQH/A4EB/wOB
+        Af8DbgH/A2MB/wNWAf8DRwH/AzgB/wM3Af8DYwH/A7UB/wO1Af8DGgH/CAADFQEdAV8CSgH7AfkB+gH5
+        Af8DfwH+AV8BUwFSAfsDVQGyAx0BKgMIAQsgAAMbASYDQAH9IP8DQAH9AxsBJgMAAQEMAAMbASYDQAH9
+        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
+        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/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+ATsCKwH8AVgCVgG7Ax0BKgMGAQgMAAMbASYDQAH9BP8B3wHk
+        AeEB/wHkAekB5gH/AeoB7QHrAf8B7gHxAe8B/wHvAfEB8AH/AewB7wHuBf8DQAH9AxsBJgMBAQIMAAMb
+        ASYDQAH9AesB7QHsAf8B3QHjAeAB/wNAAf0DGwEmAxsBJgNAAf0B7QHwAe8B/wHfAeQB4QH/A0AB/QMb
+        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/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/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
+        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
+        AcABPwHAAQEBwAEBAcABAwHAAf8BwAEBAcABAQHgAQcBwwH/AcABAQHAAQEB4AEHAccF/wHgAQcB3wX/
+        AeABHws=
+</value>
+  </data>
+  <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>84, 17</value>
+  </metadata>
+</root>

GraphLib/PlotterGraphPaneEx.Designer.cs

@@ -0,0 +1,46 @@
+namespace GraphLib
+{
+    partial class PlotterGraphPaneEx
+    {
+        /// <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.SuspendLayout();
+            // 
+            // PlotterGraphPane
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Name = "PlotterGraphPane";
+            this.Size = new System.Drawing.Size(409, 150);
+            this.Load += new System.EventHandler(this.OnLoadControl);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+    }
+}

GraphLib/PlotterGraphPaneEx.resx

@@ -0,0 +1,120 @@
+<?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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

GraphLib/PlotterGraphSelectCurvesForm.Designer.cs

@@ -0,0 +1,365 @@
+namespace GraphLib
+{
+    partial class PlotterGraphSelectCurvesForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.lb_Graphs = new System.Windows.Forms.CheckedListBox();
+            this.gB_SelectedGraph = new System.Windows.Forms.GroupBox();
+            this.cb_X_AutoScale = new System.Windows.Forms.CheckBox();
+            this.tb_GraphName = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.cbDownSampling = new System.Windows.Forms.ComboBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.btn_GraphColor = new System.Windows.Forms.Button();
+            this.cb_Y_AutoScale = new System.Windows.Forms.CheckBox();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.label7 = new System.Windows.Forms.Label();
+            this.label5 = new System.Windows.Forms.Label();
+            this.bt_MinorGridColor = new System.Windows.Forms.Button();
+            this.bt_bg_col_bot = new System.Windows.Forms.Button();
+            this.label6 = new System.Windows.Forms.Label();
+            this.bt_MajorGridColor = new System.Windows.Forms.Button();
+            this.label4 = new System.Windows.Forms.Label();
+            this.bt_bg_col_top = new System.Windows.Forms.Button();
+            this.btn_AutoScaleAll = new System.Windows.Forms.Button();
+            this.label1 = new System.Windows.Forms.Label();
+            this.cb_Layout = new System.Windows.Forms.ComboBox();
+            this.button1 = new System.Windows.Forms.Button();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.Panel2.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
+            this.gB_SelectedGraph.SuspendLayout();
+            this.groupBox1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // splitContainer1
+            // 
+            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+            this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer1.Name = "splitContainer1";
+            // 
+            // splitContainer1.Panel1
+            // 
+            this.splitContainer1.Panel1.Controls.Add(this.lb_Graphs);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Controls.Add(this.gB_SelectedGraph);
+            this.splitContainer1.Panel2.Controls.Add(this.groupBox1);
+            this.splitContainer1.Panel2.Controls.Add(this.button1);
+            this.splitContainer1.Size = new System.Drawing.Size(395, 431);
+            this.splitContainer1.SplitterDistance = 171;
+            this.splitContainer1.TabIndex = 0;
+            // 
+            // lb_Graphs
+            // 
+            this.lb_Graphs.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lb_Graphs.FormattingEnabled = true;
+            this.lb_Graphs.Location = new System.Drawing.Point(0, 0);
+            this.lb_Graphs.Name = "lb_Graphs";
+            this.lb_Graphs.Size = new System.Drawing.Size(171, 424);
+            this.lb_Graphs.TabIndex = 0;
+            this.lb_Graphs.SelectedIndexChanged += new System.EventHandler(this.checkedListBox1_SelectedIndexChanged_1);
+            // 
+            // gB_SelectedGraph
+            // 
+            this.gB_SelectedGraph.Controls.Add(this.cb_X_AutoScale);
+            this.gB_SelectedGraph.Controls.Add(this.tb_GraphName);
+            this.gB_SelectedGraph.Controls.Add(this.label3);
+            this.gB_SelectedGraph.Controls.Add(this.cbDownSampling);
+            this.gB_SelectedGraph.Controls.Add(this.label2);
+            this.gB_SelectedGraph.Controls.Add(this.btn_GraphColor);
+            this.gB_SelectedGraph.Controls.Add(this.cb_Y_AutoScale);
+            this.gB_SelectedGraph.Location = new System.Drawing.Point(6, 232);
+            this.gB_SelectedGraph.Name = "gB_SelectedGraph";
+            this.gB_SelectedGraph.Size = new System.Drawing.Size(206, 158);
+            this.gB_SelectedGraph.TabIndex = 6;
+            this.gB_SelectedGraph.TabStop = false;
+            this.gB_SelectedGraph.Text = "Selected Graph Options";
+            this.gB_SelectedGraph.Visible = false;
+            // 
+            // cb_X_AutoScale
+            // 
+            this.cb_X_AutoScale.AutoSize = true;
+            this.cb_X_AutoScale.Location = new System.Drawing.Point(12, 102);
+            this.cb_X_AutoScale.Name = "cb_X_AutoScale";
+            this.cb_X_AutoScale.Size = new System.Drawing.Size(93, 17);
+            this.cb_X_AutoScale.TabIndex = 8;
+            this.cb_X_AutoScale.Text = "X AutoScaling";
+            this.cb_X_AutoScale.UseVisualStyleBackColor = true;
+            this.cb_X_AutoScale.CheckedChanged += new System.EventHandler(this.cb_X_AutoScale_CheckedChanged);
+            // 
+            // tb_GraphName
+            // 
+            this.tb_GraphName.Location = new System.Drawing.Point(12, 24);
+            this.tb_GraphName.Name = "tb_GraphName";
+            this.tb_GraphName.Size = new System.Drawing.Size(167, 20);
+            this.tb_GraphName.TabIndex = 7;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(52, 133);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(76, 13);
+            this.label3.TabIndex = 6;
+            this.label3.Text = "Downsampling";
+            // 
+            // cbDownSampling
+            // 
+            this.cbDownSampling.FormattingEnabled = true;
+            this.cbDownSampling.Items.AddRange(new object[] {
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6"});
+            this.cbDownSampling.Location = new System.Drawing.Point(7, 130);
+            this.cbDownSampling.Name = "cbDownSampling";
+            this.cbDownSampling.Size = new System.Drawing.Size(39, 21);
+            this.cbDownSampling.TabIndex = 5;
+            this.cbDownSampling.Text = "1";
+            this.cbDownSampling.SelectedIndexChanged += new System.EventHandler(this.OnDownsamplingChanged);
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(57, 55);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(63, 13);
+            this.label2.TabIndex = 4;
+            this.label2.Text = "Graph Color";
+            // 
+            // btn_GraphColor
+            // 
+            this.btn_GraphColor.Location = new System.Drawing.Point(11, 50);
+            this.btn_GraphColor.Name = "btn_GraphColor";
+            this.btn_GraphColor.Size = new System.Drawing.Size(26, 23);
+            this.btn_GraphColor.TabIndex = 3;
+            this.btn_GraphColor.UseVisualStyleBackColor = true;
+            this.btn_GraphColor.Click += new System.EventHandler(this.btn_GraphColor_Click);
+            // 
+            // cb_Y_AutoScale
+            // 
+            this.cb_Y_AutoScale.AutoSize = true;
+            this.cb_Y_AutoScale.Location = new System.Drawing.Point(12, 79);
+            this.cb_Y_AutoScale.Name = "cb_Y_AutoScale";
+            this.cb_Y_AutoScale.Size = new System.Drawing.Size(93, 17);
+            this.cb_Y_AutoScale.TabIndex = 2;
+            this.cb_Y_AutoScale.Text = "Y AutoScaling";
+            this.cb_Y_AutoScale.UseVisualStyleBackColor = true;
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.label7);
+            this.groupBox1.Controls.Add(this.label5);
+            this.groupBox1.Controls.Add(this.bt_MinorGridColor);
+            this.groupBox1.Controls.Add(this.bt_bg_col_bot);
+            this.groupBox1.Controls.Add(this.label6);
+            this.groupBox1.Controls.Add(this.bt_MajorGridColor);
+            this.groupBox1.Controls.Add(this.label4);
+            this.groupBox1.Controls.Add(this.bt_bg_col_top);
+            this.groupBox1.Controls.Add(this.btn_AutoScaleAll);
+            this.groupBox1.Controls.Add(this.label1);
+            this.groupBox1.Controls.Add(this.cb_Layout);
+            this.groupBox1.Location = new System.Drawing.Point(6, 5);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(206, 221);
+            this.groupBox1.TabIndex = 4;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "General Options";
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Location = new System.Drawing.Point(57, 194);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(82, 13);
+            this.label7.TabIndex = 10;
+            this.label7.Text = "Minor Grid Color";
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(57, 136);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(128, 13);
+            this.label5.TabIndex = 8;
+            this.label5.Text = "Background Color Bottom";
+            // 
+            // bt_MinorGridColor
+            // 
+            this.bt_MinorGridColor.Location = new System.Drawing.Point(11, 189);
+            this.bt_MinorGridColor.Name = "bt_MinorGridColor";
+            this.bt_MinorGridColor.Size = new System.Drawing.Size(26, 23);
+            this.bt_MinorGridColor.TabIndex = 9;
+            this.bt_MinorGridColor.UseVisualStyleBackColor = true;
+            this.bt_MinorGridColor.Click += new System.EventHandler(this.bt_MinorGridColor_Click);
+            // 
+            // bt_bg_col_bot
+            // 
+            this.bt_bg_col_bot.Location = new System.Drawing.Point(11, 131);
+            this.bt_bg_col_bot.Name = "bt_bg_col_bot";
+            this.bt_bg_col_bot.Size = new System.Drawing.Size(26, 23);
+            this.bt_bg_col_bot.TabIndex = 7;
+            this.bt_bg_col_bot.UseVisualStyleBackColor = true;
+            this.bt_bg_col_bot.Click += new System.EventHandler(this.bt_bg_col_bot_Click);
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Location = new System.Drawing.Point(57, 165);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(82, 13);
+            this.label6.TabIndex = 8;
+            this.label6.Text = "Major Grid Color";
+            // 
+            // bt_MajorGridColor
+            // 
+            this.bt_MajorGridColor.Location = new System.Drawing.Point(11, 160);
+            this.bt_MajorGridColor.Name = "bt_MajorGridColor";
+            this.bt_MajorGridColor.Size = new System.Drawing.Size(26, 23);
+            this.bt_MajorGridColor.TabIndex = 7;
+            this.bt_MajorGridColor.UseVisualStyleBackColor = true;
+            this.bt_MajorGridColor.Click += new System.EventHandler(this.bt_MajorGridColor_Click);
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(57, 107);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(114, 13);
+            this.label4.TabIndex = 6;
+            this.label4.Text = "Background Color Top";
+            // 
+            // bt_bg_col_top
+            // 
+            this.bt_bg_col_top.Location = new System.Drawing.Point(11, 102);
+            this.bt_bg_col_top.Name = "bt_bg_col_top";
+            this.bt_bg_col_top.Size = new System.Drawing.Size(26, 23);
+            this.bt_bg_col_top.TabIndex = 5;
+            this.bt_bg_col_top.UseVisualStyleBackColor = true;
+            this.bt_bg_col_top.Click += new System.EventHandler(this.bt_bg_col_top_Click);
+            // 
+            // btn_AutoScaleAll
+            // 
+            this.btn_AutoScaleAll.Location = new System.Drawing.Point(11, 69);
+            this.btn_AutoScaleAll.Name = "btn_AutoScaleAll";
+            this.btn_AutoScaleAll.Size = new System.Drawing.Size(167, 25);
+            this.btn_AutoScaleAll.TabIndex = 4;
+            this.btn_AutoScaleAll.Text = "Auto Scale All";
+            this.btn_AutoScaleAll.UseVisualStyleBackColor = true;
+            this.btn_AutoScaleAll.Click += new System.EventHandler(this.OnButtonAutoScallOnClicked);
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(9, 26);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(39, 13);
+            this.label1.TabIndex = 3;
+            this.label1.Text = "Layout";
+            // 
+            // cb_Layout
+            // 
+            this.cb_Layout.FormattingEnabled = true;
+            this.cb_Layout.Items.AddRange(new object[] {
+            "Normal",
+            "Stacked",
+            "Tiles - Fill Vertical",
+            "Tiles - Fill Horizontal",
+            "Vertically"});
+            this.cb_Layout.Location = new System.Drawing.Point(11, 42);
+            this.cb_Layout.Name = "cb_Layout";
+            this.cb_Layout.Size = new System.Drawing.Size(168, 21);
+            this.cb_Layout.TabIndex = 2;
+            this.cb_Layout.Text = "Select";
+            this.cb_Layout.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
+            // 
+            // button1
+            // 
+            this.button1.Location = new System.Drawing.Point(66, 396);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(68, 23);
+            this.button1.TabIndex = 0;
+            this.button1.Text = "Exit";
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Click += new System.EventHandler(this.button1_Click);
+            // 
+            // PlotterGraphSelectCurvesForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(395, 431);
+            this.Controls.Add(this.splitContainer1);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.MinimumSize = new System.Drawing.Size(16, 246);
+            this.Name = "PlotterGraphSelectCurvesForm";
+            this.Text = "Graph Properties";
+            this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.Panel2.ResumeLayout(false);
+            this.splitContainer1.ResumeLayout(false);
+            this.gB_SelectedGraph.ResumeLayout(false);
+            this.gB_SelectedGraph.PerformLayout();
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.Button button1;
+        private System.Windows.Forms.CheckedListBox lb_Graphs;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.ComboBox cb_Layout;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Button btn_GraphColor;
+        private System.Windows.Forms.CheckBox cb_Y_AutoScale;
+        private System.Windows.Forms.Button btn_AutoScaleAll;
+        private System.Windows.Forms.GroupBox gB_SelectedGraph;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.ComboBox cbDownSampling;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Button bt_bg_col_top;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Button bt_bg_col_bot;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.Button bt_MinorGridColor;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.Button bt_MajorGridColor;
+        private System.Windows.Forms.TextBox tb_GraphName;
+        private System.Windows.Forms.CheckBox cb_X_AutoScale;
+    }
+}

GraphLib/PlotterGraphSelectCurvesForm.cs

@@ -0,0 +1,369 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+ 
+/* Copyright (c) 2008-2014 DI Zimmermann Stephan (stefan.zimmermann@tele2.at)
+ *   
+ * Permission is hereby granted, free of charge, to any person obtaining a copy 
+ * of this software and associated documentation files (the "Software"), to 
+ * deal in the Software without restriction, including without limitation the 
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or 
+ * sell copies of the Software, and to permit persons to whom the Software is 
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in 
+ * all copies or substantial portions of the Software. 
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
+ * THE SOFTWARE.
+ */
+
+ 
+namespace GraphLib
+{
+    public partial class PlotterGraphSelectCurvesForm : Form
+    {
+        private int selectetGraphIndex = -1;
+
+        private PlotterGraphPaneEx gpane = null;
+
+        public PlotterGraphSelectCurvesForm()
+        {
+            InitializeComponent();
+            FormClosing += new FormClosingEventHandler(OnFormClosing);
+            lb_Graphs.SelectedIndexChanged += new EventHandler(OnSelectedGraphIndexChanged);
+            VisibleChanged += new EventHandler(OnVisibleChanged);
+            tb_GraphName.TextChanged += new EventHandler(tb_GraphName_TextChanged);
+        }
+
+        void tb_GraphName_TextChanged(object sender, EventArgs e)
+        {
+            if (selectetGraphIndex >= 0 && selectetGraphIndex < gpane.Sources.Count)
+            {
+                DataSource src = gpane.Sources[selectetGraphIndex];
+                String Text = tb_GraphName.Text;
+
+                if (String.IsNullOrEmpty(Text) == false)
+                {
+                    src.Name = Text;
+                    gpane.Invalidate();
+                }
+            }
+        }
+
+        public PlotterGraphPaneEx GraphPanel
+        {
+            set
+            {
+                gpane = value;
+                if (gpane != null)
+                {
+                    this.lb_Graphs.Items.Clear();
+
+                    foreach (DataSource s in gpane.Sources)
+                    {
+                        if (s.Active)
+                        {
+                            this.lb_Graphs.Items.Add(s.Name, CheckState.Checked);
+                        }
+                        else
+                        {
+                            this.lb_Graphs.Items.Add(s.Name, CheckState.Unchecked);
+                        }
+                    }
+
+                    UpdateAllCheckedState();
+                }
+            }
+        }
+
+        void UpdateAllCheckedState()
+        {
+            int AutoScaleOn = 0;
+
+            foreach (DataSource src in gpane.Sources)
+            {
+                if (src.AutoScaleY)
+                {
+                    AutoScaleOn++;
+                }
+            }
+
+            if (AutoScaleOn == 0)
+            {
+                btn_AutoScaleAll.Visible = true;
+                btn_AutoScaleAll.Text = "Auto Y-Scale all Graphs";
+            }            
+            else
+            {
+                btn_AutoScaleAll.Visible = true;
+                btn_AutoScaleAll.Text = "Normal Y-Scale all Graphs";
+            }
+        }
+
+        void OnVisibleChanged(object sender, EventArgs e)
+        {
+            if (this.Visible == true)
+            {
+                selectetGraphIndex = -1;
+                gB_SelectedGraph.Visible = false;
+
+                if (gpane != null)
+                {
+                    UpdateAllCheckedState();                     
+
+                    if (gpane.layout == PlotterGraphPaneEx.LayoutMode.NORMAL)
+                    {
+                        cb_Layout.SelectedIndex = 0;
+                    }
+                    else if (gpane.layout == PlotterGraphPaneEx.LayoutMode.STACKED)
+                    {
+                        cb_Layout.SelectedIndex = 1;
+                    }
+                    else if (gpane.layout == PlotterGraphPaneEx.LayoutMode.TILES_HOR)
+                    {
+                        cb_Layout.SelectedIndex = 2;
+                    }
+                    else if (gpane.layout == PlotterGraphPaneEx.LayoutMode.TILES_VER)
+                    {
+                        cb_Layout.SelectedIndex = 3;
+                    }
+                    else if (gpane.layout == PlotterGraphPaneEx.LayoutMode.VERTICAL_ARRANGED)
+                    {
+                        cb_Layout.SelectedIndex = 4;
+                    }
+
+                    bt_bg_col_top.BackColor = gpane.BgndColorTop;
+                    bt_bg_col_bot.BackColor = gpane.BgndColorBot;
+                    bt_MajorGridColor.BackColor = gpane.MajorGridColor;
+                    bt_MinorGridColor.BackColor = gpane.MinorGridColor;
+
+                }
+            }
+        }
+
+            
+        void OnSelectedGraphIndexChanged(object sender, EventArgs e)
+        {
+            if (gpane != null)
+            {
+                for (int i = 0; i < gpane.Sources.Count; i++)
+                {
+                    if (lb_Graphs.CheckedIndices.Contains(i))
+                    {
+                        gpane.Sources[i].Active = true;
+                    }
+                    else
+                    {
+                        gpane.Sources[i].Active = false;
+                    }
+                }
+                gpane.Invalidate();
+            }
+        }
+
+        void OnFormClosing(object sender, FormClosingEventArgs e)
+        {
+            this.Hide();
+            e.Cancel = true;
+        }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            this.Hide();
+        }
+      
+        private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (cb_Layout.SelectedIndex == 0)
+            {
+                gpane.layout = PlotterGraphPaneEx.LayoutMode.NORMAL;
+            }
+            if (cb_Layout.SelectedIndex == 1)
+            {
+                gpane.layout = PlotterGraphPaneEx.LayoutMode.STACKED;
+            }
+          
+            if (cb_Layout.SelectedIndex == 2)
+            {
+                gpane.layout = PlotterGraphPaneEx.LayoutMode.TILES_VER;
+            }
+            if (cb_Layout.SelectedIndex == 3)
+            {
+                gpane.layout = PlotterGraphPaneEx.LayoutMode.TILES_HOR;
+            }
+            if (cb_Layout.SelectedIndex == 4)
+            {
+                gpane.layout = PlotterGraphPaneEx.LayoutMode.VERTICAL_ARRANGED;
+            }
+            gpane.Invalidate();
+        }
+       
+        private void checkedListBox1_SelectedIndexChanged_1(object sender, EventArgs e)
+        {
+            selectetGraphIndex = lb_Graphs.SelectedIndex;
+
+            UpdateSelectedGraphInfo();
+            gB_SelectedGraph.Visible = true;
+        }
+
+        private void UpdateSelectedGraphInfo()
+        {
+            if (selectetGraphIndex >= 0 && selectetGraphIndex < gpane.Sources.Count)
+            {
+                DataSource src = gpane.Sources[selectetGraphIndex];
+                btn_GraphColor.BackColor = src.GraphColor;
+
+                cb_Y_AutoScale.Checked = src.AutoScaleY;
+                cb_X_AutoScale.Checked = src.AutoScaleX;
+
+                cbDownSampling.SelectedIndex = (src.Downsampling - 1);
+                tb_GraphName.Text = src.Name;
+            }
+        }
+
+        private void btn_GraphColor_Click(object sender, EventArgs e)
+        {
+            if (selectetGraphIndex >= 0 && selectetGraphIndex < gpane.Sources.Count)
+            {
+                DataSource src = gpane.Sources[selectetGraphIndex];
+                ColorDialog d = new ColorDialog();
+                if (d.ShowDialog() == DialogResult.OK)
+                {
+                    btn_GraphColor.BackColor = d.Color;
+                    src.GraphColor = d.Color;
+                    gpane.Invalidate();
+                }                
+            }
+        }
+
+      
+        private void OnButtonAutoScallOnClicked(object sender, EventArgs e)
+        {
+            int AutoScaleOn = 0;
+
+            foreach (DataSource src in gpane.Sources)
+            {
+                if (src.AutoScaleY)
+                {
+                    AutoScaleOn++;
+                }
+            }
+
+            if (AutoScaleOn == 0)
+            {
+                btn_AutoScaleAll.Text = "Normal scale for all graphs";
+                foreach (DataSource src in gpane.Sources)
+                {
+                    src.AutoScaleY = true;
+                }                
+            }
+            else
+            {
+                btn_AutoScaleAll.Text = "Auto scale for all graphs";
+                foreach (DataSource src in gpane.Sources)
+                {
+                    src.AutoScaleY = false;
+                }
+            }
+
+			UpdateSelectedGraphInfo();
+            gpane.Invalidate();
+        }
+
+        private void OnDownsamplingChanged(object sender, EventArgs e)
+        {
+            if (selectetGraphIndex >= 0 && selectetGraphIndex < gpane.Sources.Count)
+            {
+                DataSource src = gpane.Sources[selectetGraphIndex];
+
+                src.Downsampling = (cbDownSampling.SelectedIndex + 1);
+            }
+
+            gpane.Invalidate();
+        }
+
+        private void bt_bg_col_top_Click(object sender, EventArgs e)
+        {
+             ColorDialog d = new ColorDialog();
+             if (d.ShowDialog() == DialogResult.OK)
+             {
+                 bt_bg_col_top.BackColor = d.Color;
+                 gpane.BgndColorTop = d.Color;
+                 
+                 gpane.Invalidate();
+             }
+        }
+
+        private void bt_bg_col_bot_Click(object sender, EventArgs e)
+        {
+            ColorDialog d = new ColorDialog();
+            if (d.ShowDialog() == DialogResult.OK)
+            {
+                bt_bg_col_bot.BackColor = d.Color;
+                gpane.BgndColorBot = d.Color;
+                gpane.Invalidate();
+            }
+        }
+
+        private void bt_MajorGridColor_Click(object sender, EventArgs e)
+        {
+            ColorDialog d = new ColorDialog();
+            if (d.ShowDialog() == DialogResult.OK)
+            {
+                bt_MajorGridColor.BackColor = d.Color;
+                gpane.MajorGridColor = d.Color;
+                gpane.Invalidate();
+            }
+        }
+
+        private void bt_MinorGridColor_Click(object sender, EventArgs e)
+        {
+            ColorDialog d = new ColorDialog();
+            if (d.ShowDialog() == DialogResult.OK)
+            {
+                bt_MinorGridColor.BackColor = d.Color;
+                gpane.MinorGridColor = d.Color;
+                gpane.Invalidate();
+            }
+        }
+
+        private void cb_Y_AutoScale_CheckedChanged(object sender, EventArgs e)
+        {
+            if (selectetGraphIndex >= 0 && selectetGraphIndex < gpane.Sources.Count)
+            {
+                DataSource src = gpane.Sources[selectetGraphIndex];
+
+                src.AutoScaleY = cb_Y_AutoScale.Checked;
+
+                UpdateAllCheckedState();
+
+                gpane.Invalidate();
+            }
+        }
+
+        private void cb_X_AutoScale_CheckedChanged(object sender, EventArgs e)
+        {
+            if (selectetGraphIndex >= 0 && selectetGraphIndex < gpane.Sources.Count)
+            {
+                DataSource src = gpane.Sources[selectetGraphIndex];
+
+                src.AutoScaleX = cb_X_AutoScale.Checked;
+
+                UpdateAllCheckedState();
+
+                gpane.Invalidate();
+            }
+        }
+    }
+}

GraphLib/PlotterGraphSelectCurvesForm.resx

@@ -0,0 +1,120 @@
+<?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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

GraphLib/PrecisionTimer.cs

@@ -0,0 +1,490 @@
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+
+#region License
+
+/*  
+ * Based on the work of  Leslie Sanford  
+ */
+
+#endregion
+
+
+namespace PrecisionTimer
+{    
+    public enum Mode
+    {        
+        OneShot,        
+        Periodic
+    };
+    
+    [StructLayout(LayoutKind.Sequential)]
+    public struct TimerCaps
+    {       
+        public int periodMin;       
+        public int periodMax;
+    }
+
+    
+    public sealed class Timer : IComponent
+    {       
+        private delegate void TimeProc(int id, int msg, int user, int param1, int param2);
+
+        private delegate void EventRaiser(EventArgs e);
+            
+        [DllImport("winmm.dll")]
+        private static extern int timeGetDevCaps(ref TimerCaps caps,
+                                                 int sizeOfTimerCaps);
+
+        [DllImport("winmm.dll")]
+        private static extern int timeSetEvent(int delay, 
+                                               int resolution,
+                                               TimeProc proc, 
+                                               int user, 
+                                               int mode);
+
+        [DllImport("winmm.dll")]
+        private static extern int timeKillEvent(int id);
+
+        private const int TIMERR_NOERROR = 0;
+        
+        private int timerID;
+
+        private volatile Mode mode;
+        
+        private volatile int period;
+
+        private volatile int resolution;        
+        
+        private TimeProc timeProcPeriodic;
+
+        private TimeProc timeProcOneShot;
+
+        private EventRaiser tickRaiser;
+
+        private bool running = false;
+
+        private volatile bool disposed = false;
+
+        private ISynchronizeInvoke synchronizingObject = null;
+
+        private ISite site = null;
+
+        private static TimerCaps caps;      
+         
+        public event EventHandler Started;
+         
+        public event EventHandler Stopped;
+         
+        public event EventHandler Tick;
+         
+        static Timer()
+        {
+            // Get multimedia timer capabilities.
+            timeGetDevCaps(ref caps, Marshal.SizeOf(caps));
+        }
+
+        
+        public Timer(IContainer container)
+        {
+            
+            container.Add(this);
+
+            Initialize();
+        }
+
+         
+        public Timer()
+        {
+            Initialize();
+        }
+
+        ~Timer()
+        {
+            if(IsRunning)
+            {
+                // Stop and destroy timer.
+                timeKillEvent(timerID);
+            }
+        }
+
+        private void Initialize()
+        {
+            this.mode = Mode.Periodic;
+            this.period = Capabilities.periodMin;
+            this.resolution = 1;
+
+            running = false;
+
+            timeProcPeriodic = new TimeProc(TimerPeriodicEventCallback);
+            timeProcOneShot = new TimeProc(TimerOneShotEventCallback);
+            tickRaiser = new EventRaiser(OnTick);
+        }
+
+        
+        public void Start()
+        {
+            
+            if(disposed)
+            {
+                throw new ObjectDisposedException("Timer");
+            }
+ 
+            if(IsRunning)
+            {
+                return;
+            }
+           
+            if(Mode == Mode.Periodic)
+            {
+                 timerID = timeSetEvent(Period, Resolution, timeProcPeriodic, 0, (int)Mode);
+            }
+            else
+            {
+                  timerID = timeSetEvent(Period, Resolution, timeProcOneShot, 0, (int)Mode);
+            }
+
+            if(timerID != 0)
+            {
+                running = true;
+
+                if(SynchronizingObject != null && SynchronizingObject.InvokeRequired)
+                {
+                    SynchronizingObject.BeginInvoke(
+                        new EventRaiser(OnStarted), 
+                        new object[] { EventArgs.Empty });
+                }
+                else
+                {
+                    OnStarted(EventArgs.Empty);
+                }                
+            }
+            else
+            {
+                throw new TimerException("Unable to start timer.");
+            }
+        }
+
+        
+        public void Stop()
+        {
+            
+            if(disposed)
+            {
+                throw new ObjectDisposedException("Timer");
+            }
+                        
+            if(!running)
+            {
+                return;
+            }
+
+                       
+            int result = timeKillEvent(timerID);
+
+            Debug.Assert(result == TIMERR_NOERROR);
+
+            running = false;
+
+            if(SynchronizingObject != null && SynchronizingObject.InvokeRequired)
+            {
+                SynchronizingObject.BeginInvoke(
+                    new EventRaiser(OnStopped), 
+                    new object[] { EventArgs.Empty });
+            }
+            else
+            {
+                OnStopped(EventArgs.Empty);
+            }
+        }        
+
+         
+        private void TimerPeriodicEventCallback(int id, int msg, int user, int param1, int param2)
+        {
+            if(synchronizingObject != null)
+            {
+                synchronizingObject.BeginInvoke(tickRaiser, new object[] { EventArgs.Empty });
+            }
+            else
+            {
+                OnTick(EventArgs.Empty);
+            }
+        }
+      
+        private void TimerOneShotEventCallback(int id, int msg, int user, int param1, int param2)
+        {
+            if(synchronizingObject != null)
+            {
+                synchronizingObject.BeginInvoke(tickRaiser, new object[] { EventArgs.Empty });
+                Stop();
+            }
+            else
+            {
+                OnTick(EventArgs.Empty);
+                Stop();
+            }
+        }
+
+        
+       
+        // Raises the Disposed event.
+        private void OnDisposed(EventArgs e)
+        {
+            EventHandler handler = Disposed;
+
+            if(handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        // Raises the Started event.
+        private void OnStarted(EventArgs e)
+        {
+            EventHandler handler = Started;
+
+            if(handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        // Raises the Stopped event.
+        private void OnStopped(EventArgs e)
+        {
+            EventHandler handler = Stopped;
+
+            if(handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        // Raises the Tick event.
+        private void OnTick(EventArgs e)
+        {
+            EventHandler handler = Tick;
+
+            if(handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+      
+       
+       
+
+        /// <summary>
+        /// Gets or sets the object used to marshal event-handler calls.
+        /// </summary>
+        public ISynchronizeInvoke SynchronizingObject
+        {
+            get
+            {
+                #region Require
+
+                if(disposed)
+                {
+                    throw new ObjectDisposedException("Timer");
+                }
+
+                #endregion
+
+                return synchronizingObject;
+            }
+            set
+            {
+                #region Require
+
+                if(disposed)
+                {
+                    throw new ObjectDisposedException("Timer");
+                }
+
+                #endregion
+
+                synchronizingObject = value;
+            }
+        }
+
+         
+        public int Period
+        {
+            get
+            {
+                #region Require
+
+                if(disposed)
+                {
+                    throw new ObjectDisposedException("Timer");
+                }
+
+                #endregion
+
+                return period;
+            }
+            set
+            {
+                #region Require
+
+                if(disposed)
+                {
+                    throw new ObjectDisposedException("Timer");
+                }
+                else if(value < Capabilities.periodMin || value > Capabilities.periodMax)
+                {
+                    throw new ArgumentOutOfRangeException("Period", value,
+                        "Multimedia Timer period out of range.");
+                }
+
+                #endregion
+
+                period = value;
+
+                if(IsRunning)
+                {
+                    Stop();
+                    Start();
+                }
+            }
+        }
+
+       
+        public int Resolution
+        {
+            get
+            {
+                
+                if(disposed)
+                {
+                    throw new ObjectDisposedException("Timer");
+                }
+                
+                return resolution;
+            }
+            set
+            {               
+                if(disposed)
+                {
+                    throw new ObjectDisposedException("Timer");
+                }
+                else if(value < 0)
+                {
+                    throw new ArgumentOutOfRangeException("Resolution", value,
+                        "timer resolution out of range.");
+                }
+
+                resolution = value;
+
+                if(IsRunning)
+                {
+                    Stop();
+                    Start();
+                }
+            }
+        }
+        
+        public Mode Mode
+        {
+            get
+            {
+                
+                if(disposed)
+                {
+                    throw new ObjectDisposedException("Timer");
+                }
+
+                
+                return mode;
+            }
+            set
+            {
+               
+                if(disposed)
+                {
+                    throw new ObjectDisposedException("Timer");
+                }
+
+                 
+                mode = value;
+
+                if(IsRunning)
+                {
+                    Stop();
+                    Start();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the Timer is running.
+        /// </summary>
+        public bool IsRunning
+        {
+            get
+            {
+                return running;
+            }
+        }
+
+        /// <summary>
+        /// Gets the timer capabilities.
+        /// </summary>
+        public static TimerCaps Capabilities
+        {
+            get
+            {
+                return caps;
+            }
+        }
+
+      
+      
+      
+        public event System.EventHandler Disposed;
+
+        public ISite Site
+        {
+            get
+            {
+                return site;
+            }
+            set
+            {
+                site = value;
+            }
+        }
+
+       
+        public void Dispose()
+        {
+            
+            if(disposed)
+            {
+                return;
+            }
+            
+            if(IsRunning)
+            {
+                Stop();
+            }
+
+            disposed = true;
+
+            OnDisposed(EventArgs.Empty);
+        }
+
+        
+    }
+
+    
+    public class TimerException : ApplicationException
+    {       
+        public TimerException(string message) : base(message)
+        {
+        }
+    }
+}

GraphLib/PrintPreviewForm.Designer.cs

@@ -0,0 +1,264 @@
+namespace GraphLib
+{
+    partial class PrintPreviewForm
+    {
+        /// <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.printPreviewCtrl = new System.Windows.Forms.PrintPreviewControl();
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.rb_Unscaled = new System.Windows.Forms.RadioButton();
+            this.rb_BestFit = new System.Windows.Forms.RadioButton();
+            this.rb_Scale = new System.Windows.Forms.RadioButton();
+            this.cb_PrintBackground = new System.Windows.Forms.CheckBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.cb_Printer = new System.Windows.Forms.ComboBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.cb_Orientation = new System.Windows.Forms.ComboBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.cb_PaperSize = new System.Windows.Forms.ComboBox();
+            this.bt_Cancel = new System.Windows.Forms.Button();
+            this.bt_print = new System.Windows.Forms.Button();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.Panel2.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
+            this.groupBox1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // printPreviewCtrl
+            // 
+            this.printPreviewCtrl.BackColor = System.Drawing.SystemColors.ControlLight;
+            this.printPreviewCtrl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.printPreviewCtrl.Location = new System.Drawing.Point(0, 0);
+            this.printPreviewCtrl.Name = "printPreviewCtrl";
+            this.printPreviewCtrl.Size = new System.Drawing.Size(453, 501);
+            this.printPreviewCtrl.TabIndex = 1;
+            // 
+            // splitContainer1
+            // 
+            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+            this.splitContainer1.IsSplitterFixed = true;
+            this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer1.Name = "splitContainer1";
+            // 
+            // splitContainer1.Panel1
+            // 
+            this.splitContainer1.Panel1.Controls.Add(this.printPreviewCtrl);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Controls.Add(this.groupBox1);
+            this.splitContainer1.Panel2.Controls.Add(this.cb_PrintBackground);
+            this.splitContainer1.Panel2.Controls.Add(this.label3);
+            this.splitContainer1.Panel2.Controls.Add(this.cb_Printer);
+            this.splitContainer1.Panel2.Controls.Add(this.label2);
+            this.splitContainer1.Panel2.Controls.Add(this.cb_Orientation);
+            this.splitContainer1.Panel2.Controls.Add(this.label1);
+            this.splitContainer1.Panel2.Controls.Add(this.cb_PaperSize);
+            this.splitContainer1.Panel2.Controls.Add(this.bt_Cancel);
+            this.splitContainer1.Panel2.Controls.Add(this.bt_print);
+            this.splitContainer1.Size = new System.Drawing.Size(681, 501);
+            this.splitContainer1.SplitterDistance = 453;
+            this.splitContainer1.TabIndex = 2;
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.rb_Unscaled);
+            this.groupBox1.Controls.Add(this.rb_BestFit);
+            this.groupBox1.Controls.Add(this.rb_Scale);
+            this.groupBox1.Location = new System.Drawing.Point(18, 188);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(93, 93);
+            this.groupBox1.TabIndex = 12;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Scaling";
+            // 
+            // rb_Unscaled
+            // 
+            this.rb_Unscaled.AutoSize = true;
+            this.rb_Unscaled.Location = new System.Drawing.Point(13, 19);
+            this.rb_Unscaled.Name = "rb_Unscaled";
+            this.rb_Unscaled.Size = new System.Drawing.Size(70, 17);
+            this.rb_Unscaled.TabIndex = 8;
+            this.rb_Unscaled.TabStop = true;
+            this.rb_Unscaled.Text = "Unscaled";
+            this.rb_Unscaled.UseVisualStyleBackColor = true;
+            this.rb_Unscaled.CheckedChanged += new System.EventHandler(this.rb_Unscaled_CheckedChanged);
+            // 
+            // rb_BestFit
+            // 
+            this.rb_BestFit.AutoSize = true;
+            this.rb_BestFit.Location = new System.Drawing.Point(13, 65);
+            this.rb_BestFit.Name = "rb_BestFit";
+            this.rb_BestFit.Size = new System.Drawing.Size(60, 17);
+            this.rb_BestFit.TabIndex = 6;
+            this.rb_BestFit.TabStop = true;
+            this.rb_BestFit.Text = "Best Fit";
+            this.rb_BestFit.UseVisualStyleBackColor = true;
+            this.rb_BestFit.CheckedChanged += new System.EventHandler(this.rb_BestFit_CheckedChanged);
+            // 
+            // rb_Scale
+            // 
+            this.rb_Scale.AutoSize = true;
+            this.rb_Scale.Location = new System.Drawing.Point(13, 42);
+            this.rb_Scale.Name = "rb_Scale";
+            this.rb_Scale.Size = new System.Drawing.Size(52, 17);
+            this.rb_Scale.TabIndex = 7;
+            this.rb_Scale.TabStop = true;
+            this.rb_Scale.Text = "Scale";
+            this.rb_Scale.UseVisualStyleBackColor = true;
+            this.rb_Scale.CheckedChanged += new System.EventHandler(this.rb_Scale_CheckedChanged);
+            // 
+            // cb_PrintBackground
+            // 
+            this.cb_PrintBackground.AutoSize = true;
+            this.cb_PrintBackground.Location = new System.Drawing.Point(22, 321);
+            this.cb_PrintBackground.Name = "cb_PrintBackground";
+            this.cb_PrintBackground.Size = new System.Drawing.Size(108, 17);
+            this.cb_PrintBackground.TabIndex = 11;
+            this.cb_PrintBackground.Text = "Print Background";
+            this.cb_PrintBackground.UseVisualStyleBackColor = true;
+            this.cb_PrintBackground.Visible = false;
+            this.cb_PrintBackground.CheckedChanged += new System.EventHandler(this.cb_PrintBackground_CheckedChanged);
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(19, 29);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(37, 13);
+            this.label3.TabIndex = 10;
+            this.label3.Text = "Printer";
+            // 
+            // cb_Printer
+            // 
+            this.cb_Printer.FormattingEnabled = true;
+            this.cb_Printer.Location = new System.Drawing.Point(18, 45);
+            this.cb_Printer.Name = "cb_Printer";
+            this.cb_Printer.Size = new System.Drawing.Size(195, 21);
+            this.cb_Printer.TabIndex = 9;
+            this.cb_Printer.SelectedIndexChanged += new System.EventHandler(this.cb_Printer_SelectedIndexChanged);
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(19, 134);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(58, 13);
+            this.label2.TabIndex = 5;
+            this.label2.Text = "Orientation";
+            // 
+            // cb_Orientation
+            // 
+            this.cb_Orientation.FormattingEnabled = true;
+            this.cb_Orientation.Items.AddRange(new object[] {
+            "Portrait",
+            "Landscape"});
+            this.cb_Orientation.Location = new System.Drawing.Point(18, 150);
+            this.cb_Orientation.Name = "cb_Orientation";
+            this.cb_Orientation.Size = new System.Drawing.Size(93, 21);
+            this.cb_Orientation.TabIndex = 4;
+            this.cb_Orientation.SelectedIndexChanged += new System.EventHandler(this.cb_Orientation_SelectedIndexChanged);
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(19, 81);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(58, 13);
+            this.label1.TabIndex = 3;
+            this.label1.Text = "Paper Size";
+            // 
+            // cb_PaperSize
+            // 
+            this.cb_PaperSize.FormattingEnabled = true;
+            this.cb_PaperSize.Location = new System.Drawing.Point(18, 97);
+            this.cb_PaperSize.Name = "cb_PaperSize";
+            this.cb_PaperSize.Size = new System.Drawing.Size(93, 21);
+            this.cb_PaperSize.TabIndex = 2;
+            this.cb_PaperSize.SelectedIndexChanged += new System.EventHandler(this.cb_PaperSize_SelectedIndexChanged);
+            // 
+            // bt_Cancel
+            // 
+            this.bt_Cancel.Location = new System.Drawing.Point(118, 450);
+            this.bt_Cancel.Name = "bt_Cancel";
+            this.bt_Cancel.Size = new System.Drawing.Size(69, 26);
+            this.bt_Cancel.TabIndex = 1;
+            this.bt_Cancel.Text = "Cancel";
+            this.bt_Cancel.UseVisualStyleBackColor = true;
+            this.bt_Cancel.Click += new System.EventHandler(this.bt_Cancel_Click);
+            // 
+            // bt_print
+            // 
+            this.bt_print.Location = new System.Drawing.Point(22, 450);
+            this.bt_print.Name = "bt_print";
+            this.bt_print.Size = new System.Drawing.Size(69, 26);
+            this.bt_print.TabIndex = 0;
+            this.bt_print.Text = "Print";
+            this.bt_print.UseVisualStyleBackColor = true;
+            this.bt_print.Click += new System.EventHandler(this.bt_print_Click);
+            // 
+            // PrintPreviewForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(681, 501);
+            this.Controls.Add(this.splitContainer1);
+            this.MaximumSize = new System.Drawing.Size(697, 537);
+            this.MinimumSize = new System.Drawing.Size(697, 537);
+            this.Name = "PrintPreviewForm";
+            this.Text = "PrintPreviewForm";
+            this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.Panel2.ResumeLayout(false);
+            this.splitContainer1.Panel2.PerformLayout();
+            this.splitContainer1.ResumeLayout(false);
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.PrintPreviewControl printPreviewCtrl;
+        private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.Button bt_Cancel;
+        private System.Windows.Forms.Button bt_print;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.ComboBox cb_PaperSize;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.ComboBox cb_Orientation;
+        private System.Windows.Forms.RadioButton rb_Scale;
+        private System.Windows.Forms.RadioButton rb_BestFit;
+        private System.Windows.Forms.RadioButton rb_Unscaled;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.ComboBox cb_Printer;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.CheckBox cb_PrintBackground;
+    }
+}

GraphLib/PrintPreviewForm.cs

@@ -0,0 +1,336 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing.Printing;
+
+namespace GraphLib
+{
+    public partial class PrintPreviewForm : Form
+    {
+        private PrintDocument printDoc = new PrintDocument();
+        private PlotterGraphPaneEx gpane = null;
+        private String strDefaultPrinter = String.Empty;
+      
+        private bool bBestScale = false;
+        private bool bPageScale = false;
+        private bool bUnscaled = false;
+        private bool bLandscape = false;
+        private int selPrinterIndex = -1;
+
+        public PrintPreviewForm()
+        {
+            InitializeComponent();
+            
+            printPreviewCtrl.Zoom = 1;
+            rb_BestFit.Checked = true;
+            rb_Scale.Checked = false;
+            rb_Unscaled.Checked = false;
+            cb_Orientation.SelectedIndex = 0;
+            printDoc.PrintPage += new PrintPageEventHandler(printDoc_PrintPage);
+            this.VisibleChanged += new EventHandler(OnVisibleChanged);
+            FormClosing += new FormClosingEventHandler(OnFormClosing);
+        }
+
+        void FillInInstalledPrinters()
+        {
+            strDefaultPrinter = printDoc.PrinterSettings.PrinterName;
+            cb_Printer.Items.Clear();       
+            foreach (String strPrinter in PrinterSettings.InstalledPrinters)
+            {
+                cb_Printer.Items.Add(strPrinter);
+
+                if (strPrinter == strDefaultPrinter)
+                {                   
+                    cb_Printer.SelectedIndex = cb_Printer.Items.IndexOf(strPrinter);
+                }
+            }             
+        }
+
+        void OnVisibleChanged(object sender, EventArgs e)
+        {
+            if (this.Visible)
+            {
+                bLandscape = cb_Orientation.SelectedIndex == 1;
+
+                FillInInstalledPrinters();
+
+                FillInPaperSizes();
+
+                UpdateScaleRadioButtons();
+                 
+                InvalidatePrintPreview();
+            }
+            else
+            {
+                
+            }
+        }
+
+        void OnFormClosing(object sender, FormClosingEventArgs e)
+        {
+            this.Hide();
+            e.Cancel = true;
+        }
+       
+        void UpdateScaleRadioButtons()
+        {
+            bBestScale = rb_BestFit.Checked;
+            bPageScale = rb_Scale.Checked;
+            bUnscaled = rb_Unscaled.Checked;
+        }
+
+        double AutoZoomPreview()
+        {
+            float zoom = 1.0f;
+            float step = 0.05f;
+
+            float PaperWidth = printDoc.DefaultPageSettings.PaperSize.Width;
+            float PaperHeight = printDoc.DefaultPageSettings.PaperSize.Height;
+          
+            if (bLandscape)
+            {
+                PaperHeight = printDoc.DefaultPageSettings.PaperSize.Width * zoom;
+                PaperWidth = printDoc.DefaultPageSettings.PaperSize.Height * zoom;
+            }
+
+            while (zoom > 0.1f)
+            {
+                double CurW = PaperWidth * zoom;
+                double CurH = PaperHeight * zoom;
+                
+                if (splitContainer1.Panel1.Width < (CurW+10) || splitContainer1.Panel1.Height < (CurH+10))
+                {
+                    zoom -= step;
+                }
+                else
+                {
+                    break;
+                }
+            }
+
+            return zoom;
+        }
+
+        void FillInPaperSizes()
+        {
+            cb_PaperSize.Items.Clear();
+
+            foreach (PaperSize s in printDoc.PrinterSettings.PaperSizes)
+            {
+                cb_PaperSize.Items.Add(s.PaperName.ToString());                
+            }
+             
+            if (cb_PaperSize.SelectedIndex == -1 || cb_PaperSize.SelectedIndex >= cb_PaperSize.Items.Count)
+            {                
+                int idx = cb_PaperSize.Items.IndexOf(printDoc.DefaultPageSettings.PaperSize.PaperName); 
+                
+                if (idx >= 0 && idx < cb_PaperSize.Items.Count)
+                {
+                    cb_PaperSize.SelectedIndex = idx;
+                }
+                else
+                {
+                    cb_PaperSize.SelectedIndex = 0;
+                }
+            } 
+        }
+
+        void InvalidatePrintPreview()
+        {
+            printDoc.DefaultPageSettings.Landscape = bLandscape;            
+            printPreviewCtrl.Document = printDoc;
+            printPreviewCtrl.Document.DocumentName = "Preview";
+            printPreviewCtrl.Zoom = AutoZoomPreview();
+            printPreviewCtrl.InvalidatePreview();                  
+        }
+
+        
+        public PlotterGraphPaneEx GraphPanel
+        {
+            set
+            {
+                gpane = value;                
+            }
+        }
+
+        private void AutoScaleDocument(ref float w, ref float h, ref float x, ref float y)
+        {           
+            float CurGraphWidth = gpane.Width;
+            float CurGraphHeight = gpane.Height;
+            float CurPaperWidth = printDoc.DefaultPageSettings.PaperSize.Width;
+            float CurPaperHeight = printDoc.DefaultPageSettings.PaperSize.Height;
+
+            if (bLandscape)
+            {
+                CurPaperWidth = printDoc.DefaultPageSettings.PaperSize.Height;
+                CurPaperHeight = printDoc.DefaultPageSettings.PaperSize.Width;
+            }
+
+            if (bUnscaled)
+            {
+                    // do nothing
+            }
+
+            if (bPageScale)         // scale to page
+            {                
+                CurGraphWidth = CurPaperWidth;
+                CurGraphHeight = CurPaperHeight;                 
+            }
+
+            if (bBestScale)         // scale to best fit
+            {
+                float zoom = 1.0f;
+                float step = 0.05f;
+
+                if (CurGraphWidth > (CurPaperWidth ) || CurGraphHeight > (CurPaperHeight ))
+                {
+                    // scale down                   
+                    while ((zoom * gpane.Width > CurPaperWidth || zoom * gpane.Height > CurPaperHeight) && zoom > step)
+                    {                        
+                        zoom -= step;
+                    }
+                    zoom -= step;
+                    
+                }
+                else if (CurGraphWidth < CurPaperWidth && CurGraphHeight < CurPaperHeight)
+                {
+                    // scale up                   
+                    while (((zoom+step) * gpane.Width < CurPaperWidth && (zoom+step) * gpane.Height < CurPaperHeight) && zoom > step)
+                    {                        
+                        zoom += step;
+                    }                    
+                   
+                }
+                CurGraphWidth = zoom * gpane.Width;
+                CurGraphHeight = zoom * gpane.Height;
+            }
+
+            w = CurGraphWidth;
+            h = CurGraphHeight;
+
+            // center print
+            x =   (CurPaperWidth - w) / 2.0f;
+            y =   (CurPaperHeight - h) / 2.0f;
+        }
+
+        private void printDoc_PrintPage(object sender, PrintPageEventArgs e)
+        {
+            if (gpane != null)
+            {
+                float x=0, y=0, w=gpane.Width, h=gpane.Height;
+
+                AutoScaleDocument(ref w, ref h, ref x, ref y);
+                e.Graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                //gpane.PaintControl(e.Graphics, w, h,x,y,cb_PrintBackground.Checked);
+                gpane.PaintControl(e.Graphics, w, h, x, y, false);
+            }
+        }
+
+        private void bt_print_Click(object sender, EventArgs e)
+        {
+            if (printDoc != null)
+            {               
+                printDoc.Print();
+                this.Hide();
+            }
+        }
+
+        private void bt_Cancel_Click(object sender, EventArgs e)
+        {
+            this.Hide();
+        }
+
+        private void cb_PaperSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (cb_PaperSize.SelectedIndex >= 0 && cb_PaperSize.SelectedIndex < cb_PaperSize.Items.Count)
+            {
+                
+                foreach (PaperSize s in printDoc.PrinterSettings.PaperSizes)
+                {
+                    if (s.PaperName == (string)cb_PaperSize.Items[cb_PaperSize.SelectedIndex])
+                    {
+                        printDoc.DefaultPageSettings.PaperSize = s;
+                        InvalidatePrintPreview();
+                    }
+                }
+            }
+        }
+
+        
+        private void rb_BestFit_CheckedChanged(object sender, EventArgs e)
+        {
+            if (rb_BestFit.Checked)
+            {
+                rb_Scale.Checked = !rb_BestFit.Checked;
+                rb_Unscaled.Checked = !rb_BestFit.Checked;
+            }
+
+            UpdateScaleRadioButtons();
+            InvalidatePrintPreview();
+        }
+
+        private void rb_Scale_CheckedChanged(object sender, EventArgs e)
+        {
+            if (rb_Scale.Checked)
+            {
+                rb_BestFit.Checked = !rb_Scale.Checked;
+                rb_Unscaled.Checked = !rb_Scale.Checked;
+            }
+
+            UpdateScaleRadioButtons();
+            InvalidatePrintPreview();
+        }
+
+        private void rb_Unscaled_CheckedChanged(object sender, EventArgs e)
+        {
+            if (rb_Unscaled.Checked)
+            {
+                rb_Scale.Checked = !rb_Unscaled.Checked;
+                rb_BestFit.Checked = !rb_Unscaled.Checked;
+            }
+
+            UpdateScaleRadioButtons();
+            InvalidatePrintPreview();
+        }
+
+        private void cb_Printer_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            selPrinterIndex = cb_Printer.SelectedIndex;
+
+            if (selPrinterIndex >= 0 && selPrinterIndex < cb_Printer.Items.Count)
+            {
+                printDoc.PrinterSettings.PrinterName = (string)cb_Printer.Items[selPrinterIndex];
+                this.Text = "Print Preview - " + printDoc.PrinterSettings.PrinterName;
+            }   
+
+            FillInPaperSizes();
+
+            InvalidatePrintPreview();
+        }
+
+        private void cb_Orientation_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (cb_Orientation.SelectedIndex == 0)
+            {
+                bLandscape = false;
+            }
+            else
+            {
+                bLandscape = true;
+            }
+
+            InvalidatePrintPreview();
+        }
+
+        private void cb_PrintBackground_CheckedChanged(object sender, EventArgs e)
+        {
+            InvalidatePrintPreview();
+        }
+
+        
+    }
+}

GraphLib/PrintPreviewForm.resx

@@ -0,0 +1,120 @@
+<?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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

GraphLib/Properties/AssemblyInfo.cs

@@ -0,0 +1,35 @@
+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("GraphLibrary")]
+[assembly: AssemblyDescription("Library for easy and simple graph drawing")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("GraphLibrary")]
+[assembly: AssemblyCopyright("Copyright © 2008-2014 ZIMMERMANN STEPHAN")]
+[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("b23e30ac-c4b8-4863-90d0-cf0ad837c050")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.1")]
+[assembly: AssemblyFileVersion("1.0.0.1")]

GraphLib/Properties/Resources.Designer.cs

@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.18408
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace ClassLibrary1.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    /// </summary>
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    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>
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ClassLibrary1.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}

GraphLib/Properties/Resources.resx

@@ -0,0 +1,120 @@
+<?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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

GraphLib/Utils.cs

@@ -0,0 +1,45 @@
+using System;
+
+namespace GraphLib
+{
+    public class Utilities
+    {
+        /// <summary>
+        /// returns the most significant decimal digit
+        /// 250 -> 100
+        /// 350 -> 100
+        /// 12 -> 10
+        /// 5 -> 1
+        /// 0.5 .> 0.1
+        /// .....
+        /// </summary>
+        /// <param name="Value"></param>
+        /// <returns></returns>
+        static public float MostSignificantDigit(float Value)
+        {
+            float n = 1;
+
+            float val_abs = Math.Abs(Value);
+            float sig = 1.0f * Math.Sign(Value);
+
+            if (val_abs > 1)
+            {
+                while (n < val_abs)
+                {
+                    n *= 10.0f;
+                }
+
+                return (float)((int)(sig * n / 10));
+            }
+            else // n <= 1
+            {
+                while (n > val_abs)
+                {
+                    n /= 10.0f;
+                }
+
+                return sig * n;
+            }
+        }
+    }
+}

MonitoringDB/Entities/Part.cs

@@ -0,0 +1,68 @@
+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);
+		}
+    }
+}

MonitoringDB/Entities/Process.cs

@@ -0,0 +1,68 @@
+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);
+		}
+    }
+}

MonitoringDB/Entities/Record.cs

@@ -0,0 +1,61 @@
+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);
+		}
+	}
+}

MonitoringDB/Entities/ReferenceRecord.cs

@@ -0,0 +1,88 @@
+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);
+		}
+    }
+}

MonitoringDB/Entities/Workstep.cs

@@ -0,0 +1,82 @@
+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);
+        }
+    }
+}

MonitoringDB/Enums.cs

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

MonitoringDB/FluentNH.cs

@@ -0,0 +1,212 @@
+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);
+						}
+					}
+				}
+			}
+		}
+    }
+}

MonitoringDB/Forms/ListViewEx.cs

@@ -0,0 +1,456 @@
+///
+/// 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; }
+		}
+	}
+}

MonitoringDB/Forms/ListViewEx.resx

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

MonitoringDB/Forms/ModelessForm.Designer.cs

@@ -0,0 +1,64 @@
+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;
+    }
+}

MonitoringDB/Forms/ModelessForm.cs

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

MonitoringDB/Forms/ResultsConfigDlg.cs

@@ -0,0 +1,299 @@
+///
+/// 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();
+        }
+	}
+}

MonitoringDB/Forms/ResultsConfigDlg.designer.cs

@@ -0,0 +1,201 @@
+///
+/// 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;
+	}
+}

MonitoringDB/Forms/SettingsDlg.Designer.cs

@@ -0,0 +1,263 @@
+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;
+	}
+}

MonitoringDB/Forms/SettingsDlg.cs

@@ -0,0 +1,87 @@
+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();
+		}
+	}
+}

MonitoringDB/Forms/TrivialLoginDlg.cs

@@ -0,0 +1,49 @@
+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();
+		}
+	}
+}

MonitoringDB/Forms/TrivialLoginDlg.designer.cs

@@ -0,0 +1,105 @@
+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;
+	}
+}

MonitoringDB/ItemSpec.cs

@@ -0,0 +1,306 @@
+///
+/// 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;
+		}
+    }
+}

MonitoringDB/Mappings/PartMap.cs

@@ -0,0 +1,23 @@
+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);
+		}
+    }
+}

MonitoringDB/Mappings/ProcessMap.cs

@@ -0,0 +1,25 @@
+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();
+		}
+    }
+}

MonitoringDB/Mappings/RecordMap.cs

@@ -0,0 +1,17 @@
+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);
+		}
+    }
+}

MonitoringDB/Mappings/ReferenceRecordMap.cs

@@ -0,0 +1,22 @@
+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();
+		}
+    }
+}

MonitoringDB/Mappings/WorkstepMap.cs

@@ -0,0 +1,23 @@
+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();
+		}
+    }
+}

MonitoringDB/MonitoringDB.csproj

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

MonitoringDB/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+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")]

MonitoringDB/Properties/Resources.Designer.cs

@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <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;
+            }
+        }
+    }
+}

MonitoringDB/QuitAppException.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace MonitoringDB
+{
+    public class QuitAppException : Exception
+    {
+        public QuitAppException(string message)
+            : base(message)
+        {
+        }
+    }
+}

MonitoringDB/Resources/Strings.Designer.cs

@@ -0,0 +1,333 @@
+//------------------------------------------------------------------------------
+// <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);
+            }
+        }
+    }
+}

MonitoringDB/Resources/Strings.resx

@@ -0,0 +1,210 @@
+<?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>
+  <data name="Add" xml:space="preserve">
+    <value>Add  &gt;</value>
+  </data>
+  <data name="Available_results" xml:space="preserve">
+    <value>Available results</value>
+  </data>
+  <data name="Barcode" xml:space="preserve">
+    <value>Barcode</value>
+  </data>
+  <data name="CancelBtnText" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="Caption" xml:space="preserve">
+    <value>Caption</value>
+  </data>
+  <data name="Configuration" xml:space="preserve">
+    <value>Configuration</value>
+  </data>
+  <data name="DownBtnText" xml:space="preserve">
+    <value>Down</value>
+  </data>
+  <data name="Format" xml:space="preserve">
+    <value>Format</value>
+  </data>
+  <data name="Item" xml:space="preserve">
+    <value>Item</value>
+  </data>
+  <data name="Max_pruefindex" xml:space="preserve">
+    <value>Max. prüfindex</value>
+  </data>
+  <data name="OkBtnText" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="Part_barcode" xml:space="preserve">
+    <value>Another part barcode</value>
+  </data>
+  <data name="Precision" xml:space="preserve">
+    <value>Precision</value>
+  </data>
+  <data name="Process" xml:space="preserve">
+    <value>Process</value>
+  </data>
+  <data name="Purchase_order" xml:space="preserve">
+    <value>Purchase order</value>
+  </data>
+  <data name="RefRecordID" xml:space="preserve">
+    <value>Record ID</value>
+  </data>
+  <data name="Remove" xml:space="preserve">
+    <value>&lt;  Remove</value>
+  </data>
+  <data name="Remove_all" xml:space="preserve">
+    <value>Remove all</value>
+  </data>
+  <data name="Selected_results" xml:space="preserve">
+    <value>Selected results</value>
+  </data>
+  <data name="Serial_nr" xml:space="preserve">
+    <value>Serial nr.</value>
+  </data>
+  <data name="Serial_number" xml:space="preserve">
+    <value>Serial_number</value>
+  </data>
+  <data name="Summary" xml:space="preserve">
+    <value>Summary</value>
+  </data>
+  <data name="Test_result" xml:space="preserve">
+    <value>Test result</value>
+  </data>
+  <data name="Text" xml:space="preserve">
+    <value>Text</value>
+  </data>
+  <data name="Time_stamp" xml:space="preserve">
+    <value>Time stamp</value>
+  </data>
+  <data name="UpBtnText" xml:space="preserve">
+    <value>Up</value>
+  </data>
+  <data name="User_name" xml:space="preserve">
+    <value>User name</value>
+  </data>
+  <data name="Width" xml:space="preserve">
+    <value>Width</value>
+  </data>
+  <data name="Workplace" xml:space="preserve">
+    <value>Workplace</value>
+  </data>
+  <data name="Workstep" xml:space="preserve">
+    <value>Workstep</value>
+  </data>
+</root>

MonitoringDB/ScanVerificationInfo.cs

@@ -0,0 +1,25 @@
+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;
+        }
+    }
+}

MonitoringDB/SerializableDictionary.cs

@@ -0,0 +1,69 @@
+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();
+            }
+        }
+    }
+}

MonitoringDB/WMPart.cs

@@ -0,0 +1,53 @@
+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;
+		}
+	}
+}

MonitoringDB/app.config

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

MonitoringDB/packages.config

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

Results/BatchResults.cs

@@ -189,5 +189,22 @@ namespace Results
                 }
 			}
 		}
+
+
+        public bool IsProduction()
+        {
+            for (int i = 0; i < WMPositionsCount; i++)
+            {
+                if (WaterMeters[i] != null)
+                {
+                    foreach (var mtr in WaterMeters[i].MeterTestRslts)
+                    {
+                        if (mtr.TestData().Name.ToLower().Contains("adj"))
+                            return true;
+                    }
+                }
+            }
+            return false;
+        }
 	}
 }

Results/DB.cs

@@ -21,12 +21,19 @@ namespace Results
 		public static ISessionFactory SessionFactory;
 
 		/// <summary> Connection string for all sessions </summary>
-		private static string connectionString;
+		static string connectionString;
 		/// 
 		public static string ConnectionString
 		{
 			get { return connectionString; }
-			set { connectionString = value; SessionFactory = null; }
+            set
+            {
+                if (value != connectionString)
+                {
+                    connectionString = value;
+                    SessionFactory = null;          /// Clear SessionFactory on connection string change
+                }
+            }
 		}
 
 		/// <summary> Database type (MySQL or SQLite) for all sessions </summary>
@@ -254,6 +261,12 @@ namespace Results
 				foreach (var cd in ComponentsList) if (cd.Id == 0) session.SaveOrUpdate(cd);
 				foreach (var wd in WaterMeterDataList) if (wd.Id == 0) session.SaveOrUpdate(wd);
 
+				log.Debug(batch.ToString(1));
+				foreach (var tstRslt in batch.TestRslts)
+				{
+					log.Debug(tstRslt.ToString(1));
+				}
+
 				session.SaveOrUpdate(batch);
 
 				transaction.Commit();
@@ -261,7 +274,13 @@ namespace Results
 			catch (Exception exc)
 			{
 				transaction.Rollback();
+
 				log.FatalFormat("Saving results of batch #{0} into the results DB failed: {1}", batch.BatchNr, exc.Message);
+				if (exc.InnerException != null && !string.IsNullOrEmpty(exc.InnerException.Message))
+				{
+					log.FatalFormat("Inner exception message: {0}", exc.InnerException.Message);
+				}
+
 				return false;
 			}
 

Results/Entities/Batch.cs

@@ -41,6 +41,18 @@ namespace Results.Entities
 			TestRslts = new List<TestRslt>();
 		}
 
+        public virtual int PassedMetersCount()
+        {
+            int count = 0;
+            foreach (var mtr in WaterMeters) if (mtr.PassedFromTests()) count++;
+            return count;
+        }
+
+        public virtual int FailedMetersCount()
+        {
+            return WaterMeters.Count - PassedMetersCount();
+        }
+
         public virtual double AmbTempMean()
 		{
             double timeSum = 0;
@@ -95,6 +107,14 @@ namespace Results.Entities
             return (timeSum == 0) ? 0 : (sum / timeSum);
         }
 
+        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() { 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()
         {
             double timeSum = 0;
@@ -126,5 +146,14 @@ namespace Results.Entities
 		{
 			return string.Format("Batch #{0}, Start:{1}, End:{2}, Procedure:{3}", BatchNr, StartTime, EndTime, ProcedureName);
 		}
+
+		public virtual string ToString(int i)
+		{
+			return string.Format("Batch: BatchNr={0} TestBenchId={1} ProgramVersion={2} UserName={3} UserNumber={4} ProcedureName={5} ProcedureRevision={6} ProtocolTitle={7} Remark={8} DensityCorr={9} Custom2={10} Custom3={11} StartTime={12} EndTime={13} Dirty={14} RsltsSent={15} RsltsPrinted={16}",
+								BatchNr, TestBenchId, ProgramVersion, UserName, UserNumber,
+								ProcedureName, ProcedureRevision, ProtocolTitle, Remark, DensityCorr,
+								Custom2, Custom3, StartTime, EndTime, Dirty,
+								RsltsSent, RsltsPrinted);
+		}
 	}
 }

Results/Entities/MeterTestRslt.cs

@@ -23,6 +23,7 @@ namespace Results.Entities
  
 		/// Main result
 		public virtual double Error			  { get; set; }		/// [%]
+        public virtual double KorrErrQ        { get; set; }     /// [%] not mapped to results DB, saved to Oracle DB
 		public virtual bool   TestDone		  { get; set; }		/// true = test was completed
 		public virtual bool   Passed		  { get; set; }		/// true = test passed, water meter is OK
 
@@ -40,7 +41,7 @@ namespace Results.Entities
 		public virtual double   DensityOut()  { return TestRslt.DensityOut; }
 		public virtual Components Components(){ return TestRslt.Components; }
 		/// 
-		protected virtual TestData TestData() { return TestRslt.TestData; }
+		public virtual TestData TestData()    { return TestRslt.TestData; }
 		/// 
 		public virtual int    Repeats()		  { return TestData().Repeats; }
 		public virtual double Qfrom()		  { return TestData().Qfrom; }			/// [m3/h]
@@ -74,13 +75,7 @@ namespace Results.Entities
 
 		public virtual string PassedColorStr()
         {
-#if PUCHONG_PT200
-			if (!Evaluate())	return Passed ? "OK|White" : "NG|White";
-			else				return Passed ? "OK|Green" : "NG|Red";
-#else
-            if (!Evaluate())    return Passed ? "OK|White" : "NOK|White";
-            else                return Passed ? "OK|Green" : "NOK|Red";
-#endif
+            return Utils.PassedColorStr(Passed, Evaluate());
 		}
 
         public MeterTestRslt()
@@ -112,6 +107,7 @@ namespace Results.Entities
 		    TimestampEnd = src.TimestampEnd;
 		    TestTime = src.TestTime;
 		    Error = src.Error;
+            KorrErrQ = src.KorrErrQ;
 		    TestDone = src.TestDone;
             Passed = src.Passed;
         }

Results/Entities/TestRslt.cs

@@ -1,8 +1,9 @@
 ///
-/// Copyright (c) 2015-2016 Sensus Metering Systems
+/// Copyright (c) 2015-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
+using System.Text;
 
 namespace Results.Entities
 {
@@ -39,6 +40,19 @@ namespace Results.Entities
 		public virtual double VolumeMaster { get; set; }    /// [l]    Volume from the master flow meter
 		public virtual double ErrorMaster { get; set; }		/// [%]
 
+        public virtual float  DiverterStart { get; set; }   /// [s]    Diverter switch time when test starts
+        public virtual float  DivStart10 { get; set; }      /// [s]    Diverter switch time when test starts at level 10 (e.g. 10%) (not mapped to DB)
+        public virtual float  DivStart50 { get; set; }      /// [s]    Diverter switch time when test starts at level 50 (e.g. 50%) (not mapped to DB)
+        public virtual float  DivStart90 { get; set; }      /// [s]    Diverter switch time when test starts at level 90 (e.g. 90%) (not mapped to DB)
+        
+        public virtual float  DiverterEnd { get; set; }     /// [s]    Diverter switch time when test ends
+        public virtual float  DivEnd90 { get; set; }        /// [s]    Diverter switch time when test starts at level 90 (e.g. 90%) (not mapped to DB)
+        public virtual float  DivEnd50 { get; set; }        /// [s]    Diverter switch time when test starts at level 50 (e.g. 50%) (not mapped to DB)
+        public virtual float  DivEnd10 { get; set; }        /// [s]    Diverter switch time when test starts at level 10 (e.g. 10%) (not mapped to DB)
+        
+        public virtual int    ErrorFlags { get; set; }		/// bitfield : bit0=E1, bit1=E2, bit2=E3, etc.
+		public virtual sbyte  ErrorFlagsMd { get; set; }	/// 0=off, 1=info, 2=on (evaluated in MeterTestRslt.Passed)
+
 		/// Main results of heat meters
 		public virtual double RefEnergy { get; set; }		/// [J]    Joul
 
@@ -113,10 +127,59 @@ namespace Results.Entities
 		public virtual double TargetVolume() { return TestData.TargetVolume; }
 		public virtual double TargetTime()	 { return TestData.TargetTime; }
 		public virtual string Method()		 { return TestData.Method; }
-		public virtual double ErrLimLo()	 { return TestData.ErrLimLo; }
-		public virtual double ErrLimHi()	 { return TestData.ErrLimHi; }
+
+		public virtual double ErrLimLo()
+        {
+            if (TestData.ErrLimLo <= TestData.ErrLimHi)
+            {
+                return TestData.ErrLimLo;       /// Error limit of a water meter
+            }
+            else
+            {
+                /// Metrological class and nominal flow of a heat meter
+                int metrClass = (int)Math.Round(TestData.ErrLimLo);
+                double Qp = Math.Abs(TestData.ErrLimHi);
+                double Q = Math.Max(FlowMean, 0.00001);     /// to avoid division by zero
+
+                /// Calculate the error limit of a heat meter
+                switch (metrClass)
+                {
+                    default:
+                    case 1: return -Math.Min(3.5, 1.0 + 0.01 * Qp / Q);
+                    case 2: return -Math.Min(5.0, 2.0 + 0.02 * Qp / Q);
+                    case 3: return -Math.Min(5.0, 3.0 + 0.05 * Qp / Q);
+                }
+            }
+        }
+
+		public virtual double ErrLimHi()
+        {
+            if (TestData.ErrLimLo <= TestData.ErrLimHi)
+            {
+                return TestData.ErrLimHi;       /// Error limit of a water meter
+            }
+            else
+            {
+                /// Metrological class and nominal flow of a heat meter
+                int metrClass = (int)Math.Round(TestData.ErrLimLo);
+                double Qp = Math.Abs(TestData.ErrLimHi);
+                double Q = Math.Max(FlowMean, 0.00001);     /// to avoid division by zero
+
+                /// Calculate the error limit of a heat meter
+                switch (metrClass)
+                {
+                    default:
+                    case 1: return +Math.Min(3.5, 1.0 + 0.01 * Qp / Q);
+                    case 2: return +Math.Min(5.0, 2.0 + 0.02 * Qp / Q);
+                    case 3: return +Math.Min(5.0, 3.0 + 0.05 * Qp / Q);
+                }
+            }
+        }
+
 		public virtual double Uncertainty()  { return TestData.Uncertainty; }
-		public virtual bool   Evaluate()     { return TestData.Evaluate; }
+        public virtual float TempLimLo()     { return TestData.TempLimLo; }
+        public virtual float TempLimHi()     { return TestData.TempLimHi; }
+        public virtual bool Evaluate()       { return TestData.Evaluate; }
 		public virtual Config.Entities.Publish Publish() { return (Config.Entities.Publish)TestData.Publish; }
 
 
@@ -161,6 +224,10 @@ namespace Results.Entities
 		    VolumeCTV = src.VolumeCTV;
 		    VolumeMaster = src.VolumeMaster;
 		    ErrorMaster = src.ErrorMaster;
+            DiverterStart = src.DiverterStart;
+            DiverterEnd = src.DiverterEnd;
+			ErrorFlags = src.ErrorFlags;
+			ErrorFlagsMd = src.ErrorFlagsMd;
 		    RefEnergy = src.RefEnergy;
             AmbTempMean = src.AmbTempMean;
 		    AmbTempStart = src.AmbTempStart;
@@ -224,9 +291,42 @@ namespace Results.Entities
 		    Custom10 = src.Custom10;
         }
 
+		/// <summary> Wrapper </summary>
+		public virtual Config.Entities.ErrorFlagsMode ErrorFlagsMode()
+		{
+			return (Config.Entities.ErrorFlagsMode)ErrorFlagsMd;
+		}
+
+        /// <summary> Wrapper </summary>
+        public virtual string ErrorFlagsStr()
+        {
+            return Utils.ErrorFlagsStr(ErrorFlags);
+        }
+
         public override string ToString()
         {
 			return string.Format("batch={0}, procedure={1}, test={2}, {3} {4}", Batch.BatchNr, Batch.ProcedureName, Name(), StartTime.ToShortDateString(), StartTime.ToShortTimeString());
         }
-    }
+
+		public virtual string ToString(int i)
+		{
+			return string.Format("TestRslt: Part={0} RepetitionNr={1} TestDone={2} Remark={3} StartTime={4} EndTime={5} FlowSetTime={6} TestTime={7} PulsesMaster={8} ConstMaster={9} MassStartRaw={10} MassStart={11} MassEndRaw={12} MassEnd={13} DensityIn={14} DensityOut={15} DensityDiv={16} Buoyancy={17} FlowMass={18} FlowVolume={19} VolumeCTV={20} VolumeMaster={21} ErrorMaster={22} DiverterStart={85} DiverterEnd={86} ErrorFlags={23} 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, DensityOut, DensityDiv, Buoyancy, FlowMass, FlowVolume,
+								VolumeCTV, VolumeMaster, ErrorMaster, ErrorFlags, ErrorFlagsMd, 
+								AmbTempMean, AmbTempStart, AmbTempEnd, AmbTempMin, AmbTempMax,
+								AmbPressMean, AmbPressStart, AmbPressEnd, AmbPressMin, AmbPressMax,
+								AmbHumiMean, AmbHumiStart, AmbHumiEnd, AmbHumiMin, AmbHumiMax,
+								PressUpMean, PressUpStart, PressUpEnd, PressUpMin, PressUpMax,
+								PressDownMean, PressDownStart, PressDownEnd, PressDownMin, PressDownMax,
+								PressDeltaMean, PressDeltaStart, PressDeltaEnd, PressDeltaMin, PressDeltaMax,
+								TempUpMean, TempUpStart, TempUpEnd, TempUpMin, TempUpMax,
+								TempDownMean, TempDownStart, TempDownEnd, TempDownMin, TempDownMax,
+								TempDivMean, TempDivStart, TempDivEnd, TempDivMin, TempDivMax,
+								FlowMean, FlowStart, FlowEnd, FlowMin, FlowMax,
+								Custom1, Custom2, Custom3, Custom4, Custom5, Custom6, Custom7, Custom8, Custom9, Custom10,
+                                DiverterStart, DiverterEnd);
+		}
+	}
 }

Results/Entities/WaterMeter.cs

@@ -8,7 +8,37 @@ using Config.Entities;
 
 namespace Results.Entities
 {
-	public class WaterMeter
+
+    public enum ResultCode
+    {
+        None  = 0,
+
+        Bit16 = (1 << 16),
+        Bit17 = (1 << 17),
+        Bit18 = (1 << 18),
+        Bit19 = (1 << 19),
+        RfidErrorCodeMask = (Bit16 | Bit17 | Bit18 | Bit19),        /// RFID comm. err. (the first encounetered error is stored)
+
+		Bit20 = (1 << 20),
+		Bit21 = (1 << 21),
+		Bit22 = (1 << 22),
+		Bit23 = (1 << 23),
+		RfidErrorTestIdMask = (Bit20 | Bit21 | Bit22 | Bit23),        /// RFID comm. err. (the first encounetered error is stored)
+		
+		MissingOptoData = (1 << 24),
+        OptoDataWithZeroFlow = (1 << 25),
+        OptoErrorCodeMask = (MissingOptoData | OptoDataWithZeroFlow),    /// Opto comm. err. (the first encounetered error is stored)
+
+        Bit26 = (1 << 26),
+        Bit27 = (1 << 27),
+        Bit28 = (1 << 28),
+        Bit29 = (1 << 29),
+        Bit30 = (1 << 30),
+        Bit31 = (1 << 31),
+    }
+
+
+    public class WaterMeter
 	{
 		public virtual int    Id				{ get; protected set; }
 		public virtual string SerialNr			{ get; set; }	/// Main s/n for compound meters, PCB Number for iPerl water meter
@@ -18,9 +48,10 @@ namespace Results.Entities
 		public virtual int    WMPosition        { get; set; }
 		public virtual string EndState			{ get; set; }	/// End state (of the main water meter)
 		public virtual string EndStateAux       { get; set; }	/// End state of the auxiliary water meter
-		public virtual double QRise				{ get; set; }	/// [m3/h] detected Q_rise of a composed meter
+		public virtual double QRise				{ get; set; }	/// [m3/h] detected Q_rise of a composed meter or 'sensitivity' of a single meter
 		public virtual double QFall				{ get; set; }	/// [m3/h] detected Q_fall of a composed meter
-		public virtual bool   Passed            { get; set; }
+        public virtual int    ErrorFlags        { get; set; }	/// bitfield : bit14=E15, bit15=E16
+        public virtual bool   Passed            { get; set; }
         public virtual int    ResultCode        { get; set; }
 		public virtual string ArchivePath		{ get; set; }
 		public virtual string Remark			{ get; set; }
@@ -55,6 +86,7 @@ namespace Results.Entities
 		public virtual string Producer()		  { return WaterMeterData.Producer; }
 		public virtual string MetrologicalClass() { return WaterMeterData.MetrologicalClass; }
 		public virtual string ApprovalInfo()	  { return WaterMeterData.ApprovalInfo; }
+		public virtual bool NewQnames()           { return WaterMeterData.NewQnames; }
 		public virtual double Q4_Qmax()			  { return WaterMeterData.Q4_Qmax; }
 		public virtual double Q3_Qn()			  { return WaterMeterData.Q3_Qn; }
 		public virtual double Q2_Qt()			  { return WaterMeterData.Q2_Qt; }
@@ -79,9 +111,39 @@ namespace Results.Entities
 		public virtual MeterTestRslt LastMeterTestRslts() { return lastMeterTestRslts; }
 
 
+        public virtual int ErrorFlagsFromTests(out ErrorFlagsMode errorFlagsMode)
+        {
+            int errorFlags = 0;
+            ErrorFlagsMode eFlagsMode = 0;  /// = ErrorFlagsMode.Off;
+            foreach (var mtr in MeterTestRslts)
+            {
+                if (mtr.TestDone) errorFlags |= mtr.TestRslt.ErrorFlags;
+                if ((int)mtr.TestRslt.ErrorFlagsMode() > (int)eFlagsMode) eFlagsMode = mtr.TestRslt.ErrorFlagsMode();
+            }
+            errorFlagsMode = eFlagsMode;    /// Maximum from all tests (=ErrorFlagsMode.On if at least one test is ErrorFlagsMode.On)
+            return errorFlags;
+        }
+
+        public virtual int ErrorFlagsFromTestsAndWM(out ErrorFlagsMode errorFlagsMode)
+        {
+            int eFlagsFromTests = ErrorFlagsFromTests(out errorFlagsMode) | ErrorFlags;
+            return (errorFlagsMode != ErrorFlagsMode.Off) ? (eFlagsFromTests | ErrorFlags) : 0;
+        }
+
+        public virtual string ErrorFlagstStr()
+        {
+            ErrorFlagsMode errorFlagsMode;
+            return Utils.ErrorFlagsStr(ErrorFlagsFromTestsAndWM(out errorFlagsMode));
+        }
+
         public virtual bool  PassedFromTests()
         {
+            ErrorFlagsMode eFlagsMode;
+            int eFlags = ErrorFlagsFromTestsAndWM(out eFlagsMode);
+
             bool passed = true;
+            if (eFlagsMode == ErrorFlagsMode.On && eFlags != 0) passed = false;
+
             foreach (var mtr in MeterTestRslts)
             {
                 if (mtr.Evaluate() && (!mtr.Passed || !mtr.TestDone))
@@ -90,6 +152,7 @@ namespace Results.Entities
                     break;
                 }
             }
+
             return passed;
         }
 
@@ -110,11 +173,7 @@ namespace Results.Entities
 
         public virtual string PassedColorStr()
         {
-#if PUCHONG_PT200
-			return Passed ? "OK|Green" : "NG|Red";
-#else
-            return Passed ? "OK|Green" : "NOK|Red";
-#endif
+            return Utils.PassedColorStr(Passed, true);
         }
 
 
@@ -201,6 +260,7 @@ namespace Results.Entities
 		    EndStateAux = src.EndStateAux;
 		    QRise = src.QRise;
 		    QFall = src.QFall;
+            ErrorFlags = src.ErrorFlags;
 		    Passed = src.Passed;
             ResultCode = src.ResultCode;
 			ArchivePath = src.ArchivePath;

Results/Entities/WaterMeterData.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016-2017 Sensus Metering Systems
+/// Copyright (c) 2015-2017 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -17,7 +17,8 @@ namespace Results.Entities
         public virtual double DN { get; set; }			                    /// [mm]
         public virtual double L { get; set; }			                    /// [mm]
         public virtual Config.Entities.Mounting Mounting { get; set; }	    /// H / V / S / F
-        
+
+		public virtual bool NewQnames { get; set; }							/// Yes = Q3...  No = Qn...
         public virtual double Q4_Qmax { get; set; }			                /// [m3/h]
 		public virtual double Q3_Qn { get; set; }			                /// [m3/h]
 		public virtual double Q2_Qt { get; set; }			                /// [m3/h]
@@ -73,6 +74,7 @@ namespace Results.Entities
             if (L != wmd.L) return false;
             if (Mounting != wmd.Mounting) return false;
 
+			if (NewQnames != wmd.NewQnames) return false;
             if (Q4_Qmax != wmd.Q4_Qmax) return false;
 			if (Q3_Qn   != wmd.Q3_Qn) return false;
 			if (Q2_Qt   != wmd.Q2_Qt) return false;

Results/Forms/BatchResultsDlg.cs

@@ -150,17 +150,17 @@ namespace Results.Forms
                 {
                     if (results.WaterMeters[i] != null && !results.WaterMeters[i].Disabled)
                     {
-                        if (TestsArrangement == TestsArrangement.Rows)
+                        ListView lview = (TestsArrangement == TestsArrangement.Rows)
+                                       ? GetResultsTestsAreRows(results.WaterMeters[i], i + 1)
+                                       : GetResultsTestsAreColumns(results.WaterMeters[i], i + 1);
+                        if (lview != null)
                         {
-                            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);
+                            flowLayoutPanel.Controls.Add(lview);
+                            if (first)
+                            {
+                                firstListView = lview;
+                                first = false;
+                            }
                         }
                     }
                 }
@@ -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 = items[i].Print(wMtr, mtr.Name());
+                        string str = item.Print(wMtr, mtr.Name());
 
                         string[] texts = str.Split(new char[] { '|' });
                         if (texts.Length == 1)

Results/Forms/ResultsConfigCtrl.Designer.cs

@@ -28,210 +28,211 @@
         /// </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;
-			// 
-			// 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();
+            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();
 
         }
 

Results/ItemID.cs

@@ -83,14 +83,14 @@ namespace Results
         Lite_per_pulse_Read,            /// 73
         Result_code,                    /// 74
         Remark,                         /// 75
-        T_Hi_mean,                     /// 76
-        T_Hi_start,                    /// 77
-        T_Hi_end,                      /// 78
-        T_Hi_avg,                      /// 79
-        T_Lo_mean,                     /// 80
-        T_Lo_start,                    /// 81
-        T_Lo_end,                      /// 82
-        T_Lo_avg,                      /// 83
+        T_Hi_mean,                      /// 76
+        T_Hi_start,                     /// 77
+        T_Hi_end,                       /// 78
+        T_Hi_avg,                       /// 79
+        T_Lo_mean,                      /// 80
+        T_Lo_start,                     /// 81
+        T_Lo_end,                       /// 82
+        T_Lo_avg,                       /// 83
 		P_delta_mean,                   /// 84
 		P_delta_start,                  /// 85
 		P_delta_end,                    /// 86
@@ -149,6 +149,69 @@ namespace Results
 		Buoyancy,						/// 132
 		Density_correction,				/// 133
 
+		ErrorFlags,						/// 134
+		E1,								/// 135
+		E2,								/// 136
+		E3,								/// 137
+		E4,								/// 138
+		E5,								/// 139
+		E6,								/// 140
+		E7,								/// 141
+		E8,								/// 142
+		E9,								/// 143
+		E10,							/// 144
+		E11,							/// 145
+		E12,							/// 146
+		E13,							/// 147
+		E14,							/// 148
+		E15,							/// 149
+		E16,							/// 150
+
+		Table_row_nr,					/// 151
+		Table_column_nr,				/// 152
+		WMRemark,                       /// 153
+
+        User_description,               /// 154
+        Legalizator,                    /// 155
+
+        Passed_meters_count,            /// 156
+        Failed_meters_count,            /// 157
+        Passed_seals_count,             /// 158
+
+        Diverter_start_time,            /// 159
+        Diverter_end_time,              /// 160
+        Q_sensitivity,                  /// 161
+                                    
+        Q_ref_min,                      /// 162
+        Q_ref_max,                      /// 163
+        Q_ref_start,                    /// 164
+        Q_ref_end,                      /// 165
+
+        Amb_temp_start_end,             /// 166
+        Amb_press_start_end,            /// 167
+        Amb_humi_start_end,             /// 168
+
+        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_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
+
         Count,
     }
 }

Results/Mappings/TestRsltMap.cs

@@ -40,6 +40,10 @@ namespace Results.Mappings
 			Map(x => x.VolumeCTV);
 			Map(x => x.VolumeMaster);
 			Map(x => x.ErrorMaster);
+            Map(x => x.DiverterStart);
+            Map(x => x.DiverterEnd);
+            Map(x => x.ErrorFlags);
+			Map(x => x.ErrorFlagsMd);
 #if HEAT_METERS
 			Map(x => x.RefEnergy);
 #endif

Results/Mappings/WaterMeterDataMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015 Sensus Metering Systems
+/// Copyright (c) 2015-2017 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Results.Entities;
@@ -18,6 +18,9 @@ namespace Results.Mappings
             Map(x => x.L);
             Map(x => x.Mounting);
 
+#if MUNICH && LANG_DE
+			Map(x => x.NewQnames);
+#endif
             Map(x => x.Q4_Qmax);
 			Map(x => x.Q3_Qn);
 			Map(x => x.Q2_Qt);

Results/Mappings/WaterMeterMap.cs

@@ -20,6 +20,7 @@ namespace Results.Mappings
 			Map(x => x.EndStateAux);
 			Map(x => x.QRise);
 			Map(x => x.QFall);
+            Map(x => x.ErrorFlags);
 			Map(x => x.Passed);
             Map(x => x.ResultCode);
 			Map(x => x.ArchivePath);

Results/Output/Printers/Enhanced/EnhancedPrintDocument.cs

@@ -27,7 +27,9 @@ 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
 										/// 
@@ -37,9 +39,10 @@ namespace Results.Output.Printers.Enhanced
 		/// <summary>
 		/// Property variable for the Font the user wishes to use
 		/// </summary>
-		Font font;
-		Font headerFont;
-		Font titleFont;
+        Font titleFont;
+        Font headerFont;
+        Font font;
+        Font footerFont;
 
 		///
 		/// Data to print
@@ -70,11 +73,12 @@ namespace Results.Output.Printers.Enhanced
 		/// Constructor
 		/// </summary>
 		/// <param name="textToPrint">Text to be printed</param>
-		public EnhancedPrintDocument(Results.Entities.Batch batch, EnhancedPrinterCfg cfg)
+		public EnhancedPrintDocument(Results.Entities.Batch batch, EnhancedPrinterCfg cfg, string documentName)
 		{
 			this.batch = batch;
-
 			this.cfg = cfg;
+            DocumentName = documentName;
+
 			topMargin = cfg.TopMargin;
 			bottomMargin = cfg.BottomMargin;
 			leftMargin = cfg.LeftMargin;
@@ -85,9 +89,10 @@ namespace Results.Output.Printers.Enhanced
 			footer = string.IsNullOrEmpty(cfg.Footer) ? string.Empty : cfg.Footer.Replace("~", Environment.NewLine);
 
 			/// Initialize fonts
-			titleFont = new Font(cfg.TitFntFml, cfg.TitFntSz, (FontStyle)cfg.TitFntSty);
-			headerFont = new Font(cfg.HdrFntFml, cfg.HdrFntSz, (FontStyle)cfg.HdrFntSty);
-			font = new Font(cfg.BodyFntFml, cfg.BodyFntSz, (FontStyle)cfg.BodyFntSty);
+			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);
@@ -107,6 +112,7 @@ 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;
@@ -160,11 +166,17 @@ namespace Results.Output.Printers.Enhanced
 			/// 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));
-			}
+            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));
+                }
+            }
 
 			/// Use the StringFormat class for the text layout of our document
 			StringFormat format = new StringFormat(StringFormatFlags.LineLimit);
@@ -216,7 +228,8 @@ namespace Results.Output.Printers.Enhanced
 			for (int wmNr = nextWMNr; wmNr < Math.Min(nextWMNr + nrWMsOnPage, batch.WaterMeters.Count); wmNr++)	/// wmNr is 0-based
 			{
 				int wmPosition = true ? batch.WaterMeters[wmNr].WMPosition : (wmNr + 1);
-				nextWmTop += PrintWM(e, batch.WaterMeters[wmNr], wmPosition, nextWmTop);
+                int sectionHght = PrintWM(e, batch.WaterMeters[wmNr], wmPosition, nextWmTop);
+                nextWmTop += sectionHght;
 			}
 
 			nextWMNr += nrWMsOnPage;
@@ -225,8 +238,8 @@ namespace Results.Output.Printers.Enhanced
 			///----------
 			///  Footer
 			///----------
-            int footerWidth = (int)e.Graphics.MeasureString(footer, font).Width;
-            PrintAt(e, leftMargin + (printWidth - footerWidth) / 2, topMargin + printHeight - 2 * SpacingOne, footer);
+            int footerWidth = (int)e.Graphics.MeasureString(footer, footerFont).Width;
+            PrintFooterAt(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;
@@ -296,9 +309,12 @@ namespace Results.Output.Printers.Enhanced
 			{
 				if ((mtr != null) && (mtr.Publish() == Config.Entities.Publish.Always))
 				{
-					testsCount++;
-					for (int i = 0; i < testItems.Count; i++)
+                    WMeterRsltItemSpec.TableRowNr = ++testsCount;
+
+                    for (int i = 0; i < testItems.Count; i++)
 					{
+                        WMeterRsltItemSpec.TableColumnNr = i + 1;
+
                         string itemText = testItems[i].Print(wm, mtr.Name());
 
 						/// Strip color information
@@ -327,8 +343,6 @@ 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);
@@ -340,12 +354,21 @@ 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);
+        }
+    }
 }

Results/Output/Printers/Enhanced/EnhancedPrinterCfg.cs

@@ -1,17 +1,14 @@
 ///
-/// Copyright (c) 2017 Sensus Metering Systems
+/// Copyright (c) 2017 Sensus Slovensko a.s.
 ///
-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 int TopMargin;
+        public string Template;
+        public int TopMargin;
 		public int BottomMargin;
 		public int LeftMargin;
 		public string TitFntFml;
@@ -23,11 +20,15 @@ namespace Results.Output.Printers.Enhanced
 		public string BodyFntFml;
 		public int BodyFntSz;
 		public int BodyFntSty;
-		public bool SupressPrinting;		/// Bypass printing when true
+        public string FooterFntFml;
+        public int FooterFntSz;
+        public int FooterFntSty;
+        public bool GoodOnly;
+        public bool SupressPrinting;		/// Bypass printing when true
 		public System.Globalization.CultureInfo CultureInfo;
-		public string[] CommonItems;
+        public string Header;				/// =Title
+        public string[] CommonItems;
 		public string[] TestItems;
-		public string Header;				/// =Title
 		public string Footer;
 	}
 }

Results/Output/Printers/Munich/MunichPrintDocument.cs

@@ -11,10 +11,10 @@ namespace Results.Output.Printers.Munich
 {
 	public class MunichPrintDocument : PrintDocument
 	{
-        const string FontFamilyName = "Arial";  //"Times New Roman";
+        const string FontFamilyName = "Arial";  ///"Times New Roman";
 
 		const int SpacingOne = 18;
-		const int SpacingOneAndHalf = (3 * SpacingOne) / 2;
+		const int SpacingOneAndHalf = 24;		/// was 27 before
 		const int TitleX = 240;
 		const int TitleY = 180;			/// Depends on the size of the header
 		const int FirstLineNr = 14;		/// Depends on the size of the header
@@ -38,10 +38,11 @@ namespace Results.Output.Printers.Munich
         readonly int resultsCount;
 		readonly bool compound;			/// true when MetersKind is MetersKind.Combined												
 										
-		readonly int secondTableOffset;	/// Calculated in the constructor
-
 		/// Top coordinate of the table
-		int top;
+		int nrPages;
+		int pageNr;
+		int firstTblTop;
+		int secondTblTop;
 
 		/// <summary>
 		/// Property variable for the Font the user wishes to use
@@ -85,7 +86,8 @@ namespace Results.Output.Printers.Munich
 			int resultsCount = wm.MeterTestRslts.Count;
 			if (compound) resultsCount /= 3;
 
-			secondTableOffset = (resultsCount + 2) * SpacingOneAndHalf;
+			pageNr = 1;
+			nrPages = (compound ? (resultsCount > 7) : (resultsCount > 9)) ? 2 : 1;
 
 			DefaultPageSettings.Landscape = (pageOrientation == PageOrientation.Landscape);
 		}
@@ -138,219 +140,279 @@ namespace Results.Output.Printers.Munich
 			/// Use the StringFormat class for the text layout of our document
 			StringFormat format = new StringFormat(StringFormatFlags.LineLimit);
 
-			RectangleF printArea = new RectangleF(TitleX, TitleY, 667, 50);
-			e.Graphics.DrawString(wm.Batch.ProtocolTitle, this.fontTitle, Brushes.Black, printArea);
-
 			int lineNr = FirstLineNr;
-            PrintAt(e, Tab1, lineNr * SpacingOne, docVersion);
-			lineNr++;
-			PrintBoldAt(e, Tab1, lineNr * SpacingOne, "Prüfstand Nr :");
-            PrintBoldAt(e, Tab2, lineNr * SpacingOne, wm.BenchId().ToString());
-            PrintBoldAt(e, Tab3, lineNr * SpacingOne, "Datum :");
-            PrintBoldAt(e, Tab4, lineNr * SpacingOne, wm.Batch.EndTime.Date.ToString("d"));
-			lineNr++;
-            PrintAt(e, Tab1, lineNr * SpacingOne, "Zählertyp :");
-			PrintAt(e, Tab2, lineNr * SpacingOne, zaehlertyp);
-			PrintAt(e, Tab3, lineNr * SpacingOne, "Eichjahr :");
-            PrintAt(e, Tab4, lineNr * SpacingOne, wm.YearOfProduction.ToString());
-			lineNr++;
-			PrintAt(e, Tab1, lineNr * SpacingOne, "Prüfvorlage :");
-			PrintAt(e, Tab2, lineNr * SpacingOne, pruefvorlage);
-			lineNr += 2;
 
-			if (compound)
+			if (pageNr == 1)
 			{
-                PrintBoldAt(e, Tab1, lineNr * SpacingOne, "Hauptzahler");
-                PrintBoldAt(e, Tab3, lineNr * SpacingOne, "Nebenzahler");
+				RectangleF printArea = new RectangleF(TitleX, TitleY, 667, 50);
+				e.Graphics.DrawString(wm.Batch.ProtocolTitle, this.fontTitle, Brushes.Black, printArea);
+
+				///
+				/// Common
+				/// 
+				PrintAt(e, Tab1, lineNr * SpacingOne, docVersion);
 				lineNr++;
-			}
-
-			PrintAt(e, Tab1, lineNr * SpacingOne, "Hersteller :");
-			PrintAt(e, Tab2, lineNr * SpacingOne,  wm.Producer());
-			if (compound)
-			{
-				PrintAt(e, Tab3, lineNr * SpacingOne, "Hersteller :");
-				PrintAt(e, Tab4, lineNr * SpacingOne, wm.ProducerAux());
-			}
-			lineNr++;
-
-			PrintAt(e, Tab1, lineNr * SpacingOne, "Seriennummer :");
-			PrintAt(e, Tab2, lineNr * SpacingOne, wm.SerialNr);
-			if (compound)
-			{
-				PrintAt(e, Tab3, lineNr * SpacingOne, "Seriennummer :");
-				PrintAt(e, Tab4, lineNr * SpacingOne, wm.SerialNrAux);
-			}
-			lineNr++;
-
-			PrintAt(e, Tab1, lineNr * SpacingOne, "Qn :");
-			PrintAt(e, Tab2, lineNr * SpacingOne, wm.Q3_Qn().ToString());
-			if (compound)
-			{
-				PrintAt(e, Tab3, lineNr * SpacingOne, "Qn :");
-                PrintAt(e, Tab4, lineNr * SpacingOne, wm.Q3_Qn_Aux().ToString());
-			}
-			lineNr++;
-
-			PrintAt(e, Tab1, lineNr * SpacingOne, "Zulassungszeichen :");
-			PrintAt(e, Tab2, lineNr * SpacingOne, wm.ApprovalInfo());
-			if (compound)
-			{
-				PrintAt(e, Tab3, lineNr * SpacingOne, "Zulassungszeichen :");
-				PrintAt(e, Tab4, lineNr * SpacingOne, wm.ApprovalInfoAux());
-			}
-			lineNr++;
-
-			PrintAt(e, Tab1, lineNr * SpacingOne, "Metr. klasse :");
-			PrintAt(e, Tab2, lineNr * SpacingOne, wm.MetrologicalClass());
-			if (compound)
-			{
-				PrintAt(e, Tab3, lineNr * SpacingOne, "Metr. klasse :");
-				PrintAt(e, Tab4, lineNr * SpacingOne, wm.MetrologicalClassAux());
-			}
-			lineNr++;
-
-			PrintAt(e, Tab1, lineNr * SpacingOne, "Stand :");
-			PrintAt(e, Tab2, lineNr * SpacingOne, wm.EndState);
-			if (compound)
-			{
-				PrintAt(e, Tab3, lineNr * SpacingOne, "Stand :");
-				PrintAt(e, Tab4, lineNr * SpacingOne, wm.EndStateAux);
-			
+				PrintBoldAt(e, Tab1, lineNr * SpacingOne, "Prüfstand Nr :");
+				PrintBoldAt(e, Tab2, lineNr * SpacingOne, wm.BenchId().ToString());
+				PrintBoldAt(e, Tab3, lineNr * SpacingOne, "Datum :");
+				PrintBoldAt(e, Tab4, lineNr * SpacingOne, wm.Batch.EndTime.Date.ToString("d"));
+				lineNr++;
+				PrintAt(e, Tab1, lineNr * SpacingOne, "Zählertyp :");
+				PrintAt(e, Tab2, lineNr * SpacingOne, zaehlertyp);
+				PrintAt(e, Tab3, lineNr * SpacingOne, "Eichjahr :");
+				PrintAt(e, Tab4, lineNr * SpacingOne, wm.YearOfProduction.ToString());
+				lineNr++;
+				PrintAt(e, Tab1, lineNr * SpacingOne, "Prüfvorlage :");
+				PrintAt(e, Tab2, lineNr * SpacingOne, pruefvorlage);
 				lineNr += 2;
-				PrintAt(e, Tab1, lineNr * SpacingOne, "Umschaltpunkte :");
+
+				if (compound)
+				{
+					PrintBoldAt(e, Tab1, lineNr * SpacingOne, "Hauptzahler");
+					PrintBoldAt(e, Tab3, lineNr * SpacingOne, "Nebenzahler");
+					lineNr++;
+				}
+
+				PrintAt(e, Tab1, lineNr * SpacingOne, "Hersteller :");
+				PrintAt(e, Tab2, lineNr * SpacingOne, wm.Producer());
+				if (compound)
+				{
+					PrintAt(e, Tab3, lineNr * SpacingOne, "Hersteller :");
+					PrintAt(e, Tab4, lineNr * SpacingOne, wm.ProducerAux());
+				}
 				lineNr++;
-				PrintAt(e, Tab1, lineNr * SpacingOne, "Qsteig");
-				PrintAt(e, Tab2, lineNr * SpacingOne, (1000.0 * wm.QRise).ToString("F1") + " l/h");
+
+				PrintAt(e, Tab1, lineNr * SpacingOne, "Seriennummer :");
+				PrintAt(e, Tab2, lineNr * SpacingOne, wm.SerialNr);
+				if (compound)
+				{
+					PrintAt(e, Tab3, lineNr * SpacingOne, "Seriennummer :");
+					PrintAt(e, Tab4, lineNr * SpacingOne, wm.SerialNrAux);
+				}
 				lineNr++;
-				PrintAt(e, Tab1, lineNr * SpacingOne, "Qfall");
-				PrintAt(e, Tab2, lineNr * SpacingOne, (1000.0 * wm.QFall).ToString("F1") + " l/h");
+
+				PrintAt(e, Tab1, lineNr * SpacingOne, wm.NewQnames() ? "Q3 :" : "Qn :");
+				PrintAt(e, Tab2, lineNr * SpacingOne, wm.Q3_Qn().ToString());
+				if (compound)
+				{
+					PrintAt(e, Tab3, lineNr * SpacingOne, wm.NewQnames() ?  "Q3 :" : "Qn :");
+					PrintAt(e, Tab4, lineNr * SpacingOne, wm.Q3_Qn_Aux().ToString());
+				}
+				lineNr++;
+
+				PrintAt(e, Tab1, lineNr * SpacingOne, "Zulassungszeichen :");
+				PrintAt(e, Tab2, lineNr * SpacingOne, wm.ApprovalInfo());
+				if (compound)
+				{
+					PrintAt(e, Tab3, lineNr * SpacingOne, "Zulassungszeichen :");
+					PrintAt(e, Tab4, lineNr * SpacingOne, wm.ApprovalInfoAux());
+				}
+				lineNr++;
+
+				PrintAt(e, Tab1, lineNr * SpacingOne, "Metr. klasse :");
+				PrintAt(e, Tab2, lineNr * SpacingOne, wm.MetrologicalClass());
+				if (compound)
+				{
+					PrintAt(e, Tab3, lineNr * SpacingOne, "Metr. klasse :");
+					PrintAt(e, Tab4, lineNr * SpacingOne, wm.MetrologicalClassAux());
+				}
+				lineNr++;
+
+				PrintAt(e, Tab1, lineNr * SpacingOne, "Stand :");
+				PrintAt(e, Tab2, lineNr * SpacingOne, wm.EndState);
+				if (compound)
+				{
+					PrintAt(e, Tab3, lineNr * SpacingOne, "Stand :");
+					PrintAt(e, Tab4, lineNr * SpacingOne, wm.EndStateAux);
+
+					lineNr += 2;
+					PrintAt(e, Tab1, lineNr * SpacingOne, "Umschaltpunkte :");
+					lineNr++;
+					PrintAt(e, Tab1, lineNr * SpacingOne, "Qsteig");
+					PrintAt(e, Tab2, lineNr * SpacingOne, (1000.0 * wm.QRise).ToString("F1") + " l/h");
+					lineNr++;
+					PrintAt(e, Tab1, lineNr * SpacingOne, "Qfall");
+					PrintAt(e, Tab2, lineNr * SpacingOne, (1000.0 * wm.QFall).ToString("F1") + " l/h");
+				}
+
+				lineNr += 2;
+				firstTblTop = SpacingOne * lineNr;
+
+				///
+				/// Table 1
+				///
+				PrintTableOne(e, firstTblTop);
+				DrawTableFrame(e, resultsCount + 1, firstTblTop);
 			}
 
-			lineNr += 2;
-			top = SpacingOne * lineNr;
 
-			PrintTable(e);
-			DrawTable(e);
+			if (pageNr == nrPages)
+			{
+				if (pageNr == 1)
+				{
+					secondTblTop = firstTblTop + (resultsCount + 2) * SpacingOneAndHalf;
+					lineNr += ((resultsCount + 2) * SpacingOneAndHalf * 2) / SpacingOne;
+				}
+				else
+				{
+					lineNr -= 3;
 
-			lineNr += (secondTableOffset * 2) / SpacingOne;
-			PrintAt(e, Tab1, lineNr * SpacingOne, "Temperatur");
-			PrintAt(e, Tab2, lineNr * SpacingOne, wm.Batch.AmbTempMean().ToString("F1") + " \x00b0C");
-			lineNr++;
-			PrintAt(e, Tab1, lineNr * SpacingOne, "Feuchtigkeit");
-			PrintAt(e, Tab2, lineNr * SpacingOne, wm.Batch.AmbHumiMean().ToString("F0") + " %");
-			lineNr++;
-			PrintAt(e, Tab1, lineNr * SpacingOne, "Luftdruck");
-			PrintAt(e, Tab2, lineNr * SpacingOne, Config.Units.ConvertTo(Config.Unit.mbar, wm.Batch.AmbPressMean()).ToString("F0") + " mbar");
+					if (compound)
+					{
+						PrintBoldAt(e, Tab1, lineNr * SpacingOne, "Hauptzahler");
+						PrintBoldAt(e, Tab3, lineNr * SpacingOne, "Nebenzahler");
+						lineNr++;
+					}
 
-			lineNr++;
-			PrintAt(e, Tab3, lineNr * SpacingOne, wm.Batch.EndTime.Date.ToString("d"));
-			lineNr ++;
-			PrintAt(e, Tab3, lineNr * SpacingOne, "Datum");
-			PrintAt(e, Tab4, lineNr * SpacingOne, "Unterschrift");
+					PrintAt(e, Tab1, lineNr * SpacingOne, "Hersteller :");
+					PrintAt(e, Tab2, lineNr * SpacingOne, wm.Producer());
+					if (compound)
+					{
+						PrintAt(e, Tab3, lineNr * SpacingOne, "Hersteller :");
+						PrintAt(e, Tab4, lineNr * SpacingOne, wm.ProducerAux());
+					}
+					lineNr++;
+
+					PrintAt(e, Tab1, lineNr * SpacingOne, "Seriennummer :");
+					PrintAt(e, Tab2, lineNr * SpacingOne, wm.SerialNr);
+					if (compound)
+					{
+						PrintAt(e, Tab3, lineNr * SpacingOne, "Seriennummer :");
+						PrintAt(e, Tab4, lineNr * SpacingOne, wm.SerialNrAux);
+					}
+					lineNr += ((resultsCount + 2) * SpacingOneAndHalf) / SpacingOne + 2;
+
+					secondTblTop = TitleY + (compound ? 5 : 4) * SpacingOne;
+				}
+
+				///
+				/// Table 2
+				///
+				PrintTableTwo(e, secondTblTop);
+				DrawTableFrame(e, resultsCount + 1, secondTblTop);
+
+				///
+				/// Footer
+				/// 
+				PrintAt(e, Tab1, lineNr * SpacingOne, "Temperatur");
+				PrintAt(e, Tab2, lineNr * SpacingOne, wm.Batch.AmbTempMean().ToString("F1") + " \x00b0C");
+				lineNr++;
+				PrintAt(e, Tab1, lineNr * SpacingOne, "Feuchtigkeit");
+				PrintAt(e, Tab2, lineNr * SpacingOne, wm.Batch.AmbHumiMean().ToString("F0") + " %");
+				lineNr++;
+				PrintAt(e, Tab1, lineNr * SpacingOne, "Luftdruck");
+				PrintAt(e, Tab2, lineNr * SpacingOne, Config.Units.ConvertTo(Config.Unit.mbar, wm.Batch.AmbPressMean()).ToString("F0") + " mbar");
+
+				lineNr++;
+				PrintAt(e, Tab3, lineNr * SpacingOne, wm.Batch.EndTime.Date.ToString("d"));
+				lineNr++;
+				PrintAt(e, Tab3, lineNr * SpacingOne, "Datum");
+				PrintAt(e, Tab4, lineNr * SpacingOne, "Unterschrift");
+			}
+
+			e.HasMorePages = (pageNr != nrPages);
+			pageNr++;
 		}
 
 		/// <summary>
 		/// Print table texts.
 		/// </summary>
-		void PrintTable(System.Drawing.Printing.PrintPageEventArgs e)
+		void PrintTableOne(System.Drawing.Printing.PrintPageEventArgs e, int tblTop)
 		{
-			PrintAt(e, FromTest(-1, -1), "Prüflauf");
-			PrintAt(e, FromTest(-1, 0), "Q [l/h]");
-			PrintAt(e, FromTest(-1, 1), "Prüf-Vol.[l]");
-			PrintAt(e, FromTest(-1, 2), compound ? "HZ-Vol.[l]" : "Z-Vol.[l]");
-			PrintAt(e, FromTest(-1, 3), compound ? "NZ-Vol.[l]" : "-");
-			PrintAt(e, FromTest(-1, 4), "Fehler [%]");
-			PrintAt(e, FromTest(-1, 5), "Ergebnis");
+			PrintAt(e, GetTabItemPos(0, 0, tblTop), "Prüflauf");
+			PrintAt(e, GetTabItemPos(0, 1, tblTop), "Q [l/h]");
+			PrintAt(e, GetTabItemPos(0, 2, tblTop), "Prüf-Vol.[l]");
+			PrintAt(e, GetTabItemPos(0, 3, tblTop), compound ? "HZ-Vol.[l]" : "Z-Vol.[l]");
+			PrintAt(e, GetTabItemPos(0, 4, tblTop), compound ? "NZ-Vol.[l]" : "-");
+			PrintAt(e, GetTabItemPos(0, 5, tblTop), "Fehler [%]");
+			PrintAt(e, GetTabItemPos(0, 6, tblTop), "Ergebnis");
 
-			PrintAt(e, FromTest(-1, 6), "Q [l/h]");
-			PrintAt(e, FromTest(-1, 7), "Temperatur");
-			PrintAt(e, FromTest(-1, 8), "Dichte");
-			PrintAt(e, FromTest(-1, 9), "Prüfzeit");
-			PrintAt(e, FromTest(-1, 10), "Druck Eing.");
-			PrintAt(e, FromTest(-1, 11), "Druck Ausg.");
-
-			int rowCnt = 0;
+			int rowCnt = 1;
 			foreach (var mtr in wm.MeterTestRslts) 
 			{
 				if (!compound || mtr.CompoundMeterId == (byte)CompoundMeterId.Compound)
 				{
-					Point p = FromTest(rowCnt, -1);
-					PrintAt(e, p.X, p.Y, mtr.Name());
-					PrintAt(e, p.X, p.Y + (resultsCount + 2) * SpacingOneAndHalf, mtr.Name());
-
-					PrintAt(e, FromTest(rowCnt, 0), mtr.TestRslt.FlowMass.ToString("F1"));
-					PrintAt(e, FromTest(rowCnt, 1), mtr.TestRslt.VolumeCTV.ToString("F2"));
+					PrintAt(e, GetTabItemPos(rowCnt, 0, tblTop), mtr.Name());
+					PrintAt(e, GetTabItemPos(rowCnt, 1, tblTop), mtr.TestRslt.FlowMass.ToString("F1"));
+					PrintAt(e, GetTabItemPos(rowCnt, 2, tblTop), mtr.TestRslt.VolumeCTV.ToString("F2"));
 					if (compound)
 					{
 						Results.Entities.MeterTestRslt mainMtr = wm.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundMain);
 						Results.Entities.MeterTestRslt auxMtr = wm.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundAux);
 
-						PrintAt(e, FromTest(rowCnt, 2), mainMtr.VolumeMeter.ToString("F2"));
-						PrintAt(e, FromTest(rowCnt, 3), auxMtr.VolumeMeter.ToString("F2"));
-						PrintAt(e, FromTest(rowCnt, 4), mtr.Error.ToString("F2"));
-						PrintAt(e, FromTest(rowCnt, 5), mtr.Passed ? "iO" : "NiO");
+						PrintAt(e, GetTabItemPos(rowCnt, 3, tblTop), mainMtr.VolumeMeter.ToString("F2"));
+						PrintAt(e, GetTabItemPos(rowCnt, 4, tblTop), auxMtr.VolumeMeter.ToString("F2"));
+						PrintAt(e, GetTabItemPos(rowCnt, 5, tblTop), mtr.Error.ToString("F2"));
+						PrintAt(e, GetTabItemPos(rowCnt, 6, tblTop), mtr.Passed ? "iO" : "NiO");
 					}
 					else
 					{
-						PrintAt(e, FromTest(rowCnt, 2), mtr.VolumeMeter.ToString("F2"));
-						PrintAt(e, FromTest(rowCnt, 3), "-");
-						PrintAt(e, FromTest(rowCnt, 4), mtr.Error.ToString("F2"));
-						PrintAt(e, FromTest(rowCnt, 5), mtr.Passed ? "iO" : "NiO");
+						PrintAt(e, GetTabItemPos(rowCnt, 3, tblTop), mtr.VolumeMeter.ToString("F2"));
+						PrintAt(e, GetTabItemPos(rowCnt, 4, tblTop), "-");
+						PrintAt(e, GetTabItemPos(rowCnt, 5, tblTop), mtr.Error.ToString("F2"));
+						PrintAt(e, GetTabItemPos(rowCnt, 6, tblTop), mtr.Passed ? "iO" : "NiO");
 					}
-					PrintAt(e, FromTest(rowCnt, 6), mtr.TestRslt.FlowMass.ToString("F1"));
-					PrintAt(e, FromTest(rowCnt, 7), mtr.TestRslt.TempDownMean.ToString("F2"));
-					PrintAt(e, FromTest(rowCnt, 8), mtr.TestRslt.DensityDiv.ToString("F2"));
-					PrintAt(e, FromTest(rowCnt, 9), mtr.TestTime.ToString("F1"));
-					PrintAt(e, FromTest(rowCnt, 10), Config.Units.ConvertTo(Config.Unit.bar, mtr.TestRslt.PressUpMean).ToString("F3"));
-					PrintAt(e, FromTest(rowCnt, 11), Config.Units.ConvertTo(Config.Unit.bar, mtr.TestRslt.PressDownMean).ToString("F3"));
 
                     rowCnt++;
 				}
 			}
 		}
 
+		void PrintTableTwo(System.Drawing.Printing.PrintPageEventArgs e, int tblTop)
+		{
+			PrintAt(e, GetTabItemPos(0, 1, tblTop), "Q [l/h]");
+			PrintAt(e, GetTabItemPos(0, 2, tblTop), "Temperatur");
+			PrintAt(e, GetTabItemPos(0, 3, tblTop), "Dichte");
+			PrintAt(e, GetTabItemPos(0, 4, tblTop), "Prüfzeit");
+			PrintAt(e, GetTabItemPos(0, 5, tblTop), "Druck Eing.");
+			PrintAt(e, GetTabItemPos(0, 6, tblTop), "Druck Ausg.");
+
+			int rowCnt = 1;
+			foreach (var mtr in wm.MeterTestRslts)
+			{
+				if (!compound || mtr.CompoundMeterId == (byte)CompoundMeterId.Compound)
+				{
+					Point p = GetTabItemPos(rowCnt, 0, tblTop);
+					PrintAt(e, p.X, p.Y, mtr.Name());
+
+					PrintAt(e, GetTabItemPos(rowCnt, 1, tblTop), mtr.TestRslt.FlowMass.ToString("F1"));
+					PrintAt(e, GetTabItemPos(rowCnt, 2, tblTop), mtr.TestRslt.TempDownMean.ToString("F2"));
+					PrintAt(e, GetTabItemPos(rowCnt, 3, tblTop), mtr.TestRslt.DensityDiv.ToString("F2"));
+					PrintAt(e, GetTabItemPos(rowCnt, 4, tblTop), mtr.TestTime.ToString("F1"));
+					PrintAt(e, GetTabItemPos(rowCnt, 5, tblTop), Config.Units.ConvertTo(Config.Unit.bar, mtr.TestRslt.PressUpMean).ToString("F3"));
+					PrintAt(e, GetTabItemPos(rowCnt, 6, tblTop), Config.Units.ConvertTo(Config.Unit.bar, mtr.TestRslt.PressDownMean).ToString("F3"));
+
+					rowCnt++;
+				}
+			}
+		}
+
 		/// <summary>
 		/// Draw table lines.
 		/// </summary>
-		void DrawTable(System.Drawing.Printing.PrintPageEventArgs e)
+		void DrawTableFrame(System.Drawing.Printing.PrintPageEventArgs e, int rowsCount, int tblTop)
 		{
-			int mid = top + SpacingOneAndHalf;
-			int bot = top + (resultsCount + 1) * SpacingOneAndHalf;
-
-			int top2 = top + secondTableOffset;
-			int mid2 = mid + secondTableOffset;
-			int bot2 = bot + secondTableOffset;
+			int t = tblTop;
+			int m = tblTop + SpacingOneAndHalf;
+			int b = tblTop + rowsCount * SpacingOneAndHalf;
 
 			// Horizontal lines
-			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(80, top), new Point(747, top));
-			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(80, mid), new Point(747, mid));
-			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(80, bot), new Point(747, bot));
-
-			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(80, top2), new Point(747, top2));
-			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(80, mid2), new Point(747, mid2));
-			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(80, bot2), new Point(747, bot2));
+			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(80, t), new Point(747, t));
+			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(80, m), new Point(747, m));
+			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(80, b), new Point(747, b));
 
 			// Vertical lines
-			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point( 80, top), new Point( 80, bot));
-			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(267, top), new Point(267, bot));
-			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(347, top), new Point(347, bot));
-			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(427, top), new Point(427, bot));
-			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(507, top), new Point(507, bot));
-			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(587, top), new Point(587, bot));
-			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(667, top), new Point(667, bot));
-			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(747, top), new Point(747, bot));
-
-			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point( 80, top2), new Point( 80, bot2));
-			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(267, top2), new Point(267, bot2));
-			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(347, top2), new Point(347, bot2));
-			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(427, top2), new Point(427, bot2));
-			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(507, top2), new Point(507, bot2));
-			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(587, top2), new Point(587, bot2));
-			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(667, top2), new Point(667, bot2));
-			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(747, top2), new Point(747, bot2));
+			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point( 80, t), new Point( 80, b));
+			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(267, t), new Point(267, b));
+			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(347, t), new Point(347, b));
+			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(427, t), new Point(427, b));
+			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(507, t), new Point(507, b));
+			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(587, t), new Point(587, b));
+			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(667, t), new Point(667, b));
+			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(747, t), new Point(747, b));
 		}
 
+
 		void PrintAt(System.Drawing.Printing.PrintPageEventArgs e, Point p, string text)
 		{
 			PrintAt(e, p.X, p.Y, text);
@@ -373,16 +435,16 @@ namespace Results.Output.Printers.Munich
             e.Graphics.DrawString(text, this.boldFont, Brushes.Black, printArea);
         }
 
-        Point FromTest(int testNr, int parNr)
+		/// <summary>
+		/// Get text position form a number of the test and a number of the parameter.
+		/// </summary>
+		/// <param name="row"></param>
+		/// <param name="column">Table column (0-based)</param>
+		/// <returns></returns>
+        Point GetTabItemPos(int row, int column, int tblTop)
 		{
-			const int NrParamsInOneTableRow = 6;
-
-			int x = 267 + (parNr % NrParamsInOneTableRow) * 80 + MarginLeft;
-			int y = top + SpacingOneAndHalf + MarginTop + testNr * SpacingOneAndHalf
-				  + ((parNr >= NrParamsInOneTableRow) ? secondTableOffset : 0);
-
-			if (parNr < 0) x = 80 + MarginLeft;		/// When parNr == -1 return the left column x coordinate
-
+			int x = MarginLeft + ((column == 0) ? 80 : 187) + column * 80;	/// leftmost column is wider
+			int y = MarginTop + tblTop + (row * SpacingOneAndHalf) - 2;
 			return new Point(x, y);
 		}
 	}

Results/Output/Printers/OnePagePerMeter/EnhancedPrintDocument.cs

@@ -1,351 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Metering Systems
-///
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Printing;
-using System.IO;
-using Config.Entities;
-using Results.Resources;
-
-namespace Results.Output.Printers.OnePagePerMeter
-{
-	public class EnhancedPrintDocument : PrintDocument
-	{
-		/// Size of the printed area without margins, after taking into account 'pageOrientation'
-		readonly int printHeight;
-		readonly int printWidth;
-
-		readonly int topMargin;
-		readonly int bottomMargin;
-		readonly int leftMargin;
-		readonly int TitleX;
-		readonly int TitleY;			/// Depends on the size of the header
-
-		readonly int SpacingOne;
-		readonly int SpacingOneAndHalf;
-		readonly int SpacingOne4Header;
-		readonly int SpacingOneAndHalf4Header;
-		
-		int CommonTop;			/// = TitleY + 60
-		int BodyTop;			/// = HdrTop + 160
-										/// 
-		int titleHeight;
-		int commonHeight;
-
-		/// <summary>
-		/// Property variable for the Font the user wishes to use
-		/// </summary>
-		Font font;
-		Font headerFont;
-		Font titleFont;
-
-		///
-		/// Data to print
-		///
-		Results.Entities.Batch batch;
-
-		EnhancedPrinterCfg cfg;
-
-		///
-		/// Items to print
-		///
-        string header;
-        IList<WMeterRsltItemSpec> commonItems;
-        IList<WMeterRsltItemSpec> testItems;
-        string footer;
-
-		///
-		/// Layout and status
-		///
-		int nrWMsOnFirstPage;
-		int nrWMsOnNextPage;
-		int nextWMNr;				/// nr. of watermeter to be printed as the first one on the next page
-		int nrPages;
-		int pageNr;					/// Page number to be printed at the bottom of the page
-
-
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="textToPrint">Text to be printed</param>
-		public EnhancedPrintDocument(Results.Entities.Batch batch, EnhancedPrinterCfg cfg)
-		{
-			this.batch = batch;
-
-			this.cfg = cfg;
-			topMargin = cfg.TopMargin;
-			bottomMargin = cfg.BottomMargin;
-			leftMargin = cfg.LeftMargin;
-
-			header = string.IsNullOrEmpty(cfg.Header) ? string.Empty : cfg.Header.Replace("~", Environment.NewLine);
-			commonItems = Results.WMeterRsltItemSpec.FromStrArray(cfg.CommonItems);
-			testItems = Results.WMeterRsltItemSpec.FromStrArray(cfg.TestItems);		/// TestID info will be overwritten later on
-			footer = string.IsNullOrEmpty(cfg.Footer) ? string.Empty : cfg.Footer.Replace("~", Environment.NewLine);
-
-			/// Initialize fonts
-			titleFont = new Font(cfg.TitFntFml, cfg.TitFntSz, (FontStyle)cfg.TitFntSty);
-			headerFont = new Font(cfg.HdrFntFml, cfg.HdrFntSz, (FontStyle)cfg.HdrFntSty);
-			font = new Font(cfg.BodyFntFml, cfg.BodyFntSz, (FontStyle)cfg.BodyFntSty);
-
-			/// Set print area size and margins (in dots using 100 dpi)
-			DefaultPageSettings.Landscape = (cfg.PageOrientation == PageOrientation.Landscape);
-			///
-			if (DefaultPageSettings.Landscape)
-			{
-				printHeight = base.DefaultPageSettings.PaperSize.Width - topMargin - bottomMargin;
-				printWidth = base.DefaultPageSettings.PaperSize.Height - leftMargin - leftMargin;
-			}
-			else
-			{
-				printHeight = base.DefaultPageSettings.PaperSize.Height - topMargin - bottomMargin;
-				printWidth = base.DefaultPageSettings.PaperSize.Width - leftMargin - leftMargin;
-			}
-
-			SpacingOne = System.Windows.Forms.TextRenderer.MeasureText("Abcgq", font).Height;
-			SpacingOneAndHalf = (3 * SpacingOne) / 2;
-			SpacingOne4Header = System.Windows.Forms.TextRenderer.MeasureText("Abcgq", headerFont).Height;
-			SpacingOneAndHalf4Header = (3 * SpacingOne4Header) / 2;
-
-			/// Calculate the tests count
-			int testsCount = 0;
-			if (batch.WaterMeters.Count > 0)
-			{
-				foreach (var mtr in batch.WaterMeters[0].MeterTestRslts)
-				{
-					if (mtr.Publish() == Config.Entities.Publish.Always && mtr.IsPilotRslt()) testsCount++;
-				}
-			}
-
-			/// Prepare document outline
-			TitleX = cfg.LeftMargin;
-			TitleY = cfg.TopMargin;
-
-			titleHeight = System.Windows.Forms.TextRenderer.MeasureText(header, titleFont).Height;
-			CommonTop = TitleY + titleHeight + SpacingOne4Header;
-
-			commonHeight = commonItems.Count * SpacingOne;
-			BodyTop = CommonTop + commonHeight + SpacingOne4Header;
-
-			int wmSectionHeight = (testsCount + 1) * SpacingOne + 3 * SpacingOne4Header;
-
-			nrWMsOnFirstPage = (printHeight - BodyTop + TitleY - 2 * SpacingOne) / wmSectionHeight;
-			nrWMsOnNextPage = (printHeight - 2 * SpacingOne) / wmSectionHeight;
-			nrWMsOnNextPage = Math.Max(nrWMsOnNextPage, 1); /// Prevent division by zero if there are too many WM tests
-
-			nrPages = 1 + (batch.WaterMeters.Count - nrWMsOnFirstPage + nrWMsOnNextPage - 1) / nrWMsOnNextPage;
-
-			pageNr = 1;
-			nextWMNr = 0;
-		}
-
-		/// <summary>
-		/// Override the default onbeginPrint method of the PrintDocument Object
-		/// </summary>
-		/// <param name=e></param>
-		/// <remarks></remarks>
-		protected override void OnBeginPrint(System.Drawing.Printing.PrintEventArgs e)
-		{
-			base.OnBeginPrint(e);
-		}
-
-		/// <summary>
-		/// Override the default OnPrintPage method of the PrintDocument.
-		/// </summary>
-		/// <param name=e></param>
-		/// <remarks>This provides the print logic for our document</remarks>
-		protected override void OnPrintPage(System.Drawing.Printing.PrintPageEventArgs e)
-		{
-			/// Run base code
-			base.OnPrintPage(e);
-
-			if (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
-				///----------
-				RectangleF printArea = new RectangleF(TitleX, TitleY, printWidth, titleHeight);
-				e.Graphics.DrawString(header, titleFont, Brushes.Black, printArea);
-
-                ///----------------
-                ///  Common items
-                ///----------------
-                string[] leftColumn = new string[commonItems.Count];
-                string[] rightColumn = new string[commonItems.Count];
-
-                int cnt = 0;
-                foreach (var v in commonItems)
-                {
-                    leftColumn[cnt] = v.Caption;
-                    rightColumn[cnt] = (batch.WaterMeters.Count > 0) ? v.Print(batch.WaterMeters[0]) : string.Empty;
-                    cnt++;
-                }
-
-				/// Determine max. left column width in characters
-				int maxLen = 0;
-				foreach (var s in leftColumn) if (s.Length > maxLen) maxLen = s.Length;
-
-				/// Write aligned columns
-				for (int i = 0; i < Math.Min(leftColumn.Length, rightColumn.Length); i++)
-				{
-					PrintAt(e, leftMargin, CommonTop + SpacingOne * i, leftColumn[i]);
-					PrintAt(e, 300, CommonTop + SpacingOne * i, rightColumn[i]);
-				}
-			}
-
-			///--------
-			///  Body
-			///--------
-
-			/// This variable represents the top coordinate of the area where WM results are printed
-			/// and it is updated (increased by) the value returned by PrintXyzWM() - the section size. 
-			int nextWmTop = (pageNr == 1) ? BodyTop : TitleY;
-
-			int nrWMsOnPage = (pageNr == 1) ? nrWMsOnFirstPage : nrWMsOnNextPage;
-
-			for (int wmNr = nextWMNr; wmNr < Math.Min(nextWMNr + nrWMsOnPage, batch.WaterMeters.Count); wmNr++)	/// wmNr is 0-based
-			{
-				int wmPosition = true ? batch.WaterMeters[wmNr].WMPosition : (wmNr + 1);
-				nextWmTop += PrintWM(e, batch.WaterMeters[wmNr], wmPosition, nextWmTop);
-			}
-
-			nextWMNr += nrWMsOnPage;
-			e.HasMorePages = (nextWMNr < batch.WaterMeters.Count);
-
-			///----------
-			///  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;
-            PrintAt(e, leftMargin + (printWidth - pageNrWidth) / 2, topMargin + printHeight - SpacingOne, pageNrText);
-		}
-
-
-		/// <summary>
-		/// Print one water meter results
-		/// </summary>
-		/// <param name="wm">Water meter</param>
-		/// <param name="printedWMNr">Number of the water meter printed</param>
-		/// <param name="top">Top coordinate of watermeter data</param>
-		/// <returns>The height of the printed section</returns>
-		int PrintWM(System.Drawing.Printing.PrintPageEventArgs e,
-					Results.Entities.WaterMeter wm, int printedWMNr, int top)
-		{
-			/// Determin column widths
-			float[] columnPos = new float[testItems.Count + 1];
-			columnPos[0] = (float)leftMargin;
-
-			for (int i = 0; i < testItems.Count; i++)
-			{
-				float columnWidth = e.Graphics.MeasureString(testItems[i].Caption, headerFont).Width;
-				foreach (var mtr in wm.MeterTestRslts)
-				{
-                    if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
-                    {
-                        string itemText = testItems[i].Print(wm, mtr.Name());
-
-                        /// Strip color information
-                        string[] texts = itemText.Split(new char[] { '|' });
-                        if (texts.Length == 2) { itemText = texts[0]; }
-
-                        float width = e.Graphics.MeasureString(itemText, font).Width;
-                        if (width > columnWidth) columnWidth = width;
-                    }
-				}
-				columnPos[i + 1] = columnPos[i] + columnWidth + 20.0f;
-			}
-			int tableLeftX = (int)columnPos[0];
-			int tableRightX = (int)columnPos[testItems.Count] - 20;
-
-			string wmText = string.Format("{0} {1}", Strings.Water_Meter, printedWMNr);
-			PrintHeaderAt(e, leftMargin, top, wmText);
-			if (!string.IsNullOrEmpty(wm.SerialNr))
-			{
-				PrintHeaderAt(e, leftMargin + (int)e.Graphics.MeasureString(wmText, headerFont).Width, top,
-						string.Format("  {0} = {1}", Strings.sn, wm.SerialNr));
-			}
-
-			/// Horizontal line
-			int horY = top + SpacingOneAndHalf4Header;
-			e.Graphics.DrawLine(new Pen(Color.Black, 2), new Point(tableLeftX, horY), new Point(tableRightX, horY));
-
-			for (int i = 0; i < testItems.Count; i++)
-			{
-				PrintHeaderAt(e, (int)columnPos[i], top + (int)(1.6 * SpacingOne4Header), testItems[i].Caption);
-			}
-
-			/// Horizontal line
-			horY = top + (int)(2.8 * SpacingOne4Header);
-			e.Graphics.DrawLine(new Pen(Color.Black, 2), new Point(tableLeftX, horY), new Point(tableRightX, horY));
-
-			int testsCount = 0;
-			foreach (var mtr in wm.MeterTestRslts)
-			{
-				if ((mtr != null) && (mtr.Publish() == Config.Entities.Publish.Always))
-				{
-					testsCount++;
-					for (int i = 0; i < testItems.Count; i++)
-					{
-                        string itemText = testItems[i].Print(wm, mtr.Name());
-
-						/// Strip color information
-						string[] texts = itemText.Split(new char[] { '|' });
-						if (texts.Length == 2)
-						{
-							itemText = texts[0];
-							Color color = texts[1].Equals("Green") ? Color.Green : (texts[1].Equals("Red") ? Color.Red : Color.White);
-							/// TODO: How to print colors?
-						}
-
-						PrintAt(e, (int)columnPos[i], top + 2 * SpacingOne4Header + SpacingOne * testsCount, itemText);
-					}
-				}
-			}
-
-			/// Horizontal line
-			horY = top + 2 * SpacingOneAndHalf4Header + SpacingOne * testsCount;
-			e.Graphics.DrawLine(new Pen(Color.Black, 2), new Point(tableLeftX, horY), new Point(tableRightX, horY));
-
-			return (testsCount + 1) * SpacingOne + 3 * SpacingOne4Header;
-		}
-
-
-		void PrintAt(System.Drawing.Printing.PrintPageEventArgs e, Point p, string text)
-		{
-			PrintAt(e, p.X, p.Y, text);
-		}
-
-
-		void PrintAt(System.Drawing.Printing.PrintPageEventArgs e, int x, int y, string text)
-		{
-			RectangleF printArea = new RectangleF(x, y, 2000, SpacingOne);
-			e.Graphics.DrawString(text, this.font, Brushes.Black, printArea);
-		}
-
-
-		void PrintHeaderAt(System.Drawing.Printing.PrintPageEventArgs e, Point p, string text)
-		{
-			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);
-		}
-	}
-}

Results/Output/Printers/OnePagePerMeter/EnhancedPrinterCfg.cs

@@ -1,33 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Metering Systems
-///
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Results.Output.Printers.OnePagePerMeter
-{
-	public class EnhancedPrinterCfg
-	{
-		public Config.Entities.PageOrientation PageOrientation;
-		public int TopMargin;
-		public int BottomMargin;
-		public int LeftMargin;
-		public string TitFntFml;
-		public int TitFntSz;
-		public int TitFntSty;
-		public string HdrFntFml;
-		public int HdrFntSz;
-		public int HdrFntSty;
-		public string BodyFntFml;
-		public int BodyFntSz;
-		public int BodyFntSty;
-		public bool SupressPrinting;		/// Bypass printing when true
-		public System.Globalization.CultureInfo CultureInfo;
-		public string[] CommonItems;
-		public string[] TestItems;
-		public string Header;				/// =Title
-		public string Footer;
-	}
-}

Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs

@@ -0,0 +1,477 @@
+///
+/// Copyright (c) 2017 Sensus Metering Systems
+///
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Printing;
+using System.IO;
+using Config.Entities;
+using Results.Resources;
+
+namespace Results.Output.Printers.OnePerMeter
+{
+	public class OnePerMeterPrintDocument : PrintDocument
+	{
+        const float GapBetweenTableColumns = 10;
+        const float GapBetweenCommonColumns = 10;
+
+		/// Size of the printed area without margins, after taking into account 'pageOrientation'
+		readonly int printHeight;
+		readonly int printWidth;
+
+		readonly int topMargin;
+		readonly int bottomMargin;
+		readonly int leftMargin;
+		readonly int TitleX;
+		readonly int TitleY;			/// Depends on the size of the header
+
+		readonly int spacingOne;
+		readonly int spacingOne4Header;
+		
+		float commonTop;			/// = TitleY + 60
+		float bodyTop;			/// = HdrTop + 160
+										/// 
+		float titleHeight;
+		float commonHeight;
+
+		/// <summary>
+		/// Property variable for the Font the user wishes to use
+		/// </summary>
+        Font titleFont;
+        Font headerFont;
+        Font font;
+        Font footerFont;
+
+		///
+		/// Data to print
+		///
+		Results.Entities.Batch batch;
+		OnePerMeterPrinterCfg cfg;
+        Results.Entities.WaterMeter wm;
+
+		///
+		/// Items to print
+		///
+        string header;
+        IList<WMeterRsltItemSpec> commonItems;
+        IList<WMeterRsltItemSpec> testItems;
+        IList<WMeterRsltItemSpec> testItems2;
+        string footer;
+
+		int nrPages;
+		int pageNr;					/// Page number to be printed at the bottom of the page
+
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		/// <param name="textToPrint">Text to be printed</param>
+        public OnePerMeterPrintDocument(Results.Entities.Batch batch, OnePerMeterPrinterCfg cfg, Results.Entities.WaterMeter wm, string documentName)
+		{
+			this.batch = batch;
+			this.cfg = cfg;
+            this.wm = wm;
+            DocumentName = documentName;
+
+			topMargin = cfg.TopMargin;
+			bottomMargin = cfg.BottomMargin;
+			leftMargin = cfg.LeftMargin;
+
+			header = string.IsNullOrEmpty(cfg.Header) ? string.Empty : cfg.Header.Replace("~", Environment.NewLine);
+			commonItems = Results.WMeterRsltItemSpec.FromStrArray(cfg.CommonItems);
+			testItems = Results.WMeterRsltItemSpec.FromStrArray(cfg.TestItems);		    /// TestID info will be overwritten later on
+            testItems2 = Results.WMeterRsltItemSpec.FromStrArray(cfg.TestItems2);	    /// TestID info will be overwritten later on
+            footer = string.IsNullOrEmpty(cfg.Footer) ? string.Empty : cfg.Footer.Replace("~", Environment.NewLine);
+
+			/// Initialize fonts
+			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);
+			///
+			if (DefaultPageSettings.Landscape)
+			{
+				printHeight = base.DefaultPageSettings.PaperSize.Width - topMargin - bottomMargin;
+				printWidth = base.DefaultPageSettings.PaperSize.Height - leftMargin - leftMargin;
+			}
+			else
+			{
+				printHeight = base.DefaultPageSettings.PaperSize.Height - topMargin - bottomMargin;
+				printWidth = base.DefaultPageSettings.PaperSize.Width - leftMargin - leftMargin;
+			}
+
+			spacingOne = System.Windows.Forms.TextRenderer.MeasureText("Abcgq", font).Height;
+			spacingOne4Header = System.Windows.Forms.TextRenderer.MeasureText("Abcgq", headerFont).Height;
+
+            /// Prepare document outline
+            TitleX = cfg.LeftMargin;
+            TitleY = cfg.TopMargin;
+
+			pageNr = 1;
+            nrPages = (testItems2.Count != 0) ? 2 : 1;
+        }
+
+		/// <summary>
+		/// Override the default onbeginPrint method of the PrintDocument Object
+		/// </summary>
+		/// <param name=e></param>
+		/// <remarks></remarks>
+		protected override void OnBeginPrint(System.Drawing.Printing.PrintEventArgs e)
+		{
+			base.OnBeginPrint(e);
+		}
+
+		/// <summary>
+		/// Override the default OnPrintPage method of the PrintDocument.
+		/// </summary>
+		/// <param name=e></param>
+		/// <remarks>This provides the print logic for our document</remarks>
+		protected override void OnPrintPage(System.Drawing.Printing.PrintPageEventArgs e)
+		{
+            /// Run base code
+            base.OnPrintPage(e);
+
+            if (!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;
+
+				///
+				///  Title
+				///
+				RectangleF printArea = new RectangleF(TitleX, TitleY, printWidth, titleHeight);
+				e.Graphics.DrawString(header, titleFont, Brushes.Black, printArea);
+	
+	            ///
+	            ///  Common items
+	            ///
+	            string[] leftColumn = new string[commonItems.Count];
+	            string[] rightColumn = new string[commonItems.Count];
+	
+	            int cnt = 0;
+	            foreach (var v in commonItems)
+	            {
+	                leftColumn[cnt] = v.Caption;
+	                rightColumn[cnt] = (batch.WaterMeters.Count > 0) ? v.Print(batch.WaterMeters[0]) : string.Empty;
+	                cnt++;
+	            }
+	
+				/// Determine left column width
+                float maxWidth = 0;
+                foreach (var str in leftColumn)
+                {
+                    float width = e.Graphics.MeasureString(str, font).Width;
+                    if (width > maxWidth) maxWidth = width;
+                }
+	
+				/// Write aligned columns
+				for (int i = 0; i < Math.Min(leftColumn.Length, rightColumn.Length); i++)
+				{
+                    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
+			///
+            if (pageNr == 1)
+            {
+                string[] tableHeader;
+                IList<string[]> tableRows;
+                Alignment[] itemAlignment;
+
+                ///
+                /// Prepare table content: tableHeader + tableRows + itemAlignment
+                ///
+                if (cfg.TestsAreRows)
+                {
+                    GetContentTestsAreRows(wm, testItems, out tableHeader, out tableRows, out itemAlignment);
+                }
+                else
+                {
+                    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 tableHeader, out tableRows, out itemAlignment);
+                }
+                else
+                {
+                    GetContentTestsAreColumns(wm, testItems2, out tableHeader, out tableRows, out itemAlignment);
+                }
+
+                DrawTable(e, (float)leftMargin, (float)topMargin, tableHeader, tableRows, itemAlignment);
+            }
+
+            if (pageNr == nrPages)
+			{
+				///
+                ///  Footer on the last page
+				///
+                float footerWidth = e.Graphics.MeasureString(footer, footerFont).Width;
+                PrintAt(e, leftMargin, topMargin + printHeight - 2 * spacingOne, 0, footer, footerFont, Alignment.Left);
+            }
+
+            ///
+            /// Page number on each page
+            ///
+            string pageNrText = string.Format("{0} {1}/{2}", Strings.Page, pageNr, nrPages);
+            float pageNrWidth = e.Graphics.MeasureString(pageNrText, font).Width;
+            PrintAt(e, leftMargin + (printWidth - pageNrWidth) / 2, topMargin + printHeight - spacingOne, 0, pageNrText, font, Alignment.Left);
+
+            e.HasMorePages = !(pageNr == nrPages);
+
+            pageNr++;
+		}
+
+
+        void GetContentTestsAreRows(Results.Entities.WaterMeter wm, IList<WMeterRsltItemSpec> items, out string[] tableHeader, out IList<string[]> tableRows, out Alignment[] itemAlignment)
+        {
+            int tableColumnsCount = items.Count;
+
+            tableRows = new List<string[]>();
+            tableHeader = new string[tableColumnsCount];
+            itemAlignment = new Alignment[tableColumnsCount];
+
+            for (int i = 0; i < tableColumnsCount; i++)
+            {
+                tableHeader[i] = items[i].Caption;
+                itemAlignment[i] = items[i].Alignment;
+            }
+
+            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];
+                    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];
+                    }
+
+                    tableRows.Add(oneTableRow);
+                }
+            }
+        }
+
+
+        void GetContentTestsAreColumns(Results.Entities.WaterMeter wm, IList<WMeterRsltItemSpec> items, out string[] tableHeader, out IList<string[]> tableRows, out Alignment[] itemAlignment)
+        {
+            int tableColumnsCount = 1;
+            foreach (var mtr in wm.MeterTestRslts)
+            {
+                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
+                {
+                    tableColumnsCount++;
+                }
+            }
+
+            tableRows = new List<string[]>();
+            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++;
+                }
+            }
+            
+            WMeterRsltItemSpec.TableRowNr = 0;
+            for (int i = 0; i < items.Count; i++)
+            {
+                string[] oneTableRow = new string[tableColumnsCount];
+                WMeterRsltItemSpec.TableRowNr++;
+
+                oneTableRow[0] = items[i].Caption;
+
+                WMeterRsltItemSpec.TableColumnNr = 1;
+                foreach (var mtr in wm.MeterTestRslts)
+                {
+                    if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
+                    {
+                        /// Strip color information
+                        oneTableRow[WMeterRsltItemSpec.TableColumnNr] =
+                            items[i].Print(wm, mtr.Name()).Split(new char[] { '|' })[0];
+                        WMeterRsltItemSpec.TableColumnNr++;
+                    }
+                }
+
+                tableRows.Add(oneTableRow);
+            }
+        }
+
+
+        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;
+            }
+        }
+    }
+}

Results/Output/Printers/OnePerMeter/OnePerMeterPrinterCfg.cs

@@ -0,0 +1,42 @@
+///
+/// Copyright (c) 2017 Sensus Slovensko a.s.
+///
+
+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;
+		public string TitFntFml;
+		public int TitFntSz;
+		public int TitFntSty;
+		public string HdrFntFml;
+		public int HdrFntSz;
+		public int HdrFntSty;
+		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;
+        public string Header;				/// =Title
+        public string[] CommonItems;
+		public string[] TestItems;
+        public string[] TestItems2;
+		public string Footer;
+        public bool TestsAreRows;
+        public bool TestsAreRows2;
+        public string ImgFullPathName;
+        public int ImgLeft;
+        public int ImgTop;
+        public int ImgWid;
+        public int ImgHgh;
+    }
+}

Results/Output/Printers/Zapiska/ZapiskaPrintDocument.cs

@@ -0,0 +1,504 @@
+///
+/// Copyright (c) 2017 Sensus Metering Systems
+///
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Printing;
+using System.IO;
+using Config.Entities;
+using Results;
+using Results.Resources;
+
+namespace Results.Output.Printers.Zapiska
+{
+	public class ZapiskaPrintDocument : PrintDocument
+	{
+        const float GapBetweenTableColumns = 10.0f;
+        const float GapBetweenCommonColumns = 10.0f;
+
+		/// Size of the printed area without margins, after taking into account 'pageOrientation'
+		readonly int printHeight;           /// in 0.254 mm = 0.01 in
+        readonly int printWidth;            /// in 0.254 mm = 0.01 in
+
+        readonly int topMargin;             /// in 0.254 mm = 0.01 in
+        readonly int bottomMargin;          /// in 0.254 mm = 0.01 in
+        readonly int leftMargin;            /// in 0.254 mm = 0.01 in
+
+        readonly float leftMarginCommon1;
+        readonly float leftMarginCommon2;
+        readonly float leftMarginCommon3;
+        readonly float leftMarginBelow1;
+        readonly float leftMarginBelow2;
+        readonly float leftMarginBelow3;
+
+		readonly float spacingOne;
+        readonly float spacingOne4Header;
+
+        float commonTop;			/// = TitleY + 60
+        float bodyTop;			/// = HdrTop + 160
+										/// 
+        float titleHeight;
+        float commonHeight;
+
+		/// <summary>
+		/// Property variable for the Font the user wishes to use
+		/// </summary>
+        Font titleFont;
+        Font headerFont;
+        Font font;
+        Font footerFont;
+
+		///
+		/// Data to print
+		///
+		Results.Entities.Batch batch;
+
+		ZapiskaPrinterCfg cfg;
+
+		///
+		/// Items to print
+		///
+        string header;
+        IList<WMeterRsltItemSpec> commonItems1;
+		IList<WMeterRsltItemSpec> commonItems2;
+		IList<WMeterRsltItemSpec> commonItems3;
+		IList<WMeterRsltItemSpec> selectedItems;
+        IList<WMeterRsltItemSpec> belowItems1;
+        IList<WMeterRsltItemSpec> belowItems2;
+        IList<WMeterRsltItemSpec> belowItems3;
+        string footer;
+
+		///
+		/// Layout and status
+		///
+		int tablesOnFirstPage;
+		int tablesOnNextPage;
+		int nrPages;
+		int pageNr;					/// Page number to be printed at the bottom of the page
+
+
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		/// <param name="textToPrint">Text to be printed</param>
+		public ZapiskaPrintDocument(Results.Entities.Batch batch, ZapiskaPrinterCfg cfg, string documentName)
+		{
+			this.batch = batch;
+            DocumentName = documentName;
+
+			this.cfg = cfg;
+			topMargin = cfg.TopMargin;
+			bottomMargin = cfg.BottomMargin;
+			leftMargin = cfg.LeftMargin;
+
+			header = string.IsNullOrEmpty(cfg.Header) ? string.Empty : cfg.Header.Replace("~", Environment.NewLine);
+			commonItems1 = Results.WMeterRsltItemSpec.FromStrArray(cfg.CommonItems1);
+			commonItems2 = Results.WMeterRsltItemSpec.FromStrArray(cfg.CommonItems2);
+			commonItems3 = Results.WMeterRsltItemSpec.FromStrArray(cfg.CommonItems3);
+			selectedItems = Results.WMeterRsltItemSpec.FromStrArray(cfg.SelectedItems);
+            belowItems1 = Results.WMeterRsltItemSpec.FromStrArray(cfg.BelowItems1);
+            belowItems2 = Results.WMeterRsltItemSpec.FromStrArray(cfg.BelowItems2);
+            belowItems3 = Results.WMeterRsltItemSpec.FromStrArray(cfg.BelowItems3);
+            footer = string.IsNullOrEmpty(cfg.Footer) ? string.Empty : cfg.Footer.Replace("~", Environment.NewLine);
+
+			/// Initialize fonts
+			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);
+			///
+			if (DefaultPageSettings.Landscape)
+			{
+				printHeight = base.DefaultPageSettings.PaperSize.Width - topMargin - bottomMargin;
+				printWidth = base.DefaultPageSettings.PaperSize.Height - leftMargin - leftMargin;
+			}
+			else
+			{
+				printHeight = base.DefaultPageSettings.PaperSize.Height - topMargin - bottomMargin;
+				printWidth = base.DefaultPageSettings.PaperSize.Width - leftMargin - leftMargin;
+			}
+
+            leftMarginCommon1 = leftMargin + printWidth * 0.01f * cfg.ColW0Pct;
+            leftMarginCommon2 = leftMargin + printWidth * 0.01f * (cfg.ColW0Pct + cfg.ColW1Pct);
+            leftMarginCommon3 = leftMargin + printWidth * 0.01f * (cfg.ColW0Pct + cfg.ColW1Pct + cfg.ColW2Pct);
+
+            leftMarginBelow1 = leftMargin + printWidth * 0.01f * cfg.BelowW0Pct;
+            leftMarginBelow2 = leftMargin + printWidth * 0.01f * (cfg.BelowW0Pct + cfg.BelowW1Pct);
+            leftMarginBelow3 = leftMargin + printWidth * 0.01f * (cfg.BelowW0Pct + cfg.BelowW1Pct + cfg.BelowW2Pct);
+
+            spacingOne = System.Windows.Forms.TextRenderer.MeasureText("Abcgq", font).Height;
+			spacingOne4Header = System.Windows.Forms.TextRenderer.MeasureText("Abcgq", headerFont).Height;
+
+			pageNr = 1;
+		}
+
+		/// <summary>
+		/// Override the default onbeginPrint method of the PrintDocument Object
+		/// </summary>
+		/// <param name=e></param>
+		/// <remarks></remarks>
+		protected override void OnBeginPrint(System.Drawing.Printing.PrintEventArgs e)
+		{
+			base.OnBeginPrint(e);
+		}
+
+		/// <summary>
+		/// Override the default OnPrintPage method of the PrintDocument.
+		/// </summary>
+		/// <param name=e></param>
+		/// <remarks>This provides the print logic for our document</remarks>
+		protected override void OnPrintPage(System.Drawing.Printing.PrintPageEventArgs e)
+		{
+            /// Run base code
+            base.OnPrintPage(e);
+
+            if (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)
+                {
+                    if (!cfg.GoodOnly || wm.Passed) tableRowsCount++;
+                }
+
+                /// Prepare document outline
+                titleHeight = System.Windows.Forms.TextRenderer.MeasureText(header, titleFont).Height;
+                commonTop = cfg.TopMargin + titleHeight + spacingOne4Header;
+
+                int commonCount = Math.Max(commonItems1.Count, Math.Max(commonItems2.Count, commonItems3.Count));
+                commonHeight = commonCount * spacingOne;
+                bodyTop = commonTop + commonHeight + spacingOne4Header;
+
+                float wmSectionHeight = (tableRowsCount + 1) * spacingOne + 3 * spacingOne4Header;
+
+                tablesOnFirstPage = (int)Math.Floor((printHeight - bodyTop + (float)cfg.TopMargin - 2 * spacingOne) / wmSectionHeight);
+                tablesOnNextPage = Math.Max(1, (int)Math.Floor((printHeight - 2 * spacingOne) / wmSectionHeight));   /// Min. 1, prevent division by zero
+
+                if (tablesOnFirstPage >= 1)
+                    nrPages = 1;
+                else
+                    nrPages = 2;
+            }
+
+			/// Use the StringFormat class for the text layout of our document
+			StringFormat format = new StringFormat(StringFormatFlags.LineLimit);
+
+			if (pageNr == 1)
+			{
+				///----------
+				///  Title
+				///----------
+                float titleWid = e.Graphics.MeasureString(header, titleFont).Width;
+				RectangleF printArea = new RectangleF(cfg.LeftMargin + Math.Max(0, (printWidth - titleWid)) / 2, cfg.TopMargin,
+													  titleWid, titleHeight);
+				e.Graphics.DrawString(header, titleFont, Brushes.Black, printArea);
+
+                ///----------------
+                ///  Common items
+                ///----------------
+				for (int n = 1; n <= 3; n++)
+				{
+					IList<WMeterRsltItemSpec> commonItems;
+					float lMargin;
+					switch (n)
+					{
+						default:
+                        case 1:  commonItems = commonItems1;  lMargin = leftMarginCommon1;  break;
+						case 2:  commonItems = commonItems2;  lMargin = leftMarginCommon2;  break;
+						case 3:  commonItems = commonItems3;  lMargin = leftMarginCommon3;  break;
+					}
+
+					if (commonItems.Count == 0) continue;	/// Common part is empty
+
+					string[] leftColumn = new string[commonItems.Count];
+					string[] rightColumn = new string[commonItems.Count];
+
+					int cnt = 0;
+					foreach (var v in commonItems)
+					{
+						leftColumn[cnt] = v.Caption;
+						rightColumn[cnt] = (batch.WaterMeters.Count > 0) ? v.Print(batch.WaterMeters[0]) : string.Empty;
+						cnt++;
+					}
+
+					/// Determine left column width
+					float leftColWidth = 0;
+                    foreach (var paragraph in leftColumn)
+                    {
+                        string[] lines = paragraph.Split(new char[] { '~' });
+                        foreach (var line in lines)
+                        {
+                            float itemWidth = Measure(e, paragraph, this.font).Width;
+                            if (itemWidth > leftColWidth)
+                            {
+                                leftColWidth = itemWidth;
+                            }
+                        }
+                    }
+
+					/// Write aligned columns
+					for (int i = 0; i < Math.Min(leftColumn.Length, rightColumn.Length); i++)
+					{
+						PrintAt(e, lMargin, commonTop + spacingOne * i, leftColWidth, leftColumn[i], this.font, commonItems[i].Alignment);
+                        PrintAt(e, lMargin + leftColWidth + GapBetweenCommonColumns, commonTop + spacingOne * i, 0, rightColumn[i], this.font, Alignment.Left);
+					}
+				}
+			}
+
+			///--------
+			///  Body
+			///--------
+
+			/// This variable represents the top coordinate of the area where WM results are printed
+			/// and it is updated (increased by) the value returned by PrintXyzWM() - the section size. 
+			float nextTableTop = (pageNr == 1) ? bodyTop : cfg.TopMargin;
+
+            if (tablesOnFirstPage > 0 || pageNr == 2)
+            {
+                nextTableTop += PrintWMs(e, batch.WaterMeters, nextTableTop);
+            }
+
+            e.HasMorePages = (nrPages > 1) && (pageNr == 1);
+
+            ///----------------
+            ///  Below items
+            ///----------------
+            for (int n = 1; n <= 3; n++)
+            {
+                IList<WMeterRsltItemSpec> belowItems;
+                float lMargin;
+                switch (n)
+                {
+                    default:
+                    case 1:  belowItems = belowItems1;  lMargin = leftMarginBelow1;  break;
+                    case 2:  belowItems = belowItems2;  lMargin = leftMarginBelow2;  break;
+                    case 3:  belowItems = belowItems3;  lMargin = leftMarginBelow3;  break;
+                }
+
+                if (belowItems.Count == 0) continue;	/// Below part is empty
+
+                string[] leftColumn = new string[belowItems.Count];
+                string[] rightColumn = new string[belowItems.Count];
+
+                int cnt = 0;
+                foreach (var v in belowItems)
+                {
+                    leftColumn[cnt] = v.Caption;
+                    rightColumn[cnt] = (batch.WaterMeters.Count > 0) ? v.Print(batch.WaterMeters[0]) : string.Empty;
+                    cnt++;
+                }
+
+                /// Determine left column width
+                float leftColWidth = 0;
+                foreach (var paragraph in leftColumn)
+                {
+                    string[] lines = paragraph.Split(new char[] { '~' });
+                    foreach (var line in lines)
+                    {
+                        float itemWidth = e.Graphics.MeasureString(paragraph, font).Width + 1;
+                        if (itemWidth > leftColWidth) leftColWidth = itemWidth;
+                    }
+                }
+
+                /// Write aligned columns
+                for (int i = 0; i < Math.Min(leftColumn.Length, rightColumn.Length); i++)
+                {
+                    PrintAt(e, lMargin, nextTableTop + spacingOne * i, leftColWidth, leftColumn[i], this.font, belowItems[i].Alignment);
+                    PrintAt(e, lMargin + leftColWidth + GapBetweenCommonColumns, nextTableTop + spacingOne * i, 0, rightColumn[i], this.font, Alignment.Left);
+                }
+            }
+
+			///----------
+			///  Footer
+			///----------
+            float footerWidth = Measure(e, footer, footerFont).Width;
+            PrintAt(e, leftMargin + (printWidth - footerWidth) / 2, topMargin + printHeight - 2 * spacingOne, 0, footer, footerFont, Alignment.Left);
+            
+            string pageNrText = string.Format("{0} {1}/{2}", Strings.Page, pageNr++, nrPages);
+			float pageNrWidth = e.Graphics.MeasureString(pageNrText, font).Width;
+            PrintAt(e, leftMargin + (printWidth - pageNrWidth) / 2, topMargin + printHeight - spacingOne, 0, pageNrText, font, Alignment.Left);
+		}
+
+
+		/// <summary>
+		/// Print one water meter results
+		/// </summary>
+		/// <param name="wm">Water meter</param>
+		/// <param name="printedWMNr">Number of the water meter printed</param>
+		/// <param name="top">Top coordinate of watermeter data</param>
+		/// <returns>The height of the printed section</returns>
+		float PrintWMs(System.Drawing.Printing.PrintPageEventArgs e,
+					IList<Results.Entities.WaterMeter> wms, float top)
+		{
+            ///
+            /// Prepare table content
+            /// 
+            int tableColumnsCount = selectedItems.Count;
+            ///
+            string[] tableHeader = new string[tableColumnsCount];
+            IList<string[]> tableRows = new List<string[]>();
+            Alignment[] itemAlignment = new Alignment[tableColumnsCount]; 
+            ///
+            for (int i = 0; i < tableColumnsCount; i++)
+            {
+                tableHeader[i] = selectedItems[i].Caption;
+                itemAlignment[i] = selectedItems[i].Alignment;
+            }
+            ///
+            WMeterRsltItemSpec.TableRowNr = 0;
+            foreach (var wm in wms)
+            {
+                if (!cfg.GoodOnly || wm.Passed)
+                {
+                    string[] oneTableRow = new string[tableColumnsCount];
+                    WMeterRsltItemSpec.TableRowNr++;
+
+                    for (int i = 0; i < tableColumnsCount; i++)
+                    {
+                        WMeterRsltItemSpec.TableColumnNr = i + 1;
+                        oneTableRow[i] = selectedItems[i].Print(wm).Split(new char[] { '|' })[0];   /// Strip color information
+                    }
+
+                    tableRows.Add(oneTableRow);
+                }
+            }
+
+            return DrawTable(e, leftMargin, top, tableHeader, tableRows, itemAlignment);
+		}
+
+
+        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 = Measure(e, header[i], headerFont);
+                columnWidth[i] = size.Width;
+                if (size.Height > headerHeight) headerHeight = size.Height;
+
+                foreach (var tableRow in rows)
+                {
+                    float width = Measure(e, tableRow[i], font).Width + 1;
+                    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;
+            }
+		}
+	}
+}

Results/Output/Printers/Zapiska/ZapiskaPrinterCfg.cs

@@ -0,0 +1,46 @@
+///
+/// Copyright (c) 2017 Sensus Slovensko a.s.
+///
+
+namespace Results.Output.Printers.Zapiska
+{
+	public class ZapiskaPrinterCfg
+	{
+		public Config.Entities.PageOrientation PageOrientation;
+        public string Template;
+        public int TopMargin;
+		public int BottomMargin;
+		public int LeftMargin;
+		public string TitFntFml;
+		public int TitFntSz;
+		public int TitFntSty;
+		public string HdrFntFml;
+		public int HdrFntSz;
+		public int HdrFntSty;
+		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 GoodOnly;
+		public System.Globalization.CultureInfo CultureInfo;
+
+        public string Header;				/// =Title
+        public int ColW0Pct;
+        public int ColW1Pct;
+		public int ColW2Pct;
+		public string[] CommonItems1;
+		public string[] CommonItems2;
+		public string[] CommonItems3;
+		public string[] SelectedItems;
+        public int BelowW0Pct;
+        public int BelowW1Pct;
+        public int BelowW2Pct;
+        public string[] BelowItems1;
+        public string[] BelowItems2;
+        public string[] BelowItems3;
+		public string Footer;
+	}
+}

Results/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Sensus")]
 [assembly: AssemblyProduct("Results")]
-[assembly: AssemblyCopyright("Copyright © 2013 - 2017 Sensus Slovensko, a.s.")]
+[assembly: AssemblyCopyright("Copyright © 2013 - 2018 Sensus Slovensko, a.s.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.14.619.0")]
-[assembly: AssemblyFileVersion("2.14.619.0")]
+[assembly: AssemblyVersion("2.18.782.0")]
+[assembly: AssemblyFileVersion("2.18.782.0")]

Results/Resources/Strings.Designer.cs

@@ -330,6 +330,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Error flags.
+        /// </summary>
+        internal static string Error_flags {
+            get {
+                return ResourceManager.GetString("Error_flags", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to E rel. ref..
         /// </summary>
@@ -339,6 +348,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Failed meters count.
+        /// </summary>
+        internal static string Failed_meters_count {
+            get {
+                return ResourceManager.GetString("Failed_meters_count", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to fall.
         /// </summary>
@@ -402,6 +420,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Legalizator.
+        /// </summary>
+        internal static string Legalizator {
+            get {
+                return ResourceManager.GetString("Legalizator", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to main.
         /// </summary>
@@ -564,6 +591,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Passed meters count.
+        /// </summary>
+        internal static string Passed_meters_count {
+            get {
+                return ResourceManager.GetString("Passed_meters_count", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to PO.
         /// </summary>
@@ -762,6 +798,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to sensitivity.
+        /// </summary>
+        internal static string sensitivity {
+            get {
+                return ResourceManager.GetString("sensitivity", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Single.
         /// </summary>
@@ -1032,6 +1077,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Pressure difference measured by delta P meter - maximum during the test.
+        /// </summary>
+        internal static string Tooltip_P_de_max {
+            get {
+                return ResourceManager.GetString("Tooltip_P_de_max", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Pressure difference measured by delta P meter - mean.
         /// </summary>
@@ -1041,6 +1095,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Pressure difference measured by delta P meter - minimum during the test.
+        /// </summary>
+        internal static string Tooltip_P_de_min {
+            get {
+                return ResourceManager.GetString("Tooltip_P_de_min", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Pressure difference measured by delta P meter - at the start of the test.
         /// </summary>
@@ -1077,6 +1140,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Maximum pressure at the outlet during the test.
+        /// </summary>
+        internal static string Tooltip_P_dw_max {
+            get {
+                return ResourceManager.GetString("Tooltip_P_dw_max", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Mean pressure at the outlet.
         /// </summary>
@@ -1086,6 +1158,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Minimum pressure at the outlet during the test.
+        /// </summary>
+        internal static string Tooltip_P_dw_min {
+            get {
+                return ResourceManager.GetString("Tooltip_P_dw_min", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Pressure at the outlet at start of the test.
         /// </summary>
@@ -1122,6 +1203,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Maximum pressure at the inlet during the test.
+        /// </summary>
+        internal static string Tooltip_P_up_max {
+            get {
+                return ResourceManager.GetString("Tooltip_P_up_max", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Mean pressure at the inlet.
         /// </summary>
@@ -1131,6 +1221,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Minimum pressure at the inlet during the test.
+        /// </summary>
+        internal static string Tooltip_P_up_min {
+            get {
+                return ResourceManager.GetString("Tooltip_P_up_min", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Pressure at the inlet at start of the test.
         /// </summary>
@@ -1140,6 +1239,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Flow obtained from the master meter - end.
+        /// </summary>
+        internal static string Tooltip_Q_end {
+            get {
+                return ResourceManager.GetString("Tooltip_Q_end", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Flow calculated from conventional true mass and time.
         /// </summary>
@@ -1149,6 +1257,24 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Flow obtained from the master meter - max.
+        /// </summary>
+        internal static string Tooltip_Q_max {
+            get {
+                return ResourceManager.GetString("Tooltip_Q_max", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Flow obtained from the master meter - min.
+        /// </summary>
+        internal static string Tooltip_Q_min {
+            get {
+                return ResourceManager.GetString("Tooltip_Q_min", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Flow obtained from the master meter - actual.
         /// </summary>
@@ -1167,6 +1293,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Flow obtained from the master meter - start.
+        /// </summary>
+        internal static string Tooltip_Q_start {
+            get {
+                return ResourceManager.GetString("Tooltip_Q_start", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Flow calculated from conventional true volume and the time.
         /// </summary>
@@ -1176,6 +1311,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Calculated density of water from table or formula at water density calibration temperature (r).
+        /// </summary>
+        internal static string Tooltip_Rho_Wa_calc {
+            get {
+                return ResourceManager.GetString("Tooltip_Rho_Wa_calc", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Serial number of the meter.
         /// </summary>
@@ -1239,6 +1383,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Maximum temperature at the diverter during the test.
+        /// </summary>
+        internal static string Tooltip_T_di_max {
+            get {
+                return ResourceManager.GetString("Tooltip_T_di_max", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Mean temperature at diverter.
         /// </summary>
@@ -1248,6 +1401,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Minimum temperature at the diverter during the test.
+        /// </summary>
+        internal static string Tooltip_T_di_min {
+            get {
+                return ResourceManager.GetString("Tooltip_T_di_min", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Temperature at the diverter at start of the test – first 4 measurements from the start.
         /// </summary>
@@ -1284,6 +1446,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Maximum temperature at the outlet during the test.
+        /// </summary>
+        internal static string Tooltip_T_dw_max {
+            get {
+                return ResourceManager.GetString("Tooltip_T_dw_max", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Mean temperature at outlet.
         /// </summary>
@@ -1293,6 +1464,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Minimum temperature at the outlet during the test.
+        /// </summary>
+        internal static string Tooltip_T_dw_min {
+            get {
+                return ResourceManager.GetString("Tooltip_T_dw_min", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Temperature at the outlet at start of the test – first 4 measurements from the start.
         /// </summary>
@@ -1302,6 +1482,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Temperature of water sample at water density calibration.
+        /// </summary>
+        internal static string Tooltip_T_rho_0 {
+            get {
+                return ResourceManager.GetString("Tooltip_T_rho_0", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Actual temperature at the inlet.
         /// </summary>
@@ -1312,7 +1501,7 @@ namespace Results.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Average temperature at the inlet.
+        ///   Looks up a localized string similar to Average temperature at the inlet during a test.
         /// </summary>
         internal static string Tooltip_T_up_avg {
             get {
@@ -1330,7 +1519,16 @@ namespace Results.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Mean temperature at inlet.
+        ///   Looks up a localized string similar to Maximum temperature at the inlet during the test.
+        /// </summary>
+        internal static string Tooltip_T_up_max {
+            get {
+                return ResourceManager.GetString("Tooltip_T_up_max", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Mean temperature at inlet during a test.
         /// </summary>
         internal static string Tooltip_T_up_me {
             get {
@@ -1338,6 +1536,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Minimum temperature at the inlet during the test.
+        /// </summary>
+        internal static string Tooltip_T_up_min {
+            get {
+                return ResourceManager.GetString("Tooltip_T_up_min", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Temperature at the inlet at start of the test – first 4 measurements from the start.
         /// </summary>
@@ -1401,6 +1608,15 @@ namespace Results.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to User description.
+        /// </summary>
+        internal static string User_description {
+            get {
+                return ResourceManager.GetString("User_description", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to User nr..
         /// </summary>

Results/Resources/Strings.resx

@@ -550,13 +550,13 @@
     <value>Actual temperature at the inlet</value>
   </data>
   <data name="Tooltip_T_up_avg" xml:space="preserve">
-    <value>Average temperature at the inlet</value>
+    <value>Average temperature at the inlet during a test</value>
   </data>
   <data name="Tooltip_T_up_en" xml:space="preserve">
     <value>Temperature at the inlet at end of the test – last 4 measurement before the end</value>
   </data>
   <data name="Tooltip_T_up_me" xml:space="preserve">
-    <value>Mean temperature at inlet</value>
+    <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 from the start</value>
@@ -627,4 +627,76 @@
   <data name="Density_correction" xml:space="preserve">
     <value>Density correction</value>
   </data>
+  <data name="Error_flags" xml:space="preserve">
+    <value>Error flags</value>
+  </data>
+  <data name="Legalizator" xml:space="preserve">
+    <value>Legalizator</value>
+  </data>
+  <data name="User_description" xml:space="preserve">
+    <value>User description</value>
+  </data>
+  <data name="Failed_meters_count" xml:space="preserve">
+    <value>Failed meters count</value>
+  </data>
+  <data name="Passed_meters_count" xml:space="preserve">
+    <value>Passed meters count</value>
+  </data>
+  <data name="sensitivity" xml:space="preserve">
+    <value>sensitivity</value>
+  </data>
+  <data name="Tooltip_Q_end" xml:space="preserve">
+    <value>Flow obtained from the master meter - end</value>
+  </data>
+  <data name="Tooltip_Q_max" xml:space="preserve">
+    <value>Flow obtained from the master meter - max</value>
+  </data>
+  <data name="Tooltip_Q_min" xml:space="preserve">
+    <value>Flow obtained from the master meter - min</value>
+  </data>
+  <data name="Tooltip_Q_start" xml:space="preserve">
+    <value>Flow obtained from the master meter - start</value>
+  </data>
+  <data name="Tooltip_P_dw_max" xml:space="preserve">
+    <value>Maximum pressure at the outlet during the test</value>
+  </data>
+  <data name="Tooltip_P_dw_min" xml:space="preserve">
+    <value>Minimum pressure at the outlet during the test</value>
+  </data>
+  <data name="Tooltip_P_up_max" xml:space="preserve">
+    <value>Maximum pressure at the inlet during the test</value>
+  </data>
+  <data name="Tooltip_P_up_min" xml:space="preserve">
+    <value>Minimum pressure at the inlet during the test</value>
+  </data>
+  <data name="Tooltip_T_di_max" xml:space="preserve">
+    <value>Maximum temperature at the diverter during the test</value>
+  </data>
+  <data name="Tooltip_T_di_min" xml:space="preserve">
+    <value>Minimum temperature at the diverter during the test</value>
+  </data>
+  <data name="Tooltip_T_dw_max" xml:space="preserve">
+    <value>Maximum temperature at the outlet during the test</value>
+  </data>
+  <data name="Tooltip_T_dw_min" xml:space="preserve">
+    <value>Minimum temperature at the outlet during the test</value>
+  </data>
+  <data name="Tooltip_T_up_max" xml:space="preserve">
+    <value>Maximum temperature at the inlet during the test</value>
+  </data>
+  <data name="Tooltip_T_up_min" xml:space="preserve">
+    <value>Minimum temperature at the inlet during the test</value>
+  </data>
+  <data name="Tooltip_P_de_max" xml:space="preserve">
+    <value>Pressure difference measured by delta P meter - maximum during the test</value>
+  </data>
+  <data name="Tooltip_P_de_min" xml:space="preserve">
+    <value>Pressure difference measured by delta P meter - minimum during the test</value>
+  </data>
+  <data name="Tooltip_Rho_Wa_calc" xml:space="preserve">
+    <value>Calculated density of water from table or formula at water density calibration temperature (r)</value>
+  </data>
+  <data name="Tooltip_T_rho_0" xml:space="preserve">
+    <value>Temperature of water sample at water density calibration</value>
+  </data>
 </root>

Results/Resources/Strings.ru.resx

@@ -429,4 +429,13 @@
   <data name="VName_Vol" xml:space="preserve">
     <value>Объем</value>
   </data>
+  <data name="No" xml:space="preserve">
+    <value>Нет</value>
+  </data>
+  <data name="Yes" xml:space="preserve">
+    <value>Да</value>
+  </data>
+  <data name="Water_Meter" xml:space="preserve">
+    <value>Счетчик воды</value>
+  </data>
 </root>

Results/Results.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;GENESIS;IPERL;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;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;GENESIS;IPERL;LANG_DE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -107,10 +107,14 @@
     <Compile Include="Output\Printers\Munich\MunichPrintDocument.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Output\Printers\OnePagePerMeter\EnhancedPrintDocument.cs">
+    <Compile Include="Output\Printers\OnePerMeter\OnePerMeterPrintDocument.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Output\Printers\OnePagePerMeter\EnhancedPrinterCfg.cs" />
+    <Compile Include="Output\Printers\OnePerMeter\OnePerMeterPrinterCfg.cs" />
+    <Compile Include="Output\Printers\Zapiska\ZapiskaPrintDocument.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Output\Printers\Zapiska\ZapiskaPrinterCfg.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ItemSpec.cs" />
     <Compile Include="Properties\Resources.Designer.cs">

Results/Utils.cs

@@ -75,5 +75,101 @@ namespace Results
             }
             else return value.ToString();
         }
+
+
+        public static string SignificantDigitsToFmt(double value, int sigDigits)
+        {
+            if (sigDigits == 5)
+            {
+                if (value >= 9999.5 || value < -9999.5) return "F0";
+                else if (value >= 999.95 || value < -999.95) return "F1";
+                else if (value >= 99.995 || value < -99.995) return "F2";
+                else if (value >= 9.9995 || value < -9.9995) return "F3";
+                else if (value >= 0.99995 || value < -0.99995) return "F4";
+                else if (value >= 0.099995 || value < -0.099995) return "F5";
+                else if (value >= 0.0099995 || value < -0.0099995) return "F6";
+                else if (value >= 0.00099995 || value < -0.00099995) return "F7";
+                else if (value >= 0.000099995 || value < -0.000099995) return "F8";
+                else return "F9";
+            }
+            else if (sigDigits == 4)
+            {
+                if (value >= 999.5 || value < -999.5) return "F0";
+                else if (value >= 99.95 || value < -99.95) return "F1";
+                else if (value >= 9.995 || value < -9.995) return "F2";
+                else if (value >= 0.9995 || value < -0.9995) return "F3";
+                else if (value >= 0.09995 || value < -0.09995) return "F4";
+                else if (value >= 0.009995 || value < -0.009995) return "F5";
+                else if (value >= 0.0009995 || value < -0.0009995) return "F6";
+                else if (value >= 0.00009995 || value < -0.00009995) return "F7";
+                else return "F8";
+            }
+            else if (sigDigits == 3)
+            {
+                if (value >= 99.5 || value < -99.5) return "F0";
+                else if (value >= 9.95 || value < -9.95) return "F1";
+                else if (value >= 0.995 || value < -0.995) return "F2";
+                else if (value >= 0.0995 || value < -0.0995) return "F3";
+                else if (value >= 0.00995 || value < -0.00995) return "F4";
+                else if (value >= 0.000995 || value < -0.000995) return "F5";
+                else if (value >= 0.0000995 || value < -0.0000995) return "F6";
+                else return "F7";
+            }
+            else if (sigDigits == 2)
+            {
+                if (value >= 9.5 || value < -9.5) return "F0";
+                else if (value >= 0.95 || value < -0.95) return "F1";
+                else if (value >= 0.095 || value < -0.095) return "F2";
+                else if (value >= 0.0095 || value < -0.0095) return "F3";
+                else if (value >= 0.00095 || value < -0.00095) return "F4";
+                else if (value >= 0.000095 || value < -0.000095) return "F5";
+                else return "F6";
+            }
+            else /// if (sigDigits == 1)
+            {
+                if (value >= 0.95 || value < -0.95) return "F0";
+                else if (value >= 0.095 || value < -0.095) return "F1";
+                else if (value >= 0.0095 || value < -0.0095) return "F2";
+                else if (value >= 0.00095 || value < -0.00095) return "F3";
+                else if (value >= 0.000095 || value < -0.000095) return "F4";
+                else return "F5";
+            }
+        }
+
+        /// <summary>
+        /// Converts ErrorFlags integer to string. Supports up to 31 flags (E1..E31).
+        /// </summary>
+        /// <param name="errorFlags">Input</param>
+        /// <returns>Output string</returns>
+        public static string ErrorFlagsStr(int errorFlags)
+        {
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < 30; i++)
+            {
+                if ((errorFlags & (1 << i)) != 0)
+                {
+                    sb.Append("E");
+                    sb.Append(i + 1);
+                    sb.Append(" ");
+                }
+            }
+            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
+        }
+
     }
 }

Results/WMeterRsltItemSpec.cs

@@ -7,6 +7,7 @@ using Config;
 using Config.Entities;
 using Results.Entities;
 using Results.Resources;
+using System.Globalization;
 
 namespace Results
 {
@@ -42,6 +43,11 @@ namespace Results
             return item2;
         }
 
+
+        public static double RealDensity;
+        public static double AtTemperature;
+
+
 		///
 		/// Function to pick a MeterTestResult field and convert it into a string
 		/// 
@@ -56,31 +62,33 @@ namespace Results
 		}
 		public string Print(WaterMeter waterMeterResult, string testId)
 		{
-			string str = printDlgt(waterMeterResult, testId, Units, Format, Precision);
-            if (str == null) str = string.Empty;
+            try
+            {
+                string str = printDlgt(waterMeterResult, testId, Units, Format, Precision);
+                if (str == null) str = string.Empty;
 
-            if (!string.IsNullOrEmpty(Format))
-            {
-                str = string.Format(Format, str);
+                int len = str.Length;
+                if (Width == 0 || len >= Width)
+                {
+                    return str;
+                }
+                else if (Alignment == Config.Entities.Alignment.Left)
+                {
+                    return str + new string(' ', Width - len);
+                }
+                else if (Alignment == Config.Entities.Alignment.Right)
+                {
+                    return new string(' ', Width - len) + str;
+                }
+                else // Alignment.Center or Alignment.Justified
+                {
+                    int nrSpaces = Width - len;
+                    return new string(' ', nrSpaces / 2) + str + new string(' ', nrSpaces - (nrSpaces / 2));
+                }
             }
-
-            int len = str.Length;
-            if (Width == 0 || len >= Width)
+            catch (Exception)
             {
-                return str;
-            }
-            else if (Alignment == Config.Entities.Alignment.Left)
-            {
-                return str + new string(' ', Width - len);
-            }
-            else if (Alignment == Config.Entities.Alignment.Right)
-            {
-                return new string(' ', Width - len) + str;
-            }
-            else // Alignment.Center or Alignment.Justified
-            {
-                int nrSpaces = Width - len;
-                return new string(' ', nrSpaces / 2) + str + new string(' ', nrSpaces - (nrSpaces / 2));
+                return string.Empty;
             }
 		}
 
@@ -96,6 +104,10 @@ namespace Results
 			Quantity = quantity;
 			Category = category;
 			this.printDlgt = printDlgt;
+
+            Format = string.Empty;
+            Precision = string.Empty;
+            TestID = string.Empty;
 		}
 
 		///
@@ -110,19 +122,11 @@ namespace Results
 			Quantity = quantity;
 			Category = category;
 			this.printDlgt = printDlgt;
-		}
 
-
-		/// <summary>
-		/// Get precision string
-		/// </summary>
-		/// <param name="p1">Parameter</param>
-		/// <param name="p2">Default value when p1 is empty</param>
-		/// <returns>Precision</returns>
-		static string GetPr(string p1, string p2)
-		{
-			return string.IsNullOrEmpty(p1) ? p2 : p1;
-		}
+            Format = string.Empty;
+            Precision = string.Empty;
+            TestID = string.Empty;
+        }
 
 
 		/// Static list of all available items
@@ -136,218 +140,353 @@ namespace Results
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.String, "String", "", Quantity.String, ItemCategory.Other, (w, t, u, f, p) => f));
 
             /// Common
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_name, Strings.Test, Quantity.String, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Name()));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Procedure_name, Strings.Procedure, Quantity.String, ItemCategory.Other, (w, t, u, f, p) => w.ProcedureName()));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_number, Strings.Batch_nr, Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => w.BatchNr().ToString()));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_method, Strings.Test_method + " *", Quantity.String, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Method()));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_name,      Strings.Test + "()",        Quantity.String, ItemCategory.TestData, (w, t, u, f, p) => FormatStr(f, (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Name())));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Procedure_name, Strings.Procedure,          Quantity.String, ItemCategory.Other,    (w, t, u, f, p) => FormatStr(f, w.ProcedureName())));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_number,   Strings.Batch_nr,           Quantity.Number, ItemCategory.Other,    (w, t, u, f, p) => FormatInt(f, w.BatchNr())));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_method,    Strings.Test_method + "()", Quantity.String, ItemCategory.TestData, (w, t, u, f, p) => FormatStr(f, (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Method())));
 
             ///
             /// Volume
             ///
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_volume,       Strings.Test_vol + "()",                                                  Quantity.Volume, ItemCategory.TestData,    (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).TargetVolume()).ToString(GetPr(p, "F1"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume,            string.Format("{0} Mt. ()", Strings.VName_Vol), Strings.Tooltip_Vol_Mt,   Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).VolumeMeter).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_volume,  string.Format("{0} rm ()", Strings.VName_Vol), Strings.Tooltip_Vol_rm,    Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).VolumeRef).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume_main,       string.Format("{0} {1} ()", Strings.VName_Vol, Strings.main),             Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).VolumeMeter).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume_aux,        string.Format("{0} {1} ()", Strings.VName_Vol, Strings.aux),              Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).VolumeMeter).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume,      Strings.Start_volume + "()",                                              Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).VolumeStart).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume_main, Strings.Start_volume_main + "()",                                         Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).VolumeStart).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume_aux,  Strings.Start_volume_aux + "()",                                          Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).VolumeStart).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume,        Strings.End_volume + "()",                                                Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).VolumeEnd).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume_main,   Strings.End_volume_main + "()",                                           Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).VolumeEnd).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume_aux,    Strings.End_volume_aux + "()",                                            Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).VolumeEnd).ToString(GetPr(p, "F3"))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_volume,       Strings.Test_vol + "()",                                                  Quantity.Volume, ItemCategory.TestData,    (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).TargetVolume())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume,            string.Format("{0} Mt. ()", Strings.VName_Vol), Strings.Tooltip_Vol_Mt,   Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeMeter)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_volume,  string.Format("{0} rm ()", Strings.VName_Vol),  Strings.Tooltip_Vol_rm,   Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeRef)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume_main,       string.Format("{0} {1} ()", Strings.VName_Vol,  Strings.main),            Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeMeter)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume_aux,        string.Format("{0} {1} ()", Strings.VName_Vol,  Strings.aux),             Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeMeter)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume,      Strings.Start_volume + "()",                                              Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume_main, Strings.Start_volume_main + "()",                                         Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume_aux,  Strings.Start_volume_aux + "()",                                          Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume,        Strings.End_volume + "()",                                                Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume_main,   Strings.End_volume_main + "()",                                           Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume_aux,    Strings.End_volume_aux + "()",                                            Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeEnd)));
 
 			///
 			/// Mass
 			/// 
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass_start_raw, string.Format("{0} ST raw ()", Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).MassStartRaw).ToString(GetPr(p, "F4"))));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass_start,     string.Format("{0} ST ()",     Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).MassStart).ToString(GetPr(p, "F4"))));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass_end_raw,   string.Format("{0} EN raw ()", Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).MassEndRaw).ToString(GetPr(p, "F4"))));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass_end,       string.Format("{0} EN ()",     Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).MassEnd).ToString(GetPr(p, "F4"))));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass,           string.Format("{0} ()",        Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).MassEnd - w.GetTestRslt(t).MassStart).ToString(GetPr(p, "F4"))));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass_start_raw, string.Format("{0} ST raw ()", Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetTestRslt(t).MassStartRaw)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass_start,     string.Format("{0} ST ()",     Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetTestRslt(t).MassStart)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass_end_raw,   string.Format("{0} EN raw ()", Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetTestRslt(t).MassEndRaw)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass_end,       string.Format("{0} EN ()",     Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetTestRslt(t).MassEnd)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass,           string.Format("{0} ()",        Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetTestRslt(t).MassEnd - w.GetTestRslt(t).MassStart)));
 
 			///
 			/// Density
 			/// 
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Density,            Strings.Density + " ()",            Quantity.Density, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).DensityOut.ToString(GetPr(p, "F1"))));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Density_correction, Strings.Density_correction + " ()", Quantity.Density, ItemCategory.TestResult, (w, t, u, f, p) => w.Batch.DensityCorr.ToString(GetPr(p, "F3"))));
+			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)));
 
 			///
-            /// Time (duration), date and time 
+            /// Date and time 
             ///
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_start_time, Strings.T_start + "()", Quantity.DateTime, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : (string.IsNullOrEmpty(f) ? w.GetTestRslt(t).StartTime.ToString() : string.Format(f, w.GetTestRslt(t).StartTime))));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_end_time,   Strings.T_end + "()",   Quantity.DateTime, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : (string.IsNullOrEmpty(f) ? w.GetTestRslt(t).EndTime.ToString() : string.Format(f, w.GetTestRslt(t).EndTime))));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_time,       Strings.T_s + "()",     Quantity.Time,     ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).TestTime.ToString(GetPr(p, "F2"))));
+
+            ///
+            /// Time (duration) 
+            ///
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_time, Strings.T_s + "()",                 Quantity.Time, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TestTime)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Diverter_start_time, "Diverter start time ()", Quantity.Time, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).DiverterStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Diverter_end_time,   "Diverter end time ()",   Quantity.Time, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).DiverterEnd)));
 
             ///
             /// Flow
             ///
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_from,      string.Format("{0} {1}", Strings.VName_Flow, Strings.from),             Quantity.Flow, ItemCategory.TestData,    (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Qfrom().ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_to,        string.Format("{0} {1}", Strings.VName_Flow, Strings.to),               Quantity.Flow, ItemCategory.TestData,    (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Qto().ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow,        string.Format("{0} v r", Strings.VName_Flow), Strings.Tooltip_Q_v_r,    Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Utils.DoubleToStr(Config.Units.ConvertTo(u, w.GetTestRslt(t).FlowVolume), 4)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_rise,      string.Format("{0} {1}", Strings.VName_Flow, Strings.rise),             Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QRise == 0) ? "-" : Utils.DoubleToStr(w.QRise, 4)) : ""));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_fall,		string.Format("{0} {1}", Strings.VName_Flow, Strings.fall),				Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QFall == 0) ? "-" : Utils.DoubleToStr(w.QFall, 4)) : ""));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_mean,  string.Format("{0} rim ()", Strings.VName_Flow), Strings.Tooltip_Q_rim, Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Utils.DoubleToStr(Config.Units.ConvertTo(u, w.GetTestRslt(t).FlowMean), 4)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_from,      string.Format("{0} {1}", Strings.VName_Flow, Strings.from),               Quantity.Flow, ItemCategory.TestData,    (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).Qfrom())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_to,        string.Format("{0} {1}", Strings.VName_Flow, Strings.to),                 Quantity.Flow, ItemCategory.TestData,    (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).Qto())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow,        string.Format("{0} v r", Strings.VName_Flow),      Strings.Tooltip_Q_v_r, Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowVolume)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_mean,  string.Format("{0} rim ()", Strings.VName_Flow),   Strings.Tooltip_Q_rim, Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_min,   string.Format("{0} ref min ()", Strings.VName_Flow), Strings.Tooltip_Q_min, Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMin)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_max,   string.Format("{0} ref max ()", Strings.VName_Flow), Strings.Tooltip_Q_max, Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMax)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_start, string.Format("{0} ref start ()", Strings.VName_Flow), Strings.Tooltip_Q_start, Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_end,   string.Format("{0} ref end ()", Strings.VName_Flow), Strings.Tooltip_Q_end, Quantity.Flow, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_rise,      string.Format("{0} {1}", Strings.VName_Flow, Strings.rise), Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QRise == 0) ? "-" : FormatDbl(u, f, p, "V3", w.QRise)) : ""));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_fall,      string.Format("{0} {1}", Strings.VName_Flow, Strings.fall),               Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QFall == 0) ? "-" : FormatDbl(u, f, p, "V3", w.QFall)) : ""));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_sensitivity, string.Format("{0} {1}", Strings.VName_Flow, Strings.sensitivity),      Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QRise == 0) ? "-" : FormatDbl(u, f, p, "V3", w.QRise)) : ""));
 
             ///
             /// Temperature
             ///
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_mean,    string.Format("{0} UP ME ()",  Strings.VName_Temp), Strings.Tooltip_T_up_me,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).TempUpMean).ToString(GetPr(p, "F2"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_start,   string.Format("{0} UP ST ()",  Strings.VName_Temp), Strings.Tooltip_T_up_st,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).TempUpStart).ToString(GetPr(p, "F1"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_end,     string.Format("{0} UP EN ()",  Strings.VName_Temp), Strings.Tooltip_T_up_en,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).TempUpEnd).ToString(GetPr(p, "F1"))));
-            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) ? "" : Config.Units.ConvertTo(u, (w.GetTestRslt(t).TempUpStart + w.GetTestRslt(t).TempUpEnd) / 2).ToString(GetPr(p, "F1"))));
-            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) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).TempDownMean).ToString(GetPr(p, "F2"))));
-            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) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).TempDownStart).ToString(GetPr(p, "F1"))));
-            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) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).TempDownEnd).ToString(GetPr(p, "F1"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_down_avg,   string.Format("{0} DW avg ()", Strings.VName_Temp), Strings.Tooltip_T_dw_avg, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, (w.GetTestRslt(t).TempDownStart + w.GetTestRslt(t).TempDownEnd) / 2).ToString(GetPr(p, "F1"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div,        string.Format("{0} DI ME ()",  Strings.VName_Temp), Strings.Tooltip_T_di_me,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).TempDivMean).ToString(GetPr(p, "F2"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_start,  string.Format("{0} DI ST ()",  Strings.VName_Temp), Strings.Tooltip_T_di_st,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).TempDivStart).ToString(GetPr(p, "F1"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_end,    string.Format("{0} DI EN ()",  Strings.VName_Temp), Strings.Tooltip_T_di_en,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).TempDivEnd).ToString(GetPr(p, "F1"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_avg,    string.Format("{0} DI avg ()", Strings.VName_Temp), Strings.Tooltip_T_di_avg, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, (w.GetTestRslt(t).TempDivStart + w.GetTestRslt(t).TempDivEnd) / 2).ToString(GetPr(p, "F1"))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_mean,    string.Format("{0} UP ME ()",  Strings.VName_Temp), Strings.Tooltip_T_up_me,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempUpMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_start,   string.Format("{0} UP ST ()",  Strings.VName_Temp), Strings.Tooltip_T_up_st,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempUpStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_end,     string.Format("{0} UP EN ()",  Strings.VName_Temp), Strings.Tooltip_T_up_en,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempUpEnd)));
+            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_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)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_down_avg,   string.Format("{0} DW avg ()", Strings.VName_Temp), Strings.Tooltip_T_dw_avg, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempDownStart + w.GetTestRslt(t).TempDownEnd) / 2)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_down_min,   string.Format("{0} DW min ()", Strings.VName_Temp), Strings.Tooltip_T_dw_min, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDownMin)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_down_max,   string.Format("{0} DW max ()", Strings.VName_Temp), Strings.Tooltip_T_dw_max, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDownMax)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div,        string.Format("{0} DI ME ()",  Strings.VName_Temp), Strings.Tooltip_T_di_me,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDivMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_start,  string.Format("{0} DI ST ()",  Strings.VName_Temp), Strings.Tooltip_T_di_st,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDivStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_end,    string.Format("{0} DI EN ()",  Strings.VName_Temp), Strings.Tooltip_T_di_en,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDivEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_avg,    string.Format("{0} DI avg ()", Strings.VName_Temp), Strings.Tooltip_T_di_avg, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempDivStart + w.GetTestRslt(t).TempDivEnd) / 2)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_min,    string.Format("{0} DI min ()", Strings.VName_Temp), Strings.Tooltip_T_di_min, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDivMin)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_max,    string.Format("{0} DI max ()", Strings.VName_Temp), Strings.Tooltip_T_di_max, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDivMax)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_rho_0,      string.Format("{0} RO0",       Strings.VName_Temp), Strings.Tooltip_T_rho_0,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", AtTemperature)));
 #if HEAT_METERS
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Hi_mean,  string.Format("{0} hi me", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).Custom1).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Hi_start, string.Format("{0} hi st", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).Custom2).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Hi_end,   string.Format("{0} hi en", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).Custom3).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Hi_avg,   string.Format("{0} hi av", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, (w.GetTestRslt(t).Custom2 + w.GetTestRslt(t).Custom3) / 2).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Lo_mean,  string.Format("{0} lo me", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).Custom6).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Lo_start, string.Format("{0} lo st", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).Custom7).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Lo_end,   string.Format("{0} lo en", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).Custom8).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Lo_avg,   string.Format("{0} lo av", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, (w.GetTestRslt(t).Custom7 + w.GetTestRslt(t).Custom8) / 2).ToString(GetPr(p, "F3"))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Hi_mean,  string.Format("{0} hi me", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : (w.GetTestRslt(t).Custom1).ToString(GetPr(p, "F3"))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Hi_start, string.Format("{0} hi st", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : (w.GetTestRslt(t).Custom2).ToString(GetPr(p, "F3"))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Hi_end,   string.Format("{0} hi en", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : (w.GetTestRslt(t).Custom3).ToString(GetPr(p, "F3"))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Hi_avg,   string.Format("{0} hi av", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : ((w.GetTestRslt(t).Custom2 + w.GetTestRslt(t).Custom3) / 2).ToString(GetPr(p, "F3"))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Lo_mean,  string.Format("{0} lo me", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : (w.GetTestRslt(t).Custom6).ToString(GetPr(p, "F3"))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Lo_start, string.Format("{0} lo st", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : (w.GetTestRslt(t).Custom7).ToString(GetPr(p, "F3"))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Lo_end,   string.Format("{0} lo en", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : (w.GetTestRslt(t).Custom8).ToString(GetPr(p, "F3"))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Lo_avg,   string.Format("{0} lo av", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : ((w.GetTestRslt(t).Custom7 + w.GetTestRslt(t).Custom8) / 2).ToString(GetPr(p, "F3"))));
 #endif
 
             ///
             /// Pressure
             ///
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up,          string.Format("{0} UP ME ()",  Strings.VName_Press), Strings.Tooltip_P_up_me,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).PressUpMean).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up_start,    string.Format("{0} UP ST ()",  Strings.VName_Press), Strings.Tooltip_P_up_st,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).PressUpStart).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up_end,      string.Format("{0} UP EN ()",  Strings.VName_Press), Strings.Tooltip_P_up_en,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).PressUpEnd).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up_avg,      string.Format("{0} UP avg ()", Strings.VName_Press), Strings.Tooltip_P_up_avg, Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, (w.GetTestRslt(t).PressUpStart + w.GetTestRslt(t).PressUpEnd) / 2).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down,        string.Format("{0} DW ME ()",  Strings.VName_Press), Strings.Tooltip_P_dw_me,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).PressDownMean).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down_start,  string.Format("{0} DW ST ()",  Strings.VName_Press), Strings.Tooltip_P_dw_st,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).PressDownStart).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down_end,    string.Format("{0} DW EN ()",  Strings.VName_Press), Strings.Tooltip_P_dw_en,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).PressDownEnd).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down_avg,    string.Format("{0} DW avg ()", Strings.VName_Press), Strings.Tooltip_P_dw_avg, Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, (w.GetTestRslt(t).PressDownStart + w.GetTestRslt(t).PressDownEnd) / 2).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_mean,  string.Format("{0} DE ME ()",  Strings.VName_Press), Strings.Tooltip_P_de_me,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).PressDeltaMean).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_start, string.Format("{0} DE ST ()",  Strings.VName_Press), Strings.Tooltip_P_de_st,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).PressDeltaStart).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_end,   string.Format("{0} DE EN ()",  Strings.VName_Press), Strings.Tooltip_P_de_en,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).PressDeltaEnd).ToString(GetPr(p, "F3"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_avg,   string.Format("{0} DE avg ()", Strings.VName_Press), Strings.Tooltip_P_de_avg, Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, (w.GetTestRslt(t).PressDeltaStart + w.GetTestRslt(t).PressDeltaEnd) / 2).ToString(GetPr(p, "F3"))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up,          string.Format("{0} UP ME ()",  Strings.VName_Press), Strings.Tooltip_P_up_me,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressUpMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up_start,    string.Format("{0} UP ST ()",  Strings.VName_Press), Strings.Tooltip_P_up_st,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressUpStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up_end,      string.Format("{0} UP EN ()",  Strings.VName_Press), Strings.Tooltip_P_up_en,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressUpEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up_avg,      string.Format("{0} UP avg ()", Strings.VName_Press), Strings.Tooltip_P_up_avg, Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).PressUpStart + w.GetTestRslt(t).PressUpEnd) / 2)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up_min,      string.Format("{0} UP min ()", Strings.VName_Press), Strings.Tooltip_P_up_min, Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressUpMin)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up_max,      string.Format("{0} UP max ()", Strings.VName_Press), Strings.Tooltip_P_up_max, Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressUpMax)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down,        string.Format("{0} DW ME ()",  Strings.VName_Press), Strings.Tooltip_P_dw_me,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressDownMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down_start,  string.Format("{0} DW ST ()",  Strings.VName_Press), Strings.Tooltip_P_dw_st,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressDownStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down_end,    string.Format("{0} DW EN ()",  Strings.VName_Press), Strings.Tooltip_P_dw_en,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressDownEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down_avg,    string.Format("{0} DW avg ()", Strings.VName_Press), Strings.Tooltip_P_dw_avg, Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).PressDownStart + w.GetTestRslt(t).PressDownEnd) / 2)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down_min,    string.Format("{0} DW min ()", Strings.VName_Press), Strings.Tooltip_P_dw_min, Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressDownMin)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down_max,    string.Format("{0} DW max ()", Strings.VName_Press), Strings.Tooltip_P_dw_max, Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressDownMax)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_mean,  string.Format("{0} DE ME ()",  Strings.VName_Press), Strings.Tooltip_P_de_me,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressDeltaMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_start, string.Format("{0} DE ST ()",  Strings.VName_Press), Strings.Tooltip_P_de_st,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressDeltaStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_end,   string.Format("{0} DE EN ()",  Strings.VName_Press), Strings.Tooltip_P_de_en,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressDeltaEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_avg,   string.Format("{0} DE avg ()", Strings.VName_Press), Strings.Tooltip_P_de_avg, Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).PressDeltaStart + w.GetTestRslt(t).PressDeltaEnd) / 2)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_min,   string.Format("{0} DE min ()", Strings.VName_Press), Strings.Tooltip_P_de_min, Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressDeltaMin)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_max,   string.Format("{0} DE max ()", Strings.VName_Press), Strings.Tooltip_P_de_max, Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressDeltaMax)));
 
             ///
             /// 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) => (w.GetTestRslt(t) == null) ? Config.Units.ConvertTo(u, w.Batch.AmbTempMean()).ToString(GetPr(p, "F1")) : Config.Units.ConvertTo(u, w.GetTestRslt(t).AmbTempMean).ToString(GetPr(p, "F1"))));
-            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) => (w.GetTestRslt(t) == null) ? Config.Units.ConvertTo(u, w.Batch.AmbPressMean()).ToString(GetPr(p, "F0")) : Config.Units.ConvertTo(u, w.GetTestRslt(t).AmbPressMean).ToString(GetPr(p, "F0"))));
-            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) => (w.GetTestRslt(t) == null) ? Config.Units.ConvertTo(u, w.Batch.AmbHumiMean()).ToString(GetPr(p, "F1")) : Config.Units.ConvertTo(u, w.GetTestRslt(t).AmbHumiMean).ToString(GetPr(p, "F1"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Buoyancy, "Buoyancy ()", Quantity.Number, ItemCategory.TestResult, (w, t, u, f, p) => string.IsNullOrEmpty(t) ? w.Batch.Buoyancy().ToString(GetPr(p, "F5")) : ((w.GetTestRslt(t) != null) ? w.GetTestRslt(t).Buoyancy.ToString(GetPr(p, "F5")) : "")));
+            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.Buoyancy, "Buoyancy ()", Quantity.Number, ItemCategory.TestResult, (w, t, u, f, p) => string.IsNullOrEmpty(t) ? FormatDbl(u, f, p, "V6", w.Batch.Buoyancy()) : ((w.GetTestRslt(t) != null) ? FormatDbl(u, f, p, "V6", (w.GetTestRslt(t).Buoyancy)) : "")));
 
             ///
             /// Error
             ///
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_limit_Lo,  Strings.ErrLimLo + "()",    Quantity.Error, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).ErrLimLo()).ToString(GetPr(p, "F1"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_limit_Hi,  Strings.ErrLimHi + "()",    Quantity.Error, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).ErrLimHi()).ToString(GetPr(p, "F1"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Uncertainty,     Strings.Uncertainty + "()", Quantity.Error, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Uncertainty().ToString(GetPr(p, "F2"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_error, string.Format("{0} rel.ref. ()", Strings.VName_Error), Strings.Tooltip_E_rel_ref, Quantity.Error, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).ErrorMaster).ToString(GetPr(p, "F3"))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_limit_Lo,  Strings.ErrLimLo + "()",    Quantity.Error, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).ErrLimLo())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_limit_Hi,  Strings.ErrLimHi + "()",    Quantity.Error, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).ErrLimHi())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Uncertainty,     Strings.Uncertainty + "()", Quantity.Error, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).Uncertainty())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_error, string.Format("{0} rel.ref. ()", Strings.VName_Error), Strings.Tooltip_E_rel_ref, Quantity.Error, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).ErrorMaster)));
 #if TURA_IPERL || TURA_SPECIAL 
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, string.Format("{0} rel. ()", Strings.VName_Error), Strings.Tooltip_E_rel, Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "0" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).Error).ToString(GetPr(p, "F2"))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, string.Format("{0} rel. ()", Strings.VName_Error), Strings.Tooltip_E_rel, Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "0" : FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t).Error)));
 #else
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, string.Format("{0} rel. ()", Strings.VName_Error), Strings.Tooltip_E_rel, Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).Error).ToString(GetPr(p, "F2"))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, string.Format("{0} rel. ()", Strings.VName_Error), Strings.Tooltip_E_rel, Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t).Error)));
 #endif
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed, Strings.Result, Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => string.IsNullOrEmpty(t) ? w.PassedColorStr() : ((w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PassedColorStr())));
 
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.ResultOrErrorFlags, "Winiki lub E", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, string.IsNullOrEmpty(w.ErrorFlagstStr()) ? (w.WaterMeterData.Text4 + w.PassedColorStr()) : w.ErrorFlagstStr())));    /// PL specific result
+
             ///
             /// Water meter info
             ///
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Watermeter_type, Strings.WM_Type, Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => w.WaterMeterData.ProductName));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Producer, Strings.Producer, Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => w.WaterMeterData.Producer));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Watermeter_type, Strings.WM_Type, Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.ProductName)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Producer, Strings.Producer, Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Producer)));
 
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.DN, "DN", Quantity.Length, ItemCategory.MeterData, (w, t, u, f, p) => string.IsNullOrEmpty(p) ? Config.Units.ConvertTo(u, w.WaterMeterData.DN).ToString()
-                                                                                                                                                     : Config.Units.ConvertTo(u, w.WaterMeterData.DN).ToString(p)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.L, "L", Quantity.Length, ItemCategory.MeterData, (w, t, u, f, p) => string.IsNullOrEmpty(p) ? Config.Units.ConvertTo(u, w.WaterMeterData.L).ToString()
-                                                                                                                                                   : Config.Units.ConvertTo(u, w.WaterMeterData.L).ToString(p)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mounting, Strings.Mounting, Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => w.WaterMeterData.Mounting.ToDescription()));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.DN,       "DN",             Quantity.Length, ItemCategory.MeterData, (w, t, u, f, p) => FormatDbl(u, f, p, "V2", w.WaterMeterData.DN)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.L,        "L",              Quantity.Length, ItemCategory.MeterData, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.WaterMeterData.L)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mounting, Strings.Mounting, Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Mounting.ToDescription())));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Q4,       "Q4_Qmax",        Quantity.Flow,   ItemCategory.MeterData, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.WaterMeterData.Q4_Qmax)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Q3,       "Q3_Qn",          Quantity.Flow,   ItemCategory.MeterData, (w, t, u, f, p) => FormatDbl(u, f, p, "V2", w.WaterMeterData.Q3_Qn)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2,       "Q2_Qt",          Quantity.Flow,   ItemCategory.MeterData, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.WaterMeterData.Q2_Qt)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q1,       "Q1_Qmin",        Quantity.Flow,   ItemCategory.MeterData, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.WaterMeterData.Q1_Qmin)));
 
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Q4, "Q4_Qmax", Quantity.Flow, ItemCategory.MeterData, (w, t, u, f, p) => string.IsNullOrEmpty(p) ? Config.Units.ConvertTo(u, w.WaterMeterData.Q4_Qmax).ToString()
-                                                                                                                                                        : Config.Units.ConvertTo(u, w.WaterMeterData.Q4_Qmax).ToString(p)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Q3, "Q3_Qn", Quantity.Flow, ItemCategory.MeterData, (w, t, u, f, p) => string.IsNullOrEmpty(p) ? Config.Units.ConvertTo(u, w.WaterMeterData.Q3_Qn).ToString()
-                                                                                                                                                      : Config.Units.ConvertTo(u, w.WaterMeterData.Q3_Qn).ToString(p)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2, "Q2_Qt", Quantity.Flow, ItemCategory.MeterData, (w, t, u, f, p) => string.IsNullOrEmpty(p) ? Config.Units.ConvertTo(u, w.WaterMeterData.Q2_Qt).ToString()
-                                                                                                                                                      : Config.Units.ConvertTo(u, w.WaterMeterData.Q2_Qt).ToString(p)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Q1, "Q1_Qmin", Quantity.Flow, ItemCategory.MeterData, (w, t, u, f, p) => string.IsNullOrEmpty(p) ? Config.Units.ConvertTo(u, w.WaterMeterData.Q1_Qmin).ToString()
-                                                                                                                                                        : Config.Units.ConvertTo(u, w.WaterMeterData.Q1_Qmin).ToString(p)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Metrological_class,             Strings.MClass,                   Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.MetrologicalClass)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Temperature_class,              "Temperature class",              Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.TemperatureClass.ToDescription())));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Pressure_loss_class,            "Pressure loss class",            Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.PressureLossClass.ToDescription())));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Max_admissible_pressure,        "Max. admissible pressure",       Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.MaxAdmissiblePressure.ToDescription())));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_profile_sensitivity_class, "Flow profile sensitivity class", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.FlowProfileSensitivityClass.ToDescription())));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Approval_info,                  Strings.Approval,                 Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.ApprovalInfo)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Certificate,                    "Certificate",                    Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Certificate)));
 
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Metrological_class, Strings.MClass, Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => w.WaterMeterData.MetrologicalClass));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Temperature_class, "Temperature class", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => w.WaterMeterData.TemperatureClass.ToDescription()));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Pressure_loss_class, "Pressure loss class", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => w.WaterMeterData.PressureLossClass.ToDescription()));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Max_admissible_pressure, "Max. admissible pressure", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => w.WaterMeterData.MaxAdmissiblePressure.ToDescription()));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_profile_sensitivity_class, "Flow profile sensitivity class", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => w.WaterMeterData.FlowProfileSensitivityClass.ToDescription()));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses_per_liter, Strings.PulsesLiter, Quantity.PulsePerLtr, ItemCategory.MeterData, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", w.WaterMeterData.PulsesPerLtr)));
 
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Approval_info, Strings.Approval, Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => w.WaterMeterData.ApprovalInfo));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Certificate, "Certificate", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => w.WaterMeterData.Certificate));
-
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses_per_liter, Strings.PulsesLiter, Quantity.PulsePerLtr, ItemCategory.MeterData, (w, t, u, f, p) => string.IsNullOrEmpty(p) ? w.WaterMeterData.PulsesPerLtr.ToString()
-																																													   : w.WaterMeterData.PulsesPerLtr.ToString(p)));
-
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Text1, "Text1", Quantity.String, ItemCategory.Other, (w, t, u, f, p) => w.WaterMeterData.Text1));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Text2, "Text2", Quantity.String, ItemCategory.Other, (w, t, u, f, p) => w.WaterMeterData.Text2));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Text3, "Text3", Quantity.String, ItemCategory.Other, (w, t, u, f, p) => w.WaterMeterData.Text3));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Text4, "Text4", Quantity.String, ItemCategory.Other, (w, t, u, f, p) => w.WaterMeterData.Text4));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Text5, "Text5", Quantity.String, ItemCategory.Other, (w, t, u, f, p) => w.WaterMeterData.Text5));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Text1, "Text1", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Text1)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Text2, "Text2", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Text2)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Text3, "Text3", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Text3)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Text4, "Text4", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Text4)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Text5, "Text5", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Text5)));
 
             /// Water meters results
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr, Strings.sn, Strings.Tooltip_sn, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => w.SerialNr));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Purchase_order, Strings.PO, Quantity.String, ItemCategory.Other, (w, t, u, f, p) => w.PurchaseOrder));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Year_of_production, Strings.Year, Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => w.YearOfProduction.ToString()));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.WM_Position, Strings.Pos, Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => w.WMPosition.ToString()));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr,          Strings.sn, Strings.Tooltip_sn, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.SerialNr)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Purchase_order,     Strings.PO,                     Quantity.String, ItemCategory.Other,       (w, t, u, f, p) => FormatStr(f, w.PurchaseOrder)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Year_of_production, Strings.Year,                   Quantity.Number, ItemCategory.Other,       (w, t, u, f, p) => FormatInt(f, w.YearOfProduction)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.WM_Position,        Strings.Pos,                    Quantity.Number, ItemCategory.Other,       (w, t, u, f, p) => FormatInt(f, w.WMPosition)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Formatted_WM_ID,    "Formatted WM ID",              Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? string.Format("{0}-{1}", w.BatchNr(), w.WMPosition) : string.Format(f, w.StartTime(), w.EndTime(), w.BatchNr(), w.WMPosition, w.SerialNr)));
 
             /// Water meters results (single)
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state, Strings.End_state, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => w.EndState));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses, Strings.Pulses + "()", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PulsesMeter.ToString()));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses__liter, Strings.PulsesLiter + "()", Quantity.PulsePerLtr, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : (string.IsNullOrEmpty(p) ? w.GetMeterTestRslt(t).PulsesPerLiter.ToString()
-																																																							   : w.GetMeterTestRslt(t).PulsesPerLiter.ToString(p))));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_pulses, Strings.RefPulses + "()", Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PulsesMaster.ToString()));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state,        Strings.End_state,          Quantity.String,      ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.EndState)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses,           Strings.Pulses + "()",      Quantity.Number,      ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F0", w.GetMeterTestRslt(t).PulsesMeter)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_pulses, Strings.RefPulses + "()",   Quantity.Number,      ItemCategory.Other,       (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t).PulsesMaster)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses__liter,    Strings.PulsesLiter + "()", Quantity.PulsePerLtr, ItemCategory.Other,       (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).PulsesPerLiter)));
 
 			/// Water meters results (combined)
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_main, Strings.Err_main + "()", Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) == null) ? "" : (string.IsNullOrEmpty(p) ? w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).Error.ToString()																																																													   : w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).Error.ToString(p))));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_aux, Strings.Err_aux + "()", Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) == null) ? "" : (string.IsNullOrEmpty(p) ? w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).Error.ToString()
-																																																												    : w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).Error.ToString(p))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr_main, string.Format("{0} {1}", Strings.sn, Strings.main), Strings.Tooltip_sn_main, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => w.SerialNr));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr_aux, string.Format("{0} {1}", Strings.sn, Strings.aux), Strings.Tooltip_sn_aux, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => w.SerialNrAux));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state_main, Strings.EndState_main, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => w.EndState));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state_aux, Strings.EndState_aux, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => w.EndStateAux));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_main,     Strings.Err_main + "()", Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) == null) ? "" : FormatDbl(u, f, p, "V2",  w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).Error)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_aux,      Strings.Err_aux + "()",  Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) == null) ? "" : FormatDbl(u, f, p, "V2",  w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).Error)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr_main, string.Format("{0} {1}", Strings.sn, Strings.main), Strings.Tooltip_sn_main, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.SerialNr)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr_aux,  string.Format("{0} {1}", Strings.sn, Strings.aux),  Strings.Tooltip_sn_aux,  Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.SerialNrAux)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state_main, Strings.EndState_main,   Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.EndState)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state_aux,  Strings.EndState_aux,    Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.EndStateAux)));
 
             /// Batch info
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_bench_ID, Strings.Bench, Quantity.String, ItemCategory.Other, (w, t, u, f, p) => w.Batch.TestBenchId.ToString()));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Program_version, Strings.Ver, Quantity.String, ItemCategory.Other, (w, t, u, f, p) => w.Batch.ProgramVersion));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.User_name, Strings.User, Quantity.String, ItemCategory.Other, (w, t, u, f, p) => w.Batch.UserName));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.User_nr, Strings.User_nr, Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => w.Batch.UserNumber.ToString()));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Watermeters, Strings.WMs, Quantity.String, ItemCategory.Other, (w, t, u, f, p) => w.Batch.WatermetersStr));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Protocol_title, Strings.Protocol, Quantity.String, ItemCategory.Other, (w, t, u, f, p) => w.Batch.ProtocolTitle));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_start_time, Strings.Start, Quantity.DateTime, ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? w.Batch.StartTime.ToString() : string.Format(f, w.Batch.StartTime)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_end_time, Strings.End, Quantity.DateTime, ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? w.Batch.EndTime.ToString() : string.Format(f, w.Batch.EndTime)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Lite_per_pulse_Read, "1 / PlsPerLtr_Read", Quantity.PulsePerLtr, ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(p) ? ((w.WaterMeterData.PulsesPerLtr != 0) ? 1 / w.WaterMeterData.PulsesPerLtr : 0).ToString()
-                                                                                                                                                   : ((w.WaterMeterData.PulsesPerLtr != 0) ? 1 / w.WaterMeterData.PulsesPerLtr : 0).ToString(p)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_bench_ID,       Strings.Bench,               Quantity.String,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, w.Batch.TestBenchId.ToString())));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Program_version,     Strings.Ver,                 Quantity.String,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, w.Batch.ProgramVersion)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.User_nr,             Strings.User_nr,             Quantity.Number,      ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.UserNumber)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.User_name,           Strings.User,                Quantity.String,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, Users.Entities.User.EncodedStrToUserName(w.Batch.UserName))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.User_description,    Strings.User_description,    Quantity.String,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, Users.Entities.User.EncodedStrToFullName(w.Batch.UserName))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Legalizator,         Strings.Legalizator,         Quantity.String,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, Users.Entities.User.EncodedStrToLegalizator(w.Batch.UserName))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Watermeters,         Strings.WMs,                 Quantity.String,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, w.Batch.WatermetersStr)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Protocol_title,      Strings.Protocol,            Quantity.String,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, w.Batch.ProtocolTitle)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_start_time,    Strings.Start,               Quantity.DateTime,    ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? w.Batch.StartTime.ToString() : string.Format(f, w.Batch.StartTime)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_end_time,      Strings.End,                 Quantity.DateTime,    ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? w.Batch.EndTime.ToString() : string.Format(f, w.Batch.EndTime)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Lite_per_pulse_Read, "1 / PlsPerLtr_Read",        Quantity.PulsePerLtr, ItemCategory.Other, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", (w.WaterMeterData.PulsesPerLtr != 0) ? 1/w.WaterMeterData.PulsesPerLtr : 0)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed_meters_count, Strings.Passed_meters_count, Quantity.Number,      ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.PassedMetersCount())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Failed_meters_count, Strings.Failed_meters_count, Quantity.Number,      ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.FailedMetersCount())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed_seals_count,  "Seals count of passed meters", Quantity.Number,   ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.PassedMetersCount() * int.Parse(w.WaterMeterData.Text5))));
+
             /// Extra water meter data
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Result_code, Strings.Result_code, Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? w.ResultCode.ToString() : string.Format(f, w.ResultCode)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Remark, Strings.Remark, Quantity.String, ItemCategory.TestResult, (w, t, u, f, p) => w.Batch.Remark));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Meter_type, Strings.Meter_type, Quantity.String, ItemCategory.Other, (w, t, u, f, p) => w.WaterMeterData.Compound ? Strings.Compound : (w.WaterMeterData.HeatMeter ? Strings.Heat_meter : Strings.Single)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Result_code, Strings.Result_code, Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.ResultCode)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Remark,      Strings.Remark,      Quantity.String, ItemCategory.TestResult,  (w, t, u, f, p) => FormatStr(f, w.Batch.Remark)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Meter_type,  Strings.Meter_type,  Quantity.String, ItemCategory.Other,       (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Compound ? Strings.Compound : (w.WaterMeterData.HeatMeter ? Strings.Heat_meter : Strings.Single))));
 
 #if HEAT_METERS
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy,              Strings.Energy + "()",      Quantity.Energy,        ItemCategory.Other,	(w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeMeter).ToString(GetPr(p, "F1"))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_energy,    Strings.Energy_ref + "()",  Quantity.Energy,        ItemCategory.Other,	(w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeRef).ToString(GetPr(p, "F1"))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy,              Strings.Energy + "()",      Quantity.Energy,        ItemCategory.Other,	(w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) == null) ? "" : (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeMeter).ToString(GetPr(p, "F1"))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_energy,    Strings.Energy_ref + "()",  Quantity.Energy,        ItemCategory.Other,	(w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) == null) ? "" : (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeRef).ToString(GetPr(p, "F1"))));
 #endif
 
 #if IPERL
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.OrigCalibFactor, "iPerl OrigCalibFactor", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => (w.OrigCalibFactor.ToString())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.CalibFactor, "iPerl CalibFactor", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => (w.CalibFactor.ToString())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2ErrWOCorrection, "iPerl Q2ErrWOCorrection", Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.Q2ErrWOCorrection.ToString(GetPr(p, "F2")))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrectionDone, "iPerl Q2CorrectionDone", Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => (w.Q2CorrectionDone ? "yes" : "no")));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrRFlow, "iPerl Q2CorrRFlow", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => (w.Q2CorrRFlow.ToString())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrLFlow, "iPerl Q2CorrLFlow", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => (w.Q2CorrLFlow.ToString())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrFlowRight, "iPerl Q2CorrFlowRight", Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.Q2CorrFlowRight.ToString())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.FW_Version, "iPerl FW version", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => (w.FWVersion)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.OrigCalibFactor, "iPerl OrigCalibFactor", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.OrigCalibFactor)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.CalibFactor, "iPerl CalibFactor", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.CalibFactor)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2ErrWOCorrection, "iPerl Q2ErrWOCorrection", Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.Q2ErrWOCorrection)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrectionDone, "iPerl Q2CorrectionDone", Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => (w.Q2CorrectionDone ? Strings.Yes : Strings.No)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrRFlow, "iPerl Q2CorrRFlow", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrRFlow)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrLFlow, "iPerl Q2CorrLFlow", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrLFlow)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrFlowRight, "iPerl Q2CorrFlowRight", Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrFlowRight)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.FW_Version, "iPerl FW version", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.FWVersion)));
 #endif
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.TestDone, Strings.Test_done + "()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) != null && w.GetMeterTestRslt(t).TestDone) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.TestDone, Strings.Test_done + "()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) != null && w.GetMeterTestRslt(t).TestDone) ? Strings.Yes : Strings.No));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.TestPassed, Strings.Test_passed + "()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) != null && w.GetMeterTestRslt(t).Passed) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.ErrorFlags, Strings.Error_flags + "()", Quantity.String, ItemCategory.TestResult, (w, t, u, f, p) => FormatStr(f, (w.GetTestRslt(t) != null) ? w.GetTestRslt(t).ErrorFlagsStr() : w.ErrorFlagstStr())));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E1,  "E1 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0001) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E2,  "E2 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0002) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E3,  "E3 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0004) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E4,  "E4 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0008) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E5,  "E5 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0010) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E6,  "E6 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0020) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E7,  "E7 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0040) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E8,  "E8 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0080) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E9,  "E9 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0100) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E10, "E10 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0200) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E11, "E11 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0400) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E12, "E12 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0800) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E13, "E13 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x1000) != 0) ? Strings.Yes : Strings.No));
+			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.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)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.WMRemark, string.Format("{0} {1}", Strings.Water_Meter, Strings.Remark), Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.Remark)));
 		}
 
+		/// To be updated by Output.FileWriter or Output.Printer
+		public static int TableRowNr;
+		public static int TableColumnNr;
+
+
+        public static string FormatStr(string format, string value)
+        {
+            return  string.IsNullOrEmpty(format) ? value : string.Format(format, value);
+        }
+
+        public static string FormatInt(string format, int value)
+        {
+            return  string.IsNullOrEmpty(format) ? value.ToString() : string.Format(format, value);
+        }
+
+        public static string FormatDbl(Config.Unit units, string format, string precisionOrEmpty, string dfltPrecision, double v)
+        {
+            return FormatDbl(units, format, precisionOrEmpty, dfltPrecision, v, CultureInfo.CurrentCulture);
+        }
+        /// 
+        public static string FormatDbl(Config.Unit units, string format, string precisionOrEmpty, string dfltPrecision, double v, CultureInfo ci)
+        {
+            double val = Config.Units.ConvertTo(units, v);
+
+            string precision = string.IsNullOrEmpty(precisionOrEmpty) ? dfltPrecision : precisionOrEmpty;
+
+            /// Modify "Vx" precision specification to an appropriate "Fx" format specification
+            if (precision.Contains("V"))
+            {
+                int significantDigits;
+                if (int.TryParse(precision.Substring(1), out significantDigits))
+                {
+                    precision = Utils.SignificantDigitsToFmt(val, significantDigits);
+                }
+            }
+
+            if (string.IsNullOrEmpty(format))
+            {
+                if (-float.Epsilon <= val && val <= float.Epsilon)
+                    return "0";
+                else
+                    return val.ToString(precision, ci);
+            }
+            else
+            {
+                if (-float.Epsilon <= val && val <= float.Epsilon)
+                    return string.Format(format, "0");
+                else
+                    return string.Format(format, val.ToString(precision, ci));
+            }
+        }
+
+        public static string FormatDbl(Config.Unit units, string format, string precisionOrEmpty, string dfltPrecision, double v1, double v2)
+        {
+            return FormatDbl(units, format, precisionOrEmpty, dfltPrecision, v1, v2, CultureInfo.CurrentCulture);
+        }
+        /// 
+        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, v1);
+
+            string precision = string.IsNullOrEmpty(precisionOrEmpty) ? dfltPrecision : precisionOrEmpty;
+
+            /// Modify "Vx" precision specification to an appropriate "Fx" format specification
+            if (precision.Contains("V"))
+            {
+                int significantDigits;
+                if (int.TryParse(precision.Substring(1), out significantDigits))
+                {
+                    precision = Utils.SignificantDigitsToFmt(val1, significantDigits);
+                }
+            }
+
+            if (string.IsNullOrEmpty(format))
+            {
+                return string.Format("{0} {1}",
+                    (-float.Epsilon <= val1 && val1 <= float.Epsilon) ? "0" : val1.ToString(precision, ci),
+                    (-float.Epsilon <= val2 && val2 <= float.Epsilon) ? "0" : val2.ToString(precision, ci));
+            }
+            else
+            {
+                return string.Format(format,
+                    (-float.Epsilon <= val1 && val1 <= float.Epsilon) ? "0" : val1.ToString(precision, ci),
+                    (-float.Epsilon <= val2 && val2 <= float.Epsilon) ? "0" : val2.ToString(precision, ci));
+            }
+        }
+
+
         /// <summary>
         /// Converts a list of 'Output item specifications' to a string array
         /// </summary>
@@ -359,12 +498,17 @@ namespace Results
 			string[] result = new string[count];
             for (int i = 0; i < count; i++)
             {
+				if (items[i].Caption == null) items[i].Caption = string.Empty;
+				if (items[i].TestID == null) items[i].TestID = string.Empty;
+				if (items[i].Format == null) items[i].Format = string.Empty;
+				if (items[i].Precision == null) items[i].Precision = string.Empty;
+
                 result[i] = string.Format("{0}~{1}~{2}~{3}~{4}~{5}~{6}~{7}",
                                           items[i].Uid,
-                                          items[i].Caption,
+                                          items[i].Caption.Replace("~", "\n"),
                                           items[i].TestID,
                                           items[i].Units,
-                                          items[i].Format,
+                                          items[i].Format.Replace("~", "\n"),
                                           items[i].Precision,
                                           items[i].Width,
 										  items[i].Alignment);
@@ -425,14 +569,14 @@ namespace Results
 							///
 							/// Load the new style results item specification
 							/// 
-							item.Caption = field[1];
+                            item.Caption = field[1].Replace("\n", "~");
 							item.TestID = field[2];
 							item.Units = 0;
 							for (Config.Unit u = 0; u < Config.Unit.Count; u++)
 							{
 								if (u.ToString().Equals(field[3])) { item.Units = u; break; }
 							}
-							item.Format = field[4];
+							item.Format = field[4].Replace("\n", "~");
 							item.Precision = field[5];
 							item.Width = int.Parse(field[6]);
 							item.Alignment = 0;
@@ -481,5 +625,13 @@ namespace Results
         {
             return GetItem((int)itemId);
         }
+
+        public override string ToString()
+        {
+            if (!string.IsNullOrEmpty(Caption))
+                return Caption;
+            else
+                return ((ItemID)Uid).ToString();
+        }
     }
 }