Czech language.

Common/Forms/MessageEventArgs.cs

@@ -1,4 +1,7 @@
-using System;
+///
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
+///
+using System;
 
 namespace Common.Forms
 {

Common/Forms/ModelessForm.cs

@@ -1,4 +1,7 @@
-using System;
+///
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
+///
+using System;
 using System.Drawing;
 using System.Windows.Forms;
 
@@ -53,20 +56,20 @@ namespace Common.Forms
         public event EventHandler<MessageEventArgs> UpdateMessageHandler;
         void OnUpdateMessage(object sender, MessageEventArgs args)
         {
-            if (args.Message != null) label1.Text = args.Message;
+            if (args != null && args.Message != null) label1.Text = args.Message;
         }
 
 
         /// <summary>
         /// Called from the state machine when an operation forces a modeless dialog close.
         /// </summary>
-        public static void CloseForm()
+        public void CloseForm()
         {
             if (CloseFormHandler == null) return;
             try { CloseFormHandler(null, null); }
             catch (Exception) { }
         }
-        static public event EventHandler<EventArgs> CloseFormHandler;
+        public event EventHandler<EventArgs> CloseFormHandler;
         void OnCloseForm(object sender, EventArgs args)
         {
             DialogResult = DialogResult.Cancel;

Config/Mappings/ComponentMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Config.Entities;
@@ -19,7 +19,7 @@ namespace Config.Mappings
 			Map(x => x.LogLevel);
 			Map(x => x.Parameters)
 				.CustomType("StringClob")
-				.CustomSqlType("varchar(8000)");
+				.CustomSqlType("varchar(12000)");
 			HasMany(x => x.Corrections)
 				.OrderBy("Measurement")
 				.Cascade.All();

GenericTest/GenericTestDlg.cs

@@ -65,7 +65,8 @@ namespace GenericTest
         const int ActivityMsgsCount = 7;
         ActivityEventArgs[] activityEvents;         /// Activity messages displayed in the main window
 
-		
+        Common.Forms.ModelessForm modelessForm;
+
         NHibernate.ISession dbSession;              /// MySQL database session
         static OracleConnection oracleConn;         /// Oracle database connection (server is in Stara Tura)
 #if RF_TEST_400_900
@@ -115,7 +116,8 @@ namespace GenericTest
             UpdateTitle();
 
             /// Open a modeless form that is closed after initialization and loading the main window
-            new Thread(() => Application.Run(new Common.Forms.ModelessForm("Loading workflows from a database"))).Start();
+            modelessForm = new Common.Forms.ModelessForm("Loading workflows from a database");
+            new Thread(() => Application.Run(modelessForm)).Start();
 
 
             activityEvents = new ActivityEventArgs[ActivityMsgsCount];
@@ -159,7 +161,7 @@ namespace GenericTest
                 StarSensorReading();
             }
 
-            Common.Forms.ModelessForm.CloseForm();   /// Close the modeless information form
+            if (modelessForm != null) modelessForm.CloseForm();   /// Close the modeless information form
         }
 
         private void startButton_Click(object sender, EventArgs e)

GenericTest/Program.cs

@@ -174,7 +174,7 @@ namespace GenericTest
 			{
                 if (exc is QuitAppException)
                 {
-                    Common.Forms.ModelessForm.CloseForm();
+                    //Common.Forms.ModelessForm.CloseForm();
                     log.FatalFormat(Strings.Program_was_not_started_0, exc.Message);
                     MessageBox.Show(exc.Message,
                                     Strings.Warning,

ProductionTracing/ProductionTracingWnd.cs

@@ -23,6 +23,8 @@ namespace ProductionTracing
     {
         const string OpenFileDlg_SaveFileDlg_Filter = "{0} (*.que)|*.que|{1} (*.*)|*.*";
 
+        ModelessForm modelessForm;
+
         string[] args;
         FiltersConfig filtersConfig;        /// Serializable configuration of filters and displayed results
         QueryResults currentQR;
@@ -190,8 +192,9 @@ namespace ProductionTracing
         private void executeQueryBtn_Click(object sender, EventArgs e)
         {
             UpdateAndSaveHistory();
-            
-            Thread thread = new Thread(() => Application.Run(new Common.Forms.ModelessForm(Strings.searching)));
+
+            modelessForm = new ModelessForm(Strings.searching);
+            Thread thread = new Thread(() => Application.Run(modelessForm));
             thread.CurrentCulture = CultureInfo.CurrentCulture;
             thread.CurrentUICulture = CultureInfo.CurrentUICulture;
             thread.Start();
@@ -220,7 +223,7 @@ namespace ProductionTracing
             catch (Exception exc)
             {
                 if (session != null && session.IsOpen) session.Close();
-                Common.Forms.ModelessForm.CloseForm();
+                if (modelessForm != null) modelessForm.CloseForm();
                 MessageBox.Show(exc.Message,
                                 Strings.Error,
                                 MessageBoxButtons.OK,
@@ -233,7 +236,7 @@ namespace ProductionTracing
             tabControl.TabPages.Add(newTabPage);
             tabControl.SelectTab(newTabPage);
 
-            Common.Forms.ModelessForm.CloseForm();
+            if (modelessForm != null) modelessForm.CloseForm();
         }
 
         /// <summary>

Results/Entities/TestData.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2016-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -18,8 +18,9 @@ namespace Results.Entities
         public virtual string Name					{ get; set; }
 		public virtual int    Repeats				{ get; set; }
         public virtual double Qtg                   { get; set; }	/// [m3/h] flow range low limit
-        public virtual double Qfrom                 { get; set; }	/// [m3/h] flow range low limit
-		public virtual double Qto					{ get; set; }	/// [m3/h] flow range high limit
+        public virtual double Qfrom                 { get; set; }	/// [m3/h] or [%] flow range low limit
+		public virtual double Qto					{ get; set; }	/// [m3/h] or [%] flow range high limit
+        public virtual bool   IsFromToInPct         { get; set; }   /// true: Qfrom and Qto are in % of Qtg, false: Qfrom and Qto are in [m3/h]
 		public virtual double TargetVolume			{ get; set; }	/// [l] target test volume
 		public virtual double TargetTime			{ get; set; }	/// [s] target test time
 		public virtual string Method				{ get; set; }
@@ -48,8 +49,9 @@ namespace Results.Entities
 			Name           = test.Name;
 			Repeats        = test.Repeats;
             Qtg            = test.Qtg;
-            Qfrom          = test.QfromM3ph();
-			Qto            = test.QtoM3ph();
+            Qfrom          = test.Qfrom;
+			Qto            = test.Qto;
+            IsFromToInPct  = test.IsFromToInPct;
 			TargetVolume   = test.Volume;
 			TargetTime     = test.TestTime;
 			Method         = test.Method;
@@ -73,6 +75,7 @@ namespace Results.Entities
             Qtg             = oriTestData.Qtg;
             Qfrom           = oriTestData.Qfrom;
             Qto				= oriTestData.Qto;
+            IsFromToInPct   = oriTestData.IsFromToInPct;
             TargetVolume	= oriTestData.TargetVolume;
             TargetTime		= oriTestData.TargetTime;
             Method			= oriTestData.Method;
@@ -99,6 +102,7 @@ namespace Results.Entities
             if (Qtg != td.Qtg) return false;
             if (Qfrom != td.Qfrom) return false;
 			if (Qto != td.Qto) return false;
+            if (IsFromToInPct != td.IsFromToInPct) return false;
 			if (TargetVolume != td.TargetVolume) return false;
 			if (TargetTime != td.TargetTime) return false;
 			if (Method != td.Method) return false;
@@ -141,6 +145,7 @@ namespace Results.Entities
             writer.Write(Qtg);
             writer.Write(Qfrom);
             writer.Write(Qto);
+            writer.Write(IsFromToInPct);
             writer.Write(TargetVolume);
             writer.Write(TargetTime);
             writer.Write((Method != null) ? Method : string.Empty);
@@ -162,6 +167,7 @@ namespace Results.Entities
             Qtg = reader.ReadDouble();
             Qfrom = reader.ReadDouble();
             Qto = reader.ReadDouble();
+            IsFromToInPct = reader.ReadBoolean();
             TargetVolume = reader.ReadDouble();
             TargetTime = reader.ReadDouble();
             Method = reader.ReadString();

Results/Entities/TestRslt.cs

@@ -3,7 +3,6 @@
 ///
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.IO;
 using Common;
 
@@ -44,7 +43,7 @@ namespace Results.Entities
 		public virtual double   DensityLine         { get; set; }	/// [kg/m3]
 		public virtual double   DensityDiv          { get; set; }	/// [kg/m3]
 		public virtual double   MassOfEvapWater     { get; set; }   /// [kg]
-		public virtual double   SpareDbl            { get; set; }
+		public virtual double   Qdetected           { get; set; }
 		public virtual double   Flow                { get; set; }	/// [m3/h] calculated from conventional true value
 		public virtual double   VolumeCTV           { get; set; }   /// [l]    Volume conventional true value
 		public virtual double   VolumeMaster        { get; set; }   /// [l]    Volume from the master flow meter
@@ -150,9 +149,21 @@ namespace Results.Entities
 		public virtual string Name()		 { return Common.Utils.GetTestName(TestData.Name, TestData.Repeats, RepetitionNr); }
         public virtual string Key()          { return string.Format("{0}~{1}~{2}~{3}", TestData.Name, Part, TestData.Repeats, RepetitionNr); }      /// Unique key
         public virtual int Repeats()         { return TestData.Repeats; }
-		public virtual double Qfrom()		 { return TestData.Qfrom; }
-		public virtual double Qto()			 { return TestData.Qto; }
-		public virtual double TargetVolume() { return TestData.TargetVolume; }
+        public virtual double Qfrom()
+        {
+            return (TestData == null)     ? 0
+                : !TestData.IsFromToInPct ? TestData.Qfrom
+                : (TestData.Qtg >= 0)     ? TestData.Qfrom * TestData.Qtg / 100
+                                          : TestData.Qfrom * Qdetected / 100;
+        }
+        public virtual double Qto()
+        {
+            return (TestData == null)     ? 0
+                : !TestData.IsFromToInPct ? TestData.Qto
+                : (TestData.Qtg >= 0)     ? TestData.Qto * TestData.Qtg / 100
+                                          : TestData.Qto * Qdetected / 100;
+        }
+        public virtual double TargetVolume() { return TestData.TargetVolume; }
 		public virtual double TargetTime()	 { return TestData.TargetTime; }
 		public virtual string Method()		 { return TestData.Method; }
         public virtual string RefFlowmeter() { return (Components != null && Components.Flowmeter != null) ? Components.Flowmeter : string.Empty; }
@@ -161,8 +172,11 @@ namespace Results.Entities
         public virtual string RegValve()     { return (Components != null && Components.RegValve  != null) ? Components.RegValve  : string.Empty; }
         public virtual bool IsRelErrTest()   { return (MethodClass != null) ? (MethodClass.Contains("StandingStart") || MethodClass.Contains("FlyingStart") || MethodClass.Contains("CombinedWithDetection") || MethodClass.Contains("DiverterTest") || MethodClass.Contains("ManualEntry")) : true; }
         public virtual bool IsPMaxTest()     { return (MethodClass != null) ? (MethodClass.Contains("PMaxTest") || MethodClass.Contains("LeakTest") || TestData.Method.ToLower().Contains("pmax")) : true; }
-        public virtual bool IsStartStop() { return (MethodClass != null) ? MethodClass.Contains("StandingStart") : true; }
-        public virtual bool IsDiverter()     { return (MethodClass != null) ? ((MethodClass.Contains("FlyingStart") && MethodClass.Contains("MassColl")) || MethodClass.Contains("DiverterTest")) : true; }
+        public virtual bool IsStartStop()    { return (MethodClass != null) ? MethodClass.Contains("StandingStart") : true; }
+        public virtual bool IsDiverter()     { return (MethodClass != null) ? ((MethodClass.Contains("FlyingStart") && MethodClass.Contains("MassColl")) ||
+                                                                                MethodClass.Contains("CombinedWithDetection") ||
+                                                                                MethodClass.Contains("DiverterTest"))
+                                                                            : true; }
         public virtual bool IsVolumeMethod() { return (MethodClass != null) ? (MethodClass.Contains("TestMethods.StandingStart.") || MethodClass.Contains("TestMethods.FlyingStart.")) : false; }
 
         public virtual string MethodElde()
@@ -171,6 +185,7 @@ namespace Results.Entities
             else if (MethodClass.Contains("TestMethods.FlyingStartMassCollection.")) return "MS";
             else if (MethodClass.Contains("TestMethods.FlyingStartMassCollectionProlonged.")) return "MS";
             else if (MethodClass.Contains("TestMethods.FlyingStartMassCollectionComparative.")) return "MS";
+            else if (MethodClass.Contains("TestMethods.CombinedWithDetection.")) return "MS";
             else if (MethodClass.Contains("TestMethods.FlyingStart.")) return "VS";
             else if (MethodClass.Contains("TestMethods.StandingStartMassCollection.")) return "MP";
             else if (MethodClass.Contains("TestMethods.StandingStartTankCollection.")) return "VP";
@@ -278,7 +293,7 @@ namespace Results.Entities
 		    DensityLine         = src.DensityLine;
 		    DensityDiv          = src.DensityDiv;
 		    MassOfEvapWater     = src.MassOfEvapWater;
-		    SpareDbl            = src.SpareDbl;
+		    Qdetected            = src.Qdetected;
 		    Flow                = src.Flow;
 		    VolumeCTV           = src.VolumeCTV;
 		    VolumeMaster        = src.VolumeMaster;
@@ -416,7 +431,7 @@ namespace Results.Entities
             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}", 
 								Part, RepetitionNr, TestDone, Remark, StartTime, EndTime, FlowSetTime, TestTime,
 								PulsesMaster, ConstMaster, MassStartRaw, MassStart, MassEndRaw, MassEnd,
-								DensityIn, DensityLine, DensityDiv, MassOfEvapWater, SpareDbl, Flow,
+								DensityIn, DensityLine, DensityDiv, MassOfEvapWater, Qdetected, Flow,
 								VolumeCTV, VolumeMaster, ErrorMaster, ErrorFlags, InfoFlags, 
 								AmbTempMean, AmbTempStart, AmbTempEnd, AmbTempMin, AmbTempMax,
 								AmbPressMean, AmbPressStart, AmbPressEnd, AmbPressMin, AmbPressMax,
@@ -485,7 +500,7 @@ namespace Results.Entities
             writer.Write(DensityLine);
             writer.Write(DensityDiv);
             writer.Write(MassOfEvapWater);
-            writer.Write(SpareDbl);
+            writer.Write(Qdetected);
             writer.Write(Flow);
             writer.Write(VolumeCTV);
             writer.Write(VolumeMaster);
@@ -626,7 +641,7 @@ namespace Results.Entities
             DensityLine = reader.ReadDouble();
             DensityDiv = reader.ReadDouble();
             MassOfEvapWater = reader.ReadDouble();
-            SpareDbl = reader.ReadDouble();
+            Qdetected = reader.ReadDouble();
             Flow = reader.ReadDouble();
             VolumeCTV = reader.ReadDouble();
             VolumeMaster = reader.ReadDouble();

Results/Entities/WaterMeter.cs

@@ -109,6 +109,7 @@ namespace Results.Entities
         ///
         public virtual string Workflow          { get; set; }	/// Not mapped to DB !!!    Production tracing workflow name
         public virtual bool   LastRecordIsNok   { get; set; }	/// Not mapped to DB !!!    Previous record verification result
+        public virtual bool   PrintLabel        { get; set; }	/// Not mapped to DB !!!
 
         public virtual WaterMeterData WaterMeterData { get; set; }
 		public virtual Batch Batch { get; set; }
@@ -467,6 +468,7 @@ namespace Results.Entities
 #if IPERL
             FWVersion = string.Empty;
 #endif
+            PrintLabel = true;
         }
 
 
@@ -529,6 +531,7 @@ namespace Results.Entities
 
             Workflow           = src.Workflow;          /// Not mapped to DB
             LastRecordIsNok    = src.LastRecordIsNok;   /// Not mapped to DB
+            PrintLabel         = src.PrintLabel;        /// Not mapped to DB
 
             foreach (var mtr in MeterTestRslts)
             {
@@ -723,6 +726,7 @@ namespace Results.Entities
 
             writer.Write(Workflow);
             writer.Write(LastRecordIsNok);
+            writer.Write(PrintLabel);
 
             /// Save WaterMeterData or WaterMeterData.Id
             if (WaterMeterData != null && savedWMDatas != null && !savedWMDatas.Contains(WaterMeterData))
@@ -823,6 +827,7 @@ namespace Results.Entities
 
             Workflow = reader.ReadString();
             LastRecordIsNok = reader.ReadBoolean();
+            PrintLabel = reader.ReadBoolean();
 
             /// Retrieve TestData
             if (reader.ReadBoolean())

Results/Mappings/TestDataMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Results.Entities;
@@ -15,7 +15,8 @@ namespace Results.Mappings
             Map(x => x.Qtg);
             Map(x => x.Qfrom);
 			Map(x => x.Qto);
-			Map(x => x.TargetVolume);
+            Map(x => x.IsFromToInPct);
+            Map(x => x.TargetVolume);
 			Map(x => x.TargetTime);
 			Map(x => x.Repeats);
 			Map(x => x.Method);

Results/Mappings/TestRsltMap.cs

@@ -40,7 +40,7 @@ namespace Results.Mappings
             Map(x => x.DensityLine);
 			Map(x => x.DensityDiv);
 			Map(x => x.MassOfEvapWater).Column("Buoyancy");
-			Map(x => x.SpareDbl).Column("FlowMass");
+			Map(x => x.Qdetected).Column("FlowMass");
 			Map(x => x.Flow).Column("FlowVolume");
 			Map(x => x.VolumeCTV);
 			Map(x => x.VolumeMaster);

Results/Output/Printers/OnePerBatch/OnePerBatchPrintDocument.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2020 Sensus Slovensko a.s.
+/// Copyright (c) 2020-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -336,9 +336,12 @@ namespace Results.Output.Printers.OnePerBatch
             ///
             /// Page number on each page
             ///
-            string pageNrText = string.Format("{0} {1}/{2}", Strings.Page, pageNr, nrPages);
-            float pageNrWidth = e.Graphics.MeasureString(pageNrText, font).Width;
-            PrintAt(e, pageNrText, font, leftMargin + (printWidth - pageNrWidth) / 2, topMargin + printHeight - spacingOne, 0, 0, Alignment.Left, VertAlignment.Top);
+            if (nrPages != 1)
+            {
+                string pageNrText = string.Format("{0} {1}/{2}", Strings.Page, pageNr, nrPages);
+                float pageNrWidth = e.Graphics.MeasureString(pageNrText, font).Width;
+                PrintAt(e, pageNrText, font, leftMargin + (printWidth - pageNrWidth) / 2, topMargin + printHeight - spacingOne, 0, 0, Alignment.Left, VertAlignment.Top);
+            }
 
             e.HasMorePages = !(pageNr == nrPages);
 

Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2017-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2017-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -313,7 +313,15 @@ namespace Results.Output.Printers.OnePerMeter
             }
 
             SizeF size = table.Measure(e);
-            float tableLeft = (float)leftMargin + ((float)printWidth - size.Width) / 2;
+            float sideMargin = (printWidth - size.Width) / 2;
+            float tableLeft;
+            switch (cfg.Alignment)
+            {
+                case Alignment.Left:    tableLeft = leftMargin; break;
+                default:
+                case Alignment.Center:  tableLeft = leftMargin + sideMargin; break;
+                case Alignment.Right:   tableLeft = leftMargin + 2 * sideMargin; break;
+            }
             belowTop = table.Draw(e, tableLeft, tableTop);
 
             if (pageNr == nrPages)
@@ -365,9 +373,12 @@ namespace Results.Output.Printers.OnePerMeter
             ///
             /// Page number on each page
             ///
-            string pageNrText = string.Format("{0} {1}/{2}", Strings.Page, pageNr, nrPages);
-            float pageNrWidth = e.Graphics.MeasureString(pageNrText, font).Width;
-            PrintAt(e, pageNrText, font, leftMargin + (printWidth - pageNrWidth) / 2, topMargin + printHeight - spacingOne, 0, 0, Alignment.Left, VertAlignment.Top);
+            if (nrPages != 1)
+            {
+                string pageNrText = string.Format("{0} {1}/{2}", Strings.Page, pageNr, nrPages);
+                float pageNrWidth = e.Graphics.MeasureString(pageNrText, font).Width;
+                PrintAt(e, pageNrText, font, leftMargin + (printWidth - pageNrWidth) / 2, topMargin + printHeight - spacingOne, 0, 0, Alignment.Left, VertAlignment.Top);
+            }
 
             e.HasMorePages = !(pageNr == nrPages);
 

Results/Output/Printers/OnePerMeter/OnePerMeterPrinterCfg.cs

@@ -34,6 +34,7 @@ namespace Results.Output.Printers.OnePerMeter
         public string[] CommonItems2;
         public string[] CommonItems3;
         public Common.TableForm Form;
+        public Common.Alignment Alignment;
         public string[] TestItems;
         public string[] TestItems2;
         public int BelowW0Pct;

Results/Output/Printers/Zapiska/ZapiskaPrintDocument.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -328,21 +328,26 @@ namespace Results.Output.Printers.Zapiska
 			///----------
             float footerWidth = Measure(e, footer, footerFont).Width;
             PrintAt(e, leftMargin + (printWidth - footerWidth) / 2, topMargin + printHeight - 2 * spacingOne, 0, footer, footerFont, Alignment.Left);
-            
-            string pageNrText = string.Format("{0} {1}/{2}", Strings.Page, pageNr++, nrPages);
-			float pageNrWidth = e.Graphics.MeasureString(pageNrText, font).Width;
-            PrintAt(e, leftMargin + (printWidth - pageNrWidth) / 2, topMargin + printHeight - spacingOne, 0, pageNrText, font, Alignment.Left);
-		}
+
+            if (nrPages != 1)
+            {
+                string pageNrText = string.Format("{0} {1}/{2}", Strings.Page, pageNr, nrPages);
+                float pageNrWidth = e.Graphics.MeasureString(pageNrText, font).Width;
+                PrintAt(e, leftMargin + (printWidth - pageNrWidth) / 2, topMargin + printHeight - spacingOne, 0, pageNrText, font, Alignment.Left);
+            }
+
+            pageNr++;
+        }
 
 
-		/// <summary>
-		/// Print one water meter results
-		/// </summary>
-		/// <param name="wm">Water meter</param>
-		/// <param name="printedWMNr">Number of the water meter printed</param>
-		/// <param name="top">Top coordinate of watermeter data</param>
-		/// <returns>The height of the printed section</returns>
-		float PrintWMs(PrintPageEventArgs e, IList<Results.Entities.WaterMeter> wms, float top)
+        /// <summary>
+        /// Print one water meter results
+        /// </summary>
+        /// <param name="wm">Water meter</param>
+        /// <param name="printedWMNr">Number of the water meter printed</param>
+        /// <param name="top">Top coordinate of watermeter data</param>
+        /// <returns>The height of the printed section</returns>
+        float PrintWMs(PrintPageEventArgs e, IList<Results.Entities.WaterMeter> wms, float top)
 		{
             ///
             /// Prepare table content

Results/WMeterRsltItemSpec.cs

@@ -146,7 +146,7 @@ namespace Results
 
             AllItems.Add(new WMeterRsltItemSpec(ItemID.TestDone,   Strings.Test_done + "()",   Quantity.Boolean,    ItemCategory.TestResult,  (w,t,u,f,p) => FormatBool(f, (w.GetMeterTestRslt(t) != null) && w.GetMeterTestRslt(t).TestDone)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.TestPassed, Strings.Test_passed + "()", Quantity.Boolean,    ItemCategory.TestResult,  (w,t,u,f,p) => FormatBool(f, (w.GetMeterTestRslt(t) != null) && w.GetMeterTestRslt(t).Passed)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed,     Strings.Result,             Quantity.Boolean,    ItemCategory.MeterResult, (w,t,u,f,p) => w.PassedColorStr(f)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed,     Strings.Result,             Quantity.Boolean,    ItemCategory.MeterResult, (w,t,u,f,p) => string.IsNullOrEmpty(t) ? w.PassedColorStr(f) : ((w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PassedColorStr(f))));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.ThreeState,        "Three state result",Quantity.Enumerated, ItemCategory.MeterResult, (w,t,u,f,p) => FormatThreeState(f, w.ThreeStateFromTests())));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.ResultOrErrorFlags,"Winiki lub E",      Quantity.String,     ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) != null) ? FormatStr(f, w.GetMeterTestRslt(t).PassedOrErrorFlagsStr())
                                                                                                                                                                                              : FormatStr(f, w.PassedOrErrorFlagsStr())));    /// PL specific result

SharedDatabase/Entities/TestData.cs

@@ -1,11 +1,11 @@
 ///
-/// Copyright (c) 2016-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2016-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.IO;
-using Common;
+using Config.Entities;
 
 namespace SharedDatabase.Entities
 {
@@ -18,15 +18,16 @@ namespace SharedDatabase.Entities
         public virtual string Name					{ get; set; }
 		public virtual int    Repeats				{ get; set; }
         public virtual double Qtg                   { get; set; }	/// [m3/h] flow range low limit
-        public virtual double Qfrom                 { get; set; }	/// [m3/h] flow range low limit
-		public virtual double Qto					{ get; set; }	/// [m3/h] flow range high limit
+        public virtual double Qfrom                 { get; set; }	/// [m3/h] or [%] flow range low limit
+		public virtual double Qto					{ get; set; }	/// [m3/h] or [%] flow range high limit
+        public virtual bool   IsFromToInPct         { get; set; }   /// true: Qfrom and Qto are in % of Qtg, false: Qfrom and Qto are in [m3/h]
 		public virtual double TargetVolume			{ get; set; }	/// [l] target test volume
 		public virtual double TargetTime			{ get; set; }	/// [s] target test time
 		public virtual string Method				{ get; set; }
         public virtual double ErrLimLo              { get; set; }	/// [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
         public virtual double ErrLimHi              { get; set; }	/// [%] usually > 0, in case of heat meters: -Qn in m3/h
         public virtual double ErrLimMargin          { get; set; }	///	[%] makes error limits tighter: 0 <= ErrLimMargin <= abs(ErrLimXx)
-        public virtual float  TempLimLo             { get; set; }
+		public virtual float  TempLimLo				{ get; set; }
 		public virtual float  TempLimHi				{ get; set; }
         public virtual string TempControl           { get; set; }
         public virtual sbyte  Publish               { get; set; }   /// 0=no, 1=in all protocols, 2=on screen, 3=internal
@@ -42,14 +43,15 @@ namespace SharedDatabase.Entities
 			Method = string.Empty;
 		}
 
-		public TestData(Config.Entities.Test test)
+		public TestData(Test test)
 			: this()
 		{
 			Name           = test.Name;
 			Repeats        = test.Repeats;
             Qtg            = test.Qtg;
-            Qfrom          = test.QfromM3ph();
-			Qto            = test.QtoM3ph();
+            Qfrom          = test.Qfrom;
+			Qto            = test.Qto;
+            IsFromToInPct  = test.IsFromToInPct;
 			TargetVolume   = test.Volume;
 			TargetTime     = test.TestTime;
 			Method         = test.Method;
@@ -73,6 +75,7 @@ namespace SharedDatabase.Entities
             Qtg             = oriTestData.Qtg;
             Qfrom           = oriTestData.Qfrom;
             Qto				= oriTestData.Qto;
+            IsFromToInPct   = oriTestData.IsFromToInPct;
             TargetVolume	= oriTestData.TargetVolume;
             TargetTime		= oriTestData.TargetTime;
             Method			= oriTestData.Method;
@@ -82,7 +85,7 @@ namespace SharedDatabase.Entities
             TempLimLo		= oriTestData.TempLimLo;
             TempLimHi		= oriTestData.TempLimHi;
             TempControl     = oriTestData.TempControl;
-            Publish         = oriTestData.Publish;
+            Publish			= oriTestData.Publish;
             Evaluate        = oriTestData.Evaluate;
         }
 
@@ -99,6 +102,7 @@ namespace SharedDatabase.Entities
             if (Qtg != td.Qtg) return false;
             if (Qfrom != td.Qfrom) return false;
 			if (Qto != td.Qto) return false;
+            if (IsFromToInPct != td.IsFromToInPct) return false;
 			if (TargetVolume != td.TargetVolume) return false;
 			if (TargetTime != td.TargetTime) return false;
 			if (Method != td.Method) return false;
@@ -141,6 +145,7 @@ namespace SharedDatabase.Entities
             writer.Write(Qtg);
             writer.Write(Qfrom);
             writer.Write(Qto);
+            writer.Write(IsFromToInPct);
             writer.Write(TargetVolume);
             writer.Write(TargetTime);
             writer.Write((Method != null) ? Method : string.Empty);
@@ -162,6 +167,7 @@ namespace SharedDatabase.Entities
             Qtg = reader.ReadDouble();
             Qfrom = reader.ReadDouble();
             Qto = reader.ReadDouble();
+            IsFromToInPct = reader.ReadBoolean();
             TargetVolume = reader.ReadDouble();
             TargetTime = reader.ReadDouble();
             Method = reader.ReadString();

SharedDatabase/Entities/TestRslt.cs

@@ -3,9 +3,9 @@
 ///
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.IO;
 using Common;
+using SharedDatabase.Mappings;
 
 namespace SharedDatabase.Entities
 {
@@ -44,7 +44,7 @@ namespace SharedDatabase.Entities
 		public virtual double   DensityLine         { get; set; }	/// [kg/m3]
 		public virtual double   DensityDiv          { get; set; }	/// [kg/m3]
 		public virtual double   MassOfEvapWater     { get; set; }   /// [kg]
-		public virtual double   SpareDbl            { get; set; }
+		public virtual double   Qdetected           { get; set; }
         public virtual double   Flow                { get; set; }	/// [m3/h] calculated from conventional true value
 		public virtual double   VolumeCTV           { get; set; }   /// [l]    Volume conventional true value
 		public virtual double   VolumeMaster        { get; set; }   /// [l]    Volume from the master flow meter
@@ -150,9 +150,21 @@ namespace SharedDatabase.Entities
 		public virtual string Name()		 { return Common.Utils.GetTestName(TestData.Name, TestData.Repeats, RepetitionNr); }
         public virtual string Key()          { return string.Format("{0}~{1}~{2}~{3}", TestData.Name, Part, TestData.Repeats, RepetitionNr); }      /// Unique key
         public virtual int Repeats()         { return TestData.Repeats; }
-		public virtual double Qfrom()		 { return TestData.Qfrom; }
-		public virtual double Qto()			 { return TestData.Qto; }
-		public virtual double TargetVolume() { return TestData.TargetVolume; }
+		public virtual double Qfrom()		
+        {
+            return (TestData == null)     ? 0
+                : !TestData.IsFromToInPct ? TestData.Qfrom
+                : (TestData.Qtg >= 0)     ? TestData.Qfrom * TestData.Qtg / 100
+                                          : TestData.Qfrom * Qdetected / 100;
+        }
+		public virtual double Qto()
+        {
+            return (TestData == null)     ? 0
+                : !TestData.IsFromToInPct ? TestData.Qto
+                : (TestData.Qtg >= 0)     ? TestData.Qto * TestData.Qtg / 100
+                                          : TestData.Qto * Qdetected / 100;
+        }
+        public virtual double TargetVolume() { return TestData.TargetVolume; }
 		public virtual double TargetTime()	 { return TestData.TargetTime; }
 		public virtual string Method()		 { return TestData.Method; }
         public virtual string RefFlowmeter() { return (Components != null && Components.Flowmeter != null) ? Components.Flowmeter : string.Empty; }
@@ -278,7 +290,7 @@ namespace SharedDatabase.Entities
 		    DensityLine         = src.DensityLine;
 		    DensityDiv          = src.DensityDiv;
 		    MassOfEvapWater     = src.MassOfEvapWater;
-		    SpareDbl            = src.SpareDbl;
+		    Qdetected            = src.Qdetected;
 		    Flow                = src.Flow;
 		    VolumeCTV           = src.VolumeCTV;
 		    VolumeMaster        = src.VolumeMaster;
@@ -416,7 +428,7 @@ namespace SharedDatabase.Entities
             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}", 
 								Part, RepetitionNr, TestDone, Remark, StartTime, EndTime, FlowSetTime, TestTime,
 								PulsesMaster, ConstMaster, MassStartRaw, MassStart, MassEndRaw, MassEnd,
-								DensityIn, DensityLine, DensityDiv, MassOfEvapWater, SpareDbl, Flow,
+								DensityIn, DensityLine, DensityDiv, MassOfEvapWater, Qdetected, Flow,
 								VolumeCTV, VolumeMaster, ErrorMaster, ErrorFlags, InfoFlags, 
 								AmbTempMean, AmbTempStart, AmbTempEnd, AmbTempMin, AmbTempMax,
 								AmbPressMean, AmbPressStart, AmbPressEnd, AmbPressMin, AmbPressMax,
@@ -485,7 +497,7 @@ namespace SharedDatabase.Entities
             writer.Write(DensityLine);
             writer.Write(DensityDiv);
             writer.Write(MassOfEvapWater);
-            writer.Write(SpareDbl);
+            writer.Write(Qdetected);
             writer.Write(Flow);
             writer.Write(VolumeCTV);
             writer.Write(VolumeMaster);
@@ -626,7 +638,7 @@ namespace SharedDatabase.Entities
             DensityLine = reader.ReadDouble();
             DensityDiv = reader.ReadDouble();
             MassOfEvapWater = reader.ReadDouble();
-            SpareDbl = reader.ReadDouble();
+            Qdetected = reader.ReadDouble();
             Flow = reader.ReadDouble();
             VolumeCTV = reader.ReadDouble();
             VolumeMaster = reader.ReadDouble();

SharedDatabase/Entities/WaterMeter.cs

@@ -108,6 +108,7 @@ namespace SharedDatabase.Entities
         ///
         public virtual string Workflow          { get; set; }	/// Not mapped to DB !!!    Production tracing workflow name
         public virtual bool   LastRecordIsNok   { get; set; }	/// Not mapped to DB !!!    Previous record verification result
+        public virtual bool   PrintLabel        { get; set; }	/// Not mapped to DB !!!
 
         public virtual WaterMeterData WaterMeterData { get; set; }
 		public virtual Batch Batch { get; set; }
@@ -469,6 +470,7 @@ namespace SharedDatabase.Entities
 #if IPERL
             FWVersion = string.Empty;
 #endif
+            PrintLabel = true;
         }
 
 
@@ -531,6 +533,7 @@ namespace SharedDatabase.Entities
 
             Workflow           = src.Workflow;          /// Not mapped to DB
             LastRecordIsNok    = src.LastRecordIsNok;   /// Not mapped to DB
+            PrintLabel         = src.PrintLabel;        /// Not mapped to DB
 
             foreach (var mtr in MeterTestRslts)
             {
@@ -725,6 +728,7 @@ namespace SharedDatabase.Entities
 
             writer.Write(Workflow);
             writer.Write(LastRecordIsNok);
+            writer.Write(PrintLabel);
 
             /// Save WaterMeterData or WaterMeterData.Id
             if (WaterMeterData != null && savedWMDatas != null && !savedWMDatas.Contains(WaterMeterData))
@@ -825,6 +829,7 @@ namespace SharedDatabase.Entities
 
             Workflow = reader.ReadString();
             LastRecordIsNok = reader.ReadBoolean();
+            PrintLabel = reader.ReadBoolean();
 
             /// Retrieve TestData
             if (reader.ReadBoolean())

SharedDatabase/Mappings/TestDataMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 
@@ -14,7 +14,8 @@ namespace SharedDatabase.Mappings
             Map(x => x.Qtg);
             Map(x => x.Qfrom);
 			Map(x => x.Qto);
-			Map(x => x.TargetVolume);
+            Map(x => x.IsFromToInPct);
+            Map(x => x.TargetVolume);
 			Map(x => x.TargetTime);
 			Map(x => x.Repeats);
 			Map(x => x.Method);

SharedDatabase/Mappings/TestRsltMap.cs

@@ -40,7 +40,7 @@ namespace SharedDatabase.Mappings
             Map(x => x.DensityLine);
 			Map(x => x.DensityDiv);
             Map(x => x.MassOfEvapWater).Column("Buoyancy");
-            Map(x => x.SpareDbl).Column("FlowMass");
+            Map(x => x.Qdetected).Column("FlowMass");
             Map(x => x.Flow).Column("FlowVolume");
             Map(x => x.VolumeCTV);
 			Map(x => x.VolumeMaster);

SharedDatabase/Resources/Strings.pl.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -117,161 +117,116 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="activityGroupBox.Text" xml:space="preserve">
-    <value>Czynność</value>
+  <data name="AddBtnText" xml:space="preserve">
+    <value>Dodaj</value>
   </data>
-  <data name="procedureGroupBox.Text" xml:space="preserve">
-    <value>Procedura</value>
+  <data name="CancelBtnText" xml:space="preserve">
+    <value>Anuluj</value>
   </data>
-  <data name="progressGroupBox.Text" xml:space="preserve">
-    <value>Przebiega</value>
+  <data name="DescriptionColHdr" xml:space="preserve">
+    <value>Opis</value>
   </data>
-  <data name="homeTabPage.Text" xml:space="preserve">
-    <value>Hydsraulika</value>
+  <data name="EditBtnText" xml:space="preserve">
+    <value>Edycja</value>
   </data>
-  <data name="processTabPage.Text" xml:space="preserve">
-    <value>Czynność</value>
+  <data name="Edit_User" xml:space="preserve">
+    <value>Edytuj użytkownika</value>
   </data>
-  <data name="insertTabPage.Text" xml:space="preserve">
-    <value>Wstawić</value>
+  <data name="Error" xml:space="preserve">
+    <value>Błąd</value>
   </data>
-  <data name="resultsTabPage.Text" xml:space="preserve">
-    <value>Wyniki</value>
+  <data name="Full_name" xml:space="preserve">
+    <value>Imię i Nazwisko</value>
   </data>
-  <data name="logsTabPage.Text" xml:space="preserve">
-    <value>Logi</value>
+  <data name="Groups" xml:space="preserve">
+    <value>Grupy</value>
   </data>
-  <data name="picturesTabPage.Text" xml:space="preserve">
-    <value>Obrazy</value>
+  <data name="ID" xml:space="preserve">
+    <value>ID</value>
   </data>
-  <data name="measurementTabPage.Text" xml:space="preserve">
-    <value>Pomiar</value>
+  <data name="Invalid_username_or_password" xml:space="preserve">
+    <value>Nieprawidłowa nazwa użytkownika lub hasło</value>
   </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="userInfoStatusLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>108, 17</value>
+  <data name="max_0_alphanum_chars" xml:space="preserve">
+    <value>(max. {0} znaków alfanumerycznych)</value>
   </data>
-  <data name="userInfoStatusLabel.Text" xml:space="preserve">
-    <value>Użytkownik: admin</value>
+  <data name="Name" xml:space="preserve">
+    <value>Nazwa</value>
   </data>
-  <data name="activityStatusLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>154, 17</value>
+  <data name="OkBtnText" xml:space="preserve">
+    <value>OK</value>
   </data>
-  <data name="activityStatusLabel.Text" xml:space="preserve">
-    <value>Proszę rozpocząć procedurę</value>
-  </data>
-  <data name="statusStrip1.Text" xml:space="preserve">
-    <value>Pasek stanu 1</value>
-  </data>
-  <data name="benchComponentsTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>132, 22</value>
-  </data>
-  <data name="benchComponentsTSMenuItem.Text" xml:space="preserve">
-    <value>Elementy</value>
-  </data>
-  <data name="benchPathsTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>132, 22</value>
-  </data>
-  <data name="benchPathsTSMenuItem.Text" xml:space="preserve">
-    <value>Ścieżki</value>
-  </data>
-  <data name="benchTransitionsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>132, 22</value>
-  </data>
-  <data name="benchTransitionsToolStripMenuItem.Text" xml:space="preserve">
-    <value>Przejścia</value>
-  </data>
-  <data name="benchMetrologyTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>132, 22</value>
-  </data>
-  <data name="benchMetrologyTSMenuItem.Text" xml:space="preserve">
-    <value>Metrologia</value>
-  </data>
-  <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>129, 6</value>
-  </data>
-  <data name="exitToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>132, 22</value>
-  </data>
-  <data name="exitToolStripMenuItem.Text" xml:space="preserve">
-    <value>Wyjście</value>
-  </data>
-  <data name="benchTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>61, 20</value>
-  </data>
-  <data name="benchTSMenuItem.Text" xml:space="preserve">
-    <value>Badanie</value>
-  </data>
-  <data name="homeTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>59, 20</value>
-  </data>
-  <data name="homeTSMenuItem.Text" xml:space="preserve">
-    <value>Główna</value>
-  </data>
-  <data name="resultsTSMenuItem.Text" xml:space="preserve">
-    <value>Wyniki</value>
-  </data>
-  <data name="logsTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>42, 20</value>
-  </data>
-  <data name="logsTSMenuItem.Text" xml:space="preserve">
-    <value>Logi</value>
-  </data>
-  <data name="usersTSMenuItem.Text" xml:space="preserve">
-    <value>Użytkownicy </value>
-  </data>
-  <data name="localSettingsTSMenuItem.Text" xml:space="preserve">
-    <value>Język</value>
-  </data>
-  <data name="databaseSettingsTSMenuItem.Text" xml:space="preserve">
-    <value>Baza danych</value>
-  </data>
-  <data name="passwortToolStripMenuItem.Text" xml:space="preserve">
+  <data name="Password" xml:space="preserve">
     <value>Hasło</value>
   </data>
-  <data name="upgradeTSMenuItem.Text" xml:space="preserve">
-    <value>Aktualizacja</value>
+  <data name="RemoveBtnText" xml:space="preserve">
+    <value>Usuń</value>
   </data>
-  <data name="editTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>79, 20</value>
+  <data name="Repeat_password" xml:space="preserve">
+    <value>Hasło 2</value>
   </data>
-  <data name="editTSMenuItem.Text" xml:space="preserve">
-    <value>Ustawienia </value>
+  <data name="Username_taken" xml:space="preserve">
+    <value>Ta Nazwa użytkownika jest już zajęta. Proszę wybrać inną.</value>
   </data>
-  <data name="aboutTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>83, 22</value>
+  <data name="User_code" xml:space="preserve">
+    <value>Kod użytkownika</value>
   </data>
-  <data name="aboutTSMenuItem.Text" xml:space="preserve">
-    <value>O</value>
+  <data name="User_Login" xml:space="preserve">
+    <value>Login użytkownika</value>
   </data>
-  <data name="helpTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>57, 20</value>
+  <data name="User_Management" xml:space="preserve">
+    <value>Uprawnienia użytkownika</value>
   </data>
-  <data name="helpTSMenuItem.Text" xml:space="preserve">
-    <value>Pomoc</value>
+  <data name="User_name" xml:space="preserve">
+    <value>Nazwa użytkownika</value>
   </data>
-  <data name="proceduresToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>86, 20</value>
+  <data name="CloseBtnText" xml:space="preserve">
+    <value>Zamknij</value>
   </data>
-  <data name="proceduresToolStripMenuItem.Text" xml:space="preserve">
-    <value>Wodomierzy</value>
+  <data name="administrator" xml:space="preserve">
+    <value>Użytkownik stanowiska</value>
   </data>
-  <data name="processToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>70, 20</value>
+  <data name="calibration_specialist" xml:space="preserve">
+    <value>Legalizator</value>
+    <comment>Specjalista ds. kalibracji</comment>
   </data>
-  <data name="processToolStripMenuItem.Text" xml:space="preserve">
-    <value>Czynność</value>
+  <data name="head_of_lab" xml:space="preserve">
+    <value>Kierownik laboratorium</value>
   </data>
-  <data name="resultsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>55, 20</value>
+  <data name="maintenance" xml:space="preserve">
+    <value>Konserwator</value>
   </data>
-  <data name="resultsToolStripMenuItem.Text" xml:space="preserve">
-    <value>Wyniki</value>
+  <data name="metrologist" xml:space="preserve">
+    <value>Metrolog</value>
   </data>
-  <data name="mainMenuStrip.Text" xml:space="preserve">
-    <value>Nagłówek głównego menu</value>
+  <data name="specialist" xml:space="preserve">
+    <value>Specjalista</value>
   </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>Framework stanowiska pomiarowego</value>
+  <data name="tester" xml:space="preserve">
+    <value>Pracownik</value>
+  </data>
+  <data name="metrological_authority" xml:space="preserve">
+    <value>GUM (Główny Urząd Miar)</value>
+  </data>
+  <data name="production_tracing_administrator" xml:space="preserve">
+    <value>Production tracing administrator</value>
+  </data>
+  <data name="water_meter_authority" xml:space="preserve">
+    <value>OUM (Okręgowy Urząd Miar)</value>
+  </data>
+  <data name="Result" xml:space="preserve">
+    <value>Wynik</value>
+  </data>
+  <data name="Serial_nr" xml:space="preserve">
+    <value>Nr seryjny</value>
+  </data>
+  <data name="SN" xml:space="preserve">
+    <value>S/N</value>
+  </data>
+  <data name="Warning" xml:space="preserve">
+    <value>Ostrzeżenie</value>
+  </data>
+  <data name="Yes" xml:space="preserve">
+    <value>Tak</value>
   </data>
 </root>

SharedDatabase/SharedDatabase.csproj

@@ -209,6 +209,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\Strings.cs.resx" />
     <EmbeddedResource Include="Resources\Strings.de.resx" />
+    <EmbeddedResource Include="Resources\Strings.pl.resx" />
     <EmbeddedResource Include="Resources\Strings.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Strings.Designer.cs</LastGenOutput>

TBF/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.9.2118.0")]
-[assembly: AssemblyFileVersion("3.9.2118.0")]
+[assembly: AssemblyVersion("3.9.2133.0")]
+[assembly: AssemblyFileVersion("3.9.2133.0")]

TBF/Resources/Strings.Designer.cs

@@ -177,6 +177,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to About.
+        /// </summary>
+        internal static string About {
+            get {
+                return ResourceManager.GetString("About", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to About Test Bench Framework.
         /// </summary>
@@ -537,6 +546,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Backup.
+        /// </summary>
+        internal static string Backup {
+            get {
+                return ResourceManager.GetString("Backup", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Scale.
         /// </summary>
@@ -1041,6 +1059,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Components.
+        /// </summary>
+        internal static string Components {
+            get {
+                return ResourceManager.GetString("Components", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Compound.
         /// </summary>
@@ -1725,6 +1752,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Edit schematic drawing.
+        /// </summary>
+        internal static string Edit_schematic_drawing {
+            get {
+                return ResourceManager.GetString("Edit_schematic_drawing", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Edit User.
         /// </summary>
@@ -2088,9 +2124,9 @@ namespace TBF.Resources {
         /// <summary>
         ///   Looks up a localized string similar to Exit.
         /// </summary>
-        internal static string ExitBtnText {
+        internal static string Exit {
             get {
-                return ResourceManager.GetString("ExitBtnText", resourceCulture);
+                return ResourceManager.GetString("Exit", resourceCulture);
             }
         }
         
@@ -2490,6 +2526,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Home.
+        /// </summary>
+        internal static string Home {
+            get {
+                return ResourceManager.GetString("Home", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Horizontally.
         /// </summary>
@@ -3753,9 +3798,9 @@ namespace TBF.Resources {
         /// <summary>
         ///   Looks up a localized string similar to Paths.
         /// </summary>
-        internal static string PathsDlgTitle {
+        internal static string Paths {
             get {
-                return ResourceManager.GetString("PathsDlgTitle", resourceCulture);
+                return ResourceManager.GetString("Paths", resourceCulture);
             }
         }
         
@@ -6072,6 +6117,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Test Bench Framework.
+        /// </summary>
+        internal static string Test_Bench_Framework {
+            get {
+                return ResourceManager.GetString("Test_Bench_Framework", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Test bench is controlled by this computer.
         /// </summary>
@@ -6606,6 +6660,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Upgrade database.
+        /// </summary>
+        internal static string Upgrade_DB {
+            get {
+                return ResourceManager.GetString("Upgrade_DB", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Use {0}.
         /// </summary>

TBF/Resources/Strings.cs.resx

@@ -124,7 +124,7 @@
     <value>(offline)</value>
   </data>
   <data name="About_Test_Bench_Framework" xml:space="preserve">
-    <value>O zkušební stolici Framework</value>
+    <value>O Test Bench Framework</value>
   </data>
   <data name="Activity" xml:space="preserve">
     <value>Činnost</value>
@@ -405,7 +405,7 @@
   <data name="Evaluate" xml:space="preserve">
     <value>Vyhodnocení</value>
   </data>
-  <data name="ExitBtnText" xml:space="preserve">
+  <data name="Exit" xml:space="preserve">
     <value>Ukončit</value>
   </data>
   <data name="Failed" xml:space="preserve">
@@ -1749,4 +1749,10 @@
   <data name="PDF_files" xml:space="preserve">
     <value>PDF soubory</value>
   </data>
+  <data name="Paths" xml:space="preserve">
+    <value>Cesty</value>
+  </data>
+  <data name="About" xml:space="preserve">
+    <value>O</value>
+  </data>
 </root>

TBF/Resources/Strings.de.resx

@@ -334,7 +334,7 @@
     <value>Tol. Abzug [%]</value>
   </data>
   <data name="Zeroing_chdr" xml:space="preserve">
-    <value>Nullstellen (Ergebnisse)</value>
+    <value>Nullstellen</value>
   </data>
   <data name="Test_time" xml:space="preserve">
     <value>Dauer</value>
@@ -378,7 +378,7 @@
   <data name="Error_while_creating_DB_Reason" xml:space="preserve">
     <value>Fehler beim Erzeugen der Datenbank.</value>
   </data>
-  <data name="ExitBtnText" xml:space="preserve">
+  <data name="Exit" xml:space="preserve">
     <value>Beenden</value>
   </data>
   <data name="Invalid_password" xml:space="preserve">
@@ -966,7 +966,7 @@
   <data name="OutputTabPageTitle" xml:space="preserve">
     <value>Ausgabe</value>
   </data>
-  <data name="PathsDlgTitle" xml:space="preserve">
+  <data name="Paths" xml:space="preserve">
     <value>Pfade</value>
   </data>
   <data name="Camera" xml:space="preserve">
@@ -2119,7 +2119,7 @@
     <value>Konditionen</value>
   </data>
   <data name="Uncertainty" xml:space="preserve">
-    <value>Messunsicherheit.</value>
+    <value>Messunsicherheit</value>
   </data>
   <data name="No_info_available" xml:space="preserve">
     <value>Keine Info vorhanden!</value>
@@ -2205,4 +2205,10 @@
   <data name="determine" xml:space="preserve">
     <value>feststellen</value>
   </data>
+  <data name="Calibration_certificate" xml:space="preserve">
+    <value>Kalibrierschein</value>
+  </data>
+  <data name="Calibration_certificate_validity_expired" xml:space="preserve">
+    <value>Kalibrierschein gültigkeit abgelaufen</value>
+  </data>
 </root>

TBF/Resources/Strings.fr.resx

@@ -300,7 +300,7 @@
   <data name="ConfigureDatabaseText" xml:space="preserve">
     <value>Configurer les bancs d'essai (mot de passe requis)</value>
   </data>
-  <data name="ExitBtnText" xml:space="preserve">
+  <data name="Exit" xml:space="preserve">
     <value>Quitter</value>
   </data>
   <data name="RetryDatabaseText" xml:space="preserve">
@@ -1104,7 +1104,7 @@
   <data name="OutputTabPageTitle" xml:space="preserve">
     <value>Sortie</value>
   </data>
-  <data name="PathsDlgTitle" xml:space="preserve">
+  <data name="Paths" xml:space="preserve">
     <value>chemins</value>
   </data>
   <data name="ID" xml:space="preserve">

TBF/Resources/Strings.it.resx

@@ -309,7 +309,7 @@
   <data name="ConfigureDatabaseText" xml:space="preserve">
     <value>azzeramento (richiesta password)</value>
   </data>
-  <data name="ExitBtnText" xml:space="preserve">
+  <data name="Exit" xml:space="preserve">
     <value>uscita</value>
   </data>
   <data name="RetryDatabaseText" xml:space="preserve">
@@ -1119,7 +1119,7 @@
   <data name="OutputTabPageTitle" xml:space="preserve">
     <value>produzione</value>
   </data>
-  <data name="PathsDlgTitle" xml:space="preserve">
+  <data name="Paths" xml:space="preserve">
     <value>percorso</value>
   </data>
   <data name="ID" xml:space="preserve">

TBF/Resources/Strings.pl.resx

@@ -372,7 +372,7 @@
   <data name="Error_while_creating_DB_Reason" xml:space="preserve">
     <value>Błąd podczas tworzenia bazy danych. Powód:</value>
   </data>
-  <data name="ExitBtnText" xml:space="preserve">
+  <data name="Exit" xml:space="preserve">
     <value>Wyjście</value>
   </data>
   <data name="Failed" xml:space="preserve">
@@ -1134,7 +1134,7 @@
   <data name="OutputTabPageTitle" xml:space="preserve">
     <value>Wyjście</value>
   </data>
-  <data name="PathsDlgTitle" xml:space="preserve">
+  <data name="Paths" xml:space="preserve">
     <value>Ścieżki</value>
   </data>
   <data name="ID" xml:space="preserve">
@@ -1626,4 +1626,64 @@
   <data name="Start_cycle" xml:space="preserve">
     <value>Start cyklu</value>
   </data>
+  <data name="Bench" xml:space="preserve">
+    <value>Stanowisko</value>
+  </data>
+  <data name="Calendar" xml:space="preserve">
+    <value>Kalendarz</value>
+  </data>
+  <data name="Graphs" xml:space="preserve">
+    <value>Wykresy</value>
+  </data>
+  <data name="Help" xml:space="preserve">
+    <value>Pomoc</value>
+  </data>
+  <data name="Settings" xml:space="preserve">
+    <value>Ustawienia</value>
+  </data>
+  <data name="Event_logs" xml:space="preserve">
+    <value>Logi</value>
+  </data>
+  <data name="Home" xml:space="preserve">
+    <value>Hydraulika</value>
+  </data>
+  <data name="Backup" xml:space="preserve">
+    <value>Kopia zapasowa</value>
+  </data>
+  <data name="Components" xml:space="preserve">
+    <value>Elementy</value>
+  </data>
+  <data name="Database" xml:space="preserve">
+    <value>Baza danych</value>
+  </data>
+  <data name="Upgrade_DB" xml:space="preserve">
+    <value>Aktualizacja bazy danych</value>
+  </data>
+  <data name="About" xml:space="preserve">
+    <value>O</value>
+  </data>
+  <data name="Class" xml:space="preserve">
+    <value>Klasa</value>
+  </data>
+  <data name="Date_time" xml:space="preserve">
+    <value>Data/czas</value>
+  </data>
+  <data name="Edit_schematic_drawing" xml:space="preserve">
+    <value>Edycja schematu</value>
+  </data>
+  <data name="Severity" xml:space="preserve">
+    <value>Poziom ważności</value>
+  </data>
+  <data name="Source" xml:space="preserve">
+    <value>Źródło</value>
+  </data>
+  <data name="Test_Bench_Framework" xml:space="preserve">
+    <value>Framework stanowiska pomiarowego</value>
+  </data>
+  <data name="Test_profiles" xml:space="preserve">
+    <value>Profile</value>
+  </data>
+  <data name="Uncertainty" xml:space="preserve">
+    <value>Nepevność</value>
+  </data>
 </root>

TBF/Resources/Strings.resx

@@ -297,7 +297,7 @@
   <data name="ConfigureDatabaseText" xml:space="preserve">
     <value>Configure test benches (password required)</value>
   </data>
-  <data name="ExitBtnText" xml:space="preserve">
+  <data name="Exit" xml:space="preserve">
     <value>Exit</value>
   </data>
   <data name="RetryDatabaseText" xml:space="preserve">
@@ -1114,7 +1114,7 @@
   <data name="OutputTabPageTitle" xml:space="preserve">
     <value>Output</value>
   </data>
-  <data name="PathsDlgTitle" xml:space="preserve">
+  <data name="Paths" xml:space="preserve">
     <value>Paths</value>
   </data>
   <data name="ID" xml:space="preserve">
@@ -2428,4 +2428,25 @@
   <data name="PDF_files" xml:space="preserve">
     <value>PDF files</value>
   </data>
+  <data name="Home" xml:space="preserve">
+    <value>Home</value>
+  </data>
+  <data name="Backup" xml:space="preserve">
+    <value>Backup</value>
+  </data>
+  <data name="Components" xml:space="preserve">
+    <value>Components</value>
+  </data>
+  <data name="Upgrade_DB" xml:space="preserve">
+    <value>Upgrade database</value>
+  </data>
+  <data name="About" xml:space="preserve">
+    <value>About</value>
+  </data>
+  <data name="Edit_schematic_drawing" xml:space="preserve">
+    <value>Edit schematic drawing</value>
+  </data>
+  <data name="Test_Bench_Framework" xml:space="preserve">
+    <value>Test Bench Framework</value>
+  </data>
 </root>

TBF/Resources/Strings.ro.resx

@@ -315,7 +315,7 @@
   <data name="Evaluate" xml:space="preserve">
     <value>Evaluare</value>
   </data>
-  <data name="ExitBtnText" xml:space="preserve">
+  <data name="Exit" xml:space="preserve">
     <value>Iesire</value>
   </data>
   <data name="Failed" xml:space="preserve">

TBF/Resources/Strings.ru.resx

@@ -294,7 +294,7 @@
   <data name="ConfigureDatabaseText" xml:space="preserve">
     <value>Тестовая конфигурация установки (требуется пароль)</value>
   </data>
-  <data name="ExitBtnText" xml:space="preserve">
+  <data name="Exit" xml:space="preserve">
     <value>Выход</value>
   </data>
   <data name="RetryDatabaseText" xml:space="preserve">
@@ -1104,7 +1104,7 @@
   <data name="OutputTabPageTitle" xml:space="preserve">
     <value>Выход</value>
   </data>
-  <data name="PathsDlgTitle" xml:space="preserve">
+  <data name="Paths" xml:space="preserve">
     <value>Пути</value>
   </data>
   <data name="ID" xml:space="preserve">

TBF/Resources/Strings.sk.resx

@@ -235,4 +235,10 @@
   <data name="Do_you_really_want_to_delete_all_codes_Q" xml:space="preserve">
     <value>Naozaj chcete vymazať všetky kódy ?</value>
   </data>
+  <data name="Exit" xml:space="preserve">
+    <value>Ukončiť</value>
+  </data>
+  <data name="Paths" xml:space="preserve">
+    <value>Cesty</value>
+  </data>
 </root>

TBF/Resources/Strings.zh-CN.resx

@@ -405,7 +405,7 @@
   <data name="Evaluate" xml:space="preserve">
     <value>评估</value>
   </data>
-  <data name="ExitBtnText" xml:space="preserve">
+  <data name="Exit" xml:space="preserve">
     <value>退出 Exit</value>
   </data>
   <data name="Failed" xml:space="preserve">
@@ -1119,7 +1119,7 @@
   <data name="OutputTabPageTitle" xml:space="preserve">
     <value>输出 Output</value>
   </data>
-  <data name="PathsDlgTitle" xml:space="preserve">
+  <data name="Paths" xml:space="preserve">
     <value>工作台 - 路径</value>
   </data>
   <data name="Focus" xml:space="preserve">

TBF/Rig/DataEntry/DEItem.cs

@@ -15,6 +15,7 @@ namespace TBF.Rig.DataEntry
         [Description("Last from history")]  HistoryLast,
         [Description("Load")]               Load,           /// Load from water meters when the form is open, save on OK
         [Description("Load (readonly)")]    LoadReadOnly,   /// Load from water meters when the form is open, prevent changes, do not save
+        [Description("Set")]                Set,            /// Set to 'yes' when the form is open
         Count,
     }
 
@@ -39,6 +40,7 @@ namespace TBF.Rig.DataEntry
         [Description("WM Remark")]           WmRemark,
         [Description("Batch remark")]        BatchRemark,
         [Description("Batch and WM remark")] BatchAndWmRemark,
+        [Description("Print label")]         PrintLabel,
 #if ORACLE_DB
         [Description("Prefix")]              Prefix,
         [Description("Suffix")]              Suffix,

TBF/Rig/DataEntry/DEUtils.cs

@@ -3,6 +3,7 @@
 ///
 using System.Windows.Forms;
 using Results.Entities;
+using TBF.Resources;
 
 namespace TBF.Rig.DataEntry
 {
@@ -30,9 +31,10 @@ namespace TBF.Rig.DataEntry
                 case Ct.BatchOrder:        return (wm.Batch != null && wm.Batch.PurchaseOrder != null) ? wm.Batch.PurchaseOrder : string.Empty;
                 case Ct.BatchAndWmOrder:   return (wm.Batch != null && wm.Batch.PurchaseOrder != null) ? wm.Batch.PurchaseOrder : string.Empty;
 
-                case Ct.WmRemark: return (!wm.Disabled && wm.Remark != null) ? wm.Remark : string.Empty;
-                case Ct.BatchRemark: return (wm.Batch != null && wm.Batch.Remark != null) ? wm.Batch.Remark : string.Empty;
-                case Ct.BatchAndWmRemark: return (wm.Batch != null && wm.Batch.Remark != null) ? wm.Batch.Remark : string.Empty;
+                case Ct.WmRemark:          return (!wm.Disabled && wm.Remark != null) ? wm.Remark : string.Empty;
+                case Ct.BatchRemark:       return (wm.Batch != null && wm.Batch.Remark != null) ? wm.Batch.Remark : string.Empty;
+                case Ct.BatchAndWmRemark:  return (wm.Batch != null && wm.Batch.Remark != null) ? wm.Batch.Remark : string.Empty;
+                case Ct.PrintLabel:        return wm.PrintLabel ? Strings.yes : Strings.no;
 #if ORACLE_DB
                 case Ct.Prefix: return (!wm.Disabled && wm.Prefix != null) ? wm.Prefix : string.Empty;
                 case Ct.Suffix: return (!wm.Disabled && wm.Suffix != null) ? wm.Suffix : string.Empty;
@@ -77,6 +79,10 @@ namespace TBF.Rig.DataEntry
                 case Ct.BatchAndWmRemark:
                     if (wm.Batch != null) wm.Batch.Remark = value;
                     return;
+
+                case Ct.PrintLabel:
+                    wm.PrintLabel = (value == Strings.yes);
+                    return;
 #if ORACLE_DB
                 case Ct.Prefix: wm.Prefix = value; return;
                 case Ct.Suffix: wm.Suffix = value; return;

TBF/Rig/DataEntry/Uni/CycleBgEnForm.cs

@@ -124,6 +124,18 @@ namespace TBF.Rig.DataEntry.Uni
             comboBoxes = new ComboBox[colItems.Count, wmsCount];
             checkBoxes = new CheckBox[wmsCount];
 
+            /// Make Auto s/n button visible if there is either Ct.SerialNr or Ct.SerialNrAux column
+            int buttonsWidth = 350;
+            for (int k = 0; k < colItems.Count; k++)
+            {
+                if ((colItems[k].Content == Ct.SerialNr || colItems[k].Content == Ct.SerialNrAux) && colItems[k].Action != Ac.LoadReadOnly)
+                {
+                    autoSNButton.Visible = true;
+                    buttonsWidth += 147;
+                    break;
+                }
+            }
+
             /// Layout related readonly variables derived from argument 'sz'
             switch (sz)
             {
@@ -132,7 +144,7 @@ namespace TBF.Rig.DataEntry.Uni
                     meterHeight = 26;       /// Height of a ComboBox control
                     margin = 20;
                     spacing = 8;
-                    buttonsWidth = 350;
+                    this.buttonsWidth = buttonsWidth;
                     hdrHeight = 120;
                     labelWid = 31;
                     checkBoxWid = 23;
@@ -144,7 +156,7 @@ namespace TBF.Rig.DataEntry.Uni
                     meterHeight = 31;       /// Height of a ComboBox control
                     margin = 25;
                     spacing = 10;
-                    buttonsWidth = 350;
+                    this.buttonsWidth = buttonsWidth;
                     hdrHeight = 140;
                     labelWid = 34;
                     checkBoxWid = 23;
@@ -155,7 +167,7 @@ namespace TBF.Rig.DataEntry.Uni
                     meterHeight = 37;       /// Height of a ComboBox control
                     margin = 30;
                     spacing = 12;
-                    buttonsWidth = 350;
+                    this.buttonsWidth = buttonsWidth;
                     hdrHeight = 160;
                     labelWid = 40;
                     checkBoxWid = 23;
@@ -236,6 +248,8 @@ namespace TBF.Rig.DataEntry.Uni
             ///
             /// Table
             ///
+            int commonCheckBoxLeft = 0;
+            int commonCheckBoxTop = 0;
             int columnsTop = Math.Max(hdrHeight, groupBoxHeight + 2 * margin + spacing);
             for (int j = 0; j < linesCount; j++)
             {
@@ -294,14 +308,22 @@ namespace TBF.Rig.DataEntry.Uni
                             TabIndex = tabIndex++,
                             Parent = this,
                         };
-                        
+
                         comboBox.SelectedIndexChanged += new System.EventHandler(this.comboBox_SelectedIndexChanged);
                         comboBox.TextChanged += new System.EventHandler(this.comboBox_TextChanged);
                         comboBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox_KeyPress);
-                        
-                        var lastVals = GetHistoryFromLS(isEnd, k);
-                        comboBox.Items.Add(lastVals.Length > wmPos0 ? lastVals[wmPos0] : string.Empty);   /// History in drop-down menu
-                        
+
+                        if (ci.Content == Ct.PrintLabel)
+                        {
+                            comboBox.Items.Add(Strings.yes);
+                            comboBox.Items.Add(Strings.no);
+                        }
+                        else
+                        {
+                            var lastVals = GetHistoryFromLS(isEnd, k);
+                            comboBox.Items.Add(lastVals.Length > wmPos0 ? lastVals[wmPos0] : string.Empty);   /// History in drop-down menu
+                        }
+
                         left += ci.Width + spacing;
                         comboBoxes[k, wmPos0] = comboBox;
                         this.Controls.Add(comboBox);
@@ -316,10 +338,26 @@ namespace TBF.Rig.DataEntry.Uni
                     };
                     checkBoxes[wmPos0] = checkBox;
                     this.Controls.Add(checkBox);
+
+                    if (commonCheckBoxLeft == 0)
+                    {
+                        commonCheckBoxLeft = left;
+                        commonCheckBoxTop = columnsTop - meterHeight;
+                    }
                 }
 
                 okButton.TabIndex = tabIndex++;
                 clearButton.TabIndex = tabIndex++;
+
+                var commonCheckBox = new CheckBox
+                {
+                    Location = new Point(commonCheckBoxLeft, commonCheckBoxTop + 6),
+                    Size = new Size(checkBoxWid, 23),
+                    TabIndex = tabIndex++,
+                    Parent = this,
+                };
+                commonCheckBox.CheckedChanged += new System.EventHandler(commonCheckBox_CheckedChanged);
+                this.Controls.Add(commonCheckBox);
             }
 
             ///
@@ -327,7 +365,7 @@ namespace TBF.Rig.DataEntry.Uni
             ///
             Rectangle screenRectangle = this.RectangleToScreen(this.ClientRectangle);
             int titleBarHeight = screenRectangle.Top - this.Top;
-            Size = new Size(Math.Max(meterWidth * linesCount + margin * (linesCount + 1), margin + groupBoxWidth + buttonsWidth),
+            Size = new Size(Math.Max(meterWidth * linesCount + margin * (linesCount + 1), margin + groupBoxWidth + this.buttonsWidth),
                             titleBarHeight + columnsTop + lineSize * (meterHeight + spacing) + margin);
 
             Localize();
@@ -445,6 +483,10 @@ namespace TBF.Rig.DataEntry.Uni
                     case Ac.LoadReadOnly:
                         commonComboBoxes[ix].Text = DEUtils.GetContent(commonItems[ix].Content, firstValidWM);
                         break;
+
+                    case Ac.Set:
+                        commonComboBoxes[ix].Text = Strings.yes;
+                        break;
                 }
             }
 
@@ -472,6 +514,13 @@ namespace TBF.Rig.DataEntry.Uni
                             comboBoxes[k, i].Text = DEUtils.GetContent(colItems[k].Content, WaterMeters[i]);
                         }
                         break;
+
+                    case Ac.Set:
+                        for (int i = 0; i < wmsCount; i++)
+                        {
+                            comboBoxes[k, i].Text = Strings.yes;
+                        }
+                        break;
                 }
             }
 
@@ -577,18 +626,94 @@ namespace TBF.Rig.DataEntry.Uni
             }
         }
 
-        private void clearButton_Click(object sender, EventArgs e)
+        private void commonCheckBox_CheckedChanged(object sender, EventArgs e)
         {
-            InitializeBoxes();
+            bool state = (sender as CheckBox).Checked;
+            for (int i = 0; i < wmsCount; i++)
+            {
+                checkBoxes[i].Checked = state;
+            }
         }
 
-		private void okButton_Click(object sender, EventArgs e)
+        private void okButton_Click(object sender, EventArgs e)
         {
             UpdateWMsFromBoxes();
 
             completed = true;
             Close();
         }
+
+        private void clearButton_Click(object sender, EventArgs e)
+        {
+            InitializeBoxes();
+        }
+
+        private void autoSNButton_Click(object sender, EventArgs e)
+        {
+            ///
+            /// Find the 1st enabled water meter
+            ///
+            int firstIx;
+            for (firstIx = 0; firstIx < wmsCount; firstIx++)
+            {
+                if (checkBoxes[firstIx].Checked) break;
+            }
+            if (firstIx == wmsCount)
+            {
+                return;     /// There is not any enabled water meter
+            }
+
+            char[] digits = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+
+            ///
+            /// Find a column with serial numbers
+            ///
+            for (int k = 0; k < colItems.Count; k++)
+            {
+                if ((colItems[k].Content == Ct.SerialNr || colItems[k].Content == Ct.SerialNrAux) && colItems[k].Action != Ac.LoadReadOnly)
+                {
+                    ///
+                    /// Column with serial numbers found => perform an auto s/n assignment
+                    ///
+                    string firstSN = comboBoxes[k, firstIx].Text;
+
+                    int firstSnNr;
+                    int startIx = firstSN.IndexOfAny(digits);
+                    if (startIx >= 0)
+                    {
+                        int lastDigitPosPlus1 = startIx + 1;
+                        var listOfDigits = new List<char>(digits);
+                        while (lastDigitPosPlus1 < firstSN.Length && listOfDigits.Contains(firstSN[lastDigitPosPlus1]))
+                        {
+                            lastDigitPosPlus1++;
+                        }
+                        int digitsCount = lastDigitPosPlus1 - startIx;
+
+                        if (int.TryParse(firstSN.Substring(startIx, digitsCount), out firstSnNr) && firstSnNr >= 0)
+                        {
+                            for (int ix = firstIx + 1; ix < wmsCount; ix++)
+                            {
+                                if (checkBoxes[ix].Checked)
+                                {
+                                    firstSnNr++;
+                                    string newSN = firstSnNr.ToString();
+                                    int len = newSN.Length;
+                                    if (len <= digitsCount)
+                                    {
+                                        comboBoxes[k, ix].Text = firstSN.Substring(0, startIx + digitsCount - len) + newSN + firstSN.Substring(startIx + digitsCount);
+                                    }
+                                    else
+                                    {
+                                        comboBoxes[k, ix].Text = firstSN.Substring(0, startIx) + newSN + firstSN.Substring(startIx + digitsCount); ;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
         private void comboBox_SelectedIndexChanged(object sndr, EventArgs e)
         {
             if (!isHandlersEnabled) return;
@@ -599,7 +724,7 @@ namespace TBF.Rig.DataEntry.Uni
 
             isHandlersEnabled = false;
 
-            if (k >= 0 && comboBoxes[k, j].Text == comboBoxes[k, j].Items[0].ToString())
+            if (k >= 0 && colItems[k].Content != Ct.PrintLabel && comboBoxes[k, j].Text == comboBoxes[k, j].Items[0].ToString())
             {
                 for (int i = 0; i < wmsCount; i++)
                 {

TBF/Rig/DataEntry/Uni/CycleBgEnForm.designer.cs

@@ -34,6 +34,7 @@ namespace TBF.Rig.DataEntry.Uni
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CycleBgEnForm));
             this.okButton = new System.Windows.Forms.Button();
             this.clearButton = new System.Windows.Forms.Button();
+            this.autoSNButton = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
             // okButton
@@ -52,11 +53,20 @@ namespace TBF.Rig.DataEntry.Uni
             this.clearButton.UseVisualStyleBackColor = true;
             this.clearButton.Click += new System.EventHandler(this.clearButton_Click);
             // 
+            // autoSNButton
+            // 
+            resources.ApplyResources(this.autoSNButton, "autoSNButton");
+            this.autoSNButton.ForeColor = System.Drawing.Color.Black;
+            this.autoSNButton.Name = "autoSNButton";
+            this.autoSNButton.UseVisualStyleBackColor = true;
+            this.autoSNButton.Click += new System.EventHandler(this.autoSNButton_Click);
+            // 
             // CycleBgEnForm
             // 
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.DarkGray;
+            this.Controls.Add(this.autoSNButton);
             this.Controls.Add(this.clearButton);
             this.Controls.Add(this.okButton);
             this.ForeColor = System.Drawing.Color.Black;
@@ -71,5 +81,6 @@ namespace TBF.Rig.DataEntry.Uni
 
         private System.Windows.Forms.Button okButton;
         private System.Windows.Forms.Button clearButton;
+        private System.Windows.Forms.Button autoSNButton;
     }
 }

TBF/Rig/DataEntry/Uni/CycleBgEnForm.resx

@@ -148,7 +148,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;okButton.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="clearButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
@@ -181,6 +181,42 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;clearButton.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="autoSNButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
+  <data name="autoSNButton.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Verdana, 14.25pt</value>
+  </data>
+  <data name="autoSNButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="autoSNButton.Location" type="System.Drawing.Point, System.Drawing">
+    <value>648, 26</value>
+  </data>
+  <data name="autoSNButton.Size" type="System.Drawing.Size, System.Drawing">
+    <value>112, 63</value>
+  </data>
+  <data name="autoSNButton.TabIndex" type="System.Int32, mscorlib">
+    <value>9</value>
+  </data>
+  <data name="autoSNButton.Text" xml:space="preserve">
+    <value>Auto s/n</value>
+  </data>
+  <data name="autoSNButton.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="&gt;&gt;autoSNButton.Name" xml:space="preserve">
+    <value>autoSNButton</value>
+  </data>
+  <data name="&gt;&gt;autoSNButton.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;autoSNButton.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;autoSNButton.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

TBF/Rig/DataEntry/Uni/EntryFormCfg.cs

@@ -563,6 +563,7 @@ namespace TBF.Rig.DataEntry.Uni
                             Ct.ArchivePath.ToDescription(),
                             Ct.WmOrder.ToDescription(),
                             Ct.WmRemark.ToDescription(),
+                            Ct.PrintLabel.ToDescription(),
                         };
                     }
                 case 2:

TBF/Rig/Output/Printers/Enhanced/Printer.cs

@@ -3,11 +3,12 @@
 ///
 using System;
 using System.Collections.Generic;
-using System.Drawing.Printing;
 using System.Globalization;
 using System.Threading;
+using Common.Forms;
 using Results.Output.Printers.Enhanced;
 using log4net;
+using Common;
 
 namespace TBF.Rig.Output.Printers.Enhanced
 {
@@ -31,22 +32,35 @@ namespace TBF.Rig.Output.Printers.Enhanced
 		IList<Results.WMeterRsltItemSpec> testItems;
 		string footer;
 
+        bool printingCompleted = false;
+        bool statusDlgShown = false;
+        ModelessForm modelessForm;
 
-		public Printer() { }
+
+        public Printer() { }
 
 		public Printer(Generic.IComponentCfg cfg)
 			: base(cfg)
 		{
 			printerCfg = cfg as PrinterCfg;
-            log.Warn(this.ToString());
 		}
 
         public override void Initialize()
         {
             ApplyConfig();
+            if (printerCfg.DebugLevel == DebugMode.Normal)
+            {
+                string message;
+                if (!PrinterStatus.IsOnline(printerCfg.PrinterName, out message)) throw new ApplicationException(message);
+                log.FatalFormat("{0} initialized: {1}", Name, this);
+            }
+            else
+            {
+                log.FatalFormat("{0} simulated: {1}", Name, this);
+            }
         }
 
-		void ApplyConfig()
+        void ApplyConfig()
 		{
 			header = string.IsNullOrEmpty(printerCfg.Header) ? string.Empty : printerCfg.Header.Replace("~", Environment.NewLine);
 			commonItems = Results.WMeterRsltItemSpec.FromStrArray(printerCfg.CommonItems);
@@ -132,38 +146,67 @@ namespace TBF.Rig.Output.Printers.Enhanced
 		/// <summary>Start this operation</summary>
 		public void Start()
 		{
-            CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
-
-            if (printerCfg.Culture != Culture.system)
-            {
-                Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
-            }
-
-            string documentName;
-            try
-            {
-                if (string.IsNullOrEmpty(printerCfg.DocName)) throw (new Exception());
-                documentName = string.Format(printerCfg.DocName, batch.StartTime, batch.EndTime, batch.BatchNr);
-            }
-            catch
-            {
-                documentName = string.Format("{0:yyyyMMdd-HHmm}", batch.EndTime);
-            }
-
-            PrintResults(batch, documentName);
-
-            Thread.CurrentThread.CurrentCulture = oriCulture;
+            printingCompleted = false;
+            statusDlgShown = false;
         }
 
 		/// <summary>Run this operation</summary>
 		/// <returns>Event.ResultsPrinted</returns>
 		public Event Run()
 		{
-			return Event.ResultsPrinted;
-		}
+            string message;
+            if (printingCompleted || printerCfg.DebugLevel != DebugMode.Normal)
+            {
+                return Event.ResultsPrinted;
+            }
+            else if (PrinterStatus.IsOnline(printerCfg.PrinterName, out message))
+            {
+                if (statusDlgShown)
+                {
+                    statusDlgShown = false;
+                    if (modelessForm != null) modelessForm.Close();
+                }
 
-		/// <summary>Stop this operation</summary>
-		public void Stop()
+                /// Printer is online  =>  Print results now
+                CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
+                if (printerCfg.Culture != Culture.system)
+                {
+                    Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
+                }
+
+                string documentName;
+                try
+                {
+                    if (string.IsNullOrEmpty(printerCfg.DocName)) throw (new Exception());
+                    documentName = string.Format(printerCfg.DocName, batch.StartTime, batch.EndTime, batch.BatchNr);
+                }
+                catch
+                {
+                    documentName = string.Format("{0:yyyyMMdd-HHmm}", batch.EndTime);
+                }
+
+                PrintResults(batch, documentName);
+
+                Thread.CurrentThread.CurrentCulture = oriCulture;
+
+                printingCompleted = true;
+                return Event.ResultsPrinted;
+            }
+            else
+            {
+                if (!statusDlgShown)
+                {
+                    statusDlgShown = true;
+                    modelessForm = new ModelessForm(message);
+                    new Thread(() => System.Windows.Forms.Application.Run(modelessForm)).Start();
+                }
+
+                return Event.Busy;
+            }
+        }
+
+        /// <summary>Stop this operation</summary>
+        public void Stop()
 		{
 		}
 

TBF/Rig/Output/Printers/Enhanced/PrinterCfgCtrl.cs

@@ -74,7 +74,6 @@ namespace TBF.Rig.Output.Printers.Enhanced
 
 		void Localize()
 		{
-            classNameLabel.Text = config.ClassName;
 			nameLabel.Text = Strings.Name;
             printerLabel.Text = Strings.Printer;
             selectPrinterButton.Text = "Select";
@@ -92,7 +91,9 @@ namespace TBF.Rig.Output.Printers.Enhanced
 		void Redraw()
 		{
 			if (config == null) return;			/// Control was not loaded, settings were not changed
-			nameTextBox.Text = config.Name;
+
+            classNameLabel.Text = config.ClassName;
+            nameTextBox.Text = config.Name;
             printerComboBox.Text = string.IsNullOrEmpty(config.PrinterName) ? Strings.default_printer : config.PrinterName;
             templateTextBox.Text = config.Template;
             orientationComboBox.Text = config.PageOrientation.ToString();

TBF/Rig/Output/Printers/Label/Printer.cs

@@ -6,7 +6,9 @@ using System.Collections.Generic;
 using log4net;
 using System.Globalization;
 using System.Threading;
+using Common.Forms;
 using Results.Output.Printers.Label;
+using Common;
 
 namespace TBF.Rig.Output.Printers.Label
 {
@@ -19,30 +21,36 @@ namespace TBF.Rig.Output.Printers.Label
 
 		public bool SupressPrinting { get { return (printerCfg.NrOfCopies == 0); } }
 
-		/// <summary> Data to print </summary>
-		Results.Entities.Batch batch;
+		Results.Entities.Batch batch;					/// Data to print
+        IList<Results.WMeterRsltItemSpec> commonItems;  /// Items to print
+		bool printingCompleted = false;
+        bool statusDlgShown = false;
+        ModelessForm modelessForm;
 
-		///
-		/// Items to print
-		///
-		IList<Results.WMeterRsltItemSpec> commonItems;
-
-
-		public Printer() { }
+        public Printer() { }
 
 		public Printer(Generic.IComponentCfg cfg)
 			: base(cfg)
 		{
 			printerCfg = cfg as PrinterCfg;
-            log.Warn(this.ToString());
 		}
 
         public override void Initialize()
         {
             ApplyConfig();
+            if (printerCfg.DebugLevel == DebugMode.Normal)
+            {
+                string message;
+                if (!PrinterStatus.IsOnline(printerCfg.PrinterName, out message)) throw new ApplicationException(message);
+                log.FatalFormat("{0} initialized: {1}", Name, this);
+            }
+            else
+            {
+                log.FatalFormat("{0} simulated: {1}", Name, this);
+            }
         }
 
-		void ApplyConfig()
+        void ApplyConfig()
 		{
 			commonItems = Results.WMeterRsltItemSpec.FromStrArray(printerCfg.ItemsToPrint);
 		}
@@ -108,29 +116,58 @@ namespace TBF.Rig.Output.Printers.Label
 		/// <summary>Start this operation</summary>
 		public void Start()
 		{
-            CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
+            printingCompleted = false;
+            statusDlgShown = false;
+        }
 
-            if (printerCfg.Culture != Culture.system)
-            {
-                Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
-            }
-
-            foreach (var wm in batch.WaterMeters)
-            {
-                if (wm != null && (!printerCfg.GoodOnly || wm.Passed))
-                {
-                    PrintResults(batch, wm, string.Format("{0}-{1}", batch.BatchNr, wm.WMPosition));
-                }
-            }
-
-            Thread.CurrentThread.CurrentCulture = oriCulture;
-		}
-
-		/// <summary>Run this operation</summary>
-		/// <returns>Event.ResultsPrinted</returns>
-		public Event Run()
+        /// <summary>Run this operation</summary>
+        /// <returns>Event.ResultsPrinted</returns>
+        public Event Run()
 		{
-			return Event.ResultsPrinted;
+			string message;
+			if (printingCompleted || printerCfg.DebugLevel != DebugMode.Normal)
+			{
+                return Event.ResultsPrinted;
+            }
+            else if (PrinterStatus.IsOnline(printerCfg.PrinterName, out message))
+			{
+                if (statusDlgShown)
+                {
+                    statusDlgShown = false;
+                    if (modelessForm != null) modelessForm.Close();
+                }
+
+                /// Printer is online  =>  Print results now
+                CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
+                if (printerCfg.Culture != Culture.system)
+                {
+                    Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
+                }
+
+                foreach (var wm in batch.WaterMeters)
+                {
+                    if (wm != null && !wm.Disabled && wm.PrintLabel && (!printerCfg.GoodOnly || wm.Passed))
+                    {
+                        PrintResults(batch, wm, string.Format("{0}-{1}", batch.BatchNr, wm.WMPosition));
+                    }
+                }
+
+                Thread.CurrentThread.CurrentCulture = oriCulture;
+
+                printingCompleted = true;
+                return Event.ResultsPrinted;
+            }
+            else
+			{
+                if (!statusDlgShown)
+                {
+                    statusDlgShown = true;
+                    modelessForm = new ModelessForm(message);
+                    new Thread(() => System.Windows.Forms.Application.Run(modelessForm)).Start();
+                }
+
+                return Event.Busy;
+			}
 		}
 
 		/// <summary>Stop this operation</summary>

TBF/Rig/Output/Printers/MultiLabel/Printer.cs

@@ -7,6 +7,7 @@ using log4net;
 using System.Globalization;
 using System.Threading;
 using Results.Output.Printers.MultiLabel;
+using Common;
 
 namespace TBF.Rig.Output.Printers.MultiLabel
 {
@@ -34,15 +35,24 @@ namespace TBF.Rig.Output.Printers.MultiLabel
 			: base(cfg)
 		{
 			printerCfg = cfg as PrinterCfg;
-            log.Warn(this.ToString());
 		}
 
         public override void Initialize()
         {
             ApplyConfig();
+            if (printerCfg.DebugLevel == DebugMode.Normal)
+            {
+                string message;
+                if (!PrinterStatus.IsOnline(printerCfg.PrinterName, out message)) throw new ApplicationException(message);
+                log.FatalFormat("{0} initialized: {1}", Name, this);
+            }
+            else
+            {
+                log.FatalFormat("{0} simulated: {1}", Name, this);
+            }
         }
 
-		void ApplyConfig()
+        void ApplyConfig()
 		{
 			commonItems = Results.WMeterRsltItemSpec.FromStrArray(printerCfg.ItemsToPrint);
 		}
@@ -112,16 +122,19 @@ namespace TBF.Rig.Output.Printers.MultiLabel
 		/// <summary>Start this operation</summary>
 		public void Start()
 		{
-            CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
+			if (printerCfg.DebugLevel == DebugMode.Normal)
+			{
+				CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
 
-            if (printerCfg.Culture != Culture.system)
-            {
-                Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
-            }
+				if (printerCfg.Culture != Culture.system)
+				{
+					Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
+				}
 
-            PrintResults(batch, string.Format("{0}", batch.BatchNr));
+				PrintResults(batch, string.Format("{0}", batch.BatchNr));
 
-            Thread.CurrentThread.CurrentCulture = oriCulture;
+				Thread.CurrentThread.CurrentCulture = oriCulture;
+			}
 		}
 
 		/// <summary>Run this operation</summary>

TBF/Rig/Output/Printers/OnePerBatch/Printer.cs

@@ -8,6 +8,7 @@ using System.Threading;
 using Results.Entities;
 using Results.Output.Printers.OnePerBatch;
 using log4net;
+using Common;
 
 namespace TBF.Rig.Output.Printers.OnePerBatch
 {
@@ -38,15 +39,24 @@ namespace TBF.Rig.Output.Printers.OnePerBatch
 			: base(cfg)
 		{
 			printerCfg = cfg as PrinterCfg;
-            log.Warn(this.ToString());
 		}
 
         public override void Initialize()
         {
             ApplyConfig();
+            if (printerCfg.DebugLevel == DebugMode.Normal)
+            {
+                string message;
+                if (!PrinterStatus.IsOnline(printerCfg.PrinterName, out message)) throw new ApplicationException(message);
+                log.FatalFormat("{0} initialized: {1}", Name, this);
+            }
+            else
+            {
+                log.FatalFormat("{0} simulated: {1}", Name, this);
+            }
         }
 
-		void ApplyConfig()
+        void ApplyConfig()
 		{
 			header = string.IsNullOrEmpty(printerCfg.Header) ? string.Empty : printerCfg.Header.Replace("~", Environment.NewLine);
 			commonItems = Results.WMeterRsltItemSpec.FromStrArray(printerCfg.CommonItems1);
@@ -150,45 +160,48 @@ namespace TBF.Rig.Output.Printers.OnePerBatch
 		/// <summary>Start this operation</summary>
 		public void Start()
 		{
-            CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
-
-            if (printerCfg.Culture != Culture.system)
+            if (printerCfg.DebugLevel == DebugMode.Normal)
             {
-                Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
-            }
+                CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
 
-            foreach (var wm in batch.WaterMeters)
-            {
-                if (wm != null && !wm.Disabled && (!printerCfg.GoodOnly || wm.Passed))
+                if (printerCfg.Culture != Culture.system)
                 {
-                    string documentName;
-                    try
-                    {
-                        if (string.IsNullOrEmpty(printerCfg.DocName)) throw (new Exception());
-                        documentName = string.Format(printerCfg.DocName, wm.StartTime(), wm.EndTime(), wm.BatchNr(), wm.WMPosition, wm.SerialNr);
-                    }
-                    catch
-                    {
-                        documentName = string.Format("{0}", batch.BatchNr, wm.WMPosition);
-                    }
+                    Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
+                }
 
-                    /// The following condition prevents printing empty AutoTest results protocols
-                    if (string.IsNullOrEmpty(printerCfg.AutoTestParam) || wm.AutoMeterTestRslts(printerCfg.AutoTestParam).Count > 0)
+                foreach (var wm in batch.WaterMeters)
+                {
+                    if (wm != null && !wm.Disabled && (!printerCfg.GoodOnly || wm.Passed))
                     {
-                        PrintResults(batch, wm, documentName);
-                        break;
+                        string documentName;
+                        try
+                        {
+                            if (string.IsNullOrEmpty(printerCfg.DocName)) throw (new Exception());
+                            documentName = string.Format(printerCfg.DocName, wm.StartTime(), wm.EndTime(), wm.BatchNr(), wm.WMPosition, wm.SerialNr);
+                        }
+                        catch
+                        {
+                            documentName = string.Format("{0}", batch.BatchNr, wm.WMPosition);
+                        }
+
+                        /// The following condition prevents printing empty AutoTest results protocols
+                        if (string.IsNullOrEmpty(printerCfg.AutoTestParam) || wm.AutoMeterTestRslts(printerCfg.AutoTestParam).Count > 0)
+                        {
+                            PrintResults(batch, wm, documentName);
+                            break;
+                        }
                     }
                 }
-            }
 
-            Thread.CurrentThread.CurrentCulture = oriCulture;
+                Thread.CurrentThread.CurrentCulture = oriCulture;
+            }
         }
 
 		/// <summary>Run this operation</summary>
 		/// <returns>Event.ResultsPrinted</returns>
 		public Event Run()
 		{
-				return Event.ResultsPrinted;
+		    return Event.ResultsPrinted;
 		}
 
 		/// <summary>Stop this operation</summary>

TBF/Rig/Output/Printers/OnePerMeter/Printer.cs

@@ -8,6 +8,7 @@ using System.Threading;
 using Results.Entities;
 using Results.Output.Printers.OnePerMeter;
 using log4net;
+using Common;
 
 namespace TBF.Rig.Output.Printers.OnePerMeter
 {
@@ -38,15 +39,24 @@ namespace TBF.Rig.Output.Printers.OnePerMeter
 			: base(cfg)
 		{
 			printerCfg = cfg as PrinterCfg;
-            log.Warn(this.ToString());
 		}
 
         public override void Initialize()
         {
             ApplyConfig();
+            if (printerCfg.DebugLevel == DebugMode.Normal)
+            {
+                string message;
+                if (!PrinterStatus.IsOnline(printerCfg.PrinterName, out message)) throw new ApplicationException(message);
+                log.FatalFormat("{0} initialized: {1}", Name, this);
+            }
+            else
+            {
+                log.FatalFormat("{0} simulated: {1}", Name, this);
+            }
         }
 
-		void ApplyConfig()
+        void ApplyConfig()
 		{
 			header = string.IsNullOrEmpty(printerCfg.Header) ? string.Empty : printerCfg.Header.Replace("~", Environment.NewLine);
 			commonItems = Results.WMeterRsltItemSpec.FromStrArray(printerCfg.CommonItems1);
@@ -105,6 +115,7 @@ namespace TBF.Rig.Output.Printers.OnePerMeter
                         printerCfg.CommonItems2 = newCfg.CommonItems2;
                         printerCfg.CommonItems3 = newCfg.CommonItems3;
                         printerCfg.Form = newCfg.Form;
+                        printerCfg.Alignment = newCfg.Alignment;
                         printerCfg.SelectedItems = newCfg.SelectedItems;
                         printerCfg.SelectedItems2 = newCfg.SelectedItems2;
                         printerCfg.BelowW0Pct = newCfg.BelowW0Pct;
@@ -154,38 +165,41 @@ namespace TBF.Rig.Output.Printers.OnePerMeter
 		/// <summary>Start this operation</summary>
 		public void Start()
 		{
-            CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
-
-            if (printerCfg.Culture != Culture.system)
+            if (printerCfg.DebugLevel == DebugMode.Normal)
             {
-                Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
-            }
+                CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
 
-            foreach (var wm in batch.WaterMeters)
-            {
-                if (wm != null && !wm.Disabled && (!printerCfg.GoodOnly || wm.Passed))
+                if (printerCfg.Culture != Culture.system)
                 {
-                    string documentName;
-                    try
-                    {
-                        if (string.IsNullOrEmpty(printerCfg.DocName)) throw (new Exception());
-                        documentName = string.Format(printerCfg.DocName, wm.StartTime(), wm.EndTime(), wm.BatchNr(), wm.WMPosition, wm.SerialNr);
-                    }
-                    catch
-                    {
-                        documentName = string.Format("{0}-{1}", batch.BatchNr, wm.WMPosition);
-                    }
-
-                    PrintResults(batch, wm, documentName);
+                    Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
                 }
-            }
 
-            Thread.CurrentThread.CurrentCulture = oriCulture;
+                foreach (var wm in batch.WaterMeters)
+                {
+                    if (wm != null && !wm.Disabled && (!printerCfg.GoodOnly || wm.Passed))
+                    {
+                        string documentName;
+                        try
+                        {
+                            if (string.IsNullOrEmpty(printerCfg.DocName)) throw (new Exception());
+                            documentName = string.Format(printerCfg.DocName, wm.StartTime(), wm.EndTime(), wm.BatchNr(), wm.WMPosition, wm.SerialNr);
+                        }
+                        catch
+                        {
+                            documentName = string.Format("{0}-{1}", batch.BatchNr, wm.WMPosition);
+                        }
+
+                        PrintResults(batch, wm, documentName);
+                    }
+                }
+
+                Thread.CurrentThread.CurrentCulture = oriCulture;
+            }
         }
 
-		/// <summary>Run this operation</summary>
-		/// <returns>Event.ResultsPrinted</returns>
-		public Event Run()
+        /// <summary>Run this operation</summary>
+        /// <returns>Event.ResultsPrinted</returns>
+        public Event Run()
 		{
 				return Event.ResultsPrinted;
 		}
@@ -227,6 +241,7 @@ namespace TBF.Rig.Output.Printers.OnePerMeter
                 CommonItems2 = printerCfg.CommonItems2,
                 CommonItems3 = printerCfg.CommonItems3,
                 Form = printerCfg.Form,
+                Alignment = printerCfg.Alignment,
                 TestItems = printerCfg.SelectedItems,
                 TestItems2 = printerCfg.SelectedItems2,
                 BelowW0Pct = printerCfg.BelowW0Pct,

TBF/Rig/Output/Printers/OnePerMeter/PrinterCfg.cs

@@ -50,6 +50,7 @@ namespace TBF.Rig.Output.Printers.OnePerMeter
         public string[] CommonItems3;
 
         public TableForm Form;
+        public Alignment Alignment;
         public string[] SelectedItems;
         public string[] SelectedItems2;
 

TBF/Rig/Output/Printers/OnePerMeter/PrinterCfgCtrl.cs

@@ -59,7 +59,12 @@ namespace TBF.Rig.Output.Printers.OnePerMeter
 
             for (TableForm f = 0; f < TableForm.Count; f++)
             {
-                table1FormComboBox.Items.Add(f.ToString());
+                tableFormComboBox.Items.Add(f.ToString());
+            }
+
+            for (Alignment a = 0; a < Alignment.Count; a++)
+            {
+                tableAlignmentComboBox.Items.Add(a.ToDescription());
             }
 
             for (BarcodeType bt = BarcodeType.None; bt < BarcodeType.Count; bt++)
@@ -158,7 +163,8 @@ namespace TBF.Rig.Output.Printers.OnePerMeter
             imageNameTextBox.Text = config.ImgName;
             docNameTextBox.Text = config.DocName;
 
-            table1FormComboBox.Text = config.Form.ToString();
+            tableFormComboBox.Text = config.Form.ToString();
+            tableAlignmentComboBox.Text = config.Alignment.ToDescription();
 
             barcodeTypeComboBox.Text = config.BarcodeType.ToString();
             barcodeLeftTextBox.Text = config.BarcodeLeft.ToString();
@@ -203,7 +209,8 @@ namespace TBF.Rig.Output.Printers.OnePerMeter
             commonItems1Button.Enabled = true;
             commonItems2Button.Enabled = true;
             commonItems3Button.Enabled = true;
-            table1FormComboBox.Enabled = true;
+            tableFormComboBox.Enabled = true;
+            tableAlignmentComboBox.Enabled = true;
             testItemsButton.Enabled = true;
             testItems2Button.Enabled = true;
             belowW0TextBox.Enabled = true;
@@ -376,12 +383,18 @@ namespace TBF.Rig.Output.Printers.OnePerMeter
                 flags |= CfgUpdateFlags.Error;
             }
 
-            if (!table1FormComboBox.Items.Contains(table1FormComboBox.Text))
+            if (!tableFormComboBox.Items.Contains(tableFormComboBox.Text))
             {
                 message += Environment.NewLine + "Invalid 'Table form'";
                 flags |= CfgUpdateFlags.Error;
             }
 
+            if (!tableAlignmentComboBox.Items.Contains(tableAlignmentComboBox.Text))
+            {
+                message += Environment.NewLine + "Invalid 'Table alignmentm'";
+                flags |= CfgUpdateFlags.Error;
+            }
+
             if (!barcodeTypeComboBox.Items.Contains(barcodeTypeComboBox.Text))
             {
                 message += Environment.NewLine + "Invalid barcode type";
@@ -505,13 +518,22 @@ namespace TBF.Rig.Output.Printers.OnePerMeter
 
             for (TableForm f = 0; f < TableForm.Count; f++)
             {
-                if (f.ToString().Equals(table1FormComboBox.Text))
+                if (f.ToString().Equals(tableFormComboBox.Text))
                 {
                     config.Form = f;
                     flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
                 }
             }
 
+            for (Alignment a = 0; a < Alignment.Count; a++)
+            {
+                if (a.ToDescription().Equals(tableAlignmentComboBox.Text))
+                {
+                    config.Alignment = a;
+                    flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
+                }
+            }
+
             flags |= UpdateDifferent(ref config.GraphLeft, graphLeftTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
             flags |= UpdateDifferent(ref config.GraphTop, graphTopTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
             flags |= UpdateDifferent(ref config.GraphWid, graphWidthTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);

TBF/Rig/Output/Printers/PrinterStatus.cs

@@ -0,0 +1,136 @@
+///
+/// Copyright (c) 2023 Sensus Slovensko a.s.
+///
+using System;
+using System.Management;
+
+namespace TBF.Rig.Output.Printers
+{
+    public static class PrinterStatus
+    {
+        ///
+        /// See also https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-printer
+        ///
+
+        public enum DetectedErrorState : UInt16
+        {
+            Unknown = 0,
+            Other = 1,
+            No_Error = 2,
+            Low_Paper = 3,
+            No_Paper = 4,
+            Low_Toner = 5,
+            No_Toner = 6,
+            Door_Open = 7,
+            Jammed = 8,
+            Offline = 9,
+            Service_Requested = 10,
+            Output_Bin_Full = 11,
+        }
+
+        public enum ExtendedPrinterStatus : UInt16
+        {
+            Other = 1,
+            Unknown = 2,
+            Idle = 3,
+            Printing = 4,
+            Warming_Up = 5,
+            Stopped_Printing = 6,
+            Offline = 7,
+            Paused = 8,
+            Error = 9,
+            Busy = 10,
+            Not_Aavailable = 11,
+            Waiting = 12,
+            Processing = 13,
+            Initialization = 14,
+            Power_Save = 15,
+            Pending_Deletion = 16,
+            IO_Active = 17,
+            Manual_Feed = 18,
+        }
+
+        public static void GetStatus(string printerName)
+        {
+            /// Perform the search for printers and return the listing as a collection
+            var mgmtSearcher = new ManagementObjectSearcher("SELECT * FROM Win32_Printer");
+            var mgmtCollection = mgmtSearcher.Get();
+
+            foreach (ManagementObject wmiObj in mgmtCollection)
+            {
+                if (wmiObj["Name"].ToString().ToLower() == printerName.ToLower())
+                {
+                    /// Management object name fits the printer name
+
+                    var state = (ExtendedPrinterStatus)int.Parse(wmiObj["ExtendedPrinterStatus"].ToString());
+                    if (state == ExtendedPrinterStatus.Other ||
+                        state == ExtendedPrinterStatus.Unknown ||
+                        state == ExtendedPrinterStatus.Offline ||
+                        state == ExtendedPrinterStatus.Error ||
+                        state == ExtendedPrinterStatus.Not_Aavailable)
+                    {
+                        var message = string.Format("Printer '{0}' state is '{1}'", printerName, state.ToString().Replace('_', ' '));
+                        throw new ApplicationException(message);
+                    }
+
+                    var error = (DetectedErrorState)int.Parse(wmiObj["DetectedErrorState"].ToString());
+                    if (error != DetectedErrorState.No_Error)
+                    {
+                        var message = string.Format("Printer '{0}' error state is '{1}'", printerName, error.ToString().Replace('_', ' '));
+                        throw new ApplicationException(message);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns true when printer is online, without errors.
+        /// </summary>
+        /// <param name="printerName">Printer name</param>
+        /// <param name="message">Error message when printer is not online</param>
+        /// <returns>true when online, false when there are any errors or printer is not online</returns>
+        public static bool IsOnline(string printerName, out string message)
+        {
+            // TODO: Uncomment the following line and resolve problems : Unknown status/error always returned
+            // if (string.IsNullOrEmpty(printerName))
+            {
+                /// Default printer
+                message = string.Empty;
+                return true;
+            }
+
+            /// Perform the search for printers and return the listing as a collection
+            var mgmtSearcher = new ManagementObjectSearcher("SELECT * FROM Win32_Printer");
+            var mgmtCollection = mgmtSearcher.Get();
+
+            foreach (ManagementObject wmiObj in mgmtCollection)
+            {
+                if (wmiObj["Name"].ToString().ToLower() == printerName.ToLower())
+                {
+                    /// Management object name fits the printer name
+
+                    var state = (ExtendedPrinterStatus)int.Parse(wmiObj["ExtendedPrinterStatus"].ToString());
+                    if (state == ExtendedPrinterStatus.Other ||
+                        state == ExtendedPrinterStatus.Unknown ||
+                        state == ExtendedPrinterStatus.Offline ||
+                        state == ExtendedPrinterStatus.Error ||
+                        state == ExtendedPrinterStatus.Not_Aavailable)
+                    {
+                        message = string.Format("Printer '{0}' state is '{1}'", printerName, state.ToString().Replace('_', ' '));
+                        return false;
+                    }
+
+                    var error = (DetectedErrorState)int.Parse(wmiObj["DetectedErrorState"].ToString());
+                    if (error != DetectedErrorState.No_Error)
+                    {
+                        message = string.Format("Printer '{0}' error state is '{1}'", printerName, error.ToString().Replace('_', ' '));
+                        return false;
+                    }
+                }
+            }
+
+            message = string.Empty;
+            return true;
+        }
+    }
+}

TBF/Rig/Output/Printers/Zapiska/Printer.cs

@@ -7,6 +7,7 @@ using System.Globalization;
 using System.Threading;
 using Results.Output.Printers.Zapiska;
 using log4net;
+using Common;
 
 namespace TBF.Rig.Output.Printers.Zapiska
 {
@@ -37,15 +38,24 @@ namespace TBF.Rig.Output.Printers.Zapiska
 			: base(cfg)
 		{
 			printerCfg = cfg as PrinterCfg;
-            log.Warn(this.ToString());
 		}
 
         public override void Initialize()
         {
             ApplyConfig();
+            if (printerCfg.DebugLevel == DebugMode.Normal)
+            {
+                string message;
+                if (!PrinterStatus.IsOnline(printerCfg.PrinterName, out message)) throw new ApplicationException(message);
+                log.FatalFormat("{0} initialized: {1}", Name, this);
+            }
+            else
+            {
+                log.FatalFormat("{0} simulated: {1}", Name, this);
+            }
         }
 
-		void ApplyConfig()
+        void ApplyConfig()
 		{
 			header = string.IsNullOrEmpty(printerCfg.Header) ? string.Empty : printerCfg.Header.Replace("~", Environment.NewLine);
 			commonItems = Results.WMeterRsltItemSpec.FromStrArray(printerCfg.CommonItems1);
@@ -137,27 +147,30 @@ namespace TBF.Rig.Output.Printers.Zapiska
 		/// <summary>Start this operation</summary>
 		public void Start()
 		{
-            CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
+			if (printerCfg.DebugLevel == DebugMode.Normal)
+			{
+				CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
 
-            if (printerCfg.Culture != Culture.system)
-            {
-                Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
-            }
+				if (printerCfg.Culture != Culture.system)
+				{
+					Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
+				}
 
-            string documentName;
-            try
-            {
-                if (string.IsNullOrEmpty(printerCfg.DocName)) throw (new Exception());
-                documentName = string.Format(printerCfg.DocName, batch.StartTime, batch.EndTime, batch.BatchNr);
-            }
-            catch
-            {
-                documentName = string.Format("{0:yyyyMMdd-HHmm}", batch.EndTime);
-            }
+				string documentName;
+				try
+				{
+					if (string.IsNullOrEmpty(printerCfg.DocName)) throw (new Exception());
+					documentName = string.Format(printerCfg.DocName, batch.StartTime, batch.EndTime, batch.BatchNr);
+				}
+				catch
+				{
+					documentName = string.Format("{0:yyyyMMdd-HHmm}", batch.EndTime);
+				}
 
-            PrintResults(batch, documentName);
+				PrintResults(batch, documentName);
 
-            Thread.CurrentThread.CurrentCulture = oriCulture;
+				Thread.CurrentThread.CurrentCulture = oriCulture;
+			}
         }
 
 		/// <summary>Run this operation</summary>

TBF/Rig/Sequences/MainSeq.cs

@@ -1227,11 +1227,11 @@ namespace TBF.Rig.Sequences
 			Bridge.OnActivity(this, Strings.Enter_protocol_data);
 
             //--------------------------------
-			GenericDevices.IDataEntry dataEntryCmpnt = TbfComponents.FindComponent(StateMachine.Procedure.DataEntry) as GenericDevices.IDataEntry;
+			IDataEntry dataEntryCmpnt = TbfComponents.FindComponent(StateMachine.Procedure.DataEntry) as IDataEntry;
 			if (dataEntryCmpnt is IHasCycleEndForm)
 			{
                 IOperation showCycleEndFormOp =
-                    (dataEntryCmpnt as GenericDevices.IHasCycleEndForm).ShowCycleEndFormOp(TBF.Rig.Sequences.ProcessData.BatchRslts.Batch.WaterMeters);
+                    (dataEntryCmpnt as IHasCycleEndForm).ShowCycleEndFormOp(BatchRslts.Batch.WaterMeters);
 
                 if (showCycleEndFormOp != null)
                 {
@@ -1240,8 +1240,7 @@ namespace TBF.Rig.Sequences
                          .AddOperation(showCycleEndFormOp)
                          .AddOperation(checkUiOp)
                          .EnterState();
-                    do
-                    {
+                    do {
                         e = StateMachine.WaitRunDevsRunOps();
                         if (e.Contains(Event.UiCmdStop)) goto stop;
                     }

TBF/Rig/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs

@@ -200,11 +200,11 @@ namespace TBF.Rig.TestMethods.CombinedWithDetection
             //------------------------------------------------
             Bridge.OnActivity(this, Strings.Switching_flow_detection);
             //------------------------------------------------
+            if (inPath.Pump is IPumpFM) (inPath.Pump as IPumpFM).TurnOn(test.PumpPower);
             State.Create(string.Format("{0}({1}) : Start the pump", test.Method, test.Name))
 				 .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
                  .AddOperations(measureOperations)
-				 .AddOperation((inPath.Pump is GenericDevices.IPumpFM) ? (inPath.Pump as GenericDevices.IPumpFM).TurnOnOp(test.PumpPower) : null)
 				 .AddOperation(cBrd.SetValvesOp(inPath.Pump, null))
 				 .EnterState();
 			do {
@@ -423,9 +423,11 @@ namespace TBF.Rig.TestMethods.CombinedWithDetection
 
             /// Update test results with the test flow determined from the detected switching flow
             double Qave_lps = (qfromAfterDetection + qtoAfterDetection) / 7.2;
-			double testTimeFromDetectedFlow = test.Volume / Qave_lps;	/// Test volume wont be changed 
+			double testTimeFromDetectedFlow = test.Volume / Qave_lps;   /// Test volume wont be changed 
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
+            Bridge.OnFlowDetected(this, new FlowDetectedEventArgs(detectedFlow, qfromAfterDetection, qtoAfterDetection,
+                                                                  testTimeFromDetectedFlow, 0));
+            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
 			if (goBackToInitFlow)
             {
@@ -618,11 +620,11 @@ namespace TBF.Rig.TestMethods.CombinedWithDetection
             //------------------------------------------------
             Bridge.OnActivity(this, Strings.Test_completed);
             //------------------------------------------------
+            if (inPath.Pump is IPumpFM) (inPath.Pump as IPumpFM).TurnOff();
             State.Create(Strings.Stop_the_pump)
 				 .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
-                 .AddOperation((inPath != null && inPath.Pump is GenericDevices.IPumpFM) ? (inPath.Pump as GenericDevices.IPumpFM).TurnOffOp() : null)
-				 .AddOperation(cBrd.SetValvesOp(null, inPath.Pump))
+                 .AddOperation(cBrd.SetValvesOp(null, inPath.Pump))
                  .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();
@@ -651,6 +653,7 @@ namespace TBF.Rig.TestMethods.CombinedWithDetection
                 tstRslt.MethodClass    = TbfComponents.FindComponent(test.Method).ClassName;
                 tstRslt.StartTime      = TestStartTime;
 				tstRslt.EndTime        = TestEndTime;
+                tstRslt.Qdetected      = detectedFlow;
 				tstRslt.FlowSetTime    = flowSetTime;
 				tstRslt.TestTime       = cBrd.TestTime;											/// [s] measurement time
                 tstRslt.PulsesMaster   = Convert.ToDouble(cBrd.RefPulses);					    /// Pulses of the master flow meter (test total)
@@ -806,17 +809,17 @@ namespace TBF.Rig.TestMethods.CombinedWithDetection
             if (isLastRepetition || stopCycle)
             {
                 /// Stop the pump
+                if (inPath.Pump is IPumpFM) (inPath.Pump as IPumpFM).TurnOff();
                 State.Create(string.Format("{0}({1}) : Test(s) completed -> Stopping the pump", test.Method, test.Name))
                     .AddOperation(checkUiOp)
                     .AddOperation(cBrd.SetValvesOp(null, inPath.Pump))
-                    .AddOperation((inPath != null && inPath.Pump is GenericDevices.IPumpFM) ? (inPath.Pump as GenericDevices.IPumpFM).TurnOffOp() : null)
                     .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
                     if (e.Contains(Event.Error))      { retVal = Event.Error;     goto stopTest; }
                     if (e.Contains(Event.UiCmdStop))  { retVal = Event.UiCmdStop; goto stopTest; }
                 }
-                while (!e.Contains(Event.ValvesSet) || ((inPath.Pump is GenericDevices.IPumpFM) && !e.Contains(Event.TurnPumpOnOffDone)));
+                while (!e.Contains(Event.ValvesSet));
             }
 
             if (stopCycle) retVal = Event.ErrorFlagsStop;

TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs

@@ -551,7 +551,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
             tstRslt.MassEndRaw      = oriTestRslt.MassEndRaw;
             tstRslt.MassEnd         = oriTestRslt.MassEnd;
             tstRslt.MassOfEvapWater = oriTestRslt.MassOfEvapWater;
-			tstRslt.SpareDbl        = oriTestRslt.SpareDbl;
+			tstRslt.Qdetected       = oriTestRslt.Qdetected;
 			tstRslt.Flow            = oriTestRslt.Flow;
 			tstRslt.VolumeCTV       = oriTestRslt.VolumeCTV;
 			tstRslt.VolumeMaster    = oriTestRslt.VolumeMaster;
@@ -703,7 +703,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
             tstRslt.MassEndRaw = oriTestRslt.MassEndRaw;
             tstRslt.MassEnd = oriTestRslt.MassEnd;
             tstRslt.MassOfEvapWater = oriTestRslt.MassOfEvapWater;
-            tstRslt.SpareDbl = oriTestRslt.SpareDbl;
+            tstRslt.Qdetected = oriTestRslt.Qdetected;
             tstRslt.Flow = oriTestRslt.Flow;
             tstRslt.VolumeCTV = oriTestRslt.VolumeCTV;
             tstRslt.VolumeMaster = oriTestRslt.VolumeMaster;
@@ -855,7 +855,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
             tstRslt.MassEndRaw      = testRsltQ2ac.MassEndRaw;
             tstRslt.MassEnd         = testRsltQ2ac.MassEnd;
             tstRslt.MassOfEvapWater = testRsltQ2ac.MassOfEvapWater;
-            tstRslt.SpareDbl        = testRsltQ2ac.SpareDbl;
+            tstRslt.Qdetected       = testRsltQ2ac.Qdetected;
             tstRslt.Flow            = testRsltQ2ac.Flow;
             tstRslt.VolumeCTV       = testRsltQ2ac.VolumeCTV;
             tstRslt.VolumeMaster    = testRsltQ2ac.VolumeMaster;

TBF/TBF.csproj

@@ -133,6 +133,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Management" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Security" />
     <Reference Include="System.Web" />
@@ -1002,6 +1003,7 @@
     <Compile Include="Rig\Output\Printers\OnePerMeter\PrinterCfgCtrl.designer.cs">
       <DependentUpon>PrinterCfgCtrl.cs</DependentUpon>
     </Compile>
+    <Compile Include="Rig\Output\Printers\PrinterStatus.cs" />
     <Compile Include="Rig\Output\Printers\Zapiska\FactoryCompound.cs" />
     <Compile Include="Rig\Output\Printers\Zapiska\FactoryHeatMeters.cs" />
     <Compile Include="Rig\Output\Printers\Zapiska\FactorySingle.cs" />
@@ -1941,6 +1943,7 @@
     <Compile Include="UiBridge\CompoundDetectionEventArgs.cs" />
     <Compile Include="UiBridge\EmergencyStopEventArgs.cs" />
     <Compile Include="UiBridge\Enums.cs" />
+    <Compile Include="UiBridge\FlowDetectedEventArgs.cs" />
     <Compile Include="UiBridge\ImageEventArgs.cs" />
     <Compile Include="UiBridge\EventEventArgs.cs" />
     <Compile Include="UiBridge\MeasurementRequestArgs.cs" />
@@ -3165,9 +3168,6 @@
     <EmbeddedResource Include="UI\MainWnd.it.resx">
       <DependentUpon>MainWnd.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="UI\MainWnd.pl.resx">
-      <DependentUpon>MainWnd.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="UI\MainWnd.resx">
       <DependentUpon>MainWnd.cs</DependentUpon>
     </EmbeddedResource>

TBF/UI/Bench/Paths/PathsDlg.cs

@@ -152,7 +152,7 @@ namespace TBF.UI.Bench.Paths
 
 		private void Localize()
 		{
-			Text = Strings.PathsDlgTitle;
+			Text = Strings.Paths;
 			pathsTabControl.TabPages[(int)PathsDlgTabs.Feeding].Text = Strings.FeedingTabPageTitle;
 			pathsTabControl.TabPages[(int)PathsDlgTabs.Bench].Text = Strings.BenchTabPageTitle;
 			pathsTabControl.TabPages[(int)PathsDlgTabs.Output].Text = Strings.OutputTabPageTitle;

TBF/UI/EventLogs/EventLogsTabPageCtrl.cs

@@ -35,7 +35,7 @@ namespace TBF.UI.EventLogs
             eventsListView.Columns.Add(Strings.Date_time, 100 * currentDpi / Constants.Dpi100pct);
             eventsListView.Columns.Add(Strings.Source,    100 * currentDpi / Constants.Dpi100pct);
             eventsListView.Columns.Add(Strings.Class,      85 * currentDpi / Constants.Dpi100pct);
-            eventsListView.Columns.Add(Strings.Severity,   70 * currentDpi / Constants.Dpi100pct);
+            eventsListView.Columns.Add(Strings.Severity,  100 * currentDpi / Constants.Dpi100pct);
             eventsListView.Columns.Add(Strings.Message,   500 * currentDpi / Constants.Dpi100pct);
 
             if (SharedDatabase.EventsDB.RecentEvents != null)

TBF/UI/MainWnd.Designer.cs

@@ -89,7 +89,6 @@ namespace TBF.UI
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.homeTSMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.resultsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.eventLogsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.settingsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.usersTSMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -329,6 +328,7 @@ namespace TBF.UI
             // 
             this.drawingCtrl.AltStrings = null;
             this.drawingCtrl.BenchControlMode = false;
+            this.drawingCtrl.CustomBitmaps = null;
             resources.ApplyResources(this.drawingCtrl, "drawingCtrl");
             this.drawingCtrl.EditMode = false;
             this.drawingCtrl.MeasuredValues = null;
@@ -341,7 +341,6 @@ namespace TBF.UI
             this.drawingCtrl.SelectedElement = SchematicDrawing.Element.None;
             this.drawingCtrl.SelectedItem = null;
             this.drawingCtrl.Setpoints = null;
-            this.drawingCtrl.CustomBitmaps = null;
             this.drawingCtrl.SupressRedraws = false;
             this.drawingCtrl.MouseClick += new System.Windows.Forms.MouseEventHandler(this.drawingCtrl_MouseClick);
             // 
@@ -555,11 +554,6 @@ namespace TBF.UI
             resources.ApplyResources(this.homeTSMenuItem, "homeTSMenuItem");
             this.homeTSMenuItem.Click += new System.EventHandler(this.homeTSMenuItem_Click);
             // 
-            // resultsTSMenuItem
-            // 
-            this.resultsTSMenuItem.Name = "resultsTSMenuItem";
-            resources.ApplyResources(this.resultsTSMenuItem, "resultsTSMenuItem");
-            // 
             // eventLogsTSMenuItem
             // 
             this.eventLogsTSMenuItem.Name = "eventLogsTSMenuItem";

TBF/UI/MainWnd.cs

@@ -112,10 +112,8 @@ namespace TBF.UI
 
             InitializeComponent();
 
-			Text = string.Format("Test Bench Framework  ver. {0} - {1}{2}",
-								 Program.Version,
-                                 TBF.DB.CurrentBench.BenchName,
-                                 TBF.DB.CurrentBench.IsRealBench ? "" : Strings._offline);
+			Text = string.Format("{0}  ver. {1} - {2}{3}", Strings.Test_Bench_Framework, Program.Version,
+                                 TBF.DB.CurrentBench.BenchName, TBF.DB.CurrentBench.IsRealBench ? "" : Strings._offline);
 
             localProcedures = new List<Procedure>();
             remoteProcedures = new List<Procedure>();
@@ -220,13 +218,38 @@ namespace TBF.UI
 
 		void Localize()
 		{
+            ///
+            /// Menu
+            ///
+            benchTSMenuItem.Text = Strings.Bench;
+              benchComponentsTSMenuItem.Text = Strings.Components;
+              benchPathsTSMenuItem.Text = Strings.Paths;
+              benchTransitionsToolStripMenuItem.Text = Strings.Transitions;
+              benchMetrologyTSMenuItem.Text = Strings.Metrology;
+              benchUncertaintyTSMItem.Text = Strings.Uncertainty;
+              benchTestProfilesTSMItem.Text = Strings.Test_profiles;
+              editSchDrawingTSMItem.Text = Strings.Edit_schematic_drawing;
+              exitToolStripMenuItem.Text = Strings.Exit;
+            proceduresToolStripMenuItem.Text = Strings.Procedures;
+            homeTSMenuItem.Text = Strings.Home;
+            processToolStripMenuItem.Text = Strings.Process;
+            resultsToolStripMenuItem.Text = Strings.Results;
             graphsToolStripMenuItem.Text = Strings.Graphs;
             eventLogsTSMenuItem.Text = Strings.Event_logs;
             calendarTSMenuItem.Text = Strings.Calendar;
             settingsTSMenuItem.Text = Strings.Settings;
-            optoHeadsToolStripMenuItem.Text = Strings.Optical_heads;
-            clearCountersToolStripMenuItem.Text = Strings.Clear_counters;
+              usersTSMenuItem.Text = Strings.Users;
+              languageTSMItem.Text = Strings.Language;
+              databaseSettingsTSMenuItem.Text = Strings.Database;
+              backUpTSMItem.Text = Strings.Backup;
+                backUpConfigTSMItem.Text = Strings.Configuration;
+                backUpResultsTSMItem.Text = Strings.Results;
+              passwdTSMItem.Text = Strings.Password;
+              upgradeTSMenuItem.Text = Strings.Upgrade_DB;
+              optoHeadsToolStripMenuItem.Text = Strings.Optical_heads;
+              clearCountersToolStripMenuItem.Text = Strings.Clear_counters;
             helpTSMenuItem.Text = Strings.Help;
+              aboutTSMenuItem.Text = Strings.About;
             
             procedureGroupBox.Text = Strings.Procedure;
 			activityGroupBox.Text = Strings.Activity;

TBF/UI/MainWnd.cs.resx

@@ -268,9 +268,6 @@
   <data name="aboutTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>83, 22</value>
   </data>
-  <data name="aboutTSMenuItem.Text" xml:space="preserve">
-    <value>O</value>
-  </data>
   <data name="mainMenuStrip.Text" xml:space="preserve">
     <value>Záhlaví hlavního menu</value>
   </data>

TBF/UI/MainWnd.resx

@@ -277,7 +277,7 @@
     <value>23, 3, 3, 3</value>
   </data>
   <data name="procedureComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>359, 33</value>
+    <value>363, 33</value>
   </data>
   <data name="procedureComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>6</value>
@@ -352,7 +352,7 @@
     <value>389, 39</value>
   </data>
   <data name="splitContainer2.SplitterDistance" type="System.Int32, mscorlib">
-    <value>359</value>
+    <value>363</value>
   </data>
   <data name="splitContainer2.SplitterWidth" type="System.Int32, mscorlib">
     <value>1</value>
@@ -739,7 +739,7 @@
     <value>processTabPageCtrl</value>
   </data>
   <data name="&gt;&gt;processTabPageCtrl.Type" xml:space="preserve">
-    <value>TBF.UI.Process.ProcessTabPageCtrl, TBF, Version=3.1.1901.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.UI.Process.ProcessTabPageCtrl, TBF, Version=3.9.2118.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;processTabPageCtrl.Parent" xml:space="preserve">
     <value>processTabPage</value>
@@ -817,7 +817,7 @@
     <value>resultsTabPageCtrl</value>
   </data>
   <data name="&gt;&gt;resultsTabPageCtrl.Type" xml:space="preserve">
-    <value>TBF.UI.ResultsMI.ResultsTabPageCtrl, TBF, Version=3.1.1901.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.UI.ResultsMI.ResultsTabPageCtrl, TBF, Version=3.9.2118.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;resultsTabPageCtrl.Parent" xml:space="preserve">
     <value>resultsTabPage</value>
@@ -868,7 +868,7 @@
     <value>graphsTabPageCtrl</value>
   </data>
   <data name="&gt;&gt;graphsTabPageCtrl.Type" xml:space="preserve">
-    <value>TBF.UI.Graphs.GraphsTabPageCtrl, TBF, Version=3.1.1901.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.UI.Graphs.GraphsTabPageCtrl, TBF, Version=3.9.2118.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;graphsTabPageCtrl.Parent" xml:space="preserve">
     <value>graphsTabPage</value>
@@ -922,7 +922,7 @@
     <value>eventLogsTabPageCtrl</value>
   </data>
   <data name="&gt;&gt;eventLogsTabPageCtrl.Type" xml:space="preserve">
-    <value>TBF.UI.EventLogs.EventLogsTabPageCtrl, TBF, Version=3.1.1901.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.UI.EventLogs.EventLogsTabPageCtrl, TBF, Version=3.9.2118.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;eventLogsTabPageCtrl.Parent" xml:space="preserve">
     <value>eventLogsTabPage</value>
@@ -973,7 +973,7 @@
     <value>calendarTabPageCtrl</value>
   </data>
   <data name="&gt;&gt;calendarTabPageCtrl.Type" xml:space="preserve">
-    <value>TBF.UI.Calendar.CalendarTabPageCtrl, TBF, Version=3.1.1901.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.UI.Calendar.CalendarTabPageCtrl, TBF, Version=3.9.2118.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;calendarTabPageCtrl.Parent" xml:space="preserve">
     <value>calendarTabPage</value>
@@ -1024,7 +1024,7 @@
     <value>picturesTabPageCtrl</value>
   </data>
   <data name="&gt;&gt;picturesTabPageCtrl.Type" xml:space="preserve">
-    <value>TBF.UI.Camera.PicturesTabPageCtrl, TBF, Version=3.1.1901.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.UI.Camera.PicturesTabPageCtrl, TBF, Version=3.9.2118.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;picturesTabPageCtrl.Parent" xml:space="preserve">
     <value>picturesTabPage</value>
@@ -1365,12 +1365,6 @@
   <data name="homeTSMenuItem.Text" xml:space="preserve">
     <value>Home</value>
   </data>
-  <data name="resultsTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>56, 20</value>
-  </data>
-  <data name="resultsTSMenuItem.Text" xml:space="preserve">
-    <value>Results</value>
-  </data>
   <data name="eventLogsTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>73, 20</value>
   </data>
@@ -1515,9 +1509,6 @@
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>40</value>
-  </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
     <value>6, 13</value>
   </data>
@@ -1617,12 +1608,6 @@
   <data name="&gt;&gt;homeTSMenuItem.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;resultsTSMenuItem.Name" xml:space="preserve">
-    <value>resultsTSMenuItem</value>
-  </data>
-  <data name="&gt;&gt;resultsTSMenuItem.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;eventLogsTSMenuItem.Name" xml:space="preserve">
     <value>eventLogsTSMenuItem</value>
   </data>

TBF/UI/Procedures/ProcedureDlg.Designer.cs

@@ -108,6 +108,8 @@ namespace TBF.UI.Procedures
             this.parametersTabPage = new System.Windows.Forms.TabPage();
             this.parametersListViewEx = new Common.Forms.ListViewEx();
             this.sharedButtons = new TBF.UI.Shared.SharedButtons();
+            this.printer3NokLabel = new System.Windows.Forms.Label();
+            this.printer3ComboBox = new System.Windows.Forms.ComboBox();
             ((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).BeginInit();
             this.mainSplitContainer.Panel1.SuspendLayout();
             this.mainSplitContainer.Panel2.SuspendLayout();
@@ -150,6 +152,8 @@ namespace TBF.UI.Procedures
             // 
             // generalTabPage
             // 
+            this.generalTabPage.Controls.Add(this.printer3NokLabel);
+            this.generalTabPage.Controls.Add(this.printer3ComboBox);
             this.generalTabPage.Controls.Add(this.variantNokLabel);
             this.generalTabPage.Controls.Add(this.eventTrigger3NokLabel);
             this.generalTabPage.Controls.Add(this.eventTrigger2NokLabel);
@@ -603,6 +607,7 @@ namespace TBF.UI.Procedures
             this.historyListViewEx.DoubleClickActivation = false;
             this.historyListViewEx.FullRowSelect = true;
             this.historyListViewEx.GridLines = true;
+            this.historyListViewEx.HideSelection = false;
             this.historyListViewEx.Name = "historyListViewEx";
             this.historyListViewEx.UseCompatibleStateImageBehavior = false;
             this.historyListViewEx.View = System.Windows.Forms.View.Details;
@@ -622,6 +627,7 @@ namespace TBF.UI.Procedures
             this.metrology1ListViewEx.DoubleClickActivation = false;
             this.metrology1ListViewEx.FullRowSelect = true;
             this.metrology1ListViewEx.GridLines = true;
+            this.metrology1ListViewEx.HideSelection = false;
             this.metrology1ListViewEx.Name = "metrology1ListViewEx";
             this.metrology1ListViewEx.UseCompatibleStateImageBehavior = false;
             this.metrology1ListViewEx.View = System.Windows.Forms.View.Details;
@@ -641,6 +647,7 @@ namespace TBF.UI.Procedures
             this.metrology2ListViewEx.DoubleClickActivation = false;
             this.metrology2ListViewEx.FullRowSelect = true;
             this.metrology2ListViewEx.GridLines = true;
+            this.metrology2ListViewEx.HideSelection = false;
             this.metrology2ListViewEx.Name = "metrology2ListViewEx";
             this.metrology2ListViewEx.UseCompatibleStateImageBehavior = false;
             this.metrology2ListViewEx.View = System.Windows.Forms.View.Details;
@@ -660,6 +667,7 @@ namespace TBF.UI.Procedures
             this.processListViewEx.DoubleClickActivation = false;
             this.processListViewEx.FullRowSelect = true;
             this.processListViewEx.GridLines = true;
+            this.processListViewEx.HideSelection = false;
             this.processListViewEx.Name = "processListViewEx";
             this.processListViewEx.UseCompatibleStateImageBehavior = false;
             this.processListViewEx.View = System.Windows.Forms.View.Details;
@@ -679,6 +687,7 @@ namespace TBF.UI.Procedures
             this.parametersListViewEx.DoubleClickActivation = false;
             this.parametersListViewEx.FullRowSelect = true;
             this.parametersListViewEx.GridLines = true;
+            this.parametersListViewEx.HideSelection = false;
             this.parametersListViewEx.Name = "parametersListViewEx";
             this.parametersListViewEx.UseCompatibleStateImageBehavior = false;
             this.parametersListViewEx.View = System.Windows.Forms.View.Details;
@@ -689,6 +698,20 @@ namespace TBF.UI.Procedures
             resources.ApplyResources(this.sharedButtons, "sharedButtons");
             this.sharedButtons.Name = "sharedButtons";
             // 
+            // printer3NokLabel
+            // 
+            resources.ApplyResources(this.printer3NokLabel, "printer3NokLabel");
+            this.printer3NokLabel.ForeColor = System.Drawing.Color.Red;
+            this.printer3NokLabel.Name = "printer3NokLabel";
+            // 
+            // printer3ComboBox
+            // 
+            this.printer3ComboBox.FormattingEnabled = true;
+            resources.ApplyResources(this.printer3ComboBox, "printer3ComboBox");
+            this.printer3ComboBox.Name = "printer3ComboBox";
+            this.printer3ComboBox.SelectedIndexChanged += new System.EventHandler(this.printer3ComboBox_SelectedIndexChanged);
+            this.printer3ComboBox.TextChanged += new System.EventHandler(this.printer3ComboBox_TextChanged);
+            // 
             // ProcedureDlg
             // 
             resources.ApplyResources(this, "$this");
@@ -790,5 +813,7 @@ namespace TBF.UI.Procedures
         private System.Windows.Forms.Label dataEntryNokLabel;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Label variantNokLabel;
-	}
+        private System.Windows.Forms.Label printer3NokLabel;
+        private System.Windows.Forms.ComboBox printer3ComboBox;
+    }
 }

TBF/UI/Procedures/ProcedureDlg.cs

@@ -152,6 +152,7 @@ namespace TBF.UI.Procedures
 				dataEntryComboBox.Items.Add("---");
 				printer1ComboBox.Items.Add("---");
                 printer2ComboBox.Items.Add("---");
+                printer3ComboBox.Items.Add("---");
                 fileWriter1ComboBox.Items.Add("---");
                 fileWriter2ComboBox.Items.Add("---");
                 fileWriter3ComboBox.Items.Add("---");
@@ -171,6 +172,7 @@ namespace TBF.UI.Procedures
                     {
                         printer1ComboBox.Items.Add(cmpnt.Cfg.Name);
                         printer2ComboBox.Items.Add(cmpnt.Cfg.Name);
+                        printer3ComboBox.Items.Add(cmpnt.Cfg.Name);
                     }
                     if (cmpnt is IResultsWriter)
                     {
@@ -425,6 +427,7 @@ namespace TBF.UI.Procedures
             transitionEndComboBox.Enabled = false;
             printer1ComboBox.Enabled = false;
             printer2ComboBox.Enabled = false;
+            printer3ComboBox.Enabled = false;
             fileWriter1ComboBox.Enabled = false;
             fileWriter2ComboBox.Enabled = false;
             fileWriter3ComboBox.Enabled = false;
@@ -559,13 +562,15 @@ namespace TBF.UI.Procedures
 			{
 				printer1ComboBox.Text = "---";
 				printer2ComboBox.Text = "---";
-			}
-			else
+                printer3ComboBox.Text = "---";
+            }
+            else
 			{
 				string[] fields = LoadedProcedure.ResultsPrinter.Split(new char[] { '~' });
 				printer1ComboBox.Text = fields[0];
-				printer2ComboBox.Text = (fields.Length == 2) ? fields[1] : "---";
-			}
+				printer2ComboBox.Text = (fields.Length >= 2) ? fields[1] : "---";
+                printer3ComboBox.Text = (fields.Length >= 3) ? fields[2] : "---";
+            }
 
             if (string.IsNullOrEmpty(LoadedProcedure.ResultsWriter))
             {
@@ -639,16 +644,35 @@ namespace TBF.UI.Procedures
             ///
             /// Printers
             ///
-			if (printer1ComboBox.Items.Contains(printer1ComboBox.Text) && printer2ComboBox.Items.Contains(printer2ComboBox.Text))
+			if (printer1ComboBox.Items.Contains(printer1ComboBox.Text) &&
+                printer2ComboBox.Items.Contains(printer2ComboBox.Text) &&
+                printer3ComboBox.Items.Contains(printer3ComboBox.Text))
 			{
-				bool pr = !printer1ComboBox.Text.Equals("---");
-				bool pr2 = !printer2ComboBox.Text.Equals("---") && !printer2ComboBox.Text.Equals(printer1ComboBox.Text);
+                bool first = true;
+                StringBuilder sb = new StringBuilder();
+                if (!printer1ComboBox.Text.Equals("---"))
+                {
+                    sb.Append(printer1ComboBox.Text);
+                    first = false;
+                }
 
-				if (!pr && !pr2) LoadedProcedure.ResultsPrinter = string.Empty;
-				else if (pr && !pr2) LoadedProcedure.ResultsPrinter = printer1ComboBox.Text;
-				else if (!pr && pr2) LoadedProcedure.ResultsPrinter = printer2ComboBox.Text;
-				else LoadedProcedure.ResultsPrinter = printer1ComboBox.Text + '~' + printer2ComboBox.Text;
-			}
+                if (!printer2ComboBox.Text.Equals("---") && !printer2ComboBox.Text.Equals(printer1ComboBox.Text))
+                {
+                    if (!first) sb.Append("~");
+                    sb.Append(printer2ComboBox.Text);
+                    first = false;
+                }
+
+                if (!printer3ComboBox.Text.Equals("---") && !printer3ComboBox.Text.Equals(printer1ComboBox.Text)
+                                                         && !printer3ComboBox.Text.Equals(printer2ComboBox.Text))
+                {
+                    if (!first) sb.Append("~");
+                    sb.Append(printer3ComboBox.Text);
+                    first = false;
+                }
+                
+                LoadedProcedure.ResultsPrinter = sb.ToString();
+            }
 
             ///
             /// File writers
@@ -1257,39 +1281,51 @@ namespace TBF.UI.Procedures
                     }
                     else if (column == MtrlgyClmn.Volume && Utils.TryParseUDouble(e.DisplayText, out volume))
                     {
-                        allOk &= Utils.TryParseSDouble(e.Item.SubItems[(int)MtrlgyClmn.Qfrom].Text, out qFrom);
-                        allOk &= Utils.TryParseSDouble(e.Item.SubItems[(int)MtrlgyClmn.Qto].Text, out qTo);
-                        
-                        if (test.IsFromToInPct)
+                        if (e.Item.SubItems[(int)MtrlgyClmn.Qtg].Text != Strings.determine)
                         {
-                            allOk &= e.Item.SubItems[(int)MtrlgyClmn.Qtg].Text != Strings.determine;
-                            allOk &= Utils.TryParseUDouble(e.Item.SubItems[(int)MtrlgyClmn.Qtg].Text, out qTg);
-                            qFrom = qTg * qFrom / 100;
-                            qTo = qTg * qTo / 100;
+                            allOk &= Utils.TryParseSDouble(e.Item.SubItems[(int)MtrlgyClmn.Qfrom].Text, out qFrom);
+                            allOk &= Utils.TryParseSDouble(e.Item.SubItems[(int)MtrlgyClmn.Qto].Text, out qTo);
+
+                            if (test.IsFromToInPct)
+                            {
+                                allOk &= Utils.TryParseUDouble(e.Item.SubItems[(int)MtrlgyClmn.Qtg].Text, out qTg);
+                                qFrom = qTg * qFrom / 100;
+                                qTo = qTg * qTo / 100;
+                            }
+
+                            if (allOk)
+                            {
+                                test.VolumeTextChngd = true;
+                                calculateTime = true;
+                            }
                         }
-                        
-                        if (allOk)
+                        else
                         {
+                            /// Qtg = 'determine'  =>  All OK, do not re-calculate test time
                             test.VolumeTextChngd = true;
-                            calculateTime = true;
+                            return;
                         }
                     }
                     else if (column == MtrlgyClmn.TestTime && Utils.TryParseUDouble(e.DisplayText, out testTime))
                     {
-                        allOk &= Utils.TryParseSDouble(e.Item.SubItems[(int)MtrlgyClmn.Qfrom].Text, out qFrom);
-                        allOk &= Utils.TryParseSDouble(e.Item.SubItems[(int)MtrlgyClmn.Qto].Text, out qTo);
-                        
-                        if (test.IsFromToInPct)
+                        if (e.Item.SubItems[(int)MtrlgyClmn.Qtg].Text != Strings.determine)
                         {
-                            allOk &= e.Item.SubItems[(int)MtrlgyClmn.Qtg].Text != Strings.determine;
-                            allOk &= Utils.TryParseUDouble(e.Item.SubItems[(int)MtrlgyClmn.Qtg].Text, out qTg);
-                            qFrom = qTg * qFrom / 100;
-                            qTo = qTg * qTo / 100;
+                            allOk &= Utils.TryParseSDouble(e.Item.SubItems[(int)MtrlgyClmn.Qfrom].Text, out qFrom);
+                            allOk &= Utils.TryParseSDouble(e.Item.SubItems[(int)MtrlgyClmn.Qto].Text, out qTo);
+
+                            if (test.IsFromToInPct)
+                            {
+                                allOk &= Utils.TryParseUDouble(e.Item.SubItems[(int)MtrlgyClmn.Qtg].Text, out qTg);
+                                qFrom = qTg * qFrom / 100;
+                                qTo = qTg * qTo / 100;
+                            }
+
+                            if (allOk) calculateVolume = true;
                         }
-                        
-                        if (allOk)
+                        else
                         {
-                            calculateVolume = true;
+                            /// Qtg = 'determine'  =>  All OK, do not re-calculate volume
+                            return;
                         }
                     }
 
@@ -2343,6 +2379,7 @@ namespace TBF.UI.Procedures
 #endif
             printer1ComboBox.Enabled = true;
             printer2ComboBox.Enabled = true;
+            printer3ComboBox.Enabled = true;
             fileWriter1ComboBox.Enabled = true;
             fileWriter2ComboBox.Enabled = true;
             fileWriter3ComboBox.Enabled = true;
@@ -3313,6 +3350,7 @@ namespace TBF.UI.Procedures
         private void transitionEndComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); }
         private void printer1ComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); }
         private void printer2ComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); }
+        private void printer3ComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); }
         private void fileWriter1ComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); }
         private void fileWriter2ComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); }
         private void fileWriter3ComboBox_SelectedIndexChanged(object sender, EventArgs e) { ShowNokComponents(); }
@@ -3327,6 +3365,7 @@ namespace TBF.UI.Procedures
         private void transitionEndComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); }
         private void printer1ComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); }
         private void printer2ComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); }
+        private void printer3ComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); }
         private void fileWriter1ComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); }
         private void fileWriter2ComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); }
         private void fileWriter3ComboBox_TextChanged(object sender, EventArgs e) { ShowNokComponents(); }
@@ -3343,6 +3382,7 @@ namespace TBF.UI.Procedures
             transitionEndNokLabel.Visible = !transitionEndComboBox.Items.Contains(transitionEndComboBox.Text);
             printer1NokLabel.Visible = !printer1ComboBox.Items.Contains(printer1ComboBox.Text);
             printer2NokLabel.Visible = !printer2ComboBox.Items.Contains(printer2ComboBox.Text);
+            printer3NokLabel.Visible = !printer3ComboBox.Items.Contains(printer3ComboBox.Text);
             fileWriter1NokLabel.Visible = !fileWriter1ComboBox.Items.Contains(fileWriter1ComboBox.Text);
             fileWriter2NokLabel.Visible = !fileWriter2ComboBox.Items.Contains(fileWriter2ComboBox.Text);
             fileWriter3NokLabel.Visible = !fileWriter3ComboBox.Items.Contains(fileWriter3ComboBox.Text);

TBF/UI/Procedures/ProcedureDlg.resx

@@ -129,6 +129,63 @@
   <data name="mainSplitContainer.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="printer3NokLabel.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="printer3NokLabel.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Microsoft Sans Serif, 8.25pt, style=Bold</value>
+  </data>
+  <data name="printer3NokLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="printer3NokLabel.Location" type="System.Drawing.Point, System.Drawing">
+    <value>473, 248</value>
+  </data>
+  <data name="printer3NokLabel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>11, 13</value>
+  </data>
+  <data name="printer3NokLabel.TabIndex" type="System.Int32, mscorlib">
+    <value>63</value>
+  </data>
+  <data name="printer3NokLabel.Text" xml:space="preserve">
+    <value>!</value>
+  </data>
+  <data name="printer3NokLabel.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="&gt;&gt;printer3NokLabel.Name" xml:space="preserve">
+    <value>printer3NokLabel</value>
+  </data>
+  <data name="&gt;&gt;printer3NokLabel.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;printer3NokLabel.Parent" xml:space="preserve">
+    <value>generalTabPage</value>
+  </data>
+  <data name="&gt;&gt;printer3NokLabel.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="printer3ComboBox.Location" type="System.Drawing.Point, System.Drawing">
+    <value>188, 243</value>
+  </data>
+  <data name="printer3ComboBox.Size" type="System.Drawing.Size, System.Drawing">
+    <value>282, 21</value>
+  </data>
+  <data name="printer3ComboBox.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;printer3ComboBox.Name" xml:space="preserve">
+    <value>printer3ComboBox</value>
+  </data>
+  <data name="&gt;&gt;printer3ComboBox.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;printer3ComboBox.Parent" xml:space="preserve">
+    <value>generalTabPage</value>
+  </data>
+  <data name="&gt;&gt;printer3ComboBox.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
   <data name="variantNokLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -160,7 +217,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;variantNokLabel.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>2</value>
   </data>
   <data name="eventTrigger3NokLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -172,7 +229,7 @@
     <value>NoControl</value>
   </data>
   <data name="eventTrigger3NokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 409</value>
+    <value>473, 432</value>
   </data>
   <data name="eventTrigger3NokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -196,7 +253,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;eventTrigger3NokLabel.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>3</value>
   </data>
   <data name="eventTrigger2NokLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -208,7 +265,7 @@
     <value>NoControl</value>
   </data>
   <data name="eventTrigger2NokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 386</value>
+    <value>473, 409</value>
   </data>
   <data name="eventTrigger2NokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -232,7 +289,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;eventTrigger2NokLabel.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>4</value>
   </data>
   <data name="eventTrigger1NokLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -244,7 +301,7 @@
     <value>NoControl</value>
   </data>
   <data name="eventTrigger1NokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 363</value>
+    <value>473, 386</value>
   </data>
   <data name="eventTrigger1NokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -268,7 +325,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;eventTrigger1NokLabel.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>5</value>
   </data>
   <data name="fileWriter5NokLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -280,7 +337,7 @@
     <value>NoControl</value>
   </data>
   <data name="fileWriter5NokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 340</value>
+    <value>473, 363</value>
   </data>
   <data name="fileWriter5NokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -304,7 +361,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;fileWriter5NokLabel.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>6</value>
   </data>
   <data name="fileWriter4NokLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -316,7 +373,7 @@
     <value>NoControl</value>
   </data>
   <data name="fileWriter4NokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 317</value>
+    <value>473, 340</value>
   </data>
   <data name="fileWriter4NokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -340,7 +397,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;fileWriter4NokLabel.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>7</value>
   </data>
   <data name="fileWriter3NokLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -352,7 +409,7 @@
     <value>NoControl</value>
   </data>
   <data name="fileWriter3NokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 294</value>
+    <value>473, 317</value>
   </data>
   <data name="fileWriter3NokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -376,7 +433,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;fileWriter3NokLabel.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>8</value>
   </data>
   <data name="fileWriter2NokLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -388,7 +445,7 @@
     <value>NoControl</value>
   </data>
   <data name="fileWriter2NokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 271</value>
+    <value>473, 294</value>
   </data>
   <data name="fileWriter2NokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -412,7 +469,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;fileWriter2NokLabel.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>9</value>
   </data>
   <data name="fileWriter1NokLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -424,7 +481,7 @@
     <value>NoControl</value>
   </data>
   <data name="fileWriter1NokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 248</value>
+    <value>473, 271</value>
   </data>
   <data name="fileWriter1NokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -448,7 +505,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;fileWriter1NokLabel.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>10</value>
   </data>
   <data name="printer2NokLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -460,7 +517,7 @@
     <value>NoControl</value>
   </data>
   <data name="printer2NokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 225</value>
+    <value>473, 225</value>
   </data>
   <data name="printer2NokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -484,7 +541,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;printer2NokLabel.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>11</value>
   </data>
   <data name="printer1NokLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -496,7 +553,7 @@
     <value>NoControl</value>
   </data>
   <data name="printer1NokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 202</value>
+    <value>473, 202</value>
   </data>
   <data name="printer1NokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -520,7 +577,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;printer1NokLabel.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>12</value>
   </data>
   <data name="transitionEndNokLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -532,7 +589,7 @@
     <value>NoControl</value>
   </data>
   <data name="transitionEndNokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 179</value>
+    <value>473, 179</value>
   </data>
   <data name="transitionEndNokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -556,7 +613,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;transitionEndNokLabel.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>13</value>
   </data>
   <data name="transitionStartNokLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -568,7 +625,7 @@
     <value>NoControl</value>
   </data>
   <data name="transitionStartNokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 156</value>
+    <value>473, 156</value>
   </data>
   <data name="transitionStartNokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -592,7 +649,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;transitionStartNokLabel.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>14</value>
   </data>
   <data name="dataEntryNokLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -604,7 +661,7 @@
     <value>NoControl</value>
   </data>
   <data name="dataEntryNokLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>373, 133</value>
+    <value>473, 133</value>
   </data>
   <data name="dataEntryNokLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>11, 13</value>
@@ -628,7 +685,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;dataEntryNokLabel.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>15</value>
   </data>
   <data name="label2.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -658,13 +715,13 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>16</value>
   </data>
   <data name="fileWriter5ComboBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>188, 335</value>
+    <value>188, 358</value>
   </data>
   <data name="fileWriter5ComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="fileWriter5ComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>46</value>
@@ -679,13 +736,13 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;fileWriter5ComboBox.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>17</value>
   </data>
   <data name="eventTrigger3ComboBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>188, 404</value>
+    <value>188, 427</value>
   </data>
   <data name="eventTrigger3ComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="eventTrigger3ComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>45</value>
@@ -700,13 +757,13 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;eventTrigger3ComboBox.ZOrder" xml:space="preserve">
-    <value>16</value>
+    <value>18</value>
   </data>
   <data name="eventTrigger2ComboBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>188, 381</value>
+    <value>188, 404</value>
   </data>
   <data name="eventTrigger2ComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="eventTrigger2ComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>44</value>
@@ -721,13 +778,13 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;eventTrigger2ComboBox.ZOrder" xml:space="preserve">
-    <value>17</value>
+    <value>19</value>
   </data>
   <data name="eventTrigger1ComboBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>188, 358</value>
+    <value>188, 381</value>
   </data>
   <data name="eventTrigger1ComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="eventTrigger1ComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>43</value>
@@ -742,7 +799,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;eventTrigger1ComboBox.ZOrder" xml:space="preserve">
-    <value>18</value>
+    <value>20</value>
   </data>
   <data name="eventTriggersLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -751,7 +808,7 @@
     <value>NoControl</value>
   </data>
   <data name="eventTriggersLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>20, 364</value>
+    <value>20, 387</value>
   </data>
   <data name="eventTriggersLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>72, 13</value>
@@ -772,13 +829,13 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;eventTriggersLabel.ZOrder" xml:space="preserve">
-    <value>19</value>
+    <value>21</value>
   </data>
   <data name="testProfileTextBox.Enabled" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
   <data name="testProfileTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>550, 13</value>
+    <value>650, 13</value>
   </data>
   <data name="testProfileTextBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>217, 20</value>
@@ -796,7 +853,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;testProfileTextBox.ZOrder" xml:space="preserve">
-    <value>20</value>
+    <value>22</value>
   </data>
   <data name="testProfileLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -805,7 +862,7 @@
     <value>NoControl</value>
   </data>
   <data name="testProfileLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>438, 16</value>
+    <value>538, 16</value>
   </data>
   <data name="testProfileLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>64, 13</value>
@@ -826,10 +883,10 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;testProfileLabel.ZOrder" xml:space="preserve">
-    <value>21</value>
+    <value>23</value>
   </data>
   <data name="altProcPeriodTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>733, 382</value>
+    <value>833, 382</value>
   </data>
   <data name="altProcPeriodTextBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>34, 20</value>
@@ -850,7 +907,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;altProcPeriodTextBox.ZOrder" xml:space="preserve">
-    <value>22</value>
+    <value>24</value>
   </data>
   <data name="altProcPeriodLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -859,7 +916,7 @@
     <value>NoControl</value>
   </data>
   <data name="altProcPeriodLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>450, 385</value>
+    <value>550, 385</value>
   </data>
   <data name="altProcPeriodLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>116, 13</value>
@@ -883,10 +940,10 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;altProcPeriodLabel.ZOrder" xml:space="preserve">
-    <value>23</value>
+    <value>25</value>
   </data>
   <data name="altProcNameTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>550, 358</value>
+    <value>650, 358</value>
   </data>
   <data name="altProcNameTextBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>217, 20</value>
@@ -907,7 +964,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;altProcNameTextBox.ZOrder" xml:space="preserve">
-    <value>24</value>
+    <value>26</value>
   </data>
   <data name="altProcNameLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -916,7 +973,7 @@
     <value>NoControl</value>
   </data>
   <data name="altProcNameLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>450, 360</value>
+    <value>550, 360</value>
   </data>
   <data name="altProcNameLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>84, 13</value>
@@ -940,7 +997,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;altProcNameLabel.ZOrder" xml:space="preserve">
-    <value>25</value>
+    <value>27</value>
   </data>
   <data name="manualControlDisabledCheckBox.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -949,7 +1006,7 @@
     <value>NoControl</value>
   </data>
   <data name="manualControlDisabledCheckBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>593, 181</value>
+    <value>693, 181</value>
   </data>
   <data name="manualControlDisabledCheckBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>138, 17</value>
@@ -970,7 +1027,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;manualControlDisabledCheckBox.ZOrder" xml:space="preserve">
-    <value>26</value>
+    <value>28</value>
   </data>
   <data name="mustBeCompleteCheckBox.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -979,7 +1036,7 @@
     <value>NoControl</value>
   </data>
   <data name="mustBeCompleteCheckBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>593, 160</value>
+    <value>693, 160</value>
   </data>
   <data name="mustBeCompleteCheckBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>152, 17</value>
@@ -1000,7 +1057,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;mustBeCompleteCheckBox.ZOrder" xml:space="preserve">
-    <value>27</value>
+    <value>29</value>
   </data>
   <data name="protectedCheckBox.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1009,7 +1066,7 @@
     <value>NoControl</value>
   </data>
   <data name="protectedCheckBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>593, 139</value>
+    <value>693, 139</value>
   </data>
   <data name="protectedCheckBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>123, 17</value>
@@ -1030,7 +1087,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;protectedCheckBox.ZOrder" xml:space="preserve">
-    <value>28</value>
+    <value>30</value>
   </data>
   <data name="metersKindRadioButton3.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1039,7 +1096,7 @@
     <value>NoControl</value>
   </data>
   <data name="metersKindRadioButton3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>444, 180</value>
+    <value>544, 180</value>
   </data>
   <data name="metersKindRadioButton3.Size" type="System.Drawing.Size, System.Drawing">
     <value>77, 17</value>
@@ -1060,13 +1117,13 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;metersKindRadioButton3.ZOrder" xml:space="preserve">
-    <value>29</value>
+    <value>31</value>
   </data>
   <data name="fileWriter4ComboBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>188, 312</value>
+    <value>188, 335</value>
   </data>
   <data name="fileWriter4ComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="fileWriter4ComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>29</value>
@@ -1081,13 +1138,13 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;fileWriter4ComboBox.ZOrder" xml:space="preserve">
-    <value>30</value>
+    <value>32</value>
   </data>
   <data name="fileWriter3ComboBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>188, 289</value>
+    <value>188, 312</value>
   </data>
   <data name="fileWriter3ComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="fileWriter3ComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>28</value>
@@ -1102,13 +1159,13 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;fileWriter3ComboBox.ZOrder" xml:space="preserve">
-    <value>31</value>
+    <value>33</value>
   </data>
   <data name="printer2ComboBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>188, 220</value>
   </data>
   <data name="printer2ComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="printer2ComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>24</value>
@@ -1123,13 +1180,13 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;printer2ComboBox.ZOrder" xml:space="preserve">
-    <value>32</value>
+    <value>34</value>
   </data>
   <data name="fileWriter2ComboBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>188, 266</value>
+    <value>188, 289</value>
   </data>
   <data name="fileWriter2ComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="fileWriter2ComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>27</value>
@@ -1144,7 +1201,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;fileWriter2ComboBox.ZOrder" xml:space="preserve">
-    <value>33</value>
+    <value>35</value>
   </data>
   <data name="metersKindRadioButton2.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1153,7 +1210,7 @@
     <value>NoControl</value>
   </data>
   <data name="metersKindRadioButton2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>444, 159</value>
+    <value>544, 159</value>
   </data>
   <data name="metersKindRadioButton2.Size" type="System.Drawing.Size, System.Drawing">
     <value>72, 17</value>
@@ -1174,7 +1231,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;metersKindRadioButton2.ZOrder" xml:space="preserve">
-    <value>34</value>
+    <value>36</value>
   </data>
   <data name="metersKindRadioButton1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1183,7 +1240,7 @@
     <value>NoControl</value>
   </data>
   <data name="metersKindRadioButton1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>444, 138</value>
+    <value>544, 138</value>
   </data>
   <data name="metersKindRadioButton1.Size" type="System.Drawing.Size, System.Drawing">
     <value>54, 17</value>
@@ -1204,13 +1261,13 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;metersKindRadioButton1.ZOrder" xml:space="preserve">
-    <value>35</value>
+    <value>37</value>
   </data>
   <data name="transitionEndComboBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>188, 174</value>
   </data>
   <data name="transitionEndComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="transitionEndComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>21</value>
@@ -1225,7 +1282,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;transitionEndComboBox.ZOrder" xml:space="preserve">
-    <value>36</value>
+    <value>38</value>
   </data>
   <data name="transitionEndLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1255,13 +1312,13 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;transitionEndLabel.ZOrder" xml:space="preserve">
-    <value>37</value>
+    <value>39</value>
   </data>
   <data name="transitionStartComboBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>188, 151</value>
   </data>
   <data name="transitionStartComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="transitionStartComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>19</value>
@@ -1276,7 +1333,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;transitionStartComboBox.ZOrder" xml:space="preserve">
-    <value>38</value>
+    <value>40</value>
   </data>
   <data name="transitionStartLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1306,13 +1363,13 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;transitionStartLabel.ZOrder" xml:space="preserve">
-    <value>39</value>
+    <value>41</value>
   </data>
   <data name="fileWriter1ComboBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>188, 243</value>
+    <value>188, 266</value>
   </data>
   <data name="fileWriter1ComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="fileWriter1ComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>26</value>
@@ -1327,13 +1384,13 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;fileWriter1ComboBox.ZOrder" xml:space="preserve">
-    <value>40</value>
+    <value>42</value>
   </data>
   <data name="printer1ComboBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>188, 197</value>
   </data>
   <data name="printer1ComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="printer1ComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>23</value>
@@ -1348,13 +1405,13 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;printer1ComboBox.ZOrder" xml:space="preserve">
-    <value>41</value>
+    <value>43</value>
   </data>
   <data name="dataEntryComboBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>188, 128</value>
   </data>
   <data name="dataEntryComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 21</value>
+    <value>282, 21</value>
   </data>
   <data name="dataEntryComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>17</value>
@@ -1369,7 +1426,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;dataEntryComboBox.ZOrder" xml:space="preserve">
-    <value>42</value>
+    <value>44</value>
   </data>
   <data name="fileWritersLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1378,7 +1435,7 @@
     <value>NoControl</value>
   </data>
   <data name="fileWritersLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>20, 248</value>
+    <value>20, 271</value>
   </data>
   <data name="fileWritersLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>56, 13</value>
@@ -1399,7 +1456,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;fileWritersLabel.ZOrder" xml:space="preserve">
-    <value>43</value>
+    <value>45</value>
   </data>
   <data name="printersLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1429,7 +1486,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;printersLabel.ZOrder" xml:space="preserve">
-    <value>44</value>
+    <value>46</value>
   </data>
   <data name="dataEntryLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1459,10 +1516,10 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;dataEntryLabel.ZOrder" xml:space="preserve">
-    <value>45</value>
+    <value>47</value>
   </data>
   <data name="notesTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>402, 220</value>
+    <value>502, 220</value>
   </data>
   <data name="notesTextBox.Multiline" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1483,7 +1540,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;notesTextBox.ZOrder" xml:space="preserve">
-    <value>46</value>
+    <value>48</value>
   </data>
   <data name="label18.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1492,7 +1549,7 @@
     <value>NoControl</value>
   </data>
   <data name="label18.Location" type="System.Drawing.Point, System.Drawing">
-    <value>399, 202</value>
+    <value>499, 202</value>
   </data>
   <data name="label18.Size" type="System.Drawing.Size, System.Drawing">
     <value>35, 13</value>
@@ -1513,13 +1570,13 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;label18.ZOrder" xml:space="preserve">
-    <value>47</value>
+    <value>49</value>
   </data>
   <data name="variantTextBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>188, 105</value>
   </data>
   <data name="variantTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>579, 20</value>
+    <value>679, 20</value>
   </data>
   <data name="variantTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>13</value>
@@ -1534,7 +1591,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;variantTextBox.ZOrder" xml:space="preserve">
-    <value>48</value>
+    <value>50</value>
   </data>
   <data name="variantLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1564,7 +1621,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;variantLabel.ZOrder" xml:space="preserve">
-    <value>49</value>
+    <value>51</value>
   </data>
   <data name="lastChangedOnTextBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>402, 82</value>
@@ -1585,7 +1642,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;lastChangedOnTextBox.ZOrder" xml:space="preserve">
-    <value>50</value>
+    <value>52</value>
   </data>
   <data name="label15.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1615,7 +1672,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;label15.ZOrder" xml:space="preserve">
-    <value>51</value>
+    <value>53</value>
   </data>
   <data name="lastChangedByTextBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>188, 82</value>
@@ -1636,7 +1693,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;lastChangedByTextBox.ZOrder" xml:space="preserve">
-    <value>52</value>
+    <value>54</value>
   </data>
   <data name="label16.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1666,7 +1723,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;label16.ZOrder" xml:space="preserve">
-    <value>53</value>
+    <value>55</value>
   </data>
   <data name="createdOnTextBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>402, 59</value>
@@ -1687,7 +1744,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;createdOnTextBox.ZOrder" xml:space="preserve">
-    <value>54</value>
+    <value>56</value>
   </data>
   <data name="label14.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1717,7 +1774,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;label14.ZOrder" xml:space="preserve">
-    <value>55</value>
+    <value>57</value>
   </data>
   <data name="createdByTextBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>188, 59</value>
@@ -1738,7 +1795,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;createdByTextBox.ZOrder" xml:space="preserve">
-    <value>56</value>
+    <value>58</value>
   </data>
   <data name="label13.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1768,13 +1825,13 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;label13.ZOrder" xml:space="preserve">
-    <value>57</value>
+    <value>59</value>
   </data>
   <data name="descriptionTextBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>188, 36</value>
   </data>
   <data name="descriptionTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>579, 20</value>
+    <value>679, 20</value>
   </data>
   <data name="descriptionTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -1789,7 +1846,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;descriptionTextBox.ZOrder" xml:space="preserve">
-    <value>58</value>
+    <value>60</value>
   </data>
   <data name="label12.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1819,13 +1876,13 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;label12.ZOrder" xml:space="preserve">
-    <value>59</value>
+    <value>61</value>
   </data>
   <data name="procNameTextBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>188, 13</value>
   </data>
   <data name="procNameTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>217, 20</value>
+    <value>317, 20</value>
   </data>
   <data name="procNameTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -1840,7 +1897,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;procNameTextBox.ZOrder" xml:space="preserve">
-    <value>60</value>
+    <value>62</value>
   </data>
   <data name="label1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1870,7 +1927,7 @@
     <value>generalTabPage</value>
   </data>
   <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>61</value>
+    <value>63</value>
   </data>
   <data name="generalTabPage.Location" type="System.Drawing.Point, System.Drawing">
     <value>4, 34</value>
@@ -1879,7 +1936,7 @@
     <value>3, 3, 3, 3</value>
   </data>
   <data name="generalTabPage.Size" type="System.Drawing.Size, System.Drawing">
-    <value>923, 433</value>
+    <value>923, 456</value>
   </data>
   <data name="generalTabPage.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -2149,7 +2206,7 @@
     <value>0, 0</value>
   </data>
   <data name="tabControl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>931, 471</value>
+    <value>931, 494</value>
   </data>
   <data name="tabControl.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -2191,7 +2248,7 @@
     <value>sharedButtons</value>
   </data>
   <data name="&gt;&gt;sharedButtons.Type" xml:space="preserve">
-    <value>TBF.UI.Shared.SharedButtons, TBF, Version=3.4.1981.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.UI.Shared.SharedButtons, TBF, Version=3.9.2132.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;sharedButtons.Parent" xml:space="preserve">
     <value>mainSplitContainer.Panel2</value>
@@ -2212,7 +2269,7 @@
     <value>1</value>
   </data>
   <data name="mainSplitContainer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1034, 471</value>
+    <value>1034, 494</value>
   </data>
   <data name="mainSplitContainer.SplitterDistance" type="System.Int32, mscorlib">
     <value>931</value>
@@ -2239,7 +2296,7 @@
     <value>6, 13</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>1034, 471</value>
+    <value>1034, 494</value>
   </data>
   <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
     <value>CenterParent</value>

TBF/UI/Procedures/ProceduresCtrl.cs

@@ -893,6 +893,7 @@ namespace TBF.UI.Procedures
             newProcedure.ObtainedByCopy = false;
             newProcedure.CreationUser = CurrentUser.UserName();
             newProcedure.CreationTime = DateTime.Now;
+            newProcedure.ResultsPrinter = dlg.SelectedProfile.Name;
 
             if (new ProcedureDlg(newProcedure, GetUsedNames(false), ProcedureDlg.Mode.Unlocked, parent).ShowDialog() == DialogResult.OK)
             {

TBF/UI/Process/ProcessTabPageCtrl.cs

@@ -37,6 +37,9 @@ namespace TBF.UI.Process
             Count
         }
 
+        int qfromIx;
+        int qtoIx;
+        int testtimeIx;
         int startMassIx;
         int massIx;
         int volumeIx;
@@ -69,6 +72,16 @@ namespace TBF.UI.Process
                 catch (Exception e) { log.ErrorFormat("ProcessTabPageCtrl.OnTestSelected() failed: {0}", e.Message); }
             };
 
+            Bridge.FlowDetectedHandler += delegate (object sender, FlowDetectedEventArgs args)
+            {
+                try
+                {
+                    if (InvokeRequired) Invoke(new EventHandler<FlowDetectedEventArgs>(OnFlowDetected), sender, args);
+                    else OnFlowDetected(sender, args);
+                }
+                catch (Exception e) { log.ErrorFormat("ProcessTabPageCtrl.OnFlowDetected() failed: {0}", e.Message); }
+            };
+
             Bridge.StateMachineTickHandler += delegate(object sndr, UiBridge.StateMachineTickEventArgs args)
             {
                 if (InvokeRequired) { Invoke(new EventHandler<UiBridge.StateMachineTickEventArgs>(OnStateMachineTick), sndr, args); }
@@ -203,52 +216,57 @@ namespace TBF.UI.Process
             lv.Items.Add(new ListViewItem(new string[] {
                 Strings.Repetition,
                 args != null ? string.Format("{0} / {1}", args.RepetitionNr, args.Test.Repeats) : "---",
-                string.Empty
+                string.Empty,
             }));
 
+            double qfrom = (args != null) ? args.Test.QfromM3ph() : 0;
+            qfromIx = lv.Items.Count;
             lv.Items.Add(new ListViewItem(new string[] {
                 Strings.Q_from,
-                args != null ? Units.ConvertTo(ProcessData.FlowUnit, args.Test.QfromM3ph()).ToString() : "---",
-                ProcessData.FlowUnit.ToDescription()
+                (qfrom > 0) ? Units.ConvertTo(ProcessData.FlowUnit, qfrom).ToString() : "---",
+                (ProcessData.FlowUnit == Unit.None ? Unit.m3ph : ProcessData.FlowUnit).ToDescription(),
             }));
 
+            double qto = (args != null) ? args.Test.QtoM3ph() : 0;
+            qtoIx = lv.Items.Count;
             lv.Items.Add(new ListViewItem(new string[] {
                 Strings.Q_to,
-                args != null ? Units.ConvertTo(ProcessData.FlowUnit, args.Test.QtoM3ph()).ToString() : "---",
-                ProcessData.FlowUnit.ToDescription()
+                (qto > 0) ? Units.ConvertTo(ProcessData.FlowUnit, qto).ToString() : "---",
+                (ProcessData.FlowUnit == Unit.None ? Unit.m3ph : ProcessData.FlowUnit).ToDescription(),
             }));
 
             lv.Items.Add(new ListViewItem(new string[] {
                 Strings.Target_volume,
                 args != null ? Units.ConvertTo(ProcessData.VolumeUnit, args.Test.Volume).ToString() : "---",
-                ProcessData.VolumeUnit.ToDescription()
+                (ProcessData.VolumeUnit == Unit.None ? Unit.l : ProcessData.VolumeUnit).ToDescription(),
             }));
 
+            testtimeIx = lv.Items.Count;
             lv.Items.Add(new ListViewItem(new string[] {
                 Strings.Test_time,
                 args != null ? args.Test.TestTime.ToString() : "---",
-                Unit.s.ToDescription()
+                Unit.s.ToDescription(),
             }));
 
             startMassIx = lv.Items.Count;
             lv.Items.Add(new ListViewItem(new string[] {
                 Strings.Start_mass,
                 "---",
-                ProcessData.MassUnit.ToDescription()
+                (ProcessData.MassUnit == Unit.None ? Unit.kg : ProcessData.MassUnit).ToDescription(),
             }));
 
             massIx = lv.Items.Count;
             lv.Items.Add(new ListViewItem(new string[] {
                 Strings.Mass,
                 "---",
-                ProcessData.MassUnit.ToDescription()
+                (ProcessData.MassUnit == Unit.None ? Unit.kg : ProcessData.MassUnit).ToDescription(),
             }));
 
             volumeIx = lv.Items.Count;
             lv.Items.Add(new ListViewItem(new string[] {
                 Strings.Volume,
                 "---",
-                ProcessData.VolumeUnit.ToDescription()
+                (ProcessData.VolumeUnit == Unit.None ? Unit.l : ProcessData.VolumeUnit).ToDescription(),
             }));
 
             refErrorIx = lv.Items.Count;
@@ -1078,6 +1096,18 @@ namespace TBF.UI.Process
             compoundDetectionTextBox.AppendText(args.Message + Environment.NewLine);
         }
 
+        void OnFlowDetected(object sender, FlowDetectedEventArgs args)
+        {
+            if (args != null && testDataListView.Items.Count > testtimeIx)
+            {
+                double qfrom = Units.ConvertTo(ProcessData.FlowUnit, args.Qfrom);
+                testDataListView.Items[qfromIx].SubItems[1].Text = qfrom.ToString(Common.Utils.SignificantDigitsToFmt(qfrom, 3));
+                double qto = Units.ConvertTo(ProcessData.FlowUnit, args.Qto);
+                testDataListView.Items[qtoIx].SubItems[1].Text = qto.ToString(Common.Utils.SignificantDigitsToFmt(qto, 3));
+                testDataListView.Items[testtimeIx].SubItems[1].Text = args.TestTime.ToString("F1");
+            }
+        }
+
         void OnTestCompleted(object sender, TestCompletedEventArgs args)
         {
             if (args.TestRslt == null || ProcessData.RegisterReaders == null || ProcessData.BatchRslts == null

TBF/UI/Settings/UpgradeSelectionDlg.cs

@@ -236,60 +236,6 @@ namespace TBF.UI.Settings
                 (!upgradeResultsDBCheckBox.Checked || resultsDbCommands.Length == 0 ||
                  ExecuteCommands(new MySqlConnection(Results.DB.ConnectionString), resultsDbCommands)))
             {
-                if (upgradeConfigDBCheckBox.Checked)
-                {
-                    ISession session = null;
-                    try
-                    {
-                        session = TBF.DB.CreateSession(DBKind.Config);
-
-                        var tests = session.QueryOver<Config.Entities.Test>().List();
-                        foreach (var t in tests)
-                        {
-                            string singlePrecStr = Convert.ToSingle(t.Qtg).ToString();
-                            if (t.Qtg.ToString().Length > 2 * singlePrecStr.Length) t.Qtg = double.Parse(singlePrecStr);
-                        
-                            singlePrecStr = Convert.ToSingle(t.Qfrom).ToString();
-                            if (t.Qfrom.ToString().Length > 2 * singlePrecStr.Length) t.Qfrom = double.Parse(singlePrecStr);
-                        
-                            singlePrecStr = Convert.ToSingle(t.Qto).ToString();
-                            if (t.Qto.ToString().Length > 2 * singlePrecStr.Length) t.Qto = double.Parse(singlePrecStr);
-                        
-                            singlePrecStr = Convert.ToSingle(t.Volume).ToString();
-                            if (t.Volume.ToString().Length > 2 * singlePrecStr.Length) t.Volume = double.Parse(singlePrecStr);
-                        
-                            singlePrecStr = Convert.ToSingle(t.TestTime).ToString();
-                            if (t.TestTime.ToString().Length > 2 * singlePrecStr.Length) t.TestTime = double.Parse(singlePrecStr);
-                        
-                            session.SaveOrUpdate(t);
-                        }
-
-                        var mcorrections = session.QueryOver<Config.Entities.MeasurementCorrection>().List();
-                        foreach (var mc in mcorrections)
-                        {
-                            string singlePrecStr = Convert.ToSingle(mc.Measurement).ToString();
-                            if (mc.Measurement.ToString().Length > 2 * singlePrecStr.Length) mc.Measurement = double.Parse(singlePrecStr);
-
-                            singlePrecStr = Convert.ToSingle(mc.Correction).ToString();
-                            if (mc.Correction.ToString().Length > 2 * singlePrecStr.Length) mc.Correction = double.Parse(singlePrecStr);
-
-                            session.SaveOrUpdate(mc);
-                        }
-
-                        session.Flush();
-                    }
-                    catch (Exception exc)
-                    {
-                        ActivityEnd();
-                        MessageBox.Show(string.Format("Test flow rounding after a conversion to double failed:\r\n{0}", exc.Message),
-                                        "Error", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    }
-                    finally
-                    {
-                        if (session != null && session.IsOpen) session.Close();
-                    }
-                }
-
                 ActivityEnd();
                 MessageBox.Show("DB succesfully upgraded", "Confirmation", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 upgradeDb_302_303_Button.Enabled = false;
@@ -448,9 +394,13 @@ namespace TBF.UI.Settings
             string[] configDbCommands = new string[]
             {
                 "ALTER TABLE `ptest` ADD `FlowId` VARCHAR(255) NOT NULL DEFAULT 'Q3' AFTER `Part`;",
+                "ALTER TABLE `component` CHANGE `Parameters` `Parameters` VARCHAR(12000) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;",
             };
 
-            string[] resultsDbCommands = new string[] { };
+            string[] resultsDbCommands = new string[]
+            {
+                "ALTER TABLE `testdata` ADD `IsFromToInPct` BOOLEAN NOT NULL DEFAULT FALSE AFTER `Qto`;",
+            };
 
             if (!upgradeConfigDBCheckBox.Checked && !upgradeResultsDBCheckBox.Checked)
             {
@@ -465,10 +415,69 @@ namespace TBF.UI.Settings
                 (!upgradeResultsDBCheckBox.Checked || resultsDbCommands.Length == 0 ||
                  ExecuteCommands(new MySqlConnection(Results.DB.ConnectionString), resultsDbCommands)))
             {
+                if (upgradeConfigDBCheckBox.Checked)
+                {
+                    RoundFlowsAfterConversionToDbl();
+                }
+
                 ActivityEnd();
                 MessageBox.Show("DB succesfully upgraded", "Confirmation", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 upgradeDb_308_309_Button.Enabled = false;
             }
         }
+
+        private void RoundFlowsAfterConversionToDbl()
+        {
+            ISession session = null;
+            try
+            {
+                session = TBF.DB.CreateSession(DBKind.Config);
+
+                var tests = session.QueryOver<Config.Entities.Test>().List();
+                foreach (var t in tests)
+                {
+                    string singlePrecStr = Convert.ToSingle(t.Qtg).ToString();
+                    if (t.Qtg.ToString().Length > 2 * singlePrecStr.Length) t.Qtg = double.Parse(singlePrecStr);
+
+                    singlePrecStr = Convert.ToSingle(t.Qfrom).ToString();
+                    if (t.Qfrom.ToString().Length > 2 * singlePrecStr.Length) t.Qfrom = double.Parse(singlePrecStr);
+
+                    singlePrecStr = Convert.ToSingle(t.Qto).ToString();
+                    if (t.Qto.ToString().Length > 2 * singlePrecStr.Length) t.Qto = double.Parse(singlePrecStr);
+
+                    singlePrecStr = Convert.ToSingle(t.Volume).ToString();
+                    if (t.Volume.ToString().Length > 2 * singlePrecStr.Length) t.Volume = double.Parse(singlePrecStr);
+
+                    singlePrecStr = Convert.ToSingle(t.TestTime).ToString();
+                    if (t.TestTime.ToString().Length > 2 * singlePrecStr.Length) t.TestTime = double.Parse(singlePrecStr);
+
+                    session.SaveOrUpdate(t);
+                }
+
+                var mcorrections = session.QueryOver<Config.Entities.MeasurementCorrection>().List();
+                foreach (var mc in mcorrections)
+                {
+                    string singlePrecStr = Convert.ToSingle(mc.Measurement).ToString();
+                    if (mc.Measurement.ToString().Length > 2 * singlePrecStr.Length) mc.Measurement = double.Parse(singlePrecStr);
+
+                    singlePrecStr = Convert.ToSingle(mc.Correction).ToString();
+                    if (mc.Correction.ToString().Length > 2 * singlePrecStr.Length) mc.Correction = double.Parse(singlePrecStr);
+
+                    session.SaveOrUpdate(mc);
+                }
+
+                session.Flush();
+            }
+            catch (Exception exc)
+            {
+                ActivityEnd();
+                MessageBox.Show(string.Format("Test flow rounding after a conversion to double failed:\r\n{0}", exc.Message),
+                                "Error", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            }
+            finally
+            {
+                if (session != null && session.IsOpen) session.Close();
+            }
+        }
     }
 }

TBF/UI/Shared/NoBenchOrDatabaseDlg.cs

@@ -27,7 +27,7 @@ namespace TBF.UI.Shared
         {
             Text = Strings.Error;
 			errorMessageLabel.Text = (Message != null) ? Message : Strings.Cannot_connect_to_the_database;
-            exitButton.Text = Strings.ExitBtnText;
+            exitButton.Text = Strings.Exit;
             retryButton.Text = Strings.RetryDatabaseText;
             configureButton.Text = Strings.ConfigureDatabaseText;
 			if (!ShowRetry) retryButton.Enabled = false;

TBF/UiBridge/Bridge.cs

@@ -77,10 +77,24 @@ namespace TBF.UiBridge
 		public static event EventHandler<TestSelectedEventArgs> TestSelectedHandler;
 
 
-		/// <summary>
-		/// Called from the state machine when progress bars need to be updated.
-		/// </summary>
-		public static void OnTestProgress(object sender, TestProgressEventArgs data)
+        /// <summary>
+        /// Called from the state machine when a test is selected and UI needs to be updated.
+        /// </summary>
+        public static void OnFlowDetected(object sender, FlowDetectedEventArgs data)
+        {
+            TBF.Rig.Sequences.ProcessData.ClearProcessValues();
+
+            if (FlowDetectedHandler == null) return;
+            try { FlowDetectedHandler(sender, data); }
+            catch (Exception e) { log.Error("FlowDetectedHandler(...) failed", e); }
+        }
+        public static event EventHandler<FlowDetectedEventArgs> FlowDetectedHandler;
+
+
+        /// <summary>
+        /// Called from the state machine when progress bars need to be updated.
+        /// </summary>
+        public static void OnTestProgress(object sender, TestProgressEventArgs data)
 		{
             if (TestProgressHandler == null) return;
 			try { TestProgressHandler(sender, data); }

TBF/UiBridge/FlowDetectedEventArgs.cs

@@ -0,0 +1,25 @@
+///
+/// Copyright (c) 2023 Sensus Slovensko a.s.
+///
+using System;
+
+namespace TBF.UiBridge
+{
+    public class FlowDetectedEventArgs : EventArgs
+    {
+        public double Qdetected;    /// Detected from in [m3/h]
+        public double Qfrom;        /// Lower limit for the test flow in [m3/h]
+        public double Qto;          /// Upper limit for the test flow in [m3/h]
+        public double TestTime;     /// Estimated test time in [s]
+        public int TotalPulses;     /// Total reference meter pulses
+
+        public FlowDetectedEventArgs(double qDetected, double qFrom, double qTo, double testTime, int totalPulses)
+        {
+            Qdetected = qDetected;
+            Qfrom = qFrom;
+            Qto = qTo;
+            TestTime = testTime;
+            TotalPulses = totalPulses;
+        }
+    }
+}

WorkflowConfigurator/Program.cs

@@ -135,7 +135,7 @@ namespace WorkflowConfigurator
             {
                 if (exc is QuitAppException)
                 {
-                    ModelessForm.CloseForm();
+                    //ModelessForm.CloseForm();
                     log.FatalFormat("Program was not running: {0}", exc.Message);
                     MessageBox.Show(exc.Message,
                                     Strings.Warning,

Workplace/WorkplaceDlg.cs

@@ -37,6 +37,8 @@ namespace Workplace
         public ISessionFactory SessionFactory;
 		public ISession dbSession;
 
+        Common.Forms.ModelessForm modelessForm;
+
         public IList<OrderInfo> AllOrders;          /// All orders including the finished ones
         IList<OrderInfo> orders;                    /// New and active orders from the database
         IList<Process> workflows;		            /// Workflows from the database
@@ -98,8 +100,8 @@ namespace Workplace
                 System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("en");
             }
 
-            var form = new Common.Forms.ModelessForm(Strings.Loading_configuration_from_a_database);
-            new System.Threading.Thread(() => Application.Run(form)).Start();
+            modelessForm = new Common.Forms.ModelessForm(Strings.Loading_configuration_from_a_database);
+            new System.Threading.Thread(() => Application.Run(modelessForm)).Start();
             
             InitializeComponent();
 
@@ -142,7 +144,7 @@ namespace Workplace
 
 					if (rslt != DialogResult.Yes)
 					{
-                        Common.Forms.ModelessForm.CloseForm();
+                        if (modelessForm != null) modelessForm.CloseForm();
                         throw new Common.QuitAppException(Strings.Opening_database_failed);
 					}
 				}
@@ -153,7 +155,7 @@ namespace Workplace
                     var dr = Configure();
                     if (dr != DialogResult.OK)
                     {
-                        Common.Forms.ModelessForm.CloseForm();
+                        if (modelessForm != null) modelessForm.CloseForm();
                         throw new Common.QuitAppException(Strings.Opening_database_failed);
                     }
                 }
@@ -269,7 +271,7 @@ namespace Workplace
                 }
             }
 
-            Common.Forms.ModelessForm.CloseForm();
+            if (modelessForm != null) modelessForm.CloseForm();
             loadedOnce = true;
             supressUINotifications = false;