Add ShowDialog and SaveCommunication fields to EntryFormCfg, implement related functionalities in PoseidonReader and EntryForm, and improve logging with ScopedLoggerFactory integration.

# Conflicts:
#	TBF/Rig/Sequences/ProcessData.cs
#	TBF/Rig/TestMethods/PMaxTest/PMaxTestSeq.cs

.gitignore

@@ -1,5 +1,3 @@
-AppDiagnostic/bin/
-AppDiagnostic/obj/
 Common/bin/
 Common/obj/
 Config/bin/
@@ -58,8 +56,6 @@ Statistics/bin/
 Statistics/obj/
 TBF/bin/
 TBF/obj/
-TBFTests/bin/
-TBFTests/obj/
 ToFirstMonitor/bin/
 ToFirstMonitor/obj/
 ToSecondMonitor/bin/

AppDiagnostic/AppDiagnostic.csproj

@@ -91,5 +91,11 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SharedComponents\SharedComponents.csproj">
+      <Project>{8f942729-f454-4c99-ba6c-746962065ae3}</Project>
+      <Name>SharedComponents</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

AppDiagnostic/BufferedListView.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

AppDiagnostic/DiagApi.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

AppDiagnostic/LogAdapter.cs

@@ -1,4 +1,4 @@
-
+using SharedComponents;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -83,22 +83,22 @@ namespace AppDiagnostic
                 var selectedIndices = _listView.SelectedIndices.Cast<int>().ToList();
 
                 // Načítanie logov
-                // var logs = LiveLogCache.Instance.GetLogs(0, LiveLogCache.Instance.GetCount())
-                //     .Where(log => string.IsNullOrEmpty(_filterText) ||
-                //                   log.IndexOf(_filterText, StringComparison.OrdinalIgnoreCase) >= 0)
-                //     .ToList();
+                var logs = LiveLogCache.Instance.GetLogs(0, LiveLogCache.Instance.GetCount())
+                    .Where(log => string.IsNullOrEmpty(_filterText) ||
+                                  log.IndexOf(_filterText, StringComparison.OrdinalIgnoreCase) >= 0)
+                    .ToList();
 
                 // Vymazanie existujúcich položiek a pridanie nových
                 _listView.Items.Clear();
 
-                // foreach (var log in logs)
-                // {
-                //     var item = new ListViewItem(log)
-                //     {
-                //         BackColor = _listView.Items.Count % 2 == 0 ? Color.White : Color.FromArgb(240, 240, 240)
-                //     };
-                //     _listView.Items.Add(item);
-                // }
+                foreach (var log in logs)
+                {
+                    var item = new ListViewItem(log)
+                    {
+                        BackColor = _listView.Items.Count % 2 == 0 ? Color.White : Color.FromArgb(240, 240, 240)
+                    };
+                    _listView.Items.Add(item);
+                }
 
                 // Obnovenie označených položiek
                 foreach (var index in selectedIndices)

AppDiagnostic/LogFilter.cs

@@ -1,4 +1,4 @@
-
+using SharedComponents;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -45,32 +45,32 @@ namespace AppDiagnostic
                     _listView.Items.Clear();
 
                     // Načítame všetky logy (ideálne z cache alebo databázy)
-                    //var logs = LiveLogCache.Instance.GetLogs(0, LiveLogCache.Instance.Logs.Count);
+                    var logs = LiveLogCache.Instance.GetLogs(0, LiveLogCache.Instance.Logs.Count);
 
                     // Pridáme len tie logy, ktoré spĺňajú filter
-                    // foreach (var log in logs)
-                    // {
-                    //     if (log.ToLower().Contains(_filterText))  // Kontrola, či log obsahuje filter text
-                    //     {
-                    //         var listViewItem = new ListViewItem(log);
-                    //
-                    //         // Striedanie farieb riadkov
-                    //         if (_listView.Items.Count % 2 == 0) // Párny index => biela
-                    //         {
-                    //             listViewItem.BackColor = Color.White;
-                    //         }
-                    //         else // Nepárny index => svetlá sivá
-                    //         {
-                    //             listViewItem.BackColor = Color.FromArgb(240, 240, 240);  // Veľmi svetlá sivá
-                    //         }
-                    //
-                    //         // Pridanie efektu pre novú položku
-                    //         ApplyNewItemEffect(listViewItem);
-                    //
-                    //         // Pridanie položky do ListView
-                    //         _listView.Items.Add(listViewItem);
-                    //     }
-                    // }
+                    foreach (var log in logs)
+                    {
+                        if (log.ToLower().Contains(_filterText))  // Kontrola, či log obsahuje filter text
+                        {
+                            var listViewItem = new ListViewItem(log);
+
+                            // Striedanie farieb riadkov
+                            if (_listView.Items.Count % 2 == 0) // Párny index => biela
+                            {
+                                listViewItem.BackColor = Color.White;
+                            }
+                            else // Nepárny index => svetlá sivá
+                            {
+                                listViewItem.BackColor = Color.FromArgb(240, 240, 240);  // Veľmi svetlá sivá
+                            }
+
+                            // Pridanie efektu pre novú položku
+                            ApplyNewItemEffect(listViewItem);
+
+                            // Pridanie položky do ListView
+                            _listView.Items.Add(listViewItem);
+                        }
+                    }
                 }
             }
             catch (Exception ex)

AppDiagnostic/MainForm.Designer.cs

@@ -1,4 +1,4 @@
-using System.Windows.Forms;
+using System.Windows.Forms;
 
 namespace AppDiagnostic
 {

AppDiagnostic/MainForm.cs

@@ -1,6 +1,19 @@
-using System;
+using log4net.Config;
+using log4net;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using System.Windows.Forms;
-// Pre File.WriteAllLines a prácu so súbormi
+using log4net.Appender;
+using SharedComponents;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement;
+using System.IO; // Pre File.WriteAllLines a prácu so súbormi
+using System.Linq;
 
 namespace AppDiagnostic
 {
@@ -65,16 +78,16 @@ namespace AppDiagnostic
                 }
 
                 // Získajte nové logy od posledného indexu
-                //var logs = LiveLogCache.Instance.GetLogs(lastDisplayedLogIndex, LiveLogCache.Instance.Logs.Count - lastDisplayedLogIndex);
+                var logs = LiveLogCache.Instance.GetLogs(lastDisplayedLogIndex, LiveLogCache.Instance.Logs.Count - lastDisplayedLogIndex);
 
                 // Pridajte len nové logy
-                // foreach (var log in logs)
-                // {
-                //     memoListView.Items.Add(new ListViewItem(log));
-                // }
+                foreach (var log in logs)
+                {
+                    memoListView.Items.Add(new ListViewItem(log));
+                }
 
                 // Aktualizujte posledný zobrazený index
-                //lastDisplayedLogIndex = LiveLogCache.Instance.Logs.Count;
+                lastDisplayedLogIndex = LiveLogCache.Instance.Logs.Count;
 
                 // Ak je autoScrollEnabled, posuňte sa na posledný záznam
                 if (autoScrollEnabled && memoListView.Items.Count > 0)
@@ -104,7 +117,7 @@ namespace AppDiagnostic
         {
             //LiveLogCache.Instance.AddLog("Nový log z hlavnej aplikácie");
 
-            //LiveLogCache.Instance.ClearLogs();
+            LiveLogCache.Instance.ClearLogs();
             ClearListView();
         }
 
@@ -198,10 +211,10 @@ namespace AppDiagnostic
                     try
                     {
                         // Načítanie všetkých logov z LiveLogCache
-                        //var logs = LiveLogCache.Instance.GetLogs(0, LiveLogCache.Instance.GetCount());
+                        var logs = LiveLogCache.Instance.GetLogs(0, LiveLogCache.Instance.GetCount());
 
                         // Uloženie logov do vybraného súboru
-                        //File.WriteAllLines(saveFileDialog.FileName, logs);
+                        File.WriteAllLines(saveFileDialog.FileName, logs);
 
                         MessageBox.Show("Logs saved successfully.", "Save TBF live logs", MessageBoxButtons.OK, MessageBoxIcon.Information);
                     }
@@ -232,19 +245,19 @@ namespace AppDiagnostic
                     _logAdapter._filterText = string.Empty;
 
                     // Načítanie logov od indexu vybraného riadku
-                    //var logs = LiveLogCache.Instance.GetLogs(selectedIndex, LiveLogCache.Instance.GetCount() - selectedIndex);
+                    var logs = LiveLogCache.Instance.GetLogs(selectedIndex, LiveLogCache.Instance.GetCount() - selectedIndex);
 
                     // Obnovenie ListView s novými údajmi
                     memoListView.BeginUpdate();
                     memoListView.Items.Clear();
-                    // foreach (var log in logs)
-                    // {
-                    //     var item = new ListViewItem(log)
-                    //     {
-                    //         BackColor = memoListView.Items.Count % 2 == 0 ? Color.White : Color.FromArgb(240, 240, 240)
-                    //     };
-                    //     memoListView.Items.Add(item);
-                    // }
+                    foreach (var log in logs)
+                    {
+                        var item = new ListViewItem(log)
+                        {
+                            BackColor = memoListView.Items.Count % 2 == 0 ? Color.White : Color.FromArgb(240, 240, 240)
+                        };
+                        memoListView.Items.Add(item);
+                    }
                     memoListView.EndUpdate();
                 }
             }

AppDiagnostic/MainForm.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 

AppDiagnostic/Program.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;

AppDiagnostic/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

AppDiagnostic/Properties/Resources.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 

AppDiagnostic/Properties/Settings.settings

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>

AppDiagnostic/packages.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="log4net" version="3.0.3" targetFramework="net472" />
 </packages>

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

@@ -310,8 +310,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")) || //...MF
-                   (userName.Equals("marek") && password.Equals("mareciino")) || //...MF
                    (userName.Equals(passwordOfDay) && password.Equals(passwordOfDay));
         }
 

Config/Config.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;HEAT_METERS</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -30,7 +30,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;JUZNA_AFRIKA_NEW; HEAT_METERS</DefineConstants>
+    <DefineConstants>TRACE;JUZNA_AFRIKA_NEW</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>

Config/Data.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 //formulas.cs has been added cause iPerl from master-2 ...MF
 

Config/FluentCommon.cs

@@ -128,11 +128,11 @@ namespace Config
                             case GID.Administrators:
 #if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
                             case GID.TraceabilityManagement:
-#endif
 //#elif LANG_PL
+#endif
                             case GID.MetrologicalAuthority:
                             case GID.WaterMeterAuthority:
-//#endif
+
                                 admin.AddGroup(group);
                                 session.SaveOrUpdate(group);    /// Save this group
                                 break;

Config/Formulas.cs

@@ -1,4 +1,4 @@
-///
+///
 /// Copyright (c) 2013-2018 Sensus Slovensko a.s.
 ///
 using System;

Config/Mappings/OutputPathMap.cs

@@ -17,7 +17,7 @@ namespace Config.Mappings
 			Map(x => x.Qto);
             Map(x => x.Selector);
             Map(x => x.RegValve);
-            Map(x => x.RegulMinStep);
+			Map(x => x.RegulMinStep).Nullable();//older databases may not have this column
             Map(x => x.FlowMeter);
 			Map(x => x.PidCoef);
             Map(x => x.StartValve);

LabelPrinting/Resources/Strings.Designer.cs

@@ -142,11 +142,11 @@ namespace LabelPrinting.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Error_mass.
+        ///   Looks up a localized string similar to Error.
         /// </summary>
         internal static string Error {
             get {
-                return ResourceManager.GetString("Error_mass", resourceCulture);
+                return ResourceManager.GetString("Error", resourceCulture);
             }
         }
         

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] //...MF
         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 VolumeRef       { get; set; }		/// Reference 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 MassRef         { get; set; }		/// Reference mass or energy (CompoundMeterId==5) in [kg] 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; }		/// [%]
-		public virtual double ErrorMass       { get; set; }		/// [%] //...MF
+ 
+		/// Main result
+		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
-		public virtual bool   PassedMass      { get; set; }     /// true = test passed, water meter is OK //...MF
-		public virtual string QuantityUnits   { get; set; }     /// dm3, kg, etc. - this value defined the quantity of meter, its decisive for distinction of pulse types
 #if IPERL
         public virtual int CalibFactor { get; set; }
         public virtual int CalibFactorLNA { get; set; }
@@ -130,36 +124,6 @@ namespace Results.Entities
             }
         }
 
-        //...MF
-        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);
-            }
-        }
-
-        //...MF
-        public virtual string GetQuantityFromUnits()
-        {
-
-            if (QuantityUnits == "kg")
-            {
-                return "Mass";
-            }
-            else if (QuantityUnits == "dm3")
-            {
-                return "Volume";
-            }
-            
-            return "Volume";
-        }
-
         public MeterTestRslt()
         {
 			TestDone = false;
@@ -193,7 +157,6 @@ namespace Results.Entities
 		    PulsesMeter     = src.PulsesMeter;
 		    PulsesMaster    = src.PulsesMaster;
             PulsesPerLiter  = src.PulsesPerLiter;
-            PulsesPerKilogram = src.PulsesPerKilogram;
             VolumeStart     = src.VolumeStart;
             VolumeEnd       = src.VolumeEnd;
             VolumeMeter     = src.VolumeMeter;
@@ -202,13 +165,10 @@ namespace Results.Entities
 		    TimestampEnd    = src.TimestampEnd;
 		    TestTime        = src.TestTime;
 		    Error           = src.Error;
-            ErrorMass       = src.ErrorMass;
             ErrorIndicators = src.ErrorIndicators;
             InfoIndicators  = src.InfoIndicators;
 		    TestDone        = src.TestDone;
             Passed          = src.Passed;
-            PassedMass      = src.PassedMass;
-            QuantityUnits = src.QuantityUnits;
 #if IPERL
             CalibFactor = src.CalibFactor;
             CalibFactorLNA = src.CalibFactorLNA;
@@ -244,7 +204,6 @@ namespace Results.Entities
             writer.Write(PulsesMeter);
             writer.Write(PulsesMaster);
             writer.Write(PulsesPerLiter);
-            writer.Write(PulsesPerKilogram);
             writer.Write(VolumeStart);
             writer.Write(VolumeEnd);
             writer.Write(VolumeMeter);
@@ -253,13 +212,10 @@ namespace Results.Entities
             writer.Write(TimestampEnd);
             writer.Write(TestTime);
             writer.Write(Error);
-            writer.Write(ErrorMass);
             writer.Write(ErrorIndicators);
             writer.Write(InfoIndicators);
             writer.Write(TestDone);
             writer.Write(Passed);
-            writer.Write(PassedMass);
-            writer.Write((QuantityUnits != null) ? QuantityUnits : string.Empty);
 #if IPERL
             writer.Write(CalibFactor);
             writer.Write(CalibFactorLNA);
@@ -292,7 +248,6 @@ namespace Results.Entities
             PulsesMeter = reader.ReadDouble();
             PulsesMaster = reader.ReadDouble();
             PulsesPerLiter = reader.ReadDouble();
-            PulsesPerKilogram = reader.ReadDouble();
             VolumeStart = reader.ReadDouble();
             VolumeEnd = reader.ReadDouble();
             VolumeMeter = reader.ReadDouble();
@@ -301,13 +256,10 @@ namespace Results.Entities
             TimestampEnd = reader.ReadDouble();
             TestTime = reader.ReadDouble();
             Error = reader.ReadDouble();
-            ErrorMass = reader.ReadDouble();
             ErrorIndicators = reader.ReadInt64();
             InfoIndicators = reader.ReadInt64();
             TestDone = reader.ReadBoolean();
             Passed = reader.ReadBoolean();
-            PassedMass = reader.ReadBoolean();
-            QuantityUnits = reader.ReadString();
 #if IPERL
             CalibFactor = reader.ReadInt32();
             CalibFactorLNA = reader.ReadInt32();

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]
@@ -51,10 +49,7 @@ namespace Results.Entities
 		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 ...MF
-		public virtual double   MassCTV             { get; set; }   /// [kg]   Volume conventional true value ...MF
-		public virtual double   MassMaster          { get; set; }   /// [kg]   Volume from the master flow meter ...MF
-		public virtual double   MassErrorMaster     { get; set; }	/// [%]    Error of the master flow meter ...MF
+
         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)
         public virtual float    DivStart50          { get; set; }   /// [s]    Diverter switch time when test starts at level 50 (e.g. 50%) (not mapped to DB)
@@ -298,8 +293,7 @@ namespace Results.Entities
             ConstMasterRaw      = src.ConstMasterRaw;
             ConstMasterCorr     = src.ConstMasterCorr;
             ConstMaster         = src.ConstMaster;
-            MassConstMaster     = src.MassConstMaster;
-            MassStartRaw        = src.MassStartRaw;
+		    MassStartRaw        = src.MassStartRaw;
 		    MassStart           = src.MassStart;
 		    MassEndRaw          = src.MassEndRaw;
 		    MassEnd             = src.MassEnd;
@@ -307,16 +301,12 @@ namespace Results.Entities
 		    DensityLine         = src.DensityLine;
 		    DensityDiv          = src.DensityDiv;
 		    MassOfEvapWater     = src.MassOfEvapWater;
-		    Qdetected           = src.Qdetected;
+		    Qdetected            = src.Qdetected;
 		    Flow                = src.Flow;
 		    VolumeCTV           = src.VolumeCTV;
 		    VolumeMaster        = src.VolumeMaster;
 		    ErrorMaster         = src.ErrorMaster;
-            MassFlow            = src.MassFlow;
-            MassCTV             = src.MassCTV;
-            MassMaster          = src.MassMaster;
-            MassErrorMaster     = src.MassErrorMaster;
-
+            
             DiverterStart = src.DiverterStart;
             DivStart10    = src.DivStart10;
             DivStart50    = src.DivStart50;
@@ -449,43 +439,24 @@ namespace Results.Entities
 
 		public virtual string ToString(int i)
 		{
-            return string.Format(
-                "TestRslt: Part={0} RepetitionNr={1} TestDone={2} Remark={3} StartTime={4} EndTime={5} FlowSetTime={6} TestTime={7} " +
-                "PulsesMaster={8} ConstMaster={9} MassConstMaster={9} MassStartRaw={10} MassStart={11} MassEndRaw={12} MassEnd={13} " +
-                "DensityIn={14} DensityOut={15} DensityDiv={16} MassOfEvapWater={17} FlowMass={18} Flow={19} " +
-                "VolumeCTV={20} VolumeMaster={21} ErrorMaster={22} MassFlow={23} MassCTV={24} MassMaster={25} MassErrorMaster={26} " +
-                "ErrorFlags={27} InfoFlags={28} " +
-                "AmbTempMean={29} AmbTempStart={30} AmbTempEnd={31} AmbTempMin={32} AmbTempMax={33} " +
-                "AmbPressMean={34} AmbPressStart={35} AmbPressEnd={36} AmbPressMin={37} AmbPressMax={38} " +
-                "AmbHumiMean={39} AmbHumiStart={40} AmbHumiEnd={41} AmbHumiMin={42} AmbHumiMax={43} " +
-                "PressUpMean={44} PressUpStart={45} PressUpEnd={46} PressUpMin={47} PressUpMax={48} " +
-                "PressDownMean={49} PressDownStart={50} PressDownEnd={51} PressDownMin={52} PressDownMax={53} " +
-                "PressDeltaMean={54} PressDeltaStart={55} PressDeltaEnd={56} PressDeltaMin={57} PressDeltaMax={58} " +
-                "TempUpMean={59} TempUpStart={60} TempUpEnd={61} TempUpMin={62} TempUpMax={63} " +
-                "TempDownMean={64} TempDownStart={65} TempDownEnd={66} TempDownMin={67} TempDownMax={68} " +
-                "TempDivMean={69} TempDivStart={70} TempDivEnd={71} TempDivMin={72} TempDivMax={73} " +
-                "FlowMean={74} FlowStart={75} FlowEnd={76} FlowMin={77} FlowMax={78} " +
-                "Custom1={79} Custom2={80} Custom3={81} Custom4={82} Custom5={83} Custom6={84} Custom7={85} Custom8={86} Custom9={87} Custom10={88} " +
-                "DiverterStart={89} DiverterEnd={90} TestMeasured={91} TestCollected={92}",
-                Part, RepetitionNr, TestDone, Remark, StartTime, EndTime, FlowSetTime, TestTime,
-                PulsesMaster, ConstMaster, MassConstMaster, MassStartRaw, MassStart, MassEndRaw, MassEnd,
-                DensityIn, DensityLine, DensityDiv, MassOfEvapWater, Qdetected, Flow,
-                VolumeCTV, VolumeMaster, ErrorMaster, MassFlow,
-                MassCTV, MassMaster, MassErrorMaster, ErrorFlags, InfoFlags,
-                AmbTempMean, AmbTempStart, AmbTempEnd, AmbTempMin, AmbTempMax,
-                AmbPressMean, AmbPressStart, AmbPressEnd, AmbPressMin, AmbPressMax,
-                AmbHumiMean, AmbHumiStart, AmbHumiEnd, AmbHumiMin, AmbHumiMax,
-                PressUpMean, PressUpStart, PressUpEnd, PressUpMin, PressUpMax,
-                PressDownMean, PressDownStart, PressDownEnd, PressDownMin, PressDownMax,
-                PressDeltaMean, PressDeltaStart, PressDeltaEnd, PressDeltaMin, PressDeltaMax,
-                TempUpMean, TempUpStart, TempUpEnd, TempUpMin, TempUpMax,
-                TempDownMean, TempDownStart, TempDownEnd, TempDownMin, TempDownMax,
-                TempDivMean, TempDivStart, TempDivEnd, TempDivMin, TempDivMax,
-                FlowMean, FlowStart, FlowEnd, FlowMin, FlowMax,
-                Custom1, Custom2, Custom3, Custom4, Custom5, Custom6, Custom7, Custom8, Custom9, Custom10,
-                DiverterStart, DiverterEnd, TestMeasured, TestCollected
-            );
-        }
+            return string.Format("TestRslt: Part={0} RepetitionNr={1} TestDone={2} Remark={3} StartTime={4} EndTime={5} FlowSetTime={6} TestTime={7} PulsesMaster={8} ConstMaster={9} MassStartRaw={10} MassStart={11} MassEndRaw={12} MassEnd={13} DensityIn={14} DensityOut={15} DensityDiv={16} MassOfEvapWaater={17} FlowMass={18} FlowVolume={19} VolumeCTV={20} VolumeMaster={21} ErrorMaster={22} DiverterStart={85} DiverterEnd={86} ErrorFlags={23} InfoFlags={24} AmbTempMean={25} AmbTempStart={26} AmbTempEnd={27} AmbTempMin={28} AmbTempMax={29} AmbPressMean={30} AmbPressStart={31} AmbPressEnd={32} AmbPressMin={33}  AmbPressMax={34} AmbHumiMean={35} AmbHumiStart={36} AmbHumiEnd={37} AmbHumiMin={38} AmbHumiMax={39} PressUpMean={40} PressUpStart={41} PressUpEnd={42} PressUpMin={43} PressUpMax={44} PressDownMean={45} PressDownStart={46} PressDownEnd={47} PressDownMin={48} PressDownMax={49} PressDeltaMean={50} PressDeltaStart={51} PressDeltaEnd={52} PressDeltaMin={53} PressDeltaMax={54} TempUpMean={55} TempUpStart={56} TempUpEnd={57} TempUpMin={58} TempUpMax={59} TempDownMean={60} TempDownStart={61} TempDownEnd={62} TempDownMin={63} TempDownMax={64} TempDivMean={65} TempDivStart={66} TempDivEnd={67} TempDivMin={68} TempDivMax={69} FlowMean={70} FlowStart={71} FlowEnd={72} FlowMin={73} FlowMax={74} Custom1={75} Custom2={76} Custom3={77} Custom4={78} Custom5={79} Custom6={80} Custom7={81} Custom8={82} Custom9={83} Custom10={84} TestMeasured={85} TestCollected={86}", 
+								Part, RepetitionNr, TestDone, Remark, StartTime, EndTime, FlowSetTime, TestTime,
+								PulsesMaster, ConstMaster, MassStartRaw, MassStart, MassEndRaw, MassEnd,
+								DensityIn, DensityLine, DensityDiv, MassOfEvapWater, Qdetected, Flow,
+								VolumeCTV, VolumeMaster, ErrorMaster, ErrorFlags, InfoFlags, 
+								AmbTempMean, AmbTempStart, AmbTempEnd, AmbTempMin, AmbTempMax,
+								AmbPressMean, AmbPressStart, AmbPressEnd, AmbPressMin, AmbPressMax,
+								AmbHumiMean, AmbHumiStart, AmbHumiEnd, AmbHumiMin, AmbHumiMax,
+								PressUpMean, PressUpStart, PressUpEnd, PressUpMin, PressUpMax,
+								PressDownMean, PressDownStart, PressDownEnd, PressDownMin, PressDownMax,
+								PressDeltaMean, PressDeltaStart, PressDeltaEnd, PressDeltaMin, PressDeltaMax,
+								TempUpMean, TempUpStart, TempUpEnd, TempUpMin, TempUpMax,
+								TempDownMean, TempDownStart, TempDownEnd, TempDownMin, TempDownMax,
+								TempDivMean, TempDivStart, TempDivEnd, TempDivMin, TempDivMax,
+								FlowMean, FlowStart, FlowEnd, FlowMin, FlowMax,
+								Custom1, Custom2, Custom3, Custom4, Custom5, Custom6, Custom7, Custom8, Custom9, Custom10,
+                                DiverterStart, DiverterEnd, TestMeasured, TestCollected);
+		}
 
 
         public virtual void WriteBinary(BinaryWriter writer, IList<TestData> savedTestDatas)
@@ -532,7 +503,6 @@ namespace Results.Entities
             writer.Write(ConstMasterRaw);
             writer.Write(ConstMasterCorr);
             writer.Write(ConstMaster);
-            writer.Write(MassConstMaster);
             writer.Write(MassStartRaw);
             writer.Write(MassStart);
             writer.Write(MassEndRaw);
@@ -546,10 +516,6 @@ namespace Results.Entities
             writer.Write(VolumeCTV);
             writer.Write(VolumeMaster);
             writer.Write(ErrorMaster);
-            writer.Write(MassFlow);
-            writer.Write(MassCTV);
-            writer.Write(MassMaster);
-            writer.Write(MassErrorMaster);
             writer.Write(DiverterStart);
             writer.Write(DivStart10);
             writer.Write(DivStart50);
@@ -680,7 +646,6 @@ namespace Results.Entities
             ConstMasterRaw = reader.ReadDouble();
             ConstMasterCorr = reader.ReadDouble();
             ConstMaster = reader.ReadDouble();
-            MassConstMaster = reader.ReadDouble();
             MassStartRaw = reader.ReadDouble();
             MassStart = reader.ReadDouble();
             MassEndRaw = reader.ReadDouble();
@@ -694,10 +659,6 @@ namespace Results.Entities
             VolumeCTV = reader.ReadDouble();
             VolumeMaster = reader.ReadDouble();
             ErrorMaster = reader.ReadDouble();
-            MassFlow = reader.ReadDouble();
-            MassCTV = reader.ReadDouble();
-            MassMaster = reader.ReadDouble();
-            MassErrorMaster = reader.ReadDouble();
             DiverterStart = reader.ReadSingle();
             DivStart10 = reader.ReadSingle();
             DivStart50 = reader.ReadSingle();

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/ItemID.cs

@@ -37,9 +37,7 @@ namespace Results
         Ambient_pressure,               /// 27
         Ambient_humidity,               /// 28
         Volume,                         /// 29
-        Quantity,                       /// 29
         Reference_volume,               /// 30
-        Reference_quantity,             /// 30
         Error,                          /// 31
         Passed,                         /// 32
         Watermeter_type,                /// 33
@@ -71,7 +69,6 @@ namespace Results
         End_state,                      /// 59
         Pulses,                         /// 60
         Pulse__liter,                   /// 61  Water meter constant (pulses per liter) specific for one test
-        Pulse__kilogram,                /// 61  Water meter constant (pulses per liter) specific for one test //...MF
         Reference_pulses_ni,            /// 62  Reference pulses gated for specific meter (synchro method)
         Reference_energy,				/// 63
         Bench_ID,                       /// 64  Test bench ID (int) obtained from a component implementing IBenchInfo
@@ -84,7 +81,6 @@ namespace Results
         Batch_start_time,               /// 71
         Batch_end_time,                 /// 72
         Lite_per_pulse_Read,            /// 73
-        Unit_per_pulse_Read,            /// 73
         Result_code,                    /// 74
         Remark,                         /// 75
         T_Hi_mean,                      /// 76
@@ -102,11 +98,9 @@ namespace Results
         Volume_main,					/// 88
         Volume_aux,					    /// 89
         Start_volume,					/// 90
-        Start_quantity,					/// 90
         Start_volume_main,				/// 91
         Start_volume_aux,				/// 92
         End_volume,				        /// 93
-        End_quantity,				    /// 93
         End_volume_main,				/// 94
         End_volume_aux,				    /// 95   
         Error_main,						/// 96
@@ -356,19 +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
-
-        RR_Quantity,                    ///  0
-        RR_Units,                       ///  0
-        MassFlow,                       /// 15 Calculated flow (use ConstMasterRaw/ConstMaster to calculate uncorrected flow of the reference flow meter) ...MF
-        Error_mass,                     /// 31 ...MF
-        Passed_mass,                    /// 32 ...MF
-        Meter_mass,                     /// 29 ...MF
-        Reference_mass,                 /// 30 ...MF
-        TestPassed_mass,			    /// 125 ...MF
-        //Pulses_per_kilogram,          /// 49  Water meter constant (water meter data, not used in calculations) //...MF
-        Pulses_per_unit,                /// 49  Water meter constant (water meter data, not used in calculations) //...MF
-        MassCTV,						/// 229 ...MF
-
+        
         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

@@ -32,8 +32,7 @@ namespace Results.Mappings
 			Map(x => x.ConstMasterRaw);
             Map(x => x.ConstMasterCorr);
             Map(x => x.ConstMaster);
-            Map(x => x.MassConstMaster);
-            Map(x => x.MassStartRaw);
+			Map(x => x.MassStartRaw);
 			Map(x => x.MassStart);
 			Map(x => x.MassEndRaw);
 			Map(x => x.MassEnd);
@@ -46,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/Mappings/WaterMeterDataMap.cs

@@ -36,7 +36,6 @@ namespace Results.Mappings
             Map(x => x.Certificate);
 
             Map(x => x.PulsesPerLtr);
-            Map(x => x.PulsesPerKilogram);
 
             Map(x => x.ProducerAux);
             Map(x => x.Q3_Qn_Aux);

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>
@@ -897,15 +888,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Pulses/kg.
-        /// </summary>
-        internal static string PulsesKilogram {
-            get {
-                return ResourceManager.GetString("PulsesKilogram", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Pulses/l.
         /// </summary>
@@ -915,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>
@@ -1158,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>
@@ -1374,15 +1338,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Relative error of a meter.
-        /// </summary>
-        internal static string Tooltip_E_rel_mass {
-            get {
-                return ResourceManager.GetString("Tooltip_E_rel_mass", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Relative error of the master meter.
         /// </summary>
@@ -1995,15 +1950,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Mass measured by the tested meter.
-        /// </summary>
-        internal static string Tooltip_Vol_Mt_mass {
-            get {
-                return ResourceManager.GetString("Tooltip_Vol_Mt_mass", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Reference volume for tested meter.
         /// </summary>
@@ -2013,15 +1959,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Reference mass for tested meter.
-        /// </summary>
-        internal static string Tooltip_Vol_rm_mass {
-            get {
-                return ResourceManager.GetString("Tooltip_Vol_rm_mass", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Uncertainty.
         /// </summary>
@@ -2166,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,28 +351,4 @@
   <data name="Merge" xml:space="preserve">
     <value>Spojit</value>
   </data>
-  <data name="PulsesKilogram" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_E_rel_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_Mt_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_rm_mass" xml:space="preserve">
-    <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,28 +825,4 @@
   <data name="Selected_items" xml:space="preserve">
     <value>Ausgewählte Objekte</value>
   </data>
-  <data name="PulsesKilogram" xml:space="preserve">
-    <value>Impulse/kg</value>
-  </data>
-  <data name="Tooltip_E_rel_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_Mt_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_rm_mass" xml:space="preserve">
-    <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,28 +804,4 @@
   <data name="Serial_number_is_missing" xml:space="preserve">
     <value>Numérotation en série</value>
   </data>
-  <data name="PulsesKilogram" xml:space="preserve">
-    <value>Impulsion/kilogram</value>
-  </data>
-  <data name="Tooltip_E_rel_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_Mt_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_rm_mass" xml:space="preserve">
-    <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

@@ -220,7 +220,7 @@
     <value>impulsi </value>
   </data>
   <data name="PulsesLiter" xml:space="preserve">
-    <value>impulsi/l</value>
+    <value>impulsi /l</value>
   </data>
   <data name="P_amb" xml:space="preserve">
     <value>P ambiente</value>
@@ -537,28 +537,4 @@
   <data name="Yes" xml:space="preserve">
     <value>Sì</value>
   </data>
-  <data name="PulsesKilogram" xml:space="preserve">
-    <value>impulsi/kg</value>
-  </data>
-  <data name="Tooltip_E_rel_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_Mt_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_rm_mass" xml:space="preserve">
-    <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,28 +441,4 @@
   <data name="Unit" xml:space="preserve">
     <value>Jednostka</value>
   </data>
-  <data name="PulsesKilogram" xml:space="preserve">
-    <value>imp./kilogram</value>
-  </data>
-  <data name="Tooltip_E_rel_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_Mt_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_rm_mass" xml:space="preserve">
-    <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,28 +852,4 @@
   <data name="Merge" xml:space="preserve">
     <value>Merge</value>
   </data>
-  <data name="PulsesKilogram" xml:space="preserve">
-    <value>Pulses/kg</value>
-  </data>
-  <data name="Tooltip_E_rel_mass" xml:space="preserve">
-    <value>Relative error of a meter</value>
-  </data>
-  <data name="Tooltip_Vol_Mt_mass" xml:space="preserve">
-    <value>Mass measured by the tested meter</value>
-  </data>
-  <data name="Tooltip_Vol_rm_mass" xml:space="preserve">
-    <value>Reference mass for tested meter</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,46 +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="PulsesKilogram" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_E_rel_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_Mt_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_rm_mass" xml:space="preserve">
-    <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

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;HEAT_METERS;IPERL</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;IPERL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -29,7 +29,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;IPERL; HEAT_METERS;IPEL</DefineConstants>
+    <DefineConstants>TRACE;IPERL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -239,9 +239,7 @@
     <EmbeddedResource Include="Resources\Strings.de.resx">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\Strings.fr.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Strings.fr.resx" />
     <EmbeddedResource Include="Resources\Strings.it.resx" />
     <EmbeddedResource Include="Resources\Strings.pl.resx">
       <SubType>Designer</SubType>

ResultsBrowser/Forms/NoBenchOrDatabaseDlg.Designer.cs

@@ -101,7 +101,7 @@
 			this.Controls.Add(this.exitButton);
 			this.Name = "NoBenchOrDatabaseDlg";
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-			this.Text = "Error_mass";
+			this.Text = "Error";
 			this.Load += new System.EventHandler(this.NoDatabaseMsgDlg_Load);
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
 			this.ResumeLayout(false);

ResultsBrowser/Resources/Strings1.Designer.cs

@@ -187,16 +187,16 @@ namespace ResultsBrowser.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Error_mass.
+        ///   Looks up a localized string similar to Error.
         /// </summary>
         internal static string Error {
             get {
-                return ResourceManager.GetString("Error_mass", resourceCulture);
+                return ResourceManager.GetString("Error", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Error_mass displaying results.
+        ///   Looks up a localized string similar to Error displaying results.
         /// </summary>
         internal static string Error_displaying_results {
             get {
@@ -205,7 +205,7 @@ namespace ResultsBrowser.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Error_mass exporting results.
+        ///   Looks up a localized string similar to Error exporting results.
         /// </summary>
         internal static string Error_exporting_results {
             get {
@@ -214,7 +214,7 @@ namespace ResultsBrowser.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Error_mass saving file.
+        ///   Looks up a localized string similar to Error saving file.
         /// </summary>
         internal static string Error_saving_file {
             get {
@@ -223,7 +223,7 @@ namespace ResultsBrowser.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Error_mass serializing filters.
+        ///   Looks up a localized string similar to Error serializing filters.
         /// </summary>
         internal static string Error_serializing_filters {
             get {

ResultsBrowser/ResultsBrowser.csproj

@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MANAGED;ORACLE_DB;TURA_IPERL;HEAT_METERS</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;MANAGED;ORACLE_DB;TURA_IPERL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>

SchematicDrawing/DrawingShape.cs

@@ -12,6 +12,7 @@ namespace SchematicDrawing
         public readonly Sz Sz;                  /// see enum SchematicDrawing.Sz
         public readonly int SzX;                /// Size X in SchematicDrawing.Const.Step pixels
         public readonly int SzY;                /// Size Y in SchematicDrawing.Const.Step pixels
+
         public readonly int OffsX;              /// Offset of left/top coordinate of the bitmap when rendering
         public readonly int OffsY;              /// Offset of left/top coordinate of the bitmap when rendering
         public readonly int Wid;                /// Width of the bitmap when rendering, original bitmap is resized to this size
@@ -377,6 +378,40 @@ namespace SchematicDrawing
                                                                   Properties.Resources.Valve_XL_closed,
                                                                   Properties.Resources.Valve_XL_vacuum,
                                                                   Properties.Resources.Valve_XL_open_dry);
+            /// ValveSw
+            Shapes[DrShIx(Shape.ValveSw, Sz.S)] = new DrawingShape(Shape.ValveSw, Sz.S, 2, 2,
+                                                                 new Node[] { new Node(0, 1, Orient.L), new Node(2, 1, Orient.R) },
+                                                                 new Edge[] { new Edge(0, 1, 20, RouteCouple.OpenWhen1), new Edge(1, 0, 20, RouteCouple.OpenWhen1) },
+                                                                 0, 0, 20, 20,
+                                                                 Properties.Resources.ValveSw_S_open,
+                                                                 Properties.Resources.ValveSw_S_closed,
+                                                                 Properties.Resources.ValveSw_S_vacuum,
+                                                                 Properties.Resources.ValveSw_S_open_dry);
+            Shapes[DrShIx(Shape.ValveSw, Sz.M)] = new DrawingShape(Shape.ValveSw, Sz.M, 3, 4,
+                                                                 new Node[] { new Node(0, 2, Orient.L), new Node(3, 2, Orient.R) },
+                                                                 new Edge[] { new Edge(0, 1, 30, RouteCouple.OpenWhen1), new Edge(1, 0, 30, RouteCouple.OpenWhen1) },
+                                                                 0, 5, 30, 30,
+                                                                 Properties.Resources.ValveSw_M_open,
+                                                                 Properties.Resources.ValveSw_M_closed,
+                                                                 Properties.Resources.ValveSw_M_vacuum,
+                                                                 Properties.Resources.ValveSw_M_open_dry);
+            Shapes[DrShIx(Shape.ValveSw, Sz.L)] = new DrawingShape(Shape.ValveSw, Sz.L, 4, 4,
+                                                                 new Node[] { new Node(0, 2, Orient.L), new Node(4, 2, Orient.R) },
+                                                                 new Edge[] { new Edge(0, 1, 40, RouteCouple.OpenWhen1), new Edge(1, 0, 40, RouteCouple.OpenWhen1) },
+                                                                 0, 0, 40, 40,
+                                                                 Properties.Resources.ValveSw_L_open,
+                                                                 Properties.Resources.ValveSw_L_closed,
+                                                                 Properties.Resources.ValveSw_L_vacuum,
+                                                                 Properties.Resources.ValveSw_L_open_dry);
+            Shapes[DrShIx(Shape.ValveSw, Sz.XL)] = new DrawingShape(Shape.ValveSw, Sz.XL, 5, 6,
+                                                                  new Node[] { new Node(0, 3, Orient.L), new Node(5, 3, Orient.R) },
+                                                                  new Edge[] { new Edge(0, 1, 50, RouteCouple.OpenWhen1), new Edge(1, 0, 50, RouteCouple.OpenWhen1) },
+                                                                  0, 5, 50, 50,
+                                                                  Properties.Resources.ValveSw_XL_open,
+                                                                  Properties.Resources.ValveSw_XL_closed,
+                                                                  Properties.Resources.ValveSw_XL_vacuum,
+                                                                  Properties.Resources.ValveSw_XL_open_dry);
+
             /// Diverter
             Shapes[DrShIx(Shape.Div, Sz.S)] = new DrawingShape(Shape.Div, Sz.S, 2, 2,
                                                                new Node[] { new Node(2, 0, Orient.Up), new Node(1, 2, Orient.Dn), new Node(3, 2, Orient.Dn) },
@@ -522,12 +557,18 @@ namespace SchematicDrawing
             Shapes[DrShIx(Shape.Scale, Sz.L)] = new DrawingShape(Shape.Scale, Sz.L, 12, 11, new Node[] { new Node(6, 11, Orient.Dn) }, null, 0, 0, 120, 110, Properties.Resources.Scale_L);
             Shapes[DrShIx(Shape.Scale, Sz.XL)] = new DrawingShape(Shape.Scale, Sz.XL, 16, 13, new Node[] { new Node(8, 13, Orient.Dn) }, null, 0, 0, 160, 130, Properties.Resources.Scale_XL);
 
-            /// Tank
+            /// Tank uni
             Shapes[DrShIx(Shape.Tank, Sz.S)] = new DrawingShape(Shape.Tank, Sz.S, 10, 8, new Node[] { new Node(0, 6, Orient.L) }, null, 0, 0, 100, 80, Properties.Resources.Tank_S);
             Shapes[DrShIx(Shape.Tank, Sz.M)] = new DrawingShape(Shape.Tank, Sz.M, 12, 9, new Node[] { new Node(0, 7, Orient.L) }, null, 0, 0, 120, 90, Properties.Resources.Tank_M);
             Shapes[DrShIx(Shape.Tank, Sz.L)] = new DrawingShape(Shape.Tank, Sz.L, 15, 11, new Node[] { new Node(0, 9, Orient.L) }, null, 0, 0, 150, 110, Properties.Resources.Tank_L);
             Shapes[DrShIx(Shape.Tank, Sz.XL)] = new DrawingShape(Shape.Tank, Sz.XL, 20, 13, new Node[] { new Node(0, 11, Orient.L) }, null, 0, 0, 200, 130, Properties.Resources.Tank_XL);
 
+            /// Tank hot
+            Shapes[DrShIx(Shape.TankHot, Sz.S)] = new DrawingShape(Shape.TankHot, Sz.S, 10, 8, new Node[] { new Node(0, 6, Orient.L) }, null, 0, 0, 100, 80, Properties.Resources.Tank_S_hot);
+            Shapes[DrShIx(Shape.TankHot, Sz.M)] = new DrawingShape(Shape.TankHot, Sz.M, 12, 9, new Node[] { new Node(0, 7, Orient.L) }, null, 0, 0, 120, 90, Properties.Resources.Tank_M_hot);
+            Shapes[DrShIx(Shape.TankHot, Sz.L)] = new DrawingShape(Shape.TankHot, Sz.L, 15, 11, new Node[] { new Node(0, 9, Orient.L) }, null, 0, 0, 150, 110, Properties.Resources.Tank_L_hot);
+            Shapes[DrShIx(Shape.TankHot, Sz.XL)] = new DrawingShape(Shape.TankHot, Sz.XL, 20, 13, new Node[] { new Node(0, 11, Orient.L) }, null, 0, 0, 200, 130, Properties.Resources.Tank_XL_hot);
+
             /// Junction
             Shapes[DrShIx(Shape.Junction, Sz.None)]  = new DrawingShape(Shape.Junction, Sz.None, 0, 0, new Node[] { new Node(0, 0, Orient.R) });
             Shapes[DrShIx(Shape.Junction, Sz.S)] = new DrawingShape(Shape.Junction, Sz.S, 2, 2,

SchematicDrawing/Enums.cs

@@ -45,11 +45,13 @@ namespace SchematicDrawing
         Scale,
         Sink,
         Tank,
+        TankHot,
         Tee,
         TempM,
         UniCB,
         Vacuum,
         Valve,
+        ValveSw,
         WaterM,
         ElectricM,
 

SchematicDrawing/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace SchematicDrawing.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", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -730,6 +730,16 @@ namespace SchematicDrawing.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Tank_L_hot {
+            get {
+                object obj = ResourceManager.GetObject("Tank_L_hot", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -740,6 +750,16 @@ namespace SchematicDrawing.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Tank_M_hot {
+            get {
+                object obj = ResourceManager.GetObject("Tank_M_hot", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -750,6 +770,16 @@ namespace SchematicDrawing.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Tank_S_hot {
+            get {
+                object obj = ResourceManager.GetObject("Tank_S_hot", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -760,6 +790,16 @@ namespace SchematicDrawing.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Tank_XL_hot {
+            get {
+                object obj = ResourceManager.GetObject("Tank_XL_hot", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -970,6 +1010,166 @@ namespace SchematicDrawing.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_L_closed {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_L_closed", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_L_open {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_L_open", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_L_open_dry {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_L_open_dry", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_L_vacuum {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_L_vacuum", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_M_closed {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_M_closed", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_M_open {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_M_open", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_M_open_dry {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_M_open_dry", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_M_vacuum {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_M_vacuum", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_S_closed {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_S_closed", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_S_open {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_S_open", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_S_open_dry {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_S_open_dry", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_S_vacuum {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_S_vacuum", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_XL_closed {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_XL_closed", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_XL_open {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_XL_open", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_XL_open_dry {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_XL_open_dry", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ValveSw_XL_vacuum {
+            get {
+                object obj = ResourceManager.GetObject("ValveSw_XL_vacuum", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

SchematicDrawing/Properties/Resources.resx

@@ -319,6 +319,18 @@
   <data name="Tank_XL" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Pictures\Tank-XL.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+	<data name="Tank_L_hot" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\Tank-L-hot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="Tank_M_hot" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\Tank-M-hot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="Tank_S_hot" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\Tank-S-hot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="Tank_XL_hot" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\Tank-XL-hot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
   <data name="Vacuum_L_dry" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Pictures\Vacuum-L-dry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -373,7 +385,66 @@
   <data name="Valve_XL_vacuum" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Pictures\Valve-XL-vacuum.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="WaterM_L" type="System.Resources.ResXFileRef, System.Windows.Forms">
+
+
+
+
+
+	<data name="ValveSw_L_closed" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-L-closed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_L_open" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-L-open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_L_open_dry" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-L-open-dry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_L_vacuum" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-L-vacuum.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_M_closed" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-M-closed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_M_open" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-M-open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_M_open_dry" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-M-open-dry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_M_vacuum" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-M-vacuum.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_S_closed" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-S-closed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_S_open" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-S-open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_S_open_dry" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-S-open-dry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_S_vacuum" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-S-vacuum.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_XL_closed" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-XL-closed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_XL_open" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-XL-open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_XL_open_dry" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-XL-open-dry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+	<data name="ValveSw_XL_vacuum" type="System.Resources.ResXFileRef, System.Windows.Forms">
+		<value>..\Pictures\ValveSw-XL-vacuum.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+	</data>
+
+
+
+
+
+
+	<data name="WaterM_L" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Pictures\WaterM-L.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="EmergencyStop_XL_off" type="System.Resources.ResXFileRef, System.Windows.Forms">

SchematicDrawing/SchematicDrawing.csproj

@@ -98,6 +98,16 @@
   <ItemGroup>
     <Content Include="Pictures\Clamping-XL-off.png" />
     <Content Include="Pictures\Clamping-XL-on.png" />
+    <Content Include="Pictures\ValveSw-L-open-dry.png" />
+    <Content Include="Pictures\ValveSw-L-vacuum.png" />
+    <Content Include="Pictures\ValveSw-M-open-dry.png" />
+    <Content Include="Pictures\ValveSw-M-vacuum.png" />
+    <Content Include="Pictures\ValveSw-S-open-dry.png" />
+    <Content Include="Pictures\ValveSw-S-vacuum.png" />
+    <Content Include="Pictures\ValveSw-XL-closed.png" />
+    <Content Include="Pictures\ValveSw-XL-open-dry.png" />
+    <Content Include="Pictures\ValveSw-XL-open.png" />
+    <Content Include="Pictures\ValveSw-XL-vacuum.png" />
     <None Include="Pictures\Cover-XL-off.png" />
     <None Include="Pictures\Cover-XL-on.png" />
     <Content Include="Pictures\Div-L-sink-dry.png" />
@@ -118,6 +128,10 @@
     <Content Include="Pictures\Div-XL-tank-wet.png" />
     <Content Include="Pictures\EmergencyStop-XL-off.png" />
     <Content Include="Pictures\EmergencyStop-XL-on.png" />
+    <Content Include="Pictures\Tank-L-hot.png" />
+    <Content Include="Pictures\Tank-M-hot.png" />
+    <Content Include="Pictures\Tank-S-hot.png" />
+    <Content Include="Pictures\Tank-XL-hot.png" />
     <Content Include="Pictures\UniCB-M-error.png" />
     <Content Include="Pictures\UniCB-M-off.png" />
     <Content Include="Pictures\UniCB-M-on.png" />
@@ -187,6 +201,12 @@
     <Content Include="Pictures\Valve-XL-closed.png" />
     <Content Include="Pictures\Valve-XL-open-dry.png" />
     <Content Include="Pictures\Valve-XL-open.png" />
+    <None Include="Pictures\ValveSw-L-closed.png" />
+    <None Include="Pictures\ValveSw-L-open.png" />
+    <None Include="Pictures\ValveSw-M-closed.png" />
+    <None Include="Pictures\ValveSw-M-open.png" />
+    <None Include="Pictures\ValveSw-S-closed.png" />
+    <None Include="Pictures\ValveSw-S-open.png" />
     <None Include="Pictures\WaterM-L.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

SchematicDrawing/SchematicDrawingCtrl.cs

@@ -365,7 +365,7 @@ namespace SchematicDrawing
                     {
                         GNode gnode = new GNode(item, nid);
                         item.GNodes.Add(gnode);
-                        graph.AddNode(gnode, dshape.Shape == Shape.Tank, dshape.Shape == Shape.Scale);
+                        graph.AddNode(gnode, dshape.Shape == Shape.Tank || dshape.Shape == Shape.TankHot, dshape.Shape == Shape.Scale);
                     }
 
                     foreach (var edge in dshape.Edges)
@@ -969,20 +969,20 @@ namespace SchematicDrawing
                 {
                     switch (item.Orient)
                     {
-                        case Orient.R: e.Graphics.DrawImage(dsh.ImgRightFlipped, rect.X, rect.Y); break;
-                        case Orient.Up: e.Graphics.DrawImage(dsh.ImgUpFlipped, rect.X, rect.Y); break;
-                        case Orient.L: e.Graphics.DrawImage(dsh.ImgLeftFlipped, rect.X, rect.Y); break;
-                        case Orient.Dn: e.Graphics.DrawImage(dsh.ImgDownFlipped, rect.X, rect.Y); break;
+                        case Orient.R:  e.Graphics.DrawImage(dsh.ImgRightFlipped, rect.X, rect.Y); break;
+                        case Orient.Up: e.Graphics.DrawImage(dsh.ImgUpFlipped,    rect.X, rect.Y); break;
+                        case Orient.L:  e.Graphics.DrawImage(dsh.ImgLeftFlipped,  rect.X, rect.Y); break;
+                        case Orient.Dn: e.Graphics.DrawImage(dsh.ImgDownFlipped,  rect.X, rect.Y); break;
                     }
                 }
                 else
                 {
                     switch (item.Orient)
                     {
-                        case Orient.R: e.Graphics.DrawImage(dsh.ImgRight, rect.X, rect.Y); break;
-                        case Orient.Up: e.Graphics.DrawImage(dsh.ImgUp, rect.X, rect.Y); break;
-                        case Orient.L: e.Graphics.DrawImage(dsh.ImgLeft, rect.X, rect.Y); break;
-                        case Orient.Dn: e.Graphics.DrawImage(dsh.ImgDown, rect.X, rect.Y); break;
+                        case Orient.R:  e.Graphics.DrawImage(dsh.ImgRight, rect.X, rect.Y); break;
+                        case Orient.Up: e.Graphics.DrawImage(dsh.ImgUp,    rect.X, rect.Y); break;
+                        case Orient.L:  e.Graphics.DrawImage(dsh.ImgLeft,  rect.X, rect.Y); break;
+                        case Orient.Dn: e.Graphics.DrawImage(dsh.ImgDown,  rect.X, rect.Y); break;
                     }
                 }
             }
@@ -996,7 +996,7 @@ namespace SchematicDrawing
             return rect;
         }
 
-
+        
         /// <summary>
         /// Searches for an elemend out of 'elements' in the displayed schematic drawing.
         /// </summary>

SharedComponents/LiveLogCache.cs

@@ -1,4 +1,4 @@
-using System.IO.MemoryMappedFiles;
+using System.IO.MemoryMappedFiles;
 using System.Text;
 
 namespace SharedComponents

SharedComponents/SharedComponents.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>

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/Debug/net472/SharedComponents.GlobalUsings.g.cs

@@ -0,0 +1,7 @@
+// <auto-generated/>
+global using global::System;
+global using global::System.Collections.Generic;
+global using global::System.IO;
+global using global::System.Linq;
+global using global::System.Threading;
+global using global::System.Threading.Tasks;

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

@@ -0,0 +1,15 @@
+<?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\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\micha\.nuget\packages\" />
+  </ItemGroup>
+</Project>

SharedComponents/obj/SharedComponents.csproj.nuget.g.targets

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />

SharedComponents/obj/project.assets.json

@@ -1,63 +0,0 @@
-{
-  "version": 3,
-  "targets": {
-    ".NETFramework,Version=v4.7.2": {}
-  },
-  "libraries": {},
-  "projectFileDependencyGroups": {
-    ".NETFramework,Version=v4.7.2": []
-  },
-  "packageFolders": {
-    "C:\\Users\\MFRNIAK\\.nuget\\packages\\": {},
-    "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
-  },
-  "project": {
-    "version": "1.0.0",
-    "restore": {
-      "projectUniqueName": "C:\\Projects\\master3-Morrisville15-5-2025-HmotnostneMeradlo-Copy\\tbf - pumpa3 - release\\SharedComponents\\SharedComponents.csproj",
-      "projectName": "SharedComponents",
-      "projectPath": "C:\\Projects\\master3-Morrisville15-5-2025-HmotnostneMeradlo-Copy\\tbf - pumpa3 - release\\SharedComponents\\SharedComponents.csproj",
-      "packagesPath": "C:\\Users\\MFRNIAK\\.nuget\\packages\\",
-      "outputPath": "C:\\Projects\\master3-Morrisville15-5-2025-HmotnostneMeradlo-Copy\\tbf - pumpa3 - release\\SharedComponents\\obj\\",
-      "projectStyle": "PackageReference",
-      "fallbackFolders": [
-        "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
-      ],
-      "configFilePaths": [
-        "C:\\Users\\MFRNIAK\\AppData\\Roaming\\NuGet\\NuGet.Config",
-        "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
-        "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
-      ],
-      "originalTargetFrameworks": [
-        "net472"
-      ],
-      "sources": {
-        "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-        "https://api.nuget.org/v3/index.json": {}
-      },
-      "frameworks": {
-        "net472": {
-          "targetAlias": "net472",
-          "projectReferences": {}
-        }
-      },
-      "warningProperties": {
-        "warnAsError": [
-          "NU1605"
-        ]
-      },
-      "restoreAuditProperties": {
-        "enableAudit": "true",
-        "auditLevel": "low",
-        "auditMode": "direct"
-      },
-      "SdkAnalysisLevel": "9.0.300"
-    },
-    "frameworks": {
-      "net472": {
-        "targetAlias": "net472",
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.301\\RuntimeIdentifierGraph.json"
-      }
-    }
-  }
-}

SharedComponents/obj/project.nuget.cache

@@ -1,8 +0,0 @@
-{
-  "version": 2,
-  "dgSpecHash": "BW0gNWUrWSM=",
-  "success": true,
-  "projectFilePath": "C:\\Projects\\master3-Morrisville15-5-2025-HmotnostneMeradlo-Copy\\tbf - pumpa3 - release\\SharedComponents\\SharedComponents.csproj",
-  "expectedPackageFiles": [],
-  "logs": []
-}

SharedComponents/obj/project.packagespec.json

@@ -1 +0,0 @@
-"restore":{"projectUniqueName":"C:\\Users\\micha\\git\\tbf - pumpa3 - release\\SharedComponents\\SharedComponents.csproj","projectName":"SharedComponents","projectPath":"C:\\Users\\micha\\git\\tbf - pumpa3 - release\\SharedComponents\\SharedComponents.csproj","outputPath":"C:\\Users\\micha\\git\\tbf - pumpa3 - release\\SharedComponents\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net472"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net472":{"targetAlias":"net472","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"}}"frameworks":{"net472":{"targetAlias":"net472","runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\8.0.204\\RuntimeIdentifierGraph.json"}}

SharedDatabase/ItemID.cs

@@ -57,7 +57,6 @@ namespace SharedDatabase
         Approval_info,                  /// 47
         Certificate,                    /// 48
         Pulses_per_liter,               /// 49  Water meter constant (water meter data, not used in calculations)
-        Pulses_per_kilogram,            /// 49  Water meter constant (water meter data, not used in calculations) //...MF
         Text1,                          /// 50
         Text2,                          /// 51
         Text3,                          /// 52

TBF.sln

@@ -111,6 +111,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppDiagnostic", "AppDiagnos
 		{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}"
@@ -489,6 +491,18 @@ Global
 		{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

TBF.sln.DotSettings.user

@@ -1,5 +1,4 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AListViewItem_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F842e321b8a9b41deb8ae4f08b8882c8a5b8998_003Fc4_003F40fa24bf_003FListViewItem_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:Boolean x:Key="/Default/Environment/UnitTesting/CreateUnitTestDialog/ShowAdvancedOptions/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/Environment/UnitTesting/CreateUnitTestDialog/TestProjectMapping/=743DF7DB_002DC7B6_002D42EB_002D986D_002D0F485E5588E4/@EntryIndexedValue">77EB589F-C670-4489-AAD6-2A3C02061FD1</s:String>
 	<s:String x:Key="/Default/Environment/UnitTesting/CreateUnitTestDialog/TestProjectMapping/=8648FD92_002DCDA1_002D4C3A_002DB5F9_002DFE547CE1FA48/@EntryIndexedValue">77EB589F-C670-4489-AAD6-2A3C02061FD1</s:String>

TBF/Boxes/DoubleBox.cs

@@ -76,7 +76,7 @@ namespace TBF.Boxes
 			}
 			else
 			{
-                return string.Format(Format, Val * Factor);
+                return string.Format(string.Format("{{0:{0}}}", Format), Val * Factor);
 			}
         }
 

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("")]
 
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.9.2208.2")]
-[assembly: AssemblyFileVersion("3.9.2008.2")]
+[assembly: AssemblyVersion("3.9.2146.4")]
+[assembly: AssemblyFileVersion("3.9.2146.4")]

TBF/Resources/Strings.Designer.cs

@@ -1,7 +1,6 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -2337,15 +2336,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Flow Meter.
-        /// </summary>
-        internal static string Flow_Meter {
-            get {
-                return ResourceManager.GetString("Flow_Meter", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Flow meter temperature range does not fit this test conditions.
         /// </summary>
@@ -2382,16 +2372,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Object.
-        /// </summary>
-        internal static object Focus {
-            get {
-                object obj = ResourceManager.GetObject("Focus", resourceCulture);
-                return ((object)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Footer.
         /// </summary>
@@ -2986,15 +2966,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Mass and error limit selection.
-        /// </summary>
-        internal static string Mass_and_error_selection {
-            get {
-                return ResourceManager.GetString("Mass_and_error_selection", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Mass diff. [kg]:.
         /// </summary>
@@ -4444,51 +4415,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Pulses quantity.
-        /// </summary>
-        internal static string Pulses_quantity {
-            get {
-                return ResourceManager.GetString("Pulses_quantity", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Quant. amount.
-        /// </summary>
-        internal static string Pulses_quantity_amount {
-            get {
-                return ResourceManager.GetString("Pulses_quantity_amount", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Impulse/kg.
-        /// </summary>
-        internal static string PulsesKilogram {
-            get {
-                return ResourceManager.GetString("PulsesKilogram", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Impulse/l.
-        /// </summary>
-        internal static string PulsesLiter {
-            get {
-                return ResourceManager.GetString("PulsesLiter", resourceCulture);
-            }
-        }
-        
-        /// <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>
@@ -4507,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>
@@ -5236,6 +5153,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Save Communication.
+        /// </summary>
+        internal static string SaveCommunication {
+            get {
+                return ResourceManager.GetString("SaveCommunication", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Saving all results.
         /// </summary>
@@ -5632,6 +5558,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Show Dialog.
+        /// </summary>
+        internal static string ShowDialog {
+            get {
+                return ResourceManager.GetString("ShowDialog", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Shut down computer after exiting Test Bench Framework.
         /// </summary>
@@ -6751,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>
@@ -7003,15 +6929,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Volume/Mass.
-        /// </summary>
-        internal static string VolumeOrMass {
-            get {
-                return ResourceManager.GetString("VolumeOrMass", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Wait please.
         /// </summary>

TBF/Resources/Strings.es.resx

@@ -123,25 +123,7 @@
   <data name="Project_number" xml:space="preserve">
     <value>Número de proyecto</value>
   </data>
-  <data name="PulsesPerKilogram" xml:space="preserve">
-    <value />
-  </data>
-  <data name="PulsesKilogram" xml:space="preserve">
-    <value />
-  </data>
-  <data name="PulsesLiter" xml:space="preserve">
-    <value />
-  </data>
-  <data name="PulsesPerUnit" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Units" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Pulses_quantity" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Pulses_quantity_amount" xml:space="preserve">
-    <value />
+  <data name="ShowDialog" xml:space="preserve">
+    <value>Mostrar diálogo</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>
@@ -549,9 +558,6 @@
   <data name="Volume_and_error_selection" xml:space="preserve">
     <value>Sélection volume et erreurs</value>
   </data>
-  <data name="Mass_and_error_selection" xml:space="preserve">
-    <value>Sélection volume et erreurs</value>
-  </data>
   <data name="Clear_results" xml:space="preserve">
     <value>Effacer les résultats</value>
   </data>
@@ -612,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>
@@ -786,6 +789,9 @@
   <data name="Stopping_flow_for_the_fixed_start" xml:space="preserve">
     <value>Arrêter flux pour fixer départ</value>
   </data>
+  <data name="Water_Meter" xml:space="preserve">
+    <value>Compteur eau</value>
+  </data>
   <data name="Water_Meter_SNs_States" xml:space="preserve">
     <value>Compteurs eau  SNs États</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,58 +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="VolumeOrMass" xml:space="preserve">
-    <value>Volume</value>
+  <data name="Project_number" xml:space="preserve">
+    <value>Numéro de projet</value>
   </data>
-  <data name="Water_Meter" xml:space="preserve">
-    <value>Compteur eau</value>
-  </data>
-  <data name="Flow_Meter" xml:space="preserve">
-    <value>Compteur eau</value>
-  </data>
-  <data name="PulsesPerKilogram" xml:space="preserve">
-    <value />
-  </data>
-  <data name="PulsesKilogram" xml:space="preserve">
-    <value />
-  </data>
-  <data name="PulsesLiter" xml:space="preserve">
-    <value />
-  </data>
-  <data name="PulsesPerUnit" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Units" xml:space="preserve">
-    <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="Pulses_quantity" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Pulses_quantity_amount" xml:space="preserve">
-    <value />
+  <data name="ShowDialog" xml:space="preserve">
+    <value>Afficher la boîte de dialogue</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>
@@ -549,9 +573,6 @@
   <data name="Volume_and_error_selection" xml:space="preserve">
     <value>selezione dei limiti di volume</value>
   </data>
-  <data name="Mass_and_error_selection" xml:space="preserve">
-    <value>selezione dei limiti di volume</value>
-  </data>
   <data name="Clear_results" xml:space="preserve">
     <value>cancellare i risultati</value>
   </data>
@@ -612,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>
@@ -786,6 +804,9 @@
   <data name="Stopping_flow_for_the_fixed_start" xml:space="preserve">
     <value>Arresto del flusso prima del test di avviamento fisso</value>
   </data>
+  <data name="Water_Meter" xml:space="preserve">
+    <value>contatore acqua</value>
+  </data>
   <data name="Water_Meter_SNs_States" xml:space="preserve">
     <value>numerazione dei numeri di serie</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,73 +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="Focus" xml:space="preserve">
-    <value>messa a fuoco</value>
+  <data name="Project_number" xml:space="preserve">
+    <value>Numero del progetto</value>
   </data>
-  <data name="VolumeOrMass" xml:space="preserve">
-    <value>Volume</value>
-  </data>
-  <data name="Water_Meter" xml:space="preserve">
-    <value>contatore acqua</value>
-  </data>
-  <data name="Flow_Meter" xml:space="preserve">
-    <value>contatore acqua</value>
-  </data>
-  <data name="PulsesPerKilogram" xml:space="preserve">
-    <value />
-  </data>
-  <data name="PulsesKilogram" xml:space="preserve">
-    <value />
-  </data>
-  <data name="PulsesLiter" xml:space="preserve">
-    <value />
-  </data>
-  <data name="PulsesPerUnit" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Units" xml:space="preserve">
-    <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="Error_" xml:space="preserve">
-    <value>Errore:</value>
-  </data>
-  <data name="Drain" xml:space="preserve">
-    <value>Drenare</value>
-  </data>
-  <data name="Pulses_quantity" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Pulses_quantity_amount" xml:space="preserve">
-    <value />
+  <data name="ShowDialog" xml:space="preserve">
+    <value>Mostra dialogo</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">
@@ -561,9 +561,6 @@
   <data name="Volume_and_error_selection" xml:space="preserve">
     <value>Volume and error limit selection</value>
   </data>
-  <data name="Mass_and_error_selection" xml:space="preserve">
-    <value>Mass and error limit selection</value>
-  </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="testFailedImage" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>testFailedImage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -808,6 +805,9 @@
   <data name="Stopping_flow_for_the_fixed_start" xml:space="preserve">
     <value>Stopping flow before the fixed start test</value>
   </data>
+  <data name="Water_Meter" xml:space="preserve">
+    <value>Water Meter</value>
+  </data>
   <data name="Water_Meter_SNs_States" xml:space="preserve">
     <value>Water Meter Serial Numbers ans States</value>
   </data>
@@ -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">
@@ -2467,37 +2467,11 @@
   <data name="Voltage" xml:space="preserve">
     <value>Voltage</value>
   </data>
-  <data name="Focus" type="System.Resources.ResXNullRef, System.Windows.Forms">
-    <value />
+  <data name="ShowDialog" xml:space="preserve">
+    <value>Show Dialog</value>
   </data>
-  <data name="VolumeOrMass" xml:space="preserve">
-    <value>Volume/Mass</value>
-  </data>
-  <data name="Water_Meter" xml:space="preserve">
-    <value>Water Meter</value>
-  </data>
-  <data name="Flow_Meter" xml:space="preserve">
-    <value>Flow Meter</value>
-  </data>
-  <data name="PulsesPerKilogram" xml:space="preserve">
-    <value>Pulses per kilogram</value>
-  </data>
-  <data name="PulsesKilogram" xml:space="preserve">
-    <value>Impulse/kg</value>
-  </data>
-  <data name="PulsesLiter" xml:space="preserve">
-    <value>Impulse/l</value>
-  </data>
-  <data name="PulsesPerUnit" xml:space="preserve">
-    <value>Pulses per unit</value>
-  </data>
-  <data name="Units" xml:space="preserve">
-    <value>Units</value>
-  </data>
-  <data name="Pulses_quantity" xml:space="preserve">
-    <value>Pulses quantity</value>
-  </data>
-  <data name="Pulses_quantity_amount" xml:space="preserve">
-    <value>Quant. amount</value>
+  <data name="SaveCommunication" xml:space="preserve">
+    <value>Save Communication</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>
@@ -540,9 +558,6 @@
   <data name="Volume_and_error_selection" xml:space="preserve">
     <value>Объем и предел погрешности</value>
   </data>
-  <data name="Mass_and_error_selection" xml:space="preserve">
-    <value>Объем и предел погрешности</value>
-  </data>
   <data name="Clear_results" xml:space="preserve">
     <value>Очистить результаты</value>
   </data>
@@ -603,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>
@@ -777,6 +789,9 @@
   <data name="Stopping_flow_for_the_fixed_start" xml:space="preserve">
     <value>Остановка расхода перед испытанием с фиксированным стартом</value>
   </data>
+  <data name="Water_Meter" xml:space="preserve">
+    <value>Счетчик воды</value>
+  </data>
   <data name="Water_Meter_SNs_States" 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,84 +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="Focus" xml:space="preserve">
-    <value>Сфокусировать</value>
-  </data>
-  <data name="VolumeOrMass" xml:space="preserve">
-    <value>Объем</value>
-  </data>
-  <data name="Water_Meter" xml:space="preserve">
-    <value>Счетчик воды</value>
-  </data>
-  <data name="Flow_Meter" xml:space="preserve">
-    <value>Счетчик воды</value>
-  </data>
-  <data name="PulsesPerKilogram" xml:space="preserve">
-    <value />
-  </data>
-  <data name="PulsesKilogram" xml:space="preserve">
-    <value />
-  </data>
-  <data name="PulsesLiter" xml:space="preserve">
-    <value />
-  </data>
-  <data name="PulsesPerUnit" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Units" xml:space="preserve">
-    <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>
@@ -1617,25 +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 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="Pulses_quantity" xml:space="preserve">
-    <value />
+  <data name="Test_method2" xml:space="preserve">
+    <value>Метод испытаний 2</value>
   </data>
-  <data name="Pulses_quantity_amount" xml:space="preserve">
-    <value />
+  <data name="Short_dercription" xml:space="preserve">
+    <value>Краткое описание</value>
+  </data>
+  <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,25 +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="PulsesPerKilogram" xml:space="preserve">
-    <value />
+  <data name="Exit" xml:space="preserve">
+    <value>Ukončiť</value>
   </data>
-  <data name="PulsesKilogram" xml:space="preserve">
-    <value />
+  <data name="Paths" xml:space="preserve">
+    <value>Cesty</value>
   </data>
-  <data name="PulsesLiter" xml:space="preserve">
-    <value />
+  <data name="Project_number" xml:space="preserve">
+    <value>Číslo projektu</value>
   </data>
-  <data name="PulsesPerUnit" xml:space="preserve">
-    <value />
+  <data name="ShowDialog" xml:space="preserve">
+    <value>Zobraz dialóg</value>
   </data>
-  <data name="Units" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Pulses_quantity" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Pulses_quantity_amount" xml:space="preserve">
-    <value />
+  <data name="SaveCommunication" xml:space="preserve">
+    <value>Ulož komunikáciu</value>
   </data>
 </root>

TBF/Resources/Strings.zh-CN.Designer.cs

@@ -942,11 +942,11 @@ namespace TBF.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to 错误 Error_mass.
+        ///   Looks up a localized string similar to 错误 Error.
         /// </summary>
         internal static string Error {
             get {
-                return ResourceManager.GetString("Error_mass", resourceCulture);
+                return ResourceManager.GetString("Error", resourceCulture);
             }
         }
         
@@ -3178,7 +3178,7 @@ namespace TBF.Resources {
         /// </summary>
         internal static string Volume {
             get {
-                return ResourceManager.GetString("Meter_volume", resourceCulture);
+                return ResourceManager.GetString("Volume", resourceCulture);
             }
         }
         

TBF/Rig/Ambient/Comet/AmbientCfg.cs

@@ -128,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

@@ -125,15 +125,15 @@ namespace TBF.Rig.Ambient.Greco
             "Data bits",                /// 3
             "Stop bits",                /// 4
             "Handshake",                /// 5
-            "Units of temperature",      /// 6
+            "Unit of temperature",      /// 6
             "Temperature limit Lo",     /// 7
             "Temperature limit Hi",     /// 8
             "Default temperature",      /// 9
-            "Units of pressure",         /// 10
+            "Unit of pressure",         /// 10
             "Pressure limit Lo",        /// 11
             "Pressure limit Hi",        /// 12
             "Default pressure",         /// 13
-            "Units of rel. humidity",    /// 14
+            "Unit of rel. humidity",    /// 14
             "Rel. humidity limit Lo",   /// 15
             "Rel. humidity limit Hi",   /// 16
             "Default retl. humidity",   /// 17

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);

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);