IZRAEL_200 bug fix, ver. 2.18.1150

.gitattributes

@@ -1,2 +0,0 @@
-# Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto

.gitignore

@@ -1,13 +1,9 @@
 Config/bin/
 Config/obj/
-Decrypt/bin/
-Decrypt/obj/
 DeviceTest/bin/
 DeviceTest/obj/
 Dirichlet.Numerics/bin
 Dirichlet.Numerics/obj
-Encrypt/bin/
-Encrypt/obj/
 GemCard/bin
 GemCard/obj
 GraphLib/bin
@@ -29,6 +25,5 @@ Users/obj/
 UserManagement/bin/
 UserManagement/obj/
 Doc/
-.vs/
 *.suo
 *.bak

Config/Config.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;ZAMBIA</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;IZRAEL_200</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;ZAMBIA</DefineConstants>
+    <DefineConstants>TRACE;IZRAEL_200</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -125,7 +125,6 @@
   <ItemGroup>
     <EmbeddedResource Include="Resources\Strings.cs.resx" />
     <EmbeddedResource Include="Resources\Strings.de.resx" />
-    <EmbeddedResource Include="Resources\Strings.fr.resx" />
     <EmbeddedResource Include="Resources\Strings.it.resx" />
     <EmbeddedResource Include="Resources\Strings.pl.resx" />
     <EmbeddedResource Include="Resources\Strings.resx">

Config/Data.cs

@@ -10,8 +10,8 @@ namespace Config
 
 #if MUNICH
 		public const int WMsCount = 3;
-		public const int LineSize = 3;
-		public const int CompoundWMsCount = 3;
+		public const int LineSize = 1;
+		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = 3;
 #elif DN100 || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || CEVAK_200
@@ -20,24 +20,12 @@ namespace Config
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = WMsCount / LineSize;
-#elif FUZHOU_300 || FUZHOU_150 || IZRAEL_200 || GENESIS || SLM_150 || PETERSBURG_200
-		public const int WMsCount = 6;
-		public const int LineSize = 6;
-		public const int CompoundWMsCount = 1;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = 3;
-#elif PUCHONG_200
+#elif FUZHOU_300 || FUZHOU_150 || IZRAEL_200 || PUCHONG_200 || 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;
         public const int MaxPartNr = 3;
-#elif DEWA_300
-        public const int WMsCount = 10;
-        public const int LineSize = 10;
-        public const int CompoundWMsCount = 3;
-        public const int HeatMetersCount = 0;
-        public const int MaxPartNr = WMsCount / LineSize;
 #elif DUBAJ_50
 		public const int WMsCount = 10;
 		public const int LineSize = 5;
@@ -62,7 +50,7 @@ namespace Config
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = 1;
-#elif TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || ALZIR_25
+#elif TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50
         public const int WMsCount = 20;
 		public const int LineSize = 10;
 		public const int CompoundWMsCount = 1;
@@ -74,7 +62,7 @@ namespace Config
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = WMsCount / LineSize;
-#elif TURA_IPERL || TURA_IPERL_NEW
+#elif TURA_IPERL
 		public const int WMsCount = 40;
 		public const int LineSize = 20;
 		public const int CompoundWMsCount = 1;

Config/Entities/Enums.cs

@@ -90,10 +90,6 @@ namespace Config.Entities
 		[Description("Wasserzähler")]			Single,
 		[Description("Verbundwasserzähler")]	Combined,
 		[Description("Wärmezähler")]			HeatMeter,
-#elif LANG_FR
-        [Description("Compteurs eau")]          Single,
-        [Description("Mètres composés")]        Combined,
-        [Description("Thermomètres")]           HeatMeter,
 #elif LANG_CS
 		[Description("Vodoměry")]				Single,
 		[Description("Kombinované vodoměry")]	Combined,
@@ -129,9 +125,6 @@ namespace Config.Entities
 #elif LANG_IT
         [Description("freddo")] ColdWater,
         [Description("caldo")]  HotWater,
-#elif LANG_FR
-        [Description("eau froide")] ColdWater,
-        [Description("eau chaude")] HotWater,
 #else
 		[Description("cold")]   ColdWater,
 		[Description("hot")]    HotWater,
@@ -247,11 +240,6 @@ namespace Config.Entities
         [Description("immer")]        Always = 1,
         [Description("Bildschirm")]   OnScreen = 2,
         [Description("intern")]       Internal = 3,
-#elif LANG_FR
-        [Description("jamais")]       Never = 0,
-        [Description("toujours")]     Always = 1,
-        [Description("À l'écran")]    OnScreen = 2,
-        [Description("interne")]      Internal = 3,
 #elif LANG_CS
         /// czech
         [Description("nikdy")]        Never = 0,
@@ -293,10 +281,6 @@ namespace Config.Entities
 		[Description("Waage")]			Scale,
 		[Description("Spanne")]			Spread,
 		[Description("Standardabw.")]	StdDev,
-#elif LANG_FR
-        [Description("Balance")]        Scale,
-        [Description("Envergure")]      Spread,
-        [Description("Déviation std.")] StdDev,
 #elif LANG_CS
         /// cesky
 		[Description("váhou")]			Scale,
@@ -307,7 +291,7 @@ namespace Config.Entities
 		[Description("Spread")]			Spread,
 		[Description("Std.dev.")]		StdDev,
 #endif
-        Count
+		Count
 	}
 
     public enum TestRedType
@@ -361,14 +345,6 @@ namespace Config.Entities
 		[Description("Prüfpunktergebnisse")]	TestResult,
 		[Description("Wasserzelledaten")]		MeterData,
 		[Description("Wasserzelleergebnisse")]	MeterResult,
-#elif LANG_FR
-        [Description("Autres")]                         Other,
-        [Description("Données de banc")]                BenchData,
-        [Description("Résultats du banc")]              BenchResult,
-        [Description("Données de test")]                TestData,
-        [Description("Résultats de test")]              TestResult,
-        [Description("Données du compteur d'eau")]      MeterData,
-        [Description("Résultats du compteur d'eau")]    MeterResult,
 #else
 		[Description("Other")]			Other,
 		[Description("Bench data")]		BenchData,
@@ -378,7 +354,7 @@ namespace Config.Entities
 		[Description("Meter data")]		MeterData,
 		[Description("Meter result")]	MeterResult,
 #endif
-        Count,
+		Count,
 	}
 
 	/// <summary> Possible modes of operation of components and devices. </summary>
@@ -395,17 +371,6 @@ namespace Config.Entities
         [Description("Reply")]          Reply,
         [Description("Simuliert")]      Simulate,				/// Test bench simulation, this mode does not require any hardware
         [Description("Geerbt")]         Inherit,
-#elif LANG_FR
-        [Description("Détection automatique: Éteindre")]    DetectedOff = -2,
-        [Description("Détection automatique: Allumé")]      DetectedOn = -1,
-        [Description("Ordinaire")]                          Normal = 0,
-        [Description("Détection automatique")]              AutoDetect,
-        [Description("Erreur d'exécution")]                 FailureDuringOperation,
-        [Description("Éteindre")]                           Off,
-        [Description("Record")]                             Record,
-        [Description("Répondre")]                           Reply,
-        [Description("Simuler")]                            Simulate,
-        [Description("Hériter")]                            Inherit,
 #else
         [Description("Detected off")]   DetectedOff = -2,
         [Description("Detected on")]    DetectedOn = -1,
@@ -418,7 +383,7 @@ namespace Config.Entities
         [Description("Simulate")]       Simulate,				/// Test bench simulation, this mode does not require any hardware
         [Description("Inherit")]        Inherit,
 #endif
-        Count,
+		Count,
     }
 
     public enum LogLevel
@@ -465,11 +430,6 @@ namespace Config.Entities
         [Description("zentriert")]  Center,
         [Description("rechts")]     Right,
         [Description("angepasst")]  Justified,
-#elif LANG_FR
-        [Description("gauche")]     Left,
-        [Description("centré")]     Center,
-        [Description("droit")]      Right,
-        [Description("justifié")]   Justified,
 #else
         [Description("Left")]       Left,
         [Description("Center")]     Center,
@@ -519,10 +479,6 @@ namespace Config.Entities
 		[Description("aus")]		Off,
 		[Description("info")]		Info,
 		[Description("ein")]		On,
-#elif LANG_FR
-        [Description("éteindre")]   Off,
-        [Description("info")]       Info,
-        [Description("allumé")]     On,
 #elif LANG_CS
 		[Description("vypnuto")]	Off,
 		[Description("info")]		Info,
@@ -540,77 +496,6 @@ namespace Config.Entities
 		[Description("info")]		Info,
 		[Description("on")]			On,
 #endif
-        Count
+		Count
 	}
-
-
-    public enum ErrorFlagShift
-    {
-        E1 = 0,
-        E2,
-        E3,
-        E4,
-        E5,
-        E6,
-        E7,
-        E8,
-        E9,
-        E10,
-        E11,
-        E12,
-        E13,
-        E14,
-        E15,
-        E16,
-        E17,
-        E18,
-        E19,
-        E20,
-        E21,
-        E22,
-        E23,
-        E24,
-        E25,
-        E26,
-        E27,
-        E28,
-        E29,
-        E30,
-        E31,
-    }
-
-    public enum ErrorFlagMask
-    {
-        E1 = (1 << (int)ErrorFlagShift.E1),
-        E2 = (1 << (int)ErrorFlagShift.E2),
-        E3 = (1 << (int)ErrorFlagShift.E3),
-        E4 = (1 << (int)ErrorFlagShift.E4),
-        E5 = (1 << (int)ErrorFlagShift.E5),
-        E6 = (1 << (int)ErrorFlagShift.E6),
-        E7 = (1 << (int)ErrorFlagShift.E7),
-        E8 = (1 << (int)ErrorFlagShift.E8),
-        E9 = (1 << (int)ErrorFlagShift.E9),
-        E10 = (1 << (int)ErrorFlagShift.E10),
-        E11 = (1 << (int)ErrorFlagShift.E11),
-        E12 = (1 << (int)ErrorFlagShift.E12),
-        E13 = (1 << (int)ErrorFlagShift.E13),
-        E14 = (1 << (int)ErrorFlagShift.E14),
-        E15 = (1 << (int)ErrorFlagShift.E15),
-        E16 = (1 << (int)ErrorFlagShift.E16),
-        E17 = (1 << (int)ErrorFlagShift.E17),
-        E18 = (1 << (int)ErrorFlagShift.E18),
-        E19 = (1 << (int)ErrorFlagShift.E19),
-        E20 = (1 << (int)ErrorFlagShift.E20),
-        E21 = (1 << (int)ErrorFlagShift.E21),
-        E22 = (1 << (int)ErrorFlagShift.E22),
-        E23 = (1 << (int)ErrorFlagShift.E23),
-        E24 = (1 << (int)ErrorFlagShift.E24),
-        E25 = (1 << (int)ErrorFlagShift.E25),
-        E26 = (1 << (int)ErrorFlagShift.E26),
-        E27 = (1 << (int)ErrorFlagShift.E27),
-        E28 = (1 << (int)ErrorFlagShift.E28),
-        E29 = (1 << (int)ErrorFlagShift.E29),
-        E30 = (1 << (int)ErrorFlagShift.E30),
-        E31 = (1 << (int)ErrorFlagShift.E31),
-    }
 }

Config/Entities/IperlEnums.cs

@@ -25,14 +25,6 @@ namespace Config.Entities
         Count
     }
 
-    public enum Counting
-    {
-        Arbitrary,
-        Positive,
-        Negative,
-        Count
-    }
-
     public enum OptoHeadState
     {
         Disabled,

Config/Entities/Procedure.cs

@@ -234,42 +234,6 @@ namespace Config.Entities
             return null;
         }
 
-
-        /// <summary>
-        /// Processes the selection done by the bench control panel in the main sequence.
-        /// </summary>
-        /// <param name="selection">Selection.Q1, .Q2, .Q3 or .Test</param>
-        /// <returns>The selected test or null</returns>
-        public virtual Test GetTest(string expandedTestName, out int testIx, out int repetNr)
-        {
-            for (int ix = 0; ix < Tests.Count; ix++)
-            {
-                Test test = Tests[ix];
-                if (test.Name.Equals(expandedTestName))
-                {
-                    /// Name is not expanded => Repeats==1
-                    testIx = ix;
-                    repetNr = 1;
-                    return test;
-                }
-
-                for (int r = 1; r <= test.Repeats; r++)
-                {
-                    if (test.GetExpandedTestName(r).Equals(expandedTestName))
-                    {
-                        testIx = ix;
-                        repetNr = r;
-                        return test;
-                    }
-                }
-            }
-
-            testIx = 0;
-            repetNr = 1;
-            return null;
-        }
-
-
 		public override string ToString()
 		{
 			return string.Format("{0}, rev.{1}", Name, Revision);

Config/Entities/Test.cs

@@ -25,12 +25,12 @@ namespace Config.Entities
 		public virtual float Volume { get; set; }			/// Test volume (target) in [l]
         public virtual float TstTime { get; set; }			/// Test time (estimate) in [s]
         public virtual string Method { get; set; }
-        public virtual float ErrLimLo { get; set; }			/// in [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
-        public virtual float ErrLimHi { get; set; }			/// in [%] usually > 0, in case of heat meters: -Qn in m3/h
+        public virtual float ErrLimLo { get; set; }			/// in [%] (usually < 0) or 1=class1, 2=class2, 3=class3
+        public virtual float ErrLimHi { get; set; }			/// in [%] (usually > 0) or -Qn in m3/h
         public virtual float Uncertainty { get; set; }		///	int [%] makes error limits tighter: 0 <= Uncertainty <= abs(ErrLimXx)
         public virtual int Repeats { get; set; }
         public virtual bool DoDraining { get; set; }
-        public virtual bool DoDrainingAfter { 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
@@ -56,9 +56,6 @@ namespace Config.Entities
 		public virtual string RelTransAfter { get; set; }
 		public virtual string TransitionAfter { get; set; }
 
-        public virtual bool IsOuterLoopStart { get; set; }  /// Not mapped to database
-        public virtual bool IsOuterLoopEnd { get; set; }    /// Not mapped to database
-
 		public virtual IList<ComponentTest> MoreParams { get; set; }
 
 		public virtual Procedure Procedure { get; set; }
@@ -76,7 +73,7 @@ namespace Config.Entities
 			DoEvaluate = true;
 			Repeats = 1;
 			DoDraining = false;
-			DoDrainingAfter = false;
+			DoZeroing = false;
 			DoControlWaterTemp = false;
 			TempLimLo = 15.0f;
 			TempLimHi = 25.0f;
@@ -124,7 +121,7 @@ namespace Config.Entities
 			result.Uncertainty = Uncertainty;
 			result.Repeats = Repeats;
             result.DoDraining = DoDraining;
-            result.DoDrainingAfter = DoDrainingAfter;
+            result.DoZeroing = DoZeroing;
 			result.DoControlWaterTemp = DoControlWaterTemp;
 			result.TempLimLo = TempLimLo;
 			result.TempLimHi = TempLimHi;
@@ -172,7 +169,7 @@ namespace Config.Entities
             output.WriteLine(Uncertainty.ToString(ci));
             output.WriteLine(Repeats.ToString(ci));
             output.WriteLine(DoDraining.ToString());
-            output.WriteLine(DoDrainingAfter.ToString());
+            output.WriteLine(DoZeroing.ToString());
 			output.WriteLine(DoControlWaterTemp.ToString());
 			output.WriteLine(TempLimLo.ToString(ci));
 			output.WriteLine(TempLimHi.ToString(ci));
@@ -222,7 +219,7 @@ namespace Config.Entities
 			tst.Uncertainty = float.Parse(input.ReadLine(), ci);
 			tst.Repeats = int.Parse(input.ReadLine(), ci);
             tst.DoDraining = bool.Parse(input.ReadLine());
-			tst.DoDrainingAfter = 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);
@@ -280,7 +277,7 @@ namespace Config.Entities
             ln = inp.ReadLine(); if (ln != Uncertainty.ToString(ci))        { diff.AppendFormat(fmt, "Uncertainty", Uncertainty.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Repeats.ToString(ci))            { diff.AppendFormat(fmt, "Repeats", Repeats.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != DoDraining.ToString(ci))         { diff.AppendFormat(fmt, "Draining", DoDraining.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != DoDrainingAfter.ToString(ci))          { diff.AppendFormat(fmt, "Zeroing", DoDrainingAfter.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != 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); };
@@ -313,77 +310,50 @@ namespace Config.Entities
             return null;
         }
 
-        /// <summary>
-        /// Return test title for a this test and a given repetition number
-        /// </summary>
-        /// <param name="repetitonNr">1 .. Nr. repetitions</param>
-        /// <returns>Test title (string)</returns>
-        public virtual string GetExpandedTestName(int repetitionNr)
-        {
-            if (Repeats == 1)
-            {
-                if (Part == 0)
-                {
-                    /// Single test
-                    return Name;
-                }
-                else
-                {
-                    /// A part of a single test
-                    return string.Format("{0} ({1})", Name, Part);
-                }
-            }
-            else
-            {
-                /// More test repetitions
-                return string.Format("{0} ({1}/{2})", Name, repetitionNr, Repeats);
-            }
-        }
-
-        public virtual double GetErrLimLo(double volumeCTV, double testTime)
+        public virtual float GetErrLimLo(float flow)
         {
             if (ErrLimLo <= ErrLimHi)
             {
-                return ErrLimLo;                        /// Error limit of a water meter
+                return ErrLimLo;        /// Error limit of a water meter
             }
             else
             {
                 /// Metrological class and nominal flow of a heat meter
                 int metrClass = (int)Math.Round(ErrLimLo);
-                double Qp = Math.Abs(ErrLimHi);
-                double Q = (testTime == 0) ? 1 : Math.Max(3.6 * volumeCTV / testTime, 0.00001); /// Div. by zero avoided
+                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.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);
+                    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 double GetErrLimHi(double volumeCTV, double testTime)
+        public virtual float GetErrLimHi(float flow)
         {
             if (ErrLimLo <= ErrLimHi)
             {
-                return ErrLimHi;                        /// Error limit of a water meter
+                return ErrLimHi;        /// Error limit of a water meter
             }
             else
             {
                 /// Metrological class and nominal flow of a heat meter
                 int metrClass = (int)Math.Round(ErrLimLo);
-                double Qp = Math.Abs(ErrLimHi);
-                double Q = (testTime == 0) ? 1 : Math.Max(3.6 * volumeCTV / testTime, 0.00001); /// Div. by zero avoided
+                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.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);
+                    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);
                 }
             }
         }

Config/Entities/TransitionSequence.cs

@@ -1,10 +1,7 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
-using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
 
 namespace Config.Entities
 {
@@ -40,56 +37,5 @@ namespace Config.Entities
 			foreach (var step in TransitionSteps) { result.TransitionSteps.Add(step.Clone()); }
             return result;
         }
-
-        public virtual void Export(StreamWriter output)
-        {
-            output.WriteLine(ItemNr.ToString(CultureInfo.InvariantCulture));
-            output.WriteLine(Name);
-            output.WriteLine(Description);
-
-            foreach (var step in TransitionSteps) { step.Export(output); }
-            output.WriteLine();
-
-            output.Close();
-        }
-
-        public static TransitionSequence Import(StreamReader input)
-        {
-            TransitionSequence result = new TransitionSequence();
-
-            result.ItemNr = int.Parse(input.ReadLine(), CultureInfo.InvariantCulture);
-            result.Name = input.ReadLine();
-            result.Description = input.ReadLine();
-
-            while (true)
-            {
-                TransitionStep step = TransitionStep.Import(input, result);
-                if (step == null)
-                    break;
-                else
-                    result.TransitionSteps.Add(step);
-            }
-
-            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); };
-
-            //foreach (var step in TransitionSteps)
-            //{
-            //    string testDiff = step.Compare(inp);
-            //    if (testDiff.Contains(
-            //}
-
-            return diff.ToString();
-        }
-    }
+	}
 }

Config/Entities/TransitionStep.cs

@@ -1,10 +1,8 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015, 2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
 
 namespace Config.Entities
 {
@@ -63,64 +61,5 @@ namespace Config.Entities
             result += indent + "PumpsWithFMPct = " + PumpWithFMPcts + Environment.NewLine;
             return result;
 		}
-
-        public virtual void Export(StreamWriter output)
-        {
-            CultureInfo ci = CultureInfo.InvariantCulture;
-
-            output.WriteLine(ItemNr.ToString(ci));
-            output.WriteLine(Duration.ToString(ci));
-            output.WriteLine(Message);
-            output.WriteLine(EndCondition);
-            output.WriteLine(ValvesOpen);
-            output.WriteLine(ValvesClose);
-            output.WriteLine(RegulValvesPct);
-            output.WriteLine(PumpWithFMPcts);
-        }
-
-        public static TransitionStep Import(StreamReader input, TransitionSequence newSequence)
-        {
-            string firstLine = input.ReadLine();
-            if (string.IsNullOrEmpty(firstLine))
-            {
-                return null;
-            }
-
-            CultureInfo ci = CultureInfo.InvariantCulture;
-            int itemNr = int.Parse(firstLine, ci);
-            TransitionStep tst = new TransitionStep(itemNr, newSequence);
-
-            tst.Duration = int.Parse(input.ReadLine(), ci);
-            tst.Message = input.ReadLine();
-            tst.EndCondition = input.ReadLine();
-            tst.ValvesOpen = input.ReadLine();
-            tst.ValvesClose = input.ReadLine();
-            tst.RegulValvesPct = input.ReadLine();
-            tst.PumpWithFMPcts = input.ReadLine();
-
-            return tst;
-        }
-
-        public virtual string Compare(StreamReader inp)
-        {
-            System.Text.StringBuilder diff = new System.Text.StringBuilder();
-            string fmt = string.Format("Step {0} : ", ItemNr) + "{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("TransitionStep {0} is missing in the compared file\r\n", ItemNr);
-
-            if (ItemNr.ToString() != firstLine) { diff.AppendFormat(fmt, "ItemNr", ItemNr, firstLine); };
-            ln = inp.ReadLine(); if (ln != Duration.ToString(ci)) { diff.AppendFormat(fmt, "Duration", Duration.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != Message) { diff.AppendFormat(fmt, "Message", Message, ln); };
-            ln = inp.ReadLine(); if (ln != EndCondition) { diff.AppendFormat(fmt, "EndCondition", EndCondition, ln); };
-            ln = inp.ReadLine(); if (ln != ValvesOpen) { diff.AppendFormat(fmt, "ValvesOpen", ValvesOpen, ln); };
-            ln = inp.ReadLine(); if (ln != ValvesClose) { diff.AppendFormat(fmt, "ValvesClose", ValvesClose, ln); };
-            ln = inp.ReadLine(); if (ln != RegulValvesPct) { diff.AppendFormat(fmt, "RegulValvesPct", RegulValvesPct, ln); };
-            ln = inp.ReadLine(); if (ln != PumpWithFMPcts) { diff.AppendFormat(fmt, "PumpWithFMPcts", PumpWithFMPcts, ln); };
-
-            return diff.ToString();
-        }
 	}
 }

Config/Entities/User.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -11,11 +11,8 @@ namespace Config.Entities
 		public virtual int Id { get; protected set; }
         public virtual string UserName { get; set; }	/// = name, alias, abbreviation
 		public virtual string FullName { get; set; }	/// = description
-        public virtual string Tag { get; set; }
-        public virtual int Number { get; set; }
+		public virtual int Number { get; set; }
 		public virtual string Password { get; set; }
-        public virtual string Password2 { get; set; }
-        public virtual string Password3 { 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
 

Config/Entities/VirtualBenchSequence.cs

@@ -1,9 +1,8 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
-using System.IO;
 
 namespace Config.Entities
 {
@@ -36,24 +35,5 @@ namespace Config.Entities
             foreach (var step in VirtualBenchSteps) { result.VirtualBenchSteps.Add(step.Clone()); }
             return result;
         }
-
-        public virtual void Export(StreamWriter output)
-        {
-            /// TODO
-        }
-
-        public static VirtualBenchSequence Import(StreamReader input)
-        {
-            VirtualBenchSequence result = new VirtualBenchSequence();
-            /// TODO
-            return result;
-        }
-
-        public virtual string Compare(StreamReader inp)
-        {
-            System.Text.StringBuilder diff = new System.Text.StringBuilder();
-            /// TODO
-            return diff.ToString();
-        }
     }
 }

Config/Formulas.cs

@@ -221,60 +221,45 @@ namespace Config
 			return error;
 		}
 
+		/// <summary>
+		/// Calculates corrected value form a list of corrections by interpolation.
+		/// It is assumed that values in the list 'corrections' are sorted.
+		/// </summary>
+		/// <param name="rawMeasurement">Raw uncorrected value</param>
+		/// <param name="corrections">Sorted (value, correction) pairs</param>
+		/// <returns>Corrected value</returns>
+		public static double CorrectedValue(double rawValue, IList<Config.Entities.MeasurementCorrection> corrections)
+		{
+			if (corrections == null || corrections.Count == 0) return rawValue;
 
-        /// <summary>
-        /// Calculates corrected value from a list of corrections by interpolation.
-        /// It is assumed that values in the list 'corrections' are sorted.
-        /// </summary>
-        /// <param name="rawMeasurement">Raw uncorrected value</param>
-        /// <param name="corrections">Sorted (value, correction) pairs</param>
-        /// <returns>Corrected value</returns>
-        public static double CorrectedValue(double rawValue, IList<Config.Entities.MeasurementCorrection> corrections)
-        {
-            return rawValue + GetCorrection(rawValue, corrections);
-        }
+			if (rawValue < corrections[0].Measurement)
+			{
+				return rawValue + corrections[0].Correction;
+			}
 
-        /// <summary>
-        /// Get a correction from a list of corrections by interpolation.
-        /// It is assumed that values in the list 'corrections' are sorted.
-        /// </summary>
-        /// <param name="rawMeasurement">Raw uncorrected value</param>
-        /// <param name="corrections">Sorted (value, correction) pairs</param>
-        /// <returns>Corrected value</returns>
-        public static double GetCorrection(double rawValue, IList<Config.Entities.MeasurementCorrection> corrections)
-        {
-            if ((corrections == null) || (corrections.Count == 0)) return 0;    /// No correction
+			int count = corrections.Count;
+			for (int i = 1; i < count; i++)
+			{
+				if (rawValue < corrections[i].Measurement)
+				{
+					double d1 = rawValue - corrections[i-1].Measurement;
+					double d2 = corrections[i].Measurement - rawValue;
 
-            if (rawValue < corrections[0].Measurement)
-            {
-                /// rawValue is below the lowest value in the correction table
-                return corrections[0].Correction;
-            }
+					double corr;
+					if (d1 + d2 <= float.Epsilon)
+					{
+						corr = (corrections[i - 1].Correction + corrections[i].Correction) / 2.0;
+					}
+					else
+					{
+						corr = (corrections[i - 1].Correction * d2 + corrections[i].Correction * d1) / (d1 + d2);
+					}
+					return rawValue + corr;
+				}
+			}
 
-            int count = corrections.Count;
-            for (int i = 1; i < count; i++)
-            {
-                if (rawValue < corrections[i].Measurement)
-                {
-                    double d1 = rawValue - corrections[i - 1].Measurement;
-                    double d2 = corrections[i].Measurement - rawValue;
-
-                    if (d1 + d2 <= float.Epsilon)
-                    {
-                        /// Neigboring values in the corection table are close to each other -> calculate the average
-                        return (corrections[i - 1].Correction + corrections[i].Correction) / 2.0;
-                    }
-                    else
-                    {
-                        /// Interpolate the correction from neigboring values in the corection table
-                        return (corrections[i - 1].Correction * d2 + corrections[i].Correction * d1) / (d1 + d2);
-                    }
-                }
-            }
-
-            /// rawValue is above the highest value in the correction table
-            return corrections[count - 1].Correction;
-        }
+			return rawValue + corrections[count - 1].Correction;
+		}
 
 
         /// <summary>

Config/Mappings/TestMap.cs

@@ -24,7 +24,7 @@ namespace Config.Mappings
 			Map(x => x.Repeats);
             Map(x => x.DoDraining)
 				.Column("Emptying");
-            Map(x => x.DoDrainingAfter)
+            Map(x => x.DoZeroing)
 				.Column("Zeroing");
             Map(x => x.DoControlWaterTemp);
             Map(x => x.TempLimLo);

Config/Mappings/UserMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
 using FluentNHibernate.Mapping;
 
@@ -12,9 +12,6 @@ namespace Config.Mappings
             Id(x => x.Id);
             Map(x => x.UserName).Column("Name");
 			Map(x => x.Number);
-#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
-            Map(x => x.Tag);
-#endif
 			Map(x => x.Password);
             Map(x => x.FullName).Column("Description");
             Map(x => x.LastPwChange);

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.18.1273.0")]
-[assembly: AssemblyFileVersion("2.18.1273.0")]
+[assembly: AssemblyVersion("2.18.1110.0")]
+[assembly: AssemblyFileVersion("2.18.1110.0")]

Config/Utils.cs

@@ -82,61 +82,5 @@ namespace Config
                 else return "F5";
             }
         }
-
-
-        /// <summary>
-        /// Extract and return a DB server from a MySQL connection string.
-        /// </summary>
-        public static string GetDBServer(string connectionString)
-        {
-            return GetFromConnectionString(connectionString, new string[] { "SERVER=" });
-        }
-
-        /// <summary>
-        /// Extract and return a DB name from a MySQL connection string.
-        /// </summary>
-        public static string GetDBName(string connectionString)
-        {
-            return GetFromConnectionString(connectionString, new string[] { "DATABASE=" });
-        }
-
-        /// <summary>
-        /// Extract and return a username from a MySQL connection string
-        /// </summary>
-        public static string GetDBUser(string connectionString)
-        {
-            return GetFromConnectionString(connectionString, new string[] { "USER=", "UID=" });
-        }
-
-        /// <summary>
-        /// Extract and return a password from a MySQL connection string
-        /// </summary>
-        public static string GetDBPassword(string connectionString)
-        {
-            return GetFromConnectionString(connectionString, new string[] { "PASSWORD=", "PWD=" });
-        }
-
-        /// <summary>
-        /// Extract and return an element of a MySQL connection string
-        /// (a host, a database, a user name or a password).
-        /// Return an empty string on any error.
-        /// </summary>
-        public static string GetFromConnectionString(string connectionString, string[] patterns)
-        {
-            foreach (var pattern in patterns)
-            {
-                int startIx = connectionString.IndexOf(pattern);
-                if (startIx >= 0)
-                {
-                    /// pattern found, extract the subsequent element
-                    startIx += pattern.Length;
-                    int endIx = connectionString.IndexOf(';', startIx);
-                    return (endIx > 0) ? connectionString.Substring(startIx, endIx - startIx) : string.Empty;
-                }
-            }
-
-            /// pattern NOT found
-            return string.Empty;
-        }
     }
 }

Decrypt/Decrypt.csproj

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D476ABBE-A455-4476-8A8D-3F6151217B51}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Decrypt</RootNamespace>
-    <AssemblyName>Decrypt</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>Decrypt.Program</StartupObject>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

Decrypt/Decrypt.csproj.user

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <StartArguments>config.xml</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <StartArguments>config.xml</StartArguments>
-  </PropertyGroup>
-</Project>

Decrypt/Program.cs

@@ -1,96 +0,0 @@
-using System;
-using System.IO;
-using System.Security.Cryptography;
-using System.Text;
-
-namespace Decrypt
-{
-    /// <summary>
-    /// See also:
-    /// https://www.fluxbytes.com/csharp/encrypt-and-decrypt-files-in-c/
-    /// </summary>
-    class Program
-    {
-        static byte[] key = new byte[] { 83, 254, 105, 64, 184, 201, 195, 127, 52, 99, 77, 45, 252, 132, 163, 156 };
-        static byte[] IV = new byte[] { 189, 23, 137, 56, 204, 241, 242, 118, 28, 89, 9, 198, 224, 111, 186, 125 };
-
-        static void Main(string[] args)
-        {
-            if ((args.Length < 1) || !File.Exists(args[0]))
-            {
-                Console.WriteLine("Usage:  Decode <file>");
-                Console.ReadKey();
-                return;
-            }
-
-            string fileName = args[0];
-            string intermediateFile = fileName + ".plain";  /// Intermediate file, output of cryptography decoding
-            string backupFile = fileName + ".bak";
-
-            try
-            {
-                using (StreamReader reader = new StreamReader(fileName))
-                {
-                    if (reader.ReadLine().StartsWith("<?xml version="))
-                    {
-                        Console.WriteLine(string.Format("File {0} is not encrypted.", fileName));
-                        Console.ReadKey();
-                        return;
-                    }
-                }
-
-                bool successful = false;
-                using (RijndaelManaged aes = new RijndaelManaged { Padding = PaddingMode.Zeros })
-                {
-                    using (FileStream fsCrypt = new FileStream(fileName, FileMode.Open))
-                    {
-                        using (FileStream fsOut = new FileStream(intermediateFile, FileMode.Create))
-                        {
-                            using (ICryptoTransform decryptor = aes.CreateDecryptor(key, IV))
-                            {
-                                using (CryptoStream cs = new CryptoStream(fsCrypt, decryptor, CryptoStreamMode.Read))
-                                {
-                                    int data;
-                                    while ((data = cs.ReadByte()) != -1)
-                                    {
-                                        if (data != 0) fsOut.WriteByte((byte)data);
-                                    }
-                                    successful = true;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                if (successful)
-                {
-                    /// File decryption successfuly completed => rotate files
-                    if (File.Exists(backupFile)) File.Delete(backupFile);
-                    File.Move(fileName, backupFile);
-                    File.Move(intermediateFile, fileName);
-                    return;
-                }
-                else
-                {
-                    Failed(fileName, intermediateFile, "");
-                    return;
-                }
-            }
-            catch (Exception e)
-            {
-                Failed(fileName, intermediateFile, e.Message);
-                return;
-            }
-        }
-
-        static void Failed(string fileName, string toBeDeleted, string message)
-        {
-            if (File.Exists(toBeDeleted))
-            {
-                File.Delete(toBeDeleted);
-            }
-            Console.WriteLine(string.Format("Decryption of file {0} failed: {1}", fileName, message));
-            Console.ReadKey();
-        }
-    }
-}

Decrypt/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Decrypt")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Decrypt")]
-[assembly: AssemblyCopyright("Copyright © 2019")]
-[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("c17ec788-0e12-4f9c-aadf-ea4e83a9f373")]
-
-// 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.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]

Decrypt/app.config

@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

DeviceTest/DeviceTestDlg.cs

@@ -7,6 +7,7 @@ using System.Threading;
 using System.Windows.Forms;
 using TBF.BenchControl;
 using TBF.BenchControl.Generic;
+using TBF.BenchControl.GenericDevices;
 using System.Xml.Serialization;
 
 
@@ -26,11 +27,11 @@ namespace DeviceTest
 		IComponentCfg component2Cfg;
 		IComponentCfg component3Cfg;
 
-		static IList<IDevice> tbfDevices;
-		static IList<IComponent> tbfComponents;
-		static IComponent tbfComponent1forOp;
-		static IComponent tbfComponent2forOp;
-		static IComponent tbfComponent3forOp;
+		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;
@@ -275,14 +276,7 @@ namespace DeviceTest
 				radioButton3.Text = "SelectTank 3";
 				radioButton4.Text = "SelectTank -";
 			}
-            else if (className == "Modbus.QuidoRS")
-            {
-                radioButton1.Text = "Close relay 1";
-                radioButton2.Text = "Close relay 2";
-                radioButton3.Text = "Close relay 3";
-                radioButton4.Text = "Open all relays";
-            }
-            else radioButton1.Text = "spare";
+			else radioButton1.Text = "spare";
 		}
 		/// 
 		void UpdateOperations2(string className)
@@ -302,14 +296,7 @@ namespace DeviceTest
 				radioButton23.Text = "SelectTank 3";
 				radioButton24.Text = "SelectTank -";
 			}
-            else if (className == "Modbus.QuidoRS")
-            {
-                radioButton21.Text = "Close relay 1";
-                radioButton22.Text = "Close relay 2";
-                radioButton23.Text = "Close relay 3";
-                radioButton24.Text = "Open all relays";
-            }
-            else radioButton21.Text = "spare";
+			else radioButton21.Text = "spare";
 		}
 		/// 
 		void UpdateOperations3(string className)
@@ -329,14 +316,7 @@ namespace DeviceTest
 				radioButton33.Text = "SelectTank 3";
 				radioButton34.Text = "SelectTank -";
 			}
-            else if (className == "Modbus.QuidoRS")
-            {
-                radioButton31.Text = "Close relay 1";
-                radioButton32.Text = "Close relay 2";
-                radioButton33.Text = "Close relay 3";
-                radioButton34.Text = "Open all relays";
-            }
-            else radioButton31.Text = "spare";
+			else radioButton31.Text = "spare";
 		}
 
 
@@ -425,7 +405,7 @@ namespace DeviceTest
 			cfgControl.Config = parentCfg;
 			cfgControl.Config.ItemNr = 0;
 
-			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+			TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg();
 			cfgForm.TbfComponents = new List<Config.Entities.Component>();
 
 			cfgForm.ComponentCfgCtrl = cfgControl;
@@ -454,7 +434,7 @@ namespace DeviceTest
 			cfgControl.Config = component1Cfg;
 			cfgControl.Config.ItemNr = 1;
 
-			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+			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());
@@ -488,7 +468,7 @@ namespace DeviceTest
 			cfgControl.Config = component2Cfg;
 			cfgControl.Config.ItemNr = 1;
 
-			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+			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());
@@ -523,7 +503,7 @@ namespace DeviceTest
 			cfgControl.Config = component3Cfg;
 			cfgControl.Config.ItemNr = 1;
 
-			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+			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());
@@ -692,13 +672,6 @@ namespace DeviceTest
 				//operation3 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(3);
 				//operation4 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(0);
 			}
-            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
-            {
-                operation1 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
-                operation2 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
-                operation3 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
-                operation4 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
-            }
 
 
 			if (tbfComponent2forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
@@ -731,13 +704,6 @@ namespace DeviceTest
                 //operation23 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(3);
                 //operation24 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(0);
 			}
-            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
-            {
-                operation21 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
-                operation22 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
-                operation23 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
-                operation24 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
-            }
 
 
 			if (tbfComponent3forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
@@ -770,13 +736,6 @@ namespace DeviceTest
 				//operation33 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(3);
 				//operation34 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(0);
 			}
-            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
-            {
-                operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(1);
-                operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(2);
-                operation33 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(4);
-                operation34 = (tbfComponent3forOp as TBF.BenchControl.Modbus.QuidoRS.QuidoRS).SetOutputsOp(0);
-            }
 
 
             int time = 0;

Encrypt/Encrypt.csproj

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{DA9B09F3-A99D-4883-A954-537560453674}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Encrypt</RootNamespace>
-    <AssemblyName>Encrypt</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>Encrypt.Program</StartupObject>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

Encrypt/Program.cs

@@ -1,93 +0,0 @@
-using System;
-using System.IO;
-using System.Security.Cryptography;
-using System.Text;
-
-namespace Encrypt
-{
-    /// <summary>
-    /// See also:
-    /// https://www.fluxbytes.com/csharp/encrypt-and-decrypt-files-in-c/
-    /// </summary>
-    class Program
-    {
-        static byte[] key = new byte[] { 83, 254, 105, 64, 184, 201, 195, 127, 52, 99, 77, 45, 252, 132, 163, 156 };
-        static byte[] IV = new byte[] { 189, 23, 137, 56, 204, 241, 242, 118, 28, 89, 9, 198, 224, 111, 186, 125 };
-
-        static void Main(string[] args)
-        {
-            if ((args.Length < 1) || !File.Exists(args[0]))
-            {
-                Console.WriteLine("Usage:  Encode <file>");
-                Console.ReadKey();
-                return;
-            }
-
-            string fileName = args[0];
-            string intermediateFile = fileName + ".encrypted";   /// Intermediate file, output of cryptography encoding
-            string backupFile = fileName + ".bak";
-
-            try
-            {
-                using (StreamReader reader = new StreamReader(fileName))
-                {
-                    if (!reader.ReadLine().StartsWith("<?xml version="))
-                    {
-                        Console.WriteLine(string.Format("File {0} is already encrypted.", fileName));
-                        Console.ReadKey();
-                        return;
-                    }
-                }
-
-                bool successful = false;
-                using (RijndaelManaged aes = new RijndaelManaged { Padding = PaddingMode.Zeros })
-                {
-                    using (FileStream fsCrypt = new FileStream(intermediateFile, FileMode.Create))
-                    {
-                        using (ICryptoTransform encryptor = aes.CreateEncryptor(key, IV))
-                        {
-                            using (CryptoStream cs = new CryptoStream(fsCrypt, encryptor, CryptoStreamMode.Write))
-                            {
-                                using (FileStream fsIn = new FileStream(fileName, FileMode.Open))
-                                {
-                                    int data;
-                                    while ((data = fsIn.ReadByte()) != -1) cs.WriteByte((byte)data);
-                                    successful = true;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                if (successful)
-                {
-                    /// File encryption successfuly completed => rotate files
-                    if (File.Exists(backupFile)) File.Delete(backupFile);
-                    File.Move(fileName, backupFile);
-                    File.Move(intermediateFile, fileName);
-                    return;
-                }
-                else
-                {
-                    Failed(fileName, intermediateFile);
-                    return;
-                }
-            }
-            catch (Exception)
-            {
-                Failed(fileName, intermediateFile);
-                return;
-            }
-        }
-
-        static void Failed(string fileName, string toBeDeleted)
-        {
-            if (File.Exists(toBeDeleted))
-            {
-                File.Delete(toBeDeleted);
-            }
-            Console.WriteLine(string.Format("Encryption of file {0} failed.", fileName));
-            Console.ReadKey();
-        }
-    }
-}

Encrypt/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Encrypt")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Encrypt")]
-[assembly: AssemblyCopyright("Copyright ©  2019")]
-[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("0f602531-6f1f-416e-af4d-9242855715a8")]
-
-// 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")]

Encrypt/app.config

@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

Results/BatchResults.cs

@@ -130,19 +130,13 @@ namespace Results
 
         public static BatchResults FromBatch(Batch batch)
         {
-            if (batch.WaterMeters == null || batch.WaterMeters.Count == 0) return null;
+            int wmCount = batch.WaterMeters.Count;
+            if (wmCount == 0) return null;
 
-            int wmPosMax = 0;
-            foreach (var wm in batch.WaterMeters) if (wm.WMPosition > wmPosMax) wmPosMax = wm.WMPosition;
-
-            BatchResults batchResults = new BatchResults(wmPosMax);
+            BatchResults batchResults = new BatchResults(wmCount);
             batchResults.Batch = batch;
-            batchResults.WaterMeters = new WaterMeter[wmPosMax];
-            for (int i = 0; i < batch.WaterMeters.Count; i++)
-            {
-                WaterMeter wm = batch.WaterMeters[i];
-                batchResults.WaterMeters[wm.WMPosition - 1] = wm;
-            }
+            batchResults.WaterMeters = new WaterMeter[wmCount];
+            for (int i = 0; i < wmCount; i++) batchResults.WaterMeters[i] = batch.WaterMeters[i];
 
             return batchResults;
         }
@@ -170,11 +164,11 @@ namespace Results
 		{
 			for (int i = 0; i < WMPositionsCount; i++)
 			{
-                if ((WaterMeters[i] != null) && !WaterMeters[i].Disabled)
+				if (WaterMeters[i] != null)
 				{
 					foreach (var mtr in WaterMeters[i].MeterTestRslts)
 					{
-                        if (!mtr.TestDone) return false;
+						if (!mtr.TestDone) return false;
 					}
 				}
 			}

Results/Entities/Batch.cs

@@ -29,17 +29,7 @@ namespace Results.Entities
         public virtual float DensityCorr { get; set; }				/// Density correction in [kg/m3]
 		public virtual float Custom2 { get; set; }
 		public virtual float Custom3 { get; set; }
-        public virtual int Counter1 { get; set; }
-        public virtual int Counter2 { get; set; }
-        public virtual int Counter3 { get; set; }
-        public virtual int Counter4 { get; set; }
-        public virtual int Counter5 { get; set; }
-        public virtual int Counter6 { get; set; }
-        public virtual int Counter7 { get; set; }
-        public virtual int Counter8 { get; set; }
-        public virtual int Counter9 { get; set; }
-        public virtual int Counter10 { get; set; }
-        public virtual DateTime StartTime { get; set; }
+		public virtual DateTime StartTime { get; set; }
 		public virtual DateTime EndTime { get; set; }
         public virtual bool Dirty { get; set; }
         public virtual bool RsltsSent { get; set; }
@@ -48,7 +38,7 @@ namespace Results.Entities
 		public virtual IList<WaterMeter> WaterMeters { get; set; }
 		public virtual IList<TestRslt> TestRslts { get; set; }
 		public virtual bool Compound { get; set; }					/// Not mapped to DB now
-        public virtual bool HeatMeter { get; set; }					/// Not mapped to DB now                                                                   /// 
+        public virtual bool HeatMeter { get; set; }					/// Not mapped to DB now
 
         public Batch()
 		{

Results/Entities/MeterTestRslt.cs

@@ -10,7 +10,7 @@ namespace Results.Entities
         public virtual int Id { get; protected set; }
 
 		public virtual byte   CompoundMeterId { get; set; }		/// 0=single, 1=compound/main, 2=compound/aux., 3=compound/overal, 4=heat meter volume, 5=heat meter energy
-        public virtual int    RegReaderType   { get; set; }     /// Not mapped to the DB, does not depend on localization and customer
+        public virtual int    RegReaderType   { get; set; }     /// Not mapped to the DB, does not depent on localisation and customer
                                                                 
 		public virtual double PulsesMeter     { get; set; }		/// # of water meter or heat meter pulses
 		public virtual double PulsesMaster	  { get; set; }		/// # of reference flowmeter pulses (gated by this water meter pulses)
@@ -25,7 +25,6 @@ namespace Results.Entities
  
 		/// Main result
 		public virtual double Error			  { get; set; }		/// [%]
-        public virtual int    ErrorIndicators { get; set; }		/// Not mapped to DB !!!, bit24=E25, bit25=E26, bit26=E27, bit27=E28
         public virtual double KorrErrQ        { get; set; }     /// [%] not mapped to results DB, saved to Oracle DB
 		public virtual bool   TestDone		  { get; set; }		/// true = test was completed
 		public virtual bool   Passed		  { get; set; }		/// true = test passed, water meter is OK
@@ -128,13 +127,9 @@ namespace Results.Entities
 		    TimestampEnd = src.TimestampEnd;
 		    TestTime = src.TestTime;
 		    Error = src.Error;
-            ErrorIndicators = src.ErrorIndicators;
             KorrErrQ = src.KorrErrQ;
 		    TestDone = src.TestDone;
             Passed = src.Passed;
-#if ORACLE_DB
-            LastError = src.LastError;
-#endif
         }
 
         public override string ToString()

Results/Entities/TestData.cs

@@ -20,8 +20,8 @@ namespace Results.Entities
 		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, in case of heat meters: 1=class1, 2=class2, 3=class3
-        public virtual double ErrLimHi              { get; set; }	/// [%] usually > 0, in case of heat meters: -Qn in m3/h
+		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; }

Results/Entities/TestRslt.cs

@@ -15,24 +15,22 @@ 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 string MethodClass { get; set; }         /// Not mapped to DB, does not depend on localization and customer
+		public virtual int RepetitionNr { get; set; }       /// Repetition number from the set of repeated tests (1...)
+        public virtual string MethodClass { get; set; }     /// Not mapped to the DB, does not depent on localisation and customer
 
 		/// Main results
 		public virtual bool TestDone { get; set; }
         public virtual string Remark { get; set; }
-		public virtual DateTime StartTime { get; set; }         /// Date and time of the test start
-		public virtual DateTime EndTime { get; set; }           /// Date and time of the test end
-		public virtual int FlowSetTime { get; set; }            /// [s]     Flow set time in seconds
-        public virtual int TimeBtwnMassMsrmnts { get; set; }    /// [s]     Time between two mass measurements in seconds (if applicable)
-        public virtual double TestTime { get; set; }            /// [s]     Test time in seconds
-        public virtual double TestTimeCorrection { get; set; }  /// [s]     Correction of the test time due to diverter (0 for methods w/o diverter or when there is no correction table)
-		public virtual double PulsesMaster { get; set; }        /// [pls]   FlyingStartMassCollectionProlonged: MID pulses of the water to the tank 
-        public virtual double TotalPulsesMstr { get; set; }     /// [pls]   FlyingStartMassCollectionProlonged: MID pulses of the complete test (not mapped to DB)
-        public virtual double ConstMasterRaw { get; set; }      /// [l/pls] Liters per pulse of the master flow meter uncorrected.
-        public virtual double ConstMasterCorr { get; set; }     /// [l/pls] Liters per pulse of the master flow meter corrected by a correction table.
-        public virtual double ConstMaster { get; set; }         /// [l/pls] Liters per pulse of the master flow meter calculated from a mass measurement.
-                                                                ///         When mass measurement is not available, corrected by a correction table.
+		public virtual 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 double TestTime { get; set; }        /// [s]     Measurement time in seconds
+		public virtual double PulsesMaster { get; set; }    /// [pls]   FlyingStartMassCollectionProlonged: MID pulses of the water to the tank 
+        public virtual double TotalPulsesMstr { get; set; } /// [pls]   FlyingStartMassCollectionProlonged: MID pulses of the complete test (not mapped to DB)
+        public virtual double ConstMasterRaw { get; set; }  /// [l/pls] Liters per pulse of the master flow meter uncorrected.
+        public virtual double ConstMasterCorr { get; set; } /// [l/pls] Liters per pulse of the master flow meter corrected by a correction table.
+        public virtual double ConstMaster { get; set; }     /// [l/pls] Liters per pulse of the master flow meter calculated from a mass measurement.
+                                                            ///         When mass measurement is not available, corrected by a correction table.
         public virtual double MassStartRaw { get; set; }	/// [kg]
 		public virtual double MassStart { get; set; }		/// [kg]
 		public virtual double MassEndRaw { get; set; }		/// [kg]
@@ -134,25 +132,10 @@ namespace Results.Entities
 		public virtual double TargetVolume() { return TestData.TargetVolume; }
 		public virtual double TargetTime()	 { return TestData.TargetTime; }
 		public virtual string Method()		 { return TestData.Method; }
-        public virtual string RefFlowmeter() { return (Components != null) ? Components.Flowmeter : string.Empty; }
-        public virtual bool IsRelErrTest()   { return (MethodClass != null) ? (MethodClass.Contains("FixedStart") || MethodClass.Contains("FlyingStart") || MethodClass.Contains("CombinedWithDetection") || MethodClass.Contains("DiverterTest")) : true; }
+        public virtual bool IsRelErrTest()   { return (MethodClass != null) ? (MethodClass.Contains("FixedStart") || MethodClass.Contains("FlyingStart") || MethodClass.Contains("CombinedWithDetection")) : true; }
         public virtual bool IsPMaxTest()     { return (MethodClass != null) ? (MethodClass.Contains("PMaxTest") || MethodClass.Contains("LeakTest")) : true; }
         public virtual bool IsStartStop()    { return (MethodClass != null) ? MethodClass.Contains("FixedStart") : true; }
-        public virtual bool IsDiverter()     { return (MethodClass != null) ? ((MethodClass.Contains("FlyingStart") && MethodClass.Contains("MassColl")) || MethodClass.Contains("DiverterTest")) : true; }
-        public virtual bool IsVolumeMethod() { return (MethodClass != null) ? (MethodClass.Contains("TestMethods.FixedStart.") || MethodClass.Contains("TestMethods.FlyingStart.")) : false; }
-
-        public virtual string MethodElde()
-        {
-            if (MethodClass == null) return string.Empty;
-            else if (MethodClass.Contains("TestMethods.FlyingStartMassCollection.")) return "MS";
-            else if (MethodClass.Contains("TestMethods.FlyingStartMassCollectionProlonged.")) return "MS";
-            else if (MethodClass.Contains("TestMethods.FlyingStartMassCollectionComparative.")) return "MS";
-            else if (MethodClass.Contains("TestMethods.FlyingStart.")) return "VS";
-            else if (MethodClass.Contains("TestMethods.FixedStartMassCollection.")) return "MP";
-            else if (MethodClass.Contains("TestMethods.FixedStartTankCollection.")) return "VP";
-            else if (MethodClass.Contains("TestMethods.FixedStart.")) return "VP";
-            else return string.Empty;
-        }
+        public virtual bool IsDiverter()     { return (MethodClass != null) ? (MethodClass.Contains("FlyingStart") && MethodClass.Contains("MassColl")) : true; }
 
 		public virtual double ErrLimLo()
         {
@@ -165,7 +148,7 @@ namespace Results.Entities
                 /// Metrological class and nominal flow of a heat meter
                 int metrClass = (int)Math.Round(TestData.ErrLimLo);
                 double Qp = Math.Abs(TestData.ErrLimHi);
-                double Q = (TestTime == 0) ? 1 : Math.Max(3.6 * VolumeCTV / TestTime, 0.00001); /// Div. by zero avoided
+                double Q = Math.Max(FlowMean, 0.00001);     /// to avoid division by zero
 
                 /// Calculate the error limit of a heat meter
                 switch (metrClass)
@@ -189,7 +172,7 @@ namespace Results.Entities
                 /// Metrological class and nominal flow of a heat meter
                 int metrClass = (int)Math.Round(TestData.ErrLimLo);
                 double Qp = Math.Abs(TestData.ErrLimHi);
-                double Q = (TestTime == 0) ? 1 : Math.Max(3.6 * VolumeCTV / TestTime, 0.00001); /// Div. by zero avoided
+                double Q = Math.Max(FlowMean, 0.00001);     /// to avoid division by zero
 
                 /// Calculate the error limit of a heat meter
                 switch (metrClass)
@@ -235,13 +218,10 @@ namespace Results.Entities
 		    StartTime = src.StartTime;
 		    EndTime = src.EndTime;
 		    FlowSetTime = src.FlowSetTime;
-            TimeBtwnMassMsrmnts = src.TimeBtwnMassMsrmnts;
 		    TestTime = src.TestTime;
 		    PulsesMaster = src.PulsesMaster;
-            TotalPulsesMstr = src.TotalPulsesMstr;
             ConstMasterRaw = src.ConstMasterRaw;
-            ConstMasterCorr = src.ConstMasterCorr;
-            ConstMaster = src.ConstMaster;
+		    ConstMaster = src.ConstMaster;
 		    MassStartRaw = src.MassStartRaw;
 		    MassStart = src.MassStart;
 		    MassEndRaw = src.MassEndRaw;
@@ -256,13 +236,7 @@ namespace Results.Entities
 		    VolumeMaster = src.VolumeMaster;
 		    ErrorMaster = src.ErrorMaster;
             DiverterStart = src.DiverterStart;
-            DivStart10 = src.DivStart10;
-            DivStart50 = src.DivStart50;
-            DivStart90 = src.DivStart90;
             DiverterEnd = src.DiverterEnd;
-            DivEnd10 = src.DivEnd10;
-            DivEnd50 = src.DivEnd50;
-            DivEnd90 = src.DivEnd90;
 			ErrorFlags = src.ErrorFlags;
 			ErrorFlagsMd = src.ErrorFlagsMd;
 		    RefEnergy = src.RefEnergy;

Results/Entities/WaterMeter.cs

@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using Config.Entities;
-using Results.Resources;
 
 namespace Results.Entities
 {
@@ -42,8 +41,8 @@ namespace Results.Entities
     public class WaterMeter
 	{
 		public virtual int    Id				{ get; protected set; }
-        public virtual string SerialNr          { get; set; }	/// S/N _or_ S/N of the main meter of a compound meter _or_ PCB Number of an iPerl water meter
-        public virtual string SerialNrAux       { get; set; }	/// S/N of the aux. meter of a compound meter _or_ a complete assigned S/N of an iPerl water meter
+		public virtual string SerialNr			{ get; set; }	/// Main s/n for compound meters, PCB Number for iPerl water meter
+		public virtual string SerialNrAux		{ get; set; }	/// Aux s/n for compound meters, Serial number for iPerl water meter
 		public virtual string PurchaseOrder		{ get; set; }
 		public virtual int    YearOfProduction  { get; set; }
 		public virtual int    WMPosition        { get; set; }
@@ -58,11 +57,14 @@ namespace Results.Entities
 		public virtual string Remark			{ get; set; }
 
 #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; }	/// Original iPerl calibration factor used during the test
         public virtual double CalibFactor       { get; set; }	/// iPerl calibration factor used during the test
         public virtual double OrigCalibFactorLNA{ get; set; }	/// Original iPerl LNA calibration factor used during the test
         public virtual double CalibFactorLNA    { get; set; }	/// iPerl LNA calibration factor used during the test
         public virtual double Q2ErrWOCorrection { get; set; }
+		public virtual bool   Q2CorrectionDone  { get; set; }   /// true = iPerl Q2 correction was done
+        public virtual double Q2Correction      { get; set; }	/// !!! obsolete
         public virtual int    Q2CorrRL          { get; set; }	/// iPerl Q2 correction for the R-flow written to iPerl
         public virtual int    Q2CorrLR          { get; set; }	/// iPerl Q2 correction for the L-flow written to iPerl
         public virtual int    Q2CorrFlowRight   { get; set; }	/// 1 = right to left
@@ -71,36 +73,11 @@ namespace Results.Entities
 		public virtual int    Hz2Correction     { get; set; }	/// iPerl Q2 correction used during the test
 		public virtual string FWVersion         { get; set; }
 #endif
-#if TURA_SPECIAL
-        /// <summary>
-        /// Data from a production test bench (in case of tests on iPerl special)
-        /// </summary>
-        public virtual int    AssignedSerialNr  { get; set; }
-        public virtual string CompleteSerialNr  { get; set; }
-        public virtual string RadioAddress      { get; set; }
-        public virtual int    PaletteNr         { get; set; }
-        public virtual int    UmkartonNr        { get; set; }
-        public virtual string ProdTestBench     { get; set; }
-        public virtual int    ProdWMPosition    { get; set; }
-        public virtual string ProdUserName      { get; set; }
-        public virtual string ProdPurchaseOrder { get; set; }
-        public virtual bool   ProdPassed        { get; set; }
-        public virtual int    ProdResultCode    { get; set; }
-        public virtual int    ProdQ2CorrRL      { get; set; }	/// iPerl Q2 correction for the R-flow written to iPerl
-        public virtual int    ProdQ2CorrLR      { get; set; }	/// iPerl Q2 correction for the L-flow written to iPerl
-#endif
 #if ORACLE_DB
-		public virtual int	  Pruefindex	    { get; set; }	/// >= 1 ... pruefindex
-		public virtual int	  HydrPruefung		{ get; set; }
-        public virtual int    WMTypeRevision    { get; set; }	/// Not mapped to DB !!!
-        public virtual object RawTestInfos      { get; set; }	/// IList<SensusTestInfo> fetched from Oracle at the beginning of the cycle, not mapped to DB !!!
-        public virtual object CompleteTestInfos { get; set; }	/// SensusTestInfo[] obtained as a best match at the beginning of the cycle, not mapped to DB !!!
+		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 int	  ProcessId	        { get; set; }	/// Not mapped to DB !!!    Tracing DB Process ID
-        public virtual int    SessionId         { get; set; }   /// Not mapped to DB !!!    1 (regular tracing DB session) or 2 (alternative tracing DB session)                                                 
-        public virtual bool   LastRecordIsNok   { get; set; }	/// Not mapped to DB !!!    Previous record verification result
-
-        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; }
 
@@ -285,12 +262,7 @@ namespace Results.Entities
 					{
 						return mtr;
 					}
-                    else if (meterId == Config.Entities.CompoundMeterId.SingleOrCompound &&
-                             mtr.CompoundMeterId == (byte)Config.Entities.CompoundMeterId.HeatMeterEnergy)
-                    {
-                        return mtr;
-                    }
-                }
+				}
 			}
 			return null;
 		}
@@ -352,17 +324,6 @@ namespace Results.Entities
 		public WaterMeter()
 		{
 			MeterTestRslts = new List<MeterTestRslt>();
-#if ORACLE_DB
-            Pruefindex = 1;
-            HydrPruefung = 0;
-            WMTypeRevision = 0;
-            RawTestInfos = null;
-            CompleteTestInfos = null;
-#endif
-            ProcessId = 0;
-            SessionId = 0;
-            ErrorFlags = 0;
-            LastRecordIsNok = false;
 		}
 
 
@@ -385,11 +346,12 @@ namespace Results.Entities
 			ArchivePath = src.ArchivePath;
 			Remark = src.Remark;
 #if IPERL
+		    SerialNrEx = src.SerialNrEx;
 		    OrigCalibFactor = src.OrigCalibFactor;
 		    CalibFactor = src.CalibFactor;
-		    OrigCalibFactorLNA = src.OrigCalibFactorLNA;
-		    CalibFactorLNA = src.CalibFactorLNA;
 		    Q2ErrWOCorrection = src.Q2ErrWOCorrection;
+		    Q2CorrectionDone = src.Q2CorrectionDone;
+            Q2Correction = src.Q2Correction;
             Q2CorrRL = src.Q2CorrRL;
             Q2CorrLR = src.Q2CorrLR;
             Q2CorrFlowRight = src.Q2CorrFlowRight;
@@ -398,32 +360,10 @@ namespace Results.Entities
 		    Hz2Correction = src.Hz2Correction;
 			FWVersion = src.FWVersion;
 #endif
-#if TURA_SPECIAL
-            AssignedSerialNr = src.AssignedSerialNr;
-            CompleteSerialNr = src.CompleteSerialNr;
-            RadioAddress = src.RadioAddress;
-            PaletteNr = src.PaletteNr;
-            UmkartonNr = src.UmkartonNr;
-            ProdTestBench = src.ProdTestBench;
-            ProdWMPosition = src.ProdWMPosition;
-            ProdUserName = src.ProdUserName;
-            ProdPurchaseOrder = src.ProdPurchaseOrder;
-            ProdPassed = src.ProdPassed;
-            ProdResultCode = src.ProdResultCode;
-            ProdQ2CorrRL = src.ProdQ2CorrRL;
-            ProdQ2CorrLR = src.ProdQ2CorrLR;
-#endif
 #if ORACLE_DB
-            Pruefindex = src.Pruefindex;
+		    Pruefindex = src.Pruefindex;
 		    HydrPruefung = src.HydrPruefung;
-            WMTypeRevision = src.WMTypeRevision;
-            RawTestInfos = src.RawTestInfos;
-            CompleteTestInfos = src.CompleteTestInfos;
 #endif
-            ProcessId = src.ProcessId;
-            SessionId = src.SessionId;
-            LastRecordIsNok = src.LastRecordIsNok;
-
             foreach (var mtr in MeterTestRslts)
             {
                 MeterTestRslt srcMtr = src.GetMeterTestRslt(mtr.Name(), (Config.Entities.CompoundMeterId)mtr.CompoundMeterId);
@@ -439,7 +379,7 @@ namespace Results.Entities
 		{
 			StringBuilder sb = new StringBuilder(80);
 #if IPERL
-			sb.AppendFormat("PCB:{0} S/N:{1} ", SerialNr, SerialNrAux);
+			sb.AppendFormat("PCB:{0} S/N:{1} ", SerialNr, SerialNrEx);
 #else
 			sb.AppendFormat("S/N:{0} ", SerialNr);
 #endif
@@ -448,101 +388,5 @@ namespace Results.Entities
 			sb.AppendFormat(" test start: {0} {1} batch={2}", StartTime().ToShortDateString(), StartTime().ToShortTimeString(), BatchNr());
 			return sb.ToString();
 		}
-
-
-        /// <summary>
-        /// Get decorated test names for a specified watermeter
-        /// </summary>
-        /// <param name="wMtr">Watermeter results entity</param>
-        /// <returns>A list of strings</returns>
-        public virtual IList<string> GetAllDecoratedTestNames()
-        {
-            IList<string> testNames = new List<string>();
-
-            if (MeterTestRslts != null)
-            {
-                foreach (var mtr in MeterTestRslts)
-                {
-                    if ((mtr.CompoundMeterId == (byte)CompoundMeterId.Single || mtr.CompoundMeterId == (byte)CompoundMeterId.Compound || mtr.CompoundMeterId == (byte)CompoundMeterId.HeatMeterEnergy)
-                          && mtr.TestDone
-                          && (mtr.Publish() != Config.Entities.Publish.Never)
-                          && (mtr.Publish() != Config.Entities.Publish.Internal))
-                    {
-                        testNames.Add(mtr.Name());
-                    }
-                }
-            }
-
-            return testNames;
-        }
-
-
-        static readonly System.Drawing.Color NotCompletedColor = System.Drawing.Color.White;
-        static readonly System.Drawing.Color OkColor = System.Drawing.Color.LightGreen;
-        static readonly System.Drawing.Color NokColor = System.Drawing.Color.LightPink;
-        static readonly System.Drawing.Color RejectColor = System.Drawing.Color.Magenta;
-        static readonly System.Drawing.Color ProductionErrorColor = System.Drawing.Color.RoyalBlue;
-        static readonly System.Drawing.Color WrongDirectionColor = System.Drawing.Color.Gold;
-        static readonly System.Drawing.Color WrongQ2FactorsColor = System.Drawing.Color.Red;
-
-        /// <summary>
-        /// Get color for highlighting results and an apporpriate text message.
-        /// </summary>
-        /// <param name="wMtr">Water meter results entity</param>
-        /// <param name="message">Appropriate message</param>
-        /// <returns>Color for results</returns>
-        public virtual System.Drawing.Color GetColorOfResults(bool maxRepeatsExceeded, out string message)
-        {
-            bool wmtrCompleted = CompletedFromTests();
-            bool wmtrPassed = PassedFromTests();
-
-            if ((ErrorFlags & (int)ErrorFlagMask.E28) != 0)
-            {
-                message = Strings.Previous_step_is_missing_or_NOK;
-                return ProductionErrorColor;
-            }
-            else if ((ErrorFlags & (int)ErrorFlagMask.E27) != 0)
-            {
-                message = Strings.Wrong_iPerl_counting_direction;
-                return WrongDirectionColor;
-            }
-            else if ((ErrorFlags & (int)ErrorFlagMask.E26) != 0)
-            {
-                message = Strings.Invalid_Q2_correction_factors;
-                return WrongQ2FactorsColor;
-            }
-            else if (wmtrPassed)
-            {
-                /// Water meter passed (therefore is was also completed)
-                message = Strings.Passed;
-                return OkColor;
-            }
-            else if (wmtrCompleted)
-            {
-                /// Water meter was completed but did not pass => Failed
-                if (maxRepeatsExceeded)
-                {
-                    message = Strings.Test_repetition_count_exceeded_upper_limit;
-                    return RejectColor;
-                }
-                else
-                {
-                    message = Strings.Failed;
-                    return NokColor;
-                }
-            }
-            else if (Disabled)
-            {
-                /// Water meter was not completed yet => did not pass, did not fail
-                message = Strings.This_position_is_disabled;
-                return NotCompletedColor;
-            }
-            else
-            {
-                /// Water meter was not completed yet => did not pass, did not fail
-                message = Strings.Test_in_progress;
-                return NotCompletedColor;
-            }
-        }
 	}
 }

Results/Entities/WaterMeterData.cs

@@ -54,6 +54,7 @@ namespace Results.Entities
 
 #if ORACLE_DB
 		public virtual int WMTypeId { get; set; }
+		public virtual int WMTypeRev { get; set; }
 #endif
 
         public WaterMeterData()
@@ -110,6 +111,7 @@ namespace Results.Entities
 
 #if ORACLE_DB
             if (WMTypeId != wmd.WMTypeId) return false;
+            if (WMTypeRev != wmd.WMTypeRev) return false;
 #endif
             return true;
 		}

Results/Forms/BatchResultsDlg.cs

@@ -1,11 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
 using System.Windows.Forms;
 using log4net;
 using Config.Entities;
 using Results.Resources;
-using NHibernate;
-using TracingDB.Entities;
 
 namespace Results.Forms
 {
@@ -13,33 +16,42 @@ namespace Results.Forms
     {
         static readonly ILog log = LogManager.GetLogger(typeof(BatchResultsDlg));
 
+        DateTime lastRedraw;
+        DateTime lastSizeChange;
+        bool loaded;
+
         ///
         /// Public members
         ///
-        public Results.BatchResults Results;
-        public IList<Results.WMeterRsltItemSpec> Items;
         public MetersArrangement MetersArrangement;
         public TestsArrangement TestsArrangement;
         public int NrMetersInOneGroup;
-        public bool ShowDisabledPositions;
-        public int MinWidth;
-        public int MinHeight;
+
+        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;
         public int PopupResultsTop;
         public int PopupResultsWidth;
         public int PopupResultsHeight;
-        public int[] RsltsClmnWidths;
 
+        public Results.BatchResults Results { set { Display(value); } }
 
         ///
         /// Private members
         ///
-        IOneWMResultsCtrl[] wmRsltsCtrl;        /// An array of controls with water meter results.
-        IOneWMResultsCtrl firstEnabledControl;
-        DateTime lastRedraw;
-        DateTime lastSizeChange;
-        int metersInOneGroup;
-        int nrGroups;
+        Results.BatchResults results;
+        MetersKind metersKind;
+
+        ListView firstListView;
+        public int[] rsltsClmnWidths;
+        int rsltsClmnCount { get { return (rsltsClmnWidths != null) ? rsltsClmnWidths.Length : 0; } }
+
+        int lvWidth;
+        int lvHeight;
+
 
         Timer timer;
 
@@ -47,226 +59,291 @@ namespace Results.Forms
         public BatchResultsDlg()
         {
             InitializeComponent();
+            Text = Strings.Results;
 
-            firstEnabledControl = null;
             lastSizeChange = DateTime.Now;
-            nrGroups = 1;
-            metersInOneGroup = 1;
 
-            /// Create a timer with one second interval.
+            // Create a timer with a ten second interval.
             timer = new Timer();
-            timer.Interval = 1000;   /// ms
+            timer.Interval = 500;   /// ms
             timer.Tick += new EventHandler(OnTimer);
             timer.Start();
         }
 
         private void BatchResultsDlg_Load(object sender, EventArgs e)
         {
-            if (PopupResultsLeft != 0) Left = PopupResultsLeft;
-            if (PopupResultsTop != 0) Top = PopupResultsTop;
-            if (PopupResultsWidth != 0)  Width = PopupResultsWidth;
+            if (PopupResultsLeft != 0)   Left   = PopupResultsLeft;
+            if (PopupResultsTop != 0)    Top    = PopupResultsTop;
+            if (PopupResultsWidth != 0)  Width  = PopupResultsWidth;
             if (PopupResultsHeight != 0) Height = PopupResultsHeight;
 
-            CreateControlsAndFillPanel(Results);
-            UpdateColumnWidths(RsltsClmnWidths);
-            UpdateResults(Results);
+            loaded = true;
+            if (results != null) Redraw();
+        }
+
+        public void Display(Results.BatchResults results)
+        {
+            this.results = results;
+            if (loaded) Redraw();
         }
 
 
-        ///
-        /// Handle double-click inside a water meter results control
-        ///
-        void OnDoubleClick(object sender, Results.Forms.WaterMeterEventArgs args)
+        IList<Results.WMeterRsltItemSpec> GetRsltItems(MetersKind metersKind)
         {
-            if (Results.WaterMeters != null && args.WMPosition > 0)
+            IList<Results.WMeterRsltItemSpec> srcItems;
+            switch (metersKind)
             {
-                foreach (var wm in Results.WaterMeters)
-                {
-                    if ((wm != null) && (wm.WMPosition == args.WMPosition))
-                    {
-                        ShowMoreWMResults(wm);
-                        return;
-                    }
-                }
+                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;
             }
 
-            MessageBox.Show(Strings.No_water_meter);
-            return;
-        }
-
-
-        void UpdateColumnWidths(int[] columnWidths)
-        {
-            foreach (var ctrl in wmRsltsCtrl) ctrl.Update(columnWidths);
-        }
-
-        void UpdateScrollpositions(int scrollStart)
-        {
-            /// TODO
+            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>
-        void CreateControlsAndFillPanel(Results.BatchResults results)
+        public void Redraw()
         {
-            if ((results == null) || (results.WMPositionsCount == 0))
-            {
-                /// There are no water meters at all
-                flowLayoutPanel.Controls.Clear();
-                wmRsltsCtrl = new OneWMResultsRowsCtrl[0];
-                firstEnabledControl = null;
-                return;
-            }
-
-            ///
-            /// Determine water meter positions count
-            ///
-            int displayedControlsCount = 0;
-            for (int i = 0; i < results.WaterMeters.Length; i++)
-            {
-                if (((results.WaterMeters[i] != null) && !results.WaterMeters[i].Disabled) || ShowDisabledPositions)
-                {
-                    displayedControlsCount++;
-                }
-            }
-
-            ///
-            /// Calculate geometry
-            ///
-            metersInOneGroup = Math.Max(1, Math.Min(displayedControlsCount, NrMetersInOneGroup));
-            nrGroups = Math.Max(1, (displayedControlsCount + metersInOneGroup - 1) / metersInOneGroup);
-
-            int oneWidth;
-            int oneHeight;
-            ///
-            if (MetersArrangement == MetersArrangement.Horizontally)
-            {
-                flowLayoutPanel.FlowDirection = FlowDirection.LeftToRight;
-                oneWidth = Math.Max(MinWidth, flowLayoutPanel.Width / metersInOneGroup - 6);
-                oneHeight = Math.Max(MinHeight, flowLayoutPanel.Height / nrGroups - 6);
-            }
-            else
-            {
-                flowLayoutPanel.FlowDirection = FlowDirection.TopDown;
-                oneWidth = Math.Max(MinWidth, flowLayoutPanel.Width / nrGroups - 6);
-                oneHeight = Math.Max(MinHeight, flowLayoutPanel.Height / metersInOneGroup - 6);
-            }
-
-            ///
-            /// Create controls and fill the FlowLayoutPanel
-            ///
-            flowLayoutPanel.SuspendLayout();
-            flowLayoutPanel.Controls.Clear();
-            flowLayoutPanel.WrapContents = true;
-            flowLayoutPanel.AutoScroll = true;
-
-            wmRsltsCtrl = new IOneWMResultsCtrl[displayedControlsCount];
-            int ix = 0;
-            firstEnabledControl = null;
-            for (int i = 0; i < results.WaterMeters.Length; i++)
-            {
-                if (((results.WaterMeters[i] != null) && !results.WaterMeters[i].Disabled) || ShowDisabledPositions)
-                {
-                    /// Create one water meter position / control
-                    wmRsltsCtrl[ix] = (TestsArrangement == TestsArrangement.Rows)
-                                    ? new OneWMResultsRowsCtrl() as IOneWMResultsCtrl
-                                    : new OneWMResultsColumnsCtrl() as IOneWMResultsCtrl;
-                    wmRsltsCtrl[ix].Width = oneWidth;
-                    wmRsltsCtrl[ix].Height = oneHeight;
-
-                    if ((results.WaterMeters[i] != null) && !results.WaterMeters[i].Disabled)
-                    {
-                        if ((firstEnabledControl == null) && (results.WaterMeters[i] != null) && !results.WaterMeters[i].Disabled)
-                        {
-                            firstEnabledControl = wmRsltsCtrl[ix];
-                        }
-
-                        //wmRsltsCtrl[ix].Update(results.WaterMeters[i].WMPosition);
-                        wmRsltsCtrl[ix].Update(Items);
-                        wmRsltsCtrl[ix].WMResultsClickedHandler += delegate(object s, Results.Forms.WaterMeterEventArgs args)
-                        {
-                            if (InvokeRequired)
-                            {
-                                Invoke(new EventHandler<Results.Forms.WaterMeterEventArgs>(OnDoubleClick), s, args);
-                            }
-                            else
-                            {
-                                OnDoubleClick(s, args);
-                            }
-                        };
-                    }
-
-                    flowLayoutPanel.Controls.Add(wmRsltsCtrl[ix] as UserControl);
-                    ix++;
-                }
-            }
-
-            flowLayoutPanel.ResumeLayout();
-
             lastRedraw = DateTime.Now;
-        }
+            
+            this.SuspendLayout();
 
-
-        void UpdateResults(Results.BatchResults results)
-        {
-            if ((results != null) && (results.WaterMeters != null))
+            try
             {
-                int ctrlIx = 0;
-                for (int i = 0; i < results.WaterMeters.Length; i++)
+                /// Determine how many water meters were enabled for result evaluation and printing
+                int enabledWMsCount = 0;
+                for (int i = 0; i < results.WMPositionsCount; i++)
                 {
-                    if (((results.WaterMeters[i] != null) && !results.WaterMeters[i].Disabled) || ShowDisabledPositions)
+                    if (results.WaterMeters[i] != null && !results.WaterMeters[i].Disabled)
                     {
-                        if (ctrlIx < wmRsltsCtrl.Length) wmRsltsCtrl[ctrlIx++].Update(results.WaterMeters[i]);
+                        enabledWMsCount++;
                     }
                 }
-            }
-        }
 
+                int metersInOneGroup = Math.Max(1, Math.Min(enabledWMsCount, NrMetersInOneGroup));
+                int nrGroups = Math.Max(1, (enabledWMsCount + metersInOneGroup - 1) / metersInOneGroup);
 
-        void ShowMoreWMResults(Results.Entities.WaterMeter wm)
-        {
-            if ((TracingDB.DB.SessionFactory == null) || string.IsNullOrEmpty(wm.SerialNr))
-            {
-                new Results.Forms.MoreWMResultsDlg(wm, null).ShowDialog();
-            }
-            else
-            {
-                using (ISession session = TracingDB.DB.SessionFactory.OpenSession())
+                if (MetersArrangement == MetersArrangement.Horizontally)
                 {
-                    IList<ReferenceRecord> refRecords = session.QueryOver<ReferenceRecord>()
-                                                               .Where(x => (x.Code == wm.SerialNr))
-                                                               .OrderBy(x => x.TimeStamp).Desc
-                                                               .List();
-                    for (int i = 0; i < refRecords.Count; i++)
+                    flowLayoutPanel.FlowDirection = FlowDirection.LeftToRight;
+                    lvWidth = flowLayoutPanel.Width / metersInOneGroup - 6;
+                    lvHeight = flowLayoutPanel.Height / nrGroups - 6;
+                }
+                else
+                {
+                    flowLayoutPanel.FlowDirection = FlowDirection.TopDown;
+                    lvWidth = flowLayoutPanel.Width / nrGroups - 6;
+                    lvHeight = flowLayoutPanel.Height / metersInOneGroup - 6;
+                }
+                flowLayoutPanel.Controls.Clear();
+                flowLayoutPanel.WrapContents = true;
+                flowLayoutPanel.AutoScroll = true;
+
+                bool first = true;
+                for (int i = 0; i < results.WMPositionsCount; i++)
+                {
+                    if (results.WaterMeters[i] != null && !results.WaterMeters[i].Disabled)
                     {
-                        ReferenceRecord refR = refRecords[i];
-                        if ((refR.Records != null) && (refR.Records.Count > 0))
+                        ListView lview = (TestsArrangement == TestsArrangement.Rows)
+                                       ? GetResultsTestsAreRows(results.WaterMeters[i], i + 1)
+                                       : GetResultsTestsAreColumns(results.WaterMeters[i], i + 1);
+                        if (lview != null)
                         {
-                            /// Reference record has additional records/parts (i.e. it is PCB assembly workflow step)
-                            /// 
-                            foreach (var rec in refR.Records)
+                            flowLayoutPanel.Controls.Add(lview);
+                            if (first)
                             {
-                                if (rec.Part.OraDBType.ToLower().Contains("flowtube"))
-                                {
-                                    /// rec.Part is a flowtube
-                                    /// 
-                                    IList<ReferenceRecord> flowtubeRRs = session.QueryOver<ReferenceRecord>()
-                                                                                .Where(x => (x.Code == rec.Code))
-                                                                                .OrderBy(x => x.TimeStamp).Desc
-                                                                                .List();
-                                    foreach (var rr in flowtubeRRs) refRecords.Add(rr);
-                                }
+                                firstListView = lview;
+                                first = false;
                             }
                         }
                     }
-
-                    new Results.Forms.MoreWMResultsDlg(wm, refRecords).ShowDialog();
                 }
             }
+            catch (Exception e)
+            {
+                log.FatalFormat("Redrawing results failed : {0}", e.Message);
+                if (e.InnerException != null)
+                {
+                    log.FatalFormat("InnerMessage : {0}", e.InnerException.Message);
+                }
+                log.FatalFormat("StackTrace   : {0}{1}", Environment.NewLine, e.StackTrace);
+            }
+
+            this.ResumeLayout(false);
         }
 
+        /// <summary>
+        /// Get an empty ListView control with appropriate parameters.
+        /// </summary>
+        /// <returns>ListView control</returns>
+        ListView GetListView()
+        {
+            ListView lview = new ListView();
+            lview.AllowColumnReorder = false;
+            lview.Dock = System.Windows.Forms.DockStyle.None;
+            lview.FullRowSelect = true;
+            lview.GridLines = true;
+            lview.Location = new System.Drawing.Point(0, 0);
+            lview.Size = new System.Drawing.Size(lvWidth, lvHeight);
+            lview.TabIndex = 0;
+            lview.UseCompatibleStateImageBehavior = false;
+            lview.View = System.Windows.Forms.View.Details;
+            return lview;
+        }
+
+
+        /// <summary>
+        /// Get decorated test names for a specified watermeter
+        /// </summary>
+        /// <param name="wMtr">Watermeter results entity</param>
+        /// <returns>A list of strings</returns>
+        IList<string> GetAllDecoratedTestNames(Results.Entities.WaterMeter wMtr)
+        {
+            IList<string> testNames = new List<string>();
+
+            foreach (var mtr in wMtr.MeterTestRslts)
+            {
+				if (mtr.IsPilotRslt() && mtr.TestDone && (mtr.Publish() != Config.Entities.Publish.Never)
+													  && (mtr.Publish() != Config.Entities.Publish.Internal))
+                {
+                    testNames.Add(mtr.Name());
+                }
+            }
+
+            return testNames;
+        }
+
+
+        /// <summary>
+        /// Get a ListView control filled with results of the meter 'mtr'
+        /// </summary>
+        /// <param name="mtr">Water meter number (1-based): 1 .. Config.Data.WMsCount</param>
+        /// <returns>ListView object</returns>
+        ListView GetResultsTestsAreRows(Results.Entities.WaterMeter wMtr, int printedWMNr)
+        {
+            metersKind = wMtr.Compound() ? MetersKind.Combined : (wMtr.HeatMeter() ? MetersKind.HeatMeter : MetersKind.Single);
+
+            ListView lview = GetListView();
+
+            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 col = 1;
+            foreach (var item in items)
+            {
+                lview.Columns.Add(item.Caption, (rsltsClmnCount > col) ? rsltsClmnWidths[col] : 70);
+                col++;
+            }
+
+
+            IList<string> testNames = GetAllDecoratedTestNames(wMtr);
+            int ix = 0;
+            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)
+                {
+                    ListViewItem lvi = new ListViewItem(testNames[ix++]);
+
+                    for (int i = 0; i < items.Count; i++)
+                    {
+                        string str = items[i].Print(wMtr, mtr.Name());
+
+                        /// Extract and use color information
+                        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);
+                }
+            }
+
+            return lview;
+        }
+
+
+        /// <summary>
+        /// Get a ListView control filled with results of the meter 'mtr'
+        /// </summary>
+        /// <param name="mtr">Water meter number (1-based): 1 .. Config.Data.WMsCount</param>
+        /// <returns>ListView object</returns>
+        ListView GetResultsTestsAreColumns(Results.Entities.WaterMeter wMtr, int printedWMNr)
+        {
+            metersKind = wMtr.Compound() ? MetersKind.Combined : (wMtr.HeatMeter() ? MetersKind.HeatMeter : MetersKind.Single);
+
+            ListView lview = GetListView();
+
+            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;
+            foreach (var str in GetAllDecoratedTestNames(wMtr))
+            {
+                lview.Columns.Add(str, (rsltsClmnCount > i) ? rsltsClmnWidths[i] : 70);
+                i++;
+            }
+
+            foreach (var item in items)
+            {
+                ListViewItem lvi = new ListViewItem(item.Caption);
+
+                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)
+                    {
+                        string str = item.Print(wMtr, mtr.Name());
+
+                        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);
+            }
+
+            return lview;
+        }
 
         private void BatchResultsDlg_FormClosing(object sender, FormClosingEventArgs e)
         {
@@ -276,7 +353,6 @@ namespace Results.Forms
             PopupResultsHeight = Height;
         }
 
-
         private void flowLayoutPanel_SizeChanged(object sender, EventArgs e)
         {
             lastSizeChange = DateTime.Now;
@@ -286,40 +362,13 @@ namespace Results.Forms
         {
             if (DateTime.Compare(lastSizeChange, lastRedraw) > 0)
             {
-                /// The last size change was more recent then the last redraw
+                /// The last size change was later then the last redraw
 
                 DateTime now = DateTime.Now;
                 if (DateTime.Compare(lastSizeChange + new TimeSpan(0, 0, 1), now) < 0)
                 {
-                    /// More then 1 second since the last panel size change
-
-                    /// Calculate geometry
-                    int oneWidth;
-                    int oneHeight;
-                    ///
-                    if (MetersArrangement == MetersArrangement.Horizontally)
-                    {
-                        flowLayoutPanel.FlowDirection = FlowDirection.LeftToRight;
-                        oneWidth = Math.Max(MinWidth, flowLayoutPanel.Width / metersInOneGroup - 6);
-                        oneHeight = Math.Max(MinHeight, flowLayoutPanel.Height / nrGroups - 6);
-                    }
-                    else
-                    {
-                        flowLayoutPanel.FlowDirection = FlowDirection.TopDown;
-                        oneWidth = Math.Max(MinWidth, flowLayoutPanel.Width / nrGroups - 6);
-                        oneHeight = Math.Max(MinHeight, flowLayoutPanel.Height / metersInOneGroup - 6);
-                    }
-
-                    /// Update size of controls
-                    flowLayoutPanel.SuspendLayout();
-                    ///
-                    foreach (var oneCtrl in wmRsltsCtrl)
-                    {
-                        oneCtrl.Width = oneWidth;
-                        oneCtrl.Height = oneHeight;
-                    }
-                    ///
-                    flowLayoutPanel.ResumeLayout();
+                    /// More then 1s since the last size change
+                    Redraw();
                 }
             }
         }

Results/Forms/IOneWMResultsCtrl.cs

@@ -1,25 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace Results.Forms
-{
-    public interface IOneWMResultsCtrl
-    {
-        event EventHandler<WaterMeterEventArgs> WMResultsClickedHandler;
-
-        bool Disabled { get; }                              /// true when water meter position is disabled
-        int WMPosition { get; }                             /// 1-based WM position
-        int Width { get; set; }                             /// Control width
-        int Height { get; set; }                            /// Control height
-        ListView.ColumnHeaderCollection Columns { get; }    /// Embedded ListView control columns
-
-        void Update(int[] columnWidths);
-        void Update(IList<Results.WMeterRsltItemSpec> items);
-        void Update(Results.Entities.WaterMeter wMtr);
-    }
-}

Results/Forms/MoreWMResultsDlg.Designer.cs

@@ -1,164 +0,0 @@
-namespace Results.Forms
-{
-    partial class MoreWMResultsDlg
-    {
-        /// <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.tabControl1 = new System.Windows.Forms.TabControl();
-            this.graphsTabPage = new System.Windows.Forms.TabPage();
-            this.productionTracingTabPage = new System.Windows.Forms.TabPage();
-            this.productionTracingSplitContainer = new System.Windows.Forms.SplitContainer();
-            this.messageLabel = new System.Windows.Forms.Label();
-            this.tracingResultsListView = new System.Windows.Forms.ListView();
-            this.allResultsTabPage = new System.Windows.Forms.TabPage();
-            this.tabControl1.SuspendLayout();
-            this.productionTracingTabPage.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.productionTracingSplitContainer)).BeginInit();
-            this.productionTracingSplitContainer.Panel1.SuspendLayout();
-            this.productionTracingSplitContainer.Panel2.SuspendLayout();
-            this.productionTracingSplitContainer.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // tabControl1
-            // 
-            this.tabControl1.Controls.Add(this.allResultsTabPage);
-            this.tabControl1.Controls.Add(this.graphsTabPage);
-            this.tabControl1.Controls.Add(this.productionTracingTabPage);
-            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabControl1.Location = new System.Drawing.Point(0, 0);
-            this.tabControl1.Name = "tabControl1";
-            this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(1195, 448);
-            this.tabControl1.TabIndex = 0;
-            // 
-            // graphsTabPage
-            // 
-            this.graphsTabPage.Location = new System.Drawing.Point(4, 22);
-            this.graphsTabPage.Name = "graphsTabPage";
-            this.graphsTabPage.Padding = new System.Windows.Forms.Padding(3);
-            this.graphsTabPage.Size = new System.Drawing.Size(1187, 422);
-            this.graphsTabPage.TabIndex = 1;
-            this.graphsTabPage.Text = "Graphs";
-            this.graphsTabPage.UseVisualStyleBackColor = true;
-            // 
-            // productionTracingTabPage
-            // 
-            this.productionTracingTabPage.Controls.Add(this.productionTracingSplitContainer);
-            this.productionTracingTabPage.Location = new System.Drawing.Point(4, 22);
-            this.productionTracingTabPage.Name = "productionTracingTabPage";
-            this.productionTracingTabPage.Size = new System.Drawing.Size(1187, 422);
-            this.productionTracingTabPage.TabIndex = 2;
-            this.productionTracingTabPage.Text = "Production tracing";
-            this.productionTracingTabPage.UseVisualStyleBackColor = true;
-            // 
-            // productionTracingSplitContainer
-            // 
-            this.productionTracingSplitContainer.BackColor = System.Drawing.SystemColors.Control;
-            this.productionTracingSplitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.productionTracingSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
-            this.productionTracingSplitContainer.IsSplitterFixed = true;
-            this.productionTracingSplitContainer.Location = new System.Drawing.Point(0, 0);
-            this.productionTracingSplitContainer.Name = "productionTracingSplitContainer";
-            this.productionTracingSplitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal;
-            // 
-            // productionTracingSplitContainer.Panel1
-            // 
-            this.productionTracingSplitContainer.Panel1.Controls.Add(this.messageLabel);
-            this.productionTracingSplitContainer.Panel1MinSize = 55;
-            // 
-            // productionTracingSplitContainer.Panel2
-            // 
-            this.productionTracingSplitContainer.Panel2.Controls.Add(this.tracingResultsListView);
-            this.productionTracingSplitContainer.Panel2MinSize = 60;
-            this.productionTracingSplitContainer.Size = new System.Drawing.Size(1187, 422);
-            this.productionTracingSplitContainer.SplitterDistance = 55;
-            this.productionTracingSplitContainer.SplitterWidth = 1;
-            this.productionTracingSplitContainer.TabIndex = 0;
-            // 
-            // messageLabel
-            // 
-            this.messageLabel.AutoSize = true;
-            this.messageLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.messageLabel.Location = new System.Drawing.Point(12, 9);
-            this.messageLabel.Name = "messageLabel";
-            this.messageLabel.Size = new System.Drawing.Size(152, 37);
-            this.messageLabel.TabIndex = 1;
-            this.messageLabel.Text = "Message";
-            // 
-            // tracingResultsListView
-            // 
-            this.tracingResultsListView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tracingResultsListView.GridLines = true;
-            this.tracingResultsListView.Location = new System.Drawing.Point(0, 0);
-            this.tracingResultsListView.Name = "tracingResultsListView";
-            this.tracingResultsListView.Size = new System.Drawing.Size(1187, 366);
-            this.tracingResultsListView.TabIndex = 0;
-            this.tracingResultsListView.UseCompatibleStateImageBehavior = false;
-            this.tracingResultsListView.View = System.Windows.Forms.View.Details;
-            // 
-            // allResultsTabPage
-            // 
-            this.allResultsTabPage.Location = new System.Drawing.Point(4, 22);
-            this.allResultsTabPage.Name = "allResultsTabPage";
-            this.allResultsTabPage.Padding = new System.Windows.Forms.Padding(3);
-            this.allResultsTabPage.Size = new System.Drawing.Size(1187, 422);
-            this.allResultsTabPage.TabIndex = 0;
-            this.allResultsTabPage.Text = "All results";
-            this.allResultsTabPage.UseVisualStyleBackColor = true;
-            // 
-            // MoreWMResultsDlg
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1195, 448);
-            this.Controls.Add(this.tabControl1);
-            this.Name = "MoreWMResultsDlg";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "Water meter results";
-            this.tabControl1.ResumeLayout(false);
-            this.productionTracingTabPage.ResumeLayout(false);
-            this.productionTracingSplitContainer.Panel1.ResumeLayout(false);
-            this.productionTracingSplitContainer.Panel1.PerformLayout();
-            this.productionTracingSplitContainer.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.productionTracingSplitContainer)).EndInit();
-            this.productionTracingSplitContainer.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TabControl tabControl1;
-        private OneWMResultsRowsCtrl oneWMResultsCtrl;
-        private System.Windows.Forms.TabPage graphsTabPage;
-        private System.Windows.Forms.TabPage productionTracingTabPage;
-        private System.Windows.Forms.SplitContainer productionTracingSplitContainer;
-        private System.Windows.Forms.Label messageLabel;
-        private System.Windows.Forms.ListView tracingResultsListView;
-        private System.Windows.Forms.TabPage allResultsTabPage;
-    }
-}

Results/Forms/MoreWMResultsDlg.cs

@@ -1,188 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-using TracingDB.Entities;
-using Results.Resources;
-using Config.Entities;
-using System.Drawing;
-using System.Windows.Forms.DataVisualization.Charting;
-
-namespace Results.Forms
-{
-    public partial class MoreWMResultsDlg : Form
-    {
-        public MoreWMResultsDlg(Results.Entities.WaterMeter wm, IList<ReferenceRecord> refRecords)
-        {
-            InitializeComponent();
-
-            Localize();
-
-            ShowAllResults(wm);
-            ShowChart(wm);
-
-            if (refRecords == null)
-            {
-                tabControl1.SelectTab(1);
-                tabControl1.TabPages.RemoveAt(2);
-            }
-            else
-            {
-                tabControl1.SelectTab(2);
-                ShowTracingResults(wm, refRecords);
-            }
-        }
-
-
-        void Localize()
-        {
-            Text = Strings.Water_meter_results;
-            tabControl1.TabPages[0].Text = Strings.All_results;
-            tabControl1.TabPages[1].Text = Strings.Graphs;
-            tabControl1.TabPages[2].Text = Strings.Production_tracing_results;
-        }
-
-
-        /// <summary>
-        /// Display all results for this water meter in the 1st tab page
-        /// </summary>
-        /// <param name="wMtr">Water meter entity</param>
-        void ShowAllResults(Results.Entities.WaterMeter wMtr)
-        {
-//            string message;
-//            Color commonBackColor = wMtr.GetColorOfResults(false, out message);     /// Ony message is used later on
-//#if ORACLE_DB
-//            oneWMResultsCtrl.Caption = string.Format("{0} ({1}) {2}", (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr), (wMtr.Pruefindex % 100), message);
-//#else
-//            oneWMResultsCtrl.Caption = string.Format("s/n = {0}", string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr);
-//#endif
-
-//            IList<Results.WMeterRsltItemSpec> items = Results.WMeterRsltItemSpec.AllItems;
-
-//            // Header
-//            oneWMResultsCtrl.Columns.Add(wMtr.WMPosition.ToString(), 100);
-//            int i = 1;
-//            foreach (var str in wMtr.GetAllDecoratedTestNames())
-//            {
-//                oneWMResultsCtrl.Columns.Add(str, 100);
-//                i++;
-//            }
-
-//            foreach (var item in items)
-//            {
-//                ListViewItem lvi = new ListViewItem(item.Name);
-
-//                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)
-//                    {
-//                        string str = item.Print(wMtr, mtr.Name());
-
-//                        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);
-//                        }
-//                    }
-//                }
-
-//                oneWMResultsCtrl.Items.Add(lvi);
-//            }
-        }
-
-
-        void ShowChart(Results.Entities.WaterMeter wm)
-        {
-            //chart.ChartAreas[0].AxisX.LabelStyle.Format = "dd.MM.yy";
-            //chart.ChartAreas[0].AxisX.Interval = 1;
-            //chart.ChartAreas[0].AxisX.IntervalType = ;
-
-            tabControl1.TabPages[1].Controls.Add(Results.Output.WMChart.GetChart(wm, false));
-        }
-
-
-        /// <summary>
-        /// Display tracing results in the 3rd tab page
-        /// </summary>
-        /// <param name="wm">Water meter entity</param>
-        /// <param name="refRecords">ReferenceRecord-s from tracing DB</param>
-        void ShowTracingResults(Results.Entities.WaterMeter wm, IList<ReferenceRecord> refRecords)
-        {
-            tracingResultsListView.Columns.Add(Strings.Date_and_time, 110);
-            tracingResultsListView.Columns.Add(Strings.Step, 100);
-            tracingResultsListView.Columns.Add(Strings.Workplace, 100);
-            tracingResultsListView.Columns.Add(Strings.Name, 100);
-            tracingResultsListView.Columns.Add(Strings.Result, 70);
-            tracingResultsListView.Columns.Add(Strings.Part, 90);
-            tracingResultsListView.Columns.Add(Strings.Code, 150);
-            tracingResultsListView.Columns.Add(Strings.Workflow, 450);
-
-            if (refRecords == null || refRecords.Count == 0)
-            {
-                messageLabel.Text = "V sledovaní výroby nie sú žiadne záznamy";
-            }
-            else
-            {
-                Process proc = refRecords[0].Process;
-                bool[] isMissing = new bool[proc.Worksteps.Count];
-                for (int i = 0; i < isMissing.Length; i++) isMissing[i] = true;
-
-                foreach (var rr in refRecords)
-                {
-                    tracingResultsListView.Items.Add(new ListViewItem(new string[]
-                    {
-                        rr.TimeStamp.ToString("dd.MM.yyyy  HH:mm"),
-                        rr.Workstep.Name,
-                        rr.Workplace,
-                        rr.UserName,
-                        rr.Result == 0 ? "OK" : "NOK",
-                        rr.Workstep.ReferencePart.Name,
-                        rr.Code,
-                        rr.Process.Name,
-                    }));
-
-                    for (int i = 0; i < isMissing.Length; i++)
-                    {
-                        if (proc.Worksteps[i] == rr.Workstep) isMissing[i] = false;
-                    }
-                }
-
-                string missingWorkplace = null;
-                for (int i = 0; i < isMissing.Length; i++)
-                {
-                    if (isMissing[i])
-                    {
-                        if (missingWorkplace == null)
-                        {
-                            missingWorkplace = proc.Worksteps[i].Name;
-                            messageLabel.Text = string.Format("Chýba záznam z pracoviska {0}", missingWorkplace);
-                        }
-                        else
-                        {
-                            messageLabel.Text = string.Format("Chýba záznam z pracoviska {0} aj z nasledujúcich pracovísk", missingWorkplace);
-                        }
-                    }
-                }
-
-                if (missingWorkplace == null)
-                {
-                    messageLabel.Text = "Všetko je OK";
-                }
-            }
-        }
-    }
-}

Results/Forms/OneWMResultsColumnsCtrl.Designer.cs

@@ -1,103 +0,0 @@
-namespace Results.Forms
-{
-    partial class OneWMResultsColumnsCtrl
-    {
-        /// <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.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.tBox = new System.Windows.Forms.TextBox();
-            this.lView = new System.Windows.Forms.ListView();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
-            this.splitContainer1.Panel1.SuspendLayout();
-            this.splitContainer1.Panel2.SuspendLayout();
-            this.splitContainer1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // splitContainer1
-            // 
-            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
-            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.Controls.Add(this.tBox);
-            // 
-            // splitContainer1.Panel2
-            // 
-            this.splitContainer1.Panel2.Controls.Add(this.lView);
-            this.splitContainer1.Size = new System.Drawing.Size(352, 318);
-            this.splitContainer1.SplitterDistance = 25;
-            this.splitContainer1.SplitterWidth = 1;
-            this.splitContainer1.TabIndex = 0;
-            // 
-            // tBox
-            // 
-            this.tBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tBox.Location = new System.Drawing.Point(0, 0);
-            this.tBox.Name = "tBox";
-            this.tBox.Size = new System.Drawing.Size(352, 20);
-            this.tBox.TabIndex = 0;
-            this.tBox.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.tBox_MouseDoubleClick);
-            // 
-            // lView
-            // 
-            this.lView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.lView.FullRowSelect = true;
-            this.lView.GridLines = true;
-            this.lView.Location = new System.Drawing.Point(0, 0);
-            this.lView.Name = "lView";
-            this.lView.Size = new System.Drawing.Size(352, 292);
-            this.lView.TabIndex = 0;
-            this.lView.UseCompatibleStateImageBehavior = false;
-            this.lView.View = System.Windows.Forms.View.Details;
-            // 
-            // OneWMResultsCtrl
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.splitContainer1);
-            this.Name = "OneWMResultsCtrl";
-            this.Size = new System.Drawing.Size(352, 318);
-            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.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.SplitContainer splitContainer1;
-        private System.Windows.Forms.TextBox tBox;
-        private System.Windows.Forms.ListView lView;
-    }
-}

Results/Forms/OneWMResultsColumnsCtrl.cs

@@ -1,159 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-using System.Collections.Generic;
-
-namespace Results.Forms
-{
-    public partial class OneWMResultsColumnsCtrl : UserControl, IOneWMResultsCtrl
-    {
-        public event EventHandler<WaterMeterEventArgs> WMResultsClickedHandler;
-        /// 
-        private void tBox_MouseDoubleClick(object sender, MouseEventArgs e)
-        {
-            try
-            {
-                if (WMResultsClickedHandler != null) WMResultsClickedHandler(sender, new WaterMeterEventArgs(wmPosition));
-            }
-            catch (Exception)
-            {
-            }
-        }
-
-
-        bool disabled;
-        int wmPosition;         /// 1-based water meter position
-        string caption;
-        Color bkColor;
-        int[] columnWidths;
-        IList<Results.WMeterRsltItemSpec> items;
-
-
-        public bool Disabled { get { return disabled; } }                                   /// Read only
-        public int WMPosition { get { return wmPosition; } }                                /// Read only
-        public ListView.ColumnHeaderCollection Columns { get { return lView.Columns; } }    /// Read only
-
-
-        public OneWMResultsColumnsCtrl()
-        {
-            InitializeComponent();
-            disabled = false;
-            wmPosition = 0;
-            tBox.Text = caption = "---";
-            tBox.BackColor = lView.BackColor = bkColor = Color.White;
-            items = new List<Results.WMeterRsltItemSpec>();
-            columnWidths = new int[0];
-        }
-
-        public void Update(int[] columnWidths)
-        {
-            this.columnWidths = columnWidths;
-
-            /// Always update ListView column widths
-            int col = 0;
-            foreach (ColumnHeader column in lView.Columns)
-            {
-                column.Width = (columnWidths != null && columnWidths.Length > col) ? columnWidths[col] : ((col == 0) ? 40 : 70);
-                col++;
-            }
-        }
-
-        public void Update(IList<Results.WMeterRsltItemSpec> items)
-        {
-            this.items = items;
-        }
-
-        public void Update(Results.Entities.WaterMeter wMtr)
-        {
-            if (wMtr == null || wMtr.Disabled)
-            {
-                /// Water meter position is disabled
-                this.disabled = true;
-                lView.Items.Clear();
-                tBox.Text = caption = "---";
-                tBox.BackColor = lView.BackColor = bkColor = Color.White;
-                return;
-            }
-
-            /// Update background color
-            string message = string.Empty;
-            Update(wMtr.GetColorOfResults(false, out message));
-
-            /// Update caption
-#if ORACLE_DB
-            tBox.Text = caption = string.Format("{0} ({1}) {2}", (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr), (wMtr.Pruefindex % 100), message);
-#else
-            tBox.Text = caption = string.Format("s/n = {0}", string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr);
-#endif
-
-            /// Header
-            lView.Columns.Add(wmPosition.ToString(), (columnWidths != null && columnWidths.Length > 0) ? columnWidths[0] : 40);
-            int col = 1;
-            foreach (var str in wMtr.GetAllDecoratedTestNames())
-            {
-                lView.Columns.Add(str, (columnWidths != null && columnWidths.Length > col) ? columnWidths[col] : 70);
-                col++;
-            }
-
-            lView.Items.Clear();
-            if (items == null || items.Count == 0) return;
-
-            foreach (var item in items)
-            {
-                ListViewItem lvi = new ListViewItem(item.Caption);
-
-                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)
-                    {
-                        string str = item.Print(wMtr, mtr.Name());
-
-                        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);
-            }
-        }
-
-        ///
-        /// Private
-        ///
-
-        void Update(int wmPosition)
-        {
-            this.wmPosition = wmPosition;
-            if (lView.Columns.Count > 0)
-            {
-                lView.Columns[0].Text = wmPosition.ToString();
-            }
-        }
-
-        void Update(Color backColor)
-        {
-            if (this.bkColor != backColor)
-            {
-                tBox.BackColor = lView.BackColor = this.bkColor = backColor;
-            }
-        }
-    }
-}

Results/Forms/OneWMResultsRowsCtrl.Designer.cs

@@ -1,103 +0,0 @@
-namespace Results.Forms
-{
-    partial class OneWMResultsRowsCtrl
-    {
-        /// <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.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.tBox = new System.Windows.Forms.TextBox();
-            this.lView = new System.Windows.Forms.ListView();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
-            this.splitContainer1.Panel1.SuspendLayout();
-            this.splitContainer1.Panel2.SuspendLayout();
-            this.splitContainer1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // splitContainer1
-            // 
-            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
-            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.Controls.Add(this.tBox);
-            // 
-            // splitContainer1.Panel2
-            // 
-            this.splitContainer1.Panel2.Controls.Add(this.lView);
-            this.splitContainer1.Size = new System.Drawing.Size(352, 318);
-            this.splitContainer1.SplitterDistance = 25;
-            this.splitContainer1.SplitterWidth = 1;
-            this.splitContainer1.TabIndex = 0;
-            // 
-            // tBox
-            // 
-            this.tBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tBox.Location = new System.Drawing.Point(0, 0);
-            this.tBox.Name = "tBox";
-            this.tBox.Size = new System.Drawing.Size(352, 20);
-            this.tBox.TabIndex = 0;
-            this.tBox.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.tBox_MouseDoubleClick);
-            // 
-            // lView
-            // 
-            this.lView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.lView.FullRowSelect = true;
-            this.lView.GridLines = true;
-            this.lView.Location = new System.Drawing.Point(0, 0);
-            this.lView.Name = "lView";
-            this.lView.Size = new System.Drawing.Size(352, 292);
-            this.lView.TabIndex = 0;
-            this.lView.UseCompatibleStateImageBehavior = false;
-            this.lView.View = System.Windows.Forms.View.Details;
-            // 
-            // OneWMResultsCtrl
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.splitContainer1);
-            this.Name = "OneWMResultsCtrl";
-            this.Size = new System.Drawing.Size(352, 318);
-            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.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.SplitContainer splitContainer1;
-        private System.Windows.Forms.TextBox tBox;
-        private System.Windows.Forms.ListView lView;
-    }
-}

Results/Forms/OneWMResultsRowsCtrl.cs

@@ -1,169 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-using System.Collections.Generic;
-
-namespace Results.Forms
-{
-    public partial class OneWMResultsRowsCtrl : UserControl, IOneWMResultsCtrl
-    {
-        public event EventHandler<WaterMeterEventArgs> WMResultsClickedHandler;
-        /// 
-        private void tBox_MouseDoubleClick(object sender, MouseEventArgs e)
-        {
-            try
-            {
-                if (WMResultsClickedHandler != null) WMResultsClickedHandler(sender, new WaterMeterEventArgs(wmPosition));
-            }
-            catch (Exception)
-            {
-            }
-        }
-
-
-        bool disabled;
-        int wmPosition;         /// 1-based water meter position
-        string caption;
-        Color bkColor;
-        int[] columnWidths;
-        IList<Results.WMeterRsltItemSpec> items;
-
-
-        public bool Disabled { get { return disabled; } }                                   /// Read only
-        public int WMPosition { get { return wmPosition; } }                                /// Read only
-        public ListView.ColumnHeaderCollection Columns { get { return lView.Columns; } }    /// Read only
-
-
-        public OneWMResultsRowsCtrl()
-        {
-            InitializeComponent();
-            disabled = false;
-            wmPosition = 0;
-            tBox.Text = caption = "---";
-            tBox.BackColor = lView.BackColor = bkColor = Color.White;
-            items = new List<Results.WMeterRsltItemSpec>();
-            columnWidths = new int[0];
-        }
-
-        public void Update(int[] columnWidths)
-        {
-            this.columnWidths = columnWidths;
-
-            /// Always update ListView column widths
-            int col = 0;
-            foreach (ColumnHeader column in lView.Columns)
-            {
-                column.Width = (columnWidths != null && columnWidths.Length > col) ? columnWidths[col] : ((col == 0) ? 40 : 70);
-                col++;
-            }
-        }
-
-        public void Update(IList<Results.WMeterRsltItemSpec> items)
-        {
-            this.items = items;
-
-            /// Always draw ListView header
-            lView.Columns.Clear();
-            lView.Columns.Add(wmPosition.ToString(), (columnWidths != null && columnWidths.Length > 0) ? columnWidths[0] : 40);
-
-            if (items == null || items.Count == 0) return;
-            int col = 1;
-            foreach (var item in items)
-            {
-                lView.Columns.Add(item.Caption, (columnWidths != null && columnWidths.Length > col) ? columnWidths[col] : 70);
-                col++;
-            }
-        }
-
-        public void Update(Results.Entities.WaterMeter wMtr)
-        {
-            if (wMtr == null || wMtr.Disabled)
-            {
-                /// Water meter position is disabled
-                this.disabled = true;
-                lView.Items.Clear();
-                tBox.Text = caption = "---";
-                tBox.BackColor = lView.BackColor = bkColor = Color.White;
-                return;
-            }
-
-            /// Update background color
-            string message = string.Empty;
-            Update(wMtr.GetColorOfResults(false, out message));
-
-            /// Update caption
-#if ORACLE_DB
-            tBox.Text = caption = string.Format("{0} ({1}) {2}", (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr), (wMtr.Pruefindex % 100), message);
-#else
-            tBox.Text = caption = string.Format("s/n = {0}", string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr);
-#endif
-            
-            Update(wMtr.WMPosition);
-
-            /// Update test results
-            IList<string> testNames = wMtr.GetAllDecoratedTestNames();
-            int ix = 0;
-            lView.Items.Clear();
-            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)
-                {
-                    ListViewItem lvi = new ListViewItem(testNames[ix++]);
-
-                    if (items != null)
-                    {
-                        for (int i = 0; i < items.Count; i++)
-                        {
-                            string str = items[i].Print(wMtr, mtr.Name());
-
-                            /// Extract and use color information
-                            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);
-                }
-            }
-        }
-
-        ///
-        /// Private
-        ///
-
-        void Update(int wmPosition)
-        {
-            this.wmPosition = wmPosition;
-            if (lView.Columns.Count > 0)
-            {
-                lView.Columns[0].Text = wmPosition.ToString();
-            }
-        }
-
-        void Update(Color backColor)
-        {
-            if (this.bkColor != backColor)
-            {
-                tBox.BackColor = lView.BackColor = this.bkColor = backColor;
-            }
-        }
-    }
-}

Results/Forms/TracingResultsDlg.Designer.cs

@@ -1,65 +0,0 @@
-namespace Results.Forms
-{
-    partial class TracingResultsDlg
-    {
-        /// <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.tracingResultsListView = new System.Windows.Forms.ListView();
-            this.SuspendLayout();
-            // 
-            // tracingResultsListView
-            // 
-            this.tracingResultsListView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tracingResultsListView.GridLines = true;
-            this.tracingResultsListView.Location = new System.Drawing.Point(0, 0);
-            this.tracingResultsListView.Name = "tracingResultsListView";
-            this.tracingResultsListView.Size = new System.Drawing.Size(1228, 178);
-            this.tracingResultsListView.TabIndex = 0;
-            this.tracingResultsListView.UseCompatibleStateImageBehavior = false;
-            this.tracingResultsListView.View = System.Windows.Forms.View.Details;
-            // 
-            // TracingResultsDlg
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1228, 178);
-            this.Controls.Add(this.tracingResultsListView);
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "TracingResultsDlg";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "TracingResultsDlg";
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.ListView tracingResultsListView;
-
-    }
-}

Results/Forms/TracingResultsDlg.cs

@@ -1,44 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-using TracingDB.Entities;
-using Results.Resources;
-
-namespace Results.Forms
-{
-    public partial class TracingResultsDlg : Form
-    {
-        public TracingResultsDlg(IList<ReferenceRecord> rRecords)
-        {
-            InitializeComponent();
-
-            Text = Strings.Production_tracing_results;
-
-            tracingResultsListView.Columns.Add(Strings.Date_and_time, 110);
-            tracingResultsListView.Columns.Add(Strings.Step, 100);
-            tracingResultsListView.Columns.Add(Strings.Workplace, 100);
-            tracingResultsListView.Columns.Add(Strings.Name, 100);
-            tracingResultsListView.Columns.Add(Strings.Result, 70);
-            tracingResultsListView.Columns.Add(Strings.Part, 90);
-            tracingResultsListView.Columns.Add(Strings.Code, 150);
-            tracingResultsListView.Columns.Add(Strings.Workflow, 450);
-
-            foreach (var rr in rRecords)
-            {
-                tracingResultsListView.Items.Add(new ListViewItem(new string[] {
-                        rr.TimeStamp.ToString("dd.MM.yyyy  HH:mm"),
-                        rr.Workstep.Name,
-                        rr.Workplace,
-                        rr.UserName,
-                        rr.Result == 0 ? "OK" : "NOK",
-                        rr.Workstep.ReferencePart.Name,
-                        rr.Code,
-                        rr.Process.Name,
-                    }));
-            }
-        }
-    }
-}

Results/Forms/TracingResultsDlg.resx

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

Results/Forms/WaterMeterEventArgs.cs

@@ -1,14 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-
-namespace Results.Forms
-{
-    public class WaterMeterEventArgs : EventArgs
-    {
-        public int WMPosition;
-
-        public WaterMeterEventArgs(int wmPosition) { WMPosition = wmPosition; }
-    }
-}

Results/ItemID.cs

@@ -91,85 +91,85 @@ namespace Results
         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
+		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
+		/// iPerl
         OrigCalibFactor,            	/// 104
-        CalibFactor,	                /// 105
-        Q2ErrWOCorrection,              /// 106
-        Q2CorrectionDone,               /// 107
+		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
+		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
+		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
+		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
+		Table_row_nr,					/// 151
+		Table_column_nr,				/// 152
+		WMRemark,                       /// 153
 
         User_description,               /// 154
         Legalizator,                    /// 155
@@ -181,7 +181,7 @@ namespace Results
         Diverter_start_time,            /// 159
         Diverter_end_time,              /// 160
         Q_sensitivity,                  /// 161
-
+                                    
         Q_ref_min,                      /// 162
         Q_ref_max,                      /// 163
         Q_ref_start,                    /// 164
@@ -210,7 +210,7 @@ namespace Results
         Rho_Wa_calc,                    /// 183
 
         Formatted_WM_ID,                /// 184, Formated WM ID string:
-        ///      {0}=start DateTime {1}-end DateTime, {2}=batch nr., {3}=wm pos.(1..max), {4}=s/n string
+                                        ///      {0}=start DateTime {1}-end DateTime, {2}=batch nr., {3}=wm pos.(1..max), {4}=s/n string
         E21,							/// 185
 
         T_line_mean,					/// 186
@@ -262,7 +262,7 @@ namespace Results
         Bench_address5,                 /// 227  'Address 5' from IBenchInfo
 
         Max_test_index,                 /// 228  MaxPruefindex % 100
-        VolumeCTV,						/// 229
+		VolumeCTV,						/// 229
 
         /// iPerl
         LastError,                      /// 230  For iPerl previous test result (test with Proefindex-1)
@@ -270,54 +270,7 @@ namespace Results
         CalibFactorLNA,	                /// 232
 
         WM_remark,                      /// 233
-
-        /// iPerl special
-        Prod_AssignedSerialNr,          /// 234
-        Prod_CompleteSerialNr,          /// 235
-        Prod_RadioAddress,              /// 236
-        Prod_PaletteNr,                 /// 237
-        Prod_UmkartonNr,                /// 238
-        Prod_TestBench,                 /// 239
-        Prod_WMPosition,                /// 240
-        Prod_UserName,                  /// 241
-        Prod_PurchaseOrder,             /// 242
-        Prod_Passed,                    /// 243
-        Prod_ResultCode,                /// 244
-        Prod_Q2CorrRL,	                /// 245
-        Prod_Q2CorrLR,                  /// 246
-
-        TestPartStr,                    /// 247
-
-        Error_heat_mtr_vol,             /// 248
-        Energy_start,                   /// 249
-        Energy_end,                     /// 250
-
-        OraWMTypeID,                    /// 251
-        OraWMTypeRev,                   /// 252
-
-        E25,							/// 253
-        E26,							/// 254
-        E27,							/// 255
-        E28,							/// 256
-
-        RefFlowmeter,                   /// 257
-        Test_Method_Elde,               /// 258
-
-        Counter1,                       /// 259  counterIdx0 = 0
-        Counter2,                       /// 260  counterIdx0 = 1
-        Counter3,                       /// 261  counterIdx0 = 2
-        Counter4,                       /// 262  counterIdx0 = 3
-        Counter5,                       /// 263  counterIdx0 = 4
-        Counter6,                       /// 264  counterIdx0 = 5
-        Counter7,                       /// 265  counterIdx0 = 6
-        Counter8,                       /// 266  counterIdx0 = 7
-        Counter9,                       /// 267  counterIdx0 = 8
-        Counter10,                      /// 268  counterIdx0 = 9
-
-        ConstMasterCorr,                /// 269
-        TimeBtwnMassMsrmnts,            /// 270
-        TestTimeCorrection,             /// 271
-
+                                        
         Count,
     }
 }

Results/Mappings/WaterMeterDataMap.cs

@@ -54,6 +54,7 @@ namespace Results.Mappings
 #endif
 #if ORACLE_DB
 			Map(x => x.WMTypeId);
+			Map(x => x.WMTypeRev);
 #endif
         }
 	}

Results/Mappings/WaterMeterMap.cs

@@ -28,34 +28,22 @@ namespace Results.Mappings
 				.CustomType("StringClob")
 				.CustomSqlType("varchar(2000)");
 #if IPERL
+			Map(x => x.SerialNrEx);
 			Map(x => x.OrigCalibFactor);
 			Map(x => x.CalibFactor);
             Map(x => x.OrigCalibFactorLNA);
             Map(x => x.CalibFactorLNA);
             Map(x => x.Q2ErrWOCorrection);
-            Map(x => x.Q2CorrRL);
-            Map(x => x.Q2CorrLR);
+			Map(x => x.Q2CorrectionDone);
+			Map(x => x.Q2Correction);
+            Map(x => x.Q2CorrRL).Column("Q2CorrRFlow");
+            Map(x => x.Q2CorrLR).Column("Q2CorrLFlow");
             Map(x => x.Q2CorrFlowRight);
 			Map(x => x.Diff2Hz8Hz);
 			Map(x => x.Hz2CorrectionDone);
 			Map(x => x.Hz2Correction);
 			Map(x => x.FWVersion);
 #endif
-#if TURA_SPECIAL
-            Map(x => x.AssignedSerialNr);
-            Map(x => x.CompleteSerialNr);
-            Map(x => x.RadioAddress);
-            Map(x => x.PaletteNr);
-            Map(x => x.UmkartonNr);
-            Map(x => x.ProdTestBench);
-            Map(x => x.ProdWMPosition);
-            Map(x => x.ProdUserName);
-            Map(x => x.ProdPurchaseOrder);
-            Map(x => x.ProdPassed);
-            Map(x => x.ProdResultCode);
-            Map(x => x.ProdQ2CorrRL);
-            Map(x => x.ProdQ2CorrLR);
-#endif
 #if ORACLE_DB
             Map(x => x.Pruefindex);
             Map(x => x.HydrPruefung);

Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs

@@ -152,12 +152,6 @@ namespace Results.Output.Printers.OnePerMeter
                 }
             }
 
-            if ((cfg.GraphHgh != 0) && (cfg.GraphWid != 0))
-            {
-                Rectangle pos = new Rectangle(cfg.GraphLeft, cfg.GraphTop, cfg.GraphWid, cfg.GraphHgh);
-                WMChart.GetChart(wm, true).Printing.PrintPaint(e.Graphics, pos);
-            }
-
             float tableTop = cfg.TopMargin;
 
             if (pageNr == 1)

Results/Output/Printers/OnePerMeter/OnePerMeterPrinterCfg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2017-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2017 Sensus Slovensko a.s.
 ///
 
 namespace Results.Output.Printers.OnePerMeter
@@ -45,14 +45,10 @@ namespace Results.Output.Printers.OnePerMeter
         public string[] BelowItems3;
         public string Footer;
         public bool TestsAreRows;
-        public int GraphLeft;
-        public int GraphTop;
-        public int GraphWid;
-        public int GraphHgh;
+        public string ImgFullPathName;
         public int ImgLeft;
         public int ImgTop;
         public int ImgWid;
         public int ImgHgh;
-        public string ImgFullPathName;
     }
 }

Results/Output/Printers/Table.cs

@@ -7,7 +7,7 @@ using System.Drawing;
 using System.Drawing.Printing;
 using Config.Entities;
 
-namespace Results.Output
+namespace Results.Output.Printers
 {
     public enum TableLines
     {
@@ -94,7 +94,7 @@ namespace Results.Output
                     else
                     {
                         bool isHeader = (colIx < Style.LeftHeadersCount) || (rowIx < Style.TopHeadersCount);
-                        SizeF size = Printers.PrintersCommon.Measure(e, Rows[rowIx][colIx], isHeader ? Style.HeaderFont : Style.Font);
+                        SizeF size = PrintersCommon.Measure(e, Rows[rowIx][colIx], isHeader ? Style.HeaderFont : Style.Font);
                         if (size.Width > columnWidth[colIx]) columnWidth[colIx] = size.Width;
                         if (size.Height > rowHeight[rowIx]) rowHeight[rowIx] = size.Height;
                     }
@@ -157,7 +157,7 @@ namespace Results.Output
                     {
                         /// In not a separator line
                         bool isHeader = (colIx < Style.LeftHeadersCount) || (rowIx < Style.TopHeadersCount);
-                        SizeF size = Printers.PrintersCommon.Measure(e, Rows[rowIx][colIx], isHeader ? Style.HeaderFont : Style.Font);
+                        SizeF size = PrintersCommon.Measure(e, Rows[rowIx][colIx], isHeader ? Style.HeaderFont : Style.Font);
                         if ((Style.ColumnWidths != null) && (Style.ColumnWidths.Length > colIx))
                         {
                             size.Width = Style.ColumnWidths[colIx]; /// Override measurement if column width is defined
@@ -244,14 +244,14 @@ namespace Results.Output
                     for (int colIndex = 0; colIndex < tblColumnsCount; colIndex++)
                     {
                         bool isHeader = (colIndex < Style.LeftHeadersCount) || (rowIndex < Style.TopHeadersCount);
-                        Printers.PrintersCommon.PrintAt(e, oneTableRow[colIndex],
-                                                           isHeader ? Style.HeaderFont : Style.Font,
-                                                           columnPos[colIndex],
-                                                           rowPos[rowIndex],
-                                                           columnWidth[colIndex],
-                                                           rowHeight[rowIndex],
-                                                           horizAlignment[colIndex],
-                                                           vertAlignment[colIndex]);
+                        PrintersCommon.PrintAt(e, oneTableRow[colIndex],
+                                                  isHeader ? Style.HeaderFont : Style.Font,
+                                                  columnPos[colIndex],
+                                                  rowPos[rowIndex],
+                                                  columnWidth[colIndex],
+                                                  rowHeight[rowIndex],
+                                                  horizAlignment[colIndex],
+                                                  vertAlignment[colIndex]);
                     }
                 }
             }

Results/Output/WMChart.cs

@@ -1,151 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Windows.Forms.DataVisualization.Charting;
-using Config.Entities;
-using Results.Entities;
-using Results.Resources;
-
-namespace Results.Output
-{
-    public class WMChart
-    {
-        public static Chart GetChart(WaterMeter wm, bool isPrinter)
-        {
-			return GetChart(wm, isPrinter, Config.Unit.lph);
-        }
-
-		public static Chart GetChart(WaterMeter wm, bool isPrinter, Config.Unit flowUnit)
-        {
-            double maxFlow_m3h = 0;
-            IList<PointF> unsortedPoints = new List<PointF>();
-            foreach (var mtr in wm.MeterTestRslts)
-            {
-                if (mtr.IsPilotRslt() && mtr.TestRslt.TestData.Evaluate && (mtr.TestRslt.TestTime > 0) && (mtr.TestRslt.PulsesMaster > 0))
-                {
-                    double flow_m3h = (mtr.TestTime != 0)
-                                ? (3.6 * mtr.TestRslt.VolumeCTV / mtr.TestTime * mtr.PulsesMaster / mtr.TestRslt.PulsesMaster)
-                                : (3.6 * mtr.TestRslt.VolumeCTV / mtr.TestRslt.TestTime);
-
-                    if (flow_m3h > maxFlow_m3h) maxFlow_m3h = flow_m3h;
-
-                    double flow = Config.Units.ConvertTo(flowUnit, flow_m3h);      /// Convert to specified units
-
-                    if (flow > 0)
-                    {
-                        unsortedPoints.Add(new PointF((float)flow, (float)mtr.Error));
-                    }
-                }
-            }
-            IEnumerable<PointF> sortedPoints = unsortedPoints.OrderBy(x => x.X);
-
-            bool isQ4 = (maxFlow_m3h > 1.1 * wm.WaterMeterData.Q3_Qn);
-
-            Chart chart = new Chart
-            {
-                Name = "chart",
-                Text = "chart",
-                Dock = System.Windows.Forms.DockStyle.Fill,
-                TabIndex = 0,
-                Size = new System.Drawing.Size(5, 5),
-                Location = new System.Drawing.Point(3, 3),
-            };
-
-            ChartArea chArea = new ChartArea { Name = "ChartArea1" };
-            chArea.AxisX.Title = Strings.Flow;
-            chArea.AxisX.IsLogarithmic = true;
-            chArea.AxisX.LogarithmBase = 10;
-            chArea.AxisX.IsLabelAutoFit = true;
-
-            List<double> xs = new List<double>() { 0.0001, 0.0002, 0.0005,
-                                                   0.001, 0.002, 0.005,
-                                                   0.01, 0.02, 0.05,
-                                                   0.1, 0.2, 0.5,
-                                                   1, 2, 5,
-                                                   10, 20, 50,
-                                                   100, 200, 500,
-                                                   1000, 2000, 5000,
-                                                   10000, 20000, 50000,
-                                                   100000, 200000, 500000,
-                                                   1000000, 2000000, 5000000,
-                                                   10000000 };
-            double spacer = 0.8;
-            double from = Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q1_Qmin);
-            double to = Config.Units.ConvertTo(flowUnit, isQ4 ? wm.WaterMeterData.Q4_Qmax : wm.WaterMeterData.Q3_Qn);
-            bool inRange = false;
-            for (int i = 0; i < xs.Count - 3; i += 3)
-            {
-                if (xs[i] <= from && from < xs[i + 3])
-                {
-                    chArea.AxisX.Minimum = xs[i];
-                    inRange = true;
-                }
-
-                if (inRange)
-                {
-                    for (int j = i; j < i + 3; j++)
-                    {
-                        CustomLabel cl = new CustomLabel();
-                        cl.Text = string.Format("{0} {1}", xs[j], flowUnit.ToDescription());
-                        cl.FromPosition = Math.Log10(xs[j] * spacer);
-                        cl.ToPosition = Math.Log10(xs[j] / spacer);
-                        chArea.AxisX.CustomLabels.Add(cl);
-                    }
-                }
-
-                if (xs[i] < to && to <= xs[i + 3])
-                {
-                    chArea.AxisX.Maximum = xs[i + 3];
-
-                    CustomLabel cl = new CustomLabel();
-                    cl.Text = string.Format("{0} {1}", xs[i + 3], flowUnit.ToDescription());
-                    cl.FromPosition = Math.Log10(xs[i + 3] * spacer);
-                    cl.ToPosition = Math.Log10(xs[i + 3] / spacer);
-                    chArea.AxisX.CustomLabels.Add(cl);
-
-                    break;
-                }
-            }
-
-            chArea.AxisY.Title = Strings.Relative_error;
-            chArea.AxisY.Interval = 3;
-            chArea.AxisY.LabelStyle.Format = "{#} %";
-
-            Legend legend1 = new Legend { Name = "Legend1" };
-
-            Series upperLimit = new Series { Name = Strings.Upper_limit, ChartArea = "ChartArea1", ChartType = SeriesChartType.Line, Color = Color.Red };
-            upperLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q1_Qmin), 5);
-            upperLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), 5);
-            upperLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), 2);
-            upperLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q3_Qn), 2);
-            if (isQ4) upperLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q4_Qmax), 2);
-
-            Series lowerLimit = new Series { Name = Strings.Lower_limit, ChartArea = "ChartArea1", ChartType = SeriesChartType.Line, Color = Color.Red };
-            lowerLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q1_Qmin), -5);
-            lowerLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), -5);
-            lowerLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), -2);
-            lowerLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q3_Qn), -2);
-            if (isQ4) lowerLimit.Points.AddXY(Config.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q4_Qmax), -2);
-
-            Series line = new Series { Name = Strings.Relative_error, ChartArea = "ChartArea1", ChartType = SeriesChartType.Line, Color = Color.DeepSkyBlue };
-            Series dots = new Series { Name = Strings.Relative_error + " ", ChartArea = "ChartArea1", ChartType = SeriesChartType.Point, Color = Color.RoyalBlue };
-			dots.MarkerStyle = MarkerStyle.Circle;
-			if (isPrinter) dots.MarkerSize = 1;
-			foreach (var point in sortedPoints)
-            {
-                line.Points.AddXY(point.X, point.Y);
-                dots.Points.AddXY(point.X, point.Y);
-            }
-
-            chart.ChartAreas.Add(chArea);
-            chart.Legends.Add(legend1);
-            chart.Series.Add(upperLimit);
-            chart.Series.Add(lowerLimit);
-            chart.Series.Add(dots);
-            chart.Series.Add(line);
-            
-            return chart;
-        }
-    }
-}

Results/Properties/AssemblyInfo.cs

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

Results/Resources/Strings.Designer.cs

@@ -87,15 +87,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to All results.
-        /// </summary>
-        internal static string All_results {
-            get {
-                return ResourceManager.GetString("All_results", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Approval.
         /// </summary>
@@ -195,15 +186,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Code.
-        /// </summary>
-        internal static string Code {
-            get {
-                return ResourceManager.GetString("Code", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Compound.
         /// </summary>
@@ -222,24 +204,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Counter {0}.
-        /// </summary>
-        internal static string Counter_0 {
-            get {
-                return ResourceManager.GetString("Counter_0", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Date and time.
-        /// </summary>
-        internal static string Date_and_time {
-            get {
-                return ResourceManager.GetString("Date_and_time", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Density.
         /// </summary>
@@ -420,15 +384,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to NOK.
-        /// </summary>
-        internal static string Failed {
-            get {
-                return ResourceManager.GetString("Failed", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Failed meters count.
         /// </summary>
@@ -474,15 +429,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Graphs.
-        /// </summary>
-        internal static string Graphs {
-            get {
-                return ResourceManager.GetString("Graphs", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to H amb.
         /// </summary>
@@ -501,15 +447,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid Q2 correction factors.
-        /// </summary>
-        internal static string Invalid_Q2_correction_factors {
-            get {
-                return ResourceManager.GetString("Invalid_Q2_correction_factors", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Item.
         /// </summary>
@@ -528,15 +465,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Lower limit.
-        /// </summary>
-        internal static string Lower_limit {
-            get {
-                return ResourceManager.GetString("Lower_limit", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to main.
         /// </summary>
@@ -573,15 +501,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Name.
-        /// </summary>
-        internal static string Name {
-            get {
-                return ResourceManager.GetString("Name", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to No.
         /// </summary>
@@ -591,15 +510,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to No water meter.
-        /// </summary>
-        internal static string No_water_meter {
-            get {
-                return ResourceManager.GetString("No_water_meter", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to OK.
         /// </summary>
@@ -717,24 +627,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Part.
-        /// </summary>
-        internal static string Part {
-            get {
-                return ResourceManager.GetString("Part", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to OK.
-        /// </summary>
-        internal static string Passed {
-            get {
-                return ResourceManager.GetString("Passed", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Passed meters count.
         /// </summary>
@@ -771,15 +663,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Previous step is missing or NOK.
-        /// </summary>
-        internal static string Previous_step_is_missing_or_NOK {
-            get {
-                return ResourceManager.GetString("Previous_step_is_missing_or_NOK", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Procedure.
         /// </summary>
@@ -807,15 +690,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Production tracing results.
-        /// </summary>
-        internal static string Production_tracing_results {
-            get {
-                return ResourceManager.GetString("Production_tracing_results", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Protocol.
         /// </summary>
@@ -897,15 +771,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Relative error.
-        /// </summary>
-        internal static string Relative_error {
-            get {
-                return ResourceManager.GetString("Relative_error", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Remark.
         /// </summary>
@@ -933,15 +798,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to repetition.
-        /// </summary>
-        internal static string repetition {
-            get {
-                return ResourceManager.GetString("repetition", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Result.
         /// </summary>
@@ -996,15 +852,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Serial number is missing.
-        /// </summary>
-        internal static string Serial_number_is_missing {
-            get {
-                return ResourceManager.GetString("Serial_number_is_missing", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Single.
         /// </summary>
@@ -1086,15 +933,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Step.
-        /// </summary>
-        internal static string Step {
-            get {
-                return ResourceManager.GetString("Step", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to T amb.
         /// </summary>
@@ -1185,15 +1023,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Test in progress.
-        /// </summary>
-        internal static string Test_in_progress {
-            get {
-                return ResourceManager.GetString("Test_in_progress", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Test method.
         /// </summary>
@@ -1212,15 +1041,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Test repetition count exceeded upper limit.
-        /// </summary>
-        internal static string Test_repetition_count_exceeded_upper_limit {
-            get {
-                return ResourceManager.GetString("Test_repetition_count_exceeded_upper_limit", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Test vol..
         /// </summary>
@@ -1230,15 +1050,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to This position is disabled.
-        /// </summary>
-        internal static string This_position_is_disabled {
-            get {
-                return ResourceManager.GetString("This_position_is_disabled", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to to.
         /// </summary>
@@ -1914,15 +1725,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Upper limit.
-        /// </summary>
-        internal static string Upper_limit {
-            get {
-                return ResourceManager.GetString("Upper_limit", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to User.
         /// </summary>
@@ -2085,15 +1887,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Water meter results.
-        /// </summary>
-        internal static string Water_meter_results {
-            get {
-                return ResourceManager.GetString("Water_meter_results", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Width.
         /// </summary>
@@ -2121,33 +1914,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Workflow.
-        /// </summary>
-        internal static string Workflow {
-            get {
-                return ResourceManager.GetString("Workflow", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Workplace.
-        /// </summary>
-        internal static string Workplace {
-            get {
-                return ResourceManager.GetString("Workplace", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Wrong iPerl counting direction.
-        /// </summary>
-        internal static string Wrong_iPerl_counting_direction {
-            get {
-                return ResourceManager.GetString("Wrong_iPerl_counting_direction", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Year.
         /// </summary>

Results/Resources/Strings.cs.resx

@@ -255,85 +255,4 @@
   <data name="Batch" xml:space="preserve">
     <value>Dávka</value>
   </data>
-  <data name="repetition" xml:space="preserve">
-    <value>opakování</value>
-  </data>
-  <data name="Invalid_Q2_correction_factors" xml:space="preserve">
-    <value>Nesprávne Q2 korekčné faktory</value>
-  </data>
-  <data name="Previous_step_is_missing_or_NOK" xml:space="preserve">
-    <value>Predchádzajúci krok chýba alebo neprešiel</value>
-  </data>
-  <data name="Test_repetition_count_exceeded_upper_limit" xml:space="preserve">
-    <value>Počet opakovaní testu prekročil dovolené maximum</value>
-  </data>
-  <data name="Wrong_iPerl_counting_direction" xml:space="preserve">
-    <value>Nesprávny smer počítania iPerlu</value>
-  </data>
-  <data name="Failed" xml:space="preserve">
-    <value>NOK</value>
-  </data>
-  <data name="Passed" xml:space="preserve">
-    <value>OK</value>
-  </data>
-  <data name="Test_in_progress" xml:space="preserve">
-    <value>Probíhá test</value>
-  </data>
-  <data name="Date_and_time" xml:space="preserve">
-    <value>Datum a čas</value>
-  </data>
-  <data name="Name" xml:space="preserve">
-    <value>Jméno</value>
-  </data>
-  <data name="Step" xml:space="preserve">
-    <value>Krok</value>
-  </data>
-  <data name="Workplace" xml:space="preserve">
-    <value>Pracovisko</value>
-  </data>
-  <data name="Workflow" xml:space="preserve">
-    <value>Pracovný postup</value>
-  </data>
-  <data name="Production_tracing_results" xml:space="preserve">
-    <value>Výsledky sledování výroby</value>
-  </data>
-  <data name="Code" xml:space="preserve">
-    <value>Kód</value>
-  </data>
-  <data name="Part" xml:space="preserve">
-    <value>Součástka</value>
-  </data>
-  <data name="All_results" xml:space="preserve">
-    <value>Všechny výsledky</value>
-  </data>
-  <data name="Graphs" xml:space="preserve">
-    <value>Grafy</value>
-  </data>
-  <data name="No_water_meter" xml:space="preserve">
-    <value>Žádný vodoměr</value>
-  </data>
-  <data name="Serial_number_is_missing" xml:space="preserve">
-    <value>Chybí sériové číslo</value>
-  </data>
-  <data name="Error" xml:space="preserve">
-    <value>Chyba</value>
-  </data>
-  <data name="Lower_limit" xml:space="preserve">
-    <value>Dolní hranice</value>
-  </data>
-  <data name="Upper_limit" xml:space="preserve">
-    <value>Horní hranice</value>
-  </data>
-  <data name="Water_meter_results" xml:space="preserve">
-    <value>Výsledky vodoměru</value>
-  </data>
-  <data name="Relative_error" xml:space="preserve">
-    <value>Relativní chyba</value>
-  </data>
-  <data name="Flow" xml:space="preserve">
-    <value>Průtok</value>
-  </data>
-  <data name="This_position_is_disabled" xml:space="preserve">
-    <value>Taro pozice je vypnuta</value>
-  </data>
 </root>

Results/Resources/Strings.fr.resx

@@ -1,807 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Add" xml:space="preserve">
-    <value>Ajouter &gt;</value>
-  </data>
-  <data name="Alignment" xml:space="preserve">
-    <value>Alignement</value>
-  </data>
-  <data name="Approval" xml:space="preserve">
-    <value>Approbation</value>
-  </data>
-  <data name="Available_results" xml:space="preserve">
-    <value>Résultats disponibles</value>
-  </data>
-  <data name="Batch_nr" xml:space="preserve">
-    <value>Numéro de lot</value>
-  </data>
-  <data name="Bench" xml:space="preserve">
-    <value>Banc</value>
-  </data>
-  <data name="CancelBtnText" xml:space="preserve">
-    <value>Annuler</value>
-  </data>
-  <data name="Caption" xml:space="preserve">
-    <value>Légende</value>
-  </data>
-  <data name="Configuration" xml:space="preserve">
-    <value>Configuration</value>
-  </data>
-  <data name="Density" xml:space="preserve">
-    <value>Densité</value>
-  </data>
-  <data name="DownBtnText" xml:space="preserve">
-    <value>Vers le bas</value>
-  </data>
-  <data name="End" xml:space="preserve">
-    <value>Fin</value>
-  </data>
-  <data name="EndState_aux" xml:space="preserve">
-    <value>État final aux</value>
-  </data>
-  <data name="EndState_main" xml:space="preserve">
-    <value>État final principal</value>
-  </data>
-  <data name="End_state" xml:space="preserve">
-    <value>État final</value>
-  </data>
-  <data name="ErrLimHi" xml:space="preserve">
-    <value>Err LimHi</value>
-  </data>
-  <data name="ErrLimLo" xml:space="preserve">
-    <value>Err LimLo</value>
-  </data>
-  <data name="Error" xml:space="preserve">
-    <value>Erreur</value>
-  </data>
-  <data name="ErrRef" xml:space="preserve">
-    <value>Err Ref</value>
-  </data>
-  <data name="Err_aux" xml:space="preserve">
-    <value>Err aux</value>
-  </data>
-  <data name="Err_main" xml:space="preserve">
-    <value>Err principale</value>
-  </data>
-  <data name="Flow" xml:space="preserve">
-    <value>Couler</value>
-  </data>
-  <data name="Format" xml:space="preserve">
-    <value>Format</value>
-  </data>
-  <data name="H_amb" xml:space="preserve">
-    <value>Hamb</value>
-  </data>
-  <data name="Item" xml:space="preserve">
-    <value>Article</value>
-  </data>
-  <data name="MClass" xml:space="preserve">
-    <value>MClass</value>
-  </data>
-  <data name="OkBtnText" xml:space="preserve">
-    <value>Oui</value>
-  </data>
-  <data name="PO" xml:space="preserve">
-    <value>Commande</value>
-  </data>
-  <data name="Pos" xml:space="preserve">
-    <value>Pos.</value>
-  </data>
-  <data name="Precision" xml:space="preserve">
-    <value>Précision</value>
-  </data>
-  <data name="Procedure" xml:space="preserve">
-    <value>Procédure</value>
-  </data>
-  <data name="Producer" xml:space="preserve">
-    <value>Producteur</value>
-  </data>
-  <data name="Protocol" xml:space="preserve">
-    <value>Protocole</value>
-  </data>
-  <data name="Pulses" xml:space="preserve">
-    <value>Impulsion</value>
-  </data>
-  <data name="PulsesLiter" xml:space="preserve">
-    <value>Impulsion/litre</value>
-  </data>
-  <data name="P_amb" xml:space="preserve">
-    <value>P amb</value>
-  </data>
-  <data name="P_dn_end" xml:space="preserve">
-    <value>P dn fin</value>
-  </data>
-  <data name="P_dn" xml:space="preserve">
-    <value>P dn</value>
-  </data>
-  <data name="P_dn_start" xml:space="preserve">
-    <value>P dn début</value>
-  </data>
-  <data name="P_up_end" xml:space="preserve">
-    <value>P up fin</value>
-  </data>
-  <data name="P_up" xml:space="preserve">
-    <value>P up</value>
-  </data>
-  <data name="P_up_start" xml:space="preserve">
-    <value>P up début</value>
-  </data>
-  <data name="Q_fall" xml:space="preserve">
-    <value>Q tomber</value>
-  </data>
-  <data name="Q_from" xml:space="preserve">
-    <value>Q de</value>
-  </data>
-  <data name="Q_rise" xml:space="preserve">
-    <value>Q monter</value>
-  </data>
-  <data name="Q_to" xml:space="preserve">
-    <value>Q à</value>
-  </data>
-  <data name="RefPulses" xml:space="preserve">
-    <value>Ref Puls</value>
-  </data>
-  <data name="Remove" xml:space="preserve">
-    <value>&lt; Retirer</value>
-  </data>
-  <data name="Remove_all" xml:space="preserve">
-    <value>Enlever tout</value>
-  </data>
-  <data name="Result" xml:space="preserve">
-    <value>Résultat</value>
-  </data>
-  <data name="Selected_results" xml:space="preserve">
-    <value>Résultats sélectionnés</value>
-  </data>
-  <data name="sn" xml:space="preserve">
-    <value>s/n</value>
-  </data>
-  <data name="sn_aux" xml:space="preserve">
-    <value>s/n aux</value>
-  </data>
-  <data name="sn_main" xml:space="preserve">
-    <value>s/n principale</value>
-  </data>
-  <data name="Start" xml:space="preserve">
-    <value>Début</value>
-  </data>
-  <data name="Test" xml:space="preserve">
-    <value>Test</value>
-  </data>
-  <data name="Test_ID" xml:space="preserve">
-    <value>Test ID</value>
-  </data>
-  <data name="Test_method" xml:space="preserve">
-    <value>Méthode d'essai</value>
-  </data>
-  <data name="Test_vol" xml:space="preserve">
-    <value>Test vol</value>
-  </data>
-  <data name="T_amb" xml:space="preserve">
-    <value>T amb</value>
-  </data>
-  <data name="T_div" xml:space="preserve">
-    <value>T div</value>
-  </data>
-  <data name="T_end" xml:space="preserve">
-    <value>T fin</value>
-  </data>
-  <data name="T_in" xml:space="preserve">
-    <value>T dans</value>
-  </data>
-  <data name="T_out" xml:space="preserve">
-    <value>T en dehors</value>
-  </data>
-  <data name="T_s" xml:space="preserve">
-    <value>T [s]</value>
-  </data>
-  <data name="T_start" xml:space="preserve">
-    <value>T début</value>
-  </data>
-  <data name="Uncertainty" xml:space="preserve">
-    <value>Incertitude</value>
-  </data>
-  <data name="Units" xml:space="preserve">
-    <value>Unités</value>
-  </data>
-  <data name="UpBtnText" xml:space="preserve">
-    <value>En haut</value>
-  </data>
-  <data name="User" xml:space="preserve">
-    <value>Utilisateur</value>
-  </data>
-  <data name="User_nr" xml:space="preserve">
-    <value>N° Utilisateur</value>
-  </data>
-  <data name="Ver" xml:space="preserve">
-    <value>Ver.</value>
-  </data>
-  <data name="VolRef" xml:space="preserve">
-    <value>Vol ref.</value>
-  </data>
-  <data name="Volume" xml:space="preserve">
-    <value>Le volume</value>
-  </data>
-  <data name="Width" xml:space="preserve">
-    <value>Largeur</value>
-  </data>
-  <data name="WMs" xml:space="preserve">
-    <value>CEs</value>
-  </data>
-  <data name="WM_Type" xml:space="preserve">
-    <value>CE Type</value>
-  </data>
-  <data name="Year" xml:space="preserve">
-    <value>Année</value>
-  </data>
-  <data name="Results" xml:space="preserve">
-    <value>Résultats</value>
-  </data>
-  <data name="Remark" xml:space="preserve">
-    <value>Remarque</value>
-  </data>
-  <data name="Result_code" xml:space="preserve">
-    <value>Code de résultat</value>
-  </data>
-  <data name="Mounting" xml:space="preserve">
-    <value>Montage</value>
-  </data>
-  <data name="Energy" xml:space="preserve">
-    <value>Énergie</value>
-  </data>
-  <data name="Energy_ref" xml:space="preserve">
-    <value>Énergie ref</value>
-  </data>
-  <data name="P_delta" xml:space="preserve">
-    <value>P delta</value>
-  </data>
-  <data name="P_delta_end" xml:space="preserve">
-    <value>P delta fin</value>
-  </data>
-  <data name="P_delta_mean" xml:space="preserve">
-    <value>P delta moyenne</value>
-  </data>
-  <data name="P_delta_start" xml:space="preserve">
-    <value>P delta début</value>
-  </data>
-  <data name="Meter_type" xml:space="preserve">
-    <value>Type de compteur</value>
-  </data>
-  <data name="Compound" xml:space="preserve">
-    <value>Composé</value>
-  </data>
-  <data name="Heat_meter" xml:space="preserve">
-    <value>Thermomètre</value>
-  </data>
-  <data name="Single" xml:space="preserve">
-    <value>Unique</value>
-  </data>
-  <data name="Page" xml:space="preserve">
-    <value>Page</value>
-  </data>
-  <data name="End_volume" xml:space="preserve">
-    <value>Volume fin</value>
-  </data>
-  <data name="Start_volume" xml:space="preserve">
-    <value>Volume début</value>
-  </data>
-  <data name="End_volume_aux" xml:space="preserve">
-    <value>Fin volume aux</value>
-  </data>
-  <data name="End_volume_main" xml:space="preserve">
-    <value>Fin volume principale</value>
-  </data>
-  <data name="Start_volume_aux" xml:space="preserve">
-    <value>Début volume aux</value>
-  </data>
-  <data name="Start_volume_main" xml:space="preserve">
-    <value>Début volume principale</value>
-  </data>
-  <data name="Volume_aux" xml:space="preserve">
-    <value>Volume aux</value>
-  </data>
-  <data name="Volume_main" xml:space="preserve">
-    <value>Volume principale</value>
-  </data>
-  <data name="End_mass" xml:space="preserve">
-    <value>Fin masse</value>
-  </data>
-  <data name="Start_mass" xml:space="preserve">
-    <value>Début masse</value>
-  </data>
-  <data name="Category" xml:space="preserve">
-    <value>Catégorie</value>
-  </data>
-  <data name="Quantity" xml:space="preserve">
-    <value>Quantité</value>
-  </data>
-  <data name="Water_Meter" xml:space="preserve">
-    <value>Compteur d'eau</value>
-  </data>
-  <data name="VName_Flow" xml:space="preserve">
-    <value>Q</value>
-  </data>
-  <data name="VName_Press" xml:space="preserve">
-    <value>Press.</value>
-  </data>
-  <data name="VName_Temp" xml:space="preserve">
-    <value>Temp.</value>
-  </data>
-  <data name="VName_Dens" xml:space="preserve">
-    <value>Ro</value>
-  </data>
-  <data name="VName_Humi" xml:space="preserve">
-    <value>Hu.</value>
-  </data>
-  <data name="VName_Mass" xml:space="preserve">
-    <value>Masse</value>
-  </data>
-  <data name="VName_TstTime" xml:space="preserve">
-    <value>Tau</value>
-  </data>
-  <data name="VName_Vol" xml:space="preserve">
-    <value>Vol.</value>
-  </data>
-  <data name="Tooltip_P_de_ac" xml:space="preserve">
-    <value>Différence de pression mesurée par delta P mètre - réelle</value>
-  </data>
-  <data name="Tooltip_P_de_avg" xml:space="preserve">
-    <value>Différence de pression mesurée par delta P mètre - moyenne</value>
-  </data>
-  <data name="Tooltip_P_de_en" xml:space="preserve">
-    <value>Différence de pression mesurée par delta P mètre - à la fin de l'essai</value>
-  </data>
-  <data name="Tooltip_P_de_me" xml:space="preserve">
-    <value>Différence de pression mesurée par delta P mètre - moyenne</value>
-  </data>
-  <data name="Tooltip_P_de_st" xml:space="preserve">
-    <value>Différence de pression mesurée par delta P mètre - au début de l'essai</value>
-  </data>
-  <data name="Tooltip_P_dw_ac" xml:space="preserve">
-    <value>Pression à la sortie réelle</value>
-  </data>
-  <data name="Tooltip_P_dw_avg" xml:space="preserve">
-    <value>Pression moyenne à la sortie</value>
-  </data>
-  <data name="Tooltip_P_dw_en" xml:space="preserve">
-    <value>Pression à la sortie à la fin du test</value>
-  </data>
-  <data name="Tooltip_P_dw_me" xml:space="preserve">
-    <value>Pression moyenne à la sortie</value>
-  </data>
-  <data name="Tooltip_P_dw_st" xml:space="preserve">
-    <value>Pression à la sortie au début du test</value>
-  </data>
-  <data name="Tooltip_P_up_ac" xml:space="preserve">
-    <value>Pression à l'entrée réelle</value>
-  </data>
-  <data name="Tooltip_P_up_avg" xml:space="preserve">
-    <value>Pression moyenne à l'entrée</value>
-  </data>
-  <data name="Tooltip_P_up_en" xml:space="preserve">
-    <value>Pression à l'entrée à la fin de l'essai</value>
-  </data>
-  <data name="Tooltip_P_up_me" xml:space="preserve">
-    <value>Pression moyenne à l'entrée</value>
-  </data>
-  <data name="Tooltip_P_up_st" xml:space="preserve">
-    <value>Pression à l'entrée au début de l'essai</value>
-  </data>
-  <data name="Tooltip_Q_m_r" xml:space="preserve">
-    <value>Débit calculé à partir de la masse vraie et du temps conventionnels</value>
-  </data>
-  <data name="Tooltip_Q_riac" xml:space="preserve">
-    <value>Débit obtenu à partir du compteur principal - réel</value>
-  </data>
-  <data name="Tooltip_Q_rim" xml:space="preserve">
-    <value>Débit obtenu à partir du compteur principal - moyenne</value>
-  </data>
-  <data name="Tooltip_Q_v_r" xml:space="preserve">
-    <value>Débit mesuré par le débitmètre de référence</value>
-  </data>
-  <data name="Tooltip_T_di_ac" xml:space="preserve">
-    <value>Température réelle au déviateur</value>
-  </data>
-  <data name="Tooltip_T_di_avg" xml:space="preserve">
-    <value>Température moyenne au déviateur</value>
-  </data>
-  <data name="Tooltip_T_di_en" xml:space="preserve">
-    <value>Température au déviateur à la fin du test - 4 dernières mesures avant la fin</value>
-  </data>
-  <data name="Tooltip_T_di_me" xml:space="preserve">
-    <value>Température moyenne au déviateur</value>
-  </data>
-  <data name="Tooltip_T_di_st" xml:space="preserve">
-    <value>Température au déviateur au début du test - 4 premières mesures après le début</value>
-  </data>
-  <data name="Tooltip_T_dw_ac" xml:space="preserve">
-    <value>Température réelle à la sortie</value>
-  </data>
-  <data name="Tooltip_T_dw_avg" xml:space="preserve">
-    <value>Température moyenne à la sortie</value>
-  </data>
-  <data name="Tooltip_T_dw_en" xml:space="preserve">
-    <value>Température à la sortie à la fin du test - 4 dernières mesures avant la fin</value>
-  </data>
-  <data name="Tooltip_T_dw_me" xml:space="preserve">
-    <value>Température moyenne à la sortie</value>
-  </data>
-  <data name="Tooltip_T_dw_st" xml:space="preserve">
-    <value>Température à la sortie au début du test - 4 premières mesures après le début</value>
-  </data>
-  <data name="Tooltip_T_up_ac" xml:space="preserve">
-    <value>Température réelle à l'entrée</value>
-  </data>
-  <data name="Tooltip_T_up_avg" xml:space="preserve">
-    <value>Température moyenne à l'entrée lors d'un test</value>
-  </data>
-  <data name="Tooltip_T_up_en" xml:space="preserve">
-    <value>Température à l'entrée à la fin de l'essai - 4 dernières mesures avant la fin</value>
-  </data>
-  <data name="Tooltip_T_up_me" xml:space="preserve">
-    <value>Température moyenne à l'entrée lors d'un test</value>
-  </data>
-  <data name="Tooltip_T_up_st" xml:space="preserve">
-    <value>Température d'entrée au début du test - 4 premières mesures après le début</value>
-  </data>
-  <data name="aux" xml:space="preserve">
-    <value>aux.</value>
-  </data>
-  <data name="main" xml:space="preserve">
-    <value>principale</value>
-  </data>
-  <data name="Tooltip_E_rel" xml:space="preserve">
-    <value>Erreur relative d'un compteur</value>
-  </data>
-  <data name="Tooltip_E_rel_ref" xml:space="preserve">
-    <value>Erreur relative du compteur maître</value>
-  </data>
-  <data name="Tooltip_sn" xml:space="preserve">
-    <value>Numéro de série du compteur</value>
-  </data>
-  <data name="Tooltip_sn_aux" xml:space="preserve">
-    <value>Numéro de série du compteur auxiliaire d'un compteur d'eau composé</value>
-  </data>
-  <data name="Tooltip_sn_main" xml:space="preserve">
-    <value>Numéro de série du compteur principal d'un compteur d'eau composé</value>
-  </data>
-  <data name="Tooltip_Vol_Mt" xml:space="preserve">
-    <value>Volume mesuré par le compteur testé</value>
-  </data>
-  <data name="Tooltip_Vol_rm" xml:space="preserve">
-    <value>Volume de référence pour compteur testé</value>
-  </data>
-  <data name="VName_Error" xml:space="preserve">
-    <value>E</value>
-  </data>
-  <data name="fall" xml:space="preserve">
-    <value>tomber</value>
-  </data>
-  <data name="from" xml:space="preserve">
-    <value>de</value>
-  </data>
-  <data name="rise" xml:space="preserve">
-    <value>monter</value>
-  </data>
-  <data name="to" xml:space="preserve">
-    <value>à</value>
-  </data>
-  <data name="Tooltip_Hu_Amb_M" xml:space="preserve">
-    <value>Humidité ambiante pendant le test</value>
-  </data>
-  <data name="Tooltip_P_Amb_M" xml:space="preserve">
-    <value>Pression ambiante pendant le test</value>
-  </data>
-  <data name="Tooltip_T_Amb_M" xml:space="preserve">
-    <value>Température ambiante pendant le test</value>
-  </data>
-  <data name="Test_done" xml:space="preserve">
-    <value>Test fait</value>
-  </data>
-  <data name="Test_passed" xml:space="preserve">
-    <value>Test réussi</value>
-  </data>
-  <data name="No" xml:space="preserve">
-    <value>Non</value>
-  </data>
-  <data name="Yes" xml:space="preserve">
-    <value>Oui</value>
-  </data>
-  <data name="Density_correction" xml:space="preserve">
-    <value>Correction densité</value>
-  </data>
-  <data name="Error_flags" xml:space="preserve">
-    <value>Drapeaux erreur</value>
-  </data>
-  <data name="Legalizator" xml:space="preserve">
-    <value>Légalisateur</value>
-  </data>
-  <data name="User_description" xml:space="preserve">
-    <value>Description utilisateur</value>
-  </data>
-  <data name="Failed_meters_count" xml:space="preserve">
-    <value>Compteur échoué</value>
-  </data>
-  <data name="Passed_meters_count" xml:space="preserve">
-    <value>Mètres passés</value>
-  </data>
-  <data name="sensitivity" xml:space="preserve">
-    <value>sensibilité</value>
-  </data>
-  <data name="Tooltip_Q_end" xml:space="preserve">
-    <value>Débit obtenu à partir du compteur principal - fin</value>
-  </data>
-  <data name="Tooltip_Q_max" xml:space="preserve">
-    <value>Débit obtenu à partir du compteur principal - max.</value>
-  </data>
-  <data name="Tooltip_Q_min" xml:space="preserve">
-    <value>Débit obtenu à partir du compteur principal - min</value>
-  </data>
-  <data name="Tooltip_Q_start" xml:space="preserve">
-    <value>Débit obtenu à partir du compteur principal - départ</value>
-  </data>
-  <data name="Tooltip_P_dw_max" xml:space="preserve">
-    <value>Pression maximale à la sortie pendant le test</value>
-  </data>
-  <data name="Tooltip_P_dw_min" xml:space="preserve">
-    <value>Pression minimale à la sortie pendant le test</value>
-  </data>
-  <data name="Tooltip_P_up_max" xml:space="preserve">
-    <value>Pression maximale à l'entrée pendant l'essai</value>
-  </data>
-  <data name="Tooltip_P_up_min" xml:space="preserve">
-    <value>Pression minimale à l'entrée lors de l'essai</value>
-  </data>
-  <data name="Tooltip_T_di_max" xml:space="preserve">
-    <value>Température maximale au déviateur pendant le test</value>
-  </data>
-  <data name="Tooltip_T_di_min" xml:space="preserve">
-    <value>Température minimale au déviateur pendant le test</value>
-  </data>
-  <data name="Tooltip_T_dw_max" xml:space="preserve">
-    <value>Température maximale à la sortie pendant le test</value>
-  </data>
-  <data name="Tooltip_T_dw_min" xml:space="preserve">
-    <value>Température minimale à la sortie pendant le test</value>
-  </data>
-  <data name="Tooltip_T_up_max" xml:space="preserve">
-    <value>Température maximale à l'entrée pendant le test</value>
-  </data>
-  <data name="Tooltip_T_up_min" xml:space="preserve">
-    <value>Température minimale à l'entrée pendant l'essai</value>
-  </data>
-  <data name="Tooltip_P_de_max" xml:space="preserve">
-    <value>Différence de pression mesurée par delta P mètre - maximum pendant le test</value>
-  </data>
-  <data name="Tooltip_P_de_min" xml:space="preserve">
-    <value>Différence de pression mesurée par delta P mètre - minimum pendant l'essai</value>
-  </data>
-  <data name="Tooltip_Rho_Wa_calc" xml:space="preserve">
-    <value>Densité calculée de l'eau à partir d'une table ou d'une formule à la température d'étalonnage de la densité de l'eau (r)</value>
-  </data>
-  <data name="Tooltip_T_rho_0" xml:space="preserve">
-    <value>Température de l'échantillon d'eau lors de l'étalonnage de la densité de l'eau</value>
-  </data>
-  <data name="Tooltip_T_ln_ac" xml:space="preserve">
-    <value>Température réelle dans la ligne</value>
-  </data>
-  <data name="Tooltip_T_ln_avg" xml:space="preserve">
-    <value>Température moyenne dans la ligne pendant un test</value>
-  </data>
-  <data name="Tooltip_T_ln_en" xml:space="preserve">
-    <value>Température dans la ligne à la fin du test - 4 dernières mesures avant la fin</value>
-  </data>
-  <data name="Tooltip_T_ln_max" xml:space="preserve">
-    <value>Température maximale dans la ligne pendant le test</value>
-  </data>
-  <data name="Tooltip_T_ln_me" xml:space="preserve">
-    <value>Température moyenne dans la ligne pendant un test</value>
-  </data>
-  <data name="Tooltip_T_ln_min" xml:space="preserve">
-    <value>Température minimale dans la ligne pendant le test</value>
-  </data>
-  <data name="Tooltip_T_ln_st" xml:space="preserve">
-    <value>Température dans la ligne au début du test - 4 premières mesures après le début</value>
-  </data>
-  <data name="Unit" xml:space="preserve">
-    <value>Unité</value>
-  </data>
-  <data name="Procedure_description" xml:space="preserve">
-    <value>Description procédure</value>
-  </data>
-  <data name="Bench_ID" xml:space="preserve">
-    <value>ID banc</value>
-  </data>
-  <data name="Bench_name" xml:space="preserve">
-    <value>Nom banc</value>
-  </data>
-  <data name="Address" xml:space="preserve">
-    <value>Adresse</value>
-  </data>
-  <data name="Tooltip_E_rel_last" xml:space="preserve">
-    <value>Erreur relative d'un compteur dans un test précédent / en production</value>
-  </data>
-  <data name="Batch" xml:space="preserve">
-    <value>Lot</value>
-  </data>
-  <data name="repetition" xml:space="preserve">
-    <value>répétition</value>
-  </data>
-  <data name="Invalid_Q2_correction_factors" xml:space="preserve">
-    <value>Facteurs correction Q2 non valides</value>
-  </data>
-  <data name="Previous_step_is_missing_or_NOK" xml:space="preserve">
-    <value>L'étape  précédente est manquante ou NOK</value>
-  </data>
-  <data name="Test_repetition_count_exceeded_upper_limit" xml:space="preserve">
-    <value>nombre répétitions test dépasse  limite supérieure</value>
-  </data>
-  <data name="Wrong_iPerl_counting_direction" xml:space="preserve">
-    <value>Mauvais sens comptage iPerl</value>
-  </data>
-  <data name="Failed" xml:space="preserve">
-    <value>Échoué</value>
-  </data>
-  <data name="Passed" xml:space="preserve">
-    <value>Passé</value>
-  </data>
-  <data name="Test_in_progress" xml:space="preserve">
-    <value>Test en cours</value>
-  </data>
-  <data name="Counter_0" xml:space="preserve">
-    <value>Compteur {0}</value>
-  </data>
-  <data name="Date_and_time" xml:space="preserve">
-    <value>Date et heure</value>
-  </data>
-  <data name="Name" xml:space="preserve">
-    <value>Prénom</value>
-  </data>
-  <data name="Step" xml:space="preserve">
-    <value>Étape</value>
-  </data>
-  <data name="Workplace" xml:space="preserve">
-    <value>Lieu travail</value>
-  </data>
-  <data name="Workflow" xml:space="preserve">
-    <value>Flux travail</value>
-  </data>
-  <data name="Production_tracing_results" xml:space="preserve">
-    <value>Résultats production</value>
-  </data>
-  <data name="Code" xml:space="preserve">
-    <value>Code</value>
-  </data>
-  <data name="Part" xml:space="preserve">
-    <value>Partie</value>
-  </data>
-  <data name="All_results" xml:space="preserve">
-    <value>Tous résultats</value>
-  </data>
-  <data name="Graphs" xml:space="preserve">
-    <value>Graphiques</value>
-  </data>
-  <data name="No_water_meter" xml:space="preserve">
-    <value>Pas de compteur</value>
-  </data>
-  <data name="Serial_number_is_missing" xml:space="preserve">
-    <value>Numérotation en série</value>
-  </data>
-</root>

Results/Resources/Strings.resx

@@ -741,82 +741,4 @@
   <data name="Batch" xml:space="preserve">
     <value>Batch</value>
   </data>
-  <data name="repetition" xml:space="preserve">
-    <value>repetition</value>
-  </data>
-  <data name="Invalid_Q2_correction_factors" xml:space="preserve">
-    <value>Invalid Q2 correction factors</value>
-  </data>
-  <data name="Previous_step_is_missing_or_NOK" xml:space="preserve">
-    <value>Previous step is missing or NOK</value>
-  </data>
-  <data name="Test_repetition_count_exceeded_upper_limit" xml:space="preserve">
-    <value>Test repetition count exceeded upper limit</value>
-  </data>
-  <data name="Wrong_iPerl_counting_direction" xml:space="preserve">
-    <value>Wrong iPerl counting direction</value>
-  </data>
-  <data name="Failed" xml:space="preserve">
-    <value>NOK</value>
-  </data>
-  <data name="Passed" xml:space="preserve">
-    <value>OK</value>
-  </data>
-  <data name="Test_in_progress" xml:space="preserve">
-    <value>Test in progress</value>
-  </data>
-  <data name="Counter_0" xml:space="preserve">
-    <value>Counter {0}</value>
-  </data>
-  <data name="Date_and_time" xml:space="preserve">
-    <value>Date and time</value>
-  </data>
-  <data name="Name" xml:space="preserve">
-    <value>Name</value>
-  </data>
-  <data name="Step" xml:space="preserve">
-    <value>Step</value>
-  </data>
-  <data name="Workplace" xml:space="preserve">
-    <value>Workplace</value>
-  </data>
-  <data name="Workflow" xml:space="preserve">
-    <value>Workflow</value>
-  </data>
-  <data name="Production_tracing_results" xml:space="preserve">
-    <value>Production tracing results</value>
-  </data>
-  <data name="Code" xml:space="preserve">
-    <value>Code</value>
-  </data>
-  <data name="Part" xml:space="preserve">
-    <value>Part</value>
-  </data>
-  <data name="All_results" xml:space="preserve">
-    <value>All results</value>
-  </data>
-  <data name="Graphs" xml:space="preserve">
-    <value>Graphs</value>
-  </data>
-  <data name="No_water_meter" xml:space="preserve">
-    <value>No water meter</value>
-  </data>
-  <data name="Serial_number_is_missing" xml:space="preserve">
-    <value>Serial number is missing</value>
-  </data>
-  <data name="Lower_limit" xml:space="preserve">
-    <value>Lower limit</value>
-  </data>
-  <data name="Upper_limit" xml:space="preserve">
-    <value>Upper limit</value>
-  </data>
-  <data name="Water_meter_results" xml:space="preserve">
-    <value>Water meter results</value>
-  </data>
-  <data name="Relative_error" xml:space="preserve">
-    <value>Relative error</value>
-  </data>
-  <data name="This_position_is_disabled" xml:space="preserve">
-    <value>This position is disabled</value>
-  </data>
 </root>

Results/Results.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;ZAMBIA</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;IZRAEL_200</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -27,7 +27,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;ZAMBIA</DefineConstants>
+    <DefineConstants>TRACE;IZRAEL_200</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -51,7 +51,6 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Windows.Forms.DataVisualization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -75,31 +74,12 @@
     <Compile Include="Forms\BatchResultsDlg.Designer.cs">
       <DependentUpon>BatchResultsDlg.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\IOneWMResultsCtrl.cs" />
     <Compile Include="Forms\ListViewEx.cs">
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Forms\ListViewExtensions.cs" />
     <Compile Include="Forms\LviIntColumnComparer.cs" />
     <Compile Include="Forms\LviTextColumnComparer.cs" />
-    <Compile Include="Forms\MoreWMResultsDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\MoreWMResultsDlg.Designer.cs">
-      <DependentUpon>MoreWMResultsDlg.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\OneWMResultsColumnsCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Forms\OneWMResultsColumnsCtrl.designer.cs">
-      <DependentUpon>OneWMResultsColumnsCtrl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\OneWMResultsRowsCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Forms\OneWMResultsRowsCtrl.Designer.cs">
-      <DependentUpon>OneWMResultsRowsCtrl.cs</DependentUpon>
-    </Compile>
     <Compile Include="Forms\ResultsConfigCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -112,13 +92,6 @@
     <Compile Include="Forms\ResultsConfigDlg.designer.cs">
       <DependentUpon>ResultsConfigDlg.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\TracingResultsDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\TracingResultsDlg.Designer.cs">
-      <DependentUpon>TracingResultsDlg.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\WaterMeterEventArgs.cs" />
     <Compile Include="ItemID.cs" />
     <Compile Include="Mappings\BatchMap.cs" />
     <Compile Include="Mappings\ComponentsMap.cs" />
@@ -145,12 +118,11 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Output\Printers\OnePerMeter\OnePerMeterPrinterCfg.cs" />
+    <Compile Include="Output\Printers\Table.cs" />
     <Compile Include="Output\Printers\Zapiska\ZapiskaPrintDocument.cs">
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Output\Printers\Zapiska\ZapiskaPrinterCfg.cs" />
-    <Compile Include="Output\Table.cs" />
-    <Compile Include="Output\WMChart.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -170,10 +142,6 @@
       <Project>{743DF7DB-C7B6-42EB-986D-0F485E5588E4}</Project>
       <Name>Config</Name>
     </ProjectReference>
-    <ProjectReference Include="..\TracingDB\TracingDB.csproj">
-      <Project>{EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF}</Project>
-      <Name>TracingDB</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Users\Users.csproj">
       <Project>{6E5CB0E9-E1B6-4E5D-AC6E-B1049E180F2B}</Project>
       <Name>Users</Name>
@@ -191,24 +159,12 @@
     <EmbeddedResource Include="Forms\ListViewEx.resx">
       <DependentUpon>ListViewEx.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\MoreWMResultsDlg.resx">
-      <DependentUpon>MoreWMResultsDlg.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\OneWMResultsColumnsCtrl.resx">
-      <DependentUpon>OneWMResultsColumnsCtrl.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\OneWMResultsRowsCtrl.resx">
-      <DependentUpon>OneWMResultsRowsCtrl.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Forms\ResultsConfigCtrl.resx">
       <DependentUpon>ResultsConfigCtrl.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\ResultsConfigDlg.resx">
       <DependentUpon>ResultsConfigDlg.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\TracingResultsDlg.resx">
-      <DependentUpon>TracingResultsDlg.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -217,7 +173,6 @@
     <EmbeddedResource Include="Resources\Strings.de.resx">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\Strings.fr.resx" />
     <EmbeddedResource Include="Resources\Strings.it.resx" />
     <EmbeddedResource Include="Resources\Strings.pl.resx" />
     <EmbeddedResource Include="Resources\Strings.resx">

Results/Utils.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2016-2018 Sensus Slovensko a.s.
 ///
 using System;
 using System.Text;
@@ -11,7 +11,6 @@ namespace Results
 	{
 		public static string GetTestName(string name, int repeats, int repetitionNr)
 		{
-            if (name == null) return null;
 			if (repeats == 1) return name;
 			return string.Format("{0} ({1}/{2})", name, repetitionNr, repeats);
 		}
@@ -27,44 +26,21 @@ namespace Results
                 case 7:  return 29;  /// PT7, special
                 case 8:  return 36;  /// WR13
                 case 9:  return 37;  /// WR15
-                case 10: return 38;  /// WR14
-                case 11: return 39;  /// WR18
-                case 12: return 40;  /// WR19
-                case 13: return 41;  /// WR20
-                case 14: return 42;  /// WR21
+                case 10: return 38;  /// WR16
                 default: return 0;
             }
         }
 
-        public static string BenchNameFromOracleBenchID(int id)
-        {
-            switch (id)
-            {
-                case 4: return "WR9";
-                case 5: return "WR10";
-                case 6: return "WR11";
-                case 7: return "PT7";
-                case 8: return "WR13";
-                case 9: return "WR15";
-                case 10: return "WR14";
-                case 11: return "WR18";
-                case 12: return "WR19";
-                case 13: return "WR20";
-                case 14: return "WR21";
-                default: return string.Empty;
-            }
-        }
-
 
         /// <summary>
-        /// Converts ErrorFlags integer to string. Supports up to 31 flags (E1..E31, i.e. bit0..bit30).
+        /// Converts ErrorFlags integer to string. Supports up to 31 flags (E1..E31).
         /// </summary>
         /// <param name="errorFlags">Input</param>
         /// <returns>Output string</returns>
         public static string ErrorFlagsStr(int errorFlags)
         {
             StringBuilder sb = new StringBuilder();
-            for (int i = 0; i < 31; i++)
+            for (int i = 0; i < 30; i++)
             {
                 if ((errorFlags & (1 << i)) != 0)
                 {
@@ -90,23 +66,5 @@ namespace Results
             return (useRedGreenColor) ? (passed ? "OK|Green" : "NOK|Red")        : (passed ? "OK|White" : "NOK|White");
 #endif
         }
-
-
-        public static void GetCounterStates(Results.Entities.Batch batch, int[] counters)
-        {
-            if (batch != null)
-            {
-                batch.Counter1 = ((counters != null) && (counters.Length >= 1)) ? counters[0] : 0;
-                batch.Counter2 = ((counters != null) && (counters.Length >= 2)) ? counters[1] : 0;
-                batch.Counter3 = ((counters != null) && (counters.Length >= 3)) ? counters[2] : 0;
-                batch.Counter4 = ((counters != null) && (counters.Length >= 4)) ? counters[3] : 0;
-                batch.Counter5 = ((counters != null) && (counters.Length >= 5)) ? counters[4] : 0;
-                batch.Counter6 = ((counters != null) && (counters.Length >= 6)) ? counters[5] : 0;
-                batch.Counter7 = ((counters != null) && (counters.Length >= 7)) ? counters[6] : 0;
-                batch.Counter8 = ((counters != null) && (counters.Length >= 8)) ? counters[7] : 0;
-                batch.Counter9 = ((counters != null) && (counters.Length >= 9)) ? counters[8] : 0;
-                batch.Counter10 = ((counters != null) && (counters.Length >= 10)) ? counters[9] : 0;
-            }
-        }
     }
 }

Results/WMeterRsltItemSpec.cs

@@ -149,23 +149,22 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Proc_description, Strings.Procedure_description, Quantity.String, ItemCategory.Other,    (w, t, u, f, p) => FormatStr(f, w.Batch.ProcedureDescription)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_number,     Strings.Batch_nr,              Quantity.Number, ItemCategory.Other,    (w, t, u, f, p) => FormatInt(f, w.BatchNr())));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_method,      Strings.Test_method + "()",    Quantity.String, ItemCategory.TestData, (w, t, u, f, p) => FormatStr(f, (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Method())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_Method_Elde, Strings.Test_method + " Elde ()", Quantity.String, ItemCategory.TestData, (w, t, u, f, p) => FormatStr(f, (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).MethodElde())));
 
             ///
             /// Volume
             ///
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_volume,       Strings.Test_vol + "()",                                                  Quantity.Volume, ItemCategory.TestData,    (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).TargetVolume())));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.VolumeCTV,		  string.Format("{0} CTV ()", Strings.VName_Vol),							Quantity.Volume, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetTestRslt(t).VolumeCTV)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume,            string.Format("{0} Mt. ()", Strings.VName_Vol), Strings.Tooltip_Vol_Mt,   Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).VolumeMeter) : ((w.GetMeterTestRslt(t) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeMeter) : string.Empty)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_volume,  string.Format("{0} rm ()", Strings.VName_Vol), Strings.Tooltip_Vol_rm,    Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).VolumeRef) : ((w.GetMeterTestRslt(t) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeRef) : string.Empty)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume_main,       string.Format("{0} {1} ()", Strings.VName_Vol, Strings.main),             Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).VolumeMeter) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume_aux,        string.Format("{0} {1} ()", Strings.VName_Vol, Strings.aux),              Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).VolumeMeter) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume,      Strings.Start_volume + "()",                                              Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).VolumeStart) : ((w.GetMeterTestRslt(t) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeStart) : string.Empty)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume_main, Strings.Start_volume_main + "()",                                         Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).VolumeStart) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume_aux,  Strings.Start_volume_aux + "()",                                          Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).VolumeStart) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume,        Strings.End_volume + "()",                                                Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).VolumeEnd) : ((w.GetMeterTestRslt(t) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeEnd) : string.Empty)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume_main,   Strings.End_volume_main + "()",                                           Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).VolumeEnd) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume_aux,    Strings.End_volume_aux + "()",                                            Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).VolumeEnd) : string.Empty));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume,			  string.Format("{0} Mt. ()", Strings.VName_Vol), Strings.Tooltip_Vol_Mt,	Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeMeter)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_volume,  string.Format("{0} rm ()",  Strings.VName_Vol), Strings.Tooltip_Vol_rm,   Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeRef)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume_main,       string.Format("{0} {1} ()", Strings.VName_Vol,  Strings.main),            Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeMeter)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume_aux,        string.Format("{0} {1} ()", Strings.VName_Vol,  Strings.aux),             Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeMeter)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume,      Strings.Start_volume + "()",                                              Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume_main, Strings.Start_volume_main + "()",                                         Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume_aux,  Strings.Start_volume_aux + "()",                                          Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume,        Strings.End_volume + "()",                                                Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume_main,   Strings.End_volume_main + "()",                                           Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume_aux,    Strings.End_volume_aux + "()",                                            Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeEnd)));
 
 			///
 			/// Mass
@@ -196,10 +195,8 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Timestamp_start,        "Timestamp start ()",                                  Quantity.Time, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).TimestampStart)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Timestamp_end,          "Timestamp end ()",                                    Quantity.Time, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).TimestampEnd)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_time_ni,           Strings.T_s + "_ni()",                                 Quantity.Time, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u, f, p, "V3", w.GetMeterTestRslt(t).TestTime)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_time,              Strings.T_s + "()",                                    Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u, f, p, "F1", w.GetTestRslt(t).TestTime)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.TestTimeCorrection,     "Test time correction ()",                             Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).TestTimeCorrection)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.TimeBtwnMassMsrmnts,    "Time between mass measurements ()",                   Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u, f, p, "F0", w.GetTestRslt(t).TimeBtwnMassMsrmnts)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.PMax_test_time,         "Pressure test time ()",     "Pressure test time",     Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsPMaxTest())   ? "" : FormatDbl(u, f, p, "F0", w.GetTestRslt(t).TestTime)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_time,              Strings.T_s + "()",                                    Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TestTime)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.PMax_test_time,         "Pressure test time ()",     "Pressure test time",     Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsPMaxTest())   ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TestTime)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Diverter_start_time,    "Diverter start time ()",    "Diverter start time",    Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsDiverter())   ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).DiverterStart)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Diverter_end_time,      "Diverter end time ()",      "Diverter end time",      Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsDiverter())   ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).DiverterEnd)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_valve_open_time,  "Start valve open time ()",  "Start valve open time",  Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsStartStop())  ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).DiverterStart)));
@@ -211,13 +208,13 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_from,      string.Format("{0} {1}", Strings.VName_Flow, Strings.from),                   Quantity.Flow, ItemCategory.TestData,    (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).Qfrom())));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_to,        string.Format("{0} {1}", Strings.VName_Flow, Strings.to),                     Quantity.Flow, ItemCategory.TestData,    (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).Qto())));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow,        string.Format("{0} v r", Strings.VName_Flow),      Strings.Tooltip_Q_v_r,     Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowVolume)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Qc,          string.Format("Qc"), "Calculated water meter flow",                           Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).VolumeCTV / w.GetMeterTestRslt(t).TestTime * 3.6 * w.GetMeterTestRslt(t).PulsesMaster / w.GetTestRslt(t).PulsesMaster)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_mean,  string.Format("{0} rim ()", Strings.VName_Flow),   Strings.Tooltip_Q_rim,     Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMean)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_min,   string.Format("{0} ref min ()", Strings.VName_Flow), Strings.Tooltip_Q_min,   Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMin)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_max,   string.Format("{0} ref max ()", Strings.VName_Flow), Strings.Tooltip_Q_max,   Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMax)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_start, string.Format("{0} ref start ()",Strings.VName_Flow),Strings.Tooltip_Q_start, Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowStart)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_end,   string.Format("{0} ref end ()", Strings.VName_Flow), Strings.Tooltip_Q_end,   Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowEnd)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Qc, string.Format("Qc"), "Calculated water meter flow",                                    Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V5", (w.GetMeterTestRslt(t).TestTime == 0 || w.GetTestRslt(t).PulsesMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV / w.GetMeterTestRslt(t).TestTime * 3.6 * w.GetMeterTestRslt(t).PulsesMaster / w.GetTestRslt(t).PulsesMaster)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv, string.Format("{0} ctv ()", Strings.VName_Flow), "CTV of the flow (mean val.)",  Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V5", (w.GetMeterTestRslt(t).TestTime == 0 || w.GetTestRslt(t).PulsesMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV / w.GetMeterTestRslt(t).TestTime * 3.6 * w.GetMeterTestRslt(t).PulsesMaster / w.GetTestRslt(t).PulsesMaster)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv,    string.Format("{0} ctv ()", Strings.VName_Flow), "CTV of the flow (mean val.)",Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TestTime == 0) ? 0 : 3.6 * w.GetTestRslt(t).VolumeCTV / w.GetTestRslt(t).TestTime)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv_min, string.Format("{0} ctv min ()", Strings.VName_Flow), "Min. CTV of the flow", Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).VolumeMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV * w.GetTestRslt(t).FlowMin / w.GetTestRslt(t).VolumeMaster)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv_max, string.Format("{0} ctv max ()", Strings.VName_Flow), "Max. CTV of the flow", Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).VolumeMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV * w.GetTestRslt(t).FlowMax / w.GetTestRslt(t).VolumeMaster)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv_start, string.Format("{0} ctv start ()", Strings.VName_Flow), "Start flow CTV",   Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).VolumeMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV * w.GetTestRslt(t).FlowStart / w.GetTestRslt(t).VolumeMaster)));
@@ -226,9 +223,8 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_fall,      string.Format("{0} {1}", Strings.VName_Flow, Strings.fall),                   Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QFall == 0) ? "-" : FormatDbl(u, f, p, "V3", w.QFall)) : ""));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_sensitivity, string.Format("{0} {1}", Strings.VName_Flow, Strings.sensitivity),          Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QRise == 0) ? "-" : FormatDbl(u, f, p, "V3", w.QRise)) : ""));
 
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.ConstMaster,    string.Format("k MID ()"), "Const. of the reference flow meter",           Quantity.PulsePerLtr, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", ((w.GetTestRslt(t).ConstMaster < float.Epsilon) ? 0 : (1 / w.GetTestRslt(t).ConstMaster)))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.ConstMasterRaw, string.Format("k MID raw ()"),"Const. of the ref. flow meter uncorrected", Quantity.PulsePerLtr, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", ((w.GetTestRslt(t).ConstMasterRaw < float.Epsilon) ? 0 : (1 / w.GetTestRslt(t).ConstMasterRaw)))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.ConstMasterCorr,string.Format("k MID corr ()"), "Const. of the ref. flow meter corrected", Quantity.PulsePerLtr, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", ((w.GetTestRslt(t).ConstMasterRaw < float.Epsilon) ? 0 : (1 / w.GetTestRslt(t).ConstMasterCorr)))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.ConstMaster,    string.Format("k MID ()"), "Const. of the reference flow meter",           Quantity.PulsePerLtr, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", ((w.GetTestRslt(t).ConstMaster < float.Epsilon) ? 0 : (1 / w.GetTestRslt(t).ConstMaster)))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.ConstMasterRaw, string.Format("k MID raw ()"), "Const. of the ref. flow meter uncorrected",Quantity.PulsePerLtr, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", ((w.GetTestRslt(t).ConstMasterRaw < float.Epsilon) ? 0 : (1 / w.GetTestRslt(t).ConstMasterRaw)))));
 
             ///
             /// Temperature
@@ -318,14 +314,12 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, string.Format("{0} rel. ()", Strings.VName_Error), Strings.Tooltip_E_rel, Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "0" : FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t).Error)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.LastError, string.Format("{0} rel. last ()", Strings.VName_Error), Strings.Tooltip_E_rel_last, Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "0" : FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t).LastError)));
 #else
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, string.Format("{0} rel. ()", Strings.VName_Error), Strings.Tooltip_E_rel, Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) != null) ? FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t).Error) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_heat_mtr_vol, string.Format("{0} rel.hm.vol. ()", Strings.VName_Error),    Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume) != null) ? FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).Error) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, string.Format("{0} rel. ()", Strings.VName_Error), Strings.Tooltip_E_rel, Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t).Error)));
 #endif
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed, Strings.Result, Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => string.IsNullOrEmpty(t) ? w.PassedColorStr(f)
                                                                                                                                                                       : ((w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PassedColorStr(f))));
 
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.RefFlowmeter,       "Ref. flowmeter", Quantity.String, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).RefFlowmeter()) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.ResultOrErrorFlags, "Winiki lub E",   Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.PassedOrErrorFlagsStr())));    /// PL specific result
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.ResultOrErrorFlags, "Winiki lub E", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.PassedOrErrorFlagsStr())));    /// PL specific result
 
             ///
             /// Water meter info
@@ -377,8 +371,8 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Degree__liter,    "Degree per liter ()",      Quantity.PulsePerLtr, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).IsCamera() ? w.GetMeterTestRslt(t).PulsesPerLiter : 0)));
 
 			/// Water meters results (combined)
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_main,     Strings.Err_main + "()", Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) != null) ? FormatDbl(u, f, p, "V2",  w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).Error) : string.Empty));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_aux,      Strings.Err_aux + "()",  Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) != null) ? FormatDbl(u, f, p, "V2",  w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).Error) : string.Empty));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_main,     Strings.Err_main + "()", Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) == null) ? "" : FormatDbl(u, f, p, "V2",  w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).Error)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_aux,      Strings.Err_aux + "()",  Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) == null) ? "" : FormatDbl(u, f, p, "V2",  w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).Error)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr_main, string.Format("{0} {1}", Strings.sn, Strings.main), Strings.Tooltip_sn_main, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.SerialNr)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr_aux,  string.Format("{0} {1}", Strings.sn, Strings.aux),  Strings.Tooltip_sn_aux,  Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.SerialNrAux)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state_main, Strings.EndState_main,   Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.EndState)));
@@ -413,10 +407,8 @@ namespace Results
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Meter_type,  Strings.Meter_type,  Quantity.String, ItemCategory.Other,       (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Compound ? Strings.Compound : (w.WaterMeterData.HeatMeter ? Strings.Heat_meter : Strings.Single))));
 
 #if HEAT_METERS
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy,           Strings.Energy + " ()",       Quantity.Energy, ItemCategory.Other,	(w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeMeter) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy_start,     Strings.Energy + " start ()", Quantity.Energy, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeStart) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy_end,       Strings.Energy + " end ()",   Quantity.Energy, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeEnd) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_energy, Strings.Energy_ref + " ()",   Quantity.Energy, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeRef) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy,              Strings.Energy + "()",      Quantity.Energy,        ItemCategory.Other,	(w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) == null) ? "" : FormatDbl(u, f, p, "F1", (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeMeter))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_energy,    Strings.Energy_ref + "()",  Quantity.Energy,        ItemCategory.Other,	(w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) == null) ? "" : FormatDbl(u, f, p, "F1", (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeRef))));
 #endif
 
 #if IPERL
@@ -425,76 +417,41 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.OrigCalibFactorLNA,"iPerl OrigCalibFactorLNA",Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.OrigCalibFactorLNA)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.CalibFactorLNA,    "iPerl CalibFactorLNA",    Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.CalibFactorLNA)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2ErrWOCorrection, "iPerl Q2ErrWOCorrection", Quantity.Error,  ItemCategory.MeterResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.Q2ErrWOCorrection)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrectionDone,  "iPerl Q2CorrectionDone",  Quantity.Boolean,ItemCategory.MeterResult, (w, t, u, f, p) => (((w.Q2CorrRL != 0) || (w.Q2CorrLR != 0)) ? Strings.Yes : Strings.No)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrRFlow,       "iPerl Q2Corr RL",         Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrRL)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrLFlow,       "iPerl Q2Corr LR",         Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrLR)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrectionDone,  "iPerl Q2CorrectionDone",  Quantity.Boolean,ItemCategory.MeterResult, (w, t, u, f, p) => (w.Q2CorrectionDone ? Strings.Yes : Strings.No)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrRFlow,       "iPerl Q2Corr R-L",        Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrRL)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrLFlow,       "iPerl Q2Corr L-R",        Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrLR)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrFlowRight,   "iPerl Q2CorrFlowRight",   Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrFlowRight)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.FW_Version,        "iPerl FW version",        Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.FWVersion)));
   #if ORACLE_DB
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Max_test_index,    "iPerl test index",        Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, (w.Pruefindex % 100))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.OraWMTypeID,       "OraDB WM Type ID",        Quantity.Number, ItemCategory.MeterData,   (w, t, u, f, p) => FormatInt(f, w.WaterMeterData.WMTypeId)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.OraWMTypeRev,      "OraDB WM Type Rev.",      Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.WMTypeRevision)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Max_test_index,    "iPerl test index",       Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, (w.Pruefindex % 100))));
   #endif
 #endif
-
-#if TURA_SPECIAL
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_AssignedSerialNr, "iPerl assigned s/n",        Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.AssignedSerialNr)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_CompleteSerialNr, "iPerl complete s/n",        Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.CompleteSerialNr)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_RadioAddress,     "iPerl radio address",       Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.RadioAddress)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_PaletteNr,        "iPerl palette nr.",         Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.PaletteNr)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_UmkartonNr,       "iPerl umkarton nr.",        Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.UmkartonNr)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_TestBench,        "Prod iPerl test bench",     Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.ProdTestBench)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_WMPosition,       "Prod iPerl WM position",    Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.ProdWMPosition)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_UserName,         "Prod iPerl user name",      Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.ProdUserName)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_PurchaseOrder,    "Prod iPerl purchase order", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.ProdPurchaseOrder)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_Passed,           "Prod iPerl passed",         Quantity.Boolean,ItemCategory.MeterResult, (w, t, u, f, p) => FormatBool(f,w.ProdPassed)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_ResultCode,       "Prod iPerl result code",    Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.ProdResultCode)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_Q2CorrRL,         "Prod iPerl Q2Corr RL",      Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.ProdQ2CorrRL)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_Q2CorrLR,         "Prod iPerl Q2Corr LR",      Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.ProdQ2CorrLR)));
-#endif
-
             AllItems.Add(new WMeterRsltItemSpec(ItemID.TestDone,     Strings.Test_done + "()",   Quantity.Boolean, ItemCategory.TestResult,  (w, t, u, f, p) => FormatBool(f, (w.GetMeterTestRslt(t) != null) && w.GetMeterTestRslt(t).TestDone)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.TestPassed,   Strings.Test_passed + "()", Quantity.Boolean, ItemCategory.TestResult,  (w, t, u, f, p) => FormatBool(f, (w.GetMeterTestRslt(t) != null) && w.GetMeterTestRslt(t).Passed)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.ErrorFlags,   Strings.Error_flags + "()", Quantity.String,  ItemCategory.TestResult,  (w, t, u, f, p) => FormatStr(f, (w.GetTestRslt(t) != null) ? w.GetTestRslt(t).ErrorFlagsStr() : w.ErrorFlagsStr())));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.ErrorFlagsEx, Strings.Error_flags + "Ex", Quantity.String,  ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.ErrorFlagsStrEx())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E1, "E1 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E1) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E2, "E2 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E2) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E3, "E3 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E3) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E4, "E4 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E4) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E5, "E5 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E5) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E6, "E6 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E6) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E7, "E7 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E7) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E8, "E8 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E8) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E9, "E9 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E9) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E10, "E10 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E10) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E11, "E11 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E11) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E12, "E12 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E12) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E13, "E13 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E13) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E14, "E14 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E14) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E15, "E15 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E15) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E16, "E16 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E16) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E21, "E21 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E21) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E25, "E25 ()", Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => ((w.ErrorFlags & (int)ErrorFlagMask.E25) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E26, "E26 ()", Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => ((w.ErrorFlags & (int)ErrorFlagMask.E26) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E27, "E27 ()", Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => ((w.ErrorFlags & (int)ErrorFlagMask.E27) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E28, "E28 ()", Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => ((w.ErrorFlags & (int)ErrorFlagMask.E28) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.TestPartStr, "Test part str.", Quantity.String, ItemCategory.TestResult, (w, t, u, f, p) => FormatEnum(f, (w.GetMeterTestRslt(t) != null) ? w.GetMeterTestRslt(t).TestRslt.Part : 0)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E1,  "E1 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0001) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E2,  "E2 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0002) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E3,  "E3 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0004) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E4,  "E4 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0008) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E5,  "E5 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0010) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E6,  "E6 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0020) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E7,  "E7 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0040) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E8,  "E8 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0080) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E9,  "E9 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0100) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E10, "E10 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0200) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E11, "E11 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0400) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E12, "E12 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0800) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E13, "E13 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x1000) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E14, "E14 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x2000) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E15, "E15 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x4000) != 0) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.E16, "E16 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x8000) != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E21, "E21 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x100000) != 0) ? Strings.Yes : Strings.No));
 
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Table_row_nr, "Table row #", Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? TableRowNr.ToString() : string.Format(f, TableRowNr)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Table_column_nr, "Table column #", Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? TableColumnNr.ToString() : string.Format(f, TableColumnNr)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.WMRemark, string.Format("{0} {1}", Strings.Water_Meter, Strings.Remark), Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.Remark)));
-        
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter1, string.Format(Strings.Counter_0, 1), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter1)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter2, string.Format(Strings.Counter_0, 2), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter2)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter3, string.Format(Strings.Counter_0, 3), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter3)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter4, string.Format(Strings.Counter_0, 4), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter4)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter5, string.Format(Strings.Counter_0, 5), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter5)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter6, string.Format(Strings.Counter_0, 6), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter6)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter7, string.Format(Strings.Counter_0, 7), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter7)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter8, string.Format(Strings.Counter_0, 8), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter8)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter9, string.Format(Strings.Counter_0, 9), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter9)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter10, string.Format(Strings.Counter_0, 10), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter10)));
-        }
+		}
 
 		/// To be updated by Output.FileWriter or Output.Printer
 		public static int TableRowNr;
@@ -503,8 +460,7 @@ namespace Results
 
         public static string FormatStr(string format, string value)
         {
-            string valueEx = string.IsNullOrEmpty(value) ? string.Empty : value;
-            return  string.IsNullOrEmpty(format) ? valueEx : string.Format(format, valueEx);
+            return  string.IsNullOrEmpty(format) ? value : string.Format(format, value);
         }
 
         public static string FormatBool(string format, bool value)
@@ -520,23 +476,6 @@ namespace Results
             }
         }
 
-        public static string FormatEnum(string format, int value)
-        {
-            if (string.IsNullOrEmpty(format))
-            {
-                return value.ToString();
-            }
-            else
-            {
-                string[] texts = format.Split(new char[] { '~' });
-
-                if (value >= 0 && value < texts.Length)
-                    return texts[value];
-                else
-                    return value.ToString();
-            }
-        }
-
         public static string FormatInt(string format, int value)
         {
             return string.IsNullOrEmpty(format) ? value.ToString() : string.Format(format, value);

ResultsBrowser/Filters/BatchNrFilterUI.Designer.cs

@@ -48,7 +48,7 @@
             // 
             this.batchNrTextBox.Location = new System.Drawing.Point(132, 13);
             this.batchNrTextBox.Name = "batchNrTextBox";
-            this.batchNrTextBox.Size = new System.Drawing.Size(80, 20);
+            this.batchNrTextBox.Size = new System.Drawing.Size(138, 20);
             this.batchNrTextBox.TabIndex = 0;
             // 
             // BatchNrFilterUI

ResultsBrowser/Filters/ProcedureFilterUI.Designer.cs

@@ -48,15 +48,15 @@
             // 
             this.procedureTextBox.Location = new System.Drawing.Point(132, 13);
             this.procedureTextBox.Name = "procedureTextBox";
-            this.procedureTextBox.Size = new System.Drawing.Size(360, 20);
+            this.procedureTextBox.Size = new System.Drawing.Size(138, 20);
             this.procedureTextBox.TabIndex = 0;
             // 
-            // ProcedureFilterUI
+            // ProcedureFilter
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.groupBox1);
-            this.Name = "ProcedureFilterUI";
+            this.Name = "ProcedureFilter";
             this.Size = new System.Drawing.Size(835, 40);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();

ResultsBrowser/Filters/QnFilterUI.Designer.cs

@@ -48,15 +48,15 @@
             // 
             this.procedureTextBox.Location = new System.Drawing.Point(132, 13);
             this.procedureTextBox.Name = "procedureTextBox";
-            this.procedureTextBox.Size = new System.Drawing.Size(80, 20);
+            this.procedureTextBox.Size = new System.Drawing.Size(138, 20);
             this.procedureTextBox.TabIndex = 0;
             // 
-            // QnFilterUI
+            // QnFilter
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.groupBox1);
-            this.Name = "QnFilterUI";
+            this.Name = "QnFilter";
             this.Size = new System.Drawing.Size(835, 40);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();

ResultsBrowser/Filters/SerialNrFilter.cs

@@ -30,6 +30,7 @@ namespace ResultsBrowser.Filters
         ///
         public string SerialNr;
 
+
         private SerialNrFilterUI userIface;
 
         public SerialNrFilter()
@@ -41,50 +42,21 @@ namespace ResultsBrowser.Filters
         {
             IList<WaterMeter> filteredWaterMeters = new List<WaterMeter>();
 
-            if (string.IsNullOrEmpty(SerialNr)) return filteredWaterMeters;     /// Empty s/n => Return an empty list of WM-s
-
-            IList<string> serialNumbers = new List<string>();
-            ///
-            if (SerialNr[0] == '@')
-            {
-                try
-                {
-                    TextReader rdr = new StreamReader(SerialNr.Substring(1));
-                    string line = rdr.ReadLine();
-                    while (!string.IsNullOrEmpty(line))
-                    {
-                        serialNumbers.Add(line);
-                        line = rdr.ReadLine();
-                    }
-                }
-                catch (Exception)
-                {
-                    return filteredWaterMeters;
-                }
-            }
-            else
-            {
-                serialNumbers.Add(SerialNr);
-            }
-
             if (waterMeters == null)
             {
                 foreach (var se in sessions)
                 {
-                    foreach (var oneSerialNr in serialNumbers)
-                    {
-                        IList<WaterMeter> wms = se.QueryOver<WaterMeter>()
-                                                  .Where(x => (x.SerialNr == oneSerialNr))
-                                                  .List<WaterMeter>();
-                        foreach (var wm in wms) filteredWaterMeters.Add(wm);
-                    }
+                    IList<WaterMeter> wms = se.QueryOver<WaterMeter>()
+                                              .Where(x => (x.SerialNr == SerialNr))
+                                              .List<WaterMeter>();
+                    foreach (var wm in wms) filteredWaterMeters.Add(wm);
                 }
             }
             else
             {
                 foreach (var wm in waterMeters)
                 {
-                    if (serialNumbers.Contains(wm.SerialNr)) filteredWaterMeters.Add(wm);
+                    if (wm.SerialNr == SerialNr) filteredWaterMeters.Add(wm);
                 }
             }
 

ResultsBrowser/Filters/SerialNrFilterUI.Designer.cs

@@ -48,16 +48,15 @@
             // 
             this.serialNrTextBox.Location = new System.Drawing.Point(132, 13);
             this.serialNrTextBox.Name = "serialNrTextBox";
-            this.serialNrTextBox.Size = new System.Drawing.Size(360, 20);
+            this.serialNrTextBox.Size = new System.Drawing.Size(138, 20);
             this.serialNrTextBox.TabIndex = 0;
-            this.serialNrTextBox.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.serialNrTextBox_MouseDoubleClick);
             // 
-            // SerialNrFilterUI
+            // SerialNrFilter
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.groupBox1);
-            this.Name = "SerialNrFilterUI";
+            this.Name = "SerialNrFilter";
             this.Size = new System.Drawing.Size(835, 40);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();

ResultsBrowser/Filters/SerialNrFilterUI.cs

@@ -35,14 +35,5 @@ namespace ResultsBrowser.Filters
 		{
             data.SerialNr = serialNrTextBox.Text;
 		}
-
-        private void serialNrTextBox_MouseDoubleClick(object sender, MouseEventArgs e)
-        {
-            OpenFileDialog dlg = new OpenFileDialog();
-            if (dlg.ShowDialog() == DialogResult.OK)
-            {
-                serialNrTextBox.Text = string.Format("@{0}", dlg.FileName);
-            }
-        }
     }
 }

ResultsBrowser/Filters/WMPositionFilterUI.Designer.cs

@@ -48,7 +48,7 @@
             // 
             this.wmPositionTextBox.Location = new System.Drawing.Point(132, 13);
             this.wmPositionTextBox.Name = "wmPositionTextBox";
-            this.wmPositionTextBox.Size = new System.Drawing.Size(80, 20);
+            this.wmPositionTextBox.Size = new System.Drawing.Size(138, 20);
             this.wmPositionTextBox.TabIndex = 0;
             // 
             // WMPositionFilterUI

ResultsBrowser/Forms/DatabaseSettingsDlg.cs

@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.Windows.Forms;
 using ResultsBrowser.Resources;
+using TBF.BenchControl;
 
 namespace ResultsBrowser.Forms
 {

ResultsBrowser/Forms/HistogramCtrl.Designer.cs

@@ -1,76 +0,0 @@
-namespace ResultsBrowser.Forms
-{
-	partial class HistogramCtrl
-	{
-		/// <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()
-		{
-			System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
-			System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
-			System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
-			System.Windows.Forms.DataVisualization.Charting.Title title1 = new System.Windows.Forms.DataVisualization.Charting.Title();
-			this.myChart = new System.Windows.Forms.DataVisualization.Charting.Chart();
-			((System.ComponentModel.ISupportInitialize)(this.myChart)).BeginInit();
-			this.SuspendLayout();
-			// 
-			// myChart
-			// 
-			chartArea1.Name = "ChartArea1";
-			this.myChart.ChartAreas.Add(chartArea1);
-			this.myChart.Dock = System.Windows.Forms.DockStyle.Fill;
-			legend1.Name = "Legend1";
-			this.myChart.Legends.Add(legend1);
-			this.myChart.Location = new System.Drawing.Point(0, 0);
-			this.myChart.Name = "myChart";
-			this.myChart.Palette = System.Windows.Forms.DataVisualization.Charting.ChartColorPalette.Bright;
-			series1.ChartArea = "ChartArea1";
-			series1.Legend = "Legend1";
-			series1.Name = "Series1";
-			this.myChart.Series.Add(series1);
-			this.myChart.Size = new System.Drawing.Size(400, 300);
-			this.myChart.TabIndex = 0;
-			this.myChart.Text = "chart1";
-			title1.Name = "Title1";
-			title1.Text = "Title1";
-			this.myChart.Titles.Add(title1);
-			// 
-			// HistogramCtrl
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.Controls.Add(this.myChart);
-			this.Name = "HistogramCtrl";
-			this.Size = new System.Drawing.Size(400, 300);
-			((System.ComponentModel.ISupportInitialize)(this.myChart)).EndInit();
-			this.ResumeLayout(false);
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.DataVisualization.Charting.Chart myChart;
-	}
-}

ResultsBrowser/Forms/HistogramCtrl.cs

@@ -1,42 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-using System.Windows.Forms.DataVisualization.Charting;
-
-namespace ResultsBrowser.Forms
-{
-	public partial class HistogramCtrl : UserControl
-	{
-        /// <summary>
-        /// Create user control that displays a bar chart iwth custom X-axis labels.
-        /// </summary>
-        /// <param name="title">Title of the chart displayed at the top</param>
-        /// <param name="values">Values = bar lengths</param>
-        /// <param name="labels">Labels for the X-axis</param>
-		public HistogramCtrl(string title, double[] values, string[] labels)
-		{
-			InitializeComponent();
-
-			if (myChart.Titles.Count > 0) myChart.Titles[0].Text = title;
-
-            if ((myChart.Series.Count > 0) && (values != null))
-			{
-                int startOffset = -1;
-                int endOffset = 1;
-                for (int i = 0; i < Math.Min(values.Length + 1, labels.Length); i++)
-				{
-                    if (i < values.Length) myChart.Series[0].Points.Add(values[i]);
-                    if (!string.IsNullOrEmpty(labels[i]))
-                    {
-                        myChart.ChartAreas[0].AxisX.CustomLabels.Add(new System.Windows.Forms.DataVisualization.Charting.CustomLabel(startOffset, endOffset, labels[i], 0, LabelMarkStyle.None));
-                    }
-                    startOffset = startOffset + 1;
-                    endOffset = endOffset + 1;
-                }
-			}
-		}
-	}
-}

ResultsBrowser/Forms/HistogramCtrl.resx

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

ResultsBrowser/Forms/HistogramDlg.Designer.cs

@@ -1,150 +0,0 @@
-namespace ResultsBrowser.Forms
-{
-    partial class HistogramDlg
-    {
-        /// <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.splitContainer2 = new System.Windows.Forms.SplitContainer();
-            this.exportButton = new System.Windows.Forms.Button();
-            this.printButton = new System.Windows.Forms.Button();
-            this.closeButton = new System.Windows.Forms.Button();
-            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
-            this.splitContainer1.Panel1.SuspendLayout();
-            this.splitContainer1.Panel2.SuspendLayout();
-            this.splitContainer1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
-            this.splitContainer2.Panel2.SuspendLayout();
-            this.splitContainer2.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";
-            this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
-            // 
-            // splitContainer1.Panel1
-            // 
-            this.splitContainer1.Panel1.Controls.Add(this.flowLayoutPanel1);
-            // 
-            // splitContainer1.Panel2
-            // 
-            this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
-            this.splitContainer1.Size = new System.Drawing.Size(572, 409);
-            this.splitContainer1.SplitterDistance = 320;
-            this.splitContainer1.TabIndex = 0;
-            // 
-            // splitContainer2
-            // 
-            this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
-            this.splitContainer2.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer2.Name = "splitContainer2";
-            // 
-            // splitContainer2.Panel2
-            // 
-            this.splitContainer2.Panel2.Controls.Add(this.exportButton);
-            this.splitContainer2.Panel2.Controls.Add(this.printButton);
-            this.splitContainer2.Panel2.Controls.Add(this.closeButton);
-            this.splitContainer2.Size = new System.Drawing.Size(572, 85);
-            this.splitContainer2.SplitterDistance = 249;
-            this.splitContainer2.TabIndex = 0;
-            // 
-            // exportButton
-            // 
-            this.exportButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.exportButton.Location = new System.Drawing.Point(103, 21);
-            this.exportButton.Name = "exportButton";
-            this.exportButton.Size = new System.Drawing.Size(94, 41);
-            this.exportButton.TabIndex = 1;
-            this.exportButton.Text = "Export";
-            this.exportButton.UseVisualStyleBackColor = true;
-            // 
-            // printButton
-            // 
-            this.printButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.printButton.Location = new System.Drawing.Point(4, 21);
-            this.printButton.Name = "printButton";
-            this.printButton.Size = new System.Drawing.Size(94, 41);
-            this.printButton.TabIndex = 0;
-            this.printButton.Text = "Print";
-            this.printButton.UseVisualStyleBackColor = true;
-            // 
-            // closeButton
-            // 
-            this.closeButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.closeButton.Location = new System.Drawing.Point(203, 21);
-            this.closeButton.Name = "closeButton";
-            this.closeButton.Size = new System.Drawing.Size(94, 41);
-            this.closeButton.TabIndex = 2;
-            this.closeButton.Text = "Close";
-            this.closeButton.UseVisualStyleBackColor = true;
-            this.closeButton.Click += new System.EventHandler(this.closeButton_Click);
-            // 
-            // flowLayoutPanel1
-            // 
-            this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);
-            this.flowLayoutPanel1.Name = "flowLayoutPanel1";
-            this.flowLayoutPanel1.Size = new System.Drawing.Size(572, 320);
-            this.flowLayoutPanel1.TabIndex = 0;
-            // 
-            // HistogramDlg
-            // 
-            this.AcceptButton = this.closeButton;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(572, 409);
-            this.Controls.Add(this.splitContainer1);
-            this.Name = "HistogramDlg";
-            this.Text = "HistogramDlg";
-            this.Load += new System.EventHandler(this.HistogramDlg_Load);
-            this.splitContainer1.Panel1.ResumeLayout(false);
-            this.splitContainer1.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
-            this.splitContainer1.ResumeLayout(false);
-            this.splitContainer2.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
-            this.splitContainer2.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.SplitContainer splitContainer1;
-        private System.Windows.Forms.SplitContainer splitContainer2;
-        private System.Windows.Forms.Button closeButton;
-		private System.Windows.Forms.Button printButton;
-        private System.Windows.Forms.Button exportButton;
-        private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
-    }
-}

ResultsBrowser/Forms/HistogramDlg.cs

@@ -1,152 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Globalization;
-using System.IO;
-using System.Windows.Forms;
-using System.Windows.Forms.DataVisualization.Charting;
-using Results.Entities;
-using ResultsBrowser.Resources;
-using ResultsBrowser.Output.Printers.Statistics;
-
-namespace ResultsBrowser.Forms
-{
-    public partial class HistogramDlg : Form
-    {
-        const int NrBins = 11;
-
-        IList<WaterMeter> waterMeters;
-        HistogramOptionsDlg options;
-
-        public HistogramDlg(IList<WaterMeter> waterMeters, HistogramOptionsDlg options, string title)
-        {
-            InitializeComponent();
-
-            this.waterMeters = waterMeters;
-            this.options = options;
-			Text = title;
-
-            closeButton.Text = Strings.OkBtnText;
-			printButton.Text = Strings.Print;
-        }
-
-        private void HistogramDlg_Load(object sender, EventArgs e)
-        {
-            CalculateAndDraw();
-        }
-
-        void CalculateAndDraw()
-        {
-            for (int i = 0; i < options.SelectedItems.Count; i++)
-            {
-                Results.WMeterRsltItemSpec item = options.SelectedItems[i];
-
-                try
-                {
-                    /// Find minimum and maximum
-                    double min = Double.MaxValue;
-                    double max = Double.MinValue;
-                    double sum = 0;
-                    int count = 0;
-                    foreach (var wm in waterMeters)
-                    {
-                        string strValue = item.Print(wm);
-                        double value;
-			            if (!double.TryParse(strValue, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign, CultureInfo.CurrentCulture, out value) &&
-			                !double.TryParse(strValue, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign, CultureInfo.InvariantCulture, out value))
-                        {
-                            throw new Exception(string.Format("{0} is not a number, cannot calculate histogram", item.Caption));
-                        }
-
-                        sum += value;
-                        count++;
-                        if (min > value) min = value;
-                        if (max < value) max = value;
-                    }
-
-                    double mean = (count != 0) ? (sum / count) : 0;     /// Prevent division by zero
-
-                    ///
-                    /// Determine limits for bins
-                    /// 
-                    double[] binHiLim;
-                    string[] labels;
-                    if ((-0.55 <= min) && (max <= 0.55))
-                    {
-                        labels   = new string[] { "-0.6",    "", "-0.4",    "", "-0.2",    "",   "0",   "", "0.2",   "", "0.4",   "", "0.6" };
-                        binHiLim = new double[] {  -0.45,  -0.35, -0.25,  -0.15, -0.05,  0.05, 0.15,  0.25, 0.35,  0.45, 0.55 };
-                    }
-                    else if ((-1.1 <= min) && (max <= 1.1))
-                    {
-                        labels   = new string[] { "-1.2",   "", "-0.8",   "", "-0.4",   "",  "0",  "", "0.4",  "", "0.8",  "", "1.2" };
-                        binHiLim = new double[] { -0.9,   -0.7, -0.5,   -0.3, -0.1,  0.1, 0.3,   0.5, 0.7,   0.9, 1.1 };
-                    }
-                    else if ((-2.2 <= min) && (max <= 2.2))
-                    {
-                        labels = new string[] { "-2.4", "", "-1.6", "", "-0.8", "", "0", "", "0.8", "", "1.6", "", "2.4" };
-                        binHiLim = new double[] { -1.8, -1.4, -1.0, -0.6, -0.2, 0.2, 0.6, 1.0, 1.4, 1.8, 2.2 };
-                    }
-                    else if ((-4.4 <= min) && (max <= 4.4))
-                    {
-                        labels   = new string[] { "-4.8", "", "-3.2", "", "-1.6", "", "0", "", "1.6", "", "3.2", "", "4.8" };
-                        binHiLim = new double[] { -3.6, -2.8, -2.0, -1.2, -0.4, 0.4, 1.2, 2.0, 2.8, 3.6, 4.4  };
-                    }
-                    else
-                    {
-                        labels   = new string[] { "-9.6",   "", "-6.4",   "", "-3.2",   "", "0",  "", "3.2",  "", "6.4",  "", "9.6" };
-                        binHiLim = new double[] { -7.2,   -5.6, -4.0,   -2.4, -0.8, 0.8, 2.4,   4.0, 5.6,   7.2, 8.8 };
-                    }
-
-                    int nrBins = Math.Min(labels.Length - 1, binHiLim.Length + 1);
-
-                    double[] bins = new double[nrBins];
-                    for (int j = 0; j < nrBins; j++) bins[j] = 0;
-
-					/// Calculate bins
-                    foreach (var wm in waterMeters)
-                    {
-                        string strValue = item.Print(wm);
-                        double value;
-			            if (!double.TryParse(strValue, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign, CultureInfo.CurrentCulture, out value) &&
-			                !double.TryParse(strValue, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign, CultureInfo.InvariantCulture, out value))
-                        {
-                            throw new Exception(string.Format("{0} is not a number, cannot calculate histogram", item.Caption));
-                        }
-
-                        for (int j = 0; j < nrBins - 1; j++)
-                        {
-                            if (value < binHiLim[j])
-                            {
-                                bins[j] += 1.0;
-                                break;
-                            }
-                        }
-                        if (value >= binHiLim[nrBins - 2])
-                        {
-                            bins[nrBins - 1] += 1.0;
-                        }
-                    }
-
-                    ///
-                    /// Draw
-                    ///
-					HistogramCtrl histo = new HistogramCtrl(string.Format("{0}   mean = {1}", item.Caption, mean.ToString("F3")), bins, labels);
-					flowLayoutPanel1.Controls.Add(histo);
-                }
-                catch (Exception exc)
-                {
-					string msg = exc.Message;
-                }
-            }
-        }
-
-        private void closeButton_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.OK;
-            Close();
-        }
-    }
-}

ResultsBrowser/Forms/HistogramDlg.resx

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

ResultsBrowser/Forms/HistogramOptionsDlg.Designer.cs

@@ -1,91 +0,0 @@
-namespace ResultsBrowser.Forms
-{
-    partial class HistogramOptionsDlg
-    {
-        /// <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.cancelButton = new System.Windows.Forms.Button();
-            this.okButton = new System.Windows.Forms.Button();
-            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
-            this.SuspendLayout();
-            // 
-            // cancelButton
-            // 
-            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.cancelButton.Location = new System.Drawing.Point(380, 302);
-            this.cancelButton.Name = "cancelButton";
-            this.cancelButton.Size = new System.Drawing.Size(95, 38);
-            this.cancelButton.TabIndex = 9;
-            this.cancelButton.Text = "Cancel";
-            this.cancelButton.UseVisualStyleBackColor = true;
-            this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
-            // 
-            // okButton
-            // 
-            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.okButton.Location = new System.Drawing.Point(269, 302);
-            this.okButton.Name = "okButton";
-            this.okButton.Size = new System.Drawing.Size(95, 38);
-            this.okButton.TabIndex = 8;
-            this.okButton.Text = "OK";
-            this.okButton.UseVisualStyleBackColor = true;
-            this.okButton.Click += new System.EventHandler(this.okButton_Click);
-            // 
-            // flowLayoutPanel1
-            // 
-            this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
-            this.flowLayoutPanel1.Location = new System.Drawing.Point(12, 12);
-            this.flowLayoutPanel1.Name = "flowLayoutPanel1";
-            this.flowLayoutPanel1.Size = new System.Drawing.Size(479, 271);
-            this.flowLayoutPanel1.TabIndex = 10;
-            // 
-            // HistogramOptionsDlg
-            // 
-            this.AcceptButton = this.okButton;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.CancelButton = this.cancelButton;
-            this.ClientSize = new System.Drawing.Size(503, 355);
-            this.Controls.Add(this.flowLayoutPanel1);
-            this.Controls.Add(this.cancelButton);
-            this.Controls.Add(this.okButton);
-            this.Name = "HistogramOptionsDlg";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "HistogramOptionsDlg";
-            this.Load += new System.EventHandler(this.HistogramOptionsDlg_Load);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Button cancelButton;
-        private System.Windows.Forms.Button okButton;
-        private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
-    }
-}

ResultsBrowser/Forms/HistogramOptionsDlg.cs

@@ -1,67 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-using ResultsBrowser.Resources;
-
-namespace ResultsBrowser.Forms
-{
-    public partial class HistogramOptionsDlg : Form
-    {
-		IList<Results.WMeterRsltItemSpec> items;
-        public IList<Results.WMeterRsltItemSpec> SelectedItems;
-
-        IList<CheckBox> checkBoxes; 
-
-		public HistogramOptionsDlg(IList<Results.WMeterRsltItemSpec> items)
-        {
-            InitializeComponent();
-			this.items = items;
-
-            checkBoxes = new List<CheckBox>();
-        }
-
-        private void HistogramOptionsDlg_Load(object sender, EventArgs e)
-        {
-            Localize();
-
-			foreach (var item in items)
-			{
-                CheckBox cb = new CheckBox();
-                cb.Text = item.Caption;
-                cb.Checked = false;
-                flowLayoutPanel1.Controls.Add(cb);
-                checkBoxes.Add(cb);
-			}
-		}
-
-        void Localize()
-        {
-            Text = Strings.Statistics;
-            okButton.Text = Strings.OkBtnText;
-            cancelButton.Text = Strings.CancelBtnText;
-		}
-
-        private void okButton_Click(object sender, EventArgs e)
-        {
-            SelectedItems = new List<Results.WMeterRsltItemSpec>();
-            for (int i = 0; i < items.Count; i++)
-            {
-                if (checkBoxes[i].Checked) SelectedItems.Add(items[i]);
-            }
-
-            //Program.LocalSettings.RowItemCaption = RowItem.Caption;
-            // ...
-            //Program.LocalSettings.Save();
-
-            DialogResult = DialogResult.OK;
-            Close();
-        }
-
-        private void cancelButton_Click(object sender, EventArgs e)
-        {
-        }
-    }
-}

ResultsBrowser/Forms/HistogramOptionsDlg.resx

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

ResultsBrowser/Forms/PrinterConfigDlg.cs

@@ -91,7 +91,7 @@ namespace ResultsBrowser.Forms
 			cfgControl.Config = printerCfg;
 			cfgControl.Config.ItemNr = 0;
 
-            TBF.BenchControl.ComponentParametersDlg cfgForm = new TBF.BenchControl.ComponentParametersDlg();
+			TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg();
 			cfgForm.TbfComponents = new List<Component>();
 
 			cfgForm.ComponentCfgCtrl = cfgControl;

ResultsBrowser/Forms/StatisticsDlg.cs

@@ -1,7 +1,4 @@
-///
-/// Copyright (c) 2016-2019 Sensus Slovensko a.s.
-///
-using System;
+using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
 using Results.Entities;
@@ -14,7 +11,22 @@ namespace ResultsBrowser.Forms
     public partial class StatisticsDlg : Form
     {
         IList<WaterMeter> waterMeters;
-        StatisticsOptionsDlg options;
+
+        bool twoDim;
+
+        Results.WMeterRsltItemSpec rowItem;
+		Results.WMeterRsltItemSpec rowItem2;
+		Results.WMeterRsltItemSpec rowItem3;
+		Results.WMeterRsltItemSpec columnItem;
+		Results.WMeterRsltItemSpec columnItem2;
+		Results.WMeterRsltItemSpec columnItem3;
+
+		string rowTestSpec;
+		string rowTestSpec2;
+		string rowTestSpec3;
+		string columnTestSpec;
+		string columnTestSpec2;
+		string columnTestSpec3;
 
         IList<string> rowValues;
         IList<string> columnValues;
@@ -24,14 +36,23 @@ namespace ResultsBrowser.Forms
 		string title;
 
 
-		public StatisticsDlg(IList<WaterMeter> waterMeters, StatisticsOptionsDlg options,
+		public StatisticsDlg(IList<WaterMeter> waterMeters, bool twoDim,
+							 Results.WMeterRsltItemSpec rowItem,
+							 Results.WMeterRsltItemSpec rowItem2,
+							 Results.WMeterRsltItemSpec rowItem3,
+							 Results.WMeterRsltItemSpec columnItem,
+							 Results.WMeterRsltItemSpec columnItem2,
+							 Results.WMeterRsltItemSpec columnItem3,
+							 string rowTestSpec,
+							 string rowTestSpec2,
+							 string rowTestSpec3,
+							 string columnTestSpec,
+							 string columnTestSpec2,
+							 string columnTestSpec3,
 							 DateTime startDate, DateTime endDate)
         {
             InitializeComponent();
 
-            this.waterMeters = waterMeters;
-            this.options = options;
-
 			if (!string.IsNullOrEmpty(Program.LocalSettings.TimePeriodFormat) && (startDate != new DateTime(0)) && (endDate != new DateTime(0)))
 			{
 				title = string.Format(Program.LocalSettings.TimePeriodFormat, startDate, endDate);
@@ -45,6 +66,26 @@ namespace ResultsBrowser.Forms
 
             closeButton.Text = Strings.OkBtnText;
 			printButton.Text = Strings.Print;
+
+            this.waterMeters = waterMeters;
+
+            this.twoDim = twoDim;
+
+			this.rowItem = rowItem;
+			this.rowItem2 = rowItem2;
+			this.rowItem3 = rowItem3;
+
+			this.columnItem = columnItem;
+			this.columnItem2 = columnItem2;
+			this.columnItem3 = columnItem3;
+
+            this.rowTestSpec = rowTestSpec;
+			this.rowTestSpec2 = rowTestSpec2;
+			this.rowTestSpec3 = rowTestSpec3;
+
+			this.columnTestSpec = columnTestSpec;
+			this.columnTestSpec2 = columnTestSpec2;
+			this.columnTestSpec3 = columnTestSpec3;
         }
 
         private void StatisticsDlg_Load(object sender, EventArgs e)
@@ -64,16 +105,16 @@ namespace ResultsBrowser.Forms
                 ///
                 foreach (var wm in waterMeters)
                 {
-                    string value = options.RowItem.Print(wm);
-					if (options.RowItem2 != null) value = value + " | " + options.RowItem2.Print(wm);
-					if (options.RowItem3 != null) value = value + " | " + options.RowItem3.Print(wm);
+                    string value = rowItem.Print(wm);
+					if (rowItem2 != null) value = value + " | " + rowItem2.Print(wm);
+					if (rowItem3 != null) value = value + " | " + rowItem3.Print(wm);
 					if (!rowValues.Contains(value)) rowValues.Add(value);
 
-                    if (options.TwoDim)
+                    if (twoDim)
                     {
-                        value = options.ColumnItem.Print(wm);
-						if (options.ColumnItem2 != null) value = value + " | " + options.ColumnItem2.Print(wm);
-						if (options.ColumnItem3 != null) value = value + " | " + options.ColumnItem3.Print(wm);
+                        value = columnItem.Print(wm);
+						if (columnItem2 != null) value = value + " | " + columnItem2.Print(wm);
+						if (columnItem3 != null) value = value + " | " + columnItem3.Print(wm);
 						if (!columnValues.Contains(value)) columnValues.Add(value);
                     }
                 }
@@ -88,17 +129,17 @@ namespace ResultsBrowser.Forms
                 {
                     for (int row = 0; row < rowValues.Count; row++)
                     {
-						string rowValue = options.RowItem.Print(wm);
-						if (options.RowItem2 != null) rowValue = rowValue + " | " + options.RowItem2.Print(wm);
-						if (options.RowItem3 != null) rowValue = rowValue + " | " + options.RowItem3.Print(wm);
+						string rowValue = rowItem.Print(wm);
+						if (rowItem2 != null) rowValue = rowValue + " | " + rowItem2.Print(wm);
+						if (rowItem3 != null) rowValue = rowValue + " | " + rowItem3.Print(wm);
 
-                        if (options.TwoDim)
+                        if (twoDim)
                         {
                             for (int column = 0; column < columnsCount; column++)
                             {
-								string columnValue = options.ColumnItem.Print(wm);
-								if (options.ColumnItem2 != null) columnValue = columnValue + " | " + options.ColumnItem2.Print(wm);
-								if (options.ColumnItem3 != null) columnValue = columnValue + " | " + options.ColumnItem3.Print(wm);
+								string columnValue = columnItem.Print(wm);
+								if (columnItem2 != null) columnValue = columnValue + " | " + columnItem2.Print(wm);
+								if (columnItem3 != null) columnValue = columnValue + " | " + columnItem3.Print(wm);
 
 								if (rowValue == rowValues[row] && columnValue == columnValues[column])
 								{
@@ -123,7 +164,7 @@ namespace ResultsBrowser.Forms
                 statisticsListView.Columns.Add(" ", 200);
                 for (int column = 0; column < columnsCount; column++)
                 {
-                    statisticsListView.Columns.Add((options.TwoDim ? columnValues[column] : Strings.Count), 70);
+                    statisticsListView.Columns.Add((twoDim ? columnValues[column] : Strings.Count), 70);
                 }
 
                 for (int row = 0; row < rowValues.Count; row++)
@@ -156,7 +197,7 @@ namespace ResultsBrowser.Forms
 			table[0, 0] = string.Empty;
 			for (int column = 0; column < columnsCount; column++)
 			{
-				table[0, column + 1] = (options.TwoDim ? columnValues[column] : Strings.Count);
+				table[0, column + 1] = (twoDim ? columnValues[column] : Strings.Count);
 			}
 
 			for (int row = 0; row < rowValues.Count; row++)
@@ -193,7 +234,7 @@ namespace ResultsBrowser.Forms
                 {
                     using (TextWriter writer = new StreamWriter(dlg.FileName, false, System.Text.Encoding.UTF8))
                     {
-                        if (options.TwoDim)
+                        if (twoDim)
                         {
                             /// Write column headers
                             for (int i = 0; i < columnValues.Count; i++)
@@ -204,7 +245,7 @@ namespace ResultsBrowser.Forms
                         }
                         else
                         {
-                            writer.WriteLine(string.Format("\"{0}\";\"{1}\"", options.RowItem.Caption, Strings.Count));
+                            writer.WriteLine(string.Format("\"{0}\";\"{1}\"", rowItem.Caption, Strings.Count));
                         }
 
                         int nrColumns = Math.Max(1, columnValues.Count);

ResultsBrowser/Forms/StatisticsOptionsDlg.cs

@@ -1,7 +1,4 @@
-///
-/// Copyright (c) 2016-2019 Sensus Slovensko a.s.
-///
-using System;
+using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
 using ResultsBrowser.Resources;

ResultsBrowser/LocalSettings.cs

@@ -109,7 +109,7 @@ namespace ResultsBrowser
             
         public LocalSettings()
         {
-#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
+#if TURA_IPERL || TURA_SPECIAL
             Bench1 = "WR10";
             Bench2 = "WR11";
             Bench3 = "WR13";

ResultsBrowser/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.18.1273.0")]
-[assembly: AssemblyFileVersion("2.18.1273.0")]
+[assembly: AssemblyVersion("2.18.1114.0")]
+[assembly: AssemblyFileVersion("2.18.1114.0")]

ResultsBrowser/Resources/Strings.cs.resx

@@ -129,6 +129,9 @@
   <data name="Columns" xml:space="preserve">
     <value>Slopuce</value>
   </data>
+  <data name="CombinedBtnText" xml:space="preserve">
+    <value>Kombinovaný</value>
+  </data>
   <data name="Connection_string" xml:space="preserve">
     <value>Řetězec pro spojní s databázou</value>
   </data>
@@ -195,8 +198,8 @@
   <data name="Save_filters" xml:space="preserve">
     <value>Uložit filtry</value>
   </data>
-  <data name="Selected_language_not_supported" xml:space="preserve">
-    <value>Vybraný jazyk není podporován.</value>
+  <data name="Selected_results" xml:space="preserve">
+    <value>Vybrané výsledky</value>
   </data>
   <data name="Select_a_filter" xml:space="preserve">
     <value>Vyberte filtr</value>
@@ -207,6 +210,9 @@
   <data name="Settings" xml:space="preserve">
     <value>Nastavení</value>
   </data>
+  <data name="SingleBtnText" xml:space="preserve">
+    <value>Jednoduchý</value>
+  </data>
   <data name="Statistics" xml:space="preserve">
     <value>Statistiky</value>
   </data>
@@ -222,79 +228,16 @@
   <data name="To" xml:space="preserve">
     <value>Do</value>
   </data>
+  <data name="UnlockBtnText" xml:space="preserve">
+    <value>Odemknout</value>
+  </data>
+  <data name="Water_Meter" xml:space="preserve">
+    <value>Vodoměr</value>
+  </data>
   <data name="Print" xml:space="preserve">
     <value>Vytisknout</value>
   </data>
-  <data name="Add" xml:space="preserve">
-    <value>&amp;Přidat &gt;</value>
-  </data>
-  <data name="Histograms" xml:space="preserve">
-    <value>Histogramy</value>
-  </data>
-  <data name="All_files" xml:space="preserve">
-    <value>Všechny soubory</value>
-  </data>
-  <data name="Count" xml:space="preserve">
-    <value>Počet</value>
-  </data>
-  <data name="Data" xml:space="preserve">
-    <value>Údaje</value>
-  </data>
-  <data name="Error_exporting_results" xml:space="preserve">
-    <value>Chyba při exportování výsledků</value>
-  </data>
-  <data name="Format" xml:space="preserve">
-    <value>Formát</value>
-  </data>
-  <data name="Message" xml:space="preserve">
-    <value>Správa</value>
-  </data>
-  <data name="Name" xml:space="preserve">
-    <value>Jméno</value>
-  </data>
-  <data name="No_printer_defined" xml:space="preserve">
-    <value>Není zadefinována tiskárna</value>
-  </data>
-  <data name="No_program_settings_found" xml:space="preserve">
-    <value>Nebyli nalezeny nastavení programu.</value>
-  </data>
-  <data name="Page_orientation" xml:space="preserve">
-    <value>Otočení strany</value>
-  </data>
-  <data name="Printer" xml:space="preserve">
-    <value>Tiskárna</value>
-  </data>
-  <data name="Printing_completed" xml:space="preserve">
-    <value>Tisk ukončen</value>
-  </data>
-  <data name="Printing_failed" xml:space="preserve">
-    <value>Chyba při tisku</value>
-  </data>
-  <data name="Query_files" xml:space="preserve">
-    <value>Definice dotazů</value>
-  </data>
-  <data name="Question" xml:space="preserve">
-    <value>Otázka</value>
-  </data>
-  <data name="Using_default_settings" xml:space="preserve">
-    <value>Budou použity výchozí nastavení.</value>
-  </data>
-  <data name="Using_English" xml:space="preserve">
-    <value>Bude použita Angličtina.</value>
-  </data>
-  <data name="Warning" xml:space="preserve">
-    <value>Upozornění</value>
-  </data>
-  <data name="Yes_Portrait_No_Landscape" xml:space="preserve">
-    <value>Ano = na výšku, Ne = na šířku</value>
-  </data>
-  <data name="Component" xml:space="preserve">
-    <value>Komponent</value>
-  </data>
-  <data name="Configure" xml:space="preserve">
-    <value>Nakonfigurovat</value>
-  </data>
-  <data name="Configure_printer" xml:space="preserve">
-    <value>Nakonfigurovat tiskárnu</value>
+  <data name="Add_data_from_Oracle" xml:space="preserve">
+    <value>Dohledej údaje z Oracle</value>
   </data>
 </root>

ResultsBrowser/Resources/Strings.de.resx

@@ -186,6 +186,9 @@
   <data name="Save_filters" xml:space="preserve">
     <value>Filter speichern</value>
   </data>
+  <data name="Selected_results" xml:space="preserve">
+    <value>Ergebnisse ausgewählt</value>
+  </data>
   <data name="Select_a_filter" xml:space="preserve">
     <value>Wählen Sie einen Filter</value>
   </data>
@@ -195,6 +198,9 @@
   <data name="Settings" xml:space="preserve">
     <value>Einstellungen</value>
   </data>
+  <data name="SingleBtnText" xml:space="preserve">
+    <value>Einzel</value>
+  </data>
   <data name="Statistics" xml:space="preserve">
     <value>Statistiken</value>
   </data>
@@ -210,6 +216,12 @@
   <data name="To" xml:space="preserve">
     <value>Zu</value>
   </data>
+  <data name="UnlockBtnText" xml:space="preserve">
+    <value>Ändern</value>
+  </data>
+  <data name="Water_Meter" xml:space="preserve">
+    <value>Wasserzähler</value>
+  </data>
   <data name="Error_displaying_results" xml:space="preserve">
     <value>Fehler beim Anzeigen der Ergebnisse</value>
   </data>
@@ -219,6 +231,9 @@
   <data name="Error_serializing_filters" xml:space="preserve">
     <value>Fehler Serialisierung Filter</value>
   </data>
+  <data name="CombinedBtnText" xml:space="preserve">
+    <value>Verbund</value>
+  </data>
   <data name="Count" xml:space="preserve">
     <value>Anzahl</value>
   </data>

ResultsBrowser/Resources/Strings.fr.resx

@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Error" xml:space="preserve">
-    <value>Erreur</value>
-  </data>
-  <data name="Test_bench" xml:space="preserve">
-    <value>Banc essai</value>
-  </data>
-  <data name="Name" xml:space="preserve">
-    <value>Prénom</value>
-  </data>
-  <data name="CancelBtnText" xml:space="preserve">
-    <value>Annuler</value>
-  </data>
-  <data name="OkBtnText" xml:space="preserve">
-    <value>Ok</value>
-  </data>
-  <data name="ConfigureDatabaseText" xml:space="preserve">
-    <value>Configurer les bancs d'essai (mot de passe requis)</value>
-  </data>
-  <data name="ExitBtnText" xml:space="preserve">
-    <value>Quitter </value>
-  </data>
-  <data name="Procedure" xml:space="preserve">
-    <value>Procédure</value>
-  </data>
-  <data name="Test" xml:space="preserve">
-    <value>Tester</value>
-  </data>
-  <data name="Component" xml:space="preserve">
-    <value>Composant</value>
-  </data>
-  <data name="Configure" xml:space="preserve">
-    <value>Configurer</value>
-  </data>
-  <data name="Printer" xml:space="preserve">
-    <value>Imprimante</value>
-  </data>
-  <data name="Question" xml:space="preserve">
-    <value>Question</value>
-  </data>
-  <data name="Connection_string" xml:space="preserve">
-    <value>Chaîne connexion</value>
-  </data>
-  <data name="Add" xml:space="preserve">
-    <value>&amp;Ajouter &gt;</value>
-  </data>
-  <data name="Message" xml:space="preserve">
-    <value>Message</value>
-  </data>
-  <data name="Data" xml:space="preserve">
-    <value>Données</value>
-  </data>
-  <data name="Protocol" xml:space="preserve">
-    <value>Protocole</value>
-  </data>
-  <data name="Serial_Number" xml:space="preserve">
-    <value>Numéro série</value>
-  </data>
-  <data name="Language" xml:space="preserve">
-    <value>Langue</value>
-  </data>
-  <data name="Add_filter" xml:space="preserve">
-    <value>Ajouter filtre</value>
-  </data>
-  <data name="Clear_filters" xml:space="preserve">
-    <value>Effacer  filtres</value>
-  </data>
-  <data name="Execute_query" xml:space="preserve">
-    <value>Exécuter ordre</value>
-  </data>
-  <data name="Export_query_results" xml:space="preserve">
-    <value>Résultats exportation</value>
-  </data>
-  <data name="Filters" xml:space="preserve">
-    <value>Filtres</value>
-  </data>
-  <data name="Format_of_results" xml:space="preserve">
-    <value>Configurer la sortie</value>
-  </data>
-  <data name="Load_filters" xml:space="preserve">
-    <value>charge filters</value>
-  </data>
-  <data name="Print_query_results" xml:space="preserve">
-    <value>Résultats impression</value>
-  </data>
-  <data name="Query_results" xml:space="preserve">
-    <value>Résultats requête</value>
-  </data>
-  <data name="Results_Browser" xml:space="preserve">
-    <value>Résultats Browser</value>
-  </data>
-  <data name="Save_filters" xml:space="preserve">
-    <value>Enregistrer filtres</value>
-  </data>
-  <data name="Settings" xml:space="preserve">
-    <value>Réglages</value>
-  </data>
-  <data name="Test_benches" xml:space="preserve">
-    <value>Bancs essai</value>
-  </data>
-  <data name="RetryDatabaseText" xml:space="preserve">
-    <value>Recommencez</value>
-  </data>
-  <data name="Date" xml:space="preserve">
-    <value>Date</value>
-  </data>
-  <data name="From" xml:space="preserve">
-    <value>De</value>
-  </data>
-  <data name="To" xml:space="preserve">
-    <value>À</value>
-  </data>
-  <data name="Statistics" xml:space="preserve">
-    <value>Statistiques</value>
-  </data>
-  <data name="Columns" xml:space="preserve">
-    <value>colonnes</value>
-  </data>
-  <data name="Rows" xml:space="preserve">
-    <value>Lignes</value>
-  </data>
-  <data name="Select_a_filter" xml:space="preserve">
-    <value>Sélectionnez filtre</value>
-  </data>
-  <data name="Error_displaying_results" xml:space="preserve">
-    <value>Erreur affichage résultats</value>
-  </data>
-  <data name="All_files" xml:space="preserve">
-    <value>Tous fichiers</value>
-  </data>
-  <data name="Error_saving_file" xml:space="preserve">
-    <value>Fichier sauvegarde erreurs</value>
-  </data>
-  <data name="Error_serializing_filters" xml:space="preserve">
-    <value>Erreurs sérialisation filtres</value>
-  </data>
-  <data name="Query_files" xml:space="preserve">
-    <value>Fichiers requête</value>
-  </data>
-  <data name="No_program_settings_found" xml:space="preserve">
-    <value>Aucun paramètre programme trouvé</value>
-  </data>
-  <data name="Using_default_settings" xml:space="preserve">
-    <value>Utilisation  valeurs par  défaut</value>
-  </data>
-  <data name="Selected_language_not_supported" xml:space="preserve">
-    <value>Langue sélectionnée non prise en charge</value>
-  </data>
-  <data name="Using_English" xml:space="preserve">
-    <value>Utilisation anglais</value>
-  </data>
-  <data name="Warning" xml:space="preserve">
-    <value>Attention</value>
-  </data>
-  <data name="Count" xml:space="preserve">
-    <value>Compter</value>
-  </data>
-  <data name="Format" xml:space="preserve">
-    <value>Format</value>
-  </data>
-  <data name="Page_orientation" xml:space="preserve">
-    <value>Page orientation</value>
-  </data>
-  <data name="Yes_Portrait_No_Landscape" xml:space="preserve">
-    <value>Oui portrait non paysage</value>
-  </data>
-  <data name="Print" xml:space="preserve">
-    <value>Impression</value>
-  </data>
-  <data name="Configure_printer" xml:space="preserve">
-    <value>Configurer impréssion</value>
-  </data>
-  <data name="No_printer_defined" xml:space="preserve">
-    <value>Aucune imprimante définie</value>
-  </data>
-  <data name="Printing_failed" xml:space="preserve">
-    <value>Impression échouée</value>
-  </data>
-  <data name="Printing_completed" xml:space="preserve">
-    <value>Impression terminée</value>
-  </data>
-  <data name="Error_exporting_results" xml:space="preserve">
-    <value>Erreur exportation résultats</value>
-  </data>
-  <data name="Histograms" xml:space="preserve">
-    <value>histogrammes</value>
-  </data>
-</root>

ResultsBrowser/Resources/Strings.it.resx

@@ -117,66 +117,579 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Confirmation" xml:space="preserve">
+    <value>conferma</value>
+  </data>
+  <data name="Do_you_want_to_save_the_procedure" xml:space="preserve">
+    <value>vuoi salvare la procedura?</value>
+  </data>
   <data name="Error" xml:space="preserve">
     <value>errore</value>
   </data>
+  <data name="Error_loading_users_from_the_database" xml:space="preserve">
+    <value>errore del caricamento del data base</value>
+  </data>
+  <data name="Failed_to_create_a_sample_database" xml:space="preserve">
+    <value>Impossibile creare un database di esempio:</value>
+  </data>
+  <data name="Failed_to_export_the_database" xml:space="preserve">
+    <value>impossibile esportare il database</value>
+  </data>
+  <data name="Invalid_user_password_or_bench" xml:space="preserve">
+    <value>utente password o banco non valido</value>
+  </data>
   <data name="Test_bench" xml:space="preserve">
     <value>banco prova</value>
   </data>
+  <data name="MaxChars" xml:space="preserve">
+    <value>max _X_ caratteri alfanumerici</value>
+  </data>
+  <data name="close" xml:space="preserve">
+    <value>Chiudi</value>
+  </data>
+  <data name="Diverter" xml:space="preserve">
+    <value>deviatore</value>
+  </data>
+  <data name="Emptying_valve" xml:space="preserve">
+    <value>valvola di svuotamento</value>
+  </data>
   <data name="Name" xml:space="preserve">
     <value>nome</value>
   </data>
+  <data name="Reference" xml:space="preserve">
+    <value>riferimento</value>
+  </data>
+  <data name="Reg_valve" xml:space="preserve">
+    <value>regolazione valvola</value>
+  </data>
+  <data name="Balance" xml:space="preserve">
+    <value>bilancia</value>
+  </data>
+  <data name="Duration_s" xml:space="preserve">
+    <value>durata [s]</value>
+  </data>
+  <data name="no" xml:space="preserve">
+    <value>no</value>
+  </data>
+  <data name="New_bench_path_name" xml:space="preserve">
+    <value>P banco</value>
+  </data>
+  <data name="New_feeding_path_name" xml:space="preserve">
+    <value>P di avanzamento</value>
+  </data>
+  <data name="New_output_path_name" xml:space="preserve">
+    <value>PQ</value>
+  </data>
+  <data name="New_procedure_name" xml:space="preserve">
+    <value>procedura</value>
+  </data>
+  <data name="New_sensors_path_name" xml:space="preserve">
+    <value>P sens</value>
+  </data>
+  <data name="New_test_name" xml:space="preserve">
+    <value>prova</value>
+  </data>
+  <data name="New_name_copy" xml:space="preserve">
+    <value>Copia</value>
+  </data>
+  <data name="Correction_g" xml:space="preserve">
+    <value>correzione [g]</value>
+  </data>
+  <data name="Nr" xml:space="preserve">
+    <value>numero</value>
+  </data>
+  <data name="Mass_kg" xml:space="preserve">
+    <value>massa [kg]</value>
+  </data>
+  <data name="AddBtnText" xml:space="preserve">
+    <value>inserisci</value>
+  </data>
   <data name="CancelBtnText" xml:space="preserve">
     <value>Annulla</value>
   </data>
+  <data name="CloseBtnText" xml:space="preserve">
+    <value>Chiudi</value>
+  </data>
+  <data name="LockBtnText" xml:space="preserve">
+    <value>serratura</value>
+  </data>
+  <data name="RemoveBtnText" xml:space="preserve">
+    <value>rimuovere</value>
+  </data>
   <data name="OkBtnText" xml:space="preserve">
     <value>ok</value>
   </data>
+  <data name="Correction_lph" xml:space="preserve">
+    <value>correzione [l/h]</value>
+  </data>
+  <data name="Correction_mbar" xml:space="preserve">
+    <value>correzione [mbar]</value>
+  </data>
+  <data name="Flow_m3h" xml:space="preserve">
+    <value>flusso [m3/h]</value>
+  </data>
+  <data name="Invalid_username_or_password" xml:space="preserve">
+    <value>Username o password non validi</value>
+  </data>
+  <data name="CopyBtnText" xml:space="preserve">
+    <value>copia</value>
+  </data>
+  <data name="DownBtnText" xml:space="preserve">
+    <value>Giù</value>
+  </data>
+  <data name="EditBtnText" xml:space="preserve">
+    <value>Modifica</value>
+  </data>
+  <data name="UpBtnText" xml:space="preserve">
+    <value>Su</value>
+  </data>
+  <data name="NoDatabaseMsg" xml:space="preserve">
+    <value>Impossibile collegarsi al database</value>
+  </data>
   <data name="ConfigureDatabaseText" xml:space="preserve">
     <value>configurare il banco prova (richiesta password)</value>
   </data>
   <data name="ExitBtnText" xml:space="preserve">
     <value>uscita</value>
   </data>
+  <data name="Enter_password" xml:space="preserve">
+    <value>password di ingresso</value>
+  </data>
+  <data name="Invalid_password" xml:space="preserve">
+    <value>Password non valida</value>
+  </data>
+  <data name="Bench_name_conflict_Use_another_name_pls" xml:space="preserve">
+    <value>conflitto nome per banco prova, cambiare nome</value>
+  </data>
+  <data name="DB_was_successfully_created" xml:space="preserve">
+    <value>Il database è stato creato con successo!</value>
+  </data>
+  <data name="DB_will_be_overwritten" xml:space="preserve">
+    <value>il database verrà sovrascritto</value>
+  </data>
+  <data name="Do_you_want_to_proceed" xml:space="preserve">
+    <value>vuoi procedere?</value>
+  </data>
+  <data name="Notification" xml:space="preserve">
+    <value>notifica</value>
+  </data>
+  <data name="NoBenchMsg" xml:space="preserve">
+    <value>nessun banco prova nella configurazione del programma</value>
+  </data>
+  <data name="DescriptionColHdr" xml:space="preserve">
+    <value>Descrizione</value>
+  </data>
   <data name="Procedure" xml:space="preserve">
     <value>procedura</value>
   </data>
   <data name="Test" xml:space="preserve">
     <value>tester</value>
   </data>
+  <data name="Corrected" xml:space="preserve">
+    <value>corretto</value>
+  </data>
+  <data name="Measured" xml:space="preserve">
+    <value>misurato</value>
+  </data>
+  <data name="Bench_is_not_running" xml:space="preserve">
+    <value>il banco prova non è in funzionamento tuttavia è possibile modificare le impostazioni per risolvere il problema</value>
+  </data>
+  <data name="Emptying_chdr" xml:space="preserve">
+    <value>svuotamento</value>
+  </data>
+  <data name="Bench_chdr" xml:space="preserve">
+    <value>banco</value>
+  </data>
+  <data name="Err_cor_neg_pct_chdr" xml:space="preserve">
+    <value>correzione errore - [%]</value>
+  </data>
+  <data name="Err_cor_pos_pct_chdr" xml:space="preserve">
+    <value>correzione errore + [%]</value>
+  </data>
+  <data name="Err_limit_neg_pct_chdr" xml:space="preserve">
+    <value>limite errore - [%]</value>
+  </data>
+  <data name="Err_limit_pos_pct_chdr" xml:space="preserve">
+    <value>limite errore + [%]</value>
+  </data>
+  <data name="Feeding_chdr" xml:space="preserve">
+    <value>alimentazione</value>
+  </data>
+  <data name="Red_type_chdr" xml:space="preserve">
+    <value>tipo rosso</value>
+  </data>
+  <data name="Error_while_creating_DB_Reason" xml:space="preserve">
+    <value>errore durante la creazione del data base , motivi:</value>
+  </data>
+  <data name="Metrology" xml:space="preserve">
+    <value>metrologia</value>
+  </data>
+  <data name="_offline" xml:space="preserve">
+    <value>(disconnesso)</value>
+  </data>
+  <data name="Administrator" xml:space="preserve">
+    <value>Amministratore</value>
+  </data>
+  <data name="Calibration_Specialist" xml:space="preserve">
+    <value>esperto di calibrazione</value>
+  </data>
+  <data name="Head_of_Lab" xml:space="preserve">
+    <value>capo del laboratorio</value>
+  </data>
+  <data name="Maintenance_Specialist" xml:space="preserve">
+    <value>esperto in manutenzione</value>
+  </data>
+  <data name="Metrologist" xml:space="preserve">
+    <value>metrologista</value>
+  </data>
+  <data name="Close_emptying_valve" xml:space="preserve">
+    <value>chiudere la valvola di svuotamento</value>
+  </data>
+  <data name="Get_mass_of_water_in_the_tank" xml:space="preserve">
+    <value>prendi la massa d'acqua nel serbatoio</value>
+  </data>
+  <data name="Ignore" xml:space="preserve">
+    <value>Ignora</value>
+  </data>
+  <data name="Loading_the_procedure" xml:space="preserve">
+    <value>scarica la procedura</value>
+  </data>
+  <data name="Make_tank_empty" xml:space="preserve">
+    <value>svuotare il serbatoio</value>
+  </data>
+  <data name="Measure_the_mass" xml:space="preserve">
+    <value>misura la massa</value>
+  </data>
+  <data name="Ready" xml:space="preserve">
+    <value>pronto</value>
+  </data>
+  <data name="BackBtnText" xml:space="preserve">
+    <value>&lt; indietro</value>
+  </data>
+  <data name="FinishBtnText" xml:space="preserve">
+    <value>finire</value>
+  </data>
+  <data name="NextBtnText" xml:space="preserve">
+    <value>avanti &gt;</value>
+  </data>
+  <data name="Flow_selection" xml:space="preserve">
+    <value>selezionare il flusso</value>
+  </data>
+  <data name="Method_chdr" xml:space="preserve">
+    <value>metodo di prova</value>
+  </data>
+  <data name="RelativeQfrom" xml:space="preserve">
+    <value>Q relativo da</value>
+  </data>
+  <data name="RelativeQto" xml:space="preserve">
+    <value>Q relativo a</value>
+  </data>
+  <data name="Combined_meters" xml:space="preserve">
+    <value>misuratori combinati</value>
+  </data>
+  <data name="DetectionThresholdPct" xml:space="preserve">
+    <value>soglia di rilevazione [%]</value>
+  </data>
+  <data name="RateOfChangePct" xml:space="preserve">
+    <value>tasso di cambio [%]</value>
+  </data>
   <data name="Component" xml:space="preserve">
     <value>componenti</value>
   </data>
+  <data name="_none_" xml:space="preserve">
+    <value>&lt;none&gt;</value>
+  </data>
+  <data name="Method_selection" xml:space="preserve">
+    <value>selezione del metodo di prova</value>
+  </data>
+  <data name="Clear_results" xml:space="preserve">
+    <value>cancella risultati</value>
+  </data>
   <data name="Configure" xml:space="preserve">
     <value>configurare</value>
   </data>
+  <data name="Arrangement_of_meters" xml:space="preserve">
+    <value>disposizioni di misuratori testati</value>
+  </data>
+  <data name="Arrangement_of_tests" xml:space="preserve">
+    <value>disposizione dei test</value>
+  </data>
+  <data name="Horizontally" xml:space="preserve">
+    <value>orizzontalmente</value>
+  </data>
+  <data name="Configuration" xml:space="preserve">
+    <value>configurazione</value>
+  </data>
+  <data name="Failed" xml:space="preserve">
+    <value>NOK</value>
+  </data>
+  <data name="ClearBtnText" xml:space="preserve">
+    <value>chiaro</value>
+  </data>
+  <data name="Emptying_tank" xml:space="preserve">
+    <value>svuotare il serbatorio</value>
+  </data>
+  <data name="Measuring_the_weight" xml:space="preserve">
+    <value>misurazione del peso</value>
+  </data>
+  <data name="Emptying_i_n" xml:space="preserve">
+    <value>svuotamento {0}: passo {1}/{2}</value>
+  </data>
+  <data name="Activity" xml:space="preserve">
+    <value>Attività</value>
+  </data>
+  <data name="Approval_info" xml:space="preserve">
+    <value>Info approvazione</value>
+  </data>
+  <data name="Metrological_class" xml:space="preserve">
+    <value>classe metrologica</value>
+  </data>
+  <data name="Producer" xml:space="preserve">
+    <value>produttore</value>
+  </data>
   <data name="Printer" xml:space="preserve">
     <value>stampante</value>
   </data>
+  <data name="Version" xml:space="preserve">
+    <value>versione</value>
+  </data>
+  <data name="nothing_to_configure" xml:space="preserve">
+    <value>&lt;niente da configurare&gt;</value>
+  </data>
+  <data name="Fill_with_water" xml:space="preserve">
+    <value>riempire il banco prova con acqua?</value>
+  </data>
+  <data name="NoBtn" xml:space="preserve">
+    <value>no</value>
+  </data>
   <data name="Question" xml:space="preserve">
     <value>domanda</value>
   </data>
+  <data name="Bench_parameters" xml:space="preserve">
+    <value>parametri del banco</value>
+  </data>
   <data name="Connection_string" xml:space="preserve">
     <value>stringa di connessione</value>
   </data>
+  <data name="Create_DB" xml:space="preserve">
+    <value>Crea DB</value>
+  </data>
+  <data name="Database_type" xml:space="preserve">
+    <value>tipo di database</value>
+  </data>
+  <data name="Logging" xml:space="preserve">
+    <value>registrazione</value>
+  </data>
+  <data name="Mode" xml:space="preserve">
+    <value>modalità</value>
+  </data>
+  <data name="NewTabBtnText" xml:space="preserve">
+    <value>nuova scheda</value>
+  </data>
+  <data name="New_transition_name" xml:space="preserve">
+    <value>nuovo nome di transizione</value>
+  </data>
+  <data name="Detection_completed" xml:space="preserve">
+    <value>rilevazione completata</value>
+  </data>
+  <data name="Emergency_STOP" xml:space="preserve">
+    <value>STOP di emergenza</value>
+  </data>
   <data name="Add" xml:space="preserve">
     <value>&amp;Aggiungi &gt;</value>
   </data>
+  <data name="Available_results" xml:space="preserve">
+    <value>Risultati disponibili:</value>
+  </data>
+  <data name="Remove" xml:space="preserve">
+    <value>&lt; &amp;rimuovere</value>
+  </data>
+  <data name="Remove_all" xml:space="preserve">
+    <value>r&amp;imuovere tutto</value>
+  </data>
   <data name="Message" xml:space="preserve">
     <value>messaggio</value>
   </data>
+  <data name="dflt" xml:space="preserve">
+    <value>dflt</value>
+  </data>
+  <data name="Detection_failed" xml:space="preserve">
+    <value>rilevazione fallita</value>
+  </data>
+  <data name="Camera_error" xml:space="preserve">
+    <value>errore della fotocamera</value>
+  </data>
+  <data name="remaining_time" xml:space="preserve">
+    <value>tempo restante</value>
+  </data>
+  <data name="LessBtnText" xml:space="preserve">
+    <value>di meno</value>
+  </data>
+  <data name="MoreBtnText" xml:space="preserve">
+    <value>di più</value>
+  </data>
+  <data name="Changes_will_be_lost_Do_you_want_to_proceed" xml:space="preserve">
+    <value>le modifiche andranno perse vuoi procedere?</value>
+  </data>
+  <data name="Flowmeter" xml:space="preserve">
+    <value>misuratore di flusso</value>
+  </data>
+  <data name="CombinedBtnText" xml:space="preserve">
+    <value>combinato</value>
+  </data>
+  <data name="Device" xml:space="preserve">
+    <value>Dispositivo</value>
+  </data>
+  <data name="PrinterBtnText" xml:space="preserve">
+    <value>stampante</value>
+  </data>
+  <data name="Aux_Water_Meter" xml:space="preserve">
+    <value>contatore acqua ausiliario</value>
+  </data>
+  <data name="Aux_Water_Meter_State" xml:space="preserve">
+    <value>stato contatore acqua ausiliario</value>
+  </data>
   <data name="Data" xml:space="preserve">
     <value>dati</value>
   </data>
+  <data name="End_State" xml:space="preserve">
+    <value>fine stato</value>
+  </data>
+  <data name="Main_Water_Meter" xml:space="preserve">
+    <value>contatore acqua principale</value>
+  </data>
+  <data name="Main_Water_Meter_State" xml:space="preserve">
+    <value>stato contatore acqua principale</value>
+  </data>
   <data name="Protocol" xml:space="preserve">
     <value>protocollo</value>
   </data>
   <data name="Serial_Number" xml:space="preserve">
     <value>Numero Seriale</value>
   </data>
+  <data name="Aux_WM_SerialNr" xml:space="preserve">
+    <value>numero seriale contatore acqua ausiliario</value>
+  </data>
+  <data name="Main_WM_SerialNr" xml:space="preserve">
+    <value>numero seriale contatore acqua principale</value>
+  </data>
+  <data name="Adjustment_in_progress" xml:space="preserve">
+    <value>aggiustamento in corso</value>
+  </data>
+  <data name="Error_pct" xml:space="preserve">
+    <value>Errore [%]</value>
+  </data>
+  <data name="Duration_Leak_s" xml:space="preserve">
+    <value>durata delle perdite [s]</value>
+  </data>
+  <data name="Duration_PMax_s" xml:space="preserve">
+    <value>durata portata massima [s]</value>
+  </data>
+  <data name="Closing_valve_Pump_off" xml:space="preserve">
+    <value>chiudere la valvola di ingresso spegnendo la pompa</value>
+  </data>
+  <data name="Purchase_Order" xml:space="preserve">
+    <value>ordine acquisto</value>
+  </data>
+  <data name="Ambient_humidity_" xml:space="preserve">
+    <value>Umidità dell'ambiente:</value>
+  </data>
+  <data name="Ambient_pressure_" xml:space="preserve">
+    <value>Pressione dell'ambiente:</value>
+  </data>
+  <data name="Ambient_temperature_" xml:space="preserve">
+    <value>Temperatura dell'ambiente:</value>
+  </data>
+  <data name="Approval_" xml:space="preserve">
+    <value>Approvazione:</value>
+  </data>
+  <data name="Date_and_time_" xml:space="preserve">
+    <value>Data e ora:</value>
+  </data>
+  <data name="End" xml:space="preserve">
+    <value>Fine</value>
+  </data>
+  <data name="AtTemperature_C" xml:space="preserve">
+    <value>@temperatura [gradiC]</value>
+  </data>
+  <data name="Density_kg_m3" xml:space="preserve">
+    <value>densità [kg/m3]</value>
+  </data>
+  <data name="Density" xml:space="preserve">
+    <value>densità</value>
+  </data>
+  <data name="Nr_meters_in_a_group" xml:space="preserve">
+    <value>numero contatori di un gruppo:</value>
+  </data>
+  <data name="End_Condition" xml:space="preserve">
+    <value>condizioni finali</value>
+  </data>
+  <data name="Communication" xml:space="preserve">
+    <value>Comunicazione</value>
+  </data>
+  <data name="Aux_" xml:space="preserve">
+    <value>ausiliario:</value>
+  </data>
+  <data name="Main_" xml:space="preserve">
+    <value>principale:</value>
+  </data>
+  <data name="cold" xml:space="preserve">
+    <value>freddo</value>
+  </data>
+  <data name="hot" xml:space="preserve">
+    <value>caldo</value>
+  </data>
+  <data name="Product_name" xml:space="preserve">
+    <value>nome prodotto</value>
+  </data>
+  <data name="Address" xml:space="preserve">
+    <value>Indirizzo</value>
+  </data>
+  <data name="Approval_date" xml:space="preserve">
+    <value>Data di approvazione</value>
+  </data>
+  <data name="Approval_ID" xml:space="preserve">
+    <value>ID approvazione</value>
+  </data>
+  <data name="Approved_by" xml:space="preserve">
+    <value>Approvato da</value>
+  </data>
+  <data name="Evaluate" xml:space="preserve">
+    <value>Valuta</value>
+  </data>
+  <data name="iPerl_Communication_in_progress" xml:space="preserve">
+    <value>iPerl comunicazione in corso</value>
+  </data>
   <data name="Language" xml:space="preserve">
     <value>lingua</value>
   </data>
+  <data name="Available_Components_" xml:space="preserve">
+    <value>componenti disponibili:</value>
+  </data>
+  <data name="Database_Settings" xml:space="preserve">
+    <value>impostazioni del data base</value>
+  </data>
+  <data name="About_Test_Bench_Framework" xml:space="preserve">
+    <value>informazioni circa la prova del banco </value>
+  </data>
+  <data name="BuildDateStr" xml:space="preserve">
+    <value>data di costruzione _BUILD_DATE_</value>
+  </data>
+  <data name="CopyrightStr" xml:space="preserve">
+    <value>Copyright © 2013 - {0}</value>
+  </data>
+  <data name="Edit_User" xml:space="preserve">
+    <value>Copyright © 2013 - {0}</value>
+  </data>
+  <data name="Groups" xml:space="preserve">
+    <value>gruppi</value>
+  </data>
+  <data name="An_unhandled_error_occured" xml:space="preserve">
+    <value>Si è verificato un errore imprevisto</value>
+  </data>
+  <data name="IgnoreBtnText" xml:space="preserve">
+    <value>Ignora</value>
+  </data>
   <data name="Add_filter" xml:space="preserve">
     <value>aggiungi filtro</value>
   </data>
@@ -219,6 +732,18 @@
   <data name="RetryDatabaseText" xml:space="preserve">
     <value>riprova</value>
   </data>
+  <data name="Selected_results" xml:space="preserve">
+    <value>selezionare risultati</value>
+  </data>
+  <data name="SingleBtnText" xml:space="preserve">
+    <value>singolo</value>
+  </data>
+  <data name="UnlockBtnText" xml:space="preserve">
+    <value>sbloccare</value>
+  </data>
+  <data name="Water_Meter" xml:space="preserve">
+    <value>contatore acqua</value>
+  </data>
   <data name="Date" xml:space="preserve">
     <value>Data  </value>
   </data>

ResultsBrowser/Resources/Strings.pl.resx

@@ -117,66 +117,579 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Confirmation" xml:space="preserve">
+    <value>Potwierdzenie</value>
+  </data>
+  <data name="Do_you_want_to_save_the_procedure" xml:space="preserve">
+    <value>Zachować procedurę ?</value>
+  </data>
   <data name="Error" xml:space="preserve">
     <value>Błąd</value>
   </data>
+  <data name="Error_loading_users_from_the_database" xml:space="preserve">
+    <value>Błąd przy ładowaniu użytkowników z bazy danych:</value>
+  </data>
+  <data name="Failed_to_create_a_sample_database" xml:space="preserve">
+    <value>Nie udało się utworzyć bazy danych:</value>
+  </data>
+  <data name="Failed_to_export_the_database" xml:space="preserve">
+    <value>Nie powódł się eksport bazy danych:</value>
+  </data>
+  <data name="Invalid_user_password_or_bench" xml:space="preserve">
+    <value>Niezgodny użytkownik, hasło lub stanowisko</value>
+  </data>
   <data name="Test_bench" xml:space="preserve">
     <value>Stanowisko pomiarowe</value>
   </data>
+  <data name="MaxChars" xml:space="preserve">
+    <value>Max._X_znaków alfanumerycznych </value>
+  </data>
+  <data name="close" xml:space="preserve">
+    <value>Zamknąć</value>
+  </data>
+  <data name="Diverter" xml:space="preserve">
+    <value>Zawór</value>
+  </data>
+  <data name="Emptying_valve" xml:space="preserve">
+    <value>Zawór spustowy</value>
+  </data>
   <data name="Name" xml:space="preserve">
     <value>Imię</value>
   </data>
+  <data name="Reference" xml:space="preserve">
+    <value>Odniesienie</value>
+  </data>
+  <data name="Reg_valve" xml:space="preserve">
+    <value>Zawór regulacyjny</value>
+  </data>
+  <data name="Balance" xml:space="preserve">
+    <value>Waga</value>
+  </data>
+  <data name="Duration_s" xml:space="preserve">
+    <value>Czas trwania [s]</value>
+  </data>
+  <data name="no" xml:space="preserve">
+    <value>nie</value>
+  </data>
+  <data name="New_bench_path_name" xml:space="preserve">
+    <value>P stanowisko</value>
+  </data>
+  <data name="New_feeding_path_name" xml:space="preserve">
+    <value>P zasilania</value>
+  </data>
+  <data name="New_output_path_name" xml:space="preserve">
+    <value>PQ</value>
+  </data>
+  <data name="New_procedure_name" xml:space="preserve">
+    <value>Procedura</value>
+  </data>
+  <data name="New_sensors_path_name" xml:space="preserve">
+    <value>P czujnków</value>
+  </data>
+  <data name="New_test_name" xml:space="preserve">
+    <value>Test</value>
+  </data>
+  <data name="New_name_copy" xml:space="preserve">
+    <value>-Kopiuj'</value>
+  </data>
+  <data name="Correction_g" xml:space="preserve">
+    <value>Korekcja [r]</value>
+  </data>
+  <data name="Nr" xml:space="preserve">
+    <value>Nr</value>
+  </data>
+  <data name="Mass_kg" xml:space="preserve">
+    <value>Masa [kg]</value>
+  </data>
+  <data name="AddBtnText" xml:space="preserve">
+    <value>Dodać</value>
+  </data>
   <data name="CancelBtnText" xml:space="preserve">
     <value>Anuluj</value>
   </data>
+  <data name="CloseBtnText" xml:space="preserve">
+    <value>Zamknąć</value>
+  </data>
+  <data name="LockBtnText" xml:space="preserve">
+    <value>Zablokować </value>
+  </data>
+  <data name="RemoveBtnText" xml:space="preserve">
+    <value>Usunąć</value>
+  </data>
   <data name="OkBtnText" xml:space="preserve">
     <value>OK</value>
   </data>
+  <data name="Correction_lph" xml:space="preserve">
+    <value>Korekcja [l/h]</value>
+  </data>
+  <data name="Correction_mbar" xml:space="preserve">
+    <value>Korekcja [mBar]</value>
+  </data>
+  <data name="Flow_m3h" xml:space="preserve">
+    <value>Przepływ [m3/h]</value>
+  </data>
+  <data name="Invalid_username_or_password" xml:space="preserve">
+    <value>Nieprawidłowa nazwa użytkownika lub hasło</value>
+  </data>
+  <data name="CopyBtnText" xml:space="preserve">
+    <value>Kupiuj</value>
+  </data>
+  <data name="DownBtnText" xml:space="preserve">
+    <value>Na dół </value>
+  </data>
+  <data name="EditBtnText" xml:space="preserve">
+    <value>Redagować</value>
+  </data>
+  <data name="UpBtnText" xml:space="preserve">
+    <value>Do góry</value>
+  </data>
+  <data name="NoDatabaseMsg" xml:space="preserve">
+    <value>Nie udane połaczenie z bazą danych</value>
+  </data>
   <data name="ConfigureDatabaseText" xml:space="preserve">
     <value>Konfiguracja testowa (wymagane hasło)</value>
   </data>
   <data name="ExitBtnText" xml:space="preserve">
     <value>Wyjście</value>
   </data>
+  <data name="Enter_password" xml:space="preserve">
+    <value>Wprowadź hasło</value>
+  </data>
+  <data name="Invalid_password" xml:space="preserve">
+    <value>Nieprawidłowe hasło</value>
+  </data>
+  <data name="Bench_name_conflict_Use_another_name_pls" xml:space="preserve">
+    <value>Nazwa stanowiska nieprawidłowa, użyj innej nazwy</value>
+  </data>
+  <data name="DB_was_successfully_created" xml:space="preserve">
+    <value>Utworzono bazę danych !</value>
+  </data>
+  <data name="DB_will_be_overwritten" xml:space="preserve">
+    <value>Baza danych zostanie nadpisana</value>
+  </data>
+  <data name="Do_you_want_to_proceed" xml:space="preserve">
+    <value>Chcesz kontynuować ?</value>
+  </data>
+  <data name="Notification" xml:space="preserve">
+    <value>Powiadomienie</value>
+  </data>
+  <data name="NoBenchMsg" xml:space="preserve">
+    <value>W konfiguracji oprogramowania nie ma stanowiska </value>
+  </data>
+  <data name="DescriptionColHdr" xml:space="preserve">
+    <value>Opis</value>
+  </data>
   <data name="Procedure" xml:space="preserve">
     <value>Procedura</value>
   </data>
   <data name="Test" xml:space="preserve">
     <value>Test</value>
   </data>
+  <data name="Corrected" xml:space="preserve">
+    <value>Poprawiono</value>
+  </data>
+  <data name="Measured" xml:space="preserve">
+    <value>Zmierzono</value>
+  </data>
+  <data name="Bench_is_not_running" xml:space="preserve">
+    <value>Stanowisko nie jest włączone ale można dokonać korekty nastaw dla usunięcia tego błedu.</value>
+  </data>
+  <data name="Emptying_chdr" xml:space="preserve">
+    <value>Spust</value>
+  </data>
+  <data name="Bench_chdr" xml:space="preserve">
+    <value>Stanowisko</value>
+  </data>
+  <data name="Err_cor_neg_pct_chdr" xml:space="preserve">
+    <value>Błąd kor. - [%]</value>
+  </data>
+  <data name="Err_cor_pos_pct_chdr" xml:space="preserve">
+    <value>Błąd kor. +[%]</value>
+  </data>
+  <data name="Err_limit_neg_pct_chdr" xml:space="preserve">
+    <value>Błąd limit - [%]</value>
+  </data>
+  <data name="Err_limit_pos_pct_chdr" xml:space="preserve">
+    <value>Błąd limit + [%]</value>
+  </data>
+  <data name="Feeding_chdr" xml:space="preserve">
+    <value>Zasilanie</value>
+  </data>
+  <data name="Red_type_chdr" xml:space="preserve">
+    <value>Red. Type</value>
+  </data>
+  <data name="Error_while_creating_DB_Reason" xml:space="preserve">
+    <value>Błąd przy tworzeniu bazy danych. Przyczyna:</value>
+  </data>
+  <data name="Metrology" xml:space="preserve">
+    <value>Metrologia</value>
+  </data>
+  <data name="_offline" xml:space="preserve">
+    <value>Ofline</value>
+  </data>
+  <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="Close_emptying_valve" xml:space="preserve">
+    <value>Zamknąć zawór spustowy</value>
+  </data>
+  <data name="Get_mass_of_water_in_the_tank" xml:space="preserve">
+    <value>Uzyskaj masę wody w zbiorniku</value>
+  </data>
+  <data name="Ignore" xml:space="preserve">
+    <value>Wyłączyć</value>
+  </data>
+  <data name="Loading_the_procedure" xml:space="preserve">
+    <value>Procedura ładowania</value>
+  </data>
+  <data name="Make_tank_empty" xml:space="preserve">
+    <value>Opróżnić zbiornik</value>
+  </data>
+  <data name="Measure_the_mass" xml:space="preserve">
+    <value>Pomiar masy</value>
+  </data>
+  <data name="Ready" xml:space="preserve">
+    <value>Gotowe</value>
+  </data>
+  <data name="BackBtnText" xml:space="preserve">
+    <value>&lt; z powrotem</value>
+  </data>
+  <data name="FinishBtnText" xml:space="preserve">
+    <value>Koniec</value>
+  </data>
+  <data name="NextBtnText" xml:space="preserve">
+    <value>Następny &gt;</value>
+  </data>
+  <data name="Flow_selection" xml:space="preserve">
+    <value>Wybór przypływu</value>
+  </data>
+  <data name="Method_chdr" xml:space="preserve">
+    <value>Metoda badania</value>
+  </data>
+  <data name="RelativeQfrom" xml:space="preserve">
+    <value>Q względne od</value>
+  </data>
+  <data name="RelativeQto" xml:space="preserve">
+    <value>Q względne do</value>
+  </data>
+  <data name="Combined_meters" xml:space="preserve">
+    <value>Wodomierze sprzężone</value>
+  </data>
+  <data name="DetectionThresholdPct" xml:space="preserve">
+    <value>Próg detekcji [%]</value>
+  </data>
+  <data name="RateOfChangePct" xml:space="preserve">
+    <value>Prędkość zmiany [%]</value>
+  </data>
   <data name="Component" xml:space="preserve">
     <value>Element</value>
   </data>
+  <data name="_none_" xml:space="preserve">
+    <value>&lt;nie&gt;</value>
+  </data>
+  <data name="Method_selection" xml:space="preserve">
+    <value>Wybór metody badania</value>
+  </data>
+  <data name="Clear_results" xml:space="preserve">
+    <value>Usunąć wyniki</value>
+  </data>
   <data name="Configure" xml:space="preserve">
     <value>Konfigurować</value>
   </data>
+  <data name="Arrangement_of_meters" xml:space="preserve">
+    <value>Połozenie badanych liczników</value>
+  </data>
+  <data name="Arrangement_of_tests" xml:space="preserve">
+    <value>Położenie badań</value>
+  </data>
+  <data name="Horizontally" xml:space="preserve">
+    <value>Poziomo</value>
+  </data>
+  <data name="Configuration" xml:space="preserve">
+    <value>Konfiguracja</value>
+  </data>
+  <data name="Failed" xml:space="preserve">
+    <value>NOK</value>
+  </data>
+  <data name="ClearBtnText" xml:space="preserve">
+    <value>Usunąć</value>
+  </data>
+  <data name="Emptying_tank" xml:space="preserve">
+    <value>Opróżnianie zbiornika</value>
+  </data>
+  <data name="Measuring_the_weight" xml:space="preserve">
+    <value>Pomair wagi</value>
+  </data>
+  <data name="Emptying_i_n" xml:space="preserve">
+    <value>Spust ({0}: krok {1} / {2}</value>
+  </data>
+  <data name="Activity" xml:space="preserve">
+    <value>Aktywny</value>
+  </data>
+  <data name="Approval_info" xml:space="preserve">
+    <value>Informacja o zatwierdzeniu</value>
+  </data>
+  <data name="Metrological_class" xml:space="preserve">
+    <value>Klasa metrologiczna</value>
+  </data>
+  <data name="Producer" xml:space="preserve">
+    <value>Producent</value>
+  </data>
   <data name="Printer" xml:space="preserve">
     <value>Drukarka</value>
   </data>
+  <data name="Version" xml:space="preserve">
+    <value>Wersja</value>
+  </data>
+  <data name="nothing_to_configure" xml:space="preserve">
+    <value>&lt;nie konfigurować&gt;</value>
+  </data>
+  <data name="Fill_with_water" xml:space="preserve">
+    <value>Napełnić stanowisko wodą ?</value>
+  </data>
+  <data name="NoBtn" xml:space="preserve">
+    <value>Nie</value>
+  </data>
   <data name="Question" xml:space="preserve">
     <value>Pytanie</value>
   </data>
+  <data name="Bench_parameters" xml:space="preserve">
+    <value>Parametry stanowiska</value>
+  </data>
   <data name="Connection_string" xml:space="preserve">
     <value>Parametry połączenia</value>
   </data>
+  <data name="Create_DB" xml:space="preserve">
+    <value>Utwórz DB</value>
+  </data>
+  <data name="Database_type" xml:space="preserve">
+    <value>Typ bazy danych</value>
+  </data>
+  <data name="Logging" xml:space="preserve">
+    <value>Logowanie</value>
+  </data>
+  <data name="Mode" xml:space="preserve">
+    <value>Cykl pracy</value>
+  </data>
+  <data name="NewTabBtnText" xml:space="preserve">
+    <value>Nowa Tab</value>
+  </data>
+  <data name="New_transition_name" xml:space="preserve">
+    <value>Nowa nazwa przejścia</value>
+  </data>
+  <data name="Detection_completed" xml:space="preserve">
+    <value>Wykrywanie zakończono</value>
+  </data>
+  <data name="Emergency_STOP" xml:space="preserve">
+    <value>Zatrzymanie awaryjne</value>
+  </data>
   <data name="Add" xml:space="preserve">
     <value>&amp;Dodać &gt;</value>
   </data>
+  <data name="Available_results" xml:space="preserve">
+    <value>Dostępne wyniki:</value>
+  </data>
+  <data name="Remove" xml:space="preserve">
+    <value>&lt;&amp;Usunąć</value>
+  </data>
+  <data name="Remove_all" xml:space="preserve">
+    <value>&lt;&lt;Usunąć wszystko</value>
+  </data>
   <data name="Message" xml:space="preserve">
     <value>Wiadomość</value>
   </data>
+  <data name="dflt" xml:space="preserve">
+    <value>dflt</value>
+  </data>
+  <data name="Detection_failed" xml:space="preserve">
+    <value>Nie udana próba wykrywania</value>
+  </data>
+  <data name="Camera_error" xml:space="preserve">
+    <value>Błąd kamery</value>
+  </data>
+  <data name="remaining_time" xml:space="preserve">
+    <value>pozostały czas</value>
+  </data>
+  <data name="LessBtnText" xml:space="preserve">
+    <value>Mniej</value>
+  </data>
+  <data name="MoreBtnText" xml:space="preserve">
+    <value>Więcej</value>
+  </data>
+  <data name="Changes_will_be_lost_Do_you_want_to_proceed" xml:space="preserve">
+    <value>Zmiany zostaną stracone. Chcesz kontynuować ?</value>
+  </data>
+  <data name="Flowmeter" xml:space="preserve">
+    <value>Przepływomierz</value>
+  </data>
+  <data name="CombinedBtnText" xml:space="preserve">
+    <value>Sprzężony</value>
+  </data>
+  <data name="Device" xml:space="preserve">
+    <value>Urządzenie</value>
+  </data>
+  <data name="PrinterBtnText" xml:space="preserve">
+    <value>Drukarka</value>
+  </data>
+  <data name="Aux_Water_Meter" xml:space="preserve">
+    <value>Wodomierz dodatkowy</value>
+  </data>
+  <data name="Aux_Water_Meter_State" xml:space="preserve">
+    <value>Stan dodatkowego wodomierza</value>
+  </data>
   <data name="Data" xml:space="preserve">
     <value>Dane</value>
   </data>
+  <data name="End_State" xml:space="preserve">
+    <value>Stan końcowy</value>
+  </data>
+  <data name="Main_Water_Meter" xml:space="preserve">
+    <value>Główny wodomierz</value>
+  </data>
+  <data name="Main_Water_Meter_State" xml:space="preserve">
+    <value>Stan wodomierza głównego</value>
+  </data>
   <data name="Protocol" xml:space="preserve">
     <value>Zapiska</value>
   </data>
   <data name="Serial_Number" xml:space="preserve">
     <value>Nr seryjny</value>
   </data>
+  <data name="Aux_WM_SerialNr" xml:space="preserve">
+    <value>Nr seryjny dodatkowego wodomierza</value>
+  </data>
+  <data name="Main_WM_SerialNr" xml:space="preserve">
+    <value>Nr seryjny głównego wodomierza</value>
+  </data>
+  <data name="Adjustment_in_progress" xml:space="preserve">
+    <value>Regulacja trwa</value>
+  </data>
+  <data name="Error_pct" xml:space="preserve">
+    <value>Błąd [%]</value>
+  </data>
+  <data name="Duration_Leak_s" xml:space="preserve">
+    <value>Czas trwania przepływu [s]</value>
+  </data>
+  <data name="Duration_PMax_s" xml:space="preserve">
+    <value>Czas trwania Pmax [s]</value>
+  </data>
+  <data name="Closing_valve_Pump_off" xml:space="preserve">
+    <value>Zamnięcie zaworu zasilania, wyłączenie pompy</value>
+  </data>
+  <data name="Purchase_Order" xml:space="preserve">
+    <value>Zamówienie</value>
+  </data>
+  <data name="Ambient_humidity_" xml:space="preserve">
+    <value>Wilgotność względna otoczenia</value>
+  </data>
+  <data name="Ambient_pressure_" xml:space="preserve">
+    <value>Ciśnienie względne:</value>
+  </data>
+  <data name="Ambient_temperature_" xml:space="preserve">
+    <value>Temperatura otoczenia:</value>
+  </data>
+  <data name="Approval_" xml:space="preserve">
+    <value>Zatwierdzenie:</value>
+  </data>
+  <data name="Date_and_time_" xml:space="preserve">
+    <value>Data i czas:</value>
+  </data>
+  <data name="End" xml:space="preserve">
+    <value>Koniec</value>
+  </data>
+  <data name="AtTemperature_C" xml:space="preserve">
+    <value>@temperatura  [degC]</value>
+  </data>
+  <data name="Density_kg_m3" xml:space="preserve">
+    <value>Gęstość [kg/m3]</value>
+  </data>
+  <data name="Density" xml:space="preserve">
+    <value>Gęstość</value>
+  </data>
+  <data name="Nr_meters_in_a_group" xml:space="preserve">
+    <value>Nr liczników w grupie</value>
+  </data>
+  <data name="End_Condition" xml:space="preserve">
+    <value>Stan końcowy</value>
+  </data>
+  <data name="Communication" xml:space="preserve">
+    <value>Połączenie</value>
+  </data>
+  <data name="Aux_" xml:space="preserve">
+    <value>Dodadkowy</value>
+  </data>
+  <data name="Main_" xml:space="preserve">
+    <value>Główny</value>
+  </data>
+  <data name="cold" xml:space="preserve">
+    <value>zimna</value>
+  </data>
+  <data name="hot" xml:space="preserve">
+    <value>ciepła</value>
+  </data>
+  <data name="Product_name" xml:space="preserve">
+    <value>Nazwa produktu</value>
+  </data>
+  <data name="Address" xml:space="preserve">
+    <value>Adres</value>
+  </data>
+  <data name="Approval_date" xml:space="preserve">
+    <value>Data zatwierdzenia</value>
+  </data>
+  <data name="Approval_ID" xml:space="preserve">
+    <value>ID Zatwierdzenia</value>
+  </data>
+  <data name="Approved_by" xml:space="preserve">
+    <value>Zatwierdzono</value>
+  </data>
+  <data name="Evaluate" xml:space="preserve">
+    <value>Ocena</value>
+  </data>
+  <data name="iPerl_Communication_in_progress" xml:space="preserve">
+    <value>Połączenie z iPERL w trakcie</value>
+  </data>
   <data name="Language" xml:space="preserve">
     <value>Język</value>
   </data>
+  <data name="Available_Components_" xml:space="preserve">
+    <value>Dostępne elementy:</value>
+  </data>
+  <data name="Database_Settings" xml:space="preserve">
+    <value>Ustawienia bazy danych:</value>
+  </data>
+  <data name="About_Test_Bench_Framework" xml:space="preserve">
+    <value>O Framework stanowiska</value>
+  </data>
+  <data name="BuildDateStr" xml:space="preserve">
+    <value>Build Data _BUILD_Data_</value>
+  </data>
+  <data name="CopyrightStr" xml:space="preserve">
+    <value>Praw autorskie © 2013 - {0}</value>
+  </data>
+  <data name="Edit_User" xml:space="preserve">
+    <value>Edytuj użytkownika</value>
+  </data>
+  <data name="Groups" xml:space="preserve">
+    <value>Grupy</value>
+  </data>
+  <data name="An_unhandled_error_occured" xml:space="preserve">
+    <value>Wystąpił nieobsługiwany błąd </value>
+  </data>
+  <data name="IgnoreBtnText" xml:space="preserve">
+    <value>Wyłączyć</value>
+  </data>
   <data name="Add_filter" xml:space="preserve">
     <value>Dodać filtr</value>
   </data>
@@ -219,6 +732,18 @@
   <data name="RetryDatabaseText" xml:space="preserve">
     <value>Powtórka</value>
   </data>
+  <data name="Selected_results" xml:space="preserve">
+    <value>Wybrane wyniki:</value>
+  </data>
+  <data name="SingleBtnText" xml:space="preserve">
+    <value>Pojedynczy</value>
+  </data>
+  <data name="UnlockBtnText" xml:space="preserve">
+    <value>Odblokować</value>
+  </data>
+  <data name="Water_Meter" xml:space="preserve">
+    <value>Licznik wody</value>
+  </data>
   <data name="Date" xml:space="preserve">
     <value>Data</value>
   </data>

ResultsBrowser/Resources/Strings.resx

@@ -117,66 +117,579 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Confirmation" xml:space="preserve">
+    <value>Confirmation</value>
+  </data>
+  <data name="Do_you_want_to_save_the_procedure" xml:space="preserve">
+    <value>Do you want to save the procedure?</value>
+  </data>
   <data name="Error" xml:space="preserve">
     <value>Error</value>
   </data>
+  <data name="Error_loading_users_from_the_database" xml:space="preserve">
+    <value>Error loading users from the database:</value>
+  </data>
+  <data name="Failed_to_create_a_sample_database" xml:space="preserve">
+    <value>Failed to create a sample database:</value>
+  </data>
+  <data name="Failed_to_export_the_database" xml:space="preserve">
+    <value>Failed to export the database:</value>
+  </data>
+  <data name="Invalid_user_password_or_bench" xml:space="preserve">
+    <value>Invalid user, password, or bench</value>
+  </data>
   <data name="Test_bench" xml:space="preserve">
     <value>Test bench</value>
   </data>
+  <data name="MaxChars" xml:space="preserve">
+    <value>(max. _X_  alphanumeric characters)</value>
+  </data>
+  <data name="close" xml:space="preserve">
+    <value>close</value>
+  </data>
+  <data name="Diverter" xml:space="preserve">
+    <value>Diverter</value>
+  </data>
+  <data name="Emptying_valve" xml:space="preserve">
+    <value>Emptying valve</value>
+  </data>
   <data name="Name" xml:space="preserve">
     <value>Name</value>
   </data>
+  <data name="Reference" xml:space="preserve">
+    <value>Reference</value>
+  </data>
+  <data name="Reg_valve" xml:space="preserve">
+    <value>Reg. valve</value>
+  </data>
+  <data name="Balance" xml:space="preserve">
+    <value>Balance</value>
+  </data>
+  <data name="Duration_s" xml:space="preserve">
+    <value>Duration [s]</value>
+  </data>
+  <data name="no" xml:space="preserve">
+    <value>no</value>
+  </data>
+  <data name="New_bench_path_name" xml:space="preserve">
+    <value>PBench</value>
+  </data>
+  <data name="New_feeding_path_name" xml:space="preserve">
+    <value>PFeed</value>
+  </data>
+  <data name="New_output_path_name" xml:space="preserve">
+    <value>PQ</value>
+  </data>
+  <data name="New_procedure_name" xml:space="preserve">
+    <value>Procedure</value>
+  </data>
+  <data name="New_sensors_path_name" xml:space="preserve">
+    <value>PSens</value>
+  </data>
+  <data name="New_test_name" xml:space="preserve">
+    <value>Test</value>
+  </data>
+  <data name="New_name_copy" xml:space="preserve">
+    <value> - Copy</value>
+  </data>
+  <data name="Correction_g" xml:space="preserve">
+    <value>Correction [g]</value>
+  </data>
+  <data name="Nr" xml:space="preserve">
+    <value>Nr.</value>
+  </data>
+  <data name="Mass_kg" xml:space="preserve">
+    <value>Mass [kg]</value>
+  </data>
+  <data name="AddBtnText" xml:space="preserve">
+    <value>Add</value>
+  </data>
   <data name="CancelBtnText" xml:space="preserve">
     <value>Cancel</value>
   </data>
+  <data name="CloseBtnText" xml:space="preserve">
+    <value>Close</value>
+  </data>
+  <data name="LockBtnText" xml:space="preserve">
+    <value>Lock</value>
+  </data>
+  <data name="RemoveBtnText" xml:space="preserve">
+    <value>Remove</value>
+  </data>
   <data name="OkBtnText" xml:space="preserve">
     <value>OK</value>
   </data>
+  <data name="Correction_lph" xml:space="preserve">
+    <value>Correction [l/h]</value>
+  </data>
+  <data name="Correction_mbar" xml:space="preserve">
+    <value>Correction [mbar]</value>
+  </data>
+  <data name="Flow_m3h" xml:space="preserve">
+    <value>Flow [m3/h]</value>
+  </data>
+  <data name="Invalid_username_or_password" xml:space="preserve">
+    <value>Invalid username or password</value>
+  </data>
+  <data name="CopyBtnText" xml:space="preserve">
+    <value>Copy</value>
+  </data>
+  <data name="DownBtnText" xml:space="preserve">
+    <value>Down</value>
+  </data>
+  <data name="EditBtnText" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="UpBtnText" xml:space="preserve">
+    <value>Up</value>
+  </data>
+  <data name="NoDatabaseMsg" xml:space="preserve">
+    <value>Cannot connect to the database.</value>
+  </data>
   <data name="ConfigureDatabaseText" xml:space="preserve">
     <value>Configure test benches (password required)</value>
   </data>
   <data name="ExitBtnText" xml:space="preserve">
     <value>Exit</value>
   </data>
+  <data name="Enter_password" xml:space="preserve">
+    <value>Enter password</value>
+  </data>
+  <data name="Invalid_password" xml:space="preserve">
+    <value>Invalid password</value>
+  </data>
+  <data name="Bench_name_conflict_Use_another_name_pls" xml:space="preserve">
+    <value>Test bench name conflict, use another name please</value>
+  </data>
+  <data name="DB_was_successfully_created" xml:space="preserve">
+    <value>The database was successfully created!</value>
+  </data>
+  <data name="DB_will_be_overwritten" xml:space="preserve">
+    <value>The database will be overwritten</value>
+  </data>
+  <data name="Do_you_want_to_proceed" xml:space="preserve">
+    <value>Do you want to proceed?</value>
+  </data>
+  <data name="Notification" xml:space="preserve">
+    <value>Notification</value>
+  </data>
+  <data name="NoBenchMsg" xml:space="preserve">
+    <value>No test bench in the program configuration.</value>
+  </data>
+  <data name="DescriptionColHdr" xml:space="preserve">
+    <value>Description</value>
+  </data>
   <data name="Procedure" xml:space="preserve">
     <value>Procedure</value>
   </data>
   <data name="Test" xml:space="preserve">
     <value>Test</value>
   </data>
+  <data name="Corrected" xml:space="preserve">
+    <value>Corrected</value>
+  </data>
+  <data name="Measured" xml:space="preserve">
+    <value>Measured</value>
+  </data>
+  <data name="Bench_is_not_running" xml:space="preserve">
+    <value>Test bench is not running, however you can change the settings to resolve the problem.</value>
+  </data>
+  <data name="Emptying_chdr" xml:space="preserve">
+    <value>Emptying</value>
+  </data>
+  <data name="Bench_chdr" xml:space="preserve">
+    <value>Bench</value>
+  </data>
+  <data name="Err_cor_neg_pct_chdr" xml:space="preserve">
+    <value>Err. cor. - [%]</value>
+  </data>
+  <data name="Err_cor_pos_pct_chdr" xml:space="preserve">
+    <value>Err. cor. +[%]</value>
+  </data>
+  <data name="Err_limit_neg_pct_chdr" xml:space="preserve">
+    <value>Err. Limit - [%]</value>
+  </data>
+  <data name="Err_limit_pos_pct_chdr" xml:space="preserve">
+    <value>Err. Limit + [%]</value>
+  </data>
+  <data name="Feeding_chdr" xml:space="preserve">
+    <value>Feeding</value>
+  </data>
+  <data name="Red_type_chdr" xml:space="preserve">
+    <value>Red. type</value>
+  </data>
+  <data name="Error_while_creating_DB_Reason" xml:space="preserve">
+    <value>Error while creating the database. Reason: </value>
+  </data>
+  <data name="Metrology" xml:space="preserve">
+    <value>Metrology</value>
+  </data>
+  <data name="_offline" xml:space="preserve">
+    <value>(offline)</value>
+  </data>
+  <data name="Administrator" xml:space="preserve">
+    <value>Administrator</value>
+  </data>
+  <data name="Calibration_Specialist" xml:space="preserve">
+    <value>Calibration Specialist</value>
+  </data>
+  <data name="Head_of_Lab" xml:space="preserve">
+    <value>Head of Lab</value>
+  </data>
+  <data name="Maintenance_Specialist" xml:space="preserve">
+    <value>Maintenance Specialist</value>
+  </data>
+  <data name="Metrologist" xml:space="preserve">
+    <value>Metrologist</value>
+  </data>
+  <data name="Close_emptying_valve" xml:space="preserve">
+    <value>Close emptying valve</value>
+  </data>
+  <data name="Get_mass_of_water_in_the_tank" xml:space="preserve">
+    <value>Get mass of water in the tank</value>
+  </data>
+  <data name="Ignore" xml:space="preserve">
+    <value>Ignore</value>
+  </data>
+  <data name="Loading_the_procedure" xml:space="preserve">
+    <value>Loading the procedure</value>
+  </data>
+  <data name="Make_tank_empty" xml:space="preserve">
+    <value>Make tank empty</value>
+  </data>
+  <data name="Measure_the_mass" xml:space="preserve">
+    <value>Measure the mass</value>
+  </data>
+  <data name="Ready" xml:space="preserve">
+    <value>Ready</value>
+  </data>
+  <data name="BackBtnText" xml:space="preserve">
+    <value>&lt; Back</value>
+  </data>
+  <data name="FinishBtnText" xml:space="preserve">
+    <value>Finish</value>
+  </data>
+  <data name="NextBtnText" xml:space="preserve">
+    <value>Next &gt;</value>
+  </data>
+  <data name="Flow_selection" xml:space="preserve">
+    <value>Flow Selection</value>
+  </data>
+  <data name="Method_chdr" xml:space="preserve">
+    <value>Test method</value>
+  </data>
+  <data name="RelativeQfrom" xml:space="preserve">
+    <value>Relative Q from</value>
+  </data>
+  <data name="RelativeQto" xml:space="preserve">
+    <value>Relative Q to</value>
+  </data>
+  <data name="Combined_meters" xml:space="preserve">
+    <value>Combined meters</value>
+  </data>
+  <data name="DetectionThresholdPct" xml:space="preserve">
+    <value>Detection threshold [%]</value>
+  </data>
+  <data name="RateOfChangePct" xml:space="preserve">
+    <value>Rate of change [%]</value>
+  </data>
   <data name="Component" xml:space="preserve">
     <value>Component</value>
   </data>
+  <data name="_none_" xml:space="preserve">
+    <value>&lt;none&gt;</value>
+  </data>
+  <data name="Method_selection" xml:space="preserve">
+    <value>Test method selection</value>
+  </data>
+  <data name="Clear_results" xml:space="preserve">
+    <value>Clear results</value>
+  </data>
   <data name="Configure" xml:space="preserve">
     <value>Configure</value>
   </data>
+  <data name="Arrangement_of_meters" xml:space="preserve">
+    <value>Arrangements of tested meters</value>
+  </data>
+  <data name="Arrangement_of_tests" xml:space="preserve">
+    <value>Arrangement of tests</value>
+  </data>
+  <data name="Horizontally" xml:space="preserve">
+    <value>Horizontally</value>
+  </data>
+  <data name="Configuration" xml:space="preserve">
+    <value>Configuration</value>
+  </data>
+  <data name="Failed" xml:space="preserve">
+    <value>NOK</value>
+  </data>
+  <data name="ClearBtnText" xml:space="preserve">
+    <value>Clear</value>
+  </data>
+  <data name="Emptying_tank" xml:space="preserve">
+    <value>Emptying the tank</value>
+  </data>
+  <data name="Measuring_the_weight" xml:space="preserve">
+    <value>Measuring the weight</value>
+  </data>
+  <data name="Emptying_i_n" xml:space="preserve">
+    <value>Emptying ({0}: step {1}/{2})</value>
+  </data>
+  <data name="Activity" xml:space="preserve">
+    <value>Activity</value>
+  </data>
+  <data name="Approval_info" xml:space="preserve">
+    <value>Approval info.</value>
+  </data>
+  <data name="Metrological_class" xml:space="preserve">
+    <value>Metrological class</value>
+  </data>
+  <data name="Producer" xml:space="preserve">
+    <value>Producer</value>
+  </data>
   <data name="Printer" xml:space="preserve">
     <value>Printer</value>
   </data>
+  <data name="Version" xml:space="preserve">
+    <value>Version</value>
+  </data>
+  <data name="nothing_to_configure" xml:space="preserve">
+    <value>&lt;nothing to configure&gt;</value>
+  </data>
+  <data name="Fill_with_water" xml:space="preserve">
+    <value>Fill the test bench with water?</value>
+  </data>
+  <data name="NoBtn" xml:space="preserve">
+    <value>No</value>
+  </data>
   <data name="Question" xml:space="preserve">
     <value>Question</value>
   </data>
+  <data name="Bench_parameters" xml:space="preserve">
+    <value>Bench parameters</value>
+  </data>
   <data name="Connection_string" xml:space="preserve">
     <value>Connection string</value>
   </data>
+  <data name="Create_DB" xml:space="preserve">
+    <value>Create DB</value>
+  </data>
+  <data name="Database_type" xml:space="preserve">
+    <value>Database type</value>
+  </data>
+  <data name="Logging" xml:space="preserve">
+    <value>Logging</value>
+  </data>
+  <data name="Mode" xml:space="preserve">
+    <value>Mode</value>
+  </data>
+  <data name="NewTabBtnText" xml:space="preserve">
+    <value>New Tab</value>
+  </data>
+  <data name="New_transition_name" xml:space="preserve">
+    <value>New transition name</value>
+  </data>
+  <data name="Detection_completed" xml:space="preserve">
+    <value>Detection completed</value>
+  </data>
+  <data name="Emergency_STOP" xml:space="preserve">
+    <value>Emergency STOP</value>
+  </data>
   <data name="Add" xml:space="preserve">
     <value>&amp;Add &gt;</value>
   </data>
+  <data name="Available_results" xml:space="preserve">
+    <value>Available results:</value>
+  </data>
+  <data name="Remove" xml:space="preserve">
+    <value>&lt; &amp;Remove</value>
+  </data>
+  <data name="Remove_all" xml:space="preserve">
+    <value>&lt;&lt; R&amp;emove all</value>
+  </data>
   <data name="Message" xml:space="preserve">
     <value>Message</value>
   </data>
+  <data name="dflt" xml:space="preserve">
+    <value>dflt</value>
+  </data>
+  <data name="Detection_failed" xml:space="preserve">
+    <value>Detection failed</value>
+  </data>
+  <data name="Camera_error" xml:space="preserve">
+    <value>Camera error</value>
+  </data>
+  <data name="remaining_time" xml:space="preserve">
+    <value>remaining time</value>
+  </data>
+  <data name="LessBtnText" xml:space="preserve">
+    <value>Less</value>
+  </data>
+  <data name="MoreBtnText" xml:space="preserve">
+    <value>More</value>
+  </data>
+  <data name="Changes_will_be_lost_Do_you_want_to_proceed" xml:space="preserve">
+    <value>Changes will be lost. Do you want to proceed?</value>
+  </data>
+  <data name="Flowmeter" xml:space="preserve">
+    <value>Flowmeter</value>
+  </data>
+  <data name="CombinedBtnText" xml:space="preserve">
+    <value>Combined</value>
+  </data>
+  <data name="Device" xml:space="preserve">
+    <value>Device</value>
+  </data>
+  <data name="PrinterBtnText" xml:space="preserve">
+    <value>Printer</value>
+  </data>
+  <data name="Aux_Water_Meter" xml:space="preserve">
+    <value>Aux Water Meter</value>
+  </data>
+  <data name="Aux_Water_Meter_State" xml:space="preserve">
+    <value>Aux. WM State</value>
+  </data>
   <data name="Data" xml:space="preserve">
     <value>Data</value>
   </data>
+  <data name="End_State" xml:space="preserve">
+    <value>End State</value>
+  </data>
+  <data name="Main_Water_Meter" xml:space="preserve">
+    <value>Main Water Meter</value>
+  </data>
+  <data name="Main_Water_Meter_State" xml:space="preserve">
+    <value>Main WM State</value>
+  </data>
   <data name="Protocol" xml:space="preserve">
     <value>Protocol</value>
   </data>
   <data name="Serial_Number" xml:space="preserve">
     <value>Serial Number</value>
   </data>
+  <data name="Aux_WM_SerialNr" xml:space="preserve">
+    <value>Aux. WM Serial Nr.</value>
+  </data>
+  <data name="Main_WM_SerialNr" xml:space="preserve">
+    <value>Main WM Serial Nr.</value>
+  </data>
+  <data name="Adjustment_in_progress" xml:space="preserve">
+    <value>Adjustment in progress</value>
+  </data>
+  <data name="Error_pct" xml:space="preserve">
+    <value>Error [%]</value>
+  </data>
+  <data name="Duration_Leak_s" xml:space="preserve">
+    <value>Leak duration [s]</value>
+  </data>
+  <data name="Duration_PMax_s" xml:space="preserve">
+    <value>PMax duration [s]</value>
+  </data>
+  <data name="Closing_valve_Pump_off" xml:space="preserve">
+    <value>Closing input valve, switching the pump off</value>
+  </data>
+  <data name="Purchase_Order" xml:space="preserve">
+    <value>Purchase Order</value>
+  </data>
+  <data name="Ambient_humidity_" xml:space="preserve">
+    <value>Ambient humidity: </value>
+  </data>
+  <data name="Ambient_pressure_" xml:space="preserve">
+    <value>Ambient pressure: </value>
+  </data>
+  <data name="Ambient_temperature_" xml:space="preserve">
+    <value>Ambient temperature: </value>
+  </data>
+  <data name="Approval_" xml:space="preserve">
+    <value>Approval: </value>
+  </data>
+  <data name="Date_and_time_" xml:space="preserve">
+    <value>Date and time: </value>
+  </data>
+  <data name="End" xml:space="preserve">
+    <value>End</value>
+  </data>
+  <data name="AtTemperature_C" xml:space="preserve">
+    <value>@temperature [degC]</value>
+  </data>
+  <data name="Density_kg_m3" xml:space="preserve">
+    <value>Density [kg/m3]</value>
+  </data>
+  <data name="Density" xml:space="preserve">
+    <value>Density</value>
+  </data>
+  <data name="Nr_meters_in_a_group" xml:space="preserve">
+    <value>Nr. meters in a group:</value>
+  </data>
+  <data name="End_Condition" xml:space="preserve">
+    <value>End condition</value>
+  </data>
+  <data name="Communication" xml:space="preserve">
+    <value>Communication</value>
+  </data>
+  <data name="Aux_" xml:space="preserve">
+    <value>Aux:</value>
+  </data>
+  <data name="Main_" xml:space="preserve">
+    <value>Main:</value>
+  </data>
+  <data name="cold" xml:space="preserve">
+    <value>cold</value>
+  </data>
+  <data name="hot" xml:space="preserve">
+    <value>hot</value>
+  </data>
+  <data name="Product_name" xml:space="preserve">
+    <value>Product name</value>
+  </data>
+  <data name="Address" xml:space="preserve">
+    <value>Address</value>
+  </data>
+  <data name="Approval_date" xml:space="preserve">
+    <value>Approval date</value>
+  </data>
+  <data name="Approval_ID" xml:space="preserve">
+    <value>Approval ID</value>
+  </data>
+  <data name="Approved_by" xml:space="preserve">
+    <value>Approved by</value>
+  </data>
+  <data name="Evaluate" xml:space="preserve">
+    <value>Evaluate</value>
+  </data>
+  <data name="iPerl_Communication_in_progress" xml:space="preserve">
+    <value>iPerl Communication in progress</value>
+  </data>
   <data name="Language" xml:space="preserve">
     <value>Language</value>
   </data>
+  <data name="Available_Components_" xml:space="preserve">
+    <value>Available Components:</value>
+  </data>
+  <data name="Database_Settings" xml:space="preserve">
+    <value>Database Settings</value>
+  </data>
+  <data name="About_Test_Bench_Framework" xml:space="preserve">
+    <value>About Test Bench Framework</value>
+  </data>
+  <data name="BuildDateStr" xml:space="preserve">
+    <value>Build date _BUILD_DATE_</value>
+  </data>
+  <data name="CopyrightStr" xml:space="preserve">
+    <value>Copyright © 2013 - {0}</value>
+  </data>
+  <data name="Edit_User" xml:space="preserve">
+    <value>Edit User</value>
+  </data>
+  <data name="Groups" xml:space="preserve">
+    <value>Groups</value>
+  </data>
+  <data name="An_unhandled_error_occured" xml:space="preserve">
+    <value>An unhandled error occured</value>
+  </data>
+  <data name="IgnoreBtnText" xml:space="preserve">
+    <value>Ignore</value>
+  </data>
   <data name="Add_filter" xml:space="preserve">
     <value>Add filter</value>
   </data>
@@ -219,6 +732,18 @@
   <data name="RetryDatabaseText" xml:space="preserve">
     <value>Retry</value>
   </data>
+  <data name="Selected_results" xml:space="preserve">
+    <value>Selected results</value>
+  </data>
+  <data name="SingleBtnText" xml:space="preserve">
+    <value>Single</value>
+  </data>
+  <data name="UnlockBtnText" xml:space="preserve">
+    <value>Unlock</value>
+  </data>
+  <data name="Water_Meter" xml:space="preserve">
+    <value>Water Meter</value>
+  </data>
   <data name="Date" xml:space="preserve">
     <value>Date</value>
   </data>
@@ -300,7 +825,7 @@
   <data name="Error_exporting_results" xml:space="preserve">
     <value>Error exporting results</value>
   </data>
-  <data name="Histograms" xml:space="preserve">
-    <value>Histograms</value>
+  <data name="Add_data_from_Oracle" xml:space="preserve">
+    <value>Add data from Oracle</value>
   </data>
 </root>

ResultsBrowser/Resources/Strings.ru.resx

@@ -117,66 +117,579 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Confirmation" xml:space="preserve">
+    <value>Подтверждение</value>
+  </data>
+  <data name="Do_you_want_to_save_the_procedure" xml:space="preserve">
+    <value>Хотите сохранить процедуру?</value>
+  </data>
   <data name="Error" xml:space="preserve">
     <value>Ошибка</value>
   </data>
+  <data name="Error_loading_users_from_the_database" xml:space="preserve">
+    <value>Ошибка при загрузке пользователей из базы данных:</value>
+  </data>
+  <data name="Failed_to_create_a_sample_database" xml:space="preserve">
+    <value>Не удалось создать базу данных:</value>
+  </data>
+  <data name="Failed_to_export_the_database" xml:space="preserve">
+    <value>Не удалось экспортировать базу данных:</value>
+  </data>
+  <data name="Invalid_user_password_or_bench" xml:space="preserve">
+    <value>Неверный пользователь, пароль, или установка</value>
+  </data>
   <data name="Test_bench" xml:space="preserve">
     <value>Поверочная установка</value>
   </data>
+  <data name="MaxChars" xml:space="preserve">
+    <value>(Макс. _X_ Буквенно-цифровых символов)</value>
+  </data>
+  <data name="close" xml:space="preserve">
+    <value>закрыть</value>
+  </data>
+  <data name="Diverter" xml:space="preserve">
+    <value>Клапан</value>
+  </data>
+  <data name="Emptying_valve" xml:space="preserve">
+    <value>Выпускной клапан</value>
+  </data>
   <data name="Name" xml:space="preserve">
     <value>Имя</value>
   </data>
+  <data name="Reference" xml:space="preserve">
+    <value>Ссылка</value>
+  </data>
+  <data name="Reg_valve" xml:space="preserve">
+    <value>Рег. вентиль</value>
+  </data>
+  <data name="Balance" xml:space="preserve">
+    <value>Весы</value>
+  </data>
+  <data name="Duration_s" xml:space="preserve">
+    <value>Продолжительность [с]</value>
+  </data>
+  <data name="no" xml:space="preserve">
+    <value>нет</value>
+  </data>
+  <data name="New_bench_path_name" xml:space="preserve">
+    <value>PУстановка</value>
+  </data>
+  <data name="New_feeding_path_name" xml:space="preserve">
+    <value>PFeed</value>
+  </data>
+  <data name="New_output_path_name" xml:space="preserve">
+    <value>PQ</value>
+  </data>
+  <data name="New_procedure_name" xml:space="preserve">
+    <value>Процедура</value>
+  </data>
+  <data name="New_sensors_path_name" xml:space="preserve">
+    <value>PSens</value>
+  </data>
+  <data name="New_test_name" xml:space="preserve">
+    <value>Тест</value>
+  </data>
+  <data name="New_name_copy" xml:space="preserve">
+    <value> - Копировать</value>
+  </data>
+  <data name="Correction_g" xml:space="preserve">
+    <value>Коррекция [г]</value>
+  </data>
+  <data name="Nr" xml:space="preserve">
+    <value>№</value>
+  </data>
+  <data name="Mass_kg" xml:space="preserve">
+    <value>Масса [кг]</value>
+  </data>
+  <data name="AddBtnText" xml:space="preserve">
+    <value>Добавить</value>
+  </data>
   <data name="CancelBtnText" xml:space="preserve">
     <value>Отмена</value>
   </data>
+  <data name="CloseBtnText" xml:space="preserve">
+    <value>Закрыть</value>
+  </data>
+  <data name="LockBtnText" xml:space="preserve">
+    <value>Заблокировать</value>
+  </data>
+  <data name="RemoveBtnText" xml:space="preserve">
+    <value>Удалить</value>
+  </data>
   <data name="OkBtnText" xml:space="preserve">
     <value>OK</value>
   </data>
+  <data name="Correction_lph" xml:space="preserve">
+    <value>Коррекция [л/ч]</value>
+  </data>
+  <data name="Correction_mbar" xml:space="preserve">
+    <value>Коррекция [мбар]</value>
+  </data>
+  <data name="Flow_m3h" xml:space="preserve">
+    <value>Расход [м3/ч]</value>
+  </data>
+  <data name="Invalid_username_or_password" xml:space="preserve">
+    <value>Неправильное имя пользователя или пароль</value>
+  </data>
+  <data name="CopyBtnText" xml:space="preserve">
+    <value>Копировать</value>
+  </data>
+  <data name="DownBtnText" xml:space="preserve">
+    <value>Вниз</value>
+  </data>
+  <data name="EditBtnText" xml:space="preserve">
+    <value>Редактировать</value>
+  </data>
+  <data name="UpBtnText" xml:space="preserve">
+    <value>Вверх</value>
+  </data>
+  <data name="NoDatabaseMsg" xml:space="preserve">
+    <value>Не удается подключиться к базе данных.</value>
+  </data>
   <data name="ConfigureDatabaseText" xml:space="preserve">
     <value>Тестовая конфигурация установки (требуется пароль)</value>
   </data>
   <data name="ExitBtnText" xml:space="preserve">
     <value>Выход</value>
   </data>
+  <data name="Enter_password" xml:space="preserve">
+    <value>Введите пароль</value>
+  </data>
+  <data name="Invalid_password" xml:space="preserve">
+    <value>Неверный пароль</value>
+  </data>
+  <data name="Bench_name_conflict_Use_another_name_pls" xml:space="preserve">
+    <value>Имя поверочной установки неверно, используйте другое имя, пожалуйста</value>
+  </data>
+  <data name="DB_was_successfully_created" xml:space="preserve">
+    <value>База данных была успешно создана!</value>
+  </data>
+  <data name="DB_will_be_overwritten" xml:space="preserve">
+    <value>База данных будет перезаписана</value>
+  </data>
+  <data name="Do_you_want_to_proceed" xml:space="preserve">
+    <value>Вы хотите продолжить?</value>
+  </data>
+  <data name="Notification" xml:space="preserve">
+    <value>Уведомление</value>
+  </data>
+  <data name="NoBenchMsg" xml:space="preserve">
+    <value>Нет поверочной установки в конфигурации программы.</value>
+  </data>
+  <data name="DescriptionColHdr" xml:space="preserve">
+    <value>Описание</value>
+  </data>
   <data name="Procedure" xml:space="preserve">
     <value>Процедура</value>
   </data>
   <data name="Test" xml:space="preserve">
     <value>Тест</value>
   </data>
+  <data name="Corrected" xml:space="preserve">
+    <value>Исправлено</value>
+  </data>
+  <data name="Measured" xml:space="preserve">
+    <value>Измерено</value>
+  </data>
+  <data name="Bench_is_not_running" xml:space="preserve">
+    <value>Поверочная установка не запущена, однако вы можете изменить настройки, чтобы решить эту проблему.</value>
+  </data>
+  <data name="Emptying_chdr" xml:space="preserve">
+    <value>Выпуск</value>
+  </data>
+  <data name="Bench_chdr" xml:space="preserve">
+    <value>Установка</value>
+  </data>
+  <data name="Err_cor_neg_pct_chdr" xml:space="preserve">
+    <value>Err. cor. - [%]</value>
+  </data>
+  <data name="Err_cor_pos_pct_chdr" xml:space="preserve">
+    <value>Err. cor. +[%]</value>
+  </data>
+  <data name="Err_limit_neg_pct_chdr" xml:space="preserve">
+    <value>Err. Limit - [%]</value>
+  </data>
+  <data name="Err_limit_pos_pct_chdr" xml:space="preserve">
+    <value>Err. Limit + [%]</value>
+  </data>
+  <data name="Feeding_chdr" xml:space="preserve">
+    <value>Feeding</value>
+  </data>
+  <data name="Red_type_chdr" xml:space="preserve">
+    <value>Red. type</value>
+  </data>
+  <data name="Error_while_creating_DB_Reason" xml:space="preserve">
+    <value>Ошибка при создании базы данных. Причина:</value>
+  </data>
+  <data name="Metrology" xml:space="preserve">
+    <value>Метрология</value>
+  </data>
+  <data name="_offline" xml:space="preserve">
+    <value>(не в сети)</value>
+  </data>
+  <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="Close_emptying_valve" xml:space="preserve">
+    <value>Закрыть выпускной клапан</value>
+  </data>
+  <data name="Get_mass_of_water_in_the_tank" xml:space="preserve">
+    <value>Получить массу воды в резервуаре</value>
+  </data>
+  <data name="Ignore" xml:space="preserve">
+    <value>Отклонить</value>
+  </data>
+  <data name="Loading_the_procedure" xml:space="preserve">
+    <value>Процедура загрузки</value>
+  </data>
+  <data name="Make_tank_empty" xml:space="preserve">
+    <value>Оборожнить бак</value>
+  </data>
+  <data name="Measure_the_mass" xml:space="preserve">
+    <value>Измерьте массу</value>
+  </data>
+  <data name="Ready" xml:space="preserve">
+    <value>Готов</value>
+  </data>
+  <data name="BackBtnText" xml:space="preserve">
+    <value>&lt; Назад</value>
+  </data>
+  <data name="FinishBtnText" xml:space="preserve">
+    <value>Завершить</value>
+  </data>
+  <data name="NextBtnText" xml:space="preserve">
+    <value>Дальше &gt;</value>
+  </data>
+  <data name="Flow_selection" xml:space="preserve">
+    <value>Выбор расхода</value>
+  </data>
+  <data name="Method_chdr" xml:space="preserve">
+    <value>Метод испытания</value>
+  </data>
+  <data name="RelativeQfrom" xml:space="preserve">
+    <value>Относительный Q от</value>
+  </data>
+  <data name="RelativeQto" xml:space="preserve">
+    <value>Относительный Q до</value>
+  </data>
+  <data name="Combined_meters" xml:space="preserve">
+    <value>Комбинированные счетчики</value>
+  </data>
+  <data name="DetectionThresholdPct" xml:space="preserve">
+    <value>Порог [%]</value>
+  </data>
+  <data name="RateOfChangePct" xml:space="preserve">
+    <value>Скорость изменения [%]</value>
+  </data>
   <data name="Component" xml:space="preserve">
     <value>Компонент</value>
   </data>
+  <data name="_none_" xml:space="preserve">
+    <value>&lt;нет&gt;</value>
+  </data>
+  <data name="Method_selection" xml:space="preserve">
+    <value>Выбор метода испытаний</value>
+  </data>
+  <data name="Clear_results" xml:space="preserve">
+    <value>Очистить Результаты</value>
+  </data>
   <data name="Configure" xml:space="preserve">
     <value>Конфигурировать</value>
   </data>
+  <data name="Arrangement_of_meters" xml:space="preserve">
+    <value>Расположение испытуемых счетчиков</value>
+  </data>
+  <data name="Arrangement_of_tests" xml:space="preserve">
+    <value>Расположение испытаний</value>
+  </data>
+  <data name="Horizontally" xml:space="preserve">
+    <value>Горизонтально</value>
+  </data>
+  <data name="Configuration" xml:space="preserve">
+    <value>Конфигурация</value>
+  </data>
+  <data name="Failed" xml:space="preserve">
+    <value>NOK</value>
+  </data>
+  <data name="ClearBtnText" xml:space="preserve">
+    <value>Очистить</value>
+  </data>
+  <data name="Emptying_tank" xml:space="preserve">
+    <value>Опорожнение бака</value>
+  </data>
+  <data name="Measuring_the_weight" xml:space="preserve">
+    <value>Измерение веса</value>
+  </data>
+  <data name="Emptying_i_n" xml:space="preserve">
+    <value>Слив ({0}: шаг {1} / {2})</value>
+  </data>
+  <data name="Activity" xml:space="preserve">
+    <value>Активность</value>
+  </data>
+  <data name="Approval_info" xml:space="preserve">
+    <value>Информация об утверждении</value>
+  </data>
+  <data name="Metrological_class" xml:space="preserve">
+    <value>Метрологический класс</value>
+  </data>
+  <data name="Producer" xml:space="preserve">
+    <value>Производитель</value>
+  </data>
   <data name="Printer" xml:space="preserve">
     <value>Принтер</value>
   </data>
+  <data name="Version" xml:space="preserve">
+    <value>Версия</value>
+  </data>
+  <data name="nothing_to_configure" xml:space="preserve">
+    <value>&lt;нечего настраивать&gt;</value>
+  </data>
+  <data name="Fill_with_water" xml:space="preserve">
+    <value>Заполнить установку водой?</value>
+  </data>
+  <data name="NoBtn" xml:space="preserve">
+    <value>Нет</value>
+  </data>
   <data name="Question" xml:space="preserve">
     <value>Вопрос</value>
   </data>
+  <data name="Bench_parameters" xml:space="preserve">
+    <value>Установка параметров</value>
+  </data>
   <data name="Connection_string" xml:space="preserve">
     <value>Строка подключения БД</value>
   </data>
+  <data name="Create_DB" xml:space="preserve">
+    <value>Создание БД</value>
+  </data>
+  <data name="Database_type" xml:space="preserve">
+    <value>Тип БД</value>
+  </data>
+  <data name="Logging" xml:space="preserve">
+    <value>Логирование</value>
+  </data>
+  <data name="Mode" xml:space="preserve">
+    <value>Режим</value>
+  </data>
+  <data name="NewTabBtnText" xml:space="preserve">
+    <value>Новая вкладка</value>
+  </data>
+  <data name="New_transition_name" xml:space="preserve">
+    <value>Новое имя перехода</value>
+  </data>
+  <data name="Detection_completed" xml:space="preserve">
+    <value>Обнаружение завершено</value>
+  </data>
+  <data name="Emergency_STOP" xml:space="preserve">
+    <value>Аварийная остановка</value>
+  </data>
   <data name="Add" xml:space="preserve">
     <value>&amp;Добавить &gt;</value>
   </data>
+  <data name="Available_results" xml:space="preserve">
+    <value>Доступные результаты</value>
+  </data>
+  <data name="Remove" xml:space="preserve">
+    <value>&lt; &amp;Удалить</value>
+  </data>
+  <data name="Remove_all" xml:space="preserve">
+    <value>&lt;&lt; Удалить все</value>
+  </data>
   <data name="Message" xml:space="preserve">
     <value>Сообщение</value>
   </data>
+  <data name="dflt" xml:space="preserve">
+    <value>dflt</value>
+  </data>
+  <data name="Detection_failed" xml:space="preserve">
+    <value>Обнаружение не удалось</value>
+  </data>
+  <data name="Camera_error" xml:space="preserve">
+    <value>Ошибка камеры</value>
+  </data>
+  <data name="remaining_time" xml:space="preserve">
+    <value>оставшееся время</value>
+  </data>
+  <data name="LessBtnText" xml:space="preserve">
+    <value>Меньше</value>
+  </data>
+  <data name="MoreBtnText" xml:space="preserve">
+    <value>Больше</value>
+  </data>
+  <data name="Changes_will_be_lost_Do_you_want_to_proceed" xml:space="preserve">
+    <value>Изменения будут потеряны. Вы хотите продолжить?</value>
+  </data>
+  <data name="Flowmeter" xml:space="preserve">
+    <value>Расходомер</value>
+  </data>
+  <data name="CombinedBtnText" xml:space="preserve">
+    <value>Комбинированный</value>
+  </data>
+  <data name="Device" xml:space="preserve">
+    <value>Устройство</value>
+  </data>
+  <data name="PrinterBtnText" xml:space="preserve">
+    <value>Принтер</value>
+  </data>
+  <data name="Aux_Water_Meter" xml:space="preserve">
+    <value>Доп.счетчик воды</value>
+  </data>
+  <data name="Aux_Water_Meter_State" xml:space="preserve">
+    <value>Статус доп.счетчика</value>
+  </data>
   <data name="Data" xml:space="preserve">
     <value>Данные</value>
   </data>
+  <data name="End_State" xml:space="preserve">
+    <value>Конечное состояние</value>
+  </data>
+  <data name="Main_Water_Meter" xml:space="preserve">
+    <value>Главный счетчик воды</value>
+  </data>
+  <data name="Main_Water_Meter_State" xml:space="preserve">
+    <value>Статус главного счетчика</value>
+  </data>
   <data name="Protocol" xml:space="preserve">
     <value>Протокол</value>
   </data>
   <data name="Serial_Number" xml:space="preserve">
     <value>Серийный номер</value>
   </data>
+  <data name="Aux_WM_SerialNr" xml:space="preserve">
+    <value>Сер. № доп. счетчика</value>
+  </data>
+  <data name="Main_WM_SerialNr" xml:space="preserve">
+    <value>Сер. № главн. счетчика</value>
+  </data>
+  <data name="Adjustment_in_progress" xml:space="preserve">
+    <value>Настройка выполняется</value>
+  </data>
+  <data name="Error_pct" xml:space="preserve">
+    <value>Погрешность [%]</value>
+  </data>
+  <data name="Duration_Leak_s" xml:space="preserve">
+    <value>Продолжительность расхода [с]</value>
+  </data>
+  <data name="Duration_PMax_s" xml:space="preserve">
+    <value>Продолжительность Pмакс [с]</value>
+  </data>
+  <data name="Closing_valve_Pump_off" xml:space="preserve">
+    <value>Закрытие впускного клапана, выключение насоса</value>
+  </data>
+  <data name="Purchase_Order" xml:space="preserve">
+    <value>Заказ</value>
+  </data>
+  <data name="Ambient_humidity_" xml:space="preserve">
+    <value>Относительная влажность окружающей среды:</value>
+  </data>
+  <data name="Ambient_pressure_" xml:space="preserve">
+    <value>Относительное давление: </value>
+  </data>
+  <data name="Ambient_temperature_" xml:space="preserve">
+    <value>Температура окружающей среды: </value>
+  </data>
+  <data name="Approval_" xml:space="preserve">
+    <value>Утверждение: </value>
+  </data>
+  <data name="Date_and_time_" xml:space="preserve">
+    <value>Дата и время: </value>
+  </data>
+  <data name="End" xml:space="preserve">
+    <value>Конец</value>
+  </data>
+  <data name="AtTemperature_C" xml:space="preserve">
+    <value>температура [degC]</value>
+  </data>
+  <data name="Density_kg_m3" xml:space="preserve">
+    <value>Плотность [кг/м3]</value>
+  </data>
+  <data name="Density" xml:space="preserve">
+    <value>Плотность</value>
+  </data>
+  <data name="Nr_meters_in_a_group" xml:space="preserve">
+    <value>№ счетчиков в группе</value>
+  </data>
+  <data name="End_Condition" xml:space="preserve">
+    <value>Конечное состояние</value>
+  </data>
+  <data name="Communication" xml:space="preserve">
+    <value>Соединение</value>
+  </data>
+  <data name="Aux_" xml:space="preserve">
+    <value>Доп.</value>
+  </data>
+  <data name="Main_" xml:space="preserve">
+    <value>Главн:</value>
+  </data>
+  <data name="cold" xml:space="preserve">
+    <value>холодный</value>
+  </data>
+  <data name="hot" xml:space="preserve">
+    <value>горячий</value>
+  </data>
+  <data name="Product_name" xml:space="preserve">
+    <value>Наименование продукта</value>
+  </data>
+  <data name="Address" xml:space="preserve">
+    <value>Адрес</value>
+  </data>
+  <data name="Approval_date" xml:space="preserve">
+    <value>Дата утверждения</value>
+  </data>
+  <data name="Approval_ID" xml:space="preserve">
+    <value>ID Утверждения </value>
+  </data>
+  <data name="Approved_by" xml:space="preserve">
+    <value>Утверждено</value>
+  </data>
+  <data name="Evaluate" xml:space="preserve">
+    <value>Оценка</value>
+  </data>
+  <data name="iPerl_Communication_in_progress" xml:space="preserve">
+    <value>Осуществляется связь с iPerl </value>
+  </data>
   <data name="Language" xml:space="preserve">
     <value>Язык</value>
   </data>
+  <data name="Available_Components_" xml:space="preserve">
+    <value>Доступные компоненты:</value>
+  </data>
+  <data name="Database_Settings" xml:space="preserve">
+    <value>Настройки Базы данных</value>
+  </data>
+  <data name="About_Test_Bench_Framework" xml:space="preserve">
+    <value>О Framework поверочной установки</value>
+  </data>
+  <data name="BuildDateStr" xml:space="preserve">
+    <value>Build Data _BUILD_Data_</value>
+  </data>
+  <data name="CopyrightStr" xml:space="preserve">
+    <value>Copyright © 2013 - {0}</value>
+  </data>
+  <data name="Edit_User" xml:space="preserve">
+    <value>Редактировать пользователя</value>
+  </data>
+  <data name="Groups" xml:space="preserve">
+    <value>Группы</value>
+  </data>
+  <data name="An_unhandled_error_occured" xml:space="preserve">
+    <value>Произошла необрабатываемая ошибка</value>
+  </data>
+  <data name="IgnoreBtnText" xml:space="preserve">
+    <value>Отклонить</value>
+  </data>
   <data name="Add_filter" xml:space="preserve">
     <value>Добавить фильтр</value>
   </data>
@@ -219,6 +732,18 @@
   <data name="RetryDatabaseText" xml:space="preserve">
     <value>Повтор</value>
   </data>
+  <data name="Selected_results" xml:space="preserve">
+    <value>Выбанные результаты</value>
+  </data>
+  <data name="SingleBtnText" xml:space="preserve">
+    <value>Единый</value>
+  </data>
+  <data name="UnlockBtnText" xml:space="preserve">
+    <value>Разблокировать</value>
+  </data>
+  <data name="Water_Meter" xml:space="preserve">
+    <value>Счетчик воды</value>
+  </data>
   <data name="Date" xml:space="preserve">
     <value>Дата</value>
   </data>

ResultsBrowser/ResultsBrowser.csproj

@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;ZAMBIA</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;IZRAEL_200</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -31,7 +31,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;ZAMBIA</DefineConstants>
+    <DefineConstants>TRACE;IZRAEL_200</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -60,7 +60,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Windows.Forms.DataVisualization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -134,24 +133,6 @@
     <Compile Include="Forms\DatabaseSettingsDlg.Designer.cs">
       <DependentUpon>DatabaseSettingsDlg.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\HistogramCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Forms\HistogramCtrl.Designer.cs">
-      <DependentUpon>HistogramCtrl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\HistogramDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\HistogramDlg.Designer.cs">
-      <DependentUpon>HistogramDlg.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\HistogramOptionsDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\HistogramOptionsDlg.Designer.cs">
-      <DependentUpon>HistogramOptionsDlg.cs</DependentUpon>
-    </Compile>
     <Compile Include="Forms\NoBenchOrDatabaseDlg.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -221,15 +202,6 @@
     <EmbeddedResource Include="Forms\DatabaseSettingsDlg.resx">
       <DependentUpon>DatabaseSettingsDlg.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\HistogramCtrl.resx">
-      <DependentUpon>HistogramCtrl.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\HistogramDlg.resx">
-      <DependentUpon>HistogramDlg.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\HistogramOptionsDlg.resx">
-      <DependentUpon>HistogramOptionsDlg.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Forms\NoBenchOrDatabaseDlg.resx">
       <DependentUpon>NoBenchOrDatabaseDlg.cs</DependentUpon>
     </EmbeddedResource>
@@ -254,7 +226,6 @@
     </Compile>
     <EmbeddedResource Include="Resources\Strings.cs.resx" />
     <EmbeddedResource Include="Resources\Strings.de.resx" />
-    <EmbeddedResource Include="Resources\Strings.fr.resx" />
     <EmbeddedResource Include="Resources\Strings.it.resx" />
     <EmbeddedResource Include="Resources\Strings.pl.resx">
       <SubType>Designer</SubType>

ResultsBrowser/ResultsBrowserWnd.Designer.cs

@@ -34,13 +34,10 @@
             this.filtersFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
             this.resultsGroupBox = new System.Windows.Forms.GroupBox();
             this.resultsListView = new System.Windows.Forms.ListView();
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.histogramBtn = new System.Windows.Forms.Button();
-            this.statisticsBtn = new System.Windows.Forms.Button();
-            this.outputGroupBox = new System.Windows.Forms.GroupBox();
-            this.exportQueryResultsBtn = new System.Windows.Forms.Button();
-            this.printQueryResultsBtn = new System.Windows.Forms.Button();
             this.printerConfigBtn = new System.Windows.Forms.Button();
+            this.statisticsBtn = new System.Windows.Forms.Button();
+            this.printQueryResultsBtn = new System.Windows.Forms.Button();
+            this.exportQueryResultsBtn = new System.Windows.Forms.Button();
             this.formatOfResultsBtn = new System.Windows.Forms.Button();
             this.clearFiltersBtn = new System.Windows.Forms.Button();
             this.settingsBtn = new System.Windows.Forms.Button();
@@ -65,8 +62,6 @@
             this.hSplitContainer.SuspendLayout();
             this.filtersGroupBox.SuspendLayout();
             this.resultsGroupBox.SuspendLayout();
-            this.groupBox1.SuspendLayout();
-            this.outputGroupBox.SuspendLayout();
             this.testBenchesGroupBox.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -84,9 +79,10 @@
             // 
             // vSplitContainer.Panel2
             // 
-            this.vSplitContainer.Panel2.Controls.Add(this.groupBox1);
-            this.vSplitContainer.Panel2.Controls.Add(this.outputGroupBox);
             this.vSplitContainer.Panel2.Controls.Add(this.printerConfigBtn);
+            this.vSplitContainer.Panel2.Controls.Add(this.statisticsBtn);
+            this.vSplitContainer.Panel2.Controls.Add(this.printQueryResultsBtn);
+            this.vSplitContainer.Panel2.Controls.Add(this.exportQueryResultsBtn);
             this.vSplitContainer.Panel2.Controls.Add(this.formatOfResultsBtn);
             this.vSplitContainer.Panel2.Controls.Add(this.clearFiltersBtn);
             this.vSplitContainer.Panel2.Controls.Add(this.settingsBtn);
@@ -158,68 +154,6 @@
             this.resultsListView.UseCompatibleStateImageBehavior = false;
             this.resultsListView.View = System.Windows.Forms.View.Details;
             // 
-            // groupBox1
-            // 
-            this.groupBox1.Controls.Add(this.histogramBtn);
-            this.groupBox1.Controls.Add(this.statisticsBtn);
-            this.groupBox1.Location = new System.Drawing.Point(8, 608);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(125, 93);
-            this.groupBox1.TabIndex = 13;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "Analysis";
-            // 
-            // histogramBtn
-            // 
-            this.histogramBtn.Location = new System.Drawing.Point(5, 55);
-            this.histogramBtn.Name = "histogramBtn";
-            this.histogramBtn.Size = new System.Drawing.Size(114, 32);
-            this.histogramBtn.TabIndex = 11;
-            this.histogramBtn.Text = "Histograms";
-            this.histogramBtn.UseVisualStyleBackColor = true;
-            this.histogramBtn.Click += new System.EventHandler(this.histogramBtn_Click);
-            // 
-            // statisticsBtn
-            // 
-            this.statisticsBtn.Location = new System.Drawing.Point(5, 18);
-            this.statisticsBtn.Name = "statisticsBtn";
-            this.statisticsBtn.Size = new System.Drawing.Size(114, 32);
-            this.statisticsBtn.TabIndex = 10;
-            this.statisticsBtn.Text = "Statistics";
-            this.statisticsBtn.UseVisualStyleBackColor = true;
-            this.statisticsBtn.Click += new System.EventHandler(this.statisticsBtn_Click);
-            // 
-            // outputGroupBox
-            // 
-            this.outputGroupBox.Controls.Add(this.exportQueryResultsBtn);
-            this.outputGroupBox.Controls.Add(this.printQueryResultsBtn);
-            this.outputGroupBox.Location = new System.Drawing.Point(8, 509);
-            this.outputGroupBox.Name = "outputGroupBox";
-            this.outputGroupBox.Size = new System.Drawing.Size(125, 93);
-            this.outputGroupBox.TabIndex = 12;
-            this.outputGroupBox.TabStop = false;
-            this.outputGroupBox.Text = "Output";
-            // 
-            // exportQueryResultsBtn
-            // 
-            this.exportQueryResultsBtn.Location = new System.Drawing.Point(5, 18);
-            this.exportQueryResultsBtn.Name = "exportQueryResultsBtn";
-            this.exportQueryResultsBtn.Size = new System.Drawing.Size(114, 32);
-            this.exportQueryResultsBtn.TabIndex = 8;
-            this.exportQueryResultsBtn.Text = "Export query results";
-            this.exportQueryResultsBtn.UseVisualStyleBackColor = true;
-            this.exportQueryResultsBtn.Click += new System.EventHandler(this.exportQueryResultsBtn_Click);
-            // 
-            // printQueryResultsBtn
-            // 
-            this.printQueryResultsBtn.Location = new System.Drawing.Point(5, 55);
-            this.printQueryResultsBtn.Name = "printQueryResultsBtn";
-            this.printQueryResultsBtn.Size = new System.Drawing.Size(113, 32);
-            this.printQueryResultsBtn.TabIndex = 9;
-            this.printQueryResultsBtn.Text = "Print query results";
-            this.printQueryResultsBtn.UseVisualStyleBackColor = true;
-            this.printQueryResultsBtn.Click += new System.EventHandler(this.printQueryResultsBtn_Click);
-            // 
             // printerConfigBtn
             // 
             this.printerConfigBtn.Location = new System.Drawing.Point(8, 316);
@@ -230,6 +164,36 @@
             this.printerConfigBtn.UseVisualStyleBackColor = true;
             this.printerConfigBtn.Click += new System.EventHandler(this.printerConfigBtn_Click);
             // 
+            // statisticsBtn
+            // 
+            this.statisticsBtn.Location = new System.Drawing.Point(8, 621);
+            this.statisticsBtn.Name = "statisticsBtn";
+            this.statisticsBtn.Size = new System.Drawing.Size(125, 35);
+            this.statisticsBtn.TabIndex = 10;
+            this.statisticsBtn.Text = "Statistics";
+            this.statisticsBtn.UseVisualStyleBackColor = true;
+            this.statisticsBtn.Click += new System.EventHandler(this.statisticsBtn_Click);
+            // 
+            // printQueryResultsBtn
+            // 
+            this.printQueryResultsBtn.Location = new System.Drawing.Point(8, 548);
+            this.printQueryResultsBtn.Name = "printQueryResultsBtn";
+            this.printQueryResultsBtn.Size = new System.Drawing.Size(125, 35);
+            this.printQueryResultsBtn.TabIndex = 9;
+            this.printQueryResultsBtn.Text = "Print query results";
+            this.printQueryResultsBtn.UseVisualStyleBackColor = true;
+            this.printQueryResultsBtn.Click += new System.EventHandler(this.printQueryResultsBtn_Click);
+            // 
+            // exportQueryResultsBtn
+            // 
+            this.exportQueryResultsBtn.Location = new System.Drawing.Point(8, 508);
+            this.exportQueryResultsBtn.Name = "exportQueryResultsBtn";
+            this.exportQueryResultsBtn.Size = new System.Drawing.Size(125, 35);
+            this.exportQueryResultsBtn.TabIndex = 8;
+            this.exportQueryResultsBtn.Text = "Export query results";
+            this.exportQueryResultsBtn.UseVisualStyleBackColor = true;
+            this.exportQueryResultsBtn.Click += new System.EventHandler(this.exportQueryResultsBtn_Click);
+            // 
             // formatOfResultsBtn
             // 
             this.formatOfResultsBtn.Location = new System.Drawing.Point(8, 276);
@@ -406,8 +370,6 @@
             this.hSplitContainer.ResumeLayout(false);
             this.filtersGroupBox.ResumeLayout(false);
             this.resultsGroupBox.ResumeLayout(false);
-            this.groupBox1.ResumeLayout(false);
-            this.outputGroupBox.ResumeLayout(false);
             this.testBenchesGroupBox.ResumeLayout(false);
             this.testBenchesGroupBox.PerformLayout();
             this.ResumeLayout(false);
@@ -440,8 +402,5 @@
         private System.Windows.Forms.RadioButton checkBox4;
 		private System.Windows.Forms.Button printerConfigBtn;
         private System.Windows.Forms.RadioButton checkBox6;
-        private System.Windows.Forms.GroupBox groupBox1;
-        private System.Windows.Forms.GroupBox outputGroupBox;
-        private System.Windows.Forms.Button histogramBtn;
     }
 }

ResultsBrowser/ResultsBrowserWnd.cs

@@ -1,7 +1,4 @@
-///
-/// Copyright (c) 2016-2019 Sensus Slovensko a.s.
-///
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Windows.Forms;
@@ -492,7 +489,7 @@ namespace ResultsBrowser
 			IList<Results.WMeterRsltItemSpec> items = Results.WMeterRsltItemSpec.FromStrArray(filtersConfig.ResultItems);
 
             ///
-            /// Statistics options
+            /// Enter options
             ///
             Forms.StatisticsOptionsDlg optionsDlg = new Forms.StatisticsOptionsDlg(items);
             if (optionsDlg.ShowDialog() != DialogResult.OK) return;
@@ -500,31 +497,16 @@ namespace ResultsBrowser
             ///
             /// Calculate statistics
             ///
-            Forms.StatisticsDlg statisticsDlg = new Forms.StatisticsDlg(waterMeters, optionsDlg, timePeriodStart, timePeriodEnd);
+            Forms.StatisticsDlg statisticsDlg = new Forms.StatisticsDlg(waterMeters, optionsDlg.TwoDim,
+																		optionsDlg.RowItem, optionsDlg.RowItem2, optionsDlg.RowItem3,
+																		optionsDlg.ColumnItem, optionsDlg.ColumnItem2, optionsDlg.ColumnItem3,
+																		optionsDlg.RowTestSpecifier, optionsDlg.RowTestSpecifier2, optionsDlg.RowTestSpecifier3,
+																		optionsDlg.ColumnTestSpecifier, optionsDlg.ColumnTestSpecifier2, optionsDlg.ColumnTestSpecifier3,
+																		timePeriodStart, timePeriodEnd);
             statisticsDlg.ShowDialog();
         }
 
 
-        private void histogramBtn_Click(object sender, EventArgs e)
-        {
-            if (waterMeters == null || waterMeters.Count == 0) return;
-
-            IList<Results.WMeterRsltItemSpec> items = Results.WMeterRsltItemSpec.FromStrArray(filtersConfig.ResultItems);
-
-            ///
-            /// Histogram options
-            ///
-            Forms.HistogramOptionsDlg optionsDlg = new Forms.HistogramOptionsDlg(items);
-            if (optionsDlg.ShowDialog() != DialogResult.OK) return;
-
-            ///
-            /// Calculate and display histograms
-            ///
-            Forms.HistogramDlg histogramDlg = new Forms.HistogramDlg(waterMeters, optionsDlg, "Histogramy");
-            histogramDlg.ShowDialog();
-        }
-
-
 		/// <summary>
 		/// Updates component factory
 		/// </summary>

Statistics/LocalSettings.cs

@@ -18,6 +18,7 @@ namespace Statistics
     [XmlRootAttribute("Statistics")]
     public class LocalSettings
     {
+        public const int BenchesCount = 6;
         public const int FlowsCount = 5;
 
 
@@ -46,166 +47,115 @@ namespace Statistics
             return ((ConnectionStrings != null) && (i >= 0) && (i < ConnectionStrings.Length)) ? ConnectionStrings[i] : string.Empty;
         }
 
-        ///
-        /// MID-s
-        ///
-        public string[] MidNames;
-
         ///
         /// Flow settings
         ///
+        public bool[] FlowEnabledWMs;
         public bool[] FlowEnabledI1;
         public bool[] FlowEnabledI2;
         public bool[] FlowEnabledI3;
         public bool[] FlowEnabledI4;
-        public bool[] FlowEnabledI5;
-        public bool[] FlowEnabledI6;
-        public bool[] FlowEnabledI7;
-        
-        
-        /// <summary>
-        /// Get flow enabled info
-        /// </summary>
-        /// <param name="midId">1-based MID id</param>
-        /// <param name="i">0-based flow id</param>
-        /// <returns>true = enabled</returns>
-        public bool GetFlowEnabled(int midId, int i)
+        /// 
+        public bool GetFlowEnabled(UserControls.MidId midId, int i)
         {
             switch (midId)
             {
-                case 1: return ((FlowEnabledI1 != null) && (i >= 0) && (i < FlowEnabledI1.Length)) ? FlowEnabledI1[i] : false;
-                case 2: return ((FlowEnabledI2 != null) && (i >= 0) && (i < FlowEnabledI2.Length)) ? FlowEnabledI2[i] : false;
-                case 3: return ((FlowEnabledI3 != null) && (i >= 0) && (i < FlowEnabledI3.Length)) ? FlowEnabledI3[i] : false;
-                case 4: return ((FlowEnabledI4 != null) && (i >= 0) && (i < FlowEnabledI4.Length)) ? FlowEnabledI4[i] : false;
-                case 5: return ((FlowEnabledI5 != null) && (i >= 0) && (i < FlowEnabledI5.Length)) ? FlowEnabledI5[i] : false;
-                case 6: return ((FlowEnabledI6 != null) && (i >= 0) && (i < FlowEnabledI6.Length)) ? FlowEnabledI6[i] : false;
-                case 7: return ((FlowEnabledI7 != null) && (i >= 0) && (i < FlowEnabledI7.Length)) ? FlowEnabledI7[i] : false;
+                case UserControls.MidId.WaterMeters:
+                    return ((FlowEnabledWMs != null) && (i >= 0) && (i < FlowEnabledWMs.Length)) ? FlowEnabledWMs[i] : false;
+                case UserControls.MidId.I1: return ((FlowEnabledI1 != null) && (i >= 0) && (i < FlowEnabledI1.Length)) ? FlowEnabledI1[i] : false;
+                case UserControls.MidId.I2: return ((FlowEnabledI2 != null) && (i >= 0) && (i < FlowEnabledI2.Length)) ? FlowEnabledI2[i] : false;
+                case UserControls.MidId.I3: return ((FlowEnabledI3 != null) && (i >= 0) && (i < FlowEnabledI3.Length)) ? FlowEnabledI3[i] : false;
+                case UserControls.MidId.I4: return ((FlowEnabledI4 != null) && (i >= 0) && (i < FlowEnabledI4.Length)) ? FlowEnabledI4[i] : false;
                 default:                    
                     return false;
             }
         }
-
-        /// <summary>
-        /// Set flow enabled info
-        /// </summary>
-        /// <param name="midId">1-based MID id</param>
-        /// <param name="i">0-based flow id</param>
-        /// <param name="value">true = enabled</param>
-        public void SetFlowEnabled(int midId, int i, bool value)
+        /// 
+        public void SetFlowEnabled(UserControls.MidId midId, int i, bool value)
         {
             switch (midId)
             {
-                case 1: if ((FlowEnabledI1 != null) && (i >= 0) && (i < FlowEnabledI1.Length)) { FlowEnabledI1[i] = value; }; break;
-                case 2: if ((FlowEnabledI2 != null) && (i >= 0) && (i < FlowEnabledI2.Length)) { FlowEnabledI2[i] = value; }; break;
-                case 3: if ((FlowEnabledI3 != null) && (i >= 0) && (i < FlowEnabledI3.Length)) { FlowEnabledI3[i] = value; }; break;
-                case 4: if ((FlowEnabledI4 != null) && (i >= 0) && (i < FlowEnabledI4.Length)) { FlowEnabledI4[i] = value; }; break;
-                case 5: if ((FlowEnabledI5 != null) && (i >= 0) && (i < FlowEnabledI5.Length)) { FlowEnabledI5[i] = value; }; break;
-                case 6: if ((FlowEnabledI6 != null) && (i >= 0) && (i < FlowEnabledI6.Length)) { FlowEnabledI6[i] = value; }; break;
-                case 7: if ((FlowEnabledI7 != null) && (i >= 0) && (i < FlowEnabledI7.Length)) { FlowEnabledI7[i] = value; }; break;
+                case UserControls.MidId.WaterMeters:
+                    if ((FlowEnabledWMs != null) && (i >= 0) && (i < FlowEnabledWMs.Length)) { FlowEnabledWMs[i] = value; };
+                    break;
+                case UserControls.MidId.I1: if ((FlowEnabledI1 != null) && (i >= 0) && (i < FlowEnabledI1.Length)) { FlowEnabledI1[i] = value; }; break;
+                case UserControls.MidId.I2: if ((FlowEnabledI2 != null) && (i >= 0) && (i < FlowEnabledI2.Length)) { FlowEnabledI2[i] = value; }; break;
+                case UserControls.MidId.I3: if ((FlowEnabledI3 != null) && (i >= 0) && (i < FlowEnabledI3.Length)) { FlowEnabledI3[i] = value; }; break;
+                case UserControls.MidId.I4: if ((FlowEnabledI4 != null) && (i >= 0) && (i < FlowEnabledI4.Length)) { FlowEnabledI4[i] = value; }; break;
                 default:
                     break;
             }
         }
 
+        public double[] FlowFromWMs;
         public double[] FlowFromI1;
         public double[] FlowFromI2;
         public double[] FlowFromI3;
         public double[] FlowFromI4;
-        public double[] FlowFromI5;
-        public double[] FlowFromI6;
-        public double[] FlowFromI7;
-
-        /// <summary>
-        /// Get lower limit of the flow
-        /// </summary>
-        /// <param name="midId">1-based MID id</param>
-        /// <param name="i">0-based flow id</param>
-        /// <returns>Flow in m3/h</returns>
-        public double GetFlowFrom(int midId, int i)
+        /// 
+        public double GetFlowFrom(UserControls.MidId midId, int i)
         {
             switch (midId)
             {
-                case 1: return ((FlowFromI1 != null) && (i >= 0) && (i < FlowFromI1.Length)) ? FlowFromI1[i] : 0;
-                case 2: return ((FlowFromI2 != null) && (i >= 0) && (i < FlowFromI2.Length)) ? FlowFromI2[i] : 0;
-                case 3: return ((FlowFromI3 != null) && (i >= 0) && (i < FlowFromI3.Length)) ? FlowFromI3[i] : 0;
-                case 4: return ((FlowFromI4 != null) && (i >= 0) && (i < FlowFromI4.Length)) ? FlowFromI4[i] : 0;
-                case 5: return ((FlowFromI5 != null) && (i >= 0) && (i < FlowFromI5.Length)) ? FlowFromI5[i] : 0;
-                case 6: return ((FlowFromI6 != null) && (i >= 0) && (i < FlowFromI6.Length)) ? FlowFromI6[i] : 0;
-                case 7: return ((FlowFromI7 != null) && (i >= 0) && (i < FlowFromI7.Length)) ? FlowFromI7[i] : 0;
+                case UserControls.MidId.WaterMeters:
+                    return ((FlowFromWMs != null) && (i >= 0) && (i < FlowFromWMs.Length)) ? FlowFromWMs[i] : 0;
+                case UserControls.MidId.I1: return ((FlowFromI1 != null) && (i >= 0) && (i < FlowFromI1.Length)) ? FlowFromI1[i] : 0;
+                case UserControls.MidId.I2: return ((FlowFromI2 != null) && (i >= 0) && (i < FlowFromI2.Length)) ? FlowFromI2[i] : 0;
+                case UserControls.MidId.I3: return ((FlowFromI3 != null) && (i >= 0) && (i < FlowFromI3.Length)) ? FlowFromI3[i] : 0;
+                case UserControls.MidId.I4: return ((FlowFromI4 != null) && (i >= 0) && (i < FlowFromI4.Length)) ? FlowFromI4[i] : 0;
                 default:
                     return 0;
             }
         }
-
-        /// <summary>
-        /// Set lower limit of the flow
-        /// </summary>
-        /// <param name="midId">1-based MID id</param>
-        /// <param name="i">0-based flow id</param>
-        /// <param name="value">Flow in m3/h</param>
-        public void SetFlowFrom(int midId, int i, double value)
+        /// 
+        public void SetFlowFrom(UserControls.MidId midId, int i, double value)
         {
             switch (midId)
             {
-                case 1: if ((FlowFromI1 != null) && (i >= 0) && (i < FlowFromI1.Length)) { FlowFromI1[i] = value; }; break;
-                case 2: if ((FlowFromI2 != null) && (i >= 0) && (i < FlowFromI2.Length)) { FlowFromI2[i] = value; }; break;
-                case 3: if ((FlowFromI3 != null) && (i >= 0) && (i < FlowFromI3.Length)) { FlowFromI3[i] = value; }; break;
-                case 4: if ((FlowFromI4 != null) && (i >= 0) && (i < FlowFromI4.Length)) { FlowFromI4[i] = value; }; break;
-                case 5: if ((FlowFromI5 != null) && (i >= 0) && (i < FlowFromI5.Length)) { FlowFromI5[i] = value; }; break;
-                case 6: if ((FlowFromI6 != null) && (i >= 0) && (i < FlowFromI6.Length)) { FlowFromI6[i] = value; }; break;
-                case 7: if ((FlowFromI7 != null) && (i >= 0) && (i < FlowFromI7.Length)) { FlowFromI7[i] = value; }; break;
+                case UserControls.MidId.WaterMeters:
+                    if ((FlowFromWMs != null) && (i >= 0) && (i < FlowFromWMs.Length)) { FlowFromWMs[i] = value; };
+                    break;
+                case UserControls.MidId.I1: if ((FlowFromI1 != null) && (i >= 0) && (i < FlowFromI1.Length)) { FlowFromI1[i] = value; }; break;
+                case UserControls.MidId.I2: if ((FlowFromI2 != null) && (i >= 0) && (i < FlowFromI2.Length)) { FlowFromI2[i] = value; }; break;
+                case UserControls.MidId.I3: if ((FlowFromI3 != null) && (i >= 0) && (i < FlowFromI3.Length)) { FlowFromI3[i] = value; }; break;
+                case UserControls.MidId.I4: if ((FlowFromI4 != null) && (i >= 0) && (i < FlowFromI4.Length)) { FlowFromI4[i] = value; }; break;
                 default:
                     break;
             }
         }
 
+        public double[] FlowToWMs;
         public double[] FlowToI1;
         public double[] FlowToI2;
         public double[] FlowToI3;
         public double[] FlowToI4;
-        public double[] FlowToI5;
-        public double[] FlowToI6;
-        public double[] FlowToI7;
-
-        /// <summary>
-        /// Get upper limit of the flow
-        /// </summary>
-        /// <param name="midId">1-based MID id</param>
-        /// <param name="i">0-based flow id</param>
-        /// <returns>Flow in m3/h</returns>
-        public double GetFlowTo(int midId, int i)
+        /// 
+        public double GetFlowTo(UserControls.MidId midId, int i)
         {
             switch (midId)
             {
-                case 1: return ((FlowToI1 != null) && (i >= 0) && (i < FlowToI1.Length)) ? FlowToI1[i] : 0;
-                case 2: return ((FlowToI2 != null) && (i >= 0) && (i < FlowToI2.Length)) ? FlowToI2[i] : 0;
-                case 3: return ((FlowToI3 != null) && (i >= 0) && (i < FlowToI3.Length)) ? FlowToI3[i] : 0;
-                case 4: return ((FlowToI4 != null) && (i >= 0) && (i < FlowToI4.Length)) ? FlowToI4[i] : 0;
-                case 5: return ((FlowToI5 != null) && (i >= 0) && (i < FlowToI5.Length)) ? FlowToI5[i] : 0;
-                case 6: return ((FlowToI6 != null) && (i >= 0) && (i < FlowToI6.Length)) ? FlowToI6[i] : 0;
-                case 7: return ((FlowToI7 != null) && (i >= 0) && (i < FlowToI7.Length)) ? FlowToI7[i] : 0;
+                case UserControls.MidId.WaterMeters:
+                    return ((FlowToWMs != null) && (i >= 0) && (i < FlowToWMs.Length)) ? FlowToWMs[i] : 0;
+                case UserControls.MidId.I1: return ((FlowToI1 != null) && (i >= 0) && (i < FlowToI1.Length)) ? FlowToI1[i] : 0;
+                case UserControls.MidId.I2: return ((FlowToI2 != null) && (i >= 0) && (i < FlowToI2.Length)) ? FlowToI2[i] : 0;
+                case UserControls.MidId.I3: return ((FlowToI3 != null) && (i >= 0) && (i < FlowToI3.Length)) ? FlowToI3[i] : 0;
+                case UserControls.MidId.I4: return ((FlowToI4 != null) && (i >= 0) && (i < FlowToI4.Length)) ? FlowToI4[i] : 0;
                 default:
                     return 0;
             }
         }
-
-        /// <summary>
-        /// Set upper limit of the flow
-        /// </summary>
-        /// <param name="midId">1-based MID id</param>
-        /// <param name="i">0-based flow id</param>
-        /// <param name="value">Flow in m3/h</param>
-        public void SetFlowTo(int midId, int i, double value)
+        /// 
+        public void SetFlowTo(UserControls.MidId midId, int i, double value)
         {
             switch (midId)
             {
-                case 1: if ((FlowToI1 != null) && (i >= 0) && (i < FlowToI1.Length)) { FlowToI1[i] = value; }; break;
-                case 2: if ((FlowToI2 != null) && (i >= 0) && (i < FlowToI2.Length)) { FlowToI2[i] = value; }; break;
-                case 3: if ((FlowToI3 != null) && (i >= 0) && (i < FlowToI3.Length)) { FlowToI3[i] = value; }; break;
-                case 4: if ((FlowToI4 != null) && (i >= 0) && (i < FlowToI4.Length)) { FlowToI4[i] = value; }; break;
-                case 5: if ((FlowToI5 != null) && (i >= 0) && (i < FlowToI5.Length)) { FlowToI5[i] = value; }; break;
-                case 6: if ((FlowToI6 != null) && (i >= 0) && (i < FlowToI6.Length)) { FlowToI6[i] = value; }; break;
-                case 7: if ((FlowToI7 != null) && (i >= 0) && (i < FlowToI7.Length)) { FlowToI7[i] = value; }; break;
+                case UserControls.MidId.WaterMeters:
+                    if ((FlowToWMs != null) && (i >= 0) && (i < FlowToWMs.Length)) { FlowToWMs[i] = value; };
+                    break;
+                case UserControls.MidId.I1: if ((FlowToI1 != null) && (i >= 0) && (i < FlowToI1.Length)) { FlowToI1[i] = value; }; break;
+                case UserControls.MidId.I2: if ((FlowToI2 != null) && (i >= 0) && (i < FlowToI2.Length)) { FlowToI2[i] = value; }; break;
+                case UserControls.MidId.I3: if ((FlowToI3 != null) && (i >= 0) && (i < FlowToI3.Length)) { FlowToI3[i] = value; }; break;
+                case UserControls.MidId.I4: if ((FlowToI4 != null) && (i >= 0) && (i < FlowToI4.Length)) { FlowToI4[i] = value; }; break;
                 default:
                     break;
             }
@@ -230,18 +180,6 @@ namespace Statistics
         /// </summary>
         public LocalSettings()
         {
-#if GENESIS
-            Language = "DE";
-
-            BenchNames = new string[] { "Genesis" };
-
-            ConnectionStrings = new string[]
-            {
-                "SERVER=localhost; DATABASE=genesis-r; UID=root; PASSWORD=; CHARSET=utf8;",
-            };
-
-            MidNames = new string[] { string.Empty, "I11", "I12", "I2", "I3", "I4", "I5" };     /// Index is MID-id
-#else
             Language = "SK";
 
             BenchNames = new string[] { "WR10", "WR11", "WR13", "WR14", "WR15", "PT7" };
@@ -256,31 +194,23 @@ namespace Statistics
                 "SERVER=10.42.129.26; DATABASE=iperlspecial-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;",
             };
 
-            MidNames = new string[] { string.Empty, "I1", "I2", "I3", "I4" };       /// Index is MID-id
-#endif
+            FlowEnabledWMs = new bool[FlowsCount];
             FlowEnabledI1 = new bool[FlowsCount];
             FlowEnabledI2 = new bool[FlowsCount];
             FlowEnabledI3 = new bool[FlowsCount];
             FlowEnabledI4 = new bool[FlowsCount];
-            FlowEnabledI5 = new bool[FlowsCount];
-            FlowEnabledI6 = new bool[FlowsCount];
-            FlowEnabledI7 = new bool[FlowsCount];
 
+            FlowFromWMs = new double[FlowsCount];
             FlowFromI1 = new double[FlowsCount];
             FlowFromI2 = new double[FlowsCount];
             FlowFromI3 = new double[FlowsCount];
             FlowFromI4 = new double[FlowsCount];
-            FlowFromI5 = new double[FlowsCount];
-            FlowFromI6 = new double[FlowsCount];
-            FlowFromI7 = new double[FlowsCount];
 
+            FlowToWMs = new double[FlowsCount];
             FlowToI1 = new double[FlowsCount];
             FlowToI2 = new double[FlowsCount];
             FlowToI3 = new double[FlowsCount];
             FlowToI4 = new double[FlowsCount];
-            FlowToI5 = new double[FlowsCount];
-            FlowToI6 = new double[FlowsCount];
-            FlowToI7 = new double[FlowsCount];
 
             SelectedRadioButtonNumber = 1;
         }

Statistics/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.18.1154.0")]
-[assembly: AssemblyFileVersion("2.18.1154.0")]
+[assembly: AssemblyVersion("2.18.1108.0")]
+[assembly: AssemblyFileVersion("2.18.1108.0")]

Statistics/Statistics.csproj

@@ -80,6 +80,7 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UserControls\Enums.cs" />
     <Compile Include="UserControls\MidOrWaterMetersCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>

Statistics/StatisticsDlg.Designer.cs

@@ -39,11 +39,27 @@
             this.dateTimeFromPicker = new System.Windows.Forms.DateTimePicker();
             this.dateTimeToPicker = new System.Windows.Forms.DateTimePicker();
             this.midsTabControl = new System.Windows.Forms.TabControl();
+            this.wr10TabPage = new System.Windows.Forms.TabPage();
+            this.wmsBenchesControl = new Statistics.UserControls.MidOrWaterMetersCtrl();
+            this.wr11TabPage = new System.Windows.Forms.TabPage();
+            this.i1BenchesControl = new Statistics.UserControls.MidOrWaterMetersCtrl();
+            this.wr13TabPage = new System.Windows.Forms.TabPage();
+            this.i2BbenchesControl = new Statistics.UserControls.MidOrWaterMetersCtrl();
+            this.wr14TabPage = new System.Windows.Forms.TabPage();
+            this.i3BenchesControl = new Statistics.UserControls.MidOrWaterMetersCtrl();
+            this.wr15TabPage = new System.Windows.Forms.TabPage();
+            this.i4BenchesControl = new Statistics.UserControls.MidOrWaterMetersCtrl();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
             this.splitContainer1.Panel2.SuspendLayout();
             this.splitContainer1.SuspendLayout();
             this.timePeriodGroupBox.SuspendLayout();
+            this.midsTabControl.SuspendLayout();
+            this.wr10TabPage.SuspendLayout();
+            this.wr11TabPage.SuspendLayout();
+            this.wr13TabPage.SuspendLayout();
+            this.wr14TabPage.SuspendLayout();
+            this.wr15TabPage.SuspendLayout();
             this.SuspendLayout();
             // 
             // splitContainer1
@@ -161,6 +177,11 @@
             // 
             // midsTabControl
             // 
+            this.midsTabControl.Controls.Add(this.wr10TabPage);
+            this.midsTabControl.Controls.Add(this.wr11TabPage);
+            this.midsTabControl.Controls.Add(this.wr13TabPage);
+            this.midsTabControl.Controls.Add(this.wr14TabPage);
+            this.midsTabControl.Controls.Add(this.wr15TabPage);
             this.midsTabControl.Dock = System.Windows.Forms.DockStyle.Fill;
             this.midsTabControl.Location = new System.Drawing.Point(0, 0);
             this.midsTabControl.Name = "midsTabControl";
@@ -168,6 +189,101 @@
             this.midsTabControl.Size = new System.Drawing.Size(1368, 732);
             this.midsTabControl.TabIndex = 0;
             // 
+            // wr10TabPage
+            // 
+            this.wr10TabPage.Controls.Add(this.wmsBenchesControl);
+            this.wr10TabPage.Location = new System.Drawing.Point(4, 22);
+            this.wr10TabPage.Name = "wr10TabPage";
+            this.wr10TabPage.Padding = new System.Windows.Forms.Padding(3);
+            this.wr10TabPage.Size = new System.Drawing.Size(1360, 706);
+            this.wr10TabPage.TabIndex = 0;
+            this.wr10TabPage.Text = "Water meters";
+            this.wr10TabPage.UseVisualStyleBackColor = true;
+            // 
+            // wmsBenchesControl
+            // 
+            this.wmsBenchesControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.wmsBenchesControl.Location = new System.Drawing.Point(3, 3);
+            this.wmsBenchesControl.Name = "wmsBenchesControl";
+            this.wmsBenchesControl.Size = new System.Drawing.Size(1354, 700);
+            this.wmsBenchesControl.TabIndex = 0;
+            // 
+            // wr11TabPage
+            // 
+            this.wr11TabPage.Controls.Add(this.i1BenchesControl);
+            this.wr11TabPage.Location = new System.Drawing.Point(4, 22);
+            this.wr11TabPage.Name = "wr11TabPage";
+            this.wr11TabPage.Padding = new System.Windows.Forms.Padding(3);
+            this.wr11TabPage.Size = new System.Drawing.Size(1360, 706);
+            this.wr11TabPage.TabIndex = 1;
+            this.wr11TabPage.Text = "I1";
+            this.wr11TabPage.UseVisualStyleBackColor = true;
+            // 
+            // i1BenchesControl
+            // 
+            this.i1BenchesControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.i1BenchesControl.Location = new System.Drawing.Point(3, 3);
+            this.i1BenchesControl.Name = "i1BenchesControl";
+            this.i1BenchesControl.Size = new System.Drawing.Size(1354, 700);
+            this.i1BenchesControl.TabIndex = 0;
+            // 
+            // wr13TabPage
+            // 
+            this.wr13TabPage.Controls.Add(this.i2BbenchesControl);
+            this.wr13TabPage.Location = new System.Drawing.Point(4, 22);
+            this.wr13TabPage.Name = "wr13TabPage";
+            this.wr13TabPage.Padding = new System.Windows.Forms.Padding(3);
+            this.wr13TabPage.Size = new System.Drawing.Size(1360, 706);
+            this.wr13TabPage.TabIndex = 2;
+            this.wr13TabPage.Text = "I2";
+            this.wr13TabPage.UseVisualStyleBackColor = true;
+            // 
+            // i2BbenchesControl
+            // 
+            this.i2BbenchesControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.i2BbenchesControl.Location = new System.Drawing.Point(3, 3);
+            this.i2BbenchesControl.Name = "i2BbenchesControl";
+            this.i2BbenchesControl.Size = new System.Drawing.Size(1354, 700);
+            this.i2BbenchesControl.TabIndex = 0;
+            // 
+            // wr14TabPage
+            // 
+            this.wr14TabPage.Controls.Add(this.i3BenchesControl);
+            this.wr14TabPage.Location = new System.Drawing.Point(4, 22);
+            this.wr14TabPage.Name = "wr14TabPage";
+            this.wr14TabPage.Padding = new System.Windows.Forms.Padding(3);
+            this.wr14TabPage.Size = new System.Drawing.Size(1360, 706);
+            this.wr14TabPage.TabIndex = 3;
+            this.wr14TabPage.Text = "I3";
+            this.wr14TabPage.UseVisualStyleBackColor = true;
+            // 
+            // i3BenchesControl
+            // 
+            this.i3BenchesControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.i3BenchesControl.Location = new System.Drawing.Point(3, 3);
+            this.i3BenchesControl.Name = "i3BenchesControl";
+            this.i3BenchesControl.Size = new System.Drawing.Size(1354, 700);
+            this.i3BenchesControl.TabIndex = 0;
+            // 
+            // wr15TabPage
+            // 
+            this.wr15TabPage.Controls.Add(this.i4BenchesControl);
+            this.wr15TabPage.Location = new System.Drawing.Point(4, 22);
+            this.wr15TabPage.Name = "wr15TabPage";
+            this.wr15TabPage.Padding = new System.Windows.Forms.Padding(3);
+            this.wr15TabPage.Size = new System.Drawing.Size(1360, 706);
+            this.wr15TabPage.TabIndex = 4;
+            this.wr15TabPage.Text = "I4";
+            this.wr15TabPage.UseVisualStyleBackColor = true;
+            // 
+            // i4BenchesControl
+            // 
+            this.i4BenchesControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.i4BenchesControl.Location = new System.Drawing.Point(3, 3);
+            this.i4BenchesControl.Name = "i4BenchesControl";
+            this.i4BenchesControl.Size = new System.Drawing.Size(1354, 700);
+            this.i4BenchesControl.TabIndex = 0;
+            // 
             // StatisticsDlg
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -175,7 +291,7 @@
             this.ClientSize = new System.Drawing.Size(1368, 826);
             this.Controls.Add(this.splitContainer1);
             this.Name = "StatisticsDlg";
-            this.Text = "MID Statistics";
+            this.Text = "Statistics";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.StatisticsDlg_FormClosing);
             this.Load += new System.EventHandler(this.StatisticsDlg_Load);
             this.splitContainer1.Panel1.ResumeLayout(false);
@@ -185,6 +301,12 @@
             this.splitContainer1.ResumeLayout(false);
             this.timePeriodGroupBox.ResumeLayout(false);
             this.timePeriodGroupBox.PerformLayout();
+            this.midsTabControl.ResumeLayout(false);
+            this.wr10TabPage.ResumeLayout(false);
+            this.wr11TabPage.ResumeLayout(false);
+            this.wr13TabPage.ResumeLayout(false);
+            this.wr14TabPage.ResumeLayout(false);
+            this.wr15TabPage.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -192,16 +314,26 @@
         #endregion
 
         private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.TabControl midsTabControl;
+        private System.Windows.Forms.TabPage wr10TabPage;
+        private System.Windows.Forms.TabPage wr11TabPage;
+        private System.Windows.Forms.TabPage wr13TabPage;
+        private System.Windows.Forms.TabPage wr14TabPage;
+        private System.Windows.Forms.TabPage wr15TabPage;
         private System.Windows.Forms.GroupBox timePeriodGroupBox;
         private System.Windows.Forms.DateTimePicker dateTimeFromPicker;
         private System.Windows.Forms.DateTimePicker dateTimeToPicker;
         private System.Windows.Forms.Label toLabel1;
         private System.Windows.Forms.Label fromLabel1;
+        private UserControls.MidOrWaterMetersCtrl wmsBenchesControl;
+        private UserControls.MidOrWaterMetersCtrl i1BenchesControl;
+        private UserControls.MidOrWaterMetersCtrl i2BbenchesControl;
+        private UserControls.MidOrWaterMetersCtrl i3BenchesControl;
+        private UserControls.MidOrWaterMetersCtrl i4BenchesControl;
         private System.Windows.Forms.RadioButton radioButton3;
         private System.Windows.Forms.RadioButton radioButton2;
         private System.Windows.Forms.RadioButton radioButton1;
         private System.Windows.Forms.RadioButton radioButton4;
-        private System.Windows.Forms.TabControl midsTabControl;
     }
 }
 

Statistics/StatisticsDlg.cs

@@ -24,7 +24,7 @@ namespace Statistics
 {
     public partial class StatisticsDlg : Form
     {
-        static ISessionFactory[] sessionFactories = new ISessionFactory[Program.LocalSettings.ConnectionStrings.Length];
+        static ISessionFactory[] sessionFactories = new ISessionFactory[LocalSettings.BenchesCount];
 
 
         public StatisticsDlg()
@@ -33,19 +33,14 @@ namespace Statistics
             
             ///ManageCheckGroupBox(timePeriodCheckBox, timePeriodGroupBox);
 
-            for (int midId = 1; midId < Program.LocalSettings.MidNames.Length; midId++)
+            for (MidId midId = 0; midId < MidId.Count; midId++)
             {
-                TabPage tp = new TabPage();
-                tp.Text = Program.LocalSettings.MidNames[midId];
-
-                MidOrWaterMetersCtrl ctrl = new MidOrWaterMetersCtrl();
-                ctrl.MidId = midId;
-                ctrl.Parent = this;
-                ctrl.Dock = DockStyle.Fill;
-
-                tp.Controls.Add(ctrl);
-                midsTabControl.TabPages.Add(tp);
+                int i = (int)midId;
+                midsTabControl.TabPages[i].Text = midId.ToString();
+                (midsTabControl.TabPages[i].Controls[0] as MidOrWaterMetersCtrl).MidId = midId;
+                (midsTabControl.TabPages[i].Controls[0] as MidOrWaterMetersCtrl).Parent = this;
             }
+            midsTabControl.TabPages[0].Text = Strings.Water_meters;
 
             radioButton1.Checked = true;
             timePeriodGroupBox.Enabled = false;
@@ -55,7 +50,7 @@ namespace Statistics
 
         void Localize()
         {
-            Text = string.Format("MID {0}", Strings.Statistics);
+            Text = Strings.Statistics;
             //timePeriodCheckBox.Text = Strings.Time_period;
             fromLabel1.Text = Strings.From;
             toLabel1.Text = Strings.To;
@@ -81,12 +76,12 @@ namespace Statistics
                 case 4: radioButton4.Checked = true; break;
             }
 
-            for (int i = 1; i < Program.LocalSettings.MidNames.Length; i++)
+            for (int i = 0; i < (int)MidId.Count; i++)
             {
-                (midsTabControl.TabPages[i - 1].Controls[0] as MidOrWaterMetersCtrl).Data2UI();
+                (midsTabControl.TabPages[i].Controls[0] as MidOrWaterMetersCtrl).Data2UI();
             }
 
-            for (int i = 0; i < Program.LocalSettings.ConnectionStrings.Length; i++)
+            for (int i = 0; i < LocalSettings.BenchesCount; i++)
             {
                 if (!string.IsNullOrEmpty(Program.LocalSettings.GetConnectionString(i)))
                 {
@@ -133,18 +128,18 @@ namespace Statistics
         //}
 
 
-        /// <summary>
-        /// Called by a child form.
-        /// Reads and returns results from DB required by the child form to update it's content.
-        /// </summary>
-        /// <param name="benchId">0-based bench Id.</param>
-        /// <param name="midId">1-based MID Id.</param>
-        /// <returns>Required test results</returns>
-        public IList<TestRslt> UpdateRequest(int benchId, int midId)
+        public IList<TestRslt> UpdateRequest(int benchId, MidId midId)
         {
-            if ((benchId < 0) || (benchId >= Program.LocalSettings.BenchNames.Length) || (sessionFactories[benchId] == null))
+            if ((benchId < 0) || (benchId >= LocalSettings.BenchesCount) || (sessionFactories[benchId] == null) || (midId == MidId.WaterMeters))
             {
-                MessageBox.Show(string.Format("Cannot load statistics of {0}", Program.LocalSettings.GetBenchName(benchId)));
+                if (midId == MidId.WaterMeters)
+                {
+                    MessageBox.Show("Loading statistics of water meters is not implemented yet");
+                }
+                else
+                {
+                    MessageBox.Show(string.Format("Cannot load statistics of {0}", Program.LocalSettings.GetBenchName(benchId)));
+                }
                 return null;
             }
 
@@ -169,7 +164,7 @@ namespace Statistics
             {
                 ISession session = sessionFactories[benchId].OpenSession();
                 var listOfComponentsWithFlowmeter = session.QueryOver<Components>()
-                                                           .Where(x => (x.Flowmeter == Program.LocalSettings.MidNames[midId]))
+                                                           .Where(x => (x.Flowmeter == midId.ToString()))
                                                            .List();
                 IList<TestRslt> testRslts = new List<TestRslt>();
                 foreach (var cmpnts in listOfComponentsWithFlowmeter)
@@ -253,12 +248,9 @@ namespace Statistics
             else if (radioButton4.Checked) ls.SelectedRadioButtonNumber = 4;
             else ls.SelectedRadioButtonNumber = 0;
 
-            for (int i = 1; i < Math.Min(Program.LocalSettings.MidNames.Length, midsTabControl.TabPages.Count + 1); i++)
+            for (int i = 0; i < (int)MidId.Count; i++)
             {
-                if (midsTabControl.TabPages[i - 1].Controls.Count > 0 && midsTabControl.TabPages[i - 1].Controls[0] is MidOrWaterMetersCtrl)
-                {
-                    (midsTabControl.TabPages[i - 1].Controls[0] as MidOrWaterMetersCtrl).UI2Data();
-                }
+                (midsTabControl.TabPages[i].Controls[0] as MidOrWaterMetersCtrl).UI2Data();
             }
 
             ls.Save();

Statistics/UserControls/Enums.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Statistics.UserControls
+{
+    public enum MidId
+    {
+        ///  When converted to 'int' it's the MID number, 0 = water meters
+        WaterMeters,
+        I1,
+        I2,
+        I3,
+        I4,
+        Count
+    }
+}