Reconfigured for Kempno PT50

ProcedureDlg implements them, ver. 2.13.555.

.gitignore

@@ -2,6 +2,10 @@ Config/bin/
 Config/obj/
 DeviceTest/bin/
 DeviceTest/obj/
+Dirichlet.Numerics/bin
+Dirichlet.Numerics/obj
+GraphLib/bin
+GraphLib/obj
 Results/bin/
 Results/obj/
 ResultsBrowser/bin/
@@ -10,6 +14,10 @@ TestBenchFramework/bin/
 TestBenchFramework/obj/
 TBFSetup/Debug/
 TBFSetup/Release/
+Users/bin/
+Users/obj/
+UserManagement/bin/
+UserManagement/obj/
 Doc/
 *.suo
 *.bak

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;KEMPNO_50;LANG_PL</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;KEMPNO_50;LANG_PL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -66,7 +66,6 @@
   <ItemGroup>
     <Compile Include="Data.cs" />
     <Compile Include="DatabaseSettings.cs" />
-    <Compile Include="DBSettings.cs" />
     <Compile Include="Entities\BenchPath.cs" />
     <Compile Include="Entities\Component.cs" />
     <Compile Include="Entities\ComponentProcedure.cs" />
@@ -76,15 +75,14 @@
     <Compile Include="Entities\Group.cs" />
     <Compile Include="Entities\HeatMetersPath.cs" />
     <Compile Include="Entities\IHasItemNr.cs" />
+    <Compile Include="Entities\IHasName.cs" />
     <Compile Include="Entities\IHasValves.cs" />
     <Compile Include="Entities\MeasurementCorrection.cs" />
     <Compile Include="Entities\MetersPath.cs" />
-    <Compile Include="Entities\MeterTestResult.cs" />
     <Compile Include="Entities\OutputPath.cs" />
     <Compile Include="Entities\Procedure.cs" />
     <Compile Include="Entities\ProcedureHistory.cs" />
     <Compile Include="Entities\Test.cs" />
-    <Compile Include="Entities\TestResult.cs" />
     <Compile Include="Entities\TransitionSequence.cs" />
     <Compile Include="Entities\TransitionStep.cs" />
     <Compile Include="Entities\User.cs" />
@@ -93,7 +91,6 @@
     <Compile Include="Entities\Watermeter.cs" />
     <Compile Include="Entities\WMType.cs" />
     <Compile Include="FluentCommon.cs" />
-    <Compile Include="Grp.cs" />
     <Compile Include="Mappings\BenchPathMap.cs" />
     <Compile Include="Mappings\ComponentMap.cs" />
     <Compile Include="Mappings\ComponentProcedureMap.cs" />
@@ -103,11 +100,9 @@
     <Compile Include="Mappings\HeatMetersPathMap.cs" />
     <Compile Include="Mappings\MeasurementCorrectionMap.cs" />
     <Compile Include="Mappings\MetersPathMap.cs" />
-    <Compile Include="Mappings\MeterTestResultMap.cs" />
     <Compile Include="Mappings\OutputPathMap.cs" />
     <Compile Include="Mappings\ProcedureMap.cs" />
     <Compile Include="Mappings\TestMap.cs" />
-    <Compile Include="Mappings\TestResultMap.cs" />
     <Compile Include="Mappings\TransitionSequenceMap.cs" />
     <Compile Include="Mappings\TransitionStepMap.cs" />
     <Compile Include="Mappings\UserMap.cs" />
@@ -126,11 +121,20 @@
   <ItemGroup>
     <EmbeddedResource Include="Resources\Strings.cs.resx" />
     <EmbeddedResource Include="Resources\Strings.de.resx" />
+    <EmbeddedResource Include="Resources\Strings.it.resx" />
+    <EmbeddedResource Include="Resources\Strings.pl.resx" />
     <EmbeddedResource Include="Resources\Strings.resx">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Strings.ru.resx" />
     <EmbeddedResource Include="Resources\Strings.zh-CN.resx" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Users\Users.csproj">
+      <Project>{6E5CB0E9-E1B6-4E5D-AC6E-B1049E180F2B}</Project>
+      <Name>Users</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Config/DBSettings.cs

@@ -1,31 +0,0 @@
-///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
-///
-using System;
-
-namespace Config
-{
-    /// <summary>
-    /// Database settings required to make a connection
-    /// </summary>
-    public class DBSettings : ICloneable
-    {
-        public Entities.DBType DbType;
-        public string ConnectionString;
-
-        public DBSettings()
-        {
-        }
-
-		public DBSettings(Entities.DBType dbType, string connectionString)
-        {
-            this.DbType = dbType;
-            this.ConnectionString = connectionString;
-        }
-
-        public object Clone()
-        {
-            return new DBSettings(DbType, ConnectionString);
-        }
-    }
-}

Config/Data.cs

@@ -2,7 +2,7 @@
 
 namespace Config
 {
-	public class Data
+	public class Data : Users.GlobalData
 	{
 		public const string AdminUsername = "admin";
 		public const string AdminPassword = "staratura";
@@ -13,58 +13,70 @@ namespace Config
 		public const int LineSize = 1;
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = 3;
 #elif DN100 || BADGER_VELKA_TRAT
 		public const int WMsCount = 3;
 		public const int LineSize = 3;
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
-#elif FUZHOU300 || FUZHOU150 || PT200IL || PUCHONG_PT200 || GENESIS
+        public const int MaxPartNr = WMsCount / LineSize;
+#elif FUZHOU300 || FUZHOU150 || PT200IL || PUCHONG_PT200 || GENESIS || SLM_150 || PETERSBURG_200
 		public const int WMsCount = 6;
 		public const int LineSize = 6;
 		public const int CompoundWMsCount = 3;
 		public const int HeatMetersCount = 0;
-#elif TORINO50 || BADGER_MALA_TRAT
+        public const int MaxPartNr = 3;
+#elif TORINO50 || BADGER_MALA_TRAT || BERLIN
 		public const int WMsCount = 6;
 		public const int LineSize = 6;
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
-#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40
-		public const int WMsCount = 20;
+        public const int MaxPartNr = 1;
+#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50
+        public const int WMsCount = 20;
 		public const int LineSize = 10;
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
-#elif IPERLST
+        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;
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
-#elif IPERLST_SPECIAL
+        public const int MaxPartNr = WMsCount / LineSize;
+#elif TURA_SPECIAL
 		public const int WMsCount = 6;
 		public const int LineSize = 6;
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
 #elif SLM_50
 		public const int WMsCount = 12;
 		public const int LineSize = 12;
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 6;
-#elif SLM_END
-		public const int WMsCount = 12;
-		public const int LineSize = 6;
+        public const int MaxPartNr = WMsCount / LineSize;
+#elif SLM_END || WARSAW_END
+        public const int WMsCount = 10;
+		public const int LineSize = 5;
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = 4;
 #elif MALTA_WSD25
 		public const int WMsCount = 6;
 		public const int LineSize = 6;
 		public const int CompoundWMsCount = 0;
 		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
 #endif
-        public static int MaxPartNr()
-		{
-			return Math.Max(WMsCount / LineSize, CompoundWMsCount);
-		}
 
-		///
+        ///
 		/// Database related: This object reference is set after a successful user login
 		///
 		public static DatabaseSettings CurrentBench;

Config/DatabaseSettings.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System;
 using System.Text;
@@ -15,16 +15,18 @@ namespace Config
         // Public fields
         public string BenchName;
         public bool IsRealBench;
-        public DBSettings ProceduresDBSettings;		/// Config database settings
-        public DBSettings WaterMetersDBSettings;	/// Results database settings
+        public Users.DBSettings ProceduresDBSettings;		/// Config database settings
+		public Users.DBSettings WaterMetersDBSettings;	/// Results database settings
+		public Users.DBSettings UsersDBSettings;		    /// Users database settings
 
         // Constructor
         public DatabaseSettings()
         {
-            BenchName = String.Empty;           /// Empty string to avoid null
+            BenchName = String.Empty;               /// Empty string (avoid null)
             IsRealBench = false;
-			ProceduresDBSettings  = new DBSettings(Entities.DBType.MySql, "SERVER=localhost; DATABASE=tbf_procedures; UID=root; PASSWORD=;");
-			WaterMetersDBSettings = new DBSettings(Entities.DBType.MySql, "SERVER=localhost; DATABASE=tbf_watermeters; UID=root; PASSWORD=;");
+			ProceduresDBSettings = new Users.DBSettings(Users.Entities.DBType.MySql, string.Empty);
+			WaterMetersDBSettings = new Users.DBSettings(Users.Entities.DBType.MySql, string.Empty);
+			UsersDBSettings = new Users.DBSettings(Users.Entities.DBType.MySql, string.Empty);
         }
 
         public object Clone()
@@ -33,15 +35,20 @@ namespace Config
 
             result.BenchName    = BenchName;
             result.IsRealBench  = IsRealBench;
-            result.ProceduresDBSettings  = (DBSettings)ProceduresDBSettings.Clone();
-            result.WaterMetersDBSettings = (DBSettings)WaterMetersDBSettings.Clone();
+			result.ProceduresDBSettings = (Users.DBSettings)ProceduresDBSettings.Clone();
+			result.WaterMetersDBSettings = (Users.DBSettings)WaterMetersDBSettings.Clone();
+			result.UsersDBSettings = (Users.DBSettings)ProceduresDBSettings.Clone();
 
             return result;
         }
 
 		public override string ToString()
 		{
-			return string.Format("{0} conn.str.={1}", BenchName, ProceduresDBSettings.ConnectionString);
+            return string.Format("{0} config={1} results={2} users={3}",
+                                 BenchName,
+                                 ProceduresDBSettings.ConnectionString,
+                                 WaterMetersDBSettings.ConnectionString,
+                                 UsersDBSettings.ConnectionString);
 		}
     }
 }

Config/Entities/BenchPath.cs

@@ -1,22 +1,24 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
 
 namespace Config.Entities
 {
-	public class BenchPath : IHasItemNr, IHasValves
+	public class BenchPath : IHasName, IHasItemNr, IHasValves
     {
-        public virtual int Id { get; protected set; }
-		public virtual int ItemNr { get; set; }
+        public virtual int    Id { get; protected set; }
+		public virtual int    ItemNr { get; set; }
 		public virtual string Name { get; set; }
-        public virtual float Qfrom { get; set; }        /// Water flow in [m3/h]
-        public virtual float Qto { get; set; }          /// Water flow in [m3/h]
-        public virtual string TempIn { get; set; }
-        public virtual string TempOut { get; set; }
-        public virtual string PressIn { get; set; }
-        public virtual string PressOut { get; set; }
+        public virtual string OriName { get; set; }         /// Not mapped to database
+        public virtual float  Qfrom { get; set; }           /// Water flow in [m3/h]
+        public virtual float  Qto { get; set; }             /// Water flow in [m3/h]
+        public virtual string TempMtrUp { get; set; }
+        public virtual string TempMtrDown { get; set; }
+        public virtual string PressMtrUp { get; set; }
+        public virtual string PressMtrDown { get; set; }
+		public virtual string PressMtrDelta { get; set; }
 		public virtual string StopBFValve { get; set; }
 
         /// Valves		
@@ -27,7 +29,7 @@ namespace Config.Entities
 
 		public BenchPath()
         {
-			ValvesOpen = string.Empty;
+			ValvesOpen  = string.Empty;
 			ValvesClose = string.Empty;
 		}
 
@@ -42,14 +44,16 @@ namespace Config.Entities
         {
 			BenchPath result = new BenchPath(name, itemNr);
 
-			result.Qfrom = Qfrom;
-            result.Qto = Qto;
-			result.TempIn = TempIn;
-			result.TempOut = TempOut;
-			result.PressIn = PressIn;
-			result.PressOut = PressOut;
-			result.ValvesOpen = ValvesOpen;
-			result.ValvesClose = ValvesClose;
+			result.Qfrom         = Qfrom;
+            result.Qto           = Qto;
+			result.TempMtrUp     = TempMtrUp;
+			result.TempMtrDown   = TempMtrDown;
+			result.PressMtrUp    = PressMtrUp;
+			result.PressMtrDown  = PressMtrDown;
+			result.PressMtrDelta = PressMtrDelta;
+			result.StopBFValve   = StopBFValve;
+			result.ValvesOpen    = ValvesOpen;
+			result.ValvesClose   = ValvesClose;
 
             return result;
         }

Config/Entities/Component.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 
 namespace Config.Entities
 {
-	public class Component : IHasItemNr
+	public class Component : IHasName, IHasItemNr
 	{
 		public virtual int Id { get; protected set; }
 		public virtual int ItemNr { get; set; }

Config/Entities/ComponentProcedure.cs

@@ -1,6 +1,9 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
+using System;
+using System.IO;
+
 namespace Config.Entities
 {
 	public class ComponentProcedure
@@ -10,13 +13,32 @@ namespace Config.Entities
 		public virtual string Parameters { get; set; }
 		public virtual Procedure Procedure { get; set; }
 
-		public virtual ComponentProcedure Clone()
+		public virtual ComponentProcedure Clone(Procedure newProcedure)
 		{
 			ComponentProcedure result = new ComponentProcedure();
 			result.CmpntName = CmpntName;
 			result.Parameters = Parameters;
-			result.Procedure = Procedure;
+            result.Procedure = newProcedure;
 			return result;
 		}
+
+        public virtual void Export(StreamWriter output)
+        {
+            output.WriteLine(CmpntName);
+            output.WriteLine(Parameters.Replace(Environment.NewLine, "~"));
+        }
+
+        public static ComponentProcedure Import(StreamReader input, Procedure newProcedure)
+        {
+            string firstLine = input.ReadLine();
+
+            if (string.IsNullOrEmpty(firstLine)) return null;
+
+            ComponentProcedure result = new ComponentProcedure();
+            result.CmpntName = firstLine;
+            result.Parameters = input.ReadLine().Replace("~", Environment.NewLine);
+            result.Procedure = newProcedure;
+            return result;
+        }
 	}
 }

Config/Entities/ComponentTest.cs

@@ -1,6 +1,9 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
+using System;
+using System.IO;
+
 namespace Config.Entities
 {
 	public class ComponentTest
@@ -18,5 +21,24 @@ namespace Config.Entities
 			result.Test = Test;
 			return result;
 		}
-	}
+
+        public virtual void Export(StreamWriter output)
+        {
+            output.WriteLine(CmpntName);
+            output.WriteLine(Parameters.Replace(Environment.NewLine, "~"));
+        }
+
+        public static ComponentTest Import(StreamReader input, Test newTest)
+        {
+            string firstLine = input.ReadLine();
+
+            if (string.IsNullOrEmpty(firstLine)) return null;
+
+            ComponentTest result = new ComponentTest();
+            result.CmpntName = firstLine;
+            result.Parameters = input.ReadLine().Replace("~", Environment.NewLine);
+            result.Test = newTest;
+            return result;
+        }
+    }
 }

Config/Entities/Enums.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -38,36 +38,33 @@ namespace Config.Entities
         }
     }
 
-	/// <summary> Identifies the type of a database </summary>
-	public enum DBType
-	{
-		MySql,              /// MySQL database
-		SQLite,             /// SQLite
-		DbTypesCount,
-	}
-
-	/// <summary> Identifies the database based on the content </summary>
-	public enum DBKind
-	{
-		Config,
-		Results,
-		Count,
-	}
-
 	public enum ProcedureState
 	{
 		Active,
 		History,
-		Template,
 		Count,
 	}
 
 	/// <summary> Kind of meters for the procedure / test </summary>
 	public enum MetersKind
 	{
-		Single,
-		Combined,
-        HeatMeter,
+#if LANG_DE
+		[Description("Wasserzähler")]			Single,
+		[Description("Verbundwasserzähler")]	Combined,
+		[Description("Wärmezähler")]			HeatMeter,
+#elif LANG_CS
+		[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("Compound water meters")]	Combined,
+		[Description("Heat meters")]			HeatMeter,
+#endif
 	}
 
 	public enum CompoundMeterId : byte
@@ -78,6 +75,7 @@ namespace Config.Entities
 		Compound,
 		HeatMeterVolume,
 		HeatMeterEnergy,
+		SingleOrCompound,		/// Only used when querying results
 	}
 
 	public enum Medium
@@ -90,12 +88,19 @@ namespace Config.Entities
 
     public enum Mounting
     {
-        [Description("")]  NotSpecified,
+        [Description("")]       NotSpecified,
+#if LANG_DE
+        [Description("H")]      H,         /// horizontal
+        [Description("V")]      V,         /// vertical
+        [Description("STR")]    S,         /// standrohre
+        [Description("F")]      F,         /// fall
+#else
         [Description("H")] H,              /// horizontal
         [Description("V")] V,              /// vertical
         [Description("S")] S,              /// steig
         [Description("F")] F,              /// fall
-        Count
+#endif
+		Count
     }
 
     public enum TemperatureClass
@@ -164,26 +169,39 @@ namespace Config.Entities
 
 	public enum Publish : sbyte
 	{
-#if MUNICH
-        /// nemecky
+#if LANG_DE
+        /// german
         [Description("nie")]          Never = 0,
         [Description("immer")]        Always = 1,
         [Description("Bildschirm")]   OnScreen = 2,
         [Description("intern")]       Internal = 3,
-#elif CEVAK || BADGER_MALA_TRAT || BADGER_VELKA_TRAT
-        /// cesky
+#elif LANG_CS
+        /// czech
         [Description("nikdy")]        Never = 0,
         [Description("vždy")]         Always = 1,
         [Description("na obrazovku")] OnScreen = 2,
         [Description("interně")]      Internal = 3,
-#elif IPERLST || IPERLST_SPECIAL || SLM_50
-        /// slovensky
+#elif LANG_SK
+        /// slovak
         [Description("nikdy")]        Never = 0,
         [Description("vždy")]         Always = 1,
         [Description("na obrazovku")] OnScreen = 2,
         [Description("interne")]      Internal = 3,
+#elif LANG_PL
+        /// polish
+        [Description("nigdy")]        Never = 0,
+        [Description("zawsze")]       Always = 1,
+        [Description("na ekranie")]   OnScreen = 2,
+        [Description("wewnętrznie")]  Internal = 3,
+#elif LANG_RU
+        /// russian
+        [Description("никогда")]      Never = 0,
+        [Description("всегда")]       Always = 1,
+        [Description("толька экран")] OnScreen = 2,
+        [Description("внутренно")]    Internal = 3,
 #else
-        [Description("Never")]        Never = 0,
+		/// english
+		[Description("Never")]        Never = 0,
         [Description("Always")]       Always = 1,
         [Description("On screen")]    OnScreen = 2,
         [Description("Internal")]     Internal = 3,
@@ -191,6 +209,26 @@ namespace Config.Entities
         Count
 	}
 
+	public enum MassMethod : byte
+	{
+#if LANG_DE
+        /// nemecky
+		[Description("Waage")]			Scale,
+		[Description("Spanne")]			Spread,
+		[Description("Standardabw.")]	StdDev,
+#elif LANG_CS
+        /// cesky
+		[Description("váhou")]			Scale,
+		[Description("max.rozdíl")]		Spread,
+		[Description("std.dev.")]		StdDev,
+#else
+		[Description("Scale")]			Scale,
+		[Description("Spread")]			Spread,
+		[Description("Std.dev.")]		StdDev,
+#endif
+		Count
+	}
+
     public enum TestRedType
     {
         Fix,
@@ -208,10 +246,11 @@ namespace Config.Entities
 	public enum Progress
 	{
 		JustStarted,
-		TransitionBefore,
+        TransitionBefore,
 		SwitchingFlowDetection,
 		FlowSetting,
-		Test,
+        Aborted,                /// Use as an argument when a test was aborted
+        Test,
 		TransitionAfter,
 		Completed,
 		Count,
@@ -231,37 +270,76 @@ namespace Config.Entities
 		Count,
 	}
 
-	public enum UnitsVolume
+	public enum ItemCategory
 	{
-		Liter,
-		CubicMtr,
+#if LANG_DE
+		[Description("Allgemein")]				Other,
+		[Description("Prüfstanddaten")]			BenchData,
+		[Description("Prüfstandergebnisse")]	BenchResult,
+		[Description("Prüfpunktdaten")]			TestData,
+		[Description("Prüfpunktergebnisse")]	TestResult,
+		[Description("Wasserzelledaten")]		MeterData,
+		[Description("Wasserzelleergebnisse")]	MeterResult,
+#else
+		[Description("Other")]			Other,
+		[Description("Bench data")]		BenchData,
+		[Description("Bench result")]	BenchResult,
+		[Description("Test data")]		TestData,
+		[Description("Test result")]	TestResult,
+		[Description("Meter data")]		MeterData,
+		[Description("Meter result")]	MeterResult,
+#endif
+		Count,
 	}
 
 	/// <summary> Possible modes of operation of components and devices. </summary>
 	public enum DebugMode
-    {
-		DetectedOff = -2,
-		DetectedOn = -1,
-        Normal = 0,				/// Normal operation
-		AutoDetect,				/// The component (device) will be auto-detected
-		FailureDuringOperation,	/// Failure during operation -> disabled 
-		Off,					/// The component is off
-        Record,
-        Reply,
-        Simulate,				/// Test bench simulation, this mode does not require any hardware
-		Inherit,
+	{
+#if LANG_DE
+		[Description("Erkennen-aus")]	DetectedOff = -2,
+        [Description("Erkennen-ein")]	DetectedOn = -1,
+        [Description("Normal")]         Normal = 0,				/// Normal operation
+        [Description("Auto-erkennen")]  AutoDetect,				/// The component (device) will be auto-detected
+        [Description("Fehler")]         FailureDuringOperation,	/// Failure during operation -> disabled 
+        [Description("Aus")]            Off,					/// The component is off
+        [Description("Aufzeichnen")]    Record,
+        [Description("Reply")]          Reply,
+        [Description("Simuliert")]      Simulate,				/// Test bench simulation, this mode does not require any hardware
+        [Description("Geerbt")]         Inherit,
+#else
+        [Description("Detected off")]   DetectedOff = -2,
+        [Description("Detected on")]    DetectedOn = -1,
+        [Description("Normal")]         Normal = 0,				/// Normal operation
+        [Description("Auto detect")]    AutoDetect,				/// The component (device) will be auto-detected
+        [Description("Run-time error")] FailureDuringOperation,	/// Failure during operation -> disabled 
+        [Description("Off")]            Off,					/// The component is off
+        [Description("Record")]         Record,
+        [Description("Reply")]          Reply,
+        [Description("Simulate")]       Simulate,				/// Test bench simulation, this mode does not require any hardware
+        [Description("Inherit")]        Inherit,
+#endif
 		Count,
     }
 
     public enum LogLevel
-    {
-        Off,
-        Fatal,
-        Error,
-        Warn,
-        Info,
-        Debug,
-        All,
+	{
+#if LANG_DE
+		[Description("Aus")]			Off,
+		[Description("Schwerwiegend")]	Fatal,
+        [Description("Fehler")]			Error,
+		[Description("Warnung")]		Warn,
+        [Description("Info")]			Info,
+        [Description("Debug")]			Debug,
+        [Description("Alles")]			All,
+#else
+        [Description("Off")]    Off,
+        [Description("Fatal")]  Fatal,
+        [Description("Error")]  Error,
+        [Description("Warn")]   Warn,
+        [Description("Info")]   Info,
+        [Description("Debug")]  Debug,
+        [Description("All")]    All,
+#endif
         Count,
     }
 
@@ -281,12 +359,62 @@ namespace Config.Entities
 	}
 
     public enum Alignment
-    {
-        Left,
-        Center,
-        Right,
-        Justified,
+	{
+#if LANG_DE
+		[Description("links")]      Left,
+        [Description("zentriert")]  Center,
+        [Description("rechts")]     Right,
+        [Description("angepasst")]  Justified,
+#else
+        [Description("Left")]       Left,
+        [Description("Center")]     Center,
+        [Description("Right")]      Right,
+        [Description("Justified")]  Justified,
+#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/FeedingPath.cs

@@ -1,16 +1,17 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
 
 namespace Config.Entities
 {
-	public class FeedingPath : IHasItemNr, IHasValves
+	public class FeedingPath : IHasName, IHasItemNr, IHasValves
     {
         public virtual int Id { get; protected set; }
 		public virtual int ItemNr { get; set; }
 		public virtual string Name { get; set; }
+        public virtual string OriName { get; set; }         /// Not mapped to database
         public virtual float Qfrom { get; set; }            /// Water flow in [m3/h]
         public virtual float Qto { get; set; }              /// Water flow in [m3/h]
 		public virtual string Pump { get; set; }

Config/Entities/Group.cs

@@ -1,8 +1,7 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System;
-using System.Collections.Generic;
 
 namespace Config.Entities
 {
@@ -11,5 +10,15 @@ namespace Config.Entities
         public virtual int Id { get; protected set; }
         public virtual int Gid { get; set; }
         public virtual string Name { get; set; }
-    }
+
+		public Group()
+		{
+		}
+
+		public Group(int gid, string name)
+		{
+			Gid = gid;
+			Name = name;
+		}
+	}
 }

Config/Entities/HeatMetersPath.cs

@@ -1,15 +1,16 @@
 ///
-/// Copyright (c) 2016 Sensus Metering Systems
+/// Copyright (c) 2016-2017 Sensus Metering Systems
 ///
 using System;
 
 namespace Config.Entities
 {
-	public class HeatMetersPath : IHasItemNr
+	public class HeatMetersPath : IHasName, IHasItemNr
     {
         public virtual int Id { get; protected set; }
 		public virtual int ItemNr { get; set; }
 		public virtual string Name { get; set; }
+        public virtual string OriName { get; set; }         /// Not mapped to database
 
         public virtual float TempWarmFrom { get; set; }		/// Warm temperature range from [°C]
         public virtual float TempWarmTo { get; set; }       /// Warm temperature range to [°C]

Config/Entities/IHasName.cs

@@ -0,0 +1,11 @@
+///
+/// Copyright (c) 2017 Sensus Metering Systems
+///
+namespace Config.Entities
+{
+	public interface IHasName
+	{
+		int Id { get; }
+		string Name { get; set; }
+	}
+}

Config/Entities/MeterTestResult.cs

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

Config/Entities/MetersPath.cs

@@ -1,16 +1,17 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
 
 namespace Config.Entities
 {
-	public class MetersPath : IHasItemNr
+	public class MetersPath : IHasName, IHasItemNr
     {
         public virtual int Id { get; protected set; }
 		public virtual int ItemNr { get; set; }
 		public virtual string Name { get; set; }
+        public virtual string OriName { get; set; }     /// Not mapped to database
 
         /// Sensors
 		public virtual string Sensor1 { get; set; }

Config/Entities/OutputPath.cs

@@ -1,26 +1,27 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
 
 namespace Config.Entities
 {
-	public class OutputPath : IHasItemNr, IHasValves
+	public class OutputPath : IHasName, IHasItemNr, IHasValves
     {
         public virtual int Id { get; protected set; }
 		public virtual int ItemNr { get; set; }
 		public virtual string Name { get; set; }
-        public virtual float Qfrom { get; set; }        /// Water flow in [m3/h]
-        public virtual float Qto { get; set; }          /// Water flow in [m3/h]
+        public virtual string OriName { get; set; }         /// Not mapped to database
+        public virtual float Qfrom { get; set; }			/// Water flow in [m3/h]
+        public virtual float Qto { get; set; }				/// Water flow in [m3/h]
         public virtual string RegulValve { get; set; }
 		public virtual string FlowMeter { get; set; }
-		public virtual float PidCoef { get; set; }		/// PID coefficient for the regulation path
+		public virtual float PidCoef { get; set; }			/// PID coefficient for the regulation path
         public virtual string StartValve { get; set; }
         public virtual string Diverter { get; set; }
 		public virtual string TempDiv { get; set; }
-		public virtual string Balance { get; set; }
-		public virtual string EmptyTankValve { get; set; }
+		public virtual string Scale { get; set; }
+		public virtual string EmptyTankValve { get; set; }	/// Not used anywhere
 
         /// Valves		
 		public virtual string ValvesOpen { get; set; }
@@ -54,7 +55,7 @@ namespace Config.Entities
             result.StartValve = StartValve;
 			result.Diverter = Diverter;
 			result.TempDiv = TempDiv;
-			result.Balance = Balance;
+			result.Scale = Scale;
 			result.EmptyTankValve = EmptyTankValve;
 			result.ValvesOpen = ValvesOpen;
 			result.ValvesClose = ValvesClose;

Config/Entities/Procedure.cs

@@ -1,15 +1,17 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
 
 namespace Config.Entities
 {
     /// <summary>
     /// Stores one test procedure, supports revisions and history log
     /// </summary>
-	public class Procedure : IHasItemNr
+	public class Procedure : IHasName, IHasItemNr
     {
         public virtual int Id { get; protected set; }
 		public virtual int ItemNr { get; set; }
@@ -25,11 +27,13 @@ namespace Config.Entities
 		public virtual ProcedureState ProcedureState { get; set; }
 		public virtual int Revision { get; set; }
 		public virtual int PredecessorId { get; set; }
-		public virtual bool ObtainedByCopy { get; set; }
-		/// 
-		public virtual MetersKind MetersKind { get; set; }
+		public virtual bool ObtainedByCopy { get; set; }		/// Initial version of this procedure was a copy of another procedure
+        /// 
+		public virtual MetersKind MetersKind { get; set; }		/// single / compound / heat meters
 		public virtual string Watermeters { get; set; }			/// Water meter name or Id
-		public virtual string ProtocolTitle { get; set; }		/// Title of the printed and saved protocol
+        public virtual bool Protected { get; set; }             /// true = procedure cannot be changed by a testing specialist
+		public virtual bool MustBeComplete { get; set; }        /// true = procedure can be finished just when all tests were finished
+		public virtual bool ManualCtrlDisabled { get; set; }	/// true = manual control of valves, etc. is disabled
 
 		public virtual string DataEntry { get; set; }			/// Component to use for data entry
 		public virtual string ResultsPrinter { get; set; }		/// Component to use for printing the results
@@ -37,12 +41,12 @@ namespace Config.Entities
 		public virtual string TransitionStart { get; set; }
 		public virtual string TransitionEnd { get; set; }
 
+        public virtual string AltProcName { get; set; }		    /// Alternative procedure name (null or string.Empty = no alt. procedure)
+        public virtual int AltProcPeriod { get; set; }			/// Period of alternative procedures (0 = no alt. procedure)
+
 		public virtual IList<ComponentProcedure> MoreParams { get; set; }
 		public virtual IList<Test> Tests { get; set; }
 
-        ////public virtual string MetrologicalClass { get; set; }
-        ////public virtual IList<WMType> WMTypes { get; set; }
-
         /// ------------- Additional stuff not mapped into the database -------------
 
         public Procedure()
@@ -53,12 +57,14 @@ namespace Config.Entities
 			///
 			/// Default values
 			/// 
-			CreationUser = (User.CurrentUser != null) ? User.CurrentUser.Name : null;
+			CreationUser = (Users.GlobalData.CurrentUser != null) ? Users.GlobalData.CurrentUser.UserName : null;
 			CreationTime = DateTime.Now;
 			LastChgUser = CreationUser;
 			LastChgTime = CreationTime;
 			MetersKind = Entities.MetersKind.Single;
-			ProtocolTitle = "Watermeter test protocol";
+			Watermeters = string.Empty;
+			Description = string.Empty;
+			LongDescription = string.Empty;
         }
 
 		public Procedure(string name, int itemNr)
@@ -88,23 +94,137 @@ namespace Config.Entities
 
 			result.MetersKind = MetersKind;
 			result.Watermeters = Watermeters;
-			result.ProtocolTitle = ProtocolTitle;
-
+            result.Protected = Protected;
+            result.MustBeComplete = MustBeComplete;
+			result.ManualCtrlDisabled = ManualCtrlDisabled;
 			result.DataEntry = DataEntry;
 			result.ResultsPrinter = ResultsPrinter;
 			result.ResultsWriter = ResultsWriter;
 			result.TransitionStart = TransitionStart;
 			result.TransitionEnd = TransitionEnd;
 
-			foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone()); }
+			foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone(result)); }
 			foreach (var test in Tests) { result.Tests.Add(test.Clone()); }
 
-			//result.MetrologicalClass = MetrologicalClass;
-            //result.WMType = WMType.Clone();
+            return result;
+        }
+
+        public virtual void Export(StreamWriter output)
+        {
+			output.WriteLine(ItemNr.ToString(CultureInfo.InvariantCulture));
+            output.WriteLine(Name);
+            output.WriteLine(Description);
+            output.WriteLine(CreationUser);
+			output.WriteLine(CreationTime.ToString(CultureInfo.InvariantCulture));
+            output.WriteLine(LastChgUser);
+			output.WriteLine(LastChgTime.ToString(CultureInfo.InvariantCulture));
+			output.WriteLine(MetersKind.ToString());
+            output.WriteLine(Watermeters);
+            output.WriteLine(Protected.ToString());
+            output.WriteLine(MustBeComplete.ToString());
+			output.WriteLine(ManualCtrlDisabled.ToString());
+            output.WriteLine(DataEntry);
+            output.WriteLine(ResultsPrinter);
+            output.WriteLine(ResultsWriter);
+            output.WriteLine(TransitionStart); 
+            output.WriteLine(TransitionEnd);
+
+            foreach (var prms in MoreParams) { prms.Export(output); }
+            output.WriteLine();
+
+            foreach (var test in Tests) { test.Export(output); }
+            output.WriteLine();
+
+            output.Close();
+        }
+
+        public static Procedure Import(StreamReader input)
+        {
+            Procedure result = new Procedure();
+
+			result.ItemNr = int.Parse(input.ReadLine(), CultureInfo.InvariantCulture);
+            result.Name = input.ReadLine();
+            result.Description = input.ReadLine();
+            result.CreationUser = input.ReadLine();
+			result.CreationTime = DateTime.Parse(input.ReadLine(), CultureInfo.InvariantCulture);
+            result.LastChgUser = input.ReadLine();
+			result.LastChgTime = DateTime.Parse(input.ReadLine(), CultureInfo.InvariantCulture);
+            string line = input.ReadLine();
+            result.MetersKind = line.Equals(MetersKind.Single.ToString()) ? MetersKind.Single : (line.Equals(MetersKind.Combined.ToString()) ? MetersKind.Combined : MetersKind.HeatMeter);
+            result.Watermeters = input.ReadLine();
+            result.Protected = bool.Parse(input.ReadLine());
+            result.MustBeComplete = bool.Parse(input.ReadLine());
+			result.ManualCtrlDisabled = bool.Parse(input.ReadLine());
+            result.DataEntry = input.ReadLine();
+            result.ResultsPrinter = input.ReadLine();
+            result.ResultsWriter = input.ReadLine();
+            result.TransitionStart = input.ReadLine();
+            result.TransitionEnd = input.ReadLine();
+
+            while(true)
+            {
+                ComponentProcedure prms = ComponentProcedure.Import(input, result);
+                if (prms == null)
+                    break;
+                else
+                    result.MoreParams.Add(prms);
+            }
+
+            while (true)
+            {
+                Test tst = Test.Import(input, result);
+                if (tst == null)
+                    break;
+                else
+                    result.Tests.Add(tst);
+            }
 
             return result;
         }
 
+        public virtual string Compare(StreamReader inp)
+        {
+            System.Text.StringBuilder diff = new System.Text.StringBuilder();
+            const string fmt = "{0} = {1}\r\n (in the file {2})\r\n";
+            string ln;
+
+            ln = inp.ReadLine();            /// skip ItemNr
+            ln = inp.ReadLine(); if (ln != Name)                          { diff.AppendFormat(fmt, "Name", Name, ln); };
+            ln = inp.ReadLine(); if (ln != Description)                   { diff.AppendFormat(fmt, "Description", Description, ln); };
+            ln = inp.ReadLine();            /// skip CreationUser
+            ln = inp.ReadLine();            /// skip CreationTime
+            ln = inp.ReadLine();            /// skip LastChgUser
+            ln = inp.ReadLine();            /// skip LastChgTime
+            ln = inp.ReadLine(); if (ln != MetersKind.ToString())         { diff.AppendFormat(fmt, "MetersKind", MetersKind, ln); };
+            ln = inp.ReadLine(); if (ln != Watermeters)                   { diff.AppendFormat(fmt, "Watermeters", Watermeters, ln); };
+
+            ln = inp.ReadLine(); if (ln != Protected.ToString())          { diff.AppendFormat(fmt, "Protected", Protected, ln); };
+            ln = inp.ReadLine(); if (ln != MustBeComplete.ToString())     { diff.AppendFormat(fmt, "MustBeComplete", MustBeComplete, ln); };
+            ln = inp.ReadLine(); if (ln != ManualCtrlDisabled.ToString()) { diff.AppendFormat(fmt, "ManualCtrlDisabled", ManualCtrlDisabled, ln); };
+            ln = inp.ReadLine(); if (ln != DataEntry)                     { diff.AppendFormat(fmt, "DataEntry", DataEntry, ln); };
+            ln = inp.ReadLine(); if (ln != ResultsPrinter)                { diff.AppendFormat(fmt, "ResultsPrinter", ResultsPrinter, ln); };
+            ln = inp.ReadLine(); if (ln != ResultsWriter)                 { diff.AppendFormat(fmt, "ResultsWriter", ResultsWriter, ln); };
+            ln = inp.ReadLine(); if (ln != TransitionStart)               { diff.AppendFormat(fmt, "TransitionStart", TransitionStart, ln); };
+            ln = inp.ReadLine(); if (ln != TransitionEnd)                 { diff.AppendFormat(fmt, "TransitionEnd", TransitionEnd, ln); };
+
+            /// TODO Compare componentprocedure-s
+            while (ComponentProcedure.Import(inp, null) != null)
+            {
+            }
+
+
+            //foreach (var test in Tests)
+            //{
+            //    string testDiff = test.Compare(inp);
+            //    if (testDiff.Contains(
+            //}
+
+            //bool extraTestsInFile = true;
+            //while (Test.Import(inp, null) != null) { extraTestsInFile = true; }
+
+            return diff.ToString();
+        }
+
 		public override string ToString()
 		{
 			return string.Format("{0}, rev.{1}", Name, Revision);

Config/Entities/Test.cs

@@ -1,50 +1,54 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
-/// Author: Milan Hanajik
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
 
 namespace Config.Entities
 {
     /// <summary>
     /// Test, consisting of one or more repetitions of the test 'SingleTest'.
     /// </summary>
-	public class Test : IHasItemNr
+	public class Test : IHasName, IHasItemNr
     {
         public virtual int Id { get; protected set; }
         public virtual int ItemNr { get; set; }
         public virtual string Name { get; set; }	
-		public virtual int Part { get; set; }			/// Part=0 ... test of all WM-s
-														/// Part>0 ... part of a set of tests with the same Name: subset of WM-s is given by MetersPath
-		public virtual sbyte Publish { get; set; }		/// 0=no, 1=in all protocols, 2=on screen, 3=internal
-		public virtual bool Evaluate { get; set; }
-		public virtual float Qfrom { get; set; }        /// Water flow low limit in [m3/h]
-        public virtual float Qto { get; set; }          /// Water flow high limit in [m3/h]
-		public virtual float Volume { get; set; }       /// Test volume (target) in [l]
-		public virtual float TstTime { get; set; }      /// Test time (estimate) in [s]
+		public virtual int Part { get; set; }				/// Part=0 ... test of all WM-s
+															/// Part>0 ... part of a set of tests with the same Name: subset of WM-s is given by MetersPath
+		public virtual sbyte Publish { get; set; }			/// 0=no, 1=in all protocols, 2=on screen, 3=internal
+		public virtual bool DoEvaluate { get; set; }	
+		public virtual float Qfrom { get; set; }			/// Water flow low limit in [m3/h]
+        public virtual float Qto { get; set; }				/// Water flow high limit in [m3/h]
+		public virtual float Volume { get; set; }			/// Test volume (target) in [l]
+        public virtual float TstTime { get; set; }			/// Test time (estimate) in [s]
         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 Uncertainty { get; set; }	///	int [%] makes error limits tighter: 0 <= Uncertainty <= abs(ErrLimXx)
+        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 Emptying { get; set; }
-        public virtual bool Zeroing { get; set; }
-		public virtual float PumpPower { get; set; }	/// Power of the pump in [%] in the range 0 .. 100.0f, use values 0% and 100% for non-FM pumps
-        public virtual int MassRepeats { get; set; }    /// Number of mass. measurements at the beginning/end of test, 0 = default (=5)
-        public virtual float MassSpread { get; set; }   /// Max spread of mass. measurements at the beginning/end of test, 0 = default
-        public virtual bool MassMethod { get; set; }    /// method of mass. measurement at the beginning/end of test: false=slow (precise), true=fast (immediate)
-        public virtual int TimeBeforeFlow { get; set; } /// Delay time before the start of flow control in [s]
-        public virtual int TimeFlow2Mass { get; set; }	/// Delay time from the flow stable to the 1st mass measurement in [s]
-        public virtual int TimePump2StartV { get; set; }/// Delay time from the start of the pump to opening the start valve in [s]
-        public virtual int TimeStop2Mass { get; set; }  /// Delay time from the test end (diverted) to the 2nd mass measuremen in [s]
-		public virtual double TolerRed { get; set; }    ///  = Filter
+        public virtual bool DoDraining { get; set; }
+        public virtual bool DoZeroing { get; set; }
+		public virtual bool DoControlWaterTemp { get; set; }
+		public virtual float TempLimLo { get; set; }		/// Lower limit for the controlled temperature
+		public virtual float TempLimHi { get; set; }		/// Upper limit for the controlled temperature
+		public virtual float PumpPower { get; set; }		/// Power of the pump in [%] in the range 0 .. 100.0f, use values 0% and 100% for non-FM pumps
+        public virtual int MassRepeats { get; set; }		/// Number of mass. measurements at the beginning/end of test, 0 = default (=5)
+        public virtual float MassSpread { get; set; }		/// Max spread of mass. measurements at the beginning/end of test, 0 = default
+		public virtual MassMethod MassMethod { get; set; }	/// method of mass. measurement at the beginning/end of test: false=slow (precise), true=using immediate mass measurement and evaluation
+        public virtual int TimeBeforeFlow { get; set; }		/// Delay time before the start of flow control in [s]
+        public virtual int TimeFlow2Mass { get; set; }		/// Delay time from the flow stable to the 1st mass measurement in [s]
+        public virtual int TimePump2StartV { get; set; }	/// Delay time from the start of the pump to opening the start valve in [s]
+        public virtual int TimeStop2Mass { get; set; }		/// Delay time from the test end (diverted) to the 2nd mass measuremen in [s]
+		public virtual double TolerRed { get; set; }		///  = Filter
         public virtual TestRedType RedType { get; set; }
 		public virtual string FeedingPath { get; set; }
 		public virtual string BenchPath { get; set; }
 		public virtual string OutputPath { get; set; }
 		public virtual string MetersPath { get; set; }
-#if HEAT_METERS_SUPPORT
+#if HEAT_METERS
         public virtual string HeatMetersPath { get; set; }
 #endif
         public virtual string RelTransBefore { get; set; }
@@ -66,25 +70,28 @@ namespace Config.Entities
 			/// Default values
 			///
 			Publish = (sbyte)Config.Entities.Publish.Always;
-			Evaluate = true;
+			DoEvaluate = true;
 			Repeats = 1;
-			Emptying = false;
-			Zeroing = false;
-			ErrLimLo = -2.0f;		/// [%] lower error limit
-			ErrLimHi = 2.0f;		/// [%] upper error limit
+			DoDraining = false;
+			DoZeroing = false;
+			DoControlWaterTemp = false;
+			TempLimLo = 15.0f;
+			TempLimHi = 25.0f;
+			ErrLimLo = -2.0f;				/// [%] lower error limit
+			ErrLimHi = 2.0f;				/// [%] upper error limit
 			Uncertainty = 0;
-            PumpPower = 60.0f;		/// [%]
-            MassRepeats = 0;        /// default
-            MassSpread = 0;         /// default
-            MassMethod = false;     /// default
-            TimeBeforeFlow = 10;	/// [s] time before the start of flow control in [s]
-            TimeFlow2Mass = 5;		/// [s] time from the flow stable to the 1st mass measurement in [s]
-            TimePump2StartV = 1;	/// [s] time from the 1st mass measurement to the test start in [s]
-            TimeStop2Mass = 5;		/// [s] between the test end and the final mass measurement
-            TolerRed = 0;			/// = Filter parameter
-			RelTransBefore = string.Empty;
+            PumpPower = 60.0f;				/// [%]
+            MassRepeats = 0;				/// default
+            MassSpread = 0;					/// default
+            MassMethod = MassMethod.Scale;     /// default
+            TimeBeforeFlow = 10;			/// [s] time before the start of flow control in [s]
+            TimeFlow2Mass = 5;				/// [s] time from the flow stable to the 1st mass measurement in [s]
+            TimePump2StartV = 1;			/// [s] time from the 1st mass measurement to the test start in [s]
+            TimeStop2Mass = 5;				/// [s] between the test end and the final mass measurement
+            TolerRed = 0;					/// = Filter parameter
+			RelTransBefore  = string.Empty;
 			RelTransBetween = string.Empty;
-			RelTransAfter = string.Empty;
+			RelTransAfter   = string.Empty;
 			TransitionAfter = string.Empty;
 		}
 
@@ -103,14 +110,17 @@ namespace Config.Entities
 
 			result.Part = Part;
 			result.Publish = Publish;
-			result.Evaluate = Evaluate;
+			result.DoEvaluate = DoEvaluate;
 			result.Qfrom = Qfrom;
             result.Qto = Qto;
 			result.Volume = Volume;
 			result.TstTime = TstTime;
 			result.Repeats = Repeats;
-            result.Emptying = Emptying;
-            result.Zeroing = Zeroing;
+            result.DoDraining = DoDraining;
+            result.DoZeroing = DoZeroing;
+			result.DoControlWaterTemp = DoControlWaterTemp;
+			result.TempLimLo = TempLimLo;
+			result.TempLimHi = TempLimHi;
 			result.PumpPower = PumpPower;
             result.MassRepeats = MassRepeats;
             result.MassSpread = MassSpread;
@@ -129,7 +139,7 @@ namespace Config.Entities
 			result.BenchPath = BenchPath;
 			result.OutputPath = OutputPath;
 			result.MetersPath = MetersPath;
-#if HEAT_METERS_SUPPORT
+#if HEAT_METERS
             result.HeatMetersPath = HeatMetersPath;
 #endif
 			result.RelTransBefore = RelTransBefore;
@@ -141,11 +151,210 @@ namespace Config.Entities
             return result;
         }
 
+        public virtual void Export(StreamWriter output)
+        {
+            CultureInfo ci = CultureInfo.InvariantCulture;
+
+            output.WriteLine(Name);
+            output.WriteLine(Part.ToString(ci));
+            output.WriteLine(Publish.ToString(ci));
+            output.WriteLine(DoEvaluate.ToString());
+            output.WriteLine(Qfrom.ToString(ci));
+            output.WriteLine(Qto.ToString(ci));
+            output.WriteLine(Volume.ToString(ci));
+            output.WriteLine(TstTime.ToString(ci));
+            output.WriteLine(Method);
+            output.WriteLine(ErrLimLo.ToString(ci));
+            output.WriteLine(ErrLimHi.ToString(ci));
+            output.WriteLine(Uncertainty.ToString(ci));
+            output.WriteLine(Repeats.ToString(ci));
+            output.WriteLine(DoDraining.ToString());
+            output.WriteLine(DoZeroing.ToString());
+			output.WriteLine(DoControlWaterTemp.ToString());
+			output.WriteLine(TempLimLo.ToString(ci));
+			output.WriteLine(TempLimHi.ToString(ci));
+			output.WriteLine(PumpPower.ToString(ci));
+            output.WriteLine(MassRepeats.ToString(ci));
+            output.WriteLine(MassSpread.ToString(ci));
+			output.WriteLine(((byte)MassMethod).ToString(ci));
+            output.WriteLine(TimeBeforeFlow.ToString(ci));
+            output.WriteLine(TimeFlow2Mass.ToString(ci));
+            output.WriteLine(TimePump2StartV.ToString(ci));
+            output.WriteLine(TimeStop2Mass.ToString(ci));
+            output.WriteLine(FeedingPath);
+            output.WriteLine(BenchPath);
+            output.WriteLine(OutputPath);
+            output.WriteLine(MetersPath);
+            output.WriteLine(RelTransBefore);
+            output.WriteLine(RelTransBetween);
+            output.WriteLine(RelTransAfter);
+            output.WriteLine(TransitionAfter);
+
+            foreach (var prms in MoreParams) { prms.Export(output); }
+            output.WriteLine();
+        }
+
+        public static Test Import(StreamReader input, Procedure newProcedure)
+        {
+            string firstLine = input.ReadLine();
+            if (string.IsNullOrEmpty(firstLine))
+            {
+                return null;
+            }
+
+            CultureInfo ci = CultureInfo.InvariantCulture;
+            Test tst = new Test();
+
+            tst.Name = firstLine;
+			tst.Part = int.Parse(input.ReadLine(), ci);
+			tst.Publish = sbyte.Parse(input.ReadLine(), ci);
+			tst.DoEvaluate = bool.Parse(input.ReadLine());
+			tst.Qfrom = float.Parse(input.ReadLine(), ci);
+			tst.Qto = float.Parse(input.ReadLine(), ci);
+			tst.Volume = float.Parse(input.ReadLine(), ci);
+			tst.TstTime = float.Parse(input.ReadLine(), ci);
+            tst.Method = input.ReadLine();
+			tst.ErrLimLo = float.Parse(input.ReadLine(), ci);
+			tst.ErrLimHi = float.Parse(input.ReadLine(), ci);
+			tst.Uncertainty = float.Parse(input.ReadLine(), ci);
+			tst.Repeats = int.Parse(input.ReadLine(), ci);
+            tst.DoDraining = bool.Parse(input.ReadLine());
+			tst.DoZeroing = bool.Parse(input.ReadLine());
+			tst.DoControlWaterTemp = bool.Parse(input.ReadLine());
+			tst.TempLimLo = float.Parse(input.ReadLine(), ci);
+			tst.TempLimHi = float.Parse(input.ReadLine(), ci);
+			tst.PumpPower = float.Parse(input.ReadLine(), ci);
+			tst.MassRepeats = int.Parse(input.ReadLine(), ci);
+			tst.MassSpread = float.Parse(input.ReadLine(), ci);
+			tst.MassMethod = (MassMethod)byte.Parse(input.ReadLine(), ci);
+			tst.TimeBeforeFlow = int.Parse(input.ReadLine(), ci);
+			tst.TimeFlow2Mass = int.Parse(input.ReadLine(), ci);
+			tst.TimePump2StartV = int.Parse(input.ReadLine(), ci);
+			tst.TimeStop2Mass = int.Parse(input.ReadLine(), ci);
+            tst.FeedingPath = input.ReadLine();
+            tst.BenchPath = input.ReadLine();
+            tst.OutputPath = input.ReadLine();
+            tst.MetersPath = input.ReadLine();
+            tst.RelTransBefore = input.ReadLine();
+            tst.RelTransBetween = input.ReadLine();
+            tst.RelTransAfter = input.ReadLine();
+            tst.TransitionAfter = input.ReadLine();
+
+            while (true)
+            {
+                ComponentTest prms = ComponentTest.Import(input, tst);
+                if (prms == null)
+                    break;
+                else
+                    tst.MoreParams.Add(prms);
+            }
+
+            tst.Procedure = newProcedure;
+            return tst;
+        }
+
+        public virtual string Compare(StreamReader inp)
+        {
+            System.Text.StringBuilder diff = new System.Text.StringBuilder();
+            string fmt = string.Format("Test {0} : ", Name) + "{0} = {1}\r\n (in the file {2})\r\n";
+            string ln;
+            CultureInfo ci = CultureInfo.InvariantCulture;
+
+            string firstLine = inp.ReadLine();
+            if (string.IsNullOrEmpty(firstLine)) return string.Format("Test {0} is missing in the file\r\n", Name);
+
+                                 if (Name != firstLine)                     { diff.AppendFormat(fmt, "Name", Name, firstLine); };
+            ln = inp.ReadLine(); if (ln != Part.ToString(ci))               { diff.AppendFormat(fmt, "Part", Part.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != Publish.ToString(ci))            { diff.AppendFormat(fmt, "Publish", Publish.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != DoEvaluate.ToString(ci))         { diff.AppendFormat(fmt, "Evaluate", DoEvaluate.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != Qfrom.ToString(ci))              { diff.AppendFormat(fmt, "Qfrom", Qfrom.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != Qto.ToString(ci))                { diff.AppendFormat(fmt, "Qto", Qto.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != Volume.ToString(ci))             { diff.AppendFormat(fmt, "Volume", Volume.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != TstTime.ToString(ci))            { diff.AppendFormat(fmt, "TstTime", TstTime.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != Method)                          { diff.AppendFormat(fmt, "Method", Method, ln); };
+            ln = inp.ReadLine(); if (ln != ErrLimLo.ToString(ci))           { diff.AppendFormat(fmt, "ErrLimLo", ErrLimLo.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != ErrLimHi.ToString(ci))           { diff.AppendFormat(fmt, "ErrLimHi", ErrLimHi.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != Uncertainty.ToString(ci))        { diff.AppendFormat(fmt, "Uncertainty", Uncertainty.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != Repeats.ToString(ci))            { diff.AppendFormat(fmt, "Repeats", Repeats.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != DoDraining.ToString(ci))         { diff.AppendFormat(fmt, "Draining", DoDraining.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != DoZeroing.ToString(ci))          { diff.AppendFormat(fmt, "Zeroing", DoZeroing.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != DoControlWaterTemp.ToString())   { diff.AppendFormat(fmt, "DoControlWaterTemp", DoControlWaterTemp.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != TempLimLo.ToString(ci))          { diff.AppendFormat(fmt, "TempLimLo", TempLimLo.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != TempLimHi.ToString(ci))          { diff.AppendFormat(fmt, "TempLimHi", TempLimHi.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != PumpPower.ToString(ci))          { diff.AppendFormat(fmt, "PumpPower", PumpPower.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != MassRepeats.ToString(ci))        { diff.AppendFormat(fmt, "MassRepeats", MassRepeats.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != MassSpread.ToString(ci))         { diff.AppendFormat(fmt, "MassSpread", MassSpread.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != ((byte)MassMethod).ToString(ci)) { diff.AppendFormat(fmt, "MassMethod", ((byte)MassMethod).ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != TimeBeforeFlow.ToString(ci))     { diff.AppendFormat(fmt, "TimeBeforeFlow", TimeBeforeFlow.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != TimeFlow2Mass.ToString(ci))      { diff.AppendFormat(fmt, "TimeFlow2Mass", TimeFlow2Mass.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != TimePump2StartV.ToString(ci))    { diff.AppendFormat(fmt, "TimePump2StartV", TimePump2StartV.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != TimeStop2Mass.ToString(ci))      { diff.AppendFormat(fmt, "TimeStop2Mass", TimeStop2Mass.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != FeedingPath)                     { diff.AppendFormat(fmt, "FeedingPath", FeedingPath, ln); };
+            ln = inp.ReadLine(); if (ln != BenchPath)                       { diff.AppendFormat(fmt, "BenchPath", BenchPath, ln); };
+            ln = inp.ReadLine(); if (ln != OutputPath)                      { diff.AppendFormat(fmt, "OutputPath", OutputPath, ln); };
+            ln = inp.ReadLine(); if (ln != MetersPath)                      { diff.AppendFormat(fmt, "MetersPath", MetersPath, ln); };
+            ln = inp.ReadLine(); if (ln != RelTransBefore)                  { diff.AppendFormat(fmt, "RelTransBefore", RelTransBefore, ln); };
+            ln = inp.ReadLine(); if (ln != RelTransBetween)                 { diff.AppendFormat(fmt, "RelTransBetween", RelTransBetween, ln); };
+            ln = inp.ReadLine(); if (ln != RelTransAfter)                   { diff.AppendFormat(fmt, "RelTransAfter", RelTransAfter, ln); };
+            ln = inp.ReadLine(); if (ln != TransitionAfter)                 { diff.AppendFormat(fmt, "TransitionAfter", TransitionAfter, ln); };
+
+            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;
 
-			return string.Format("{0}(P.{1},{2}){3}", Name, ((Publish)Publish).ToString(), Evaluate ? "E" : "-", partStr);
+			return string.Format("{0}(P.{1},{2}){3}", Name, ((Publish)Publish).ToString(), DoEvaluate ? "E" : "-", partStr);
 		}
     }
 }

Config/Entities/TestResult.cs

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

Config/Entities/TransitionSequence.cs

@@ -8,12 +8,13 @@ namespace Config.Entities
 	/// <summary>
 	/// Stores one transition sequence containing a list of transition steps
 	/// </summary>
-	public class TransitionSequence : IHasItemNr
+	public class TransitionSequence : IHasName, IHasItemNr
 	{
 		public virtual int Id { get; protected set; }
 		public virtual int ItemNr { get; set; }
 		public virtual string Name { get; set; }
-		public virtual string Description { get; set; }			/// Short description
+        public virtual string OriName { get; set; }             /// Not mapped to database
+        public virtual string Description { get; set; }			/// Short description
 		public virtual IList<TransitionStep> TransitionSteps { get; set; }
 
 		public TransitionSequence()

Config/Entities/TransitionStep.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2015, 2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -12,7 +12,7 @@ namespace Config.Entities
 		public virtual int ItemNr { get; set; }					/// Order of the preparation step
 		public virtual int Duration { get; set; }				/// Duration in seconds
         public virtual string Message { get; set; }				/// Message
-		public virtual StepCondition EndCondition { get; set; }	/// Condition when transition step is finished (next to the duration)
+		public virtual string EndCondition { get; set; }		/// Condition when transition step is finished (next to the duration)
 		public virtual string ValvesOpen { get; set; }			/// List of valves to be opened
 		public virtual string ValvesClose { get; set; }			/// List of valves to be closed
 		public virtual string RegulValvesPct { get; set; }		/// Positions of regulation valves in % separated by ';'
@@ -24,8 +24,8 @@ namespace Config.Entities
 
 		public TransitionStep()
 		{
-			Duration = 5;		/// sec.
-			EndCondition = (int)StepCondition.None;
+			Duration = 5;			/// sec.
+			EndCondition = "None";
 		}
 
 		public TransitionStep(int itemNr, TransitionSequence sequence)
@@ -54,7 +54,7 @@ namespace Config.Entities
 			result += indent + "ItemNr = " + ItemNr.ToString() + ", ";
 			result += indent + "Duration = " + Duration.ToString() + ", ";
 			result += indent + "Message = " + Message + ", ";
-			result += indent + "EndCondition = " + EndCondition.ToString() + ", ";
+			result += indent + "EndCondition = " + EndCondition + ", ";
 			result += indent + "ValvesOpen = " + ValvesOpen + ", ";
 			result += indent + "ValvesClose = " + ValvesClose + ", ";
             result += indent + "RegulValvesPct = " + RegulValvesPct + ", ";

Config/Entities/User.cs

@@ -1,276 +1,43 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
-using System.Security.Cryptography;
-using System.Text;
-using System.Diagnostics;
-using Config.Resources;
-using log4net;
 
 namespace Config.Entities
 {
     public class User
     {
-		static readonly ILog log = LogManager.GetLogger(typeof(User));
-		
 		public virtual int Id { get; protected set; }
-        public virtual string Name { get; set; }
+        public virtual string UserName { get; set; }	/// = name, alias, abbreviation
+		public virtual string FullName { get; set; }	/// = description
 		public virtual int Number { get; set; }
-        public virtual string Password { get; set; }
-        public virtual string Description { get; set; }
+		public virtual string Password { get; set; }
         public virtual DateTime LastPwChange { get; set; }
         public virtual IList<Group> Groups { get; set; }   //User can be a member of a list of groups
 
-		private bool powerUser;		    /// true for built-in users, power users have full access even with empty Groups list
-
         public User()
         {
-			this.powerUser = false;
             Groups = new List<Group>();
-#if IPERLST || IPERLST_SPECIAL
-			Number = 6;
-#else
-            Number = 0;
-#endif
-        }
-
-        public User(string name, int number, bool powerUser)
-		{
-            Name = name;
-            Number = number;
-            this.powerUser = powerUser;
-			Groups = new List<Group>();
-			Description = "Power user";
-		}
-
-        public virtual void AddGroup(Group group)
-        {
-            Groups.Add(group);
-        }
-
-        /// ------------- Additional stuff not mapped into the database -------------
-
-        ///
-        /// Authorized user (static)
-        ///
-        private static User currentUser = null;                         /// Updated by instance methods Authorize, Unauthorize
-        public static User CurrentUser
-        {
-            get { return currentUser; }
-            set { currentUser = value; }
-        }
-
-        private static DateTime lastAuthorization = DateTime.Now;
-        public static DateTime LastAuthorization { get { return lastAuthorization; } }
-
-        /// <summary>
-        /// Check whether user is a member of a group.
-        /// </summary>
-        /// <param name="groupId">Group GID</param>
-        /// <returns>true is user is a member of the specified group</returns>
-        public virtual bool IsMemberOf(Grp.GID groupId)
-        {
-            if (groupId == Grp.GID.None || powerUser)
-            {
-                return true;
-            }
-            else if (groupId >= 0 && (int)groupId < Grp.Count)
-            {
-                // for all group elements in User.groups
-                for (int i = 0; i < Groups.Count; ++i)
-                {
-                    // element GID = parameter GroupId ?
-                    if (((Group)Groups[i]).Gid == (int)groupId)
-                    {
-                        return true;
-                    }
-                }
-                return false;
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Sets users password. It then will be encrypted.
-        /// </summary>
-        /// <param name="password">Password</param>
-        public virtual void SetPassword(string password)
-        {
-            this.Password = EncryptedPassword(password);
-            LastPwChange = DateTime.Now;
-        }
-
-
-        public virtual string EncryptedPassword(string password)
-        {
-            return getHash(password);
-        }
-
-        /// <summary>
-        /// Verifies users password. Used by static bool Authorisation(...)
-        /// </summary>
-        /// <param name="password">Password</param>
-        /// <returns>true if password is correct</returns>
-        public virtual bool CheckPassword(string password)
-        {
-            return (Password == EncryptedPassword(password));
-        }
-
-        /// <summary>
-        /// The FIRST of TWO possible user authorization method to be used
-        /// when a specific group membership is required (you can use Grp.GID.None).
-        /// If the user is not authorized, the current user remains to be a current user
-        /// (i.e. the access rights were not risen to a higher level).
-        /// If you require different behavior, use Unauthorize() before calling Authorize().
-        /// </summary>
-        /// <param name="userName"></param>
-        /// <param name="password"></param>
-        /// <param name="requiredGrupMembership"></param>
-        /// <returns>true = authorized</returns>
-        public virtual bool Authorize(string userName, string password, Grp.GID requiredGroupMembership)
-        {
-			if (Entities.User.IsPowerUser(userName, password))
-			{
-				currentUser = this;
-				lastAuthorization = DateTime.Now;
-				log.FatalFormat("Power user '{0}' authorized @level '{1}'", userName, requiredGroupMembership);
-				return true;
-			}
-
-			if (Name.ToLower() == userName.ToLower())
-            {
-                if (IsMemberOf(requiredGroupMembership) && CheckPassword(password))
-                {
-                    currentUser = this;
-                    lastAuthorization = DateTime.Now;
-					log.FatalFormat("User '{0}' authorized @level '{1}'", userName, requiredGroupMembership);
-					return true;
-                }
-                else
-                {
-                    return false;
-                }
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// The SECOND of TWO possible user authorization method to be used when
-        /// no specific group membership is required.
-        /// If the user is not authorized, the current user remains to be a current user
-        /// (i.e. the access rights were not risen to a higher level).
-        /// If you require different behavior, use Unauthorize() before calling Authorize().
-        /// </summary>
-        /// <param name="userName"></param>
-        /// <param name="password"></param>
-        /// <param name="requiredGroupMembership"></param>
-        /// <returns>true = authorized</returns>
-        public virtual bool Authorize(string userName, string password)
-        {
-            return Authorize(userName, password, Grp.GID.None);
-        }
-
-        /// <summary>
-        /// Returns a 'User' with a given username from a database.
-        /// </summary>
-        /// <param name="username">User name for the query</param>
-        /// <returns>reference to a 'User' (if it exists) or null</returns>
-		public static User AuthorizeDummyUser(string username)
-		{
-			User user = new User();
-			user.Name = username;
-			currentUser = user;
-			return user;
-		}
-
-        /// <summary>
-        /// Returns a 'User' with a given username from an ARBITRARY database.
-        /// </summary>
-        /// <param name="username">User name for the query</param>
-        /// <returns>reference to a 'User' (if it exists) or null</returns>
-        public static User LoadUserByName(string username, DBSettings dbSettings)
-        {
-            IList<User> listOfUsers = FluentCommon.CreateSessionFactory(DBKind.Config, dbSettings, false)
-				.OpenSession()
-				.CreateQuery("FROM User WHERE LOWER(Name) = :username")
-				.SetParameter("username", username.ToLower())
-				.List<User>();
-            if (listOfUsers.Count > 0) return listOfUsers[0];
-            return null;
         }
 
 		/// <summary>
-		/// Returns a 'User' with a given username from the users database.
+		/// Adds a group to the user.
 		/// </summary>
-		/// <param name="username">User name for the query</param>
-		/// <returns>reference to a 'User' (if it exists) or null</returns>
-		public static User LoadUserByName(string username)
+		/// <param name="group">Group to be added</param>
+		public virtual void AddGroup(Group group)
 		{
-			IList<User> listOfUsers = FluentCommon.CreateSession(DBKind.Config)
-				.CreateQuery("FROM User WHERE LOWER(Name) = :username")
-				.SetParameter("username", username.ToLower())
-				.List<User>();
-			if (listOfUsers.Count > 0) return listOfUsers[0];
-			return null;
+			Groups.Add(group);
 		}
 
-        /// <summary>
-        /// returns an IList of all Users
-        /// </summary>
-        public static IList<User> GetAllUsers()
-		{
-            return FluentCommon.CreateSession(DBKind.Config)
-				.CreateQuery("FROM User")
-				.List<User>();
-        }
-
-
-        /// <summary>
-        /// Unauthorize, abandon current users authorization.
-        /// </summary>
-        public static void Unauthorize()
-        {
-            currentUser = null;
-            lastAuthorization = DateTime.Now;
-        }
-
-        /// <summary>
-        /// getHash encrypts a string 
-        /// </summary>
-        /// <param name="text">the string to encrypt</param>
-        /// <returns></returns>
-        public static string getHash(string text)
-        {
-            byte[] bytes = Encoding.Unicode.GetBytes(text);
-            SHA512Managed hashstring = new SHA512Managed();
-            byte[] hash = hashstring.ComputeHash(bytes);
-            string hashString = string.Empty;
-            foreach (byte x in hash)
-            {
-                hashString += String.Format("{0:x2}", x);
-            }
-            return hashString;
-        }
-
 		/// <summary>
-		/// Returns 'true' when authentication data are valid for a power user.
+		/// Encrypts and sets users password.
 		/// </summary>
-		/// <param name="userName">User name</param>
-		/// <param name="password">Password</param>
-		/// <returns>true = authenticated, false = refused</returns>
-		public static bool IsPowerUser(string userName, string password)
+		/// <param name="password">Unencrypted password</param>
+		public virtual void SetPassword(string password)
 		{
-			return (userName.Equals("milan") && password.Equals("napajedla")) ||
-				   (userName.Equals("igor")  && password.Equals("ronko4")) ||
-                   (userName.Equals("janb")  && password.Equals("sen345bnaj21")) ||
-                   (userName.Equals("vlado") && password.Equals("luskovica.430")) ||
-                   (userName.Equals("pakan") && password.Equals("kuriatko")) ||
-                   (userName.Equals("gilles") && password.Equals("alibaba"));
+			Password = Users.Entities.User.getHash(password);
+			LastPwChange = DateTime.Now;
 		}
-    }
+	}
 }

Config/Entities/VirtualBenchSequence.cs

@@ -6,12 +6,13 @@ using System.Collections.Generic;
 
 namespace Config.Entities
 {
-    public class VirtualBenchSequence : IHasItemNr
+	public class VirtualBenchSequence : IHasName, IHasItemNr
     {
 		public virtual int Id { get; protected set; }
 		public virtual int ItemNr { get; set; }
 		public virtual string Name { get; set; }
-		public virtual string Description { get; set; }			/// Short description
+        public virtual string OriName { get; set; }             /// Not mapped to database
+        public virtual string Description { get; set; }			/// Short description
         public virtual IList<VirtualBenchStep> VirtualBenchSteps { get; set; }
 
 		public VirtualBenchSequence()

Config/Entities/WMType.cs

@@ -41,7 +41,7 @@ namespace Config.Entities
             WMType procedure = new WMType()
             {
                 CreateTime = DateTime.Now,
-                CreateUserName = User.CurrentUser.Name,
+				CreateUserName = Users.GlobalData.CurrentUser.UserName,
                 CreateDescription = "A default water meter created.",
                 Name = "Watermeter",
                 PulseRate = 1000,

Config/Entities/Watermeter.cs

@@ -29,7 +29,7 @@ namespace Config.Entities
 		/// </summary>
 		public static Watermeter LoadBySerialnr(string SerialNr)
         {
-            IList<Watermeter> ListOfWatermeters = FluentCommon.CreateSession(DBKind.Results)
+            IList<Watermeter> ListOfWatermeters = FluentCommon.CreateSession(Users.Entities.DBKind.Results)
 				.CreateQuery("FROM Watermeter WHERE Serial = :SerialNrParameter")
 				.SetParameter("SerialNrParameter", SerialNr)
 				.List<Watermeter>();

Config/FluentCommon.cs

@@ -17,61 +17,61 @@ namespace Config
 		/// <summary>
 		/// Session factories for regular sessions.
 		/// </summary>
-		public static ISessionFactory[] SessionFactories = new ISessionFactory[(int)Entities.DBKind.Count];
+		public static ISessionFactory[] SessionFactories = new ISessionFactory[(int)Users.Entities.DBKind.Count];
 
         /// <summary>
         /// NHibernate session factory (to create the database session 'SessionFactory')
         /// </summary>
         /// <returns>A database session</returns>
-        static ISessionFactory CreateSessionFactory(Entities.DBKind database)
+        static ISessionFactory CreateSessionFactory(Users.Entities.DBKind database)
         {
-			Entities.DBType dbType;
+            Users.Entities.DBType dbType;
             string connectionString;
 
 			switch (database)
 			{
                 default:
-				case Entities.DBKind.Config:
+                case Users.Entities.DBKind.Config:
 					dbType = Data.CurrentBench.ProceduresDBSettings.DbType;
 					connectionString = Data.CurrentBench.ProceduresDBSettings.ConnectionString;
                     break;
-				case Entities.DBKind.Results:
+                case Users.Entities.DBKind.Results:
 					dbType = Data.CurrentBench.WaterMetersDBSettings.DbType;
 					connectionString = Data.CurrentBench.WaterMetersDBSettings.ConnectionString;
                     break;
 			}
 
-            return CreateSessionFactory(database, new DBSettings(dbType, connectionString), false);
+            return CreateSessionFactory(database, dbType, connectionString, false);
 		}
 
         /// <summary>
         /// NHibernate session factory (to create the database session 'SessionFactory')
         /// </summary>
         /// <returns>A database session</returns>
-		public static ISessionFactory CreateSessionFactory(Entities.DBKind database, DBSettings dbSettings, bool createDB)
+		public static ISessionFactory CreateSessionFactory(Users.Entities.DBKind database, Users.Entities.DBType dbType, string connectionString, bool createDB)
         {
 			try
 			{
                 FluentConfiguration cfg = Fluently.Configure();
 
-                switch (dbSettings.DbType)
+                switch (dbType)
 				{
 					default:
-					case Entities.DBType.SQLite:
-						cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(dbSettings.ConnectionString));
+                    case Users.Entities.DBType.SQLite:
+						cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
                         break;
-					case Entities.DBType.MySql:
-                        cfg = cfg.Database(MySQLConfiguration.Standard.ConnectionString(dbSettings.ConnectionString));
+                    case Users.Entities.DBType.MySql:
+                        cfg = cfg.Database(MySQLConfiguration.Standard.ConnectionString(connectionString));
                         break;
 				}
 
                 switch (database)
                 {
                     default:
-					case Entities.DBKind.Config:
+					case Users.Entities.DBKind.Config:
                         cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<Data>());
                         break;
-					case Entities.DBKind.Results:
+                    case Users.Entities.DBKind.Results:
                         cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<Data>());
                         break;
                 }
@@ -112,17 +112,17 @@ namespace Config
         }
 
 		/// Create a NHibernate session for the given database
-		public static ISession CreateSession(Entities.DBKind database)
+		public static ISession CreateSession(Users.Entities.DBKind database)
 		{
 			int ix = (int)database;
-			if (ix < 0 || ix >= (int)Entities.DBKind.Count) return null;
+			if (ix < 0 || ix >= (int)Users.Entities.DBKind.Count) return null;
 
 			if (SessionFactories[ix] == null) SessionFactories[ix] = CreateSessionFactory(database);
 
 			return SessionFactories[ix].OpenSession();
 		}
 
-		public static void SaveToDb(Entities.DBKind database, object obj)
+		public static void SaveToDb(Users.Entities.DBKind database, object obj)
 		{
 			SaveToDb(CreateSession(database), obj);
 		}
@@ -131,13 +131,19 @@ namespace Config
 		{
             using (var transaction = session.BeginTransaction())
             {
-                session.SaveOrUpdate(obj);
-                try { transaction.Commit(); }
-                catch { }
+                try
+				{
+					session.SaveOrUpdate(obj);
+					transaction.Commit();
+				}
+                catch
+				{
+					transaction.Rollback();
+				}
             }
         }
 
-		public static void DeleteFromDb(Entities.DBKind database, object obj)
+		public static void DeleteFromDb(Users.Entities.DBKind database, object obj)
 		{
 			DeleteFromDb(CreateSession(database), obj);
 		}
@@ -158,9 +164,9 @@ namespace Config
         /// <param name="dbType">DBType.SQLite or DBType.MySql</param>
         /// <param name="connectionString">Connection string</param>
         /// <returns>true=success, false=error</returns>
-		public static bool CreateEmptyConfigDB(DBSettings dbSettings)
+		public static bool CreateEmptyConfigDB(Users.Entities.DBType dbType, string connectionString)
 		{
-			ISessionFactory sessionFactory = CreateSessionFactory(Entities.DBKind.Config, dbSettings, true);
+			ISessionFactory sessionFactory = CreateSessionFactory(Users.Entities.DBKind.Config, dbType, connectionString, true);
 			if (sessionFactory == null) return false;
 
             /// Populate the database
@@ -171,19 +177,19 @@ namespace Config
                     ///
                     /// Prepare all groups
                     ///
-                    var testers					= new Entities.Group { Gid = (int)Grp.GID.Testers,				  Name = Strings.Tester };
-                    var testingSpecialists		= new Entities.Group { Gid = (int)Grp.GID.TestingSpecialists,	  Name = Strings.Testing_Specialist };
-                    var headOfLab				= new Entities.Group { Gid = (int)Grp.GID.HeadOfLab,			  Name = Strings.Head_of_Lab };
-                    var maintenanceSpecialists	= new Entities.Group { Gid = (int)Grp.GID.MaintenanceSpecialists, Name = Strings.Maintenance_Specialist };
-                    var metrologists			= new Entities.Group { Gid = (int)Grp.GID.Metrologists,			  Name = Strings.Metrologist };
-                    var calibrationSpecialists	= new Entities.Group { Gid = (int)Grp.GID.CalibrationSpecialists, Name = Strings.Calibration_Specialist };
-                    var administrators			= new Entities.Group { Gid = (int)Grp.GID.Administrators,		  Name = Strings.Administrator };
+					var testers					= new Config.Entities.Group((int)Users.Grp.GID.Testers, Strings.Tester);
+					var testingSpecialists		= new Config.Entities.Group((int)Users.Grp.GID.TestingSpecialists, Strings.Testing_Specialist);
+					var headOfLab				= new Config.Entities.Group((int)Users.Grp.GID.HeadOfLab, Strings.Head_of_Lab);
+					var maintenanceSpecialists	= new Config.Entities.Group((int)Users.Grp.GID.MaintenanceSpecialists, Strings.Maintenance_Specialist);
+					var metrologists			= new Config.Entities.Group((int)Users.Grp.GID.Metrologists, Strings.Metrologist);
+					var calibrationSpecialists	= new Config.Entities.Group((int)Users.Grp.GID.CalibrationSpecialists, Strings.Calibration_Specialist);
+					var administrators			= new Config.Entities.Group((int)Users.Grp.GID.Administrators, Strings.Administrator);
 
 					/// Create the user 'admin' add his groups
-                    var admin = new Entities.User
+                    var admin = new Config.Entities.User
                     {
-						Name = Data.AdminUsername,
-                        Description = Strings.Administrator,
+						UserName = Data.AdminUsername,
+                        FullName = Strings.Administrator,
                         LastPwChange = DateTime.Now
                     };
 					admin.SetPassword(Data.AdminPassword);
@@ -214,9 +220,9 @@ namespace Config
         /// <param name="dbType">DBType.SQLite or DBType.MySql</param>
         /// <param name="connectionString">Connection string</param>
         /// <returns>true=success, false=error</returns>
-        public static bool CreateEmptyResultsDB(DBSettings dbSettings)
+		public static bool CreateEmptyResultsDB(Users.Entities.DBType dbType, string connectionString)
         {
-			ISessionFactory sessionFactory = CreateSessionFactory(Entities.DBKind.Results, dbSettings, true);
+			ISessionFactory sessionFactory = CreateSessionFactory(Users.Entities.DBKind.Results, dbType, connectionString, true);
             if (sessionFactory == null) return false;
 
             /// Populate the database

Config/Mappings/BenchPathMap.cs

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

Config/Mappings/HeatMetersPathMap.cs

@@ -6,7 +6,7 @@ using Config.Entities;
 
 namespace Config.Mappings
 {
-#if HEAT_METERS_SUPPORT
+#if HEAT_METERS
 	class HeatMetersPathMap : ClassMap<HeatMetersPath>
     {
         public HeatMetersPathMap()

Config/Mappings/MeterTestResultMap.cs

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

Config/Mappings/OutputPathMap.cs

@@ -21,7 +21,8 @@ namespace Config.Mappings
             Map(x => x.StartValve);
             Map(x => x.Diverter);
 			Map(x => x.TempDiv);
-			Map(x => x.Balance);
+			Map(x => x.Scale)
+				.Column("Balance");
 			Map(x => x.EmptyTankValve);
 			Map(x => x.ValvesOpen)
 				.CustomType("StringClob")

Config/Mappings/ProcedureMap.cs

@@ -28,12 +28,19 @@ namespace Config.Mappings
 
 			Map(x => x.MetersKind);
 			Map(x => x.Watermeters);
-			Map(x => x.ProtocolTitle);
-			Map(x => x.DataEntry);
+            Map(x => x.Protected);
+            Map(x => x.MustBeComplete);
+			Map(x => x.ManualCtrlDisabled);
+
+            Map(x => x.DataEntry);
 			Map(x => x.ResultsPrinter);
 			Map(x => x.ResultsWriter);
 			Map(x => x.TransitionStart);
 			Map(x => x.TransitionEnd);
+
+            Map(x => x.AltProcName);
+            Map(x => x.AltProcPeriod);
+
 			////Map(x => x.MetrologicalClass);
 			////HasOne(x => x.WMType);
 			HasMany(x => x.MoreParams)

Config/Mappings/TestMap.cs

@@ -1,6 +1,5 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
-/// Author: Milan Hanajik
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using FluentNHibernate.Mapping;
 using Config.Entities;
@@ -16,18 +15,25 @@ namespace Config.Mappings
 			Map(x => x.Name);
 			Map(x => x.Part);
 			Map(x => x.Publish);
-			Map(x => x.Evaluate);
+			Map(x => x.DoEvaluate)
+				.Column("Evaluate");
 			Map(x => x.Qfrom);
 			Map(x => x.Qto);
 			Map(x => x.Volume);
 			Map(x => x.TstTime);
 			Map(x => x.Repeats);
-            Map(x => x.Emptying);
-            Map(x => x.Zeroing);
+            Map(x => x.DoDraining)
+				.Column("Emptying");
+            Map(x => x.DoZeroing)
+				.Column("Zeroing");
+            Map(x => x.DoControlWaterTemp);
+            Map(x => x.TempLimLo);
+			Map(x => x.TempLimHi);
 			Map(x => x.PumpPower);
             Map(x => x.MassRepeats);
             Map(x => x.MassSpread);
-            Map(x => x.MassMethod);
+			Map(x => x.MassMethod)
+				.CustomType<byte>();
             Map(x => x.TimeBeforeFlow);
             Map(x => x.TimeFlow2Mass);
             Map(x => x.TimePump2StartV)
@@ -44,7 +50,7 @@ namespace Config.Mappings
 			Map(x => x.BenchPath);
 			Map(x => x.OutputPath);
 			Map(x => x.MetersPath);
-#if HEAT_METERS_SUPPORT
+#if HEAT_METERS
             Map(x => x.HeatMetersPath);
 #endif
             Map(x => x.RelTransBefore);

Config/Mappings/TestResultMap.cs

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

Config/Mappings/UserMap.cs

@@ -10,10 +10,10 @@ namespace Config.Mappings
         public UserMap()
         {
             Id(x => x.Id);
-            Map(x => x.Name);
+            Map(x => x.UserName).Column("Name");
 			Map(x => x.Number);
 			Map(x => x.Password);
-            Map(x => x.Description);
+            Map(x => x.FullName).Column("Description");
             Map(x => x.LastPwChange);
             HasMany(x => x.Groups)
                 .Cascade.All();

Config/Properties/AssemblyInfo.cs

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

Config/Resources/Strings.it.resx

@@ -0,0 +1,153 @@
+<?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="Administrator" xml:space="preserve">
+    <value>Amministratore</value>
+  </data>
+  <data name="Calibration_Specialist" xml:space="preserve">
+    <value>esperto in calibrazione</value>
+  </data>
+  <data name="Head_of_Lab" xml:space="preserve">
+    <value>capo di laboratorio</value>
+  </data>
+  <data name="Maintenance_Specialist" xml:space="preserve">
+    <value>esperto di manutenzione</value>
+  </data>
+  <data name="Metrologist" xml:space="preserve">
+    <value>metrologo</value>
+  </data>
+  <data name="Tester" xml:space="preserve">
+    <value>tester</value>
+  </data>
+  <data name="Testing_Specialist" xml:space="preserve">
+    <value>esperto di prove </value>
+  </data>
+  <data name="Failed" xml:space="preserve">
+    <value>NOK</value>
+  </data>
+  <data name="Passed" xml:space="preserve">
+    <value>ok</value>
+  </data>
+  <data name="Cannot_open_DB_Cause_0" xml:space="preserve">
+    <value>Impossibile aprire il database\\r\\nCause:\\r\\n{0}</value>
+  </data>
+  <data name="Error" xml:space="preserve">
+    <value>Errore</value>
+  </data>
+</root>

Config/Resources/Strings.pl.resx

@@ -0,0 +1,153 @@
+<?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="Administrator" xml:space="preserve">
+    <value>Administrator</value>
+  </data>
+  <data name="Calibration_Specialist" xml:space="preserve">
+    <value>Specjalista ds. kalibracji</value>
+  </data>
+  <data name="Head_of_Lab" xml:space="preserve">
+    <value>Kierownik Laboratorium</value>
+  </data>
+  <data name="Maintenance_Specialist" xml:space="preserve">
+    <value>Konserwator</value>
+  </data>
+  <data name="Metrologist" xml:space="preserve">
+    <value>Metrolog</value>
+  </data>
+  <data name="Tester" xml:space="preserve">
+    <value>Pracownik przeprowadzający testy</value>
+  </data>
+  <data name="Testing_Specialist" xml:space="preserve">
+    <value>Specjalista ds. testów</value>
+  </data>
+  <data name="Failed" xml:space="preserve">
+    <value>Niepowodzenie</value>
+  </data>
+  <data name="Passed" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="Cannot_open_DB_Cause_0" xml:space="preserve">
+    <value>Nie można otworzyć \\r\\nCause:\\r\\n{0}</value>
+  </data>
+  <data name="Error" xml:space="preserve">
+    <value>Błąd</value>
+  </data>
+</root>

Config/Resources/Strings.ru.resx

@@ -0,0 +1,153 @@
+<?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="Administrator" xml:space="preserve">
+    <value>Администратор</value>
+  </data>
+  <data name="Calibration_Specialist" xml:space="preserve">
+    <value>Специалист по калибровке</value>
+  </data>
+  <data name="Head_of_Lab" xml:space="preserve">
+    <value>Руководитель лаборатории</value>
+  </data>
+  <data name="Maintenance_Specialist" xml:space="preserve">
+    <value>Специалист по техобслуживанию</value>
+  </data>
+  <data name="Metrologist" xml:space="preserve">
+    <value>Метролог</value>
+  </data>
+  <data name="Tester" xml:space="preserve">
+    <value>Контролер</value>
+  </data>
+  <data name="Testing_Specialist" xml:space="preserve">
+    <value>Специалист по тестированию</value>
+  </data>
+  <data name="Failed" xml:space="preserve">
+    <value>NOK</value>
+  </data>
+  <data name="Passed" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="Cannot_open_DB_Cause_0" xml:space="preserve">
+    <value>Не удается открыть БД.\\r\\nCause:\\r\\n{0}</value>
+  </data>
+  <data name="Error" xml:space="preserve">
+    <value>Ошибка</value>
+  </data>
+</root>

Config/Units.cs

@@ -9,7 +9,7 @@ namespace Config
 {
     public enum Unit
     {
-        None,
+		[Description("---")]		None,
 
         [Description("l")]          l,          /// * 1 liter
         [Description("m3")]         m3,         ///   1000 l
@@ -71,26 +71,88 @@ namespace Config
 	public enum Quantity
 	{
         /// Quantities with units and conversions (double -> double)
-		[Description("Volume")]         Volume,
-		[Description("Flow")]           Flow,
-		[Description("Mass")]           Mass,
-        [Description("Time")]           Time,
-        [Description("Temperature")]    Temperature,
-		[Description("Pressure")]       Pressure,
-        [Description("Humidity")]       Humidity,
-        [Description("Error")]          Error,
-		[Description("Length")]         Length,
-		[Description("Density")]        Density,
-		[Description("Energy")]         Energy,
-        [Description("Pulse/l")]        PulsePerLtr,
-        [Description("Pulse/kWh")]      PulsePerKWh,
+#if LANG_DE
+		[Description("Volumen")]			Volume,
+		[Description("Durchfluss")]			Flow,
+		[Description("Masse")]				Mass,
+        [Description("Zeit")]				Time,
+        [Description("Temperatur")]			Temperature,
+		[Description("Druck")]				Pressure,
+        [Description("Feuchtigkeit")]		Humidity,
+        [Description("Fehler")]				Error,
+		[Description("Länge")]				Length,
+		[Description("Dichte")]				Density,
+		[Description("Energie")]			Energy,
+        [Description("Impulse/l")]			PulsePerLtr,
+        [Description("Impulse/kWh")]		PulsePerKWh,
 
         /// Quantities without units and conversions
-        [Description("Number")]         Number,
-        [Description("String")]         String,
-        [Description("Boolean")]        Boolean,
-        [Description("Date and time")]  DateTime,
-        Count,
+        [Description("Nummer")]				Number,
+        [Description("Text")]				String,
+        [Description("Boolean")]			Boolean,
+        [Description("Datum und Uhrzeit")]  DateTime,
+#elif LANG_PL
+		[Description("Objętość")]			Volume,
+		[Description("Przepływ")]           Flow,
+		[Description("Masa")]				Mass,
+        [Description("Czas")]				Time,
+        [Description("Temperatura")]		Temperature,
+		[Description("Ciśnienie")]			Pressure,
+        [Description("Wilgotność")]			Humidity,
+        [Description("Błąd")]				Error,
+		[Description("Długość")]			Length,
+		[Description("Gęstość")]			Density,
+		[Description("Energia")]			Energy,
+        [Description("Impulsy/litr")]       PulsePerLtr,
+        [Description("Impulsy/kWh")]		PulsePerKWh,
+
+        /// Quantities without units and conversions
+        [Description("Numer")]				Number,
+        [Description("Tekst")]				String,
+        [Description("Boolean")]			Boolean,
+        [Description("Data i czas")]		DateTime,
+#elif LANG_CS
+		[Description("Objem")]				Volume,
+		[Description("Průtok")]				Flow,
+		[Description("Hmotnost")]           Mass,
+        [Description("Čas")]				Time,
+        [Description("Teplota")]			Temperature,
+		[Description("Tlak")]				Pressure,
+        [Description("Vlhkost")]			Humidity,
+        [Description("Chyba")]				Error,
+		[Description("Délka")]				Length,
+		[Description("Hustota")]			Density,
+		[Description("Energie")]			Energy,
+        [Description("Pulzy/litr")]			PulsePerLtr,
+        [Description("Pulzy/kWh")]			PulsePerKWh,
+
+        /// Quantities without units and conversions
+        [Description("Počet")]				Number,
+        [Description("Text")]				String,
+        [Description("Boolean")]			Boolean,
+        [Description("Datum a čas")]		DateTime,
+#else
+		[Description("Volume")]				Volume,
+		[Description("Flow")]				Flow,
+		[Description("Mass")]				Mass,
+        [Description("Time")]				Time,
+        [Description("Temperature")]		Temperature,
+		[Description("Pressure")]			Pressure,
+        [Description("Humidity")]			Humidity,
+        [Description("Error")]				Error,
+		[Description("Length")]				Length,
+		[Description("Density")]			Density,
+		[Description("Energy")]				Energy,
+        [Description("Pulses/liter")]		PulsePerLtr,
+        [Description("Pulses/kWh")]			PulsePerKWh,
+
+        /// Quantities without units and conversions
+        [Description("Number")]				Number,
+        [Description("String")]				String,
+        [Description("Boolean")]			Boolean,
+        [Description("Date and time")]		DateTime,
+#endif
+		Count,
 	}
 
     public static class Units

DeviceTest/DeviceTest.csproj

@@ -38,6 +38,10 @@
     <StartupObject>DeviceTest.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="log4net, Version=1.2.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -56,6 +60,7 @@
     <Compile Include="DeviceTestDlg.Designer.cs">
       <DependentUpon>DeviceTestDlg.cs</DependentUpon>
     </Compile>
+    <Compile Include="LocalSettings.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="DeviceTestDlg.resx">

DeviceTest/DeviceTestDlg.Designer.cs

@@ -34,17 +34,45 @@
 			this.parentNameTextBox = new System.Windows.Forms.TextBox();
 			this.configureParentButton = new System.Windows.Forms.Button();
 			this.startButton = new System.Windows.Forms.Button();
-			this.stopButton = new System.Windows.Forms.Button();
-			this.initializeButton = new System.Windows.Forms.Button();
 			this.groupBox1 = new System.Windows.Forms.GroupBox();
 			this.groupBox2 = new System.Windows.Forms.GroupBox();
-			this.configureButton = new System.Windows.Forms.Button();
-			this.nameTextBox = new System.Windows.Forms.TextBox();
+			this.configureComponent1Button = new System.Windows.Forms.Button();
+			this.componentNameTextBox = new System.Windows.Forms.TextBox();
 			this.label1 = new System.Windows.Forms.Label();
 			this.label2 = new System.Windows.Forms.Label();
-			this.classNameComboBox = new System.Windows.Forms.ComboBox();
+			this.component1ClassNameComboBox = new System.Windows.Forms.ComboBox();
+			this.radioButton4 = new System.Windows.Forms.RadioButton();
+			this.radioButton3 = new System.Windows.Forms.RadioButton();
+			this.radioButton2 = new System.Windows.Forms.RadioButton();
+			this.radioButton1 = new System.Windows.Forms.RadioButton();
+			this.radioButton0 = new System.Windows.Forms.RadioButton();
+			this.stopButton = new System.Windows.Forms.Button();
+			this.groupBox3 = new System.Windows.Forms.GroupBox();
+			this.configureComponent2Button = new System.Windows.Forms.Button();
+			this.component2NameTextBox = new System.Windows.Forms.TextBox();
+			this.label3 = new System.Windows.Forms.Label();
+			this.label4 = new System.Windows.Forms.Label();
+			this.component2ClassNameComboBox = new System.Windows.Forms.ComboBox();
+			this.radioButton24 = new System.Windows.Forms.RadioButton();
+			this.radioButton23 = new System.Windows.Forms.RadioButton();
+			this.radioButton22 = new System.Windows.Forms.RadioButton();
+			this.radioButton21 = new System.Windows.Forms.RadioButton();
+			this.groupBox4 = new System.Windows.Forms.GroupBox();
+			this.radioButton34 = new System.Windows.Forms.RadioButton();
+			this.radioButton33 = new System.Windows.Forms.RadioButton();
+			this.radioButton32 = new System.Windows.Forms.RadioButton();
+			this.radioButton31 = new System.Windows.Forms.RadioButton();
+			this.groupBox5 = new System.Windows.Forms.GroupBox();
+			this.configureComponent3Button = new System.Windows.Forms.Button();
+			this.component3NameTextBox = new System.Windows.Forms.TextBox();
+			this.label5 = new System.Windows.Forms.Label();
+			this.label6 = new System.Windows.Forms.Label();
+			this.component3ClassNameComboBox = new System.Windows.Forms.ComboBox();
 			this.groupBox1.SuspendLayout();
 			this.groupBox2.SuspendLayout();
+			this.groupBox3.SuspendLayout();
+			this.groupBox4.SuspendLayout();
+			this.groupBox5.SuspendLayout();
 			this.SuspendLayout();
 			// 
 			// parentClassNameComboBox
@@ -83,9 +111,9 @@
 			// 
 			// configureParentButton
 			// 
-			this.configureParentButton.Location = new System.Drawing.Point(77, 68);
+			this.configureParentButton.Location = new System.Drawing.Point(395, 19);
 			this.configureParentButton.Name = "configureParentButton";
-			this.configureParentButton.Size = new System.Drawing.Size(129, 28);
+			this.configureParentButton.Size = new System.Drawing.Size(73, 45);
 			this.configureParentButton.TabIndex = 4;
 			this.configureParentButton.Text = "Configure";
 			this.configureParentButton.UseVisualStyleBackColor = true;
@@ -93,34 +121,15 @@
 			// 
 			// startButton
 			// 
-			this.startButton.Location = new System.Drawing.Point(89, 273);
+			this.startButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.startButton.Location = new System.Drawing.Point(520, 19);
 			this.startButton.Name = "startButton";
-			this.startButton.Size = new System.Drawing.Size(129, 28);
-			this.startButton.TabIndex = 5;
-			this.startButton.Text = "Start device";
+			this.startButton.Size = new System.Drawing.Size(73, 45);
+			this.startButton.TabIndex = 7;
+			this.startButton.Text = "Start";
 			this.startButton.UseVisualStyleBackColor = true;
 			this.startButton.Click += new System.EventHandler(this.startButton_Click);
 			// 
-			// stopButton
-			// 
-			this.stopButton.Location = new System.Drawing.Point(89, 307);
-			this.stopButton.Name = "stopButton";
-			this.stopButton.Size = new System.Drawing.Size(129, 28);
-			this.stopButton.TabIndex = 6;
-			this.stopButton.Text = "Stop device";
-			this.stopButton.UseVisualStyleBackColor = true;
-			this.stopButton.Click += new System.EventHandler(this.stopButton_Click);
-			// 
-			// initializeButton
-			// 
-			this.initializeButton.Location = new System.Drawing.Point(89, 239);
-			this.initializeButton.Name = "initializeButton";
-			this.initializeButton.Size = new System.Drawing.Size(129, 28);
-			this.initializeButton.TabIndex = 7;
-			this.initializeButton.Text = "Start";
-			this.initializeButton.UseVisualStyleBackColor = true;
-			this.initializeButton.Click += new System.EventHandler(this.initializeButton_Click);
-			// 
 			// groupBox1
 			// 
 			this.groupBox1.Controls.Add(this.configureParentButton);
@@ -130,42 +139,42 @@
 			this.groupBox1.Controls.Add(this.parentClassNameComboBox);
 			this.groupBox1.Location = new System.Drawing.Point(12, 12);
 			this.groupBox1.Name = "groupBox1";
-			this.groupBox1.Size = new System.Drawing.Size(405, 106);
+			this.groupBox1.Size = new System.Drawing.Size(486, 75);
 			this.groupBox1.TabIndex = 8;
 			this.groupBox1.TabStop = false;
 			this.groupBox1.Text = "Parent component";
 			// 
 			// groupBox2
 			// 
-			this.groupBox2.Controls.Add(this.configureButton);
-			this.groupBox2.Controls.Add(this.nameTextBox);
+			this.groupBox2.Controls.Add(this.configureComponent1Button);
+			this.groupBox2.Controls.Add(this.componentNameTextBox);
 			this.groupBox2.Controls.Add(this.label1);
 			this.groupBox2.Controls.Add(this.label2);
-			this.groupBox2.Controls.Add(this.classNameComboBox);
-			this.groupBox2.Location = new System.Drawing.Point(12, 127);
+			this.groupBox2.Controls.Add(this.component1ClassNameComboBox);
+			this.groupBox2.Location = new System.Drawing.Point(12, 93);
 			this.groupBox2.Name = "groupBox2";
-			this.groupBox2.Size = new System.Drawing.Size(405, 106);
+			this.groupBox2.Size = new System.Drawing.Size(486, 75);
 			this.groupBox2.TabIndex = 9;
 			this.groupBox2.TabStop = false;
-			this.groupBox2.Text = "Component";
+			this.groupBox2.Text = "Component 1";
 			// 
-			// configureButton
+			// configureComponentButton
 			// 
-			this.configureButton.Location = new System.Drawing.Point(77, 68);
-			this.configureButton.Name = "configureButton";
-			this.configureButton.Size = new System.Drawing.Size(129, 28);
-			this.configureButton.TabIndex = 4;
-			this.configureButton.Text = "Configure";
-			this.configureButton.UseVisualStyleBackColor = true;
-			this.configureButton.Click += new System.EventHandler(this.configureButton_Click);
+			this.configureComponent1Button.Location = new System.Drawing.Point(395, 19);
+			this.configureComponent1Button.Name = "configureComponentButton";
+			this.configureComponent1Button.Size = new System.Drawing.Size(73, 45);
+			this.configureComponent1Button.TabIndex = 4;
+			this.configureComponent1Button.Text = "Configure";
+			this.configureComponent1Button.UseVisualStyleBackColor = true;
+			this.configureComponent1Button.Click += new System.EventHandler(this.configureComponent1Button_Click);
 			// 
-			// nameTextBox
+			// componentNameTextBox
 			// 
-			this.nameTextBox.Enabled = false;
-			this.nameTextBox.Location = new System.Drawing.Point(77, 44);
-			this.nameTextBox.Name = "nameTextBox";
-			this.nameTextBox.Size = new System.Drawing.Size(299, 20);
-			this.nameTextBox.TabIndex = 3;
+			this.componentNameTextBox.Enabled = false;
+			this.componentNameTextBox.Location = new System.Drawing.Point(77, 44);
+			this.componentNameTextBox.Name = "componentNameTextBox";
+			this.componentNameTextBox.Size = new System.Drawing.Size(299, 20);
+			this.componentNameTextBox.TabIndex = 3;
 			// 
 			// label1
 			// 
@@ -185,31 +194,345 @@
 			this.label2.TabIndex = 1;
 			this.label2.Text = "Class";
 			// 
-			// classNameComboBox
+			// componentClassNameComboBox
 			// 
-			this.classNameComboBox.FormattingEnabled = true;
-			this.classNameComboBox.Location = new System.Drawing.Point(77, 19);
-			this.classNameComboBox.Name = "classNameComboBox";
-			this.classNameComboBox.Size = new System.Drawing.Size(299, 21);
-			this.classNameComboBox.TabIndex = 0;
+			this.component1ClassNameComboBox.FormattingEnabled = true;
+			this.component1ClassNameComboBox.Location = new System.Drawing.Point(77, 19);
+			this.component1ClassNameComboBox.Name = "componentClassNameComboBox";
+			this.component1ClassNameComboBox.Size = new System.Drawing.Size(299, 21);
+			this.component1ClassNameComboBox.TabIndex = 0;
+			// 
+			// radioButton4
+			// 
+			this.radioButton4.AutoSize = true;
+			this.radioButton4.Location = new System.Drawing.Point(13, 118);
+			this.radioButton4.Name = "radioButton4";
+			this.radioButton4.Size = new System.Drawing.Size(51, 17);
+			this.radioButton4.TabIndex = 9;
+			this.radioButton4.TabStop = true;
+			this.radioButton4.Text = "spare";
+			this.radioButton4.UseVisualStyleBackColor = true;
+			this.radioButton4.CheckedChanged += new System.EventHandler(this.radioButton4_CheckedChanged);
+			// 
+			// radioButton3
+			// 
+			this.radioButton3.AutoSize = true;
+			this.radioButton3.Location = new System.Drawing.Point(13, 95);
+			this.radioButton3.Name = "radioButton3";
+			this.radioButton3.Size = new System.Drawing.Size(51, 17);
+			this.radioButton3.TabIndex = 8;
+			this.radioButton3.TabStop = true;
+			this.radioButton3.Text = "spare";
+			this.radioButton3.UseVisualStyleBackColor = true;
+			this.radioButton3.CheckedChanged += new System.EventHandler(this.radioButton3_CheckedChanged);
+			// 
+			// radioButton2
+			// 
+			this.radioButton2.AutoSize = true;
+			this.radioButton2.Location = new System.Drawing.Point(13, 72);
+			this.radioButton2.Name = "radioButton2";
+			this.radioButton2.Size = new System.Drawing.Size(51, 17);
+			this.radioButton2.TabIndex = 7;
+			this.radioButton2.TabStop = true;
+			this.radioButton2.Text = "spare";
+			this.radioButton2.UseVisualStyleBackColor = true;
+			this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton2_CheckedChanged);
+			// 
+			// radioButton1
+			// 
+			this.radioButton1.AutoSize = true;
+			this.radioButton1.Location = new System.Drawing.Point(13, 49);
+			this.radioButton1.Name = "radioButton1";
+			this.radioButton1.Size = new System.Drawing.Size(106, 17);
+			this.radioButton1.TabIndex = 6;
+			this.radioButton1.TabStop = true;
+			this.radioButton1.Text = "ReadPressureOp";
+			this.radioButton1.UseVisualStyleBackColor = true;
+			this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
+			// 
+			// radioButton0
+			// 
+			this.radioButton0.AutoSize = true;
+			this.radioButton0.Location = new System.Drawing.Point(13, 26);
+			this.radioButton0.Name = "radioButton0";
+			this.radioButton0.Size = new System.Drawing.Size(94, 17);
+			this.radioButton0.TabIndex = 5;
+			this.radioButton0.TabStop = true;
+			this.radioButton0.Text = "Stop operation";
+			this.radioButton0.UseVisualStyleBackColor = true;
+			this.radioButton0.CheckedChanged += new System.EventHandler(this.radioButton0_CheckedChanged);
+			// 
+			// stopButton
+			// 
+			this.stopButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.stopButton.Location = new System.Drawing.Point(520, 77);
+			this.stopButton.Name = "stopButton";
+			this.stopButton.Size = new System.Drawing.Size(73, 45);
+			this.stopButton.TabIndex = 10;
+			this.stopButton.Text = "Stop";
+			this.stopButton.UseVisualStyleBackColor = true;
+			this.stopButton.Click += new System.EventHandler(this.stopButton_Click);
+			// 
+			// groupBox3
+			// 
+			this.groupBox3.Controls.Add(this.configureComponent2Button);
+			this.groupBox3.Controls.Add(this.component2NameTextBox);
+			this.groupBox3.Controls.Add(this.label3);
+			this.groupBox3.Controls.Add(this.label4);
+			this.groupBox3.Controls.Add(this.component2ClassNameComboBox);
+			this.groupBox3.Location = new System.Drawing.Point(12, 174);
+			this.groupBox3.Name = "groupBox3";
+			this.groupBox3.Size = new System.Drawing.Size(486, 75);
+			this.groupBox3.TabIndex = 11;
+			this.groupBox3.TabStop = false;
+			this.groupBox3.Text = "Component 2";
+			// 
+			// configureComponent2Button
+			// 
+			this.configureComponent2Button.Location = new System.Drawing.Point(395, 19);
+			this.configureComponent2Button.Name = "configureComponent2Button";
+			this.configureComponent2Button.Size = new System.Drawing.Size(73, 45);
+			this.configureComponent2Button.TabIndex = 4;
+			this.configureComponent2Button.Text = "Configure";
+			this.configureComponent2Button.UseVisualStyleBackColor = true;
+			this.configureComponent2Button.Click += new System.EventHandler(this.configureComponent2Button_Click);
+			// 
+			// component2NameTextBox
+			// 
+			this.component2NameTextBox.Enabled = false;
+			this.component2NameTextBox.Location = new System.Drawing.Point(77, 44);
+			this.component2NameTextBox.Name = "component2NameTextBox";
+			this.component2NameTextBox.Size = new System.Drawing.Size(299, 20);
+			this.component2NameTextBox.TabIndex = 3;
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(11, 47);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(35, 13);
+			this.label3.TabIndex = 2;
+			this.label3.Text = "Name";
+			// 
+			// label4
+			// 
+			this.label4.AutoSize = true;
+			this.label4.Location = new System.Drawing.Point(11, 22);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(32, 13);
+			this.label4.TabIndex = 1;
+			this.label4.Text = "Class";
+			// 
+			// component2ClassNameComboBox
+			// 
+			this.component2ClassNameComboBox.FormattingEnabled = true;
+			this.component2ClassNameComboBox.Location = new System.Drawing.Point(77, 19);
+			this.component2ClassNameComboBox.Name = "component2ClassNameComboBox";
+			this.component2ClassNameComboBox.Size = new System.Drawing.Size(299, 21);
+			this.component2ClassNameComboBox.TabIndex = 0;
+			// 
+			// radioButton24
+			// 
+			this.radioButton24.AutoSize = true;
+			this.radioButton24.Location = new System.Drawing.Point(212, 118);
+			this.radioButton24.Name = "radioButton24";
+			this.radioButton24.Size = new System.Drawing.Size(51, 17);
+			this.radioButton24.TabIndex = 9;
+			this.radioButton24.TabStop = true;
+			this.radioButton24.Text = "spare";
+			this.radioButton24.UseVisualStyleBackColor = true;
+			this.radioButton24.CheckedChanged += new System.EventHandler(this.radioButton24_CheckedChanged);
+			// 
+			// radioButton23
+			// 
+			this.radioButton23.AutoSize = true;
+			this.radioButton23.Location = new System.Drawing.Point(212, 95);
+			this.radioButton23.Name = "radioButton23";
+			this.radioButton23.Size = new System.Drawing.Size(51, 17);
+			this.radioButton23.TabIndex = 8;
+			this.radioButton23.TabStop = true;
+			this.radioButton23.Text = "spare";
+			this.radioButton23.UseVisualStyleBackColor = true;
+			this.radioButton23.CheckedChanged += new System.EventHandler(this.radioButton23_CheckedChanged);
+			// 
+			// radioButton22
+			// 
+			this.radioButton22.AutoSize = true;
+			this.radioButton22.Location = new System.Drawing.Point(212, 72);
+			this.radioButton22.Name = "radioButton22";
+			this.radioButton22.Size = new System.Drawing.Size(51, 17);
+			this.radioButton22.TabIndex = 7;
+			this.radioButton22.TabStop = true;
+			this.radioButton22.Text = "spare";
+			this.radioButton22.UseVisualStyleBackColor = true;
+			this.radioButton22.CheckedChanged += new System.EventHandler(this.radioButton22_CheckedChanged);
+			// 
+			// radioButton21
+			// 
+			this.radioButton21.AutoSize = true;
+			this.radioButton21.Location = new System.Drawing.Point(212, 49);
+			this.radioButton21.Name = "radioButton21";
+			this.radioButton21.Size = new System.Drawing.Size(106, 17);
+			this.radioButton21.TabIndex = 6;
+			this.radioButton21.TabStop = true;
+			this.radioButton21.Text = "ReadPressureOp";
+			this.radioButton21.UseVisualStyleBackColor = true;
+			this.radioButton21.CheckedChanged += new System.EventHandler(this.radioButton21_CheckedChanged);
+			// 
+			// groupBox4
+			// 
+			this.groupBox4.Controls.Add(this.radioButton34);
+			this.groupBox4.Controls.Add(this.radioButton33);
+			this.groupBox4.Controls.Add(this.radioButton32);
+			this.groupBox4.Controls.Add(this.radioButton31);
+			this.groupBox4.Controls.Add(this.radioButton24);
+			this.groupBox4.Controls.Add(this.radioButton4);
+			this.groupBox4.Controls.Add(this.radioButton23);
+			this.groupBox4.Controls.Add(this.radioButton0);
+			this.groupBox4.Controls.Add(this.radioButton22);
+			this.groupBox4.Controls.Add(this.radioButton3);
+			this.groupBox4.Controls.Add(this.radioButton21);
+			this.groupBox4.Controls.Add(this.radioButton1);
+			this.groupBox4.Controls.Add(this.radioButton2);
+			this.groupBox4.Location = new System.Drawing.Point(12, 349);
+			this.groupBox4.Name = "groupBox4";
+			this.groupBox4.Size = new System.Drawing.Size(581, 145);
+			this.groupBox4.TabIndex = 12;
+			this.groupBox4.TabStop = false;
+			this.groupBox4.Text = "Operations";
+			// 
+			// radioButton34
+			// 
+			this.radioButton34.AutoSize = true;
+			this.radioButton34.Location = new System.Drawing.Point(405, 118);
+			this.radioButton34.Name = "radioButton34";
+			this.radioButton34.Size = new System.Drawing.Size(51, 17);
+			this.radioButton34.TabIndex = 13;
+			this.radioButton34.TabStop = true;
+			this.radioButton34.Text = "spare";
+			this.radioButton34.UseVisualStyleBackColor = true;
+			this.radioButton34.CheckedChanged += new System.EventHandler(this.radioButton34_CheckedChanged);
+			// 
+			// radioButton33
+			// 
+			this.radioButton33.AutoSize = true;
+			this.radioButton33.Location = new System.Drawing.Point(405, 95);
+			this.radioButton33.Name = "radioButton33";
+			this.radioButton33.Size = new System.Drawing.Size(51, 17);
+			this.radioButton33.TabIndex = 12;
+			this.radioButton33.TabStop = true;
+			this.radioButton33.Text = "spare";
+			this.radioButton33.UseVisualStyleBackColor = true;
+			this.radioButton33.CheckedChanged += new System.EventHandler(this.radioButton33_CheckedChanged);
+			// 
+			// radioButton32
+			// 
+			this.radioButton32.AutoSize = true;
+			this.radioButton32.Location = new System.Drawing.Point(405, 72);
+			this.radioButton32.Name = "radioButton32";
+			this.radioButton32.Size = new System.Drawing.Size(51, 17);
+			this.radioButton32.TabIndex = 11;
+			this.radioButton32.TabStop = true;
+			this.radioButton32.Text = "spare";
+			this.radioButton32.UseVisualStyleBackColor = true;
+			this.radioButton32.CheckedChanged += new System.EventHandler(this.radioButton32_CheckedChanged);
+			// 
+			// radioButton31
+			// 
+			this.radioButton31.AutoSize = true;
+			this.radioButton31.Location = new System.Drawing.Point(405, 49);
+			this.radioButton31.Name = "radioButton31";
+			this.radioButton31.Size = new System.Drawing.Size(106, 17);
+			this.radioButton31.TabIndex = 10;
+			this.radioButton31.TabStop = true;
+			this.radioButton31.Text = "ReadPressureOp";
+			this.radioButton31.UseVisualStyleBackColor = true;
+			this.radioButton31.CheckedChanged += new System.EventHandler(this.radioButton31_CheckedChanged);
+			// 
+			// groupBox5
+			// 
+			this.groupBox5.Controls.Add(this.configureComponent3Button);
+			this.groupBox5.Controls.Add(this.component3NameTextBox);
+			this.groupBox5.Controls.Add(this.label5);
+			this.groupBox5.Controls.Add(this.label6);
+			this.groupBox5.Controls.Add(this.component3ClassNameComboBox);
+			this.groupBox5.Location = new System.Drawing.Point(12, 255);
+			this.groupBox5.Name = "groupBox5";
+			this.groupBox5.Size = new System.Drawing.Size(486, 75);
+			this.groupBox5.TabIndex = 13;
+			this.groupBox5.TabStop = false;
+			this.groupBox5.Text = "Component 3";
+			// 
+			// configureComponent3Button
+			// 
+			this.configureComponent3Button.Location = new System.Drawing.Point(395, 19);
+			this.configureComponent3Button.Name = "configureComponent3Button";
+			this.configureComponent3Button.Size = new System.Drawing.Size(73, 45);
+			this.configureComponent3Button.TabIndex = 4;
+			this.configureComponent3Button.Text = "Configure";
+			this.configureComponent3Button.UseVisualStyleBackColor = true;
+			this.configureComponent3Button.Click += new System.EventHandler(this.configureComponent3Button_Click);
+			// 
+			// component3NameTextBox
+			// 
+			this.component3NameTextBox.Enabled = false;
+			this.component3NameTextBox.Location = new System.Drawing.Point(77, 44);
+			this.component3NameTextBox.Name = "component3NameTextBox";
+			this.component3NameTextBox.Size = new System.Drawing.Size(299, 20);
+			this.component3NameTextBox.TabIndex = 3;
+			// 
+			// label5
+			// 
+			this.label5.AutoSize = true;
+			this.label5.Location = new System.Drawing.Point(11, 47);
+			this.label5.Name = "label5";
+			this.label5.Size = new System.Drawing.Size(35, 13);
+			this.label5.TabIndex = 2;
+			this.label5.Text = "Name";
+			// 
+			// label6
+			// 
+			this.label6.AutoSize = true;
+			this.label6.Location = new System.Drawing.Point(11, 22);
+			this.label6.Name = "label6";
+			this.label6.Size = new System.Drawing.Size(32, 13);
+			this.label6.TabIndex = 1;
+			this.label6.Text = "Class";
+			// 
+			// component3ClassNameComboBox
+			// 
+			this.component3ClassNameComboBox.FormattingEnabled = true;
+			this.component3ClassNameComboBox.Location = new System.Drawing.Point(77, 19);
+			this.component3ClassNameComboBox.Name = "component3ClassNameComboBox";
+			this.component3ClassNameComboBox.Size = new System.Drawing.Size(299, 21);
+			this.component3ClassNameComboBox.TabIndex = 0;
 			// 
 			// DeviceTestDlg
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(496, 377);
-			this.Controls.Add(this.groupBox2);
-			this.Controls.Add(this.initializeButton);
-			this.Controls.Add(this.groupBox1);
+			this.ClientSize = new System.Drawing.Size(613, 502);
+			this.Controls.Add(this.groupBox5);
+			this.Controls.Add(this.groupBox4);
+			this.Controls.Add(this.groupBox3);
 			this.Controls.Add(this.stopButton);
+			this.Controls.Add(this.groupBox2);
 			this.Controls.Add(this.startButton);
+			this.Controls.Add(this.groupBox1);
 			this.Name = "DeviceTestDlg";
 			this.Text = "Device test";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.DeviceTestDlg_FormClosing);
 			this.Load += new System.EventHandler(this.DeviceTestDlg_Load);
 			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.groupBox5.ResumeLayout(false);
+			this.groupBox5.PerformLayout();
 			this.ResumeLayout(false);
 
         }
@@ -220,17 +543,42 @@
         private System.Windows.Forms.Label classLabel;
         private System.Windows.Forms.Label nameLabel;
         private System.Windows.Forms.TextBox parentNameTextBox;
-        private System.Windows.Forms.Button configureParentButton;
-        private System.Windows.Forms.Button startButton;
-        private System.Windows.Forms.Button stopButton;
-		private System.Windows.Forms.Button initializeButton;
+		private System.Windows.Forms.Button configureParentButton;
+		private System.Windows.Forms.Button startButton;
 		private System.Windows.Forms.GroupBox groupBox1;
 		private System.Windows.Forms.GroupBox groupBox2;
-		private System.Windows.Forms.Button configureButton;
-		private System.Windows.Forms.TextBox nameTextBox;
+		private System.Windows.Forms.Button configureComponent1Button;
+		private System.Windows.Forms.TextBox componentNameTextBox;
 		private System.Windows.Forms.Label label1;
 		private System.Windows.Forms.Label label2;
-		private System.Windows.Forms.ComboBox classNameComboBox;
+		private System.Windows.Forms.ComboBox component1ClassNameComboBox;
+		private System.Windows.Forms.RadioButton radioButton4;
+		private System.Windows.Forms.RadioButton radioButton3;
+		private System.Windows.Forms.RadioButton radioButton2;
+		private System.Windows.Forms.RadioButton radioButton1;
+		private System.Windows.Forms.RadioButton radioButton0;
+		private System.Windows.Forms.Button stopButton;
+		private System.Windows.Forms.GroupBox groupBox3;
+		private System.Windows.Forms.RadioButton radioButton24;
+		private System.Windows.Forms.RadioButton radioButton23;
+		private System.Windows.Forms.RadioButton radioButton22;
+		private System.Windows.Forms.RadioButton radioButton21;
+		private System.Windows.Forms.Button configureComponent2Button;
+		private System.Windows.Forms.TextBox component2NameTextBox;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Label label4;
+		private System.Windows.Forms.ComboBox component2ClassNameComboBox;
+		private System.Windows.Forms.GroupBox groupBox4;
+		private System.Windows.Forms.GroupBox groupBox5;
+		private System.Windows.Forms.Button configureComponent3Button;
+		private System.Windows.Forms.TextBox component3NameTextBox;
+		private System.Windows.Forms.Label label5;
+		private System.Windows.Forms.Label label6;
+		private System.Windows.Forms.ComboBox component3ClassNameComboBox;
+		private System.Windows.Forms.RadioButton radioButton34;
+		private System.Windows.Forms.RadioButton radioButton33;
+		private System.Windows.Forms.RadioButton radioButton32;
+		private System.Windows.Forms.RadioButton radioButton31;
     }
 }
 

DeviceTest/DeviceTestDlg.cs

@@ -1,9 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
 using System.Threading;
 using System.Windows.Forms;
 using TBF.BenchControl;
 using TBF.BenchControl.Generic;
+using TBF.BenchControl.GenericDevices;
+using System.Xml.Serialization;
 
 
 namespace DeviceTest
@@ -13,59 +18,379 @@ namespace DeviceTest
         IList<string> compClasses;
 
 		IComponentFactory parentFactory;
-		IComponentFactory componentFactory;
+		IComponentFactory component1Factory;
+		IComponentFactory component2Factory;
+		IComponentFactory component3Factory;
 
 		IComponentCfg parentCfg;
-		IComponentCfg componentCfg;
+		IComponentCfg component1Cfg;
+		IComponentCfg component2Cfg;
+		IComponentCfg component3Cfg;
 
-		static IList<TBF.BenchControl.Generic.IComponent> tbfComponents;
 		static IList<TBF.BenchControl.Generic.IDevice> tbfDevices;
+		static IList<TBF.BenchControl.Generic.IComponent> tbfComponents;
+		static TBF.BenchControl.Generic.IComponent tbfComponent1forOp;
+		static TBF.BenchControl.Generic.IComponent tbfComponent2forOp;
+		static TBF.BenchControl.Generic.IComponent tbfComponent3forOp;
 
 		static Thread workerThread;
+		static bool workerThreadRunning;
+
+
+		static int activeOperationId;
+
+		static IOperation operation1;
+		static IOperation operation2;
+		static IOperation operation3;
+		static IOperation operation4;
+
+		static IOperation operation21;
+		static IOperation operation22;
+		static IOperation operation23;
+		static IOperation operation24;
+
+		static IOperation operation31;
+		static IOperation operation32;
+		static IOperation operation33;
+		static IOperation operation34;
+
+
+		static TBF.Boxes.FloatBox floatBox;
+		static Event evnt;
+
+
+		static DeviceTestDlg()
+		{
+			floatBox = new TBF.Boxes.FloatBox();
+			floatBox.Format = "F2";
+		}
 
         public DeviceTestDlg()
         {
             InitializeComponent();
             compClasses = new List<string>();
-            foreach (var componentFactory in TbfComponents.Factories)
+			radioButton0.Checked = true;
+			stopButton.Enabled = false;
+			
+			foreach (var componentFactory in TbfComponents.Factories)
             {
                 compClasses.Add(componentFactory.ClassName);
             }
-        }
+
+			tbfComponents = new List<TBF.BenchControl.Generic.IComponent>();
+			tbfDevices = new List<IDevice>();
+		}
 
         private void DeviceTestDlg_Load(object sender, EventArgs e)
         {
-			startButton.Enabled = false;
-			stopButton.Enabled = false;
 
 			foreach (var clName in compClasses)
 			{
 				parentClassNameComboBox.Items.Add(clName);
-				classNameComboBox.Items.Add(clName);
+				component1ClassNameComboBox.Items.Add(clName);
+				component2ClassNameComboBox.Items.Add(clName);
+				component3ClassNameComboBox.Items.Add(clName);
 			}
-        }
 
-
-        private void configureParentButton_Click(object sender, EventArgs e)
-        {
-			bool factoryChanged = false;
-			bool classNotFound = true;
-			foreach (var factory in TbfComponents.Factories)
+			try
 			{
-				if (parentClassNameComboBox.Text == factory.ClassName)
+				if (!string.IsNullOrEmpty(Program.LocalSettings.ParentClassName) &&
+					!string.IsNullOrEmpty(Program.LocalSettings.ParentName) &&
+					!string.IsNullOrEmpty(Program.LocalSettings.ParentSettings))
 				{
-					if (parentFactory != factory)
+					FactoryFromClassName(Program.LocalSettings.ParentClassName, ref parentFactory);
+
+					using (var reader = new StringReader(Program.LocalSettings.ParentSettings))
 					{
-						parentFactory = factory;
-						factoryChanged = true;
+						IComponentCfg config = (IComponentCfg)(new XmlSerializer(parentFactory.DefaultConfig().GetType())).Deserialize(reader);
+						config.Name = Program.LocalSettings.ParentName;
+						config.ParentName = string.Empty;
+						config.ItemNr = 0;
+						config.DebugLevel = Config.Entities.DebugMode.Normal;
+						config.LogLevel = Config.Entities.LogLevel.Debug;
+						config.Corrections = null;
+						config.Factory = parentFactory;
+						parentCfg = config;
 					}
-					classNotFound = false;
-					break;
+
+					parentClassNameComboBox.Text = Program.LocalSettings.ParentClassName;
+					parentNameTextBox.Text = Program.LocalSettings.ParentName;
 				}
 			}
-			if (classNotFound)
+			catch
 			{
-				MessageBox.Show("Invalid parent component class", "Error", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+				parentFactory = null;
+				parentCfg = null;
+				parentClassNameComboBox.Text = string.Empty;
+				parentNameTextBox.Text = string.Empty;
+			}
+
+			try
+			{
+				if (!string.IsNullOrEmpty(Program.LocalSettings.ComponentClassName) &&
+					!string.IsNullOrEmpty(Program.LocalSettings.ComponentName) &&
+					!string.IsNullOrEmpty(Program.LocalSettings.ComponentSettings))
+				{
+					FactoryFromClassName(Program.LocalSettings.ComponentClassName, ref component1Factory);
+
+					using (var reader = new StringReader(Program.LocalSettings.ComponentSettings))
+					{
+						IComponentCfg config = (IComponentCfg)(new XmlSerializer(component1Factory.DefaultConfig().GetType())).Deserialize(reader);
+						config.Name = Program.LocalSettings.ComponentName;
+						config.ParentName = string.IsNullOrEmpty(Program.LocalSettings.ComponentParentName) ? string.Empty : Program.LocalSettings.ComponentParentName;
+						config.ItemNr = 1;
+						config.DebugLevel = Config.Entities.DebugMode.Normal;
+						config.LogLevel = Config.Entities.LogLevel.Debug;
+						config.Corrections = null;
+						config.Factory = component1Factory;
+						component1Cfg = config;
+					}
+
+					component1ClassNameComboBox.Text = Program.LocalSettings.ComponentClassName;
+					componentNameTextBox.Text = Program.LocalSettings.ComponentName;
+
+					UpdateOperations(component1ClassNameComboBox.Text);
+				}
+			}
+			catch
+			{
+				component1Factory = null;
+				component1Cfg = null;
+				component1ClassNameComboBox.Text = string.Empty;
+				componentNameTextBox.Text = string.Empty;
+			}
+
+			try
+			{
+				if (!string.IsNullOrEmpty(Program.LocalSettings.Component2ClassName) &&
+					!string.IsNullOrEmpty(Program.LocalSettings.Component2Name) &&
+					!string.IsNullOrEmpty(Program.LocalSettings.Component2Settings))
+				{
+					FactoryFromClassName(Program.LocalSettings.Component2ClassName, ref component2Factory);
+
+					using (var reader = new StringReader(Program.LocalSettings.Component2Settings))
+					{
+						IComponentCfg config = (IComponentCfg)(new XmlSerializer(component2Factory.DefaultConfig().GetType())).Deserialize(reader);
+						config.Name = Program.LocalSettings.Component2Name;
+						config.ParentName = string.IsNullOrEmpty(Program.LocalSettings.Component2ParentName) ? string.Empty : Program.LocalSettings.Component2ParentName;
+						config.ItemNr = 2;
+						config.DebugLevel = Config.Entities.DebugMode.Normal;
+						config.LogLevel = Config.Entities.LogLevel.Debug;
+						config.Corrections = null;
+						config.Factory = component2Factory;
+						component2Cfg = config;
+					}
+
+					component2ClassNameComboBox.Text = Program.LocalSettings.Component2ClassName;
+					component2NameTextBox.Text = Program.LocalSettings.Component2Name;
+
+					UpdateOperations2(component2ClassNameComboBox.Text);
+				}
+			}
+			catch
+			{
+				component2Factory = null;
+				component2Cfg = null;
+				component2ClassNameComboBox.Text = string.Empty;
+				component2NameTextBox.Text = string.Empty;
+			}
+
+			try
+			{
+				if (!string.IsNullOrEmpty(Program.LocalSettings.Component3ClassName) &&
+					!string.IsNullOrEmpty(Program.LocalSettings.Component3Name) &&
+					!string.IsNullOrEmpty(Program.LocalSettings.Component3Settings))
+				{
+					FactoryFromClassName(Program.LocalSettings.Component3ClassName, ref component3Factory);
+
+					using (var reader = new StringReader(Program.LocalSettings.Component3Settings))
+					{
+						IComponentCfg config = (IComponentCfg)(new XmlSerializer(component3Factory.DefaultConfig().GetType())).Deserialize(reader);
+						config.Name = Program.LocalSettings.Component3Name;
+						config.ParentName = string.IsNullOrEmpty(Program.LocalSettings.Component3ParentName) ? string.Empty : Program.LocalSettings.Component3ParentName;
+						config.ItemNr = 3;
+						config.DebugLevel = Config.Entities.DebugMode.Normal;
+						config.LogLevel = Config.Entities.LogLevel.Debug;
+						config.Corrections = null;
+						config.Factory = component3Factory;
+						component3Cfg = config;
+					}
+
+					component3ClassNameComboBox.Text = Program.LocalSettings.Component3ClassName;
+					component3NameTextBox.Text = Program.LocalSettings.Component3Name;
+
+					UpdateOperations3(component3ClassNameComboBox.Text);
+				}
+			}
+			catch
+			{
+				component3Factory = null;
+				component3Cfg = null;
+				component3ClassNameComboBox.Text = string.Empty;
+				component3NameTextBox.Text = string.Empty;
+			}
+		}
+
+		void SaveSettings()
+		{
+			Program.LocalSettings.ParentClassName = parentClassNameComboBox.Text;
+			Program.LocalSettings.ParentName = parentNameTextBox.Text;
+			Program.LocalSettings.ParentSettings = (parentCfg != null) ? parentCfg.CreateDbEntity().Parameters : string.Empty;
+
+			Program.LocalSettings.ComponentClassName = component1ClassNameComboBox.Text;
+			Program.LocalSettings.ComponentName = componentNameTextBox.Text;
+			Program.LocalSettings.ComponentParentName = (component1Cfg != null) ? component1Cfg.ParentName : string.Empty;
+			Program.LocalSettings.ComponentSettings = (component1Cfg != null) ? component1Cfg.CreateDbEntity().Parameters : string.Empty;
+
+			Program.LocalSettings.Component2ClassName = component2ClassNameComboBox.Text;
+			Program.LocalSettings.Component2Name = component2NameTextBox.Text;
+			Program.LocalSettings.Component2ParentName = (component2Cfg != null) ? component2Cfg.ParentName : string.Empty;
+			Program.LocalSettings.Component2Settings = (component2Cfg != null) ? component2Cfg.CreateDbEntity().Parameters : string.Empty;
+
+			Program.LocalSettings.Component3ClassName = component3ClassNameComboBox.Text;
+			Program.LocalSettings.Component3Name = component3NameTextBox.Text;
+			Program.LocalSettings.Component3ParentName = (component3Cfg != null) ? component3Cfg.ParentName : string.Empty;
+			Program.LocalSettings.Component3Settings = (component3Cfg != null) ? component3Cfg.CreateDbEntity().Parameters : string.Empty;
+
+			Program.LocalSettings.Save();
+		}
+
+
+		void UpdateOperations(string className)
+		{
+			if      (className == "Keithley.TempMeter")     radioButton1.Text = "ReadPressureOp";
+			else if (className == "Network.Camera.CLP1611") radioButton1.Text = "Livestream";
+			else if (className == "Network.Camera.Roi")     radioButton1.Text = "RoiDetection";
+			else if (className == "Modbus.Easytherm")
+			{
+				radioButton1.Text = "SetTemperature(10)";
+				radioButton2.Text = "SetTemperature(20)";
+			}
+			else if (className == "Modbus.TankSelector")
+			{
+				radioButton1.Text = "SelectTank 1";
+				radioButton2.Text = "SelectTank 2";
+				radioButton3.Text = "SelectTank 3";
+				radioButton4.Text = "SelectTank -";
+			}
+			else radioButton1.Text = "spare";
+		}
+		/// 
+		void UpdateOperations2(string className)
+		{
+			if      (className == "Keithley.TempMeter")     radioButton21.Text = "ReadPressureOp";
+			else if (className == "Network.Camera.CLP1611") radioButton21.Text = "Livestream";
+			else if (className == "Network.Camera.Roi")     radioButton21.Text = "RoiDetection";
+			else if (className == "Modbus.Easytherm")
+			{
+				radioButton21.Text = "SetTemperature(10)";
+				radioButton22.Text = "SetTemperature(20)";
+			}
+			else if (className == "Modbus.TankSelector")
+			{
+				radioButton21.Text = "SelectTank 1";
+				radioButton22.Text = "SelectTank 2";
+				radioButton23.Text = "SelectTank 3";
+				radioButton24.Text = "SelectTank -";
+			}
+			else radioButton21.Text = "spare";
+		}
+		/// 
+		void UpdateOperations3(string className)
+		{
+			if      (className == "Keithley.TempMeter")     radioButton31.Text = "ReadPressureOp";
+			else if (className == "Network.Camera.CLP1611") radioButton31.Text = "Livestream";
+			else if (className == "Network.Camera.Roi")     radioButton31.Text = "RoiDetection";
+			else if (className == "Modbus.Easytherm")
+			{
+				radioButton31.Text = "SetTemperature(10)";
+				radioButton32.Text = "SetTemperature(20)";
+			}
+			else if (className == "Modbus.TankSelector")
+			{
+				radioButton31.Text = "SelectTank 1";
+				radioButton32.Text = "SelectTank 2";
+				radioButton33.Text = "SelectTank 3";
+				radioButton34.Text = "SelectTank -";
+			}
+			else radioButton31.Text = "spare";
+		}
+
+
+		int GetActiveOperationId()
+		{
+			if      (radioButton1.Checked)  { return 1; }
+			else if (radioButton2.Checked)  { return 2; }
+			else if (radioButton3.Checked)  { return 3; }
+			else if (radioButton4.Checked)  { return 4; }
+			else if (radioButton21.Checked) { return 21; }
+			else if (radioButton22.Checked) { return 22; }
+			else if (radioButton23.Checked) { return 23; }
+			else if (radioButton24.Checked) { return 24; }
+			else if (radioButton31.Checked) { return 31; }
+			else if (radioButton32.Checked) { return 32; }
+			else if (radioButton33.Checked) { return 33; }
+			else if (radioButton34.Checked) { return 34; }
+			else return 0;		/// stopOperationRadioButton.Checked
+		}
+
+
+		private void radioButton0_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
+		private void radioButton1_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
+		private void radioButton2_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
+		private void radioButton3_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
+		private void radioButton4_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
+		/// 
+		private void radioButton21_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
+		private void radioButton22_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
+		private void radioButton23_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
+		private void radioButton24_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
+		/// 
+		private void radioButton31_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
+		private void radioButton32_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
+		private void radioButton33_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
+		private void radioButton34_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
+
+
+		/// <summary>
+		/// Updates component factory
+		/// </summary>
+		/// <param name="className">Component class name</param>
+		/// <param name="factory">Reference to a factory</param>
+		/// <returns>true when factory changed</returns>
+		bool FactoryFromClassName(string className, ref IComponentFactory factory)
+		{
+			foreach (var fac in TbfComponents.Factories)
+			{
+				if (className == fac.ClassName)
+				{
+					if (factory != fac)
+					{
+						factory = fac;
+						return true;
+					}
+					else
+					{
+						return false;
+					}
+				}
+			}
+
+			if (factory != null)
+			{
+				factory = null;
+				return true;
+			}
+
+			return false;
+		}
+		
+        private void configureParentButton_Click(object sender, EventArgs e)
+        {
+			bool factoryChanged = FactoryFromClassName(parentClassNameComboBox.Text, ref parentFactory);
+			if (parentFactory == null)
+			{
+				MessageBox.Show("Invalid parent class", "Error", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
 				return;
 			}
 
@@ -89,35 +414,21 @@ namespace DeviceTest
         }
 
 
-		private void configureButton_Click(object sender, EventArgs e)
+		private void configureComponent1Button_Click(object sender, EventArgs e)
 		{
-			bool factoryChanged = false;
-			bool classNotFound = true;
-			foreach (var factory in TbfComponents.Factories)
+			bool factoryChanged = FactoryFromClassName(component1ClassNameComboBox.Text, ref component1Factory);
+			if (component1Factory == null)
 			{
-				if (classNameComboBox.Text == factory.ClassName)
-				{
-					if (componentFactory != factory)
-					{
-						componentFactory = factory;
-						factoryChanged = true;
-					}
-					classNotFound = false;
-					break;
-				}
-			}
-			if (classNotFound)
-			{
-				MessageBox.Show("Invalid parent component class", "Error", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+				MessageBox.Show("Invalid component class", "Error", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
 				return;
 			}
 
-			if (factoryChanged || componentCfg == null)
+			if (factoryChanged || component1Cfg == null)
 			{
-				componentCfg = componentFactory.DefaultConfig();
+				component1Cfg = component1Factory.DefaultConfig();
 			}
-			IComponentCfgCtrl cfgControl = componentCfg.GetControl();
-			cfgControl.Config = componentCfg;
+			IComponentCfgCtrl cfgControl = component1Cfg.GetControl();
+			cfgControl.Config = component1Cfg;
 			cfgControl.Config.ItemNr = 1;
 
 			TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg();
@@ -131,79 +442,394 @@ namespace DeviceTest
 			DialogResult dr = cfgForm.ShowDialog();
 			if (dr != DialogResult.OK) return;
 
-			nameTextBox.Text = componentCfg.Name;
+			componentNameTextBox.Text = component1Cfg.Name;
+
+			UpdateOperations(component1ClassNameComboBox.Text);
 		}
 
 
-		private void initializeButton_Click(object sender, EventArgs e)
+		private void configureComponent2Button_Click(object sender, EventArgs e)
 		{
-			tbfComponents = new List<TBF.BenchControl.Generic.IComponent>();
-			tbfDevices = new List<IDevice>();
+			bool factoryChanged = FactoryFromClassName(component2ClassNameComboBox.Text, ref component2Factory);
+			if (component2Factory == null)
+			{
+				MessageBox.Show("Invalid component class", "Error", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+				return;
+			}
 
+			if (factoryChanged || component2Cfg == null)
+			{
+				component2Cfg = component2Factory.DefaultConfig();
+			}
+			IComponentCfgCtrl cfgControl = component2Cfg.GetControl();
+			cfgControl.Config = component2Cfg;
+			cfgControl.Config.ItemNr = 1;
+
+			TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg();
+			///
+			IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
+			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
+			if (component1Factory != null && component1Cfg != null) compEntities.Add(component1Cfg.CreateDbEntity());
+			cfgForm.TbfComponents = compEntities;
+
+			cfgForm.ComponentCfgCtrl = cfgControl;
+			cfgForm.UnlockAfterStart = true;
+			DialogResult dr = cfgForm.ShowDialog();
+			if (dr != DialogResult.OK) return;
+
+			component2NameTextBox.Text = component2Cfg.Name;
+
+			UpdateOperations2(component2ClassNameComboBox.Text);
+		}
+
+
+		private void configureComponent3Button_Click(object sender, EventArgs e)
+		{
+			bool factoryChanged = FactoryFromClassName(component3ClassNameComboBox.Text, ref component3Factory);
+			if (component3Factory == null)
+			{
+				MessageBox.Show("Invalid component class", "Error", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+				return;
+			}
+
+			if (factoryChanged || component3Cfg == null)
+			{
+				component3Cfg = component3Factory.DefaultConfig();
+			}
+			IComponentCfgCtrl cfgControl = component3Cfg.GetControl();
+			cfgControl.Config = component3Cfg;
+			cfgControl.Config.ItemNr = 1;
+
+			TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg();
+			///
+			IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
+			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
+			if (component1Factory != null && component1Cfg != null) compEntities.Add(component1Cfg.CreateDbEntity());
+			if (component2Factory != null && component2Cfg != null) compEntities.Add(component2Cfg.CreateDbEntity());
+			cfgForm.TbfComponents = compEntities;
+
+			cfgForm.ComponentCfgCtrl = cfgControl;
+			cfgForm.UnlockAfterStart = true;
+			DialogResult dr = cfgForm.ShowDialog();
+			if (dr != DialogResult.OK) return;
+
+			component3NameTextBox.Text = component3Cfg.Name;
+
+			UpdateOperations3(component3ClassNameComboBox.Text);
+		}
+
+
+		private void startButton_Click(object sender, EventArgs e)
+		{
+			tbfComponents.Clear();
+			tbfDevices.Clear();
+			tbfComponent1forOp = null;
+			operation1 = null;
+			operation2 = null;
+			operation3 = null;
+			operation4 = null;
+			tbfComponent2forOp = null;
+			operation21 = null;
+			operation22 = null;
+			operation23 = null;
+			operation24 = null;
+			tbfComponent3forOp = null;
+			operation31 = null;
+			operation32 = null;
+			operation33 = null;
+			operation34 = null;
+			workerThreadRunning = false;
+
+			string initializedDeviceName = "none";
 			try
 			{
 				if (parentFactory != null && parentCfg != null)
 				{
 					TBF.BenchControl.Generic.IComponent component = parentFactory.GetComponent(parentCfg, tbfComponents);
 					tbfComponents.Add(component);
-					if (component is IDevice) tbfDevices.Add(component as IDevice);
+					IDevice dev = component as IDevice;
+					if (dev != null)
+					{
+						initializedDeviceName = dev.Name;
+						dev.Initialize();
+						tbfDevices.Add(dev);
+					}
 				}
-				if (componentFactory != null && componentCfg != null)
+				if (component1Factory != null && component1Cfg != null)
 				{
-					TBF.BenchControl.Generic.IComponent component = componentFactory.GetComponent(componentCfg, tbfComponents);
+					TBF.BenchControl.Generic.IComponent component = component1Factory.GetComponent(component1Cfg, tbfComponents);
 					tbfComponents.Add(component);
-					if (component is IDevice) tbfDevices.Add(component as IDevice);
+					tbfComponent1forOp = component;
+					IDevice dev = component as IDevice;
+					if (dev != null)
+					{
+						initializedDeviceName = dev.Name;
+						dev.Initialize();
+						tbfDevices.Add(dev);
+					}
+				}
+				if (component2Factory != null && component2Cfg != null)
+				{
+					TBF.BenchControl.Generic.IComponent component2 = component2Factory.GetComponent(component2Cfg, tbfComponents);
+					tbfComponents.Add(component2);
+					tbfComponent2forOp = component2;
+					IDevice dev = component2 as IDevice;
+					if (dev != null)
+					{
+						initializedDeviceName = dev.Name;
+						dev.Initialize();
+						tbfDevices.Add(dev);
+					}
+				}
+				if (component3Factory != null && component3Cfg != null)
+				{
+					TBF.BenchControl.Generic.IComponent component3 = component3Factory.GetComponent(component3Cfg, tbfComponents);
+					tbfComponents.Add(component3);
+					tbfComponent3forOp = component3;
+					IDevice dev = component3 as IDevice;
+					if (dev != null)
+					{
+						initializedDeviceName = dev.Name;
+						dev.Initialize();
+						tbfDevices.Add(dev);
+					}
 				}
 
 				if (tbfComponents.Count == 0) throw new Exception("There are no components");
 
-				foreach (var d in tbfDevices) d.Initialize();
-
+				SaveSettings();		/// Save settings after successful initialization
+				
 				workerThread = new Thread(Worker);
 				workerThread.CurrentCulture = Thread.CurrentThread.CurrentCulture;
 				workerThread.CurrentUICulture = Thread.CurrentThread.CurrentUICulture;
+				workerThreadRunning = true;
 				workerThread.Start();
+
+				startButton.Enabled = false;
+				stopButton.Enabled = true;
+				configureComponent2Button.Enabled = false;
+				configureComponent1Button.Enabled = false;
+				configureParentButton.Enabled = false;
 			}
 			catch (Exception exc)
 			{
-				MessageBox.Show(string.Format("Exception: {0}", exc.Message), "Initialization failed",
-								MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-				configureButton.Enabled = true;
+				workerThreadRunning = false;
+				workerThread = null;
+
+				MessageBox.Show(exc.Message,
+								string.Format("'{0}' initialization failed", initializedDeviceName),
+								MessageBoxButtons.OK,
+								MessageBoxIcon.Exclamation);
+
+				foreach (var dev in tbfDevices) dev.StopDevice();
+				tbfDevices.Clear();
+
+				startButton.Enabled = true;
+				stopButton.Enabled = false;
+				configureComponent2Button.Enabled = true;
+				configureComponent1Button.Enabled = true;
 				configureParentButton.Enabled = true;
-				startButton.Enabled = false;
-				return;
 			}
-
-			configureButton.Enabled = false;
-			configureParentButton.Enabled = false;
-			startButton.Enabled = true;
-//			MessageBox.Show("Hura !", "Initialization successful", MessageBoxButtons.OK, MessageBoxIcon.Information);
-		}
-
-        private void startButton_Click(object sender, EventArgs e)
-        {
-			startButton.Enabled = false;
-			stopButton.Enabled = true;
-        }
-
-        private void stopButton_Click(object sender, EventArgs e)
-        {
-			startButton.Enabled = true;
-			stopButton.Enabled = false;
-			configureButton.Enabled = false;
-			configureParentButton.Enabled = false;
 		}
 
 
 		static void Worker()
 		{
-			do
+			int activeOperationLocal = 0;
+			int previousOperation = 0;
+
+
+			if (tbfComponent1forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
+			{
+				operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
+			}
+			else if (tbfComponent1forOp is TBF.BenchControl.Network.Camera.CLP1611.Camera)
+			{
+				operation1 = (tbfComponent1forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
+				operation2 = (tbfComponent1forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
+			}
+			else if (tbfComponent1forOp is TBF.BenchControl.Network.Camera.Roi.Roi)
+			{
+				operation1 = (tbfComponent1forOp as TBF.BenchControl.Network.Camera.Roi.Roi).RoiDetectionOp();
+			}
+			else if (tbfComponent1forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
+			{
+				operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation2 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+			}
+			else if (tbfComponent1forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
+			{
+				//operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(1);
+				//operation2 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(2);
+				//operation3 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(3);
+				//operation4 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(0);
+			}
+
+
+			if (tbfComponent2forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
+			{
+				operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
+			}
+			else if (tbfComponent2forOp is TBF.BenchControl.Network.Camera.CLP1611.Camera)
+			{
+				operation21 = (tbfComponent2forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
+				operation22 = (tbfComponent2forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
+			}
+			else if (tbfComponent2forOp is TBF.BenchControl.Network.Camera.Roi.Roi)
+			{
+				operation21 = (tbfComponent2forOp as TBF.BenchControl.Network.Camera.Roi.Roi).RoiDetectionOp();
+			}
+			else if (tbfComponent2forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
+			{
+				operation21 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation22 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+			}
+			else if (tbfComponent2forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
+			{
+				//operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(1);
+                //operation22 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(2);
+                //operation23 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(3);
+                //operation24 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(0);
+			}
+
+
+			if (tbfComponent3forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
+			{
+				operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
+			}
+			else if (tbfComponent3forOp is TBF.BenchControl.Network.Camera.CLP1611.Camera)
+			{
+				operation31 = (tbfComponent3forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
+				operation33 = (tbfComponent3forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
+			}
+			else if (tbfComponent3forOp is TBF.BenchControl.Network.Camera.Roi.Roi)
+			{
+				operation31 = (tbfComponent3forOp as TBF.BenchControl.Network.Camera.Roi.Roi).RoiDetectionOp();
+			}
+			else if (tbfComponent3forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
+			{
+				operation31 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation32 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+			}
+			else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
+			{
+				//operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(1);
+				//operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(2);
+				//operation33 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(3);
+				//operation34 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(0);
+			}
+
+
+			while (workerThreadRunning)
 			{
 				Thread.Sleep(1000);
-				foreach (var d in tbfDevices) d.RunDeviceBefore();
-				foreach (var d in tbfDevices) d.RunDeviceAfter();
+
+				if (workerThreadRunning)
+				{
+					foreach (var d in tbfDevices) d.RunDeviceBefore();
+
+					if (tbfComponent1forOp != null)
+					{
+						previousOperation = activeOperationLocal;
+						activeOperationLocal = activeOperationId;
+						if (previousOperation == 0 && activeOperationLocal != 0)
+						{
+							switch (activeOperationLocal)
+							{
+								case 1:  if (operation1 != null)  operation1.Start();  Debug.WriteLine("op1.Start()");  break;
+								case 2:  if (operation2 != null)  operation2.Start();  Debug.WriteLine("op2.Start()");  break;
+								case 3:  if (operation3 != null)  operation3.Start();  Debug.WriteLine("op3.Start()");  break;
+								case 4:  if (operation4 != null)  operation4.Start();  Debug.WriteLine("op4.Start()");  break;
+								case 21: if (operation21 != null) operation21.Start(); Debug.WriteLine("op21.Start()"); break;
+								case 22: if (operation22 != null) operation22.Start(); Debug.WriteLine("op22.Start()"); break;
+								case 23: if (operation23 != null) operation23.Start(); Debug.WriteLine("op23.Start()"); break;
+								case 24: if (operation24 != null) operation24.Start(); Debug.WriteLine("op24.Start()"); break;
+								case 31: if (operation31 != null) operation31.Start(); Debug.WriteLine("op31.Start()"); break;
+								case 32: if (operation32 != null) operation32.Start(); Debug.WriteLine("op32.Start()"); break;
+								case 33: if (operation33 != null) operation33.Start(); Debug.WriteLine("op33.Start()"); break;
+								case 34: if (operation34 != null) operation34.Start(); Debug.WriteLine("op34.Start()"); break;
+							}
+						}
+						else if (previousOperation == activeOperationLocal && activeOperationLocal != 0)
+						{
+							switch (activeOperationLocal)
+							{
+								case 1:  if (operation1 != null)  evnt = operation1.Run();  Debug.WriteLine("op1.Run() -> {0}", evnt);  break;
+								case 2:  if (operation2 != null)  evnt = operation2.Run();  Debug.WriteLine("op2.Run() -> {0}", evnt);  break;
+								case 3:  if (operation3 != null)  evnt = operation3.Run();  Debug.WriteLine("op3.Run() -> {0}", evnt);  break;
+								case 4:  if (operation4 != null)  evnt = operation4.Run();  Debug.WriteLine("op4.Run() -> {0}", evnt);  break;
+								case 21: if (operation21 != null) evnt = operation21.Run(); Debug.WriteLine("op21.Run() -> {0}", evnt); break;
+								case 22: if (operation22 != null) evnt = operation22.Run(); Debug.WriteLine("op22.Run() -> {0}", evnt); break;
+								case 23: if (operation23 != null) evnt = operation23.Run(); Debug.WriteLine("op23.Run() -> {0}", evnt); break;
+								case 24: if (operation24 != null) evnt = operation24.Run(); Debug.WriteLine("op24.Run() -> {0}", evnt); break;
+								case 31: if (operation31 != null) evnt = operation31.Run(); Debug.WriteLine("op31.Run() -> {0}", evnt); break;
+								case 32: if (operation32 != null) evnt = operation32.Run(); Debug.WriteLine("op32.Run() -> {0}", evnt); break;
+								case 33: if (operation33 != null) evnt = operation33.Run(); Debug.WriteLine("op33.Run() -> {0}", evnt); break;
+								case 34: if (operation34 != null) evnt = operation34.Run(); Debug.WriteLine("op34.Run() -> {0}", evnt); break;
+								default: evnt = Event.None; break;
+							}
+						}
+						else if (previousOperation != 0 && activeOperationLocal == 0)
+						{
+							switch (previousOperation)
+							{
+								case 1:  if (operation1 != null)  operation1.Stop();  Debug.WriteLine("op1.Stop()");  break;
+								case 2:  if (operation2 != null)  operation2.Stop();  Debug.WriteLine("op2.Stop()");  break;
+								case 3:  if (operation3 != null)  operation3.Stop();  Debug.WriteLine("op3.Stop()");  break;
+								case 4:  if (operation4 != null)  operation4.Stop();  Debug.WriteLine("op4.Stop()");  break;
+								case 21: if (operation21 != null) operation21.Stop(); Debug.WriteLine("op21.Stop()"); break;
+								case 22: if (operation22 != null) operation22.Stop(); Debug.WriteLine("op22.Stop()"); break;
+								case 23: if (operation23 != null) operation23.Stop(); Debug.WriteLine("op23.Stop()"); break;
+								case 24: if (operation24 != null) operation24.Stop(); Debug.WriteLine("op24.Stop()"); break;
+								case 31: if (operation31 != null) operation31.Stop(); Debug.WriteLine("op31.Stop()"); break;
+								case 32: if (operation32 != null) operation32.Stop(); Debug.WriteLine("op32.Stop()"); break;
+								case 33: if (operation33 != null) operation33.Stop(); Debug.WriteLine("op33.Stop()"); break;
+								case 34: if (operation34 != null) operation34.Stop(); Debug.WriteLine("op34.Stop()"); break;
+							}
+						}
+					}
+
+					foreach (var d in tbfDevices) d.RunDeviceAfter();
+				}
 			}
-			while (true);
+
+			foreach (var d in tbfDevices) d.StopDevice();
+		}
+
+		private void stopButton_Click(object sender, EventArgs e)
+		{
+			Cursor = Cursors.WaitCursor;
+
+			workerThreadRunning = false;
+			workerThread.Join(5000);
+			workerThread = null;
+
+			Cursor = Cursors.Default;
+
+			startButton.Enabled = true;
+			stopButton.Enabled = false;
+			configureParentButton.Enabled = true;
+			configureComponent1Button.Enabled = true;
+			configureComponent2Button.Enabled = true;
+			configureComponent3Button.Enabled = true;
+		}
+
+		private void DeviceTestDlg_FormClosing(object sender, FormClosingEventArgs e)
+		{
+			Cursor = Cursors.WaitCursor;
+
+			if (workerThread != null)
+			{
+				workerThreadRunning = false;
+				workerThread.Join(3000);
+				workerThread = null;
+			}
+
+			Cursor = Cursors.Default;
+
+			SaveSettings();
+
+			Cursor = Cursors.Default;
 		}
     }
 }

DeviceTest/LocalSettings.cs

@@ -0,0 +1,126 @@
+using System;
+using System.IO;
+using System.Text;
+using System.Xml.Serialization;
+
+namespace DeviceTest
+{
+    /// <summary>
+    /// Class to be serialized to an XML file...
+    /// </summary>
+	[XmlRootAttribute("DeviceTest")]
+    public class LocalSettings
+    {
+		public string ParentClassName;
+		public string ParentName;
+		public string ParentSettings;
+
+		public string ComponentClassName;
+		public string ComponentName;
+		public string ComponentParentName;
+		public string ComponentSettings;
+
+		public string Component2ClassName;
+		public string Component2Name;
+		public string Component2ParentName;
+		public string Component2Settings;
+
+		public string Component3ClassName;
+		public string Component3Name;
+		public string Component3ParentName;
+		public string Component3Settings;
+
+        public LocalSettings()
+        {
+        }
+
+        /// <summary>
+        /// Load public fields of this class from the XML file.
+        /// </summary>
+		/// <returns>LocalSettings object or null when Load() fails</returns>
+		public static LocalSettings Load(string fileName)
+        {
+            try
+            {
+				using (TextReader reader = new StreamReader(fileName))
+                {
+                    LocalSettings ls = (new XmlSerializer(typeof(LocalSettings))).Deserialize(reader) as LocalSettings;
+                    // Copy the settings just in case De-serialize() completes OK
+					return ls;
+                }
+            }
+            catch (Exception e)
+            {
+                string msg = e.Message;
+				return null;
+            }
+        }
+
+        /// <summary>
+        /// Save public fields of this class to the XML file.
+        /// </summary>
+        public void Save()
+        {
+            try
+            {
+				using (TextWriter writer = new StreamWriter(Program.LocalSettingsFileName))
+                {
+                    (new XmlSerializer(typeof(LocalSettings))).Serialize(writer, this);
+                }
+            }
+            catch (Exception e)
+            {
+                string msg = e.Message;
+            }
+        }
+
+		/// <summary>
+		/// Updates history stored in a string array by a new latest string.
+		/// </summary>
+		/// <param name="lastStrValue">Last entered string</param>
+		/// <returns>true = updated and saved</returns>
+		public bool UpdateHistory(string lastStrValue, ref string[] history)
+		{
+			const int MaxHistoryLen = 10;
+
+			if (string.IsNullOrEmpty(lastStrValue)) return false;
+
+			int currentHistoryLength = (history != null) ? history.Length : 0;
+
+			int match = -1;
+			for (int i = 0; i < currentHistoryLength; i++)
+			{
+				if (history[i] == lastStrValue)
+				{
+					match = i;
+					break;
+				}
+			}
+
+			if (match >= 0 || currentHistoryLength >= MaxHistoryLen)
+			{
+				/// History does not have to be extended (because of a match) or should not be extended (because of the lenght)
+				if (match < 0) match = currentHistoryLength - 1;
+
+				for (int j = match; j > 0; j--)
+				{
+					history[j] = history[j - 1];
+				}
+				history[0] = lastStrValue;
+			}
+			else
+			{
+				/// History will be extended, new item inserted at the beginning
+				string[] newHistory = new string[currentHistoryLength + 1];
+				newHistory[0] = lastStrValue;
+				for (int j = 1; j <= currentHistoryLength; j++)
+				{
+					newHistory[j] = history[j - 1];
+				}
+				history = newHistory;
+			}
+			Save();
+			return true;
+		}
+    }
+}

DeviceTest/Program.cs

@@ -1,21 +1,111 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+///
+/// Copyright (c) 2016-2017 Sensus Metering Systems
+///
+using System;
+using System.IO;
 using System.Windows.Forms;
+using log4net;
 
 namespace DeviceTest
 {
     static class Program
     {
-        /// <summary>
-        /// The main entry point for the application.
-        /// </summary>
-        [STAThread]
-        static void Main()
-        {
-            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new DeviceTestDlg());
-        }
-    }
+		/// Program information
+		public static string Version;			/// version string
+		public static DateTime BuildDateTime;	/// date and time of program build
+
+		/// log4net
+		static ILog log;
+		const string log4netConfigFName = "log4netConfig.xml";
+
+		/// Local settings
+		public static readonly string LocAppDataDir;
+		public static readonly string LocalSettingsFileName;
+		public static readonly string LocalSettingsBackupName;
+		public static LocalSettings LocalSettings;
+
+		static Program()
+		{
+			/// Program version string
+			System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
+			Version ver = thisAssembly.GetName().Version;
+			Version = string.Format("{0}.{1}.{2}", ver.Major, ver.Minor, ver.Build);
+			BuildDateTime = new System.IO.FileInfo(thisAssembly.Location).LastWriteTime;
+
+			/// Local program configuration directory including the trailing backslash
+			LocAppDataDir = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) +
+							Path.DirectorySeparatorChar + "TestBenchFramework" + Path.DirectorySeparatorChar;
+			LocalSettingsFileName = LocAppDataDir + "DeviceTest.xml";
+			LocalSettingsBackupName = LocAppDataDir + "DeviceTest.backup.xml";
+		}
+
+		/// <summary>
+		/// The main entry point for the application.
+		/// </summary>
+		[STAThread]
+		static void Main()
+		{
+			///
+			/// Load the local settings
+			///
+			Program.LocalSettings = LocalSettings.Load(Program.LocalSettingsFileName);
+			if (Program.LocalSettings == null)
+			{
+				/// Loading local seetings from regular config file failed. Use the backup
+				Program.LocalSettings = LocalSettings.Load(Program.LocalSettingsBackupName);
+				if (Program.LocalSettings == null)
+				{
+					MessageBox.Show("Na tomto počítači nebol tento program ani raz spustený.\r\nPoužijú sa základné nastavenia.", "Upozornenie", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+					Program.LocalSettings = new LocalSettings();
+					Directory.CreateDirectory(LocAppDataDir);
+					Program.LocalSettings.Save();
+				}
+				else
+				{
+					LocalSettings.Save();	/// Save the settings to overwrite the wrong file
+				}
+			}
+			else
+			{
+				/// Loading local seetings from the regular config file was successful. Update the backup
+				File.Copy(Program.LocalSettingsFileName, Program.LocalSettingsBackupName, true);
+			}
+
+			/// Configure and start logging
+			log4net.Config.XmlConfigurator.Configure(new System.IO.FileInfo(LocAppDataDir + log4netConfigFName));
+			log = LogManager.GetLogger(typeof(Program));
+			log.Fatal("--------------------------------------------------------------------------------");
+			log.Fatal(string.Format("TBF ver.{0}", Version));
+
+			Application.EnableVisualStyles();
+			Application.SetCompatibleTextRenderingDefault(false);
+
+			try
+			{
+				DeviceTestDlg dlg = new DeviceTestDlg();
+				Application.Run(dlg);
+			}
+			catch (Exception exc)
+			{
+				LogException(log, "Exception in Application.Run(DeviceTestDlg)", exc);
+				MessageBox.Show("Program havaroval:" +
+								Environment.NewLine + Environment.NewLine + exc.Message +
+								((exc.InnerException == null) ? string.Empty : (Environment.NewLine + exc.InnerException.Message)) +
+								Environment.NewLine + exc.StackTrace,
+								"Pozor!", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+			}
+		}
+
+		static void LogException(ILog log, string description, Exception e)
+		{
+			log.FatalFormat("---------------( {0} )---------------", description);
+			log.FatalFormat("Message      : {0}", e.Message);
+			if (e.InnerException != null)
+			{
+				log.FatalFormat("InnerMessage : {0}", e.InnerException.Message);
+			}
+			log.FatalFormat("StackTrace   : {0}{1}", Environment.NewLine, e.StackTrace);
+			log.Fatal("--------------------------------------");
+		}
+	}
 }

Dirichlet.Numerics/Dirichlet.Numerics.csproj

@@ -0,0 +1,51 @@
+<?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>{439D0878-C76E-452B-B17D-209A89E91D36}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Dirichlet.Numerics</RootNamespace>
+    <AssemblyName>Dirichlet.Numerics</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+  </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.Numerics" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Int128.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UInt128.cs" />
+  </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>

Dirichlet.Numerics/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("Dirichlet.Numerics")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Dirichlet.Numerics")]
+[assembly: AssemblyCopyright("Copyright ©  2012")]
+[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("a588abc0-c631-4475-9eab-4163d9f81fed")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

Dirichlet.Numerics/license.txt

@@ -0,0 +1,13 @@
+Copyright 2014 Rick Sladkey
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

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

@@ -1,6 +1,6 @@
-namespace Results.UiControls
+namespace GraphLib
 {
-    partial class BatchResultsCtrl
+    partial class PlotterGraphPaneEx
     {
         /// <summary> 
         /// Required designer variable.
@@ -28,30 +28,19 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.flowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
             this.SuspendLayout();
             // 
-            // flowLayoutPanel
-            // 
-            this.flowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.flowLayoutPanel.Location = new System.Drawing.Point(0, 0);
-            this.flowLayoutPanel.Name = "flowLayoutPanel";
-            this.flowLayoutPanel.Size = new System.Drawing.Size(1000, 735);
-            this.flowLayoutPanel.TabIndex = 0;
-            // 
-            // BatchResultsCtrl
+            // PlotterGraphPane
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.flowLayoutPanel);
-            this.Name = "BatchResultsCtrl";
-            this.Size = new System.Drawing.Size(1000, 735);
+            this.Name = "PlotterGraphPane";
+            this.Size = new System.Drawing.Size(409, 150);
+            this.Load += new System.EventHandler(this.OnLoadControl);
             this.ResumeLayout(false);
 
         }
 
         #endregion
-
-        private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel;
     }
 }

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;
+            }
+        }
+    }
+}

Results/BatchResults.cs

@@ -29,7 +29,7 @@ namespace Results
 
 		public static BatchResults NewFromProcedure(int batchNr, int benchId, string user, int userNr, string programVer,
 													Config.Entities.Procedure procedure,
-													WaterMeterData[] waterMeterDatas, int[] waterMeterParts)
+													WaterMeterData[] waterMeterDatas, int[] waterMeterParts, double densityCorr)
 		{
 			BatchResults d = new BatchResults(waterMeterDatas.Length);
             int year = DateTime.Now.Year;
@@ -46,10 +46,11 @@ namespace Results
 					ProcedureDescription = procedure.Description,
 					WatermetersStr = procedure.Watermeters,
 					ProcedureRevision = procedure.Revision,
-					ProtocolTitle = procedure.ProtocolTitle,
+					ProtocolTitle = string.Empty,
 					StartTime = DateTime.Now,
+					DensityCorr = (float)densityCorr,
 					Compound = (procedure.MetersKind == Config.Entities.MetersKind.Combined),
-#if HEAT_METERS_SUPPORT
+#if HEAT_METERS
                     HeatMeter = (procedure.MetersKind == Config.Entities.MetersKind.HeatMeter),
 #endif
                 };

Results/DB.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2016 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -30,9 +30,9 @@ namespace Results
 		}
 
 		/// <summary> Database type (MySQL or SQLite) for all sessions </summary>
-		private static Config.Entities.DBType dbType;
+		private static Users.Entities.DBType dbType;
 		/// 
-		public static Config.Entities.DBType DbType
+		public static Users.Entities.DBType DbType
 		{
 			get { return dbType; }
 			set { dbType = value; SessionFactory = null; }
@@ -59,10 +59,10 @@ namespace Results
 			switch (dbType)
 			{
 				default:
-				case Config.Entities.DBType.SQLite:
+				case Users.Entities.DBType.SQLite:
 					cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
                     break;
-				case Config.Entities.DBType.MySql:
+				case Users.Entities.DBType.MySql:
                     cfg = cfg.Database(MySQLConfiguration.Standard.ConnectionString(connectionString));
                     break;
 			}
@@ -177,9 +177,9 @@ namespace Results
 		{
 			ISession session = DB.CreateSession();
 
-			TestDataList = session.CreateQuery("FROM TestData").List<Entities.TestData>();
-			ComponentsList = session.CreateQuery("FROM Components").List<Entities.Components>();
-			WaterMeterDataList = session.CreateQuery("FROM WaterMeterData").List<Entities.WaterMeterData>();
+			TestDataList = session.QueryOver<TestData>().List();
+            ComponentsList = session.QueryOver<Components>().List();
+            WaterMeterDataList = session.QueryOver<WaterMeterData>().List();
 		}
 
 		/// <summary>
@@ -189,7 +189,7 @@ namespace Results
 		public static int GetMaxSavedBatchNr()
 		{
 			ISession session = DB.CreateSession();
-			IList<Entities.Batch> batches = session.CreateQuery("FROM Batch").List<Entities.Batch>();
+            IList<Entities.Batch> batches = session.QueryOver<Batch>().List();
 
 			int maxBatchNr = 0;
 			foreach (var b in batches)
@@ -239,9 +239,9 @@ namespace Results
 			ISession session = DB.CreateSession();
 			if (session == null) return false;
 
-			TestDataList = session.CreateQuery("FROM TestData").List<Entities.TestData>();
-			ComponentsList = session.CreateQuery("FROM Components").List<Entities.Components>();
-			WaterMeterDataList = session.CreateQuery("FROM WaterMeterData").List<Entities.WaterMeterData>();
+            TestDataList = session.QueryOver<TestData>().List();
+            ComponentsList = session.QueryOver<Components>().List();
+            WaterMeterDataList = session.QueryOver<WaterMeterData>().List();
 
 			UpdateBatchData(batch);
 
@@ -254,6 +254,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 +267,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;
 			}
 
@@ -270,5 +282,40 @@ namespace Results
 			return true;
 		}
 
+
+		public static Batch LoadBatch(int batchNr)
+		{
+			IList<Batch> batches;
+			ISession session = DB.CreateSession();
+			if (session == null) return null;
+
+			TestDataList = session.QueryOver<TestData>().List();
+			ComponentsList = session.QueryOver<Components>().List();
+			WaterMeterDataList = session.QueryOver<WaterMeterData>().List();
+
+			try
+			{
+				batches = session.QueryOver<Batch>()
+								 .Where(x => (x.BatchNr == batchNr))
+								 .List();
+
+                foreach (var batch in batches)
+                {
+                    batch.TestRslts = session.QueryOver<TestRslt>()
+                                             .Where(x => (x.Batch.Id == batch.Id))
+                                             .List();
+                    batch.WaterMeters = session.QueryOver<WaterMeter>()
+                                               .Where(x => (x.Batch.Id == batch.Id))
+                                               .List();
+                }
+			}
+			catch (Exception exc)
+			{
+				log.FatalFormat("Cannot load batch #{0}: {1}", batchNr, exc.Message);
+				return null;
+			}
+
+			return (batches.Count > 0) ? batches[0] : null;
+		}
 	}
 }

Results/DBase.cs

@@ -0,0 +1,63 @@
+///
+/// Copyright (c) 2017 Sensus Metering Systems
+///
+using System;
+using System.Collections.Generic;
+using FluentNHibernate.Cfg;
+using FluentNHibernate.Cfg.Db;
+using log4net;
+using NHibernate;
+using NHibernate.Cfg;
+using NHibernate.Tool.hbm2ddl;
+using Results.Entities;
+
+namespace Results
+{
+    public class DBase
+    {
+		static readonly ILog log = LogManager.GetLogger(typeof(DBase));
+
+		/// <summary> Session factory for all regular sessions, not for CreateEmptyResultsDB(). </summary>
+		public static IList<DBase> Databases;
+        public static int Count { get { return Databases.Count; } }
+
+        static DBase()
+        {
+            Databases = new List<DBase>();
+        }
+
+
+        public readonly string Name;
+        public readonly string ConnectionString;
+
+        ISessionFactory sessionFactory;
+
+        public DBase(string connectionString, string name)
+        {
+            this.ConnectionString = connectionString;
+            this.Name = name;
+            sessionFactory = Fluently.Configure()
+                                     .Database(MySQLConfiguration.Standard.ConnectionString(connectionString))
+                                     .Mappings(m => m.FluentMappings.AddFromAssemblyOf<Entities.WaterMeterData>())
+                                     .ExposeConfiguration(BuildSchema)
+                                     .BuildSessionFactory();
+        }
+
+        public DBase(string connectionString)
+            : this(connectionString, string.Empty)
+        {
+        }
+
+
+        private void BuildSchema(Configuration config)
+        {
+            /// This NHibernate tool takes a configuration with mapping info and exports a database schema
+            new SchemaExport(config).SetOutputFile("db_schema");
+        }
+
+        public ISession OpenSession()
+        {
+            return sessionFactory.OpenSession();
+        }
+	}
+}

Results/Entities/Batch.cs

@@ -20,12 +20,13 @@ namespace Results.Entities
 		public virtual string WatermetersStr { get; set; }			/// CEVAK, not mapped to DB
 		public virtual string ProtocolTitle { get; set; }
         public virtual string Remark { get; set; }
-		public virtual float Custom1 { get; set; }
+        public virtual float DensityCorr { get; set; }				/// Density correction in [kg/m3]
 		public virtual float Custom2 { get; set; }
 		public virtual float Custom3 { get; set; }
 		public virtual DateTime StartTime { get; set; }
 		public virtual DateTime EndTime { get; set; }
-		public virtual bool RsltsSent { get; set; }
+        public virtual bool Dirty { get; set; }
+        public virtual bool RsltsSent { get; set; }
 		public virtual bool RsltsPrinted { get; set; }
 		public virtual IList<TestData> Tests { get; set; }
 		public virtual IList<WaterMeter> WaterMeters { get; set; }
@@ -40,29 +41,97 @@ namespace Results.Entities
 			TestRslts = new List<TestRslt>();
 		}
 
-		public virtual float AmbientTempAve()
-		{
-			if (TestRslts.Count == 0) return 0;
-			float sum = 0;
-			foreach (var tr in TestRslts) sum += tr.AmbientTempAve;
-			return sum / TestRslts.Count;
-		}
+        public virtual int PassedMetersCount()
+        {
+            int count = 0;
+            foreach (var mtr in WaterMeters) if (mtr.PassedFromTests()) count++;
+            return count;
+        }
 
-		public virtual float AmbientPressAve()
-		{
-			if (TestRslts.Count == 0) return 0;
-			float sum = 0;
-			foreach (var tr in TestRslts) sum += tr.AmbientPressAve;
-			return sum / TestRslts.Count;
-		}
+        public virtual int FailedMetersCount()
+        {
+            return WaterMeters.Count - PassedMetersCount();
+        }
 
-		public virtual float AmbientHumiAve()
+        public virtual double AmbTempMean()
 		{
-			if (TestRslts.Count == 0) return 0;
-			float sum = 0;
-			foreach (var tr in TestRslts) sum += tr.AmbientHumiAve;
-			return sum / TestRslts.Count;
-		}
+            double timeSum = 0;
+            double sum = 0;
+
+            foreach (var tr in TestRslts)
+            {
+                if (tr.TestDone)
+                {
+                    double duration = (tr.EndTime - tr.StartTime).TotalSeconds;
+                    timeSum += duration;
+                    sum += (tr.AmbTempMean * duration);
+                }
+            }
+
+            return (timeSum == 0) ? 0 : (sum / timeSum);
+        }
+
+        public virtual double AmbPressMean()
+		{
+            double timeSum = 0;
+            double sum = 0;
+
+            foreach (var tr in TestRslts)
+            {
+                if (tr.TestDone)
+                {
+                    double duration = (tr.EndTime - tr.StartTime).TotalSeconds;
+                    timeSum += duration;
+                    sum += (tr.AmbPressMean * duration);
+                }
+            }
+
+            return (timeSum == 0) ? 0 : (sum / timeSum);
+        }
+
+        public virtual double AmbHumiMean()
+		{
+            double timeSum = 0;
+            double sum = 0;
+            
+            foreach (var tr in TestRslts)
+            {
+                if (tr.TestDone)
+                {
+                    double duration = (tr.EndTime - tr.StartTime).TotalSeconds;
+                    timeSum += duration;
+                    sum += (tr.AmbHumiMean * duration);
+                }
+            }
+
+            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;
+            double sum = 0;
+
+            foreach (var tr in TestRslts)
+            {
+                if (tr.TestData.Evaluate && tr.TestDone)
+                {
+                    double duration = (tr.EndTime - tr.StartTime).TotalSeconds;
+                    timeSum += duration;
+                    sum += (tr.Buoyancy * duration);
+                }
+            }
+
+            return (timeSum == 0) ? 0 : (sum / timeSum);
+        }
 
 		public virtual TestRslt GetTestRslt(string name, int part)
 		{
@@ -77,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

@@ -65,11 +65,24 @@ namespace Results.Entities
         public virtual WaterMeterData WaterMeterData()   { return WaterMeter.WaterMeterData; }
         public virtual Batch          Batch()            { return WaterMeter.Batch; }
 
+		public virtual bool IsPilotRslt()
+		{
+			return	(CompoundMeterId == (byte)Config.Entities.CompoundMeterId.Single) ||
+					(CompoundMeterId == (byte)Config.Entities.CompoundMeterId.Compound) ||
+					(CompoundMeterId == (byte)Config.Entities.CompoundMeterId.HeatMeterEnergy);
+		}
+
 		public virtual string PassedColorStr()
         {
 #if PUCHONG_PT200
 			if (!Evaluate())	return Passed ? "OK|White" : "NG|White";
 			else				return Passed ? "OK|Green" : "NG|Red";
+#elif LANG_PL
+			if (!Evaluate())	return Passed ? "+|White" : "-|White";
+            else                return Passed ? "+|Green" : "-|Red";
+#elif LANG_RU
+            if (!Evaluate())    return Passed ? "годен|White" : "негоден|White";
+            else                return Passed ? "годен|Green" : "негоден|Red";
 #else
             if (!Evaluate())    return Passed ? "OK|White" : "NOK|White";
             else                return Passed ? "OK|Green" : "NOK|Red";
@@ -89,5 +102,29 @@ namespace Results.Entities
 			TestRslt = testRslt;
 			CompoundMeterId = (byte)compoundMeterId;
 		}
+
+        public virtual void CopyContentFrom(MeterTestRslt src)
+        {
+            if (src == null) return;
+
+		    PulsesMeter = src.PulsesMeter;
+		    PulsesMaster = src.PulsesMaster;
+            PulsesPerLiter = src.PulsesPerLiter;
+            VolumeStart = src.VolumeStart;
+            VolumeEnd = src.VolumeEnd;
+            VolumeMeter = src.VolumeMeter;
+            VolumeRef = src.VolumeRef;
+		    TimestampStart = src.TimestampStart;
+		    TimestampEnd = src.TimestampEnd;
+		    TestTime = src.TestTime;
+		    Error = src.Error;
+		    TestDone = src.TestDone;
+            Passed = src.Passed;
+        }
+
+        public override string ToString()
+        {
+            return (TestRslt != null) ? Name() : base.ToString();
+        }
     }
 }

Results/Entities/TestData.cs

@@ -12,19 +12,22 @@ namespace Results.Entities
     /// </summary>
 	public class TestData
     {
-        public virtual int    Id			{ get; protected set; }
-        public virtual string Name			{ get; set; }
-		public virtual int    Repeats		{ get; set; }
-		public virtual double Qfrom         { get; set; }	/// [m3/h] flow range low limit
-		public virtual double Qto			{ get; set; }	/// [m3/h] flow range high limit
-		public virtual double TargetVolume	{ get; set; }	/// [l] target test volume
-		public virtual double TargetTime	{ get; set; }	/// [s] target test time
-		public virtual string Method		{ get; set; }
-		public virtual double ErrLimLo		{ get; set; }	/// [%] (usually < 0)
-		public virtual double ErrLimHi		{ get; set; }	/// [%] (usually > 0)
-		public virtual double Uncertainty	{ get; set; }	///	[%] makes error limits tighter: 0 <= Uncertainty <= abs(ErrLimXx)
-		public virtual sbyte  Publish	    { get; set; }   /// 0=no, 1=in all protocols, 2=on screen, 3=internal
-		public virtual bool   Evaluate      { get; set; }
+        public virtual int    Id					{ get; protected set; }
+        public virtual string Name					{ get; set; }
+		public virtual int    Repeats				{ get; set; }
+		public virtual double Qfrom					{ get; set; }	/// [m3/h] flow range low limit
+		public virtual double Qto					{ get; set; }	/// [m3/h] flow range high limit
+		public virtual double TargetVolume			{ get; set; }	/// [l] target test volume
+		public virtual double TargetTime			{ get; set; }	/// [s] target test time
+		public virtual string Method				{ get; set; }
+		public virtual double ErrLimLo				{ get; set; }	/// [%] (usually < 0)
+		public virtual double ErrLimHi				{ get; set; }	/// [%] (usually > 0)
+		public virtual double Uncertainty			{ get; set; }	///	[%] makes error limits tighter: 0 <= Uncertainty <= abs(ErrLimXx)
+		public virtual bool   DoControlWaterTemp	{ get; set; }
+		public virtual float  TempLimLo				{ get; set; }
+		public virtual float  TempLimHi				{ get; set; }
+		public virtual sbyte  Publish				{ get; set; }   /// 0=no, 1=in all protocols, 2=on screen, 3=internal
+		public virtual bool   Evaluate				{ get; set; }
 
 
 		protected TestData()
@@ -36,18 +39,21 @@ namespace Results.Entities
 		public TestData(Config.Entities.Test test)
 			: this()
 		{
-			Name         = test.Name;
-			Repeats      = test.Repeats;
-			Qfrom        = (double)test.Qfrom;
-			Qto          = (double)test.Qto;
+			Name = test.Name;
+			Repeats = test.Repeats;
+			Qfrom = (double)test.Qfrom;
+			Qto = (double)test.Qto;
 			TargetVolume = (double)test.Volume;
-			TargetTime   = (double)test.TstTime;
-			Method       = test.Method;
-			ErrLimLo     = (double)test.ErrLimLo;
-			ErrLimHi     = (double)test.ErrLimHi;
-			Uncertainty  = (double)test.Uncertainty;
-			Publish      = test.Publish;
-			Evaluate     = test.Evaluate;
+			TargetTime = (double)test.TstTime;
+			Method = test.Method;
+			ErrLimLo = (double)test.ErrLimLo;
+			ErrLimHi = (double)test.ErrLimHi;
+			Uncertainty = (double)test.Uncertainty;
+			DoControlWaterTemp = test.DoControlWaterTemp;
+			TempLimLo = test.TempLimLo;
+			TempLimHi = test.TempLimHi;
+			Publish = test.Publish;
+			Evaluate = test.DoEvaluate;
 		}
 
 
@@ -68,6 +74,12 @@ namespace Results.Entities
 			if (ErrLimLo != td.ErrLimLo) return false;
 			if (ErrLimHi != td.ErrLimHi) return false;
 			if (Uncertainty != td.Uncertainty) return false;
+			if (DoControlWaterTemp != td.DoControlWaterTemp) return false;
+			if (DoControlWaterTemp)
+			{
+				if (TempLimLo != td.TempLimLo) return false;
+				if (TempLimHi != td.TempLimHi) return false;
+			}
 			if (Publish != td.Publish) return false;
 			if (Evaluate != td.Evaluate) return false;
 

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
 {
@@ -14,12 +15,14 @@ namespace Results.Entities
 		public virtual TestData TestData { get; set; }
 		public virtual Components Components { get; set; }
 		public virtual int Part { get; set; }
-		public virtual int RepetitionNr { get; set; }       ///         Repetition number from the set of repeated tests (1...)
+		public virtual int RepetitionNr { get; set; }       /// Repetition number from the set of repeated tests (1...)
 
 		/// Main results
+		public virtual bool TestDone { get; set; }
+		public virtual string Remark { get; set; }
 		public virtual DateTime StartTime { get; set; }     /// Date and time of the test start
 		public virtual DateTime EndTime { get; set; }       /// Date and time of the test end
-		public virtual int    FlowSetTime { get; set; }     /// [s]     Measurement time in seconds
+		public virtual int FlowSetTime { get; set; }        /// [s]     Measurement time in seconds
 		public virtual double TestTime { get; set; }        /// [s]     Measurement time in seconds
 		public virtual double PulsesMaster { get; set; }
 		public virtual double ConstMaster { get; set; }     /// [pls/l] Pulses per liter master flow meter
@@ -37,76 +40,146 @@ 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
 
 		/// Auxiliary results
-        public virtual float AmbientTempAve { get; set; }   /// [°C]   Average ambient air temperature
+        public virtual float AmbTempMean { get; set; }		/// [°C]   Average ambient air temperature
 		public virtual float AmbTempStart { get; set; }		/// [°C]   Ambient air temperature on test start
 		public virtual float AmbTempEnd { get; set; }		/// [°C]   Ambient air temperature on test end
 		public virtual float AmbTempMin { get; set; }		/// [°C]   Minimum ambient air temperature
 		public virtual float AmbTempMax { get; set; }		/// [°C]   Maximum ambient air temperature
-        public virtual float AmbientPressAve { get; set; }  /// [bar]  Average ambient air pressure
+        public virtual float AmbPressMean { get; set; }		/// [bar]  Average ambient air pressure
 		public virtual float AmbPressStart { get; set; }	/// [bar]  Ambient air pressure on test start
 		public virtual float AmbPressEnd { get; set; }		/// [bar]  Ambient air pressure on test end
 		public virtual float AmbPressMin { get; set; }		/// [bar]  Minimum ambient air pressure
 		public virtual float AmbPressMax { get; set; }		/// [bar]  Maximum ambient air pressure
-		public virtual float AmbientHumiAve { get; set; }   /// [%]    Average ambient air relative humidity
+		public virtual float AmbHumiMean { get; set; }		/// [%]    Average ambient air relative humidity
 		public virtual float AmbHumiStart { get; set; }		/// [%]    Ambient air relative humidity on test start
 		public virtual float AmbHumiEnd { get; set; }		/// [%]    Ambient air relative humidity on test end
 		public virtual float AmbHumiMin { get; set; }		/// [%]    Minimum ambient air relative humidity
 		public virtual float AmbHumiMax { get; set; }		/// [%]    Maximum ambient air relative humidity
-		public virtual float PressUpAvrg { get; set; }      /// [bar]  Input water pressure (average)
+		public virtual float PressUpMean { get; set; }      /// [bar]  Input water pressure (average)
 		public virtual float PressUpStart { get; set; }     /// [bar]
 		public virtual float PressUpEnd { get; set; }       /// [bar]
 		public virtual float PressUpMin { get; set; }		/// [bar]
 		public virtual float PressUpMax { get; set; }       /// [bar]
-		public virtual float PressDownAvrg { get; set; }    /// [bar]
+		public virtual float PressDownMean { get; set; }    /// [bar]
 		public virtual float PressDownStart { get; set; }   /// [bar]
 		public virtual float PressDownEnd { get; set; }     /// [bar]
 		public virtual float PressDownMin { get; set; }		/// [bar]
 		public virtual float PressDownMax { get; set; }     /// [bar]
-        public virtual float TempInAvrg { get; set; }		/// [°C]
-        public virtual float TempInStart { get; set; }		/// [°C]
-        public virtual float TempInEnd { get; set; }		/// [°C]
-        public virtual float TempInMin { get; set; }		/// [°C]
-        public virtual float TempInMax { get; set; }		/// [°C]
-        public virtual float TempOutAvrg { get; set; }		/// [°C]
-        public virtual float TempOutStart { get; set; }		/// [°C]
-        public virtual float TempOutEnd { get; set; }		/// [°C]
-        public virtual float TempOutMin { get; set; }		/// [°C]
-        public virtual float TempOutMax { get; set; }		/// [°C]
-        public virtual float TempDivAvrg { get; set; }		/// [°C]
+		public virtual float PressDeltaMean { get; set; }   /// [bar]
+		public virtual float PressDeltaStart { get; set; }  /// [bar]
+		public virtual float PressDeltaEnd { get; set; }    /// [bar]
+		public virtual float PressDeltaMin { get; set; }	/// [bar]
+		public virtual float PressDeltaMax { get; set; }    /// [bar]
+		public virtual float TempUpMean { get; set; }		/// [°C]
+        public virtual float TempUpStart { get; set; }		/// [°C]
+        public virtual float TempUpEnd { get; set; }		/// [°C]
+        public virtual float TempUpMin { get; set; }		/// [°C]
+        public virtual float TempUpMax { get; set; }		/// [°C]
+        public virtual float TempDownMean { get; set; }		/// [°C]
+        public virtual float TempDownStart { get; set; }	/// [°C]
+        public virtual float TempDownEnd { get; set; }		/// [°C]
+        public virtual float TempDownMin { get; set; }		/// [°C]
+        public virtual float TempDownMax { get; set; }		/// [°C]
+        public virtual float TempDivMean { get; set; }		/// [°C]
         public virtual float TempDivStart { get; set; }		/// [°C]
         public virtual float TempDivEnd { get; set; }		/// [°C]
         public virtual float TempDivMin { get; set; }		/// [°C]
         public virtual float TempDivMax { get; set; }		/// [°C]
-        public virtual float FlowMin { get; set; }			/// [m3/h] minimum flow
-        public virtual float FlowMax { get; set; }			/// [m3/h] maximum flow
+		public virtual float FlowMean { get; set; }			/// [m3/h] mean flow from the reference flowmeter
+		public virtual float FlowStart { get; set; }		/// [m3/h] flow at the start of test from the reference flowmeter
+		public virtual float FlowEnd { get; set; }			/// [m3/h] flow at the end of test from the reference flowmeter
+        public virtual float FlowMin { get; set; }			/// [m3/h] not mapped to DB
+        public virtual float FlowMax { get; set; }			/// [m3/h] 
 
-        public virtual float Custom1  { get; set; }			/// [°C] T ref warm mean
-		public virtual float Custom2  { get; set; }			/// [°C] T ref warm start			
-		public virtual float Custom3  { get; set; }			/// [°C] T ref warm end
-		public virtual float Custom4  { get; set; }			/// [°C] T ref warm min
-		public virtual float Custom5  { get; set; }			/// [°C] T ref warm max
-		public virtual float Custom6  { get; set; }			/// [°C] T ref cold mean
-		public virtual float Custom7  { get; set; }			/// [°C] T ref cold start
-		public virtual float Custom8  { get; set; }			/// [°C] T ref cold end
-		public virtual float Custom9  { get; set; }			/// [°C] T ref cold min
-		public virtual float Custom10 { get; set; }			/// [°C] T ref cold max
+        public virtual float Custom1  { get; set; }			/// [°C] T ref hi mean
+		public virtual float Custom2  { get; set; }			/// [°C] T ref hi start			
+		public virtual float Custom3  { get; set; }			/// [°C] T ref hi end
+		public virtual float Custom4  { get; set; }			/// [°C] T ref hi min
+		public virtual float Custom5  { get; set; }			/// [°C] T ref hi max
+		public virtual float Custom6  { get; set; }			/// [°C] T ref lo mean
+		public virtual float Custom7  { get; set; }			/// [°C] T ref lo start
+		public virtual float Custom8  { get; set; }			/// [°C] T ref lo end
+		public virtual float Custom9  { get; set; }			/// [°C] T ref lo min
+		public virtual float Custom10 { get; set; }			/// [°C] T ref lo max
 
 		/// Wrappers
 		public virtual string Name()		 { return Utils.GetTestName(TestData.Name, TestData.Repeats, RepetitionNr); }
-		public virtual int    Repeats()		 { return TestData.Repeats; }
+        public virtual int Repeats()         { return TestData.Repeats; }
 		public virtual double Qfrom()		 { return TestData.Qfrom; }
 		public virtual double Qto()			 { return TestData.Qto; }
 		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; }
 
 
@@ -123,9 +196,137 @@ namespace Results.Entities
 			RepetitionNr = repetitionNr;
 		}
 
+        public virtual void CopyContentFrom(TestRslt src)
+        {
+            if (src == null) return;
+
+		    Components = src.Components;    /// ???
+		    Part = src.Part;
+		    RepetitionNr = src.RepetitionNr;
+			TestDone = src.TestDone;
+			Remark = src.Remark;
+		    StartTime = src.StartTime;
+		    EndTime = src.EndTime;
+		    FlowSetTime = src.FlowSetTime;
+		    TestTime = src.TestTime;
+		    PulsesMaster = src.PulsesMaster;
+		    ConstMaster = src.ConstMaster;
+		    MassStartRaw = src.MassStartRaw;
+		    MassStart = src.MassStart;
+		    MassEndRaw = src.MassEndRaw;
+		    MassEnd = src.MassEnd;
+		    DensityIn = src.DensityIn;
+		    DensityOut = src.DensityOut;
+		    DensityDiv = src.DensityDiv;
+		    Buoyancy = src.Buoyancy;
+		    FlowMass = src.FlowMass;
+		    FlowVolume = src.FlowVolume;
+		    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;
+		    AmbTempEnd = src.AmbTempEnd;
+		    AmbTempMin = src.AmbTempMin;
+		    AmbTempMax = src.AmbTempMax;
+            AmbPressMean = src.AmbPressMean;
+		    AmbPressStart = src.AmbPressStart;
+		    AmbPressEnd = src.AmbPressEnd;
+		    AmbPressMin = src.AmbPressMin; 
+		    AmbPressMax = src.AmbPressMax; 
+		    AmbHumiMean = src.AmbHumiMean; 
+		    AmbHumiStart = src.AmbHumiStart;
+		    AmbHumiEnd = src.AmbHumiEnd;
+		    AmbHumiMin = src.AmbHumiMin;
+		    AmbHumiMax = src.AmbHumiMax;
+		    PressUpMean = src.PressUpMean;
+		    PressUpStart = src.PressUpStart;
+		    PressUpEnd = src.PressUpEnd;
+		    PressUpMin = src.PressUpMin;
+		    PressUpMax = src.PressUpMax;
+		    PressDownMean = src.PressDownMean;
+		    PressDownStart = src.PressDownStart;
+		    PressDownEnd = src.PressDownEnd;
+		    PressDownMin = src.PressDownMin;
+		    PressDownMax = src.PressDownMax;
+		    PressDeltaMean = src.PressDeltaMean;
+		    PressDeltaStart = src.PressDeltaStart;
+		    PressDeltaEnd = src.PressDeltaEnd;
+		    PressDeltaMin = src.PressDeltaMin;
+		    PressDeltaMax = src.PressDeltaMax;
+		    TempUpMean = src.TempUpMean;
+            TempUpStart = src.TempUpStart;
+            TempUpEnd = src.TempUpEnd;
+            TempUpMin = src.TempUpMin;
+            TempUpMax = src.TempUpMax;
+            TempDownMean = src.TempDownMean;
+            TempDownStart = src.TempDownStart;
+            TempDownEnd = src.TempDownEnd;
+            TempDownMin = src.TempDownMin;
+            TempDownMax = src.TempDownMax;
+            TempDivMean = src.TempDivMean;
+            TempDivStart = src.TempDivStart;
+            TempDivEnd = src.TempDivEnd;
+            TempDivMin = src.TempDivMin;
+            TempDivMax = src.TempDivMax;
+			FlowMean = src.FlowMean;
+			FlowStart = src.FlowStart;
+		    FlowEnd = src.FlowEnd;
+			FlowMin = src.FlowMin;
+			FlowMax = src.FlowMax;
+            Custom1 = src.Custom1;
+		    Custom2 = src.Custom2;
+		    Custom3 = src.Custom3;
+		    Custom4 = src.Custom4;
+		    Custom5 = src.Custom5;
+		    Custom6 = src.Custom6;
+		    Custom7 = src.Custom7;
+		    Custom8 = src.Custom8;
+		    Custom9 = src.Custom9;
+		    Custom10 = src.Custom10;
+        }
+
+		/// <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

@@ -1,12 +1,44 @@
-using System;
+///
+/// Copyright (c) 2015-2017 Sensus Metering Systems
+///
+using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 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
@@ -16,26 +48,34 @@ 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; }
 
-#if IPERLST || IPERLST_SPECIAL
+#if IPERL
 		public virtual int    SerialNrEx        { get; set; }	/// Aux s/n for compound meters, Serial number for iPerl water meter
 		public virtual double OrigCalibFactor   { get; set; }	/// iPerl calibration factor used during the test
 		public virtual double CalibFactor		{ get; set; }	/// iPerl calibration factor used during the test
 		public virtual double Q2ErrWOCorrection { get; set; }
 		public virtual bool   Q2CorrectionDone  { get; set; }   /// true = iPerl Q2 correction was done
-		public virtual double Q2Correction		{ get; set; }	/// iPerl Q2 correction used during the test
-		public virtual int    Q2CorrFlowRight   { get; set; }	/// 1 = right to left
+        public virtual double Q2Correction      { get; set; }	/// !!! obsolete
+        public virtual int    Q2CorrRFlow       { get; set; }	/// iPerl Q2 correction for the R-flow written to iPerl
+        public virtual int    Q2CorrLFlow       { get; set; }	/// iPerl Q2 correction for the L-flow written to iPerl
+        public virtual int    Q2CorrFlowRight   { get; set; }	/// 1 = right to left
 		public virtual double Diff2Hz8Hz		{ get; set; }
 		public virtual bool   Hz2CorrectionDone { get; set; }   /// true = iPerl Q2 correction was done
 		public virtual int    Hz2Correction     { get; set; }	/// iPerl Q2 correction used during the test
+		public virtual string FWVersion         { get; set; }
+#endif
+#if ORACLE_DB
 		public virtual int	  Pruefindex	    { get; set; }	/// Not mapped to DB !!! 0=unknown (saving to Oracle failed), >=1 ... pruefindex
 		public virtual int	  HydrPruefung		{ get; set; }	/// Not mapped to DB !!!
 #endif
-        public virtual WaterMeterData WaterMeterData { get; set; }
+		public virtual WaterMeterData WaterMeterData { get; set; }
 		public virtual Batch Batch { get; set; }
 		public virtual IList<MeterTestRslt> MeterTestRslts { get; set; }
 
@@ -70,9 +110,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))
@@ -81,9 +151,39 @@ namespace Results.Entities
                     break;
                 }
             }
+
             return passed;
         }
 
+        public virtual bool CompletedFromTests()
+        {
+            bool completed = true;
+            foreach (var mtr in MeterTestRslts)
+            {
+                if (mtr.Evaluate() && !mtr.TestDone)
+                {
+                    completed = false;
+                    break;
+                }
+            }
+            return completed;
+        }
+
+
+        public virtual string PassedColorStr()
+        {
+#if PUCHONG_PT200
+			return Passed ? "OK|Green" : "NG|Red";
+#elif LANG_PL
+            return Passed ? "+|Green" : "-|Red";
+#elif LANG_RU
+            return Passed ? "годен|Green" : "негоден|Red";
+#else
+            return Passed ? "OK|Green" : "NOK|Red";
+#endif
+        }
+
+
 		///
 		/// Not mapped to the database
 		///
@@ -92,18 +192,33 @@ namespace Results.Entities
 
 		public virtual MeterTestRslt GetMeterTestRslt(string testName)
 		{
-			return GetMeterTestRslt(testName, CompoundMeterId.Single);
+			return GetMeterTestRslt(testName, CompoundMeterId.SingleOrCompound);
 		}
 
 		public virtual MeterTestRslt GetMeterTestRslt(string testName, Config.Entities.CompoundMeterId meterId)
 		{
+			if (string.IsNullOrEmpty(testName)) return null;
 			if (Disabled) return null;
+
 			string testNameL = testName.ToLower();
 			foreach (var mtr in MeterTestRslts)
 			{
-				if ((mtr.CompoundMeterId == (byte)meterId) && mtr.Name().ToLower().Equals(testNameL))
+				if (mtr.Name().ToLower().Equals(testNameL))
 				{
-					return mtr;
+					if (mtr.CompoundMeterId == (byte)meterId)
+					{
+						return mtr;
+					}
+					else if (meterId == Config.Entities.CompoundMeterId.SingleOrCompound &&
+							 mtr.CompoundMeterId == (byte)Config.Entities.CompoundMeterId.Single)
+					{
+						return mtr;
+					}
+					else if (meterId == Config.Entities.CompoundMeterId.SingleOrCompound &&
+							 mtr.CompoundMeterId == (byte)Config.Entities.CompoundMeterId.Compound)
+					{
+						return mtr;
+					}
 				}
 			}
 			return null;
@@ -116,6 +231,18 @@ namespace Results.Entities
 			return null;
         }
 
+        public virtual TestData GetTestData(string testName)
+        {
+            foreach (var mtr in MeterTestRslts)
+            {
+                if (mtr.TestRslt.TestData.Name == testName)
+                {
+                    return mtr.TestRslt.TestData;
+                }
+            }
+            return null;
+        }
+
 
 
 		/// <summary>
@@ -127,13 +254,61 @@ namespace Results.Entities
 		}
 
 
+        public virtual void CopyContentFrom(WaterMeter src)
+        {
+            if (src == null) return;
+            
+            SerialNr = src.SerialNr;
+		    SerialNrAux = src.SerialNrAux;
+		    PurchaseOrder = src.PurchaseOrder;
+		    YearOfProduction = src.YearOfProduction;
+            // WMPosition skipped
+		    EndState = src.EndState;
+		    EndStateAux = src.EndStateAux;
+		    QRise = src.QRise;
+		    QFall = src.QFall;
+            ErrorFlags = src.ErrorFlags;
+		    Passed = src.Passed;
+            ResultCode = src.ResultCode;
+			ArchivePath = src.ArchivePath;
+			Remark = src.Remark;
+#if IPERL
+		    SerialNrEx = src.SerialNrEx;
+		    OrigCalibFactor = src.OrigCalibFactor;
+		    CalibFactor = src.CalibFactor;
+		    Q2ErrWOCorrection = src.Q2ErrWOCorrection;
+		    Q2CorrectionDone = src.Q2CorrectionDone;
+            Q2Correction = src.Q2Correction;
+            Q2CorrRFlow = src.Q2CorrRFlow;
+            Q2CorrLFlow = src.Q2CorrLFlow;
+            Q2CorrFlowRight = src.Q2CorrFlowRight;
+		    Diff2Hz8Hz = src.Diff2Hz8Hz;
+		    Hz2CorrectionDone = src.Hz2CorrectionDone;
+		    Hz2Correction = src.Hz2Correction;
+			FWVersion = src.FWVersion;
+#endif
+#if ORACLE_DB
+		    Pruefindex = src.Pruefindex;
+		    HydrPruefung = src.HydrPruefung;
+#endif
+            foreach (var mtr in MeterTestRslts)
+            {
+                MeterTestRslt srcMtr = src.GetMeterTestRslt(mtr.Name(), (Config.Entities.CompoundMeterId)mtr.CompoundMeterId);
+                if (srcMtr != null)
+                {
+                    mtr.CopyContentFrom(srcMtr);
+                    mtr.TestRslt.CopyContentFrom(srcMtr.TestRslt);
+                }
+            }
+        }
+
 		public override string ToString()
 		{
 			StringBuilder sb = new StringBuilder(80);
-#if IPERLST || IPERLST_SPECIAL
+#if IPERL
 			sb.AppendFormat("PCB:{0} S/N:{1} ", SerialNr, SerialNrEx);
 #else
-            sb.AppendFormat("S/N:{0} ", SerialNr);
+			sb.AppendFormat("S/N:{0} ", SerialNr);
 #endif
 
 			foreach (var tr in MeterTestRslts) sb.AppendFormat(" {0}:{1}%", tr.Name(), tr.Error.ToString("F2"));

Results/Entities/WaterMeterData.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016 Sensus Metering Systems
+/// Copyright (c) 2016-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -49,7 +49,7 @@ namespace Results.Entities
         public virtual bool Compound { get; set; }
         public virtual bool HeatMeter { get; set; }
 
-#if IPERLST || IPERLST_SPECIAL
+#if ORACLE_DB
 		public virtual int WMTypeId { get; set; }
 		public virtual int WMTypeRev { get; set; }
 #endif
@@ -103,7 +103,7 @@ namespace Results.Entities
             if (Compound != wmd.Compound) return false;
 			if (HeatMeter != wmd.HeatMeter) return false;
 
-#if IPERLST || IPERLST_SPECIAL
+#if ORACLE_DB
             if (WMTypeId != wmd.WMTypeId) return false;
             if (WMTypeRev != wmd.WMTypeRev) return false;
 #endif

Results/Forms/BatchResultsDlg.cs

@@ -27,8 +27,9 @@ namespace Results.Forms
         public TestsArrangement TestsArrangement;
         public int NrMetersInOneGroup;
 
-        public IList<Results.ItemSpec> RsltItems_Screen_SingleWM;
-        public IList<Results.ItemSpec> RsltItems_Screen_CombinedWM;
+        public IList<Results.WMeterRsltItemSpec> RsltItems_Screen_SingleWM;
+        public IList<Results.WMeterRsltItemSpec> RsltItems_Screen_CombinedWM;
+        public IList<Results.WMeterRsltItemSpec> RsltItems_Screen_HeatM;
         public int[] RsltsClmnWidths { set { rsltsClmnWidths = value; } }
 
         public int PopupResultsLeft;
@@ -42,7 +43,7 @@ namespace Results.Forms
         /// Private members
         ///
         Results.BatchResults results;
-        bool compound;
+        MetersKind metersKind;
 
         ListView firstListView;
         public int[] rsltsClmnWidths;
@@ -87,6 +88,23 @@ namespace Results.Forms
         }
 
 
+        IList<Results.WMeterRsltItemSpec> GetRsltItems(MetersKind metersKind)
+        {
+            IList<Results.WMeterRsltItemSpec> srcItems;
+            switch (metersKind)
+            {
+                default:
+                case MetersKind.Single: srcItems = RsltItems_Screen_SingleWM; break;
+                case MetersKind.Combined: srcItems = RsltItems_Screen_CombinedWM; break;
+                case MetersKind.HeatMeter: srcItems = RsltItems_Screen_HeatM; break;
+            }
+
+            IList<Results.WMeterRsltItemSpec> copiedItems = new List<Results.WMeterRsltItemSpec>();
+            foreach (var it in srcItems) copiedItems.Add(it.Clone());
+            return copiedItems;
+        }
+
+
         /// <summary>
         /// Re-draw the results. Apply new settings if they changed.
         /// </summary>
@@ -109,7 +127,7 @@ namespace Results.Forms
                 }
 
                 int metersInOneGroup = Math.Max(1, Math.Min(enabledWMsCount, NrMetersInOneGroup));
-                int nrGroups = Math.Max(1, (enabledWMsCount + NrMetersInOneGroup - 1) / metersInOneGroup);
+                int nrGroups = Math.Max(1, (enabledWMsCount + metersInOneGroup - 1) / metersInOneGroup);
 
                 if (MetersArrangement == MetersArrangement.Horizontally)
                 {
@@ -191,10 +209,8 @@ namespace Results.Forms
 
             foreach (var mtr in wMtr.MeterTestRslts)
             {
-                if ((mtr.CompoundMeterId == (byte)CompoundMeterId.Single || mtr.CompoundMeterId == (byte)CompoundMeterId.Compound)
-                      && mtr.TestDone
-                      && (mtr.Publish() != Config.Entities.Publish.Never)
-                      && (mtr.Publish() != Config.Entities.Publish.Internal))
+				if (mtr.IsPilotRslt() && mtr.TestDone && (mtr.Publish() != Config.Entities.Publish.Never)
+													  && (mtr.Publish() != Config.Entities.Publish.Internal))
                 {
                     testNames.Add(mtr.Name());
                 }
@@ -211,20 +227,21 @@ namespace Results.Forms
         /// <returns>ListView object</returns>
         ListView GetResultsTestsAreRows(Results.Entities.WaterMeter wMtr, int printedWMNr)
         {
-            compound = wMtr.Compound();
+            metersKind = wMtr.Compound() ? MetersKind.Combined : (wMtr.HeatMeter() ? MetersKind.HeatMeter : MetersKind.Single);
 
             ListView lview = GetListView();
 
-            IList<Results.ItemSpec> items = (compound ? RsltItems_Screen_CombinedWM : RsltItems_Screen_SingleWM);
+            IList<Results.WMeterRsltItemSpec> items = GetRsltItems(metersKind);
+
             if (items == null || items.Count == 0) return lview;
 
             // Header
             lview.Columns.Add(printedWMNr.ToString(), (rsltsClmnCount > 0) ? rsltsClmnWidths[0] : 40);
-            int i = 1;
+            int col = 1;
             foreach (var item in items)
             {
-                lview.Columns.Add(item.ClmnHeaderText, (rsltsClmnCount > i) ? rsltsClmnWidths[i] : 70);
-                i++;
+                lview.Columns.Add(item.Caption, (rsltsClmnCount > col) ? rsltsClmnWidths[col] : 70);
+                col++;
             }
 
 
@@ -232,29 +249,16 @@ namespace Results.Forms
             int ix = 0;
             foreach (var mtr in wMtr.MeterTestRslts)
             {
-                if ((mtr.CompoundMeterId == (byte)CompoundMeterId.Single || mtr.CompoundMeterId == (byte)CompoundMeterId.Compound)
-                        && mtr.TestDone
-                        && (mtr.Publish() != Config.Entities.Publish.Never)
-                        && (mtr.Publish() != Config.Entities.Publish.Internal))
+                if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Config.Entities.Publish.Never
+																	 && mtr.Publish() != Config.Entities.Publish.Internal)
                 {
                     ListViewItem lvi = new ListViewItem(testNames[ix++]);
 
-                    foreach (var item in items)
+                    for (int i = 0; i < items.Count; i++)
                     {
-                        string str;
-                        if (compound)
-                        {
-                            var main = wMtr.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundMain);
-                            var aux = wMtr.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundAux);
-                            str = (item.CanPrintCompoundMeter && main != null && aux != null)
-                                    ? item.PrintCombined(main, aux, mtr)
-                                    : string.Empty;
-                        }
-                        else
-                        {
-                            str = item.CanPrintSingle ? item.Print(mtr) : string.Empty;
-                        }
+                        string str = items[i].Print(wMtr, mtr.Name());
 
+                        /// Extract and use color information
                         string[] texts = str.Split(new char[] { '|' });
                         if (texts.Length == 1)
                         {
@@ -288,11 +292,12 @@ namespace Results.Forms
         /// <returns>ListView object</returns>
         ListView GetResultsTestsAreColumns(Results.Entities.WaterMeter wMtr, int printedWMNr)
         {
-            compound = wMtr.Compound();
+            metersKind = wMtr.Compound() ? MetersKind.Combined : (wMtr.HeatMeter() ? MetersKind.HeatMeter : MetersKind.Single);
 
             ListView lview = GetListView();
 
-            IList<Results.ItemSpec> items = (compound ? RsltItems_Screen_CombinedWM : RsltItems_Screen_SingleWM);
+            IList<Results.WMeterRsltItemSpec> items = GetRsltItems(metersKind);
+
             if (items == null || items.Count == 0) return lview;
 
             // Header
@@ -306,69 +311,34 @@ namespace Results.Forms
 
             foreach (var item in items)
             {
-                ListViewItem lvi = new ListViewItem(item.ClmnHeaderText);
-                if (compound)
+                ListViewItem lvi = new ListViewItem(item.Caption);
+
+                foreach (var mtr in wMtr.MeterTestRslts)
                 {
-                    foreach (var mtr in wMtr.MeterTestRslts)
+                    if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Config.Entities.Publish.Never &&
+																			mtr.Publish() != Config.Entities.Publish.Internal)
                     {
-                        if (mtr.CompoundMeterId == (byte)CompoundMeterId.Compound && mtr.TestDone
-                                && (mtr.Publish() != Config.Entities.Publish.Never)
-                                && (mtr.Publish() != Config.Entities.Publish.Internal))
+                        string str = items[i].Print(wMtr, mtr.Name());
+
+                        string[] texts = str.Split(new char[] { '|' });
+                        if (texts.Length == 1)
                         {
-                            var main = wMtr.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundMain);
-                            var aux = wMtr.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundAux);
-
-                            string str = (item.CanPrintCompoundMeter && main != null && aux != null)
-                                        ? item.PrintCombined(main, aux, mtr)
-                                        : string.Empty;
-
-                            string[] texts = str.Split(new char[] { '|' });
-                            if (texts.Length == 1)
-                            {
-                                lvi.SubItems.Add(str);
-                            }
-                            else if (texts.Length == 2)
-                            {
-                                Color color = texts[1].Equals("Green") ? Color.Green : (texts[1].Equals("Red") ? Color.Red : Color.White);
-                                lvi.UseItemStyleForSubItems = false;
-                                lvi.SubItems.Add(texts[0]);
-                                lvi.SubItems[lvi.SubItems.Count - 1].BackColor = color;
-                            }
-                            else
-                            {
-                                lvi.SubItems.Add(string.Empty);
-                            }
+                            lvi.SubItems.Add(str);
+                        }
+                        else if (texts.Length == 2)
+                        {
+                            Color color = texts[1].Equals("Green") ? Color.Green : (texts[1].Equals("Red") ? Color.Red : Color.White);
+                            lvi.UseItemStyleForSubItems = false;
+                            lvi.SubItems.Add(texts[0]);
+                            lvi.SubItems[lvi.SubItems.Count - 1].BackColor = color;
+                        }
+                        else
+                        {
+                            lvi.SubItems.Add(string.Empty);
                         }
                     }
                 }
-                else
-                {
-                    foreach (var mtr in wMtr.MeterTestRslts)
-                    {
-                        if (mtr.TestDone && (mtr.Publish() != Config.Entities.Publish.Never)
-                                         && (mtr.Publish() != Config.Entities.Publish.Internal))
-                        {
-                            string str = !item.CanPrintSingle ? string.Empty : item.Print(mtr);
 
-                            string[] texts = str.Split(new char[] { '|' });
-                            if (texts.Length == 1)
-                            {
-                                lvi.SubItems.Add(str);
-                            }
-                            else if (texts.Length == 2)
-                            {
-                                Color color = texts[1].Equals("Green") ? Color.Green : (texts[1].Equals("Red") ? Color.Red : Color.White);
-                                lvi.UseItemStyleForSubItems = false;
-                                lvi.SubItems.Add(texts[0]);
-                                lvi.SubItems[lvi.SubItems.Count - 1].BackColor = color;
-                            }
-                            else
-                            {
-                                lvi.SubItems.Add(string.Empty);
-                            }
-                        }
-                    }
-                }
                 lview.Items.Add(lvi);
             }
 

Results/Forms/ResultsConfigCtrl.Designer.cs

@@ -0,0 +1,257 @@
+namespace Results.Forms
+{
+    partial class ResultsConfigCtrl
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+			this.availableTabControl = new System.Windows.Forms.TabControl();
+			this.tabPage1 = new System.Windows.Forms.TabPage();
+			this.availableByQuantityTreeView = new System.Windows.Forms.TreeView();
+			this.tabPage2 = new System.Windows.Forms.TabPage();
+			this.availableByCategoryTreeView = new System.Windows.Forms.TreeView();
+			this.tabPage3 = new System.Windows.Forms.TabPage();
+			this.availableAlphabeticTreeView = new System.Windows.Forms.TreeView();
+			this.downButton = new System.Windows.Forms.Button();
+			this.upButton = new System.Windows.Forms.Button();
+			this.selectedResultsListViewEx = new Results.Forms.ListViewEx();
+			this.removeAllButton = new System.Windows.Forms.Button();
+			this.removeButton = new System.Windows.Forms.Button();
+			this.addButton = new System.Windows.Forms.Button();
+			this.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();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TabControl availableTabControl;
+        private System.Windows.Forms.TabPage tabPage1;
+        private System.Windows.Forms.TreeView availableByQuantityTreeView;
+        private System.Windows.Forms.TabPage tabPage2;
+        private System.Windows.Forms.TreeView availableByCategoryTreeView;
+        private System.Windows.Forms.TabPage tabPage3;
+        private System.Windows.Forms.TreeView availableAlphabeticTreeView;
+        private System.Windows.Forms.Button downButton;
+        private System.Windows.Forms.Button upButton;
+        private ListViewEx selectedResultsListViewEx;
+        private System.Windows.Forms.Button removeAllButton;
+        private System.Windows.Forms.Button removeButton;
+        private System.Windows.Forms.Button addButton;
+        private System.Windows.Forms.Label selectedResultsLabel;
+        private System.Windows.Forms.Label availableResultsLabel;
+
+    }
+}

Results/Forms/ResultsConfigCtrl.cs

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

Results/Forms/ResultsConfigDlg.cs

@@ -1,8 +1,9 @@
 ///
-/// Copyright (c) 2016 Sensus Metering Systems
+/// Copyright (c) 2016-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Windows.Forms;
 using log4net;
 using Config.Entities;
@@ -13,338 +14,58 @@ namespace Results.Forms
 {
 	public partial class ResultsConfigDlg : Form
 	{
-        /// <summary>
-        /// ListViewEx columns
-        /// </summary>
-        enum Column
+        public IList<WMeterRsltItemSpec> SelectedItems
         {
-            Item,
-            Caption,
-            TestID,
-            Units,
-            Format,
-            Precision,
-            Width,
-            Alignment,
-            Count,
+            set { resultsConfigCtrl.SelectedItems = value; }
+            get { return resultsConfigCtrl.SelectedItems; }
         }
-        Control[] editors;
-        
 
-        public IList<WMeterRsltItemSpec> AvailableItems;
-        public IList<WMeterRsltItemSpec> SelectedItems;
+        public MetersKind MetersKind
+        {
+            set { resultsConfigCtrl.MetersKind = value; }
+        }
 
 
-        public MetersKind MetersKind;
-
+		public ResultsConfigDlg(bool supressTestIDColumn)
+			: this()
+		{
+			resultsConfigCtrl.SupressTestIDColumn = supressTestIDColumn;
+		}
+		
 		public ResultsConfigDlg()
 		{
 			InitializeComponent();
+			resultsConfigCtrl.Unlocked = true;
 		}
 
+
 		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.Test_ID });
-            selectedResultsListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Units });
-            selectedResultsListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Format });
-            selectedResultsListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Precision });
-            selectedResultsListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Width });
-            selectedResultsListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Alignment });
-
-            /// Create controls used by ListViewEx to edit items
-            ComboBox unitsCB = new ComboBox();
-            unitsCB.Items.Add("---");           /// Use "---" instead of "None"
-            for (Config.Unit u = (Config.Unit)1; u < Config.Unit.Count; u++)
-            {
-                unitsCB.Items.Add(u.ToString().Replace("Pct", "%").Replace('p', '/'));
-            }
-
-            ComboBox alignmentCB = new ComboBox();
-            for (Config.Entities.Alignment a = 0; a < Config.Entities.Alignment.Count; a++)
-            {
-                alignmentCB.Items.Add(a.ToString());
-            }
-
-            editors = new Control[]
-                {
-                    null,
-                    new TextBox(),
-                    new TextBox(),
-                    unitsCB,
-                    new TextBox(),
-                    new TextBox(),
-                    new TextBox(),
-                    alignmentCB,
-                };
-            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;
-            WMeterRsltItemSpec item = lvi.Tag as WMeterRsltItemSpec;
-
-            switch ((Column)e.SubItem)
-            {
-                case Column.Caption:    item.Caption = e.DisplayText;   return;
-                case Column.TestID:     item.TestID = e.DisplayText;    return;
-                case Column.Format:     item.Format = e.DisplayText;    return;
-                case Column.Precision:  item.Precision = e.DisplayText; return;
-
-                case Column.Units:
-                    if (editors[e.SubItem].Text == "---") { item.Units = 0; return; };
-                    for (Config.Unit u = (Config.Unit)1; u < Config.Unit.Count; u++)
-                    {
-                        if (u.ToString().Replace("Pct", "%").Replace('p', '/').Equals(editors[e.SubItem].Text))
-                        {
-                            item.Units = u;
-                            return;     /// OK
-                        }
-                    }
-                    break;              /// Error
-
-                case Column.Alignment:
-                    for (Config.Entities.Alignment a = 0; a < Config.Entities.Alignment.Count; a++)
-                    {
-                        if (a.ToString().Equals(editors[e.SubItem].Text))
-                        {
-                            item.Alignment = a;
-                            return;
-                        }
-                    }
-                    break;              /// Error
-                                    
-                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<WMeterRsltItemSpec>();
-            foreach (var item in WMeterRsltItemSpec.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.TestID);                                                      /// TestID
-                lvi.SubItems.Add((item.Units == Config.Unit.None) ? "---" : item.Units.ToString().Replace("Pct", "%").Replace('p', '/')); /// Units
-                lvi.SubItems.Add(item.Format);                                                      /// Format
-                lvi.SubItems.Add(item.Precision);                                                   /// Precision
-                lvi.SubItems.Add(item.Width.ToString());                                            /// Width
-                lvi.SubItems.Add(item.Alignment.ToString());                                        /// Alignment
-
-				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)
+        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;
-            }
-
-            WMeterRsltItemSpec 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;
-            }
-
-            WMeterRsltItemSpec tmp = SelectedItems[selIdx + 1];
-            SelectedItems[selIdx + 1] = SelectedItems[selIdx];
-            SelectedItems[selIdx] = tmp;
-            
-            RedrawSelected();
-
-            selectedResultsListViewEx.Focus();
-            selectedResultsListViewEx.Items[selIdx + 1].Selected = true;
-            selectedResultsListViewEx.Items[selIdx + 1].EnsureVisible();
-        }
-
         private void cancelButton_Click(object sender, EventArgs e)
         {
             DialogResult = DialogResult.Cancel;
             Close();
         }
+
+        private void ResultsConfigDlg_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            e.Handled = true;
+        }
 	}
 }

Results/Forms/ResultsConfigDlg.designer.cs

@@ -31,171 +31,64 @@ namespace Results.Forms
 		/// </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 Results.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 Results.Forms.SubItemEventHandler(this.selectedResultsListViewEx_SubItemClicked);
-            this.selectedResultsListViewEx.SubItemEndEditing += new Results.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();
+			this.okButton = new System.Windows.Forms.Button();
+			this.cancelButton = new System.Windows.Forms.Button();
+			this.resultsConfigCtrl = new Results.Forms.ResultsConfigCtrl();
+			this.SuspendLayout();
+			// 
+			// okButton
+			// 
+			this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.okButton.Location = new System.Drawing.Point(939, 29);
+			this.okButton.Name = "okButton";
+			this.okButton.Size = new System.Drawing.Size(105, 42);
+			this.okButton.TabIndex = 4;
+			this.okButton.Text = "OK";
+			this.okButton.UseVisualStyleBackColor = true;
+			this.okButton.Click += new System.EventHandler(this.okButton_Click);
+			// 
+			// cancelButton
+			// 
+			this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancelButton.Location = new System.Drawing.Point(939, 82);
+			this.cancelButton.Name = "cancelButton";
+			this.cancelButton.Size = new System.Drawing.Size(105, 42);
+			this.cancelButton.TabIndex = 5;
+			this.cancelButton.Text = "Cancel";
+			this.cancelButton.UseVisualStyleBackColor = true;
+			this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
+			// 
+			// resultsConfigCtrl
+			// 
+			this.resultsConfigCtrl.Location = new System.Drawing.Point(-1, 1);
+			this.resultsConfigCtrl.Name = "resultsConfigCtrl";
+			this.resultsConfigCtrl.Size = new System.Drawing.Size(925, 496);
+			this.resultsConfigCtrl.TabIndex = 6;
+			// 
+			// ResultsConfigDlg
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(1066, 498);
+			this.Controls.Add(this.resultsConfigCtrl);
+			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);
 
 		}
 
 		#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;
+        private System.Windows.Forms.Button cancelButton;
+        private ResultsConfigCtrl resultsConfigCtrl;
 	}
 }

Results/ItemID.cs

@@ -1,4 +1,7 @@
-using System;
+///
+/// Copyright (c) 2016-2017 Sensus Metering Systems
+///
+using System;
 
 namespace Results
 {
@@ -20,8 +23,8 @@ namespace Results
         Test_end_time,                  /// 13
         Test_time,                      /// 14
         Flow,                           /// 15
-        T_in,                           /// 16
-        T_out,                          /// 17
+        T_up_mean,                      /// 16
+        T_down_mean,                    /// 17
         T_div,                          /// 18
         P_up,                           /// 19
         P_up_start,                     /// 20
@@ -80,15 +83,116 @@ namespace Results
         Lite_per_pulse_Read,            /// 73
         Result_code,                    /// 74
         Remark,                         /// 75
-        TempHiMean,                     /// 76
-        TempHiStart,                    /// 77
-        TempHiEnd,                      /// 78
-        TempHiAve,                      /// 79
-        TempLoMean,                     /// 80
-        TempLoStart,                    /// 81
-        TempLoEnd,                      /// 82
-        TempLoAve,                      /// 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
+		Meter_type,						/// 87   Single, Compound or HeatMeter
+		Volume_main,					/// 88
+		Volume_aux,					    /// 89
+		Start_volume,					/// 90
+		Start_volume_main,				/// 91
+		Start_volume_aux,				/// 92
+		End_volume,				        /// 93
+		End_volume_main,				/// 94
+		End_volume_aux,				    /// 95   
+		Error_main,						/// 96
+		Error_aux,						/// 97
+		Serial_Nr_main,					/// 98
+		Serial_Nr_aux,					/// 99
+		End_state_main,					/// 100
+		End_state_aux,					/// 101
+		Q_rise,							/// 102
+		Q_fall,							/// 103
+
+		/// iPerl
+        OrigCalibFactor,            	/// 104
+		CalibFactor,	                /// 105
+		Q2ErrWOCorrection,              /// 106
+		Q2CorrectionDone,               /// 107
+        Q2CorrRFlow,	                /// 108
+        Q2CorrLFlow,                	/// 109
+        Q2CorrFlowRight,            	/// 110
+
+		Q_ref_mean,						/// 111
+		T_up_start,						/// 112
+		T_up_end,						/// 113
+		T_up_avg,						/// 114
+		T_down_start,					/// 115
+		T_down_end,						/// 116
+		T_down_avg,						/// 117
+		T_div_start,					/// 118
+		T_div_end,						/// 119
+		T_div_avg,						/// 120
+		P_up_avg,						/// 121
+		P_down_avg,						/// 122
+		P_delta_avg,					/// 123
+		
+		TestDone,						/// 124
+		TestPassed,						/// 125
+
+        /// iPerl
+        FW_Version,            	        /// 126
+
+		Mass_start_raw,					/// 127
+		Mass_start,						/// 128
+		Mass_end_raw,					/// 129
+		Mass_end,						/// 130
+		Mass,							/// 131
+		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
+
         Count,
     }
 }

Results/ItemSpec.cs

@@ -114,21 +114,26 @@ namespace Results
 			AllItems.Add(new ItemSpec("Test end time", Strings.T_end, x => x.EndTime().ToShortTimeString(), (x, y, z) => z.EndTime().ToShortTimeString(), (x, z) => z.EndTime().ToShortTimeString()));
 			AllItems.Add(new ItemSpec("Test time", Strings.T_s, x => x.TestTime.ToString("F2"), (x, y, z) => z.TestTime.ToString("F2"), (x, z) => z.TestTime.ToString("F2")));
 			AllItems.Add(new ItemSpec("Flow", Strings.Flow + " [m3/h]", x => Utils.DoubleToStr(x.FlowVolume(), 4), (x, y, z) => Utils.DoubleToStr(z.FlowVolume(), 4), (x, z) => Utils.DoubleToStr(x.FlowVolume(), 4)));
-			AllItems.Add(new ItemSpec("T in", Strings.T_in + " [°C]", x => x.TestRslt.TempInAvrg.ToString("F2"), (x, y, z) => z.TestRslt.TempInAvrg.ToString("F2"), (x, z) => z.TestRslt.TempInAvrg.ToString("F2")));
-			AllItems.Add(new ItemSpec("T out", Strings.T_out + " [°C]", x => x.TestRslt.TempOutAvrg.ToString("F2"), (x, y, z) => z.TestRslt.TempOutAvrg.ToString("F2"), (x, z) => z.TestRslt.TempOutAvrg.ToString("F2")));
-			AllItems.Add(new ItemSpec("T div", Strings.T_div + " [°C]", x => x.TestRslt.TempDivAvrg.ToString("F2"), (x, y, z) => z.TestRslt.TempDivAvrg.ToString("F2"), (x, z) => z.TestRslt.TempDivAvrg.ToString("F2")));
-			AllItems.Add(new ItemSpec("P up", Strings.P_up + " [kPa]", x => (100 * x.TestRslt.PressUpAvrg).ToString("F3"), (x, y, z) => z.TestRslt.PressUpAvrg.ToString("F3"), (x, z) => z.TestRslt.PressUpAvrg.ToString("F3")));
+			AllItems.Add(new ItemSpec("T in", Strings.T_in + " [°C]", x => x.TestRslt.TempUpMean.ToString("F2"), (x, y, z) => z.TestRslt.TempUpMean.ToString("F2"), (x, z) => z.TestRslt.TempUpMean.ToString("F2")));
+			AllItems.Add(new ItemSpec("T out", Strings.T_out + " [°C]", x => x.TestRslt.TempDownMean.ToString("F2"), (x, y, z) => z.TestRslt.TempDownMean.ToString("F2"), (x, z) => z.TestRslt.TempDownMean.ToString("F2")));
+			AllItems.Add(new ItemSpec("T div", Strings.T_div + " [°C]", x => x.TestRslt.TempDivMean.ToString("F2"), (x, y, z) => z.TestRslt.TempDivMean.ToString("F2"), (x, z) => z.TestRslt.TempDivMean.ToString("F2")));
+			AllItems.Add(new ItemSpec("P up", Strings.P_up + " [kPa]", x => (100 * x.TestRslt.PressUpMean).ToString("F3"), (x, y, z) => z.TestRslt.PressUpMean.ToString("F3"), (x, z) => z.TestRslt.PressUpMean.ToString("F3")));
 			AllItems.Add(new ItemSpec("P up start", Strings.P_up_start + " [kPa]", x => (100 * x.TestRslt.PressUpStart).ToString("F3"), (x, y, z) => z.TestRslt.PressUpStart.ToString("F3"), (x, z) => z.TestRslt.PressUpStart.ToString("F3")));
 			AllItems.Add(new ItemSpec("P up end", Strings.P_up_end + " [kPa]", x => (100 * x.TestRslt.PressUpEnd).ToString("F3"), (x, y, z) => z.TestRslt.PressUpEnd.ToString("F3"), (x, z) => z.TestRslt.PressUpEnd.ToString("F3")));
-			AllItems.Add(new ItemSpec("P down", Strings.P_dn + " [kPa]", x => (100 * x.TestRslt.PressDownAvrg).ToString("F3"), (x, y, z) => z.TestRslt.PressDownAvrg.ToString("F3"), (x, z) => z.TestRslt.PressDownAvrg.ToString("F3")));
+			AllItems.Add(new ItemSpec("P down", Strings.P_dn + " [kPa]", x => (100 * x.TestRslt.PressDownMean).ToString("F3"), (x, y, z) => z.TestRslt.PressDownMean.ToString("F3"), (x, z) => z.TestRslt.PressDownMean.ToString("F3")));
 			AllItems.Add(new ItemSpec("P down start", Strings.P_dn_start + " [kPa]", x => (100 * x.TestRslt.PressDownStart).ToString("F3"), (x, y, z) => z.TestRslt.PressDownStart.ToString("F3"), (x, z) => z.TestRslt.PressDownStart.ToString("F3")));
 			AllItems.Add(new ItemSpec("P down end", Strings.P_dn_end + " [kPa]", x => (100 * x.TestRslt.PressDownEnd).ToString("F3"), (x, y, z) => z.TestRslt.PressDownEnd.ToString("F3"), (x, z) => z.TestRslt.PressDownEnd.ToString("F3")));
+			AllItems.Add(new ItemSpec("P delta", Strings.P_delta + " [kPa]", x => (100 * x.TestRslt.PressDeltaMean).ToString("F3"), (x, y, z) => z.TestRslt.PressDeltaMean.ToString("F3"), (x, z) => z.TestRslt.PressDeltaMean.ToString("F3")));
+			AllItems.Add(new ItemSpec("P delta start", Strings.P_delta_start + " [kPa]", x => (100 * x.TestRslt.PressDeltaStart).ToString("F3"), (x, y, z) => z.TestRslt.PressDeltaStart.ToString("F3"), (x, z) => z.TestRslt.PressDeltaStart.ToString("F3")));
+			AllItems.Add(new ItemSpec("P delta end", Strings.P_delta_end + " [kPa]", x => (100 * x.TestRslt.PressDeltaEnd).ToString("F3"), (x, y, z) => z.TestRslt.PressDeltaEnd.ToString("F3"), (x, z) => z.TestRslt.PressDeltaEnd.ToString("F3")));
 			AllItems.Add(new ItemSpec("Reference error", Strings.ErrRef + " [%]", x => x.TestRslt.ErrorMaster.ToString("F3"), (x, y, z) => z.TestRslt.ErrorMaster.ToString("F3"), (x, z) => z.TestRslt.ErrorMaster.ToString("F3")));
-			AllItems.Add(new ItemSpec("Ambient temperature", Strings.T_amb + " [°C]", x => x.TestRslt.AmbientTempAve.ToString("F1"), (x, y, z) => z.TestRslt.AmbientTempAve.ToString("F1"), (x, z) => z.TestRslt.AmbientTempAve.ToString("F1")));
-			AllItems.Add(new ItemSpec("Ambient pressure", Strings.P_amb + " [mbar]", x => (1000 * x.TestRslt.AmbientPressAve).ToString("F0"), (x, y, z) => (1000 * z.TestRslt.AmbientPressAve).ToString("F0"), (x, z) => (1000 * z.TestRslt.AmbientPressAve).ToString("F0")));
-			AllItems.Add(new ItemSpec("Ambient humidity", Strings.H_amb + " [%]", x => x.TestRslt.AmbientHumiAve.ToString("F1"), (x, y, z) => z.TestRslt.AmbientHumiAve.ToString("F1"), (x, z) => z.TestRslt.AmbientHumiAve.ToString("F1")));
+			AllItems.Add(new ItemSpec("Ambient temperature", Strings.T_amb + " [°C]", x => x.TestRslt.AmbTempMean.ToString("F1"), (x, y, z) => z.TestRslt.AmbTempMean.ToString("F1"), (x, z) => z.TestRslt.AmbTempMean.ToString("F1")));
+			AllItems.Add(new ItemSpec("Ambient pressure", Strings.P_amb + " [mbar]", x => (1000 * x.TestRslt.AmbPressMean).ToString("F0"), (x, y, z) => (1000 * z.TestRslt.AmbPressMean).ToString("F0"), (x, z) => (1000 * z.TestRslt.AmbPressMean).ToString("F0")));
+			AllItems.Add(new ItemSpec("Ambient humidity", Strings.H_amb + " [%]", x => x.TestRslt.AmbHumiMean.ToString("F1"), (x, y, z) => z.TestRslt.AmbHumiMean.ToString("F1"), (x, z) => z.TestRslt.AmbHumiMean.ToString("F1")));
 
 			/// Single and combined meter results
+			AllItems.Add(new ItemSpec("Start volume", Strings.Start_volume + " [l]",  x => x.VolumeStart.ToString("F3"), (x, y, z) => z.VolumeStart.ToString("F3"), (x, z) => z.VolumeStart.ToString("F3")));
+			AllItems.Add(new ItemSpec("End volume", Strings.End_volume + " [l]", x => x.VolumeEnd.ToString("F3"), (x, y, z) => z.VolumeEnd.ToString("F3"), (x, z) => z.VolumeEnd.ToString("F3")));
 			AllItems.Add(new ItemSpec("Volume", Strings.Volume + " [l]", x => x.VolumeMeter.ToString("F3"), (x, y, z) => z.VolumeMeter.ToString("F3"), (x, z) => x.VolumeMeter.ToString("F3")));
 			AllItems.Add(new ItemSpec("Reference volume", Strings.VolRef + " [l]", x => x.VolumeRef.ToString("F3"), (x, y, z) => z.VolumeRef.ToString("F3"), (x, z) => x.VolumeRef.ToString("F3")));
 			AllItems.Add(new ItemSpec("Error", Strings.Error + " [%]", x => x.Error.ToString("F2"), (x, y, z) => z.Error.ToString("F2"), null));
@@ -173,6 +178,12 @@ namespace Results
 			AllItems.Add(new ItemSpec("Serial Nr small WM", Strings.sn_aux, null, (x, y, z) => y.SerialNr(), null));
 			AllItems.Add(new ItemSpec("End state large WM", Strings.EndState_main, null, (x, y, z) => x.EndState(), null));
 			AllItems.Add(new ItemSpec("End state small WM", Strings.EndState_aux, null, (x, y, z) => y.EndState(), null));
+			AllItems.Add(new ItemSpec("Start volume main",  Strings.Start_volume_main + " [l]",x => x.VolumeMeter.ToString("F3"), (x, y, z) => x.VolumeStart.ToString("F3"), null));
+			AllItems.Add(new ItemSpec("End volume main",    Strings.End_volume_main + " [l]",  x => x.VolumeMeter.ToString("F3"), (x, y, z) => x.VolumeEnd.ToString("F3"),   null));
+			AllItems.Add(new ItemSpec("Volume main",        Strings.Volume_main + " [l]",      x => x.VolumeMeter.ToString("F3"), (x, y, z) => x.VolumeMeter.ToString("F3"), null));
+			AllItems.Add(new ItemSpec("Start volume aux",   Strings.Start_volume_aux + " [l]", x => x.VolumeMeter.ToString("F3"), (x, y, z) => y.VolumeStart.ToString("F3"), null));
+			AllItems.Add(new ItemSpec("End volume aux",     Strings.End_volume_aux + " [l]",   x => x.VolumeMeter.ToString("F3"), (x, y, z) => y.VolumeEnd.ToString("F3"),   null));
+			AllItems.Add(new ItemSpec("Volume aux",         Strings.Volume_aux + " [l]",       x => x.VolumeMeter.ToString("F3"), (x, y, z) => y.VolumeMeter.ToString("F3"), null));
 
             /// Batch info
             AllItems.Add(new ItemSpec("Batch number",       Strings.Batch_nr,       x => x.Batch().BatchNr.ToString(),              (x, y, z) => x.Batch().BatchNr.ToString(),            (x, z) => x.Batch().BatchNr.ToString()));
@@ -197,7 +208,10 @@ namespace Results
             AllItems.Add(new ItemSpec("Temp lo st",         "T lo st",              null, null, (x, z) => z.TestRslt.Custom7.ToString("F3")));
             AllItems.Add(new ItemSpec("Temp lo en",         "T lo en",              null, null, (x, z) => z.TestRslt.Custom8.ToString("F3")));
             AllItems.Add(new ItemSpec("Temp lo av",         "T lo av",              null, null, (x, z) => ((z.TestRslt.Custom7 + z.TestRslt.Custom8) / 2).ToString("F3")));
-        }
+
+			AllItems.Add(new ItemSpec("Start mass", Strings.Start_mass + " [kg]",	x => x.TestRslt.MassStart.ToString("F4"),	(x, y, z) => z.TestRslt.MassStart.ToString("F4"),	(x, z) => z.TestRslt.MassStart.ToString("F4")));
+			AllItems.Add(new ItemSpec("End mass",	Strings.End_mass + " [kg]",		x => x.TestRslt.MassEnd.ToString("F4"),		(x, y, z) => z.TestRslt.MassEnd.ToString("F4"),		(x, z) => z.TestRslt.MassEnd.ToString("F4")));
+		}
 
 		public static ItemSpec GetItem(string name)
 		{

Results/Mappings/BatchMap.cs

@@ -22,12 +22,14 @@ namespace Results.Mappings
             Map(x => x.Remark)
 				.CustomType("StringClob")
 				.CustomSqlType("varchar(2000)");
-            Map(x => x.Custom1);
+			Map(x => x.DensityCorr)
+				.Column("Custom1"); ;
 			Map(x => x.Custom2);
 			Map(x => x.Custom3);
 			Map(x => x.StartTime);
 			Map(x => x.EndTime);
-			Map(x => x.RsltsSent);
+            Map(x => x.Dirty);
+            Map(x => x.RsltsSent);
 			Map(x => x.RsltsPrinted);
 			HasMany(x => x.Tests)
 				.Cascade.All();

Results/Mappings/TestRsltMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015 Sensus Metering Systems
+/// Copyright (c) 2015-2017 Sensus Metering Systems
 ///
 using FluentNHibernate.Mapping;
 using Results.Entities;
@@ -17,6 +17,10 @@ namespace Results.Mappings
 			Map(x => x.Part);
 			Map(x => x.RepetitionNr);
 
+			Map(x => x.TestDone);
+			Map(x => x.Remark)
+				.CustomType("StringClob")
+				.CustomSqlType("varchar(2000)");
 			Map(x => x.StartTime);
 			Map(x => x.EndTime);
 			Map(x => x.FlowSetTime);
@@ -36,49 +40,61 @@ namespace Results.Mappings
 			Map(x => x.VolumeCTV);
 			Map(x => x.VolumeMaster);
 			Map(x => x.ErrorMaster);
-#if HEAT_METERS_SUPPORT
+            Map(x => x.DiverterStart);
+            Map(x => x.DiverterEnd);
+            Map(x => x.ErrorFlags);
+			Map(x => x.ErrorFlagsMd);
+#if HEAT_METERS
 			Map(x => x.RefEnergy);
 #endif
-			Map(x => x.AmbientTempAve);
+			Map(x => x.AmbTempMean).Column("AmbientTempAve");
 			Map(x => x.AmbTempStart);
 			Map(x => x.AmbTempEnd);
 			Map(x => x.AmbTempMin);
 			Map(x => x.AmbTempMax);
-			Map(x => x.AmbientPressAve);
+			Map(x => x.AmbPressMean).Column("AmbientPressAve");
 			Map(x => x.AmbPressStart);
 			Map(x => x.AmbPressEnd);
 			Map(x => x.AmbPressMin);
 			Map(x => x.AmbPressMax);
-			Map(x => x.AmbientHumiAve);
+			Map(x => x.AmbHumiMean).Column("AmbientHumiAve");
 			Map(x => x.AmbHumiStart);
 			Map(x => x.AmbHumiEnd);
 			Map(x => x.AmbHumiMin);
 			Map(x => x.AmbHumiMax);
-			Map(x => x.PressUpAvrg);
+			Map(x => x.PressUpMean).Column("PressUpAvrg");
 			Map(x => x.PressUpStart);
 			Map(x => x.PressUpEnd);
 			Map(x => x.PressUpMin);
 			Map(x => x.PressUpMax);
-			Map(x => x.PressDownAvrg);
+			Map(x => x.PressDownMean).Column("PressDownAvrg");
 			Map(x => x.PressDownStart);
 			Map(x => x.PressDownEnd);
 			Map(x => x.PressDownMin);
 			Map(x => x.PressDownMax);
-			Map(x => x.TempInAvrg);
-			Map(x => x.TempInStart);
-			Map(x => x.TempInEnd);
-			Map(x => x.TempInMin);
-			Map(x => x.TempInMax);
-			Map(x => x.TempOutAvrg);
-			Map(x => x.TempOutStart);
-			Map(x => x.TempOutEnd);
-			Map(x => x.TempOutMin);
-			Map(x => x.TempOutMax);
-			Map(x => x.TempDivAvrg);
+			Map(x => x.PressDeltaMean);
+			Map(x => x.PressDeltaStart);
+			Map(x => x.PressDeltaEnd);
+			Map(x => x.PressDeltaMin);
+			Map(x => x.PressDeltaMax);
+			Map(x => x.TempUpMean).Column("TempInAvrg");
+			Map(x => x.TempUpStart).Column("TempInStart");
+			Map(x => x.TempUpEnd).Column("TempInEnd");
+			Map(x => x.TempUpMin).Column("TempInMin");
+			Map(x => x.TempUpMax).Column("TempInMax");
+			Map(x => x.TempDownMean).Column("TempOutAvrg");
+			Map(x => x.TempDownStart).Column("TempOutStart");
+			Map(x => x.TempDownEnd).Column("TempOutEnd");
+			Map(x => x.TempDownMin).Column("TempOutMin");
+			Map(x => x.TempDownMax).Column("TempOutMax");
+			Map(x => x.TempDivMean).Column("TempDivAvrg");
 			Map(x => x.TempDivStart);
 			Map(x => x.TempDivEnd);
 			Map(x => x.TempDivMin);
 			Map(x => x.TempDivMax);
+			Map(x => x.FlowMean);
+			Map(x => x.FlowStart);
+			Map(x => x.FlowEnd);
 			Map(x => x.FlowMin);
 			Map(x => x.FlowMax);
 

Results/Mappings/WaterMeterDataMap.cs

@@ -49,7 +49,7 @@ namespace Results.Mappings
 #if HEAT_METER_SUPPORT
             Map(x => x.HeatMeter);
 #endif
-#if IPERLST || IPERLST_SPECIAL
+#if ORACLE_DB
 			Map(x => x.WMTypeId);
 			Map(x => x.WMTypeRev);
 #endif

Results/Mappings/WaterMeterMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015 Sensus Metering Systems
+/// Copyright (c) 2015-2017 Sensus Metering Systems
 ///
 using FluentNHibernate.Mapping;
 using Results.Entities;
@@ -20,22 +20,29 @@ 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);
-
-#if IPERLST || IPERLST_SPECIAL
+			Map(x => x.ArchivePath);
+			Map(x => x.Remark)
+				.CustomType("StringClob")
+				.CustomSqlType("varchar(2000)");
+#if IPERL
 			Map(x => x.SerialNrEx);
 			Map(x => x.OrigCalibFactor);
 			Map(x => x.CalibFactor);
 			Map(x => x.Q2ErrWOCorrection);
 			Map(x => x.Q2CorrectionDone);
 			Map(x => x.Q2Correction);
-			Map(x => x.Q2CorrFlowRight);
+            Map(x => x.Q2CorrRFlow);
+            Map(x => x.Q2CorrLFlow);
+            Map(x => x.Q2CorrFlowRight);
 			Map(x => x.Diff2Hz8Hz);
 			Map(x => x.Hz2CorrectionDone);
 			Map(x => x.Hz2Correction);
+			Map(x => x.FWVersion);
 #endif
-            References(x => x.WaterMeterData);
+			References(x => x.WaterMeterData);
 			References(x => x.Batch);
 			HasMany(x => x.MeterTestRslts)
 				.Cascade.All();

Results/Output/Printers/Cevak/PrintDocumentCevak.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2016 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -7,9 +7,9 @@ using System.Drawing;
 using System.Drawing.Printing;
 using System.IO;
 using Config.Entities;
-using TBF.Resources;
+using Results.Resources;
 
-namespace TBF.BenchControl.ResultsPrinters.Cevak
+namespace Results.Output.Printers.Cevak
 {
 	enum DocumentSection
 	{
@@ -50,7 +50,10 @@ namespace TBF.BenchControl.ResultsPrinters.Cevak
 		/// Data to print
 		///
 		Results.Entities.Batch batch;
-		TBF.BenchControl.BenchInfo.Polska.Component benchInfo;
+
+		string testBenchName;
+		string address1;
+
 
 		///
 		/// Items to print
@@ -75,10 +78,9 @@ namespace TBF.BenchControl.ResultsPrinters.Cevak
 		public PrintDocumentCevak(Results.Entities.Batch batch,
 								  PageOrientation pageOrientation,
 								  int topMargin, int bottomMargin, int leftMargin,
-								  TBF.BenchControl.BenchInfo.Polska.Component benchInfo)
+								  string testBenchName, string address1)
 		{
 			this.batch = batch;
-			this.benchInfo = benchInfo;
 
 			DefaultPageSettings.Landscape = (pageOrientation == PageOrientation.Landscape);
 
@@ -86,19 +88,24 @@ namespace TBF.BenchControl.ResultsPrinters.Cevak
 			this.bottomMargin = bottomMargin;
 			this.leftMargin = leftMargin;
 
+			this.testBenchName = testBenchName;
+			this.address1 = address1;
+
 			TitleX = leftMargin;
 			TitleY = topMargin;				/// Depends on the size of the header
 			HdrTop = TitleY + 60;
 			BodyTop = HdrTop + 250;
 
-			if (batch.WaterMeters[0].Compound())
-			{
-				rsltItems = Results.ItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Printer_CombinedWM);
-			}
-			else
-			{
-				rsltItems = Results.ItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Printer_SingleWM);
-			}
+			rsltItems = Results.ItemSpec.FromStrArray(new string[] { 
+				"Test name",
+				"Volume",
+                "Reference volume",
+				"Test time",
+				"Flow",
+				"Error",
+				"Passed",
+				//"Reference error",        // ?
+				});
 
 			/// Set print area size and margins (in dots using 100 dpi)
 			if (DefaultPageSettings.Landscape)
@@ -189,9 +196,9 @@ namespace TBF.BenchControl.ResultsPrinters.Cevak
 					"Název zkušební stanice: ",
 					"Zkušební SW, č. verze: ",
 					"Metodika: ", /// BenchAdresa 1
-					"Okolní teplota: ",
-					"Okolní tlak: ",
-					"Relativní vlhkost: ",
+                    //"Okolní teplota: ",       // Disabled, see email dated 25.11.2016
+                    //"Okolní tlak: ",
+                    //"Relativní vlhkost: ",
 				};
 
 				string[] rightColumn = new string[]
@@ -204,16 +211,16 @@ namespace TBF.BenchControl.ResultsPrinters.Cevak
 														  batch.EndTime.Day.ToString("D2"),
 														  batch.EndTime.Hour.ToString("D2"),
 														  batch.EndTime.Minute.ToString("D2")),
-					batch.ProcedureName,
-					batch.ProcedureDescription,
-					batch.WatermetersStr,
-					User.CurrentUser.Name,
-					benchInfo.TestBenchName,
+					string.IsNullOrEmpty(batch.ProcedureName) ? "" : batch.ProcedureName,
+					string.IsNullOrEmpty(batch.ProcedureDescription) ? "" : batch.ProcedureDescription,
+					string.IsNullOrEmpty(batch.WatermetersStr) ? "" : batch.WatermetersStr,
+					string.IsNullOrEmpty(batch.UserName) ? "" : batch.UserName,
+					string.IsNullOrEmpty(testBenchName) ? "" : testBenchName,
 					string.Format("Test Bench Framework ver.{0}", batch.ProgramVersion),
-					benchInfo.BenchInfoCfg.Address1,
-					batch.AmbientTempAve().ToString("F1") + " °C",
-					Config.Units.ConvertTo(Config.Unit.mbar, batch.AmbientPressAve()).ToString("F0") + " mbar",
-					batch.AmbientHumiAve().ToString("F0") + " %",
+					string.IsNullOrEmpty(address1) ? "" : address1,
+                    //batch.AmbientTempAve().ToString("F1") + " °C",       // Disabled, see email dated 25.11.2016
+                    //Config.Units.ConvertTo(Config.Unit.mbar, batch.AmbientPressAve()).ToString("F0") + " mbar",
+                    //batch.AmbientHumiAve().ToString("F0") + " %",
 				};
 
 				/// Determine max. left column width in characters
@@ -260,7 +267,7 @@ namespace TBF.BenchControl.ResultsPrinters.Cevak
 				///----------
 				///  Footer
 				///----------
-				string footerText = string.Format("str. {1}/{2}", Strings.Page, pageNr++, nrPages);
+				string footerText = string.Format("{0} {1}/{2}", Strings.Page, pageNr++, nrPages);
 				int footerWidth = (int)e.Graphics.MeasureString(footerText, font).Width;
 				PrintAt(e, leftMargin + (printWidth - footerWidth) / 2, topMargin + printHeight - SpacingOne, footerText);
 			}

Results/Output/Printers/Enhanced/EnhancedPrintDocument.cs

@@ -0,0 +1,355 @@
+///
+/// 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.Enhanced
+{
+	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 != 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);
+
+			/// 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);
+                int sectionHght = PrintWM(e, batch.WaterMeters[wmNr], wmPosition, nextWmTop);
+                nextWmTop += sectionHght;
+			}
+
+			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))
+				{
+                    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
+						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/Enhanced/EnhancedPrinterCfg.cs

@@ -0,0 +1,33 @@
+///
+/// Copyright (c) 2017 Sensus Metering Systems
+///
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Results.Output.Printers.Enhanced
+{
+	public class EnhancedPrinterCfg
+	{
+		public Config.Entities.PageOrientation PageOrientation;
+		public 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/Munich/MunichPrintDocument.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2016 Sensus Metering Systems
+/// Copyright (c) 2016-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -111,10 +111,11 @@ namespace Results.Output.Printers.Munich
 		/// <remarks>This provides the print logic for our document</remarks>
 		protected override void OnPrintPage(System.Drawing.Printing.PrintPageEventArgs e)
 		{
-			// Run base code
+			/// Run base code
 			base.OnPrintPage(e);
 
-			e.Graphics.DrawImageUnscaled(Results.Properties.Resources.Headpic, 0, 0);
+			/// Draw 2550 x 3507 'headpic' scaled to A4 at 100 DPI
+			e.Graphics.DrawImage(Results.Properties.Resources.Headpic, new Rectangle(0, 0, 827, 1137));
 
 			/// Set print area size and margins (in dots using 80 dpi)
 			int printHeight = base.DefaultPageSettings.PaperSize.Height - base.DefaultPageSettings.Margins.Top - base.DefaultPageSettings.Margins.Bottom;
@@ -234,13 +235,13 @@ namespace Results.Output.Printers.Munich
 
 			lineNr += (secondTableOffset * 2) / SpacingOne;
 			PrintAt(e, Tab1, lineNr * SpacingOne, "Temperatur");
-			PrintAt(e, Tab2, lineNr * SpacingOne, wm.Batch.AmbientTempAve().ToString("F1") + " \x00b0C");
+			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.AmbientHumiAve().ToString("F0") + " %");
+			PrintAt(e, Tab2, lineNr * SpacingOne, wm.Batch.AmbHumiMean().ToString("F0") + " %");
 			lineNr++;
 			PrintAt(e, Tab1, lineNr * SpacingOne, "Luftdruck");
-			PrintAt(e, Tab2, lineNr * SpacingOne, wm.Batch.AmbientPressAve().ToString("F0") + " mbar");
+			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"));
@@ -283,7 +284,7 @@ namespace Results.Output.Printers.Munich
 					if (compound)
 					{
 						Results.Entities.MeterTestRslt mainMtr = wm.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundMain);
-						Results.Entities.MeterTestRslt auxMtr = 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"));
@@ -298,11 +299,11 @@ namespace Results.Output.Printers.Munich
 						PrintAt(e, FromTest(rowCnt, 5), mtr.Passed ? "iO" : "NiO");
 					}
 					PrintAt(e, FromTest(rowCnt, 6), mtr.TestRslt.FlowMass.ToString("F1"));
-					PrintAt(e, FromTest(rowCnt, 7), mtr.TestRslt.TempOutAvrg.ToString("F2"));
+					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), mtr.TestRslt.PressUpAvrg.ToString("F2"));
-					PrintAt(e, FromTest(rowCnt, 11), mtr.TestRslt.PressDownAvrg.ToString("F2"));
+					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++;
 				}

Results/Output/Printers/OnePagePerMeter/EnhancedPrintDocument.cs

@@ -0,0 +1,320 @@
+///
+/// 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;
+        Results.Entities.WaterMeter wm;
+
+		///
+		/// Items to print
+		///
+        string header;
+        IList<WMeterRsltItemSpec> commonItems;
+        IList<WMeterRsltItemSpec> testItems;
+        string footer;
+
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		/// <param name="textToPrint">Text to be printed</param>
+        public EnhancedPrintDocument(Results.Entities.Batch batch, EnhancedPrinterCfg cfg, Results.Entities.WaterMeter wm)
+		{
+			this.batch = batch;
+			this.cfg = cfg;
+            this.wm = wm;
+
+			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 != 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);
+
+			/// 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;
+			foreach (var mtr in wm.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;
+		}
+
+		/// <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);
+
+			///----------
+			///  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 = BodyTop;
+			int wmPosition = wm.WMPosition;
+			nextWmTop += PrintWM(e, wm, wmPosition, nextWmTop);
+
+			e.HasMorePages = false;
+
+			///----------
+			///  Footer
+			///----------
+            int footerWidth = (int)e.Graphics.MeasureString(footer, font).Width;
+            PrintAt(e, leftMargin, topMargin + printHeight - 2 * SpacingOne, footer);
+            
+            //string pageNrText = string.Format("{0} {1}/{2}", Strings.Page, 1, 1);
+            //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

@@ -0,0 +1,33 @@
+///
+/// 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/Zapiska/ZapiskaPrintDocument.cs

@@ -0,0 +1,453 @@
+///
+/// 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 int GapBetweenTableColumns = 10;
+        const int 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 leftMarginCommon1;
+        readonly int leftMarginCommon2;
+		readonly int leftMarginCommon3;
+        readonly int leftMarginBelow1;
+        readonly int leftMarginBelow2;
+        readonly int leftMarginBelow3;
+
+		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;
+
+		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)
+		{
+			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);
+			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);
+
+			/// 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 + (int)(printWidth * cfg.ColW0Pct / 100.0f);
+            leftMarginCommon2 = leftMargin + (int)(printWidth * (cfg.ColW0Pct + cfg.ColW1Pct) / 100.0f);
+            leftMarginCommon3 = leftMargin + (int)(printWidth * (cfg.ColW0Pct + cfg.ColW1Pct + cfg.ColW2Pct) / 100.0f);
+
+            leftMarginBelow1 = leftMargin + (int)(printWidth * cfg.BelowW0Pct / 100.0f);
+            leftMarginBelow2 = leftMargin + (int)(printWidth * (cfg.BelowW0Pct + cfg.BelowW1Pct) / 100.0f);
+            leftMarginBelow3 = leftMargin + (int)(printWidth * (cfg.BelowW0Pct + cfg.BelowW1Pct + cfg.BelowW2Pct) / 100.0f);
+
+			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 table rows count
+            int tableRowsCount = 0;
+            if (cfg.GoodOnly)
+            {
+                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;
+
+			int wmSectionHeight = (tableRowsCount + 1) * SpacingOne + 3 * SpacingOne4Header;
+
+			tablesOnFirstPage = (printHeight - BodyTop + cfg.TopMargin - 2 * SpacingOne) / wmSectionHeight;
+            tablesOnNextPage = Math.Max((printHeight - 2 * SpacingOne) / wmSectionHeight, 1);   /// Min. 1, prevent division by zero
+
+            if (tablesOnFirstPage >= 1)
+            {
+                nrPages = 1;
+            }
+            else
+            {
+                nrPages = 2;
+            }
+
+			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 (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
+				///----------
+				int titleWid = (int)(e.Graphics.MeasureString(header, titleFont).Width + 1);
+				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;
+					int 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
+					int leftColWidth = 0;
+                    foreach (var paragraph in leftColumn)
+                    {
+                        string[] lines = paragraph.Split(new char[] { '~' });
+                        foreach (var line in lines)
+                        {
+                            int itemWidth = (int)e.Graphics.MeasureString(paragraph, 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, leftColumn[i]);
+						PrintAt(e, lMargin + leftColWidth + GapBetweenCommonColumns, 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 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;
+                int 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
+                int leftColWidth = 0;
+                foreach (var paragraph in leftColumn)
+                {
+                    string[] lines = paragraph.Split(new char[] { '~' });
+                    foreach (var line in lines)
+                    {
+                        int itemWidth = (int)e.Graphics.MeasureString(paragraph, 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, nextTableTop + SpacingOne * i, leftColumn[i]);
+                    PrintAt(e, lMargin + leftColWidth + GapBetweenCommonColumns, nextTableTop + SpacingOne * i, rightColumn[i]);
+                }
+            }
+
+			///----------
+			///  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 PrintWMs(System.Drawing.Printing.PrintPageEventArgs e,
+					IList<Results.Entities.WaterMeter> wms, int top)
+		{
+			/// Determine column widths
+			WMeterRsltItemSpec.TableRowNr = 99;
+			WMeterRsltItemSpec.TableColumnNr = 99;
+			float[] columnPos = new float[selectedItems.Count + 1];
+			columnPos[0] = (float)leftMargin;
+
+			for (int i = 0; i < selectedItems.Count; i++)
+			{
+				float columnWidth = e.Graphics.MeasureString(selectedItems[i].Caption, headerFont).Width;
+				foreach (var wm in wms)
+				{
+                    if (!cfg.GoodOnly || wm.Passed)
+                    {
+                        string itemText = selectedItems[i].Print(wm);
+
+                        /// 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 + (float)GapBetweenTableColumns;
+			}
+			int tableLeftX = (int)columnPos[0];
+            int tableRightX = (int)columnPos[selectedItems.Count] - GapBetweenTableColumns;
+
+			/// 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 < selectedItems.Count; i++)
+			{
+				PrintHeaderAt(e, (int)columnPos[i], top + (int)(1.6 * SpacingOne4Header), selectedItems[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 rowsCount = 0;
+            foreach (var wm in wms)
+            {
+                if (!cfg.GoodOnly || wm.Passed)
+                {
+                    WMeterRsltItemSpec.TableRowNr = ++rowsCount;
+
+                    for (int i = 0; i < selectedItems.Count; i++)
+                    {
+                        WMeterRsltItemSpec.TableColumnNr = i + 1;
+
+                        string itemText = selectedItems[i].Print(wm);
+
+                        /// 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 * rowsCount, itemText);
+                    }
+                }
+			}
+
+			/// Horizontal line
+			horY = top + 2 * SpacingOneAndHalf4Header + SpacingOne * rowsCount;
+			e.Graphics.DrawLine(new Pen(Color.Black, 2), new Point(tableLeftX, horY), new Point(tableRightX, horY));
+
+			return (rowsCount + 1) * SpacingOne + 3 * SpacingOne4Header;
+		}
+
+
+		void PrintAt(System.Drawing.Printing.PrintPageEventArgs e, Point p, string paragraph)
+		{
+			    PrintAt(e, p.X, p.Y, paragraph);
+		}
+
+		void PrintAt(System.Drawing.Printing.PrintPageEventArgs e, int x, int y, string paragraph)
+		{
+            string[] lines = paragraph.Split(new char[] { '~' });
+            foreach (var line in lines)
+            {
+                RectangleF printArea = new RectangleF(x, y, 2000, SpacingOne);
+                e.Graphics.DrawString(line, this.font, Brushes.Black, printArea);
+                y += 8 * SpacingOne / 10;
+            }
+		}
+
+
+		void PrintHeaderAt(System.Drawing.Printing.PrintPageEventArgs e, Point p, string paragraph)
+		{
+			PrintHeaderAt(e, p.X, p.Y, paragraph);
+		}
+
+		void PrintHeaderAt(System.Drawing.Printing.PrintPageEventArgs e, int x, int y, string paragraph)
+		{
+            string[] lines = paragraph.Split(new char[] { '~' });
+            foreach (var line in lines)
+            {
+                RectangleF printArea = new RectangleF(x, y, 2000, SpacingOne4Header);
+			    e.Graphics.DrawString(paragraph, this.headerFont, Brushes.Black, printArea);
+                y += 8 * SpacingOne4Header / 10;
+            }
+        }
+	}
+}

Results/Output/Printers/Zapiska/ZapiskaPrinterCfg.cs

@@ -0,0 +1,46 @@
+///
+/// Copyright (c) 2017 Sensus Metering Systems
+///
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Results.Output.Printers.Zapiska
+{
+	public class ZapiskaPrinterCfg
+	{
+		public Config.Entities.PageOrientation PageOrientation;
+		public 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 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;
+	}
+}