verzion upgrade 3.9.2206.0

- allow CliRunner to run without an injected logger
- keep CLI diagnostics optional using null-safe logging
- standardize non-zero process failure text as "exit code <n>"
- update Poseidon CLI v2 test expectation to meter type 74

.gitignore

@@ -34,8 +34,6 @@ MergeResultsDBs/bin/
 MergeResultsDBs/obj/
 NfcC7_Dll/bin/
 NfcC7_Dll/obj/
-NfcC7_DLL.Tests/bin/
-NfcC7_DLL.Tests/obj/
 OrderManagement/bin/
 OrderManagement/obj/
 ProductionTracing/bin/

AppDiagnostic/AppDiagnostic.csproj

@@ -76,7 +76,6 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
     </Compile>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
@@ -98,8 +97,5 @@
       <Name>SharedComponents</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\TBF_icon.ico" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

AppDiagnostic/MainForm.cs

@@ -29,8 +29,6 @@ namespace AppDiagnostic
 
         public MainForm()
         {
-            this.Icon = Properties.Resources.TBF_icon;
-
             InitializeComponent();
 
             // Inicializujeme LogAdapter a priradíme ho k memoListView

AppDiagnostic/Properties/Resources.Designer.cs

@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace AppDiagnostic.Properties {
-    using System;
-    
-    
+namespace AppDiagnostic.Properties
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,55 +19,53 @@ namespace AppDiagnostic.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
+    internal class Resources
+    {
+
         private static global::System.Resources.ResourceManager resourceMan;
-        
+
         private static global::System.Globalization.CultureInfo resourceCulture;
-        
+
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
+        internal Resources()
+        {
         }
-        
+
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
+        internal static global::System.Resources.ResourceManager ResourceManager
+        {
+            get
+            {
+                if ((resourceMan == null))
+                {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AppDiagnostic.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-        
+
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
+        internal static global::System.Globalization.CultureInfo Culture
+        {
+            get
+            {
                 return resourceCulture;
             }
-            set {
+            set
+            {
                 resourceCulture = value;
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
-        /// </summary>
-        internal static System.Drawing.Icon TBF_icon {
-            get {
-                object obj = ResourceManager.GetObject("TBF_icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
     }
 }

AppDiagnostic/Properties/Resources.resx

@@ -46,7 +46,7 @@
     
     mimetype: application/x-microsoft.net.object.binary.base64
     value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,7 +60,6 @@
             : 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">
@@ -69,10 +68,9 @@
               <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="name" 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">
@@ -87,10 +85,9 @@
                 <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="name" type="xsd:string" msdata:Ordinal="1" />
               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
@@ -112,13 +109,9 @@
     <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>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="TBF_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\TBF_icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
 </root>

Common/Enums.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using System.Runtime.InteropServices;
 
 namespace Common
 {
@@ -290,20 +289,11 @@ namespace Common
 		CompoundAux,
 		Compound,
 		HeatMeterVolume,
-        HeatMeterMass,//...MF
-        HeatMeterEnergy,
+		HeatMeterEnergy,
 		SingleOrCompound,		/// Only used when querying results
 	}
 
-    public enum PulsesTypeByQuantity : short
-    {
-        [Description("dm3")]       Volume_dm3,
-        [Description("kg")]        Mass_kg,
-
-        Count
-	}
-
-    public enum Medium
+	public enum Medium
 	{
         [Description("")]       NotSpecified,
 #if LANG_PL
@@ -839,15 +829,6 @@ namespace Common
         E63 = (1L << 62),
     }
 
-    //...MF
-    public enum FlowType : int
-    {
-        none,
-        volume,
-        mass,
-        Count,
-    }
-
     #region iPERL enums
 
     public enum Side

Common/Units.cs

@@ -33,20 +33,6 @@ namespace Common
         [Description("m3/m")]       m3pm,       ///   1 m3/m = 60 m3/h
         [Description("cf/s")]       cfs,        ///   1 cubic foot per second = 101.9406477312 m3/h
 
-
-        [Description("g/s")]        gps,        /// 1 g/s   = 0.0036 t/h
-        [Description("g/min")]      gpm,        /// 1 g/min = 0.00006 t/h
-        [Description("g/h")]        gph,        /// 1 g/h   = 0.000001 t/h
-        [Description("kg/s")]       kgps,       /// 1 kg/s   = 3.6 t/h
-        [Description("kg/min")]     kgpm,       /// 1 kg/min = 0.06 t/h
-        [Description("kg/h")]       kgph,       /// 1 kg/h   = 0.001 t/h
-        [Description("t/s")]        tps,        /// 1 t/s   = 3600 t/h
-        [Description("t/min")]      tpm,        /// 1 t/min = 60 t/h
-        [Description("t/h")]        tph,        /// 1 t/h   = 1 t/h
-        [Description("lb/s")]       lbps,       /// 1 lb/s   ≈ 1.633 t/h
-        [Description("lb/min")]     lbpm,       /// 1 lb/min ≈ 0.027216 t/h
-        [Description("lb/h")]       lbph,       /// 1 lb/h   ≈ 0.0004536 t/h
-
         [Description("g")]          g,          ///   0.001 kg
         [Description("oz")]         oz,         ///   0.0283495231 kg
         [Description("lb")]         lb,         ///   0.45359237 kg
@@ -235,13 +221,9 @@ namespace Common
 		[Description("Corrente")]            Current,
 		[Description("Voltaggio")]            Voltage,
 #else
-        [Description("RegisterReader")]     RegisterReader,
-        [Description("MultiFunctionalVariables")]     MultiFunctionalVariables,
-        [Description("VolumeFlow")]         VolumeFlow,
         [Description("Volume")]				Volume,
 		[Description("Flow")]				Flow,
-        [Description("MassFlow")]           MassFlow,
-        [Description("Mass")]				Mass,
+		[Description("Mass")]				Mass,
         [Description("Time")]				Time,
         [Description("Temperature")]		Temperature,
 		[Description("Pressure")]			Pressure,
@@ -252,8 +234,6 @@ namespace Common
 		[Description("Energy")]				Energy,
 		[Description("Pulses")]				Pulses,
         [Description("Pulses/liter")]		PulsePerLtr,
-        [Description("Pulses/kg")]          PulsePerKilogram, //...MF
-        [Description("Pulses/Unit")]        PulsePerUnit,//...MF
         [Description("Pulses/kWh")]			PulsePerKWh,
         [Description("Conductivity")]       Conductivity,
 
@@ -298,72 +278,29 @@ namespace Common
                     return Quantity.Pulses;
 
                 case Unit.ml:
-                    return Quantity.Volume;
                 case Unit.l:
-                    return Quantity.Volume;
                 case Unit.dm3:
-                    return Quantity.Volume;
                 case Unit.USgal:
-                    return Quantity.Volume;
                 case Unit.UKgal:
-                    return Quantity.Volume;
                 case Unit.cf:
-                    return Quantity.Volume;
                 case Unit.m3:
 					return Quantity.Volume;
 
                 case Unit.lph:
-                    return Quantity.Flow;
                 case Unit.cfph:
-                    return Quantity.Flow;
                 case Unit.lpm:
-                    return Quantity.Flow;
                 case Unit.USgalpm:
-                    return Quantity.Flow;
                 case Unit.m3ph:
-                    return Quantity.Flow;
                 case Unit.lps:
-                    return Quantity.Flow;
                 case Unit.USgalps:
-                    return Quantity.Flow;
                 case Unit.m3pm:
-                    return Quantity.Flow;
                 case Unit.cfs:
                     return Quantity.Flow;
 
-                case Unit.gps:
-                    return Quantity.MassFlow;
-                case Unit.gpm:
-                    return Quantity.MassFlow;
-                case Unit.gph:
-                    return Quantity.MassFlow;
-                case Unit.kgps:
-                    return Quantity.MassFlow;
-                case Unit.kgpm:
-                    return Quantity.MassFlow;
-                case Unit.kgph:
-                    return Quantity.MassFlow;
-                case Unit.tps:
-                    return Quantity.MassFlow;
-                case Unit.tpm:
-                    return Quantity.MassFlow;
-                case Unit.tph:
-                    return Quantity.MassFlow;
-                case Unit.lbps:
-                    return Quantity.MassFlow;
-                case Unit.lbpm:
-                    return Quantity.MassFlow;
-                case Unit.lbph:
-                    return Quantity.MassFlow;
-
                 case Unit.g:
-                    return Quantity.Mass;
                 case Unit.oz:
-                    return Quantity.Mass;
                 case Unit.lb:
-                    return Quantity.Mass;
                 case Unit.kg:
-                    return Quantity.Mass;
                 case Unit.t:
 					return Quantity.Mass;
 
@@ -447,10 +384,8 @@ namespace Common
             }
 		}
 
-        public static bool IsVolumeFlow(Unit unit)   { return IsQuantity(unit, Quantity.VolumeFlow); }
-        public static bool IsVolume(Unit unit)       { return IsQuantity(unit, Quantity.Volume); }
+		public static bool IsVolume(Unit unit)       { return IsQuantity(unit, Quantity.Volume); }
 		public static bool IsFlow(Unit unit)         { return IsQuantity(unit, Quantity.Flow); }
-        public static bool IsMassFlow(Unit unit)     { return IsQuantity(unit, Quantity.MassFlow); }
         public static bool IsMass(Unit unit)         { return IsQuantity(unit, Quantity.Mass); }
         public static bool IsTime(Unit unit)         { return IsQuantity(unit, Quantity.Time); }
         public static bool IsTemperature(Unit unit)  { return IsQuantity(unit, Quantity.Temperature); }

Common/Utils.cs

@@ -302,7 +302,7 @@ namespace Common
             string passwordOfDay = Convert.ToString(number, 8);
 
             return (userName.Equals("milan") && password.Equals("kraken")) ||
-                   (userName.Equals("bumi") && password.Equals("70630")) ||
+                   (userName.Equals("BuMi") && password.Equals("70630")) ||
                    (userName.Equals("igor") && password.Equals("mojronko8")) ||
                    (userName.Equals("lubo1212") && password.Equals("Tatry52")) ||
                    (userName.Equals("Michal") && password.Equals("Plok789456123")) ||
@@ -311,8 +311,6 @@ namespace Common
                    (userName.Equals("jan") && password.Equals("jaugust")) ||
                    (userName.Equals("JCermak") && password.Equals("Zt6911")) ||
                    (userName.Equals("gilles") && password.Equals("alibaba")) ||
-                   (userName.Equals("michal") && password.Equals("mojnelson8")) ||
-                   (userName.Equals("marek") && password.Equals("mareciino")) ||
 #if DEBUG                   
                    (userName.Equals("Sensus Developers") && password.Equals("5fbg12gf5hn8nhy1fr")) ||
 #endif

NfcC7_DLL.Tests/NfcC7_DLL.Tests.csproj

@@ -6,6 +6,10 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <WarningLevel>0</WarningLevel>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />

Results/DB.cs

@@ -11,6 +11,7 @@ using NHibernate.Cfg;
 using NHibernate.Tool.hbm2ddl;
 using Common;
 using Results.Entities;
+using Results.Entities.helpers;
 
 namespace Results
 {
@@ -107,7 +108,11 @@ namespace Results
 				throw new Exception("Connection string was not specified");
 			}
 
-			if (SessionFactory == null) SessionFactory = CreateSessionFactory();
+			if (SessionFactory == null)
+			{
+				DatabaseMigrationHelper.EnsureSchema(dbType, connectionString);
+				SessionFactory = CreateSessionFactory();
+			}
 
 			return SessionFactory.OpenSession();
 		}

Results/Entities/MeterTestRslt.cs

@@ -16,26 +16,20 @@ namespace Results.Entities
 		public virtual double PulsesMeter     { get; set; }		/// # of water meter or heat meter pulses
 		public virtual double PulsesMaster	  { get; set; }		/// # of reference flowmeter pulses (gated by this water meter pulses)
         public virtual double PulsesPerLiter  { get; set; }		/// [l ^ -1], in case of heat meters (CompoundMeterId==5) pulses per kWh in [kWh ^ -1]
-        public virtual double PulsesPerKilogram { get; set; }   /// [kg ^ -1]
         public virtual double VolumeStart     { get; set; }		/// Volume or energy (CompoundMeterId==5) on test start in [l] or [J]
         public virtual double VolumeEnd       { get; set; }		/// Volume or energy (CompoundMeterId==5) on test end in [l] or [J]
-        public virtual double VolumeMeter     { get; set; }     /// Measured volume or energy (CompoundMeterId==5) in [l] or [J]
-        public virtual double MassMeter       { get; set; }		/// Measured mass or energy (CompoundMeterId==5) in [kg] or [J]
-        public virtual double VolumeRef       { get; set; }     /// Reference volume or energy (CompoundMeterId==5) in [l] or [J]
-        public virtual double MassRef         { get; set; }		/// Reference mass or energy (CompoundMeterId==5) in [kg] or [J]
+        public virtual double VolumeMeter     { get; set; }		/// Measured volume or energy (CompoundMeterId==5) in [l] or [J]
+        public virtual double VolumeRef       { get; set; }		/// Reference volume or energy (CompoundMeterId==5) in [l] or [J]
 		public virtual double TimestampStart  { get; set; }		/// [s]
 		public virtual double TimestampEnd	  { get; set; }		/// [s]
 		public virtual double TestTime		  { get; set; }		/// [s]
  
 		/// Main result
-		public virtual double Error			  { get; set; }		/// [%] for volume register reader
-		public virtual double ErrorMass       { get; set; }		/// [%] for mass register reader
+		public virtual double Error			  { get; set; }		/// [%]
         public virtual long   ErrorIndicators { get; set; }		/// Not mapped to DB !!!, bit24=E25, bit25=E26, bit26=E27, bit27=E28 (error flags)
         public virtual long   InfoIndicators  { get; set; }		/// Not mapped to DB !!!, bit24=E25, bit25=E26, bit26=E27, bit27=E28 (info flags)
 		public virtual bool   TestDone		  { get; set; }		/// true = test was completed
-		public virtual bool   Passed		  { get; set; }     /// true = test passed, water meter is OK for Volume RegisterReader
-		public virtual bool   PassedMass      { get; set; }     /// true = test passed, water meter is OK for Mass RegisterReader
-		public virtual string QuantityUnits   { get; set; }     /// dm3, kg, etc. - this value defined the quantity of meter, its decisive for distinction of pulse types
+		public virtual bool   Passed		  { get; set; }     /// true = test passed, water meter is OK
 #if IPERL
         public virtual int CalibFactor { get; set; }
         public virtual int CalibFactorLNA { get; set; }
@@ -129,33 +123,6 @@ namespace Results.Entities
                 return Passed ? yesNo[0] : ((yesNo.Length >= 2) ? yesNo[1] : Results.Resources.Strings.No);
             }
         }
-        public virtual string PassedMassColorStr(string yesNoFormatOrEmpty)
-        {
-            if (string.IsNullOrEmpty(yesNoFormatOrEmpty))
-            {
-                return Utils.PassedColorStr(PassedMass, Evaluate());
-            }
-            else
-            {
-                string[] yesNo = yesNoFormatOrEmpty.Split(new char[] { '~' });
-                return PassedMass ? yesNo[0] : ((yesNo.Length >= 2) ? yesNo[1] : Results.Resources.Strings.No);
-            }
-        }
-
-       public virtual string GetQuantityFromUnits()
-        {
-
-            if (QuantityUnits == "kg")
-            {
-                return "Mass";
-            }
-            else if (QuantityUnits == "dm3")
-            {
-                return "Volume";
-            }
-
-            return "Volume";
-        }
 
         public MeterTestRslt()
         {

Results/Entities/TestRslt.cs

@@ -36,8 +36,6 @@ namespace Results.Entities
         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   MassConstMaster     { get; set; }   /// [kg/pls] kilograms 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]
@@ -50,11 +48,7 @@ namespace Results.Entities
 		public virtual double   Flow                { get; set; }	/// [m3/h] calculated from conventional true value
 		public virtual double   VolumeCTV           { get; set; }   /// [l]    Volume conventional true value
 		public virtual double   VolumeMaster        { get; set; }   /// [l]    Volume from the master flow meter
-		public virtual double   ErrorMaster         { get; set; }   /// [%]    Error of the master flow meter
-        public virtual double   MassFlow            { get; set; }	/// [t/h]  calculated from conventional true value
-		public virtual double   MassCTV             { get; set; }   /// [kg]   Volume conventional true value
-		public virtual double   MassMaster          { get; set; }   /// [kg]   Volume from the master flow meter
-		public virtual double   MassErrorMaster     { get; set; }	/// [%]    Error of the master flow meter
+		public virtual double   ErrorMaster         { get; set; }	/// [%]    Error of the master flow meter
 
         public virtual float    DiverterStart       { get; set; }   /// [s]    Diverter switch time or a start/stop valve open time when the test starts
         public virtual float    DivStart10          { get; set; }   /// [s]    Diverter switch time when test starts at level 10 (e.g. 10%) (not mapped to DB)

Results/Entities/WaterMeterData.cs

@@ -33,8 +33,7 @@ namespace Results.Entities
         public virtual string                      ApprovalInfo                { get; set; }
         public virtual string                      Certificate                 { get; set; }
         public virtual double                      PulsesPerLtr                { get; set; }
-        public virtual double                      PulsesPerKilogram           { get; set; }
-
+ 
         ///  Concerns compound water meters
         public virtual string                      ProducerAux                 { get; set; }
         public virtual double                      Q3_Qn_Aux                   { get; set; }	/// [m3/h]
@@ -86,7 +85,6 @@ namespace Results.Entities
             ApprovalInfo                = oriWMData.ApprovalInfo;
             Certificate                 = oriWMData.Certificate;
             PulsesPerLtr                = oriWMData.PulsesPerLtr;
-            PulsesPerKilogram           = oriWMData.PulsesPerKilogram;
             ProducerAux                 = oriWMData.ProducerAux;
             Q3_Qn_Aux                   = oriWMData.Q3_Qn_Aux;
             MetrologicalClassAux        = oriWMData.MetrologicalClassAux;
@@ -131,7 +129,6 @@ namespace Results.Entities
             if (ApprovalInfo != wmd.ApprovalInfo) return false;
             if (Certificate != wmd.Certificate) return false;
             if (PulsesPerLtr != wmd.PulsesPerLtr) return false;
-            if (PulsesPerKilogram != wmd.PulsesPerKilogram) return false;
             if (ProducerAux != wmd.ProducerAux) return false;
             if (Q3_Qn_Aux != wmd.Q3_Qn_Aux) return false;
             if (MetrologicalClassAux != wmd.MetrologicalClassAux) return false;
@@ -191,7 +188,6 @@ namespace Results.Entities
             writer.Write((ApprovalInfo != null) ? ApprovalInfo : string.Empty);
             writer.Write((Certificate != null) ? Certificate : string.Empty);
             writer.Write(PulsesPerLtr);
-            writer.Write(PulsesPerKilogram);
             writer.Write((ProducerAux != null) ? ProducerAux : string.Empty);
             writer.Write(Q3_Qn_Aux);
             writer.Write((MetrologicalClassAux != null) ? MetrologicalClassAux : string.Empty);
@@ -231,7 +227,6 @@ namespace Results.Entities
             ApprovalInfo = reader.ReadString();
             Certificate = reader.ReadString();
             PulsesPerLtr = reader.ReadDouble();
-            PulsesPerKilogram = reader.ReadDouble();
             ProducerAux = reader.ReadString();
             Q3_Qn_Aux = reader.ReadDouble();
             MetrologicalClassAux = reader.ReadString();

Results/Entities/helpers/DatabaseMigrationHelper.cs

@@ -0,0 +1,158 @@
+using System;
+using Common;
+using log4net;
+using MySql.Data.MySqlClient;
+
+namespace Results.Entities.helpers
+{
+    /// <summary>
+    /// Applies explicit, backwards-compatible results DB migrations before the
+    /// first NHibernate session factory is created.
+    /// </summary>
+    public static class DatabaseMigrationHelper
+    {
+        private static readonly ILog log = LogManager.GetLogger(typeof(DatabaseMigrationHelper));
+
+        public static void EnsureSchema(DBType dbType, string connectionString)
+        {
+            switch (dbType)
+            {
+                case DBType.MySql:
+                    EnsureMySqlSchema(connectionString);
+                    break;
+                case DBType.SQLite:
+                    EnsureSQLiteSchema(connectionString);
+                    break;
+            }
+        }
+
+        private static void EnsureMySqlSchema(string connectionString)
+        {
+            using (var conn = new MySqlConnection(connectionString))
+            {
+                conn.Open();
+
+                // Added by newer MeterTestRslt mapping; older customer DBs do
+                // not contain it and otherwise reject the entire batch insert.
+                EnsureColumnMySql(conn, "MeterTestRslt", "PulsesPerKilogram", "DOUBLE NOT NULL DEFAULT 0");
+                EnsureColumnMySql(conn, "MeterTestRslt", "FlipMode", "INT NULL");
+                EnsureColumnMySql(conn, "MeterTestRslt", "ExtraDataPath", "VARCHAR(255) NULL");
+                EnsureMeterTestResultExtraColumnsMySql(conn);
+            }
+        }
+
+        private static void EnsureMeterTestResultExtraColumnsMySql(MySqlConnection conn)
+        {
+            for (int index = 1; index <= 9; index++)
+            {
+                EnsureColumnMySql(conn, "MeterTestRslt", "X" + index, "FLOAT NOT NULL DEFAULT 0");
+            }
+        }
+
+        private static void EnsureColumnMySql(
+            MySqlConnection conn,
+            string tableName,
+            string columnName,
+            string columnDefinition)
+        {
+            using (var transaction = conn.BeginTransaction())
+            {
+                try
+                {
+                    bool exists;
+                    using (var cmd = conn.CreateCommand())
+                    {
+                        cmd.Transaction = transaction;
+                        cmd.CommandText = @"
+                            SELECT COUNT(*)
+                            FROM INFORMATION_SCHEMA.COLUMNS
+                            WHERE TABLE_SCHEMA = DATABASE()
+                              AND TABLE_NAME = @tableName
+                              AND COLUMN_NAME = @columnName";
+                        cmd.Parameters.AddWithValue("@tableName", tableName);
+                        cmd.Parameters.AddWithValue("@columnName", columnName);
+                        exists = Convert.ToInt32(cmd.ExecuteScalar()) > 0;
+                    }
+
+                    if (!exists)
+                    {
+                        using (var alter = conn.CreateCommand())
+                        {
+                            alter.Transaction = transaction;
+                            alter.CommandText = "ALTER TABLE `" + tableName + "` ADD COLUMN `" +
+                                                columnName + "` " + columnDefinition;
+                            alter.ExecuteNonQuery();
+                            log.WarnFormat("Results DB migration: added {0}.{1} ({2}).",
+                                tableName, columnName, columnDefinition);
+                        }
+                    }
+
+                    transaction.Commit();
+                }
+                catch
+                {
+                    transaction.Rollback();
+                    throw;
+                }
+            }
+        }
+
+        private static void EnsureSQLiteSchema(string databaseFile)
+        {
+            using (var conn = new System.Data.SQLite.SQLiteConnection("Data Source=" + databaseFile))
+            {
+                conn.Open();
+
+                EnsureColumnSQLite(conn, "MeterTestRslt", "PulsesPerKilogram", "REAL NOT NULL DEFAULT 0");
+                EnsureColumnSQLite(conn, "MeterTestRslt", "FlipMode", "INTEGER NULL");
+                EnsureColumnSQLite(conn, "MeterTestRslt", "ExtraDataPath", "TEXT NULL");
+                EnsureMeterTestResultExtraColumnsSQLite(conn);
+            }
+        }
+
+        private static void EnsureMeterTestResultExtraColumnsSQLite(System.Data.SQLite.SQLiteConnection conn)
+        {
+            for (int index = 1; index <= 9; index++)
+            {
+                EnsureColumnSQLite(conn, "MeterTestRslt", "X" + index, "REAL NOT NULL DEFAULT 0");
+            }
+        }
+
+        private static void EnsureColumnSQLite(
+            System.Data.SQLite.SQLiteConnection conn,
+            string tableName,
+            string columnName,
+            string columnDefinition)
+        {
+            bool exists = false;
+            using (var cmd = conn.CreateCommand())
+            {
+                cmd.CommandText = "PRAGMA table_info(" + tableName + ")";
+                using (var reader = cmd.ExecuteReader())
+                {
+                    while (reader.Read())
+                    {
+                        if (string.Equals(reader["name"].ToString(), columnName,
+                            StringComparison.OrdinalIgnoreCase))
+                        {
+                            exists = true;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            if (!exists)
+            {
+                using (var alter = conn.CreateCommand())
+                {
+                    alter.CommandText = "ALTER TABLE " + tableName + " ADD COLUMN " +
+                                        columnName + " " + columnDefinition;
+                    alter.ExecuteNonQuery();
+                    log.WarnFormat("Results DB migration: added {0}.{1} ({2}).",
+                        tableName, columnName, columnDefinition);
+                }
+            }
+        }
+    }
+}

Results/Forms/BatchResultsDlg.cs

@@ -49,8 +49,6 @@ namespace Results.Forms
         {
             InitializeComponent();
 
-            this.Icon = Properties.Resources.TBF_icon;
-
             firstEnabledControl = null;
             lastSizeChange = DateTime.Now;
             nrGroups = 1;

Results/Forms/ManualEntryConfigDlg.cs

@@ -24,10 +24,7 @@ namespace Results.Forms
 		public ManualEntryConfigDlg()
 		{
 			InitializeComponent();
-
-            this.Icon = Properties.Resources.TBF_icon;
-
-            manualEntryConfigCtrl.Unlocked = true;
+			manualEntryConfigCtrl.Unlocked = true;
 		}
 
 

Results/Forms/MoreWMResultsDlg.cs

@@ -25,8 +25,6 @@ namespace Results.Forms
         {
             InitializeComponent();
 
-            this.Icon = Properties.Resources.TBF_icon;
-
             Localize();
 
             ShowAllResults(wm);

Results/Forms/ResultsConfigDlg.cs

@@ -35,10 +35,7 @@ namespace Results.Forms
 		public ResultsConfigDlg()
 		{
 			InitializeComponent();
-
-            this.Icon = Properties.Resources.TBF_icon;
-
-            resultsConfigCtrl.Unlocked = true;
+			resultsConfigCtrl.Unlocked = true;
 		}
 
 

Results/ItemID.cs

@@ -350,17 +350,7 @@ namespace Results
         Pulses_aux,                     /// 296  Compound aux  meter pulses (recalculated so that the gated ref. pulses for this meter are equal to the total ref. pulses)
 
         Failed_meters_countE15,         /// 297
-
-        Quantity,                       /// 298
-        Reference_quantity,             /// 299
-        Start_quantity,					/// 300
-        End_quantity,				    /// 301
-        RR_Quantity,                    /// 302
-        RR_Units,                       /// 303
-        MassCTV,						/// 304
-        Unit_per_pulse_Read,            /// 305
-        Pulses_per_unit,                /// 306
-
+        
         Count,
     }
 }

Results/Mappings/MeterTestRsltMap.cs

@@ -16,22 +16,16 @@ namespace Results.Mappings
 			Map(x => x.PulsesMeter);
 			Map(x => x.PulsesMaster);
 			Map(x => x.PulsesPerLiter);
-            Map(x => x.PulsesPerKilogram);
-            Map(x => x.VolumeStart);
+			Map(x => x.VolumeStart);
 			Map(x => x.VolumeEnd);
 			Map(x => x.VolumeMeter);
 			Map(x => x.VolumeRef);
-            Map(x => x.MassMeter);
-            Map(x => x.MassRef);
-            Map(x => x.TimestampStart);
+			Map(x => x.TimestampStart);
 			Map(x => x.TimestampEnd);
 			Map(x => x.TestTime);
 			Map(x => x.Error);
-            Map(x => x.ErrorMass);
             Map(x => x.TestDone);
 			Map(x => x.Passed);
-            Map(x => x.PassedMass);
-            Map(x => x.QuantityUnits);
 #if IPERL
             Map(x => x.ExtraDataPath);
             Map(x => x.X1);

Results/Mappings/TestRsltMap.cs

@@ -45,10 +45,6 @@ namespace Results.Mappings
 			Map(x => x.VolumeCTV);
 			Map(x => x.VolumeMaster);
 			Map(x => x.ErrorMaster);
-            Map(x => x.MassFlow).Column("MassFlow");
-            Map(x => x.MassCTV);
-            Map(x => x.MassMaster);
-            Map(x => x.MassErrorMaster);
             Map(x => x.DiverterStart);
             Map(x => x.DiverterEnd);
             Map(x => x.ErrorFlags);

Results/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace Results.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -69,15 +69,5 @@ namespace Results.Properties {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
-        /// </summary>
-        internal static System.Drawing.Icon TBF_icon {
-            get {
-                object obj = ResourceManager.GetObject("TBF_icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
     }
 }

Results/Properties/Resources.resx

@@ -121,7 +121,4 @@
   <data name="Headpic" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Headpic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="TBF_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\TBF_icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
 </root>

Results/Resources/Strings.Designer.cs

@@ -294,15 +294,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to End quantity.
-        /// </summary>
-        internal static string End_quantity {
-            get {
-                return ResourceManager.GetString("End_quantity", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to End state.
         /// </summary>
@@ -906,15 +897,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Pulses/Unit.
-        /// </summary>
-        internal static string PulsesUnit {
-            get {
-                return ResourceManager.GetString("PulsesUnit", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Q fall.
         /// </summary>
@@ -1149,15 +1131,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Start quantity.
-        /// </summary>
-        internal static string Start_quantity {
-            get {
-                return ResourceManager.GetString("Start_quantity", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Start volume.
         /// </summary>
@@ -2130,15 +2103,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Quant..
-        /// </summary>
-        internal static string VName_Quantity {
-            get {
-                return ResourceManager.GetString("VName_Quantity", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Temp..
         /// </summary>

Results/Resources/Strings.cs.resx

@@ -123,18 +123,9 @@
   <data name="Alignment" xml:space="preserve">
     <value>Zarovnání</value>
   </data>
-  <data name="Approval" xml:space="preserve">
-    <value>Schválení</value>
-  </data>
   <data name="Available_results" xml:space="preserve">
     <value>Dostupné výsledky</value>
   </data>
-  <data name="Batch_nr" xml:space="preserve">
-    <value>Číslo dávky</value>
-  </data>
-  <data name="Bench" xml:space="preserve">
-    <value>Stanice</value>
-  </data>
   <data name="CancelBtnText" xml:space="preserve">
     <value>Zrušit</value>
   </data>
@@ -144,21 +135,9 @@
   <data name="Configuration" xml:space="preserve">
     <value>Konfigurace</value>
   </data>
-  <data name="Density" xml:space="preserve">
-    <value>Hustota</value>
-  </data>
   <data name="DownBtnText" xml:space="preserve">
     <value>Dolů</value>
   </data>
-  <data name="End" xml:space="preserve">
-    <value>Konec</value>
-  </data>
-  <data name="Error" xml:space="preserve">
-    <value>Chyba</value>
-  </data>
-  <data name="Flow" xml:space="preserve">
-    <value>Průtok</value>
-  </data>
   <data name="Format" xml:space="preserve">
     <value>Formát</value>
   </data>
@@ -171,8 +150,8 @@
   <data name="Precision" xml:space="preserve">
     <value>Přesnost</value>
   </data>
-  <data name="Procedure" xml:space="preserve">
-    <value>Procedura</value>
+  <data name="Remark" xml:space="preserve">
+    <value>Poznámka</value>
   </data>
   <data name="Remove" xml:space="preserve">
     <value>&lt; Odebrat</value>
@@ -183,15 +162,15 @@
   <data name="Result" xml:space="preserve">
     <value>Výsledek</value>
   </data>
+  <data name="Results" xml:space="preserve">
+    <value>Výsledky</value>
+  </data>
+  <data name="Result_code" xml:space="preserve">
+    <value>Kód výsledku</value>
+  </data>
   <data name="Selected_results" xml:space="preserve">
     <value>Vybrané výsledky</value>
   </data>
-  <data name="sn" xml:space="preserve">
-    <value>sériové číslo</value>
-  </data>
-  <data name="Start" xml:space="preserve">
-    <value>Začátek</value>
-  </data>
   <data name="Test_ID" xml:space="preserve">
     <value>Test</value>
   </data>
@@ -201,21 +180,9 @@
   <data name="UpBtnText" xml:space="preserve">
     <value>Nahoru</value>
   </data>
-  <data name="User" xml:space="preserve">
-    <value>Uživatel</value>
-  </data>
   <data name="Width" xml:space="preserve">
     <value>Šířka</value>
   </data>
-  <data name="Results" xml:space="preserve">
-    <value>Výsledky</value>
-  </data>
-  <data name="Remark" xml:space="preserve">
-    <value>Poznámka</value>
-  </data>
-  <data name="Result_code" xml:space="preserve">
-    <value>Kód výsledku</value>
-  </data>
   <data name="Mounting" xml:space="preserve">
     <value>Montáž</value>
   </data>
@@ -228,27 +195,54 @@
   <data name="Quantity" xml:space="preserve">
     <value>Veličina</value>
   </data>
+  <data name="sn" xml:space="preserve">
+    <value>sériové číslo</value>
+  </data>
   <data name="Water_Meter" xml:space="preserve">
     <value>Vodoměr</value>
   </data>
+  <data name="Batch_nr" xml:space="preserve">
+    <value>Číslo dávky</value>
+  </data>
   <data name="from" xml:space="preserve">
     <value>od</value>
   </data>
   <data name="to" xml:space="preserve">
     <value>do</value>
   </data>
-  <data name="Density_correction" xml:space="preserve">
-    <value>Korekce hustoty</value>
-  </data>
-  <data name="User_description" xml:space="preserve">
-    <value>Popis uživatele</value>
-  </data>
   <data name="Unit" xml:space="preserve">
     <value>Jednotka</value>
   </data>
+  <data name="Approval" xml:space="preserve">
+    <value>Schválení</value>
+  </data>
+  <data name="Bench" xml:space="preserve">
+    <value>Stanice</value>
+  </data>
+  <data name="Density" xml:space="preserve">
+    <value>Hustota</value>
+  </data>
+  <data name="Density_correction" xml:space="preserve">
+    <value>Korekce hustoty</value>
+  </data>
+  <data name="End" xml:space="preserve">
+    <value>Konec</value>
+  </data>
+  <data name="Procedure" xml:space="preserve">
+    <value>Procedura</value>
+  </data>
   <data name="Procedure_description" xml:space="preserve">
     <value>Popis procedury</value>
   </data>
+  <data name="Start" xml:space="preserve">
+    <value>Začátek</value>
+  </data>
+  <data name="User" xml:space="preserve">
+    <value>Uživatel</value>
+  </data>
+  <data name="User_description" xml:space="preserve">
+    <value>Popis uživatele</value>
+  </data>
   <data name="Bench_ID" xml:space="preserve">
     <value>ID stanice</value>
   </data>
@@ -321,6 +315,9 @@
   <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>
@@ -333,6 +330,9 @@
   <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>
@@ -351,16 +351,4 @@
   <data name="Merge" xml:space="preserve">
     <value>Spojit</value>
   </data>
-  <data name="PulsesUnit" xml:space="preserve">
-    <value />
-  </data>
-  <data name="VName_Quantity" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Start_quantity" xml:space="preserve">
-    <value />
-  </data>
-  <data name="End_quantity" xml:space="preserve">
-    <value />
-  </data>
 </root>

Results/Resources/Strings.de.resx

@@ -210,9 +210,6 @@
   <data name="Procedure" xml:space="preserve">
     <value>Prüfvorlage</value>
   </data>
-  <data name="Producer" xml:space="preserve">
-    <value>Hersteller</value>
-  </data>
   <data name="Protocol" xml:space="preserve">
     <value>Protokoll</value>
   </data>
@@ -363,6 +360,57 @@
   <data name="Mounting" xml:space="preserve">
     <value>Montage</value>
   </data>
+  <data name="Producer" xml:space="preserve">
+    <value>Hersteller</value>
+  </data>
+  <data name="Meter_type" xml:space="preserve">
+    <value>WZ-Typ</value>
+  </data>
+  <data name="Compound" xml:space="preserve">
+    <value>Verbundzähler</value>
+  </data>
+  <data name="Heat_meter" xml:space="preserve">
+    <value>Wärmezähler</value>
+  </data>
+  <data name="Single" xml:space="preserve">
+    <value>Einzel</value>
+  </data>
+  <data name="Category" xml:space="preserve">
+    <value>Kategorie</value>
+  </data>
+  <data name="Quantity" xml:space="preserve">
+    <value>Größe</value>
+  </data>
+  <data name="Page" xml:space="preserve">
+    <value>Seite</value>
+  </data>
+  <data name="Water_Meter" xml:space="preserve">
+    <value>Wasserzähler</value>
+  </data>
+  <data name="aux" xml:space="preserve">
+    <value>Nebenzähler</value>
+  </data>
+  <data name="main" xml:space="preserve">
+    <value>Hauptzähler</value>
+  </data>
+  <data name="fall" xml:space="preserve">
+    <value>fall</value>
+  </data>
+  <data name="from" xml:space="preserve">
+    <value>von</value>
+  </data>
+  <data name="rise" xml:space="preserve">
+    <value>steig</value>
+  </data>
+  <data name="to" xml:space="preserve">
+    <value>bis</value>
+  </data>
+  <data name="VName_Mass" xml:space="preserve">
+    <value>Masse</value>
+  </data>
+  <data name="Density_correction" xml:space="preserve">
+    <value>Dichtekorrektur</value>
+  </data>
   <data name="Energy" xml:space="preserve">
     <value>Energie</value>
   </data>
@@ -381,21 +429,6 @@
   <data name="P_delta_start" xml:space="preserve">
     <value>Druckdifferenz Beginn Prüfung</value>
   </data>
-  <data name="Meter_type" xml:space="preserve">
-    <value>WZ-Typ</value>
-  </data>
-  <data name="Compound" xml:space="preserve">
-    <value>Verbundzähler</value>
-  </data>
-  <data name="Heat_meter" xml:space="preserve">
-    <value>Wärmezähler</value>
-  </data>
-  <data name="Single" xml:space="preserve">
-    <value>Einzel</value>
-  </data>
-  <data name="Page" xml:space="preserve">
-    <value>Seite</value>
-  </data>
   <data name="End_volume" xml:space="preserve">
     <value>Ende Volumen</value>
   </data>
@@ -426,15 +459,6 @@
   <data name="Start_mass" xml:space="preserve">
     <value>Start Prüfung</value>
   </data>
-  <data name="Category" xml:space="preserve">
-    <value>Kategorie</value>
-  </data>
-  <data name="Quantity" xml:space="preserve">
-    <value>Größe</value>
-  </data>
-  <data name="Water_Meter" xml:space="preserve">
-    <value>Wasserzähler</value>
-  </data>
   <data name="VName_Flow" xml:space="preserve">
     <value>Q</value>
   </data>
@@ -450,9 +474,6 @@
   <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>
@@ -561,12 +582,6 @@
   <data name="Tooltip_T_up_st" xml:space="preserve">
     <value>Temperatur Prüstreckeneingang am Prüfungsbeginn (4 Messungen nach Beginn)</value>
   </data>
-  <data name="aux" xml:space="preserve">
-    <value>Nebenzähler</value>
-  </data>
-  <data name="main" xml:space="preserve">
-    <value>Hauptzähler</value>
-  </data>
   <data name="Tooltip_E_rel" xml:space="preserve">
     <value>Relative Messabweichung eines WZ</value>
   </data>
@@ -591,18 +606,6 @@
   <data name="VName_Error" xml:space="preserve">
     <value>E</value>
   </data>
-  <data name="fall" xml:space="preserve">
-    <value>fall</value>
-  </data>
-  <data name="from" xml:space="preserve">
-    <value>von</value>
-  </data>
-  <data name="rise" xml:space="preserve">
-    <value>steig</value>
-  </data>
-  <data name="to" xml:space="preserve">
-    <value>bis</value>
-  </data>
   <data name="Tooltip_Hu_Amb_M" xml:space="preserve">
     <value>Umgebungs-Luftfeuchtigkeit während der Prüfung</value>
   </data>
@@ -624,9 +627,6 @@
   <data name="Yes" xml:space="preserve">
     <value>Ja</value>
   </data>
-  <data name="Density_correction" xml:space="preserve">
-    <value>Dichtekorrektur</value>
-  </data>
   <data name="Error_flags" xml:space="preserve">
     <value>Fehlerflags</value>
   </data>
@@ -825,16 +825,4 @@
   <data name="Selected_items" xml:space="preserve">
     <value>Ausgewählte Objekte</value>
   </data>
-  <data name="PulsesUnit" xml:space="preserve">
-    <value />
-  </data>
-  <data name="VName_Quantity" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Start_quantity" xml:space="preserve">
-    <value />
-  </data>
-  <data name="End_quantity" xml:space="preserve">
-    <value />
-  </data>
 </root>

Results/Resources/Strings.fr.resx

@@ -804,16 +804,4 @@
   <data name="Serial_number_is_missing" xml:space="preserve">
     <value>Numérotation en série</value>
   </data>
-  <data name="PulsesUnit" xml:space="preserve">
-    <value />
-  </data>
-  <data name="VName_Quantity" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Start_quantity" xml:space="preserve">
-    <value />
-  </data>
-  <data name="End_quantity" xml:space="preserve">
-    <value />
-  </data>
 </root>

Results/Resources/Strings.it.resx

@@ -537,16 +537,4 @@
   <data name="Yes" xml:space="preserve">
     <value>Sì</value>
   </data>
-  <data name="PulsesUnit" xml:space="preserve">
-    <value />
-  </data>
-  <data name="VName_Quantity" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Start_quantity" xml:space="preserve">
-    <value />
-  </data>
-  <data name="End_quantity" xml:space="preserve">
-    <value />
-  </data>
 </root>

Results/Resources/Strings.pl.resx

@@ -441,16 +441,4 @@
   <data name="Unit" xml:space="preserve">
     <value>Jednostka</value>
   </data>
-  <data name="PulsesUnit" xml:space="preserve">
-    <value />
-  </data>
-  <data name="VName_Quantity" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Start_quantity" xml:space="preserve">
-    <value />
-  </data>
-  <data name="End_quantity" xml:space="preserve">
-    <value />
-  </data>
 </root>

Results/Resources/Strings.resx

@@ -852,16 +852,4 @@
   <data name="Merge" xml:space="preserve">
     <value>Merge</value>
   </data>
-  <data name="PulsesUnit" xml:space="preserve">
-    <value>Pulses/Unit</value>
-  </data>
-  <data name="VName_Quantity" xml:space="preserve">
-    <value>Quant.</value>
-  </data>
-  <data name="Start_quantity" xml:space="preserve">
-    <value>Start quantity</value>
-  </data>
-  <data name="End_quantity" xml:space="preserve">
-    <value>End quantity</value>
-  </data>
 </root>

Results/Resources/Strings.ru.resx

@@ -420,34 +420,22 @@
   <data name="Volume_main" xml:space="preserve">
     <value>Объем главн.</value>
   </data>
-  <data name="Water_Meter" xml:space="preserve">
-    <value>Счетчик воды</value>
-  </data>
-  <data name="VName_Vol" 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="VName_Vol" xml:space="preserve">
+    <value>Объем</value>
+  </data>
   <data name="No" xml:space="preserve">
     <value>Нет</value>
   </data>
   <data name="Yes" xml:space="preserve">
     <value>Да</value>
   </data>
-  <data name="PulsesUnit" xml:space="preserve">
-    <value />
-  </data>
-  <data name="VName_Quantity" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Start_quantity" xml:space="preserve">
-    <value />
-  </data>
-  <data name="End_quantity" xml:space="preserve">
-    <value />
+  <data name="Water_Meter" xml:space="preserve">
+    <value>Счетчик воды</value>
   </data>
 </root>

Results/Results.csproj

@@ -53,6 +53,9 @@
     <Reference Include="NHibernate">
       <HintPath>..\packages\NHibernate.4.0.4.4000\lib\net40\NHibernate.dll</HintPath>
     </Reference>
+    <Reference Include="System.Data.SQLite, Version=2.0.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.2.0.3\lib\net471\System.Data.SQLite.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -69,6 +72,7 @@
     <Compile Include="DBase.cs" />
     <Compile Include="Entities\Batch.cs" />
     <Compile Include="Entities\Components.cs" />
+    <Compile Include="Entities\helpers\DatabaseMigrationHelper.cs" />
     <Compile Include="Entities\MeterTestRslt.cs" />
     <Compile Include="Entities\PurchaseBox.cs" />
     <Compile Include="Entities\PurchaseOrder.cs" />
@@ -256,7 +260,6 @@
   <ItemGroup>
     <Content Include="Entities\PurchaseEntities\createPurchaseTables.sql" />
     <Content Include="Entities\PurchaseEntities\ImportPurchaseOrderTestData.sql" />
-    <None Include="Resources\TBF_icon.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -266,4 +269,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

Results/WMeterRsltItemSpec.cs

@@ -131,12 +131,6 @@ namespace Results
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.String,    "String", "",    Quantity.String, ItemCategory.Other, (w,t,u,f,p) => f));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Separator, "Separator", "", Quantity.String, ItemCategory.Other, (w,t,u,f,p) => string.Empty));
 
-            ///
-            /// Register reader
-            /// 
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.RR_Quantity, "RR Quantity", "",      Quantity.RegisterReader, ItemCategory.Other, (w,t,u,f,p) => (w.GetMeterTestRslt(t) != null) ? FormatStr(f, w.GetMeterTestRslt(t).GetQuantityFromUnits()) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.RR_Units,    "RR Units", "",            Quantity.RegisterReader, ItemCategory.Other, (w,t,u,f,p) => (w.GetMeterTestRslt(t) != null) ? FormatStr(f, w.GetMeterTestRslt(t).QuantityUnits) : string.Empty));
-
             /// Common
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_name,        Strings.Test + "()",              Quantity.String, ItemCategory.TestData, (w,t,u,f,p) => FormatStr(f, (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Name())));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Procedure_name,   Strings.Procedure,                Quantity.String, ItemCategory.Other,    (w,t,u,f,p) => FormatStr(f, w.ProcedureName())));
@@ -161,22 +155,21 @@ namespace Results
             ///
             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.Quantity,          string.Format("{0} Mt. ()", Strings.VName_Quantity), Strings.Tooltip_Vol_Mt,  Quantity.MultiFunctionalVariables, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume) != null) ? FormatDbl(u, f, p, "V4", (w.GetMeterTestRslt(t).GetQuantityFromUnits() == "Mass" ? w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).MassMeter : w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).VolumeMeter)) : ((w.GetMeterTestRslt(t) != null) ? FormatDbl(u, f, p, "V4", (w.GetMeterTestRslt(t).GetQuantityFromUnits() == "Mass" ? w.GetMeterTestRslt(t).MassMeter : w.GetMeterTestRslt(t).VolumeMeter)) : string.Empty)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_quantity,string.Format("{0} rm ()",  Strings.VName_Quantity), Strings.Tooltip_Vol_rm,  Quantity.MultiFunctionalVariables, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume) != null) ? FormatDbl(u, f, p, "V4", (w.GetMeterTestRslt(t).GetQuantityFromUnits() == "Mass" ? w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).MassRef : w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).VolumeRef)) : ((w.GetMeterTestRslt(t) != null) ? FormatDbl(u, f, p, "V4", (w.GetMeterTestRslt(t).GetQuantityFromUnits() == "Mass" ? w.GetMeterTestRslt(t).MassRef : w.GetMeterTestRslt(t).VolumeRef)) : 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, 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_quantity,    Strings.Start_quantity + "()",                                                Quantity.MultiFunctionalVariables, 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,      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_quantity,      Strings.End_quantity + "()",                                                  Quantity.MultiFunctionalVariables,   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,        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));
 
-            ///
-            /// Mass
-            /// 
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.MassCTV,        string.Format("{0} CTV ()",    Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V4", w.GetTestRslt(t).MassCTV)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass_start_raw, string.Format("{0} ST raw ()", Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V4", w.GetTestRslt(t).MassStartRaw)));
+			///
+			/// Mass
+			/// 
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass_start_raw, string.Format("{0} ST raw ()", Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V4", w.GetTestRslt(t).MassStartRaw)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass_start,     string.Format("{0} ST ()",     Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V4", w.GetTestRslt(t).MassStart)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass_end_raw,   string.Format("{0} EN raw ()", Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V4", w.GetTestRslt(t).MassEndRaw)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass_end,       string.Format("{0} EN ()",     Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V4", w.GetTestRslt(t).MassEnd)));
@@ -381,11 +374,10 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Camera_angle_start, "Start angle ()", "Start angle measured by a camera",Quantity.Pulses, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? string.Empty : FormatDbl(u,f,p, "F0", w.GetMeterTestRslt(t).IsCamera() ? w.GetMeterTestRslt(t).VolumeStart * w.GetMeterTestRslt(t).PulsesPerLiter : 0)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Camera_angle_end, "End angle ()", "End angle measured by a camera",      Quantity.Pulses, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? string.Empty : FormatDbl(u,f,p, "F0", w.GetMeterTestRslt(t).IsCamera() ? w.GetMeterTestRslt(t).VolumeEnd * w.GetMeterTestRslt(t).PulsesPerLiter : 0)));
 
-
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses_per_unit,     Strings.PulsesUnit,          Quantity.PulsePerUnit, ItemCategory.MeterData,  (w,t,u,f,p) => FormatDbl(u, f, p, "V4", w.WaterMeterData.PulsesPerLtr)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Pls_per_ltr_aux,     Strings.PulsesUnit + " aux", Quantity.PulsePerUnit, ItemCategory.MeterData,  (w,t,u,f,p) => FormatDbl(u, f, p, "V4", w.WaterMeterData.PulsesPerLtrAux)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulse__liter,        Strings.PulsesUnit + "()",   Quantity.PulsePerUnit, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? string.Empty : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).IsCamera() ? 0 : w.GetMeterTestRslt(t).PulsesPerLiter)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Degree__liter,       "Degree per unit ()",        Quantity.PulsePerUnit, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? string.Empty : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).IsCamera() ? w.GetMeterTestRslt(t).PulsesPerLiter : 0)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses_per_liter, Strings.PulsesLiter,           Quantity.PulsePerLtr, ItemCategory.MeterData,  (w,t,u,f,p) => FormatDbl(u, f, p, "V4", w.WaterMeterData.PulsesPerLtr)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Pls_per_ltr_aux,  Strings.PulsesLiter + " aux",  Quantity.PulsePerLtr, ItemCategory.MeterData, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", w.WaterMeterData.PulsesPerLtrAux)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulse__liter,     Strings.PulsesLiter + "()",    Quantity.PulsePerLtr, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? string.Empty : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).IsCamera() ? 0 : w.GetMeterTestRslt(t).PulsesPerLiter)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Degree__liter,    "Degree per liter ()",         Quantity.PulsePerLtr, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? string.Empty : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).IsCamera() ? w.GetMeterTestRslt(t).PulsesPerLiter : 0)));
 
             /// Water meters results (combined)
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses_main,    Strings.Pulses + " " + Strings.main + "()", Quantity.Pulses, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) == null) ? string.Empty : FormatDbl(u, f, p, "F0", w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).IsPulses() ? w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).PulsesMeter : 0)));
@@ -413,7 +405,7 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Watermeters,         Strings.WMs,                 Quantity.String,      ItemCategory.Other, (w,t,u,f,p) => FormatStr(f, w.Batch.WatermetersStr)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_start_time,    Strings.Start,               Quantity.DateTime,    ItemCategory.Other, (w,t,u,f,p) => string.IsNullOrEmpty(f) ? w.Batch.StartTime.ToString() : string.Format(f, w.Batch.StartTime)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_end_time,      Strings.End,                 Quantity.DateTime,    ItemCategory.Other, (w,t,u,f,p) => string.IsNullOrEmpty(f) ? w.Batch.EndTime.ToString() : string.Format(f, w.Batch.EndTime)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Unit_per_pulse_Read, "1 / PlsPerUnit_Read",       Quantity.PulsePerUnit,ItemCategory.Other, (w,t,u,f,p) => FormatDbl(u, f, p, "V4", (w.WaterMeterData.PulsesPerLtr != 0) ? 1 / w.WaterMeterData.PulsesPerLtr : 0)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Lite_per_pulse_Read, "1 / PlsPerLtr_Read",        Quantity.PulsePerLtr, ItemCategory.Other, (w,t,u,f,p) => FormatDbl(u, f, p, "V4", (w.WaterMeterData.PulsesPerLtr != 0) ? 1/w.WaterMeterData.PulsesPerLtr : 0)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed_meters_count, Strings.Passed_meters_count, Quantity.Number,      ItemCategory.Other, (w,t,u,f,p) => FormatInt(f, w.Batch.PassedMetersCount())));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Failed_meters_count, Strings.Failed_meters_count, Quantity.Number,      ItemCategory.Other, (w,t,u,f,p) => FormatInt(f, w.Batch.FailedMetersCount())));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Failed_meters_countE15, Strings.Failed_meters_count + "E15", Quantity.Number,      ItemCategory.Other, (w,t,u,f,p) => FormatInt(f, w.Batch.FailedMetersCountE15())));  

SchematicDrawing/IDrawingItemWithMeasuredVal.cs

@@ -13,6 +13,5 @@ namespace SchematicDrawing
         Common.Unit MsrdUnit { get; }
         double MsrdValLimLo { get; }
         double MsrdValLimHi { get; }
-        bool IsOffline { get; set; }
     }
 }

SchematicDrawing/SchematicDrawingCtrl.cs

@@ -672,11 +672,7 @@ namespace SchematicDrawing
                                 SizeF size = e.Graphics.MeasureString(strVal, measuredValueFont);
                                 Rectangle rect = new Rectangle(itm.X + itm.MsrdX, itm.Y + itm.MsrdY, (int)Math.Round(size.Width) + 4, (int)Math.Round(size.Height) + 2);
                                 ItemElementRectangles.Add(new ItemElementRect(item, Element.MeasuredVal, rect));
-                                if ((item as IDrawingItemWithMeasuredVal).IsOffline)
-                                {
-                                    e.Graphics.FillRectangle(measuredValueErrorBackColor, rect);
-                                }
-                                else if (measuredValues[msrdValIx] >= itm.MsrdValLimLo && measuredValues[msrdValIx] <= itm.MsrdValLimHi)
+                                if (measuredValues[msrdValIx] >= itm.MsrdValLimLo && measuredValues[msrdValIx] <= itm.MsrdValLimHi)
                                 {
                                     e.Graphics.FillRectangle(measuredValueBackColor, rect);
                                 }

SharedComponents/obj/Debug/net472/SharedComponents.GeneratedMSBuildEditorConfig.editorconfig

@@ -0,0 +1,5 @@
+is_global = true
+build_property.RootNamespace = SharedComponents
+build_property.ProjectDir = C:\Users\micha\git\tbf\SharedComponents\
+build_property.EnableComHosting = 
+build_property.EnableGeneratedComInterfaceComImportInterop = 

SharedComponents/obj/SharedComponents.csproj.nuget.g.props

@@ -1,16 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
     <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\MFRNIAK\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\micha\.nuget\packages\</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
     <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.14.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="C:\Users\MFRNIAK\.nuget\packages\" />
-    <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
+    <SourceRoot Include="C:\Users\micha\.nuget\packages\" />
   </ItemGroup>
 </Project>

SharedDatabase/Forms/DoubleLoginDlg.cs

@@ -44,8 +44,6 @@ namespace SharedDatabase.Forms
         {
             InitializeComponent();
 
-            this.Icon = Properties.Resources.TBF_icon;
-
             loginStatePictureBox1.Image = Properties.Resources.questionMark;
             loginStatePictureBox2.Image = Properties.Resources.questionMark;
             authorizedUser1 = null;

SharedDatabase/Forms/EditSelectedUser.cs

@@ -31,9 +31,6 @@ namespace SharedDatabase.Forms
         public EditSelectedUser()
         {
             InitializeComponent();
-
-            this.Icon = Properties.Resources.TBF_icon;
-
             this.toolTip1.SetToolTip(this.txtName, string.Format(Strings.max_0_alphanum_chars, 20));
             oriGroupMember = new bool[(displayedGroups != null) ? displayedGroups.Count : 0];
             okBtn.Enabled = false;

SharedDatabase/Forms/LoginDlg.cs

@@ -45,8 +45,6 @@ namespace SharedDatabase.Forms
         {
             InitializeComponent();
 
-            this.Icon = Properties.Resources.TBF_icon;
-
             oriBackColor = BackColor;
         }
 

SharedDatabase/Forms/PasswordChangeDlg.cs

@@ -22,8 +22,6 @@ namespace SharedDatabase.Forms
         public PasswordChangeDlg()
         {
             InitializeComponent();
-
-            this.Icon = Properties.Resources.TBF_icon;
         }
 
         /// <summary>
@@ -32,9 +30,6 @@ namespace SharedDatabase.Forms
         public PasswordChangeDlg(string predefinedUser)
         {
             InitializeComponent();
-
-            this.Icon = Properties.Resources.TBF_icon;
-
             userNameTextBox.Text = predefinedUser;
         }
 

SharedDatabase/Forms/PlainLoginDlg.cs

@@ -46,8 +46,6 @@ namespace SharedDatabase.Forms
         {
             InitializeComponent();
 
-            this.Icon = Properties.Resources.TBF_icon;
-
             oriBackColor = BackColor;
         }
 

SharedDatabase/Forms/TripleLoginDlg.cs

@@ -46,8 +46,6 @@ namespace SharedDatabase.Forms
         {
             InitializeComponent();
 
-            this.Icon = Properties.Resources.TBF_icon;
-
             loginStatePictureBox1.Image = Properties.Resources.questionMark;
             loginStatePictureBox2.Image = Properties.Resources.questionMark;
             loginStatePictureBox3.Image = Properties.Resources.questionMark;

SharedDatabase/Forms/UserManagementDlg.cs

@@ -35,9 +35,6 @@ namespace SharedDatabase.Forms
         public UserManagementDlg(NHibernate.ISession session, bool showLocalExtensions)
         {
             InitializeComponent();
-
-            this.Icon = Properties.Resources.TBF_icon;
-
             this.session = session;
             this.showExtensions = showLocalExtensions;
             if (showLocalExtensions) copyFromRemoteButton.Visible = true;

SharedDatabase/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace SharedDatabase.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -89,15 +89,5 @@ namespace SharedDatabase.Properties {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
-        /// </summary>
-        internal static System.Drawing.Icon TBF_icon {
-            get {
-                object obj = ResourceManager.GetObject("TBF_icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
     }
 }

SharedDatabase/Properties/Resources.resx

@@ -127,7 +127,4 @@
   <data name="rejected" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Pictures\rejected.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="TBF_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\TBF_icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
 </root>

SharedDatabase/SharedDatabase.csproj

@@ -221,9 +221,6 @@
     <None Include="Pictures\questionMark.bmp" />
     <None Include="Pictures\rejected.bmp" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\TBF_icon.ico" />
-  </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.

TBF.sln

@@ -106,13 +106,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LabelPrinting", "LabelPrint
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TBFTests", "TBFTests\TBFTests.csproj", "{77EB589F-C670-4489-AAD6-2A3C02061FD1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppDiagnostic", "AppDiagnostic\AppDiagnostic.csproj", "{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8F942729-F454-4C99-BA6C-746962065AE3} = {8F942729-F454-4C99-BA6C-746962065AE3}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedComponents", "SharedComponents\SharedComponents.csproj", "{8F942729-F454-4C99-BA6C-746962065AE3}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sensus.iPerl.RfidCom", "..\iPerlHead\Sensus.iPerl.RfidCom\Sensus.iPerl.RfidCom.csproj", "{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sensus.iPerl.TestConsole", "..\iPerlHead\Sensus.iPerl.TestConsole\Sensus.iPerl.TestConsole.csproj", "{5025ED8B-A94F-4E58-8BE0-68481B061609}"
@@ -121,8 +114,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NfcS5_DLL", "..\NfcS5_DLL\N
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NfcC7_DLL", "NfcC7_DLL\NfcC7_DLL.csproj", "{53E75979-B530-4805-8FC9-B314F14A62BE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NfcC7_DLL.Tests", "NfcC7_DLL.Tests\NfcC7_DLL.Tests.csproj", "{715605C5-568B-48D6-9C09-2DC5F2E81F66}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -483,30 +474,6 @@ Global
 		{77EB589F-C670-4489-AAD6-2A3C02061FD1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{77EB589F-C670-4489-AAD6-2A3C02061FD1}.Release|x86.ActiveCfg = Release|Any CPU
 		{77EB589F-C670-4489-AAD6-2A3C02061FD1}.Release|x86.Build.0 = Release|Any CPU
-		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Debug|x86.Build.0 = Debug|Any CPU
-		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Release|x86.ActiveCfg = Release|Any CPU
-		{FA9ABAD1-7184-4295-ADE8-D44F2E3DE6B2}.Release|x86.Build.0 = Release|Any CPU
-		{8F942729-F454-4C99-BA6C-746962065AE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8F942729-F454-4C99-BA6C-746962065AE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8F942729-F454-4C99-BA6C-746962065AE3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8F942729-F454-4C99-BA6C-746962065AE3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8F942729-F454-4C99-BA6C-746962065AE3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8F942729-F454-4C99-BA6C-746962065AE3}.Debug|x86.Build.0 = Debug|Any CPU
-		{8F942729-F454-4C99-BA6C-746962065AE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8F942729-F454-4C99-BA6C-746962065AE3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8F942729-F454-4C99-BA6C-746962065AE3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{8F942729-F454-4C99-BA6C-746962065AE3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{8F942729-F454-4C99-BA6C-746962065AE3}.Release|x86.ActiveCfg = Release|Any CPU
-		{8F942729-F454-4C99-BA6C-746962065AE3}.Release|x86.Build.0 = Release|Any CPU
 		{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -555,18 +522,6 @@ Global
 		{53E75979-B530-4805-8FC9-B314F14A62BE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{53E75979-B530-4805-8FC9-B314F14A62BE}.Release|x86.ActiveCfg = Release|Any CPU
 		{53E75979-B530-4805-8FC9-B314F14A62BE}.Release|x86.Build.0 = Release|Any CPU
-		{715605C5-568B-48D6-9C09-2DC5F2E81F66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{715605C5-568B-48D6-9C09-2DC5F2E81F66}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{715605C5-568B-48D6-9C09-2DC5F2E81F66}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{715605C5-568B-48D6-9C09-2DC5F2E81F66}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{715605C5-568B-48D6-9C09-2DC5F2E81F66}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{715605C5-568B-48D6-9C09-2DC5F2E81F66}.Debug|x86.Build.0 = Debug|Any CPU
-		{715605C5-568B-48D6-9C09-2DC5F2E81F66}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{715605C5-568B-48D6-9C09-2DC5F2E81F66}.Release|Any CPU.Build.0 = Release|Any CPU
-		{715605C5-568B-48D6-9C09-2DC5F2E81F66}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{715605C5-568B-48D6-9C09-2DC5F2E81F66}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{715605C5-568B-48D6-9C09-2DC5F2E81F66}.Release|x86.ActiveCfg = Release|Any CPU
-		{715605C5-568B-48D6-9C09-2DC5F2E81F66}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

TBF/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Sensus")]
 [assembly: AssemblyProduct("TestBenchFramework")]
-[assembly: AssemblyCopyright("Copyright © 2013 - 2025 Sensus Slovensko, a.s.")]
+[assembly: AssemblyCopyright("Copyright © 2013 - 2023 Sensus Slovensko, a.s.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.9.3058.1")]
-[assembly: AssemblyFileVersion("3.9.3058.1")]
+[assembly: AssemblyVersion("3.9.2206.0")]
+[assembly: AssemblyFileVersion("3.9.2206.0")]

TBF/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace TBF.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -150,16 +150,6 @@ namespace TBF.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
-        /// </summary>
-        internal static System.Drawing.Icon TBF_icon {
-            get {
-                object obj = ResourceManager.GetObject("TBF_icon", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

TBF/Properties/Resources.resx

@@ -208,7 +208,4 @@
   <data name="TControl_XL_idle" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Rig\Modbus\TempControl\Pictures\TControl-XL-idle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="TBF_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\TBF_icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
 </root>

TBF/Properties/app.manifest

@@ -19,8 +19,8 @@
         <requestedExecutionLevel level="asInvoker" uiAccess="false" />
       </requestedPrivileges>
       <applicationRequestMinimum>
+        <PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site" />
         <defaultAssemblyRequest permissionSetReference="Custom" />
-        <PermissionSet class="System.Security.PermissionSet" version="1" ID="Custom" SameSite="site" Unrestricted="true" />
       </applicationRequestMinimum>
     </security>
   </trustInfo>

TBF/ReadMe_BugFix.md

@@ -1,5 +1,15 @@
 ## Version History
 
-| Version    | Source of change     | Target Environment                                           | Title                                               | Description                        |
-|------------|----------------------|--------------------------------------------------------------|-----------------------------------------------------|------------------------------------|
-| 3.9.2149.0 | Michal databse error | HeatMeters, Heat meter sensors, Procedure Dilog, Tab Process | Excanged columns value 'Sensor' and 'Heat meter sensor' | Fix in code ProcedureDlg, row 1851 |
+| Version    | Target Environment                                           | Title                                               | Description                        |
+|------------|--------------------------------------------------------------|-----------------------------------------------------|------------------------------------|
+| 3.9.2149.0 | HeatMeters, Heat meter sensors, Procedure Dilog, Tab Process | Excanged columns value 'Sensor' and 'Heat meter sensor' | Fix in code ProcedureDlg, row 1851 |
+| 3.9.2149.1 | General release                                               | Version iteration                                   | Assembly and file version increment. |
+| 3.9.2149.2 | Poseidon register reader                                      | Poseidon pulse and timing handling                  | Added reference-pulse reading in `Run()` and improved Poseidon timing/task tracking. |
+| 3.9.2149.4 | Mass collection / Poseidon start-stop                         | Mass collection update                              | Refactored standing-start mass collection, extended Poseidon start/end data-entry configuration and improved dialog/task handling. |
+| 3.9.2200.1 | Test infrastructure                                           | TBF test assembly access                            | Added `InternalsVisibleTo` support for `TBFTests`. |
+| 3.9.2201.1 | Poseidon CLI                                                  | Poseidon CLI configuration                           | Added macro descriptions, refined serial-port/CLI argument configuration and extended CLI test coverage. |
+| 3.9.2202.1 | Poseidon CLI                                                  | CLI release iteration                               | Assembly and file version increment for the Poseidon CLI workstream. |
+| 3.9.2203.1 | Poseidon CLI / smart-meter sequence                           | CLI test and configuration update                   | Updated CLI executable test setup, serial-port default responses and smart-meter component-name handling. |
+| 3.9.2204.1 | Morrisville / Poseidon CLI                                    | Morrisville CLI diagnostics                          | Restored lost 2204 versioning, added detailed CLI command/response logging and used a fixed CLI directory for deployment. |
+| 3.9.2205.1 | Morrisville / Poseidon CLI / Results DB                       | Poseidon read diagnostics and results DB migration  | Improved Poseidon CLI execution and diagnostics (fixed CLI working directory, exit code/stdout/stderr capture, JSON/NFC/reading validation and culture-independent decimal parsing). Added reader-cycle and fake-CLI test coverage. Prevented a device/CLI error while changing the legacy optical-head mode from crashing the UI. Results DB now creates missing `MeterTestRslt` compatibility columns (`FlipMode`, `ExtraDataPath`, `X1`-`X9`) automatically for MySQL and SQLite before results are saved. |
+| 3.9.2206.0 | Morrisville / Poseidon CLI / Results DB                       | Poseidon start/end rearm and simulation isolation   | Fixed the Poseidon start/end read cycle so a completed START reader is armed again once for END, preventing reused START values or skipped END CLI calls. Added trace logging for CLI response, dialog prefill and confirmed dialog values. In `Simulate` mode, `PoseidonCmdStartStop` now always runs the fixed `C:\TBF\Cli\cmdSleepTest.exe` instead of the configured physical Hat CLI. Added regression tests for customer CLI JSON responses, decimal comma/dot and non-zero readings, start/end dialog transfer, full/reduced reader cycles and simulation CLI selection. Extended results-schema migration with `MeterTestRslt.PulsesPerKilogram`. |

TBF/Resources/Strings.Designer.cs

@@ -4415,15 +4415,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Pulses per kilogram.
-        /// </summary>
-        internal static string PulsesPerKilogram {
-            get {
-                return ResourceManager.GetString("PulsesPerKilogram", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Pulses per kWh.
         /// </summary>
@@ -4442,15 +4433,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Pulses per unit.
-        /// </summary>
-        internal static string PulsesPerUnit {
-            get {
-                return ResourceManager.GetString("PulsesPerUnit", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Pump.
         /// </summary>
@@ -6269,15 +6251,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Test in calculation.
-        /// </summary>
-        internal static string Test_in_calculation {
-            get {
-                return ResourceManager.GetString("Test_in_calculation", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Test in progress.
         /// </summary>
@@ -6713,15 +6686,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Units.
-        /// </summary>
-        internal static string Units {
-            get {
-                return ResourceManager.GetString("Units", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Unlock.
         /// </summary>

TBF/Resources/Strings.es.resx

@@ -126,13 +126,4 @@
   <data name="ShowDialog" xml:space="preserve">
     <value>Mostrar diálogo</value>
   </data>
-  <data name="PulsesPerUnit" xml:space="preserve">
-    <value />
-  </data>
-  <data name="PulsesPerKilogram" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Units" xml:space="preserve">
-    <value />
-  </data>
 </root>

TBF/Resources/Strings.fr.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Activity" xml:space="preserve">
+    <value>Activité</value>
+  </data>
   <data name="Confirmation" xml:space="preserve">
     <value>Confirmation</value>
   </data>
@@ -396,6 +399,9 @@
   <data name="Tol_red_pct_chdr" xml:space="preserve">
     <value>Toler rouge. [%]</value>
   </data>
+  <data name="Test_time_s_chdr" xml:space="preserve">
+    <value>Temps test [s]</value>
+  </data>
   <data name="Error_while_creating_DB_Reason" xml:space="preserve">
     <value>Erreur lors de la création de la base de données. Raison:</value>
   </data>
@@ -519,6 +525,9 @@
   <data name="RelativeQto" xml:space="preserve">
     <value>Q relatif à</value>
   </data>
+  <data name="TargetQ" xml:space="preserve">
+    <value>Q cible [m3/h]</value>
+  </data>
   <data name="Compound_meters" xml:space="preserve">
     <value>Mètres composés</value>
   </data>
@@ -609,9 +618,6 @@
   <data name="Switching_flow_detection" xml:space="preserve">
     <value>Détection flux commutation</value>
   </data>
-  <data name="Activity" xml:space="preserve">
-    <value>Activité</value>
-  </data>
   <data name="Progress" xml:space="preserve">
     <value>Progrès</value>
   </data>
@@ -882,7 +888,7 @@
   <data name="Qrise" xml:space="preserve">
     <value>Q hausse</value>
   </data>
-  <data name="Serial_number" xml:space="preserve">
+  <data name="Serial_Number" xml:space="preserve">
     <value>Numéro série</value>
   </data>
   <data name="State" xml:space="preserve">
@@ -933,9 +939,6 @@
   <data name="Purchase_order" xml:space="preserve">
     <value>Commande</value>
   </data>
-  <data name="Project_number" xml:space="preserve">
-    <value>Numéro de projet</value>
-  </data>
   <data name="Ambient_humidity" xml:space="preserve">
     <value>Humidité ambiante</value>
   </data>
@@ -1242,6 +1245,9 @@
   <data name="Target_ref_pulses_" xml:space="preserve">
     <value>Cible ref impulsions:</value>
   </data>
+  <data name="Target_volume_l_" xml:space="preserve">
+    <value>Volume cible [l]:</value>
+  </data>
   <data name="Save_column_widths" xml:space="preserve">
     <value>Enregistrer largeurs  colonne</value>
   </data>
@@ -1380,6 +1386,9 @@
   <data name="Last_changed_by" xml:space="preserve">
     <value>Dernier changement dby</value>
   </data>
+  <data name="Meter_types_tested" xml:space="preserve">
+    <value>Types compteurs testés</value>
+  </data>
   <data name="Notes" xml:space="preserve">
     <value>Remarques</value>
   </data>
@@ -1662,9 +1671,6 @@
   <data name="Protected_procedure" xml:space="preserve">
     <value>Procédure protégée</value>
   </data>
-  <data name="Empty" xml:space="preserve">
-    <value>Vidanger</value>
-  </data>
   <data name="Session" xml:space="preserve">
     <value>Session</value>
   </data>
@@ -1707,6 +1713,9 @@
   <data name="RFID_communication_failed" xml:space="preserve">
     <value>Échec communication RFID</value>
   </data>
+  <data name="Opto_head_was_disabled_by_the_user" xml:space="preserve">
+    <value>tête désactivée par utilisateur</value>
+  </data>
   <data name="failed_0_1_exclamation" xml:space="preserve">
     <value>{0}' exclamation échoué  ({1}) !!!</value>
   </data>
@@ -1794,6 +1803,9 @@
   <data name="Refresh" xml:space="preserve">
     <value>Rafraîchir</value>
   </data>
+  <data name="current" xml:space="preserve">
+    <value>actuel</value>
+  </data>
   <data name="Flow" xml:space="preserve">
     <value>Couler</value>
   </data>
@@ -1893,7 +1905,7 @@
   <data name="Import" xml:space="preserve">
     <value>Importation</value>
   </data>
-  <data name="Repetition" xml:space="preserve">
+  <data name="repetition" xml:space="preserve">
     <value>répétition</value>
   </data>
   <data name="Result" xml:space="preserve">
@@ -1977,9 +1989,6 @@
   <data name="End_session" xml:space="preserve">
     <value>Terminer le cycle</value>
   </data>
-  <data name="Fill" xml:space="preserve">
-    <value>Inonder</value>
-  </data>
   <data name="Pipeline" xml:space="preserve">
     <value>Pipeline</value>
   </data>
@@ -1992,40 +2001,25 @@
   <data name="Q_tg" xml:space="preserve">
     <value>Q obj.</value>
   </data>
+  <data name="Empty" xml:space="preserve">
+    <value>Vidanger</value>
+  </data>
   <data name="Empty_the_tank" xml:space="preserve">
     <value>Vidanger réservoir</value>
   </data>
+  <data name="Fill" xml:space="preserve">
+    <value>Inonder</value>
+  </data>
   <data name="Current" xml:space="preserve">
     <value>Curren</value>
   </data>
   <data name="Voltage" xml:space="preserve">
     <value>Tension</value>
   </data>
+  <data name="Project_number" xml:space="preserve">
+    <value>Numéro de projet</value>
+  </data>
   <data name="ShowDialog" xml:space="preserve">
     <value>Afficher la boîte de dialogue</value>
   </data>
-  <data name="Meter_types_tested" xml:space="preserve">
-    <value>Types compteurs testés</value>
-  </data>
-  <data name="TargetQ" xml:space="preserve">
-    <value>Q cible [m3/h]</value>
-  </data>
-  <data name="Target_volume_l_" xml:space="preserve">
-    <value>Volume cible [l]:</value>
-  </data>
-  <data name="Opto_head_was_disabled_by_the_user" xml:space="preserve">
-    <value>tête désactivée par utilisateur</value>
-  </data>
-  <data name="Test_time_s_chdr" xml:space="preserve">
-    <value>Temps test [s]</value>
-  </data>
-  <data name="PulsesPerUnit" xml:space="preserve">
-    <value />
-  </data>
-  <data name="PulsesPerKilogram" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Units" xml:space="preserve">
-    <value />
-  </data>
 </root>

TBF/Resources/Strings.it.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Activity" xml:space="preserve">
+    <value>Attività</value>
+  </data>
   <data name="Confirmation" xml:space="preserve">
     <value>conferma</value>
   </data>
@@ -249,6 +252,9 @@
   <data name="Nr" xml:space="preserve">
     <value>numero</value>
   </data>
+  <data name="Mass" xml:space="preserve">
+    <value>massa</value>
+  </data>
   <data name="AddBtnText" xml:space="preserve">
     <value>Aggiunta</value>
   </data>
@@ -270,6 +276,12 @@
   <data name="OkBtnText" xml:space="preserve">
     <value>Ok</value>
   </data>
+  <data name="Flow" xml:space="preserve">
+    <value>flusso</value>
+  </data>
+  <data name="Pressure" xml:space="preserve">
+    <value>pressione</value>
+  </data>
   <data name="Invalid_username_or_password" xml:space="preserve">
     <value>Username o password non validi</value>
   </data>
@@ -387,6 +399,12 @@
   <data name="Output_chdr" xml:space="preserve">
     <value>Uscite</value>
   </data>
+  <data name="Q_from_lph" xml:space="preserve">
+    <value>Qda [l/h]</value>
+  </data>
+  <data name="Q_to_lph" xml:space="preserve">
+    <value>Q a [l/h]</value>
+  </data>
   <data name="Red_type_chdr" xml:space="preserve">
     <value>tipo rosso</value>
   </data>
@@ -396,6 +414,9 @@
   <data name="Tol_red_pct_chdr" xml:space="preserve">
     <value>tolleranza rossa [%]</value>
   </data>
+  <data name="Test_time_s_chdr" xml:space="preserve">
+    <value>test time [s]</value>
+  </data>
   <data name="Error_while_creating_DB_Reason" xml:space="preserve">
     <value>errore durante la creazione del data base. ragioni:</value>
   </data>
@@ -519,6 +540,9 @@
   <data name="RelativeQto" xml:space="preserve">
     <value>Q relativo a</value>
   </data>
+  <data name="TargetQ" xml:space="preserve">
+    <value>target Q [m3/h]</value>
+  </data>
   <data name="Compound_meters" xml:space="preserve">
     <value>metri composti</value>
   </data>
@@ -609,9 +633,6 @@
   <data name="Switching_flow_detection" xml:space="preserve">
     <value>rilevamento del flusso di commutazione</value>
   </data>
-  <data name="Activity" xml:space="preserve">
-    <value>Attività</value>
-  </data>
   <data name="Progress" xml:space="preserve">
     <value>progressi</value>
   </data>
@@ -882,7 +903,7 @@
   <data name="Qrise" xml:space="preserve">
     <value>Qalta</value>
   </data>
-  <data name="Serial_number" xml:space="preserve">
+  <data name="Serial_Number" xml:space="preserve">
     <value>Numero Seriale</value>
   </data>
   <data name="State" xml:space="preserve">
@@ -933,9 +954,6 @@
   <data name="Purchase_order" xml:space="preserve">
     <value>ordine acquisto</value>
   </data>
-  <data name="Project_number" xml:space="preserve">
-    <value>Numero del progetto</value>
-  </data>
   <data name="Ambient_humidity" xml:space="preserve">
     <value>Umidità dell'ambiente</value>
   </data>
@@ -963,6 +981,9 @@
   <data name="Start" xml:space="preserve">
     <value>Inizio</value>
   </data>
+  <data name="AtTemperature_C" xml:space="preserve">
+    <value>@temperatura [°C]</value>
+  </data>
   <data name="Density" xml:space="preserve">
     <value>densità</value>
   </data>
@@ -1104,15 +1125,15 @@
   <data name="ID" xml:space="preserve">
     <value>ID </value>
   </data>
+  <data name="Focus" xml:space="preserve">
+    <value>messa a fuoco</value>
+  </data>
   <data name="Grab" xml:space="preserve">
     <value>afferrare</value>
   </data>
   <data name="Live" xml:space="preserve">
     <value>dal vivo</value>
   </data>
-  <data name="Camera" xml:space="preserve">
-    <value>Fotocamera</value>
-  </data>
   <data name="Closing_the_tank" xml:space="preserve">
     <value>chiusura del serbatoio</value>
   </data>
@@ -1191,15 +1212,15 @@
   <data name="Compound_meter_0" xml:space="preserve">
     <value>misuratore composto {0}</value>
   </data>
+  <data name="Error_" xml:space="preserve">
+    <value>Errore:</value>
+  </data>
   <data name="Estimated_time_s_" xml:space="preserve">
     <value>tempo stimato [s]:</value>
   </data>
   <data name="Mass_diff_kg_" xml:space="preserve">
     <value>mass diff [kg]:</value>
   </data>
-  <data name="Mass" xml:space="preserve">
-    <value>massa</value>
-  </data>
   <data name="Meter" xml:space="preserve">
     <value>metri</value>
   </data>
@@ -1239,6 +1260,9 @@
   <data name="Target_ref_pulses_" xml:space="preserve">
     <value>Target ref. count:</value>
   </data>
+  <data name="Target_volume_l_" xml:space="preserve">
+    <value>target volume [l]:</value>
+  </data>
   <data name="Save_column_widths" xml:space="preserve">
     <value>salva larghezza colonne</value>
   </data>
@@ -1290,9 +1314,6 @@
   <data name="Print_watermeter_results" xml:space="preserve">
     <value>stampare i risultati dei contatori</value>
   </data>
-  <data name="Save_again" xml:space="preserve">
-    <value>inviato</value>
-  </data>
   <data name="Sent" xml:space="preserve">
     <value>inviato</value>
   </data>
@@ -1377,6 +1398,9 @@
   <data name="Last_changed_by" xml:space="preserve">
     <value>ultimo cambiato da </value>
   </data>
+  <data name="Meter_types_tested" xml:space="preserve">
+    <value>tipi di contatori testati</value>
+  </data>
   <data name="Notes" xml:space="preserve">
     <value>note</value>
   </data>
@@ -1548,6 +1572,9 @@
   <data name="User_code" xml:space="preserve">
     <value>codice utente</value>
   </data>
+  <data name="Save_again" xml:space="preserve">
+    <value>inviato</value>
+  </data>
   <data name="Failed_to_initialize_device_0_1_2" xml:space="preserve">
     <value>Errore dispositivo '{0}':{1}{2}</value>
   </data>
@@ -1659,8 +1686,8 @@
   <data name="Protected_procedure" xml:space="preserve">
     <value>Procedura protetta</value>
   </data>
-  <data name="Empty" xml:space="preserve">
-    <value>Svuotare</value>
+  <data name="Drain" xml:space="preserve">
+    <value>Drenare</value>
   </data>
   <data name="Session" xml:space="preserve">
     <value>Sessione</value>
@@ -1713,17 +1740,14 @@
   <data name="Correction" xml:space="preserve">
     <value>correzione</value>
   </data>
-  <data name="Start_the_test_bench" xml:space="preserve">
-    <value>Avvio del banco prova</value>
+  <data name="Camera" xml:space="preserve">
+    <value>Fotocamera</value>
   </data>
   <data name="Finish_the_session_please" xml:space="preserve">
     <value>Finire la misurazione perfavore</value>
   </data>
-  <data name="Flow" xml:space="preserve">
-    <value>flusso</value>
-  </data>
-  <data name="Pressure" xml:space="preserve">
-    <value>pressione</value>
+  <data name="Start_the_test_bench" xml:space="preserve">
+    <value>Avvio del banco prova</value>
   </data>
   <data name="Flow_adjustment_failed" xml:space="preserve">
     <value>Errore impostazione del flusso</value>
@@ -1737,6 +1761,12 @@
   <data name="Abort_session" xml:space="preserve">
     <value>Interrompere</value>
   </data>
+  <data name="Empty" xml:space="preserve">
+    <value>Svuotare</value>
+  </data>
+  <data name="Empty_the_tank" xml:space="preserve">
+    <value>Svuotare il serbatoio</value>
+  </data>
   <data name="End_session" xml:space="preserve">
     <value>Finire il ciclo</value>
   </data>
@@ -1749,55 +1779,16 @@
   <data name="Start_cycle" xml:space="preserve">
     <value>Avviare il ciclo</value>
   </data>
-  <data name="Empty_the_tank" xml:space="preserve">
-    <value>Svuotare il serbatoio</value>
-  </data>
   <data name="Current" xml:space="preserve">
     <value>Corrente</value>
   </data>
   <data name="Voltage" xml:space="preserve">
     <value>Voltaggio</value>
   </data>
+  <data name="Project_number" xml:space="preserve">
+    <value>Numero del progetto</value>
+  </data>
   <data name="ShowDialog" xml:space="preserve">
     <value>Mostra dialogo</value>
   </data>
-  <data name="Meter_types_tested" xml:space="preserve">
-    <value>tipi di contatori testati</value>
-  </data>
-  <data name="Q_from_lph" xml:space="preserve">
-    <value>Qda [l/h]</value>
-  </data>
-  <data name="Q_to_lph" xml:space="preserve">
-    <value>Q a [l/h]</value>
-  </data>
-  <data name="TargetQ" xml:space="preserve">
-    <value>target Q [m3/h]</value>
-  </data>
-  <data name="Target_volume_l_" xml:space="preserve">
-    <value>target volume [l]:</value>
-  </data>
-  <data name="Test_time_s_chdr" xml:space="preserve">
-    <value>test time [s]</value>
-  </data>
-  <data name="AtTemperature_C" xml:space="preserve">
-    <value>@temperatura [°C]</value>
-  </data>
-  <data name="Focus" xml:space="preserve">
-    <value>messa a fuoco</value>
-  </data>
-  <data name="Error_" xml:space="preserve">
-    <value>Errore:</value>
-  </data>
-  <data name="Drain" xml:space="preserve">
-    <value>Drenare</value>
-  </data>
-  <data name="PulsesPerUnit" xml:space="preserve">
-    <value />
-  </data>
-  <data name="PulsesPerKilogram" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Units" xml:space="preserve">
-    <value />
-  </data>
 </root>

TBF/Resources/Strings.resx

@@ -198,10 +198,10 @@
   <data name="Reg_valve" xml:space="preserve">
     <value>Reg. valve</value>
   </data>
-  <data name="RegulMinStep" xml:space="preserve">
+	<data name="RegulMinStep" xml:space="preserve">
     <value>Reg. min step</value>
   </data>
-  <data name="Application_Diagnostic" xml:space="preserve">
+	<data name="Application_Diagnostic" xml:space="preserve">
     <value>Application diagnostic</value>
   </data>
   <data name="Balance" xml:space="preserve">
@@ -2449,7 +2449,7 @@
   <data name="Upgrade_DB" xml:space="preserve">
     <value>Upgrade database</value>
   </data>
-  <data name="AppDiagnostic" xml:space="preserve">
+	<data name="AppDiagnostic" xml:space="preserve">
     <value>Application diagnostic</value>
   </data>
   <data name="About" xml:space="preserve">
@@ -2473,16 +2473,5 @@
   <data name="SaveCommunication" xml:space="preserve">
     <value>Save Communication</value>
   </data>
-  <data name="PulsesPerUnit" xml:space="preserve">
-    <value>Pulses per unit</value>
-  </data>
-  <data name="PulsesPerKilogram" xml:space="preserve">
-    <value>Pulses per kilogram</value>
-  </data>
-  <data name="Units" xml:space="preserve">
-    <value>Units</value>
-  </data>
-  <data name="Test_in_calculation" xml:space="preserve">
-    <value>Test in calculation</value>
-  </data>
+ 
 </root>

TBF/Resources/Strings.ru.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Activity" xml:space="preserve">
+    <value>Активность</value>
+  </data>
   <data name="Confirmation" xml:space="preserve">
     <value>Подтверждение</value>
   </data>
@@ -180,12 +183,6 @@
   <data name="P_out" xml:space="preserve">
     <value>P вниз</value>
   </data>
-  <data name="Q_from" xml:space="preserve">
-    <value>Q от</value>
-  </data>
-  <data name="Q_to" xml:space="preserve">
-    <value>Q до</value>
-  </data>
   <data name="Reference" xml:space="preserve">
     <value>Ссылка</value>
   </data>
@@ -243,6 +240,9 @@
   <data name="Nr" xml:space="preserve">
     <value>№</value>
   </data>
+  <data name="Mass" xml:space="preserve">
+    <value>Масса</value>
+  </data>
   <data name="AddBtnText" xml:space="preserve">
     <value>Добавить</value>
   </data>
@@ -264,6 +264,12 @@
   <data name="OkBtnText" xml:space="preserve">
     <value>OK</value>
   </data>
+  <data name="Flow" xml:space="preserve">
+    <value>Расход</value>
+  </data>
+  <data name="Pressure" xml:space="preserve">
+    <value>Давление</value>
+  </data>
   <data name="Username" xml:space="preserve">
     <value>Имя пользователя</value>
   </data>
@@ -378,6 +384,12 @@
   <data name="Output_chdr" xml:space="preserve">
     <value>Выход</value>
   </data>
+  <data name="Q_from_lph" xml:space="preserve">
+    <value>Q от [л/ч]</value>
+  </data>
+  <data name="Q_to_lph" xml:space="preserve">
+    <value>Q до [л/ч]</value>
+  </data>
   <data name="Red_type_chdr" xml:space="preserve">
     <value>Тип сокращ.</value>
   </data>
@@ -387,6 +399,9 @@
   <data name="Tol_red_pct_chdr" xml:space="preserve">
     <value>Toler. red. [%]</value>
   </data>
+  <data name="Test_time_s_chdr" xml:space="preserve">
+    <value>Время теста [с]</value>
+  </data>
   <data name="Error_while_creating_DB_Reason" xml:space="preserve">
     <value>Ошибка при создании базы данных. Причина:</value>
   </data>
@@ -510,6 +525,9 @@
   <data name="RelativeQto" xml:space="preserve">
     <value>Относительный Q до</value>
   </data>
+  <data name="TargetQ" xml:space="preserve">
+    <value>Заданный Q [м3/ч]</value>
+  </data>
   <data name="Compound_meters" xml:space="preserve">
     <value>Комбинированные счетчики</value>
   </data>
@@ -600,9 +618,6 @@
   <data name="Switching_flow_detection" xml:space="preserve">
     <value>Переключение потока</value>
   </data>
-  <data name="Activity" xml:space="preserve">
-    <value>Активность</value>
-  </data>
   <data name="Progress" xml:space="preserve">
     <value>Прогресс</value>
   </data>
@@ -873,7 +888,7 @@
   <data name="Qrise" xml:space="preserve">
     <value>Qпониж</value>
   </data>
-  <data name="Serial_number" xml:space="preserve">
+  <data name="Serial_Number" xml:space="preserve">
     <value>Серийный номер</value>
   </data>
   <data name="State" xml:space="preserve">
@@ -924,9 +939,6 @@
   <data name="Purchase_order" xml:space="preserve">
     <value>Заказ</value>
   </data>
-  <data name="Project_number" xml:space="preserve">
-    <value>Номер проекта</value>
-  </data>
   <data name="Ambient_humidity" xml:space="preserve">
     <value>Относительная влажность окружающей среды</value>
   </data>
@@ -954,6 +966,9 @@
   <data name="Start" xml:space="preserve">
     <value>Старт</value>
   </data>
+  <data name="AtTemperature_C" xml:space="preserve">
+    <value>температура [°C]</value>
+  </data>
   <data name="Density" xml:space="preserve">
     <value>Плотность</value>
   </data>
@@ -981,6 +996,12 @@
   <data name="Qt" xml:space="preserve">
     <value>Qt</value>
   </data>
+  <data name="cold" xml:space="preserve">
+    <value>холодный</value>
+  </data>
+  <data name="hot" xml:space="preserve">
+    <value>горячий</value>
+  </data>
   <data name="Water" xml:space="preserve">
     <value>Вода</value>
   </data>
@@ -1089,6 +1110,9 @@
   <data name="ID" xml:space="preserve">
     <value>ID</value>
   </data>
+  <data name="Focus" xml:space="preserve">
+    <value>Сфокусировать</value>
+  </data>
   <data name="Grab" xml:space="preserve">
     <value>Захватить</value>
   </data>
@@ -1179,9 +1203,6 @@
   <data name="Mass_diff_kg_" xml:space="preserve">
     <value>Mass diff. [kg]:</value>
   </data>
-  <data name="Mass" xml:space="preserve">
-    <value>Масса</value>
-  </data>
   <data name="Meter" xml:space="preserve">
     <value>Счетчик</value>
   </data>
@@ -1221,6 +1242,9 @@
   <data name="Target_ref_pulses_" xml:space="preserve">
     <value>Target ref. count:</value>
   </data>
+  <data name="Target_volume_l_" xml:space="preserve">
+    <value>Заданный объем [л]:</value>
+  </data>
   <data name="Save_column_widths" xml:space="preserve">
     <value>Сохранить ширину столбцов</value>
   </data>
@@ -1272,6 +1296,9 @@
   <data name="Print_watermeter_results" xml:space="preserve">
     <value>Печатать результатов водосчетчиков</value>
   </data>
+  <data name="Again" xml:space="preserve">
+    <value>Снова</value>
+  </data>
   <data name="Sent" xml:space="preserve">
     <value>Отправлено</value>
   </data>
@@ -1356,6 +1383,9 @@
   <data name="Last_changed_by" xml:space="preserve">
     <value>Изменено</value>
   </data>
+  <data name="Meter_types_tested" xml:space="preserve">
+    <value>Типы испытываемых счетчиков</value>
+  </data>
   <data name="Notes" xml:space="preserve">
     <value>Заметки</value>
   </data>
@@ -1527,57 +1557,6 @@
   <data name="User_code" xml:space="preserve">
     <value>Код пользователя</value>
   </data>
-  <data name="Resetting_scales" xml:space="preserve">
-    <value>Сброс весов</value>
-  </data>
-  <data name="Correction" xml:space="preserve">
-    <value>Коррекция</value>
-  </data>
-  <data name="Flow" xml:space="preserve">
-    <value>Расход</value>
-  </data>
-  <data name="Pressure" xml:space="preserve">
-    <value>Давление</value>
-  </data>
-  <data name="Result" xml:space="preserve">
-    <value>Результат</value>
-  </data>
-  <data name="Evaporation" xml:space="preserve">
-    <value>испарение</value>
-  </data>
-  <data name="String1" xml:space="preserve">
-    <value>Строка 1</value>
-  </data>
-  <data name="Current" xml:space="preserve">
-    <value>Current</value>
-  </data>
-  <data name="Voltage" xml:space="preserve">
-    <value>Voltage</value>
-  </data>
-  <data name="cold" xml:space="preserve">
-    <value>холодный</value>
-  </data>
-  <data name="hot" xml:space="preserve">
-    <value>горячий</value>
-  </data>
-  <data name="Test_method2" xml:space="preserve">
-    <value>Метод испытаний 2</value>
-  </data>
-  <data name="Meter_types_tested" xml:space="preserve">
-    <value>Типы испытываемых счетчиков</value>
-  </data>
-  <data name="Short_dercription" xml:space="preserve">
-    <value>Краткое описание</value>
-  </data>
-  <data name="Q_from_lph" xml:space="preserve">
-    <value>Q от [л/ч]</value>
-  </data>
-  <data name="Q_to_lph" xml:space="preserve">
-    <value>Q до [л/ч]</value>
-  </data>
-  <data name="TargetQ" xml:space="preserve">
-    <value>Заданный Q [м3/ч]</value>
-  </data>
   <data name="P_in_end" xml:space="preserve">
     <value>P вверх конец</value>
   </data>
@@ -1590,31 +1569,43 @@
   <data name="P_out_start" xml:space="preserve">
     <value>P вниз начало</value>
   </data>
-  <data name="Target_volume_l_" xml:space="preserve">
-    <value>Заданный объем [л]:</value>
+  <data name="Q_from" xml:space="preserve">
+    <value>Q от</value>
   </data>
-  <data name="Test_time_s_chdr" xml:space="preserve">
-    <value>Время теста [с]</value>
-  </data>
-  <data name="AtTemperature_C" xml:space="preserve">
-    <value>температура [°C]</value>
-  </data>
-  <data name="Focus" xml:space="preserve">
-    <value>Сфокусировать</value>
+  <data name="Q_to" xml:space="preserve">
+    <value>Q до</value>
   </data>
   <data name="ROI_Detection_in_ProgressROI_Detection_in_Progress" xml:space="preserve">
     <value>Продолжается распознавание</value>
   </data>
-  <data name="Again" xml:space="preserve">
-    <value>Снова</value>
+  <data name="String1" xml:space="preserve">
+    <value>Строка 1</value>
   </data>
-  <data name="PulsesPerUnit" xml:space="preserve">
-    <value />
+  <data name="Test_method2" xml:space="preserve">
+    <value>Метод испытаний 2</value>
   </data>
-  <data name="PulsesPerKilogram" xml:space="preserve">
-    <value />
+  <data name="Short_dercription" xml:space="preserve">
+    <value>Краткое описание</value>
   </data>
-  <data name="Units" xml:space="preserve">
-    <value />
+  <data name="Correction" xml:space="preserve">
+    <value>Коррекция</value>
+  </data>
+  <data name="Resetting_scales" xml:space="preserve">
+    <value>Сброс весов</value>
+  </data>
+  <data name="Result" xml:space="preserve">
+    <value>Результат</value>
+  </data>
+  <data name="Evaporation" xml:space="preserve">
+    <value>испарение</value>
+  </data>
+  <data name="Current" xml:space="preserve">
+    <value>Current</value>
+  </data>
+  <data name="Voltage" xml:space="preserve">
+    <value>Voltage</value>
+  </data>
+  <data name="Project_number" xml:space="preserve">
+    <value>Номер проекта</value>
   </data>
 </root>

TBF/Resources/Strings.sk.resx

@@ -117,51 +117,33 @@
   <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>Chyba</value>
-  </data>
-  <data name="Sensor" xml:space="preserve">
-    <value>Senzor</value>
+  <data name="Activity" xml:space="preserve">
+    <value>Činnosť</value>
   </data>
   <data name="CancelBtnText" xml:space="preserve">
     <value>Zrušiť</value>
   </data>
-  <data name="OkBtnText" xml:space="preserve">
-    <value>Áno</value>
-  </data>
-  <data name="Exit" xml:space="preserve">
-    <value>Ukončiť</value>
+  <data name="Compound" xml:space="preserve">
+    <value>Združený</value>
   </data>
   <data name="Compound_meters" xml:space="preserve">
     <value>Združené vodomery</value>
   </data>
-  <data name="Activity" xml:space="preserve">
-    <value>Činnosť</value>
-  </data>
-  <data name="Compound" xml:space="preserve">
-    <value>Združený</value>
-  </data>
-  <data name="Serial_number" xml:space="preserve">
-    <value>Sériové číslo</value>
-  </data>
-  <data name="Project_number" xml:space="preserve">
-    <value>Číslo projektu</value>
+  <data name="Error" xml:space="preserve">
+    <value>Chyba</value>
   </data>
   <data name="Language" xml:space="preserve">
     <value>Jazyk</value>
   </data>
-  <data name="Paths" xml:space="preserve">
-    <value>Cesty</value>
-  </data>
-  <data name="Meter" xml:space="preserve">
-    <value>Merač</value>
-  </data>
-  <data name="RFID_communication_failed" xml:space="preserve">
-    <value>Zlyhala RFID komunikácia</value>
+  <data name="OkBtnText" xml:space="preserve">
+    <value>Áno</value>
   </data>
   <data name="Head_was_disabled_by_the_user" xml:space="preserve">
     <value>Hlavica bola vypnutá používateľom</value>
   </data>
+  <data name="RFID_communication_failed" xml:space="preserve">
+    <value>Zlyhala RFID komunikácia</value>
+  </data>
   <data name="Level" xml:space="preserve">
     <value>Hladina</value>
   </data>
@@ -174,9 +156,15 @@
   <data name="Side" xml:space="preserve">
     <value>Strana</value>
   </data>
+  <data name="Meter" xml:space="preserve">
+    <value>Merač</value>
+  </data>
   <data name="Result" xml:space="preserve">
     <value>Výsledok</value>
   </data>
+  <data name="Sensor" xml:space="preserve">
+    <value>Senzor</value>
+  </data>
   <data name="Mute_alarm" xml:space="preserve">
     <value>Stlmiť sirénu</value>
   </data>
@@ -229,6 +217,9 @@
   <data name="Production_order_and_serial_numbers" xml:space="preserve">
     <value>Výrobná zákazka a sériové čísla</value>
   </data>
+  <data name="Serial_number" xml:space="preserve">
+    <value>Sériové číslo</value>
+  </data>
   <data name="Serial_numbers" xml:space="preserve">
     <value>Sériové čísla</value>
   </data>
@@ -244,22 +235,19 @@
   <data name="Do_you_really_want_to_delete_all_codes_Q" xml:space="preserve">
     <value>Naozaj chcete vymazať všetky kódy ?</value>
   </data>
+  <data name="Exit" xml:space="preserve">
+    <value>Ukončiť</value>
+  </data>
+  <data name="Paths" xml:space="preserve">
+    <value>Cesty</value>
+  </data>
+  <data name="Project_number" xml:space="preserve">
+    <value>Číslo projektu</value>
+  </data>
   <data name="ShowDialog" xml:space="preserve">
     <value>Zobraz dialóg</value>
   </data>
   <data name="SaveCommunication" xml:space="preserve">
     <value>Ulož komunikáciu</value>
   </data>
-  <data name="PulsesPerUnit" xml:space="preserve">
-    <value />
-  </data>
-  <data name="PulsesPerKilogram" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Units" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Test_in_calculation" xml:space="preserve">
-    <value>Prebieha výpočet</value>
-  </data>
 </root>

TBF/Rig/Ambient/Comet/AmbientCfg.cs

@@ -73,11 +73,8 @@ namespace TBF.Rig.Ambient.Comet
         [XmlIgnore]
         public IList<GNode> GNodes { get; set; }
 
-        [XmlIgnore]
-        public bool IsOffline { get; set; }
-
-        /// Private parameterless constructor invoked by all other (public) constructors
-        AmbientCfg()
+		/// Private parameterless constructor invoked by all other (public) constructors
+		AmbientCfg()
 		{
             GNodes = new List<GNode>();
             Format = string.Empty;
@@ -131,15 +128,15 @@ namespace TBF.Rig.Ambient.Comet
             "Stop bits",                /// 4
             "Handshake",                /// 5
             "Set DTR to one",           /// 6
-            "Units of temperature",      /// 7
+            "Unit of temperature",      /// 7
             "Temperature limit Lo",     /// 8
             "Temperature limit Hi",     /// 9
             "Default temperature",      /// 10
-            "Units of pressure",         /// 11
+            "Unit of pressure",         /// 11
             "Pressure limit Lo",        /// 12
             "Pressure limit Hi",        /// 13
             "Default pressure",         /// 14
-            "Units of rel. humidity",    /// 15
+            "Unit of rel. humidity",    /// 15
             "Rel. humidity limit Lo",   /// 16
             "Rel. humidity limit Hi",   /// 17
             "Default retl. humidity",   /// 18

TBF/Rig/Ambient/Greco/AmbientCfg.cs

@@ -72,9 +72,6 @@ namespace TBF.Rig.Ambient.Greco
         [XmlIgnore]
         public IList<GNode> GNodes { get; set; }
 
-        [XmlIgnore]
-        public bool IsOffline { get; set; }
-
         /// Private parameterless constructor invoked by all other (public) constructors
         AmbientCfg()
         {

TBF/Rig/BuiltIn/PumpTandem/Pump.cs

@@ -67,13 +67,11 @@ namespace TBF.Rig.BuiltIn.PumpTandem
                 if (pump1 is BuiltIn.Pump.Pump) { mask1 = (pump1 as BuiltIn.Pump.Pump).Mask; }
                 else if (pump1 is Danfoss.VLT2800.Pump) { mask1 = (pump1 as Danfoss.VLT2800.Pump).Mask; }
                 else if (pump1 is Modbus.PumpFM.DanfossVLT.Pump) { mask1 = (pump1 as Modbus.PumpFM.DanfossVLT.Pump).Mask; }
-                else if (pump1 is Modbus.PumpFM.Grundfoss.Pump) { mask1 = (pump1 as Modbus.PumpFM.Grundfoss.Pump).Mask; }
                 else { mask1 = 0; }
 
                 if (pump2 is BuiltIn.Pump.Pump) { mask2 = (pump2 as BuiltIn.Pump.Pump).Mask; }
                 else if (pump2 is Danfoss.VLT2800.Pump) { mask2 = (pump2 as Danfoss.VLT2800.Pump).Mask; }
                 else if (pump2 is Modbus.PumpFM.DanfossVLT.Pump) { mask2 = (pump2 as Modbus.PumpFM.DanfossVLT.Pump).Mask; }
-                else if (pump2 is Modbus.PumpFM.Grundfoss.Pump) { mask2 = (pump2 as Modbus.PumpFM.Grundfoss.Pump).Mask; }
                 else { mask2 = 0; }
 
                 log.FatalFormat("{0} initialized: {1}", Name, this);
@@ -111,7 +109,6 @@ namespace TBF.Rig.BuiltIn.PumpTandem
 
         public void TurnOff()
         {
-	        log.DebugFormat("{0}.TurnOff()", Name);
 			if ((pumpFm1 != null) && (pumpFm2 != null))
 			{
 				pumpFm1.TurnOff();
@@ -121,7 +118,6 @@ namespace TBF.Rig.BuiltIn.PumpTandem
 			{
 				// TODO
 			}
-			log.DebugFormat("DONE {0}.TurnOff()", Name);
         }
 
 

TBF/Rig/BuiltIn/PumpTandem/PumpCfgCtrl.cs

@@ -44,7 +44,6 @@ namespace TBF.Rig.BuiltIn.PumpTandem
                     if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is BuiltIn.Pump.PumpFactory ||
 						TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Danfoss.VLT2800.PumpFactory ||
                         TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Modbus.PumpFM.DanfossVLT.Factory ||
-                        TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Modbus.PumpFM.Grundfoss.Factory ||
                         TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is BuiltIn.PumpTandem.PumpFactory)
                     {
                         pump1ComboBox.Items.Add(cmpnt.Name);

TBF/Rig/BuiltIn/SetValvesOp.cs

@@ -120,8 +120,7 @@ namespace TBF.Rig.BuiltIn
                     if (valve is PumpTandem.Pump)               point.MasksOpen |= (valve as PumpTandem.Pump).Mask;
                     if (valve is Danfoss.VLT2800.Pump)          point.MasksOpen |= (valve as Danfoss.VLT2800.Pump).Mask;
                     if (valve is Modbus.PumpFM.DanfossVLT.Pump) point.MasksOpen |= (valve as Modbus.PumpFM.DanfossVLT.Pump).Mask;
-                    if (valve is Modbus.PumpFM.Grundfoss.Pump)  point.MasksOpen |= (valve as Modbus.PumpFM.Grundfoss.Pump).Mask;
-                }
+				}
 				point.MasksClose = 0;
                 foreach (var valve in point.VClose)
                 {
@@ -130,8 +129,7 @@ namespace TBF.Rig.BuiltIn
                     if (valve is PumpTandem.Pump)               point.MasksClose |= (valve as PumpTandem.Pump).Mask;
                     if (valve is Danfoss.VLT2800.Pump)          point.MasksClose |= (valve as Danfoss.VLT2800.Pump).Mask;
                     if (valve is Modbus.PumpFM.DanfossVLT.Pump) point.MasksClose |= (valve as Modbus.PumpFM.DanfossVLT.Pump).Mask;
-                    if (valve is Modbus.PumpFM.Grundfoss.Pump)  point.MasksClose |= (valve as Modbus.PumpFM.Grundfoss.Pump).Mask;
-                }
+				}
 				point.TimeSec += timeShift;
 			}
 		}

TBF/Rig/BuiltIn/SwitchPoint.cs

@@ -35,7 +35,6 @@ namespace TBF.Rig.BuiltIn
                 if (vlv is Pump.Pump && ((vlv as Pump.Pump).Mask & changed) == 0) continue;
                 if (vlv is Danfoss.VLT2800.Pump && ((vlv as Danfoss.VLT2800.Pump).Mask & changed) == 0) continue;
                 if (vlv is Modbus.PumpFM.DanfossVLT.Pump && ((vlv as Modbus.PumpFM.DanfossVLT.Pump).Mask & changed) == 0) continue;
-                if (vlv is Modbus.PumpFM.Grundfoss.Pump && ((vlv as Modbus.PumpFM.Grundfoss.Pump).Mask & changed) == 0) continue;
 
                 if ((vlv != null) && (vlv.Delay > max)) max = vlv.Delay;
             }
@@ -46,7 +45,6 @@ namespace TBF.Rig.BuiltIn
                 if (vlv is Pump.Pump && ((vlv as Pump.Pump).Mask & changed) == 0) continue;
                 if (vlv is Danfoss.VLT2800.Pump && ((vlv as Danfoss.VLT2800.Pump).Mask & changed) == 0) continue;
                 if (vlv is Modbus.PumpFM.DanfossVLT.Pump && ((vlv as Modbus.PumpFM.DanfossVLT.Pump).Mask & changed) == 0) continue;
-                if (vlv is Modbus.PumpFM.Grundfoss.Pump && ((vlv as Modbus.PumpFM.Grundfoss.Pump).Mask & changed) == 0) continue;
 
                 if ((vlv != null) && (vlv.Delay > max)) max = vlv.Delay;
             }

TBF/Rig/ControlBoard/Uni/FlyingStartStopTestOp.cs

@@ -2,7 +2,6 @@
 /// Copyright (c) 2021-2023 Sensus Slovensko a.s.
 ///
 using System;
-using Common;
 using log4net;
 using TBF.Rig.Sequences;
 
@@ -12,10 +11,6 @@ namespace TBF.Rig.ControlBoard.Uni
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(FlyingStartStopTestOp));
         public override string ToString() { return string.Format("FlyingStartStopTestOp()"); }
-        
-        private DateTime startTimeForSimulation;
-        private bool simulationTimerStarted = false;
-        
 
 		/// Arguments of the constructor
 		readonly UniCB uniCB;
@@ -128,28 +123,6 @@ namespace TBF.Rig.ControlBoard.Uni
 		{
             log.DebugFormat("Op.Run() opState={0}", opState);
 
-            //Simulation of processing time 25 seconds
-            if (uniCB.DebugLevel == DebugMode.Simulate)
-            {
-                if (opState == OpState.StartingTest)
-                {
-                    startTimeForSimulation = DateTime.Now;
-                    simulationTimerStarted = false;
-                }
-                if (opState == OpState.TestInProgress)
-                {
-                    if (!simulationTimerStarted)
-                    {
-                        startTimeForSimulation = DateTime.Now;
-                        simulationTimerStarted = true;
-                    }
-                    else if (DateTime.Now - startTimeForSimulation > TimeSpan.FromSeconds(25))
-                    {
-                        return Event.TestCompleted;
-                    }
-                }
-            }
-
             switch (opState)
             {
                 case OpState.StartingTest:
@@ -175,8 +148,8 @@ namespace TBF.Rig.ControlBoard.Uni
                     double reqFlowLo = (0.7 * qFrom) + (0.3 * reqFlowAve);  /// Move the lower limit 15% of the range up
                     double reqFlowHi = (0.7 * qTo) + (0.3 * reqFlowAve);    /// Move the upper limit 15% of the range down
                     /// 
-                    uniCB.SetFlow(false, regV.Idx1, flowMeter.NominalFreq * reqFlowLo / flowMeter.NominalFlow,
-                                                    flowMeter.NominalFreq * reqFlowHi / flowMeter.NominalFlow);
+                    uniCB.SetFlow(false, regV.Idx1, 2000.0 * reqFlowLo / flowMeter.NominalFlow,
+                                                    2000.0 * reqFlowHi / flowMeter.NominalFlow);
                     if (readDivTransition)
                     {
                         /// Schedule reading diverter transition data

TBF/Rig/ControlBoard/Uni/StandingStartStopTestOp.cs

@@ -5,7 +5,6 @@ using System;
 using System.Reflection;
 using System.Text;
 using System.Windows.Forms;
-using Common;
 using log4net;
 using TBF.Rig.GenericDevices;
 
@@ -25,9 +24,6 @@ namespace TBF.Rig.ControlBoard.Uni
         readonly TBF.Rig.Uni.Diverter.Diverter diverter;
 		readonly int pulsesCount;               /// Number of reference pulses for a complete test
         readonly bool withDiverter;             /// Test with diverter (and scale)
-                                                
-        private DateTime startTimeForSimulation;
-        private bool simulationTimerStarted = false;
 
         ///
         ///  Internal state of this operation
@@ -187,28 +183,6 @@ namespace TBF.Rig.ControlBoard.Uni
 		{
             log.DebugFormat("Run() opState={0}", opState);
 
-            //Simulation of processing time 25 seconds
-            if (uniCB.DebugLevel == DebugMode.Simulate)
-            {
-                if (opState == OpState.StartingTest)
-                {
-                    startTimeForSimulation = DateTime.Now;
-                    simulationTimerStarted = false;
-                }
-                if (opState == OpState.TestInProgress)
-                {
-                    if (!simulationTimerStarted)
-                    {
-                        startTimeForSimulation = DateTime.Now;
-                        simulationTimerStarted = true;
-                    }
-                    else if (DateTime.Now - startTimeForSimulation > TimeSpan.FromSeconds(25))
-                    {
-                        return Event.TestCompleted;
-                    }
-                }
-            }
-            
             switch (opState)
             {
                 case OpState.StartingTest:

TBF/Rig/ControlBoard/Uni/UniCB.cs

@@ -17,8 +17,7 @@ using TBF.Boxes;
 using TBF.Rig.GenericDevices;
 using TBF.Rig.Sequences;
 using TBF.UiBridge;
-using AppDiagnostic;
-using SharedComponents;
+
 
 namespace TBF.Rig.ControlBoard.Uni
 {
@@ -803,60 +802,12 @@ namespace TBF.Rig.ControlBoard.Uni
         /// </summary>
         public void SetFlow(bool isFromUI, int regVId, double freqLo, double freqHi, int regulationMinStep = 0)
         {
-            LiveLogDiag.Log1("----------------------------------------");
-            LiveLogDiag.Log1(
-                "SetFlow() >> ENTER isFromUI={0} regVId={1} freqLo={2} freqHi={3} regulationMinStep={4} IsUIBlocked={5}",
-                isFromUI, regVId, freqLo, freqHi, regulationMinStep, IsUIBlocked);
+            if (IsUIBlocked && isFromUI) return;
 
-            if (IsUIBlocked && isFromUI)
-            {
-                LiveLogDiag.Log1(
-                    "SetFlow() >> EXIT (UI BLOCKED) isFromUI={0}",
-                    isFromUI);
-                return;
-            }
+            actionQueue.Enqueue(Action.SetFlow(isFromUI, regVId, freqLo, freqHi, Convert.ToInt32(Math.Round(Devices.PidCoef)), 200, regulationMinStep));
+            log.InfoFormat("Enqueue( SetFlow(rv={0}, fLo={1}, fHi={2}, pid={3}) )", regVId, freqLo, freqHi, Convert.ToInt32(Math.Round(Devices.PidCoef)));
 
-            int pid = Convert.ToInt32(Math.Round(Devices.PidCoef));
-            int fixedParam = 200;
-
-            LiveLogDiag.Log1(
-                "SetFlow() >> PREPARE pid={0} fixedParam={1} regulationMinStep={2}",
-                pid, fixedParam, regulationMinStep);
-
-            var action = Action.SetFlow(
-                isFromUI,
-                regVId,
-                freqLo,
-                freqHi,
-                pid,
-                fixedParam,
-                regulationMinStep);
-
-            LiveLogDiag.Log1(
-                "SetFlow() >> ACTION CREATED: rv={0} fLo={1} fHi={2} pid={3} p6={4} minStep={5}",
-                regVId, freqLo, freqHi, pid, fixedParam, regulationMinStep);
-
-            actionQueue.Enqueue(action);
-
-            LiveLogDiag.Log1(
-                "SetFlow() >> ENQUEUED actionQueue.Count={0}",
-                actionQueue.Count);
-
-            log.InfoFormat(
-                "Enqueue( SetFlow(rv={0}, fLo={1}, fHi={2}, pid={3}) )",
-                regVId, freqLo, freqHi, pid);
-
-            int i = 0;
-            foreach (var a in actionQueue)
-            {
-                LiveLogDiag.Log1(
-                    "SetFlow() >> QUEUE[{0}] = {1}",
-                    i++, a);
-                log.DebugFormat("   {0}", a);
-            }
-
-            LiveLogDiag.Log1("SetFlow() >> EXIT");
-            LiveLogDiag.Log1("----------------------------------------");
+            foreach (var a in actionQueue) log.DebugFormat("   {0}", a);
         }
 
         public void StartTest(bool isFromUI, int flowMId, int divId, int divThreshold,
@@ -1029,18 +980,5 @@ namespace TBF.Rig.ControlBoard.Uni
         {
             /// TODO
         }
-
-        /// <summary>
-        /// Logging
-        /// For activation use compilation condition: LIVELOGDIAG_FlowMeter_cs
-        /// </summary>
-        static class LiveLogDiag
-        {
-            [Conditional("LIVELOGDIAG_UniCB_cs")]
-            public static void Log1(string format, params object[] args)
-            {
-                LiveLogCache.Instance.AddLog("UniCB.cs LOG>> " + string.Format(format, args));
-            }
-        }
     }
 }

TBF/Rig/ControlBoard/Uni/UniCBCfg.cs

@@ -66,9 +66,6 @@ namespace TBF.Rig.ControlBoard.Uni
         [XmlIgnore]
         public IList<GEdge> EdgesToSet { get; set; }
 
-        [XmlIgnore]
-        public bool IsOffline { get; set; }
-
         /// Private parameterless constructor invoked by all other (public) constructors
         UniCBCfg()
         {

TBF/Rig/Danfoss/VLT2800/Pump.cs

@@ -332,8 +332,6 @@ namespace TBF.Rig.Danfoss.VLT2800
 				Telegram.UpdateTelegramChecksum(msg);
 			}
 			SendData(msg);
-			
-			log.DebugFormat("DONE {0}.TurnOff()", Name);
 		}
 
 

TBF/Rig/DataEntry/Combined/CycleBeginningForm.cs

@@ -57,9 +57,6 @@ namespace TBF.Rig.DataEntry.Combined
         public CycleBeginningForm(int compoundWaterMetersCount, bool remarksEnabled)
 		{
             InitializeComponent();
-
-            this.Icon = Properties.Resources.TBF_icon;
-
             ControlBox = false;
 
             TextBoxesCount = 3;

TBF/Rig/DataEntry/Combined/CycleEndForm.cs

@@ -33,10 +33,7 @@ namespace TBF.Rig.DataEntry.Combined
         public CycleEndForm()
         {
             InitializeComponent();
-
-            this.Icon = Properties.Resources.TBF_icon;
-
-            ControlBox = false;
+			ControlBox = false;
 
 			MainStateText = new string[TBF.Data.CompoundWMsCount];
 			AuxStateText = new string[TBF.Data.CompoundWMsCount];

TBF/Rig/DataEntry/Combined/TestStartEndForm.cs

@@ -56,10 +56,7 @@ namespace TBF.Rig.DataEntry.Combined
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-
-            this.Icon = Properties.Resources.TBF_icon;
-
-            ControlBox = false;
+			ControlBox = false;
 
 			TextBoxesCount = 3;
 

TBF/Rig/DataEntry/DEItem.cs

@@ -16,7 +16,6 @@ namespace TBF.Rig.DataEntry
         [Description("Load")]               Load,           /// Load from water meters when the form is open, save on OK
         [Description("Load (readonly)")]    LoadReadOnly,   /// Load from water meters when the form is open, prevent changes, do not save
         [Description("Set")]                Set,            /// Set to 'yes' when the form is open
-        [Description("Set by RegReader")]   RegReader,      /// Set to 'yes' when the form is open
         Count,
     }
 

TBF/Rig/DataEntry/HeatMeters12/CycleBeginningForm.cs

@@ -49,10 +49,7 @@ namespace TBF.Rig.DataEntry.HeatMeters12
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-
-            this.Icon = Properties.Resources.TBF_icon;
-
-            ControlBox = false;
+			ControlBox = false;
 			
 			labels = new Label[] { label1,  label2,  label3,  label4,  label5,  label6,
 					               label7,  label8,  label9,  label10, label11, label12 };

TBF/Rig/DataEntry/HeatMeters12/CycleEndForm.cs

@@ -29,10 +29,7 @@ namespace TBF.Rig.DataEntry.HeatMeters12
         public CycleEndForm(int waterMetersCount)
         {
             InitializeComponent();
-
-            this.Icon = Properties.Resources.TBF_icon;
-
-            ControlBox = false;
+			ControlBox = false;
 
 			this.WaterMetersCount = waterMetersCount;
 			EndStateText = new string[WaterMetersCount];

TBF/Rig/DataEntry/HeatMeters12/TestStartEndForm.cs

@@ -61,10 +61,7 @@ namespace TBF.Rig.DataEntry.HeatMeters12
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-
-            this.Icon = Properties.Resources.TBF_icon;
-
-            ControlBox = false;
+			ControlBox = false;
 
 			TextBoxesCount = 12;
 

TBF/Rig/DataEntry/HeatMeters6/CycleBeginningForm.cs

@@ -49,10 +49,7 @@ namespace TBF.Rig.DataEntry.HeatMeters6
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-
-            this.Icon = Properties.Resources.TBF_icon;
-
-            ControlBox = false;
+			ControlBox = false;
 			
 			labels = new Label[] { label1,  label2,  label3,  label4,  label5,  label6 };
 			comboBoxes = new ComboBox[] { comboBox1,  comboBox2,  comboBox3,  comboBox4,  comboBox5,  comboBox6 };

TBF/Rig/DataEntry/HeatMeters6/CycleEndForm.cs

@@ -29,10 +29,7 @@ namespace TBF.Rig.DataEntry.HeatMeters6
         public CycleEndForm(int waterMetersCount)
         {
             InitializeComponent();
-
-            this.Icon = Properties.Resources.TBF_icon;
-
-            ControlBox = false;
+			ControlBox = false;
 
 			this.WaterMetersCount = waterMetersCount;
 			EndStateText = new string[WaterMetersCount];

TBF/Rig/DataEntry/HeatMeters6/TestStartEndForm.cs

@@ -61,10 +61,7 @@ namespace TBF.Rig.DataEntry.HeatMeters6
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-
-            this.Icon = Properties.Resources.TBF_icon;
-
-            ControlBox = false;
+			ControlBox = false;
 
 			TextBoxesCount = 6;
 

TBF/Rig/DataEntry/PoseidonCmd/CycleBeginningForm.cs

@@ -40,10 +40,7 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-
-            this.Icon = Properties.Resources.TBF_icon;
-
-            ControlBox = false;
+			ControlBox = false;
             preselectedOrder = null;
 
 			completed = false;

TBF/Rig/DataEntry/PoseidonCmd/EntryForm.cs

@@ -268,10 +268,16 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
 								{
 									dlg.WMStartState[item] = poseidonReader.BeginWMState;
 									dlg.WMStartStateStr[item] = poseidonReader.BeginWMState.ToString();
+									log.InfoFormat("Poseidon dialog prefill: phase=Start, WM{0}, reader={1}, value={2}",
+										item + 1, poseidonReader.Name, dlg.WMStartState[item]);
 								}
 
 								if (currentOp == CurrentOp.ReadDatastream_EndStates)
+								{
 									dlg.WMEndState[item] = poseidonReader.EndWMState;
+									log.InfoFormat("Poseidon dialog prefill: phase=End, WM{0}, reader={1}, value={2}",
+										item + 1, poseidonReader.Name, dlg.WMEndState[item]);
+								}
 							}
 						}
 
@@ -326,31 +332,10 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
                         }
                     }
 				}
-                else if (modelessDlg is TestStartEndForm && currentOp == CurrentOp.ReadDatastream_StartStates)
+				else if (modelessDlg is TestStartEndForm)
 				{
-                    /// Fixed start test - start
-                    TestStartEndForm dlg = (modelessDlg as TestStartEndForm);
-                    if (dlg != null)
-                    {
-                        for (int i = 0; i < dlg.WaterMetersCount; i++)
-                        {
-                            wmStartState[i] = dlg.WMStartState[i];
-                            wmStartStateStr[i] = dlg.WMStartStateStr[i];
-                        }
-                    }
-                }
-				else if (modelessDlg is TestStartEndForm && currentOp == CurrentOp.ReadDatastream_EndStates)
-				{
-                    /// Fixed start test - end
-                    TestStartEndForm dlg = (modelessDlg as TestStartEndForm);
-                    if (dlg != null)
-                    {
-                        for (int i = 0; i < dlg.WaterMetersCount; i++)
-                        {
-                            wmEndState[i] = dlg.WMEndState[i];
-                        }
-                    }
-                }
+					StoreAcceptedDialogValues((TestStartEndForm)modelessDlg);
+				}
                 resultSaved = true;
 				modelessDlg = null;
 			}
@@ -358,6 +343,36 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
 			return Event.ModelessFormClosed;		/// Form closed
 		}
 
+		/// <summary>
+		/// Copies values confirmed by the Poseidon start/end dialog into the
+		/// data-entry state used later by the result calculation.
+		/// </summary>
+		private void StoreAcceptedDialogValues(TestStartEndForm dlg)
+		{
+			if (dlg == null)
+				return;
+
+			if (currentOp == CurrentOp.ReadDatastream_StartStates)
+			{
+				for (int i = 0; i < dlg.WaterMetersCount; i++)
+				{
+					wmStartState[i] = dlg.WMStartState[i];
+					wmStartStateStr[i] = dlg.WMStartStateStr[i];
+					log.InfoFormat("Poseidon dialog accepted: phase=Start, WM{0}, text='{1}', value={2}",
+						i + 1, wmStartStateStr[i], wmStartState[i]);
+				}
+			}
+			else if (currentOp == CurrentOp.ReadDatastream_EndStates)
+			{
+				for (int i = 0; i < dlg.WaterMetersCount; i++)
+				{
+					wmEndState[i] = dlg.WMEndState[i];
+					log.InfoFormat("Poseidon dialog accepted: phase=End, WM{0}, value={1}",
+						i + 1, wmEndState[i]);
+				}
+			}
+		}
+
 		/// <summary>Stop this operation</summary>
 		public void Stop()
 		{
@@ -433,35 +448,45 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
 			         ||  (currentOp == CurrentOp.ReadDatastream_EndStates))
 			{
 				bool finishedReading = regReaders == null; // we can work only with register readers
+				List<IPoseidonReadOperation> poseidonReaders = new List<IPoseidonReadOperation>();
+				if (regReaders != null)
+				{
+					foreach (var iRegReader in regReaders)
+					{
+						PoseidonReader poseidonReader = iRegReader as PoseidonReader;
+						if (poseidonReader != null)
+						{
+							poseidonReader.SetCliLogging(CliLogging);
+							poseidonReaders.Add(new PoseidonReaderOperation(poseidonReader));
+						}
+					}
+				}
+
+				var phaseRunner = new PoseidonReadPhaseRunner(
+					currentOp == CurrentOp.ReadDatastream_StartStates);
 				while (!finishedReading) //TODO BUMI lock - fuck ?
 				{
-					bool bAllReadersFinished = true;
-					foreach (var iRegReader in regReaders )
+					foreach (IPoseidonReadOperation poseidonReader in poseidonReaders)
 					{
-						if (iRegReader is PoseidonReader)
+						if (poseidonReader.IsNotStarted || poseidonReader.IsFinished)
+							log.DebugFormat("Poseidon read: arming {0} for {1}, previous state finished={2}",
+								currentOp, poseidonReader.Name, poseidonReader.IsFinished);
+					}
+
+					bool bAllReadersFinished = phaseRunner.RunIteration(poseidonReaders);
+					foreach (IPoseidonReadOperation poseidonReader in poseidonReaders)
+					{
+						if (poseidonReader.IsFinished)
 						{
-							PoseidonReader poseidonReader = (iRegReader as PoseidonReader);
-							if(poseidonReader == null)
-								continue;
-							poseidonReader.SetCliLogging(CliLogging);
-							if (!(poseidonReader.CurrentOp == PoseidonReader.CurrentPoseidonOp.ReadDatastream_Done
-							    || poseidonReader.CurrentOp == PoseidonReader.CurrentPoseidonOp.ReadDatastream_Running))
-							{
-								poseidonReader.SetCurrentOp((currentOp == CurrentOp.ReadDatastream_StartStates)?
-									PoseidonReader.CurrentPoseidonOp.ReadDataStream_Start :
-									PoseidonReader.CurrentPoseidonOp.ReadDataStream_End);
-							}
-							/// Send start data stream
-							poseidonReader.Run();
-							if (!(poseidonReader.CurrentOp == PoseidonReader.CurrentPoseidonOp.Done
-							      || poseidonReader.CurrentOp == PoseidonReader.CurrentPoseidonOp.Error))
-							{
-								bAllReadersFinished = false;
-							}
+							if (poseidonReader.HasError)
+								log.ErrorFormat("Poseidon read: {0} completed with Error during {1}", poseidonReader.Name, currentOp);
+							else
+								log.DebugFormat("Poseidon read: {0} completed during {1}", poseidonReader.Name, currentOp);
 						}
 					}
 					if (bAllReadersFinished)
 					{
+						log.DebugFormat("Poseidon read: all readers finished for {0}", currentOp);
 						finishedReading = true;
 					}
 					else

TBF/Rig/DataEntry/PoseidonCmd/TestStartEndForm.cs

@@ -51,10 +51,7 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-
-            this.Icon = Properties.Resources.TBF_icon;
-
-            ControlBox = false;
+			ControlBox = false;
 
 			TextBoxesCount = 48;
 
@@ -147,6 +144,9 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
         
 		private void SetUiBusy(bool busy, long deltaTime = -1)
 		{
+			log.DebugFormat("Poseidon UI: SetUiBusy busy={0}, deltaTime={1}, enabledTextBoxes={2}",
+				busy, deltaTime, enabledTextBoxes.Count);
+
 			// show wait cursor for form and children
 			this.UseWaitCursor = busy;
 
@@ -293,10 +293,15 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
 			// Ensure we are on the UI thread
 			if (InvokeRequired)
 			{
+				log.DebugFormat("Poseidon UI: queue UpdateValues startValue={0}, enableEdit={1}, deltaTime={2}",
+					stratValue, enableEdit, deltaTime);
 				BeginInvoke(new Action(() => UpdateValues(stratValue, enableEdit)));
 				return;
 			}
 
+			log.DebugFormat("Poseidon UI: UpdateValues on UI thread startValue={0}, enableEdit={1}, deltaTime={2}",
+				stratValue, enableEdit, deltaTime);
+
 			for (int i = 0; i < TextBoxesCount; i++)
 			{
 				if (stratValue)
@@ -320,6 +325,7 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
 			if (enableEdit)
 			{
 				SetUiBusy(false, deltaTime);
+				log.Debug("Poseidon UI: values applied and dialog released from Loading...");
 			}
 			// if you also need to enable/disable editing, do it here,
 			// it's now safely on the UI thread.
@@ -348,6 +354,8 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
 						if (endTextBoxes[i].Visible && endTextBoxes[i].Enabled)
 						{
 							WMEndState[i] = Utils.ParseUDouble(endTextBoxes[i].Text);
+							log.InfoFormat("Poseidon dialog OK: phase=End, WM{0}, enteredText='{1}', parsedValue={2}",
+								i + 1, endTextBoxes[i].Text, WMEndState[i]);
 						}
 					}
 				}
@@ -359,6 +367,8 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
 						{
 							WMStartStateStr[i] = startTextBoxes[i].Text;
 							WMStartState[i] = Utils.ParseUDouble(startTextBoxes[i].Text);
+							log.InfoFormat("Poseidon dialog OK: phase=Start, WM{0}, enteredText='{1}', parsedValue={2}",
+								i + 1, startTextBoxes[i].Text, WMStartState[i]);
 						}
 					}
 				}

TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.cs

@@ -133,9 +133,6 @@ namespace TBF.Rig.DataEntry.S620
 		public FormForMechanicalMetersWithTracing()
 		{
 			InitializeComponent();
-
-            this.Icon = Properties.Resources.TBF_icon;
-
             ControlBox = false;
             oriBackColor = BackColor;
             ManageCheckGroupBox(batchesCheckBox, batchesGroupBox);

TBF/Rig/DataEntry/S620/TestStartEndForm.cs

@@ -54,10 +54,7 @@ namespace TBF.Rig.DataEntry.S620
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-
-            this.Icon = Properties.Resources.TBF_icon;
-
-            ControlBox = false;
+			ControlBox = false;
 
 			TextBoxesCount = 48;
 

TBF/Rig/DataEntry/Single/CycleBeginningForm.cs

@@ -37,10 +37,7 @@ namespace TBF.Rig.DataEntry.Single
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-
-            this.Icon = Properties.Resources.TBF_icon;
-
-            ControlBox = false;
+			ControlBox = false;
 
 			textBoxesCount = 24;
 			labels = new Label[]

TBF/Rig/DataEntry/Single/CycleEndForm.cs

@@ -35,10 +35,7 @@ namespace TBF.Rig.DataEntry.Single
         public CycleEndForm()
         {
             InitializeComponent();
-
-            this.Icon = Properties.Resources.TBF_icon;
-
-            ControlBox = false;
+			ControlBox = false;
 
             labels = new Label[]
 				{

TBF/Rig/DataEntry/Single/TestStartEndForm.cs

@@ -58,10 +58,7 @@ namespace TBF.Rig.DataEntry.Single
 		public TestStartEndForm(int waterMetersCount, int lineSize)
 		{
 			InitializeComponent();
-
-            this.Icon = Properties.Resources.TBF_icon;
-
-            ControlBox = false;
+			ControlBox = false;
 
             WaterMetersCount = waterMetersCount;
 

TBF/Rig/DataEntry/Standard12/CycleBeginningForm.cs

@@ -50,10 +50,7 @@ namespace TBF.Rig.DataEntry.Standard12
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-
-            this.Icon = Properties.Resources.TBF_icon;
-
-            ControlBox = false;
+			ControlBox = false;
 			
 			labels = new Label[] { label1,  label2,  label3,  label4,  label5,  label6,
 					               label7,  label8,  label9,  label10, label11, label12 };