Reconfigured for iPerl

Config/Config.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -28,7 +28,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

Config/Properties/AssemblyInfo.cs

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

Results/Entities/WaterMeter.cs

@@ -87,6 +87,17 @@ namespace Results.Entities
             return passed;
         }
 
+
+        public virtual string PassedColorStr()
+        {
+#if PUCHONG_PT200
+			return Passed ? "OK|Green" : "NG|Red";
+#else
+            return Passed ? "OK|Green" : "NOK|Red";
+#endif
+        }
+
+
 		///
 		/// Not mapped to the database
 		///

Results/ItemID.cs

@@ -111,6 +111,14 @@ namespace Results
 		End_state_aux,					/// 101
 		Q_rise,							/// 102
 		Q_fall,							/// 103
+
+        OrigCalibFactor,            	/// 104
+		CalibFactor,	                /// 105
+		Q2ErrWOCorrection,              /// 106
+		Q2CorrectionDone,               /// 107
+        Q2CorrRFlow,	                /// 108
+        Q2CorrLFlow,                	/// 109
+        Q2CorrFlowRight,            	/// 110
 								
         Count,
     }

Results/Properties/AssemblyInfo.cs

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

Results/Resources/Strings.cs.resx

@@ -201,4 +201,7 @@
   <data name="Water_Meter" xml:space="preserve">
     <value>Vodoměr</value>
   </data>
+  <data name="Batch_nr" xml:space="preserve">
+    <value>Číslo dávky</value>
+  </data>
 </root>

Results/Results.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -27,7 +27,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

Results/WMeterRsltItemSpec.cs

@@ -168,7 +168,7 @@ namespace Results
 #else
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, Strings.Error + "()", Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).Error).ToString(string.IsNullOrEmpty(p) ? "F2" : p)));
 #endif
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed, Strings.Result + "()", Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PassedColorStr()));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed, Strings.Result + "()", Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => string.IsNullOrEmpty(t) ? w.PassedColorStr() : ((w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PassedColorStr())));
 
             /// Water meter info
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Watermeter_type, Strings.WM_Type, Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => w.WaterMeterData.ProductName));
@@ -269,7 +269,17 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.TempLoEnd,           "T lo en",                  Quantity.Temperature,   ItemCategory.Other,	(w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetTestRslt(t).Custom8).ToString(string.IsNullOrEmpty(p) ? "F3" : p)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.TempLoAve,           "T lo av",                  Quantity.Temperature,   ItemCategory.Other,	(w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, (w.GetTestRslt(t).Custom7 + w.GetTestRslt(t).Custom8) / 2).ToString(string.IsNullOrEmpty(p) ? "F3" : p)));
 #endif
-		}
+
+#if IPERL
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.OrigCalibFactor, "iPerl OrigCalibFactor", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => (w.OrigCalibFactor.ToString())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.CalibFactor, "iPerl CalibFactor", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => (w.CalibFactor.ToString())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2ErrWOCorrection, "iPerl Q2ErrWOCorrection", Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.Q2ErrWOCorrection.ToString(string.IsNullOrEmpty(p) ? "F2" : p))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrectionDone, "iPerl Q2CorrectionDone", Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => (w.Q2CorrectionDone ? "yes" : "no")));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrRFlow, "iPerl Q2CorrRFlow", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => (w.Q2CorrRFlow.ToString())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrLFlow, "iPerl Q2CorrLFlow", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => (w.Q2CorrLFlow.ToString())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrFlowRight, "iPerl Q2CorrFlowRight", Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.Q2CorrFlowRight.ToString())));
+#endif
+        }
 
         /// <summary>
         /// Converts a list of 'Output item specifications' to a string array

ResultsBrowser/Forms/DatabaseSettingsDlg.Designer.cs

@@ -28,162 +28,204 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.connectionStringTextBox1 = new System.Windows.Forms.TextBox();
-			this.benchNameLabel = new System.Windows.Forms.Label();
-			this.connectionStringLabel = new System.Windows.Forms.Label();
-			this.connectionStringTextBox2 = new System.Windows.Forms.TextBox();
-			this.connectionStringTextBox3 = new System.Windows.Forms.TextBox();
-			this.okButton = new System.Windows.Forms.Button();
-			this.cancelButton = new System.Windows.Forms.Button();
-			this.benchNameTextBox1 = new System.Windows.Forms.TextBox();
-			this.benchNameTextBox2 = new System.Windows.Forms.TextBox();
-			this.benchNameTextBox3 = new System.Windows.Forms.TextBox();
-			this.languageLabel = new System.Windows.Forms.Label();
-			this.languageTextBox = new System.Windows.Forms.TextBox();
-			this.formatLabel = new System.Windows.Forms.Label();
-			this.timePeriodFormatTextBox = new System.Windows.Forms.TextBox();
-			this.SuspendLayout();
-			// 
-			// connectionStringTextBox1
-			// 
-			this.connectionStringTextBox1.Location = new System.Drawing.Point(157, 45);
-			this.connectionStringTextBox1.Name = "connectionStringTextBox1";
-			this.connectionStringTextBox1.Size = new System.Drawing.Size(555, 20);
-			this.connectionStringTextBox1.TabIndex = 0;
-			// 
-			// benchNameLabel
-			// 
-			this.benchNameLabel.AutoSize = true;
-			this.benchNameLabel.Location = new System.Drawing.Point(26, 20);
-			this.benchNameLabel.Name = "benchNameLabel";
-			this.benchNameLabel.Size = new System.Drawing.Size(67, 13);
-			this.benchNameLabel.TabIndex = 1;
-			this.benchNameLabel.Text = "Bench name";
-			// 
-			// connectionStringLabel
-			// 
-			this.connectionStringLabel.AutoSize = true;
-			this.connectionStringLabel.Location = new System.Drawing.Point(154, 20);
-			this.connectionStringLabel.Name = "connectionStringLabel";
-			this.connectionStringLabel.Size = new System.Drawing.Size(89, 13);
-			this.connectionStringLabel.TabIndex = 3;
-			this.connectionStringLabel.Text = "Connection string";
-			// 
-			// connectionStringTextBox2
-			// 
-			this.connectionStringTextBox2.Location = new System.Drawing.Point(157, 71);
-			this.connectionStringTextBox2.Name = "connectionStringTextBox2";
-			this.connectionStringTextBox2.Size = new System.Drawing.Size(555, 20);
-			this.connectionStringTextBox2.TabIndex = 2;
-			// 
-			// connectionStringTextBox3
-			// 
-			this.connectionStringTextBox3.Location = new System.Drawing.Point(157, 97);
-			this.connectionStringTextBox3.Name = "connectionStringTextBox3";
-			this.connectionStringTextBox3.Size = new System.Drawing.Size(555, 20);
-			this.connectionStringTextBox3.TabIndex = 4;
-			// 
-			// okButton
-			// 
-			this.okButton.Location = new System.Drawing.Point(506, 194);
-			this.okButton.Name = "okButton";
-			this.okButton.Size = new System.Drawing.Size(95, 38);
-			this.okButton.TabIndex = 6;
-			this.okButton.Text = "OK";
-			this.okButton.UseVisualStyleBackColor = true;
-			this.okButton.Click += new System.EventHandler(this.okButton_Click);
-			// 
-			// cancelButton
-			// 
-			this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.cancelButton.Location = new System.Drawing.Point(617, 194);
-			this.cancelButton.Name = "cancelButton";
-			this.cancelButton.Size = new System.Drawing.Size(95, 38);
-			this.cancelButton.TabIndex = 7;
-			this.cancelButton.Text = "Cancel";
-			this.cancelButton.UseVisualStyleBackColor = true;
-			this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
-			// 
-			// benchNameTextBox1
-			// 
-			this.benchNameTextBox1.Location = new System.Drawing.Point(29, 45);
-			this.benchNameTextBox1.Name = "benchNameTextBox1";
-			this.benchNameTextBox1.Size = new System.Drawing.Size(100, 20);
-			this.benchNameTextBox1.TabIndex = 8;
-			// 
-			// benchNameTextBox2
-			// 
-			this.benchNameTextBox2.Location = new System.Drawing.Point(29, 71);
-			this.benchNameTextBox2.Name = "benchNameTextBox2";
-			this.benchNameTextBox2.Size = new System.Drawing.Size(100, 20);
-			this.benchNameTextBox2.TabIndex = 9;
-			// 
-			// benchNameTextBox3
-			// 
-			this.benchNameTextBox3.Location = new System.Drawing.Point(29, 97);
-			this.benchNameTextBox3.Name = "benchNameTextBox3";
-			this.benchNameTextBox3.Size = new System.Drawing.Size(100, 20);
-			this.benchNameTextBox3.TabIndex = 10;
-			// 
-			// languageLabel
-			// 
-			this.languageLabel.AutoSize = true;
-			this.languageLabel.Location = new System.Drawing.Point(26, 183);
-			this.languageLabel.Name = "languageLabel";
-			this.languageLabel.Size = new System.Drawing.Size(55, 13);
-			this.languageLabel.TabIndex = 11;
-			this.languageLabel.Text = "Language";
-			// 
-			// languageTextBox
-			// 
-			this.languageTextBox.Location = new System.Drawing.Point(29, 207);
-			this.languageTextBox.Name = "languageTextBox";
-			this.languageTextBox.Size = new System.Drawing.Size(100, 20);
-			this.languageTextBox.TabIndex = 12;
-			// 
-			// formatLabel
-			// 
-			this.formatLabel.AutoSize = true;
-			this.formatLabel.Location = new System.Drawing.Point(26, 129);
-			this.formatLabel.Name = "formatLabel";
-			this.formatLabel.Size = new System.Drawing.Size(39, 13);
-			this.formatLabel.TabIndex = 13;
-			this.formatLabel.Text = "Format";
-			// 
-			// timePeriodFormatTextBox
-			// 
-			this.timePeriodFormatTextBox.Location = new System.Drawing.Point(29, 151);
-			this.timePeriodFormatTextBox.Name = "timePeriodFormatTextBox";
-			this.timePeriodFormatTextBox.Size = new System.Drawing.Size(683, 20);
-			this.timePeriodFormatTextBox.TabIndex = 14;
-			// 
-			// DatabaseSettingsDlg
-			// 
-			this.AcceptButton = this.okButton;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.cancelButton;
-			this.ClientSize = new System.Drawing.Size(743, 254);
-			this.Controls.Add(this.timePeriodFormatTextBox);
-			this.Controls.Add(this.formatLabel);
-			this.Controls.Add(this.languageTextBox);
-			this.Controls.Add(this.languageLabel);
-			this.Controls.Add(this.benchNameTextBox3);
-			this.Controls.Add(this.benchNameTextBox2);
-			this.Controls.Add(this.benchNameTextBox1);
-			this.Controls.Add(this.cancelButton);
-			this.Controls.Add(this.okButton);
-			this.Controls.Add(this.connectionStringTextBox3);
-			this.Controls.Add(this.connectionStringLabel);
-			this.Controls.Add(this.connectionStringTextBox2);
-			this.Controls.Add(this.benchNameLabel);
-			this.Controls.Add(this.connectionStringTextBox1);
-			this.Name = "DatabaseSettingsDlg";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Database Settings";
-			this.Load += new System.EventHandler(this.DatabaseSettings_Load);
-			this.ResumeLayout(false);
-			this.PerformLayout();
+            this.connectionStringTextBox1 = new System.Windows.Forms.TextBox();
+            this.benchNameLabel = new System.Windows.Forms.Label();
+            this.connectionStringLabel = new System.Windows.Forms.Label();
+            this.connectionStringTextBox2 = new System.Windows.Forms.TextBox();
+            this.connectionStringTextBox3 = new System.Windows.Forms.TextBox();
+            this.okButton = new System.Windows.Forms.Button();
+            this.cancelButton = new System.Windows.Forms.Button();
+            this.benchNameTextBox1 = new System.Windows.Forms.TextBox();
+            this.benchNameTextBox2 = new System.Windows.Forms.TextBox();
+            this.benchNameTextBox3 = new System.Windows.Forms.TextBox();
+            this.languageLabel = new System.Windows.Forms.Label();
+            this.languageTextBox = new System.Windows.Forms.TextBox();
+            this.formatLabel = new System.Windows.Forms.Label();
+            this.timePeriodFormatTextBox = new System.Windows.Forms.TextBox();
+            this.benchNameTextBox5 = new System.Windows.Forms.TextBox();
+            this.benchNameTextBox4 = new System.Windows.Forms.TextBox();
+            this.connectionStringTextBox5 = new System.Windows.Forms.TextBox();
+            this.connectionStringTextBox4 = new System.Windows.Forms.TextBox();
+            this.SuspendLayout();
+            // 
+            // connectionStringTextBox1
+            // 
+            this.connectionStringTextBox1.Location = new System.Drawing.Point(157, 45);
+            this.connectionStringTextBox1.Name = "connectionStringTextBox1";
+            this.connectionStringTextBox1.Size = new System.Drawing.Size(555, 20);
+            this.connectionStringTextBox1.TabIndex = 3;
+            // 
+            // benchNameLabel
+            // 
+            this.benchNameLabel.AutoSize = true;
+            this.benchNameLabel.Location = new System.Drawing.Point(26, 20);
+            this.benchNameLabel.Name = "benchNameLabel";
+            this.benchNameLabel.Size = new System.Drawing.Size(67, 13);
+            this.benchNameLabel.TabIndex = 0;
+            this.benchNameLabel.Text = "Bench name";
+            // 
+            // connectionStringLabel
+            // 
+            this.connectionStringLabel.AutoSize = true;
+            this.connectionStringLabel.Location = new System.Drawing.Point(154, 20);
+            this.connectionStringLabel.Name = "connectionStringLabel";
+            this.connectionStringLabel.Size = new System.Drawing.Size(89, 13);
+            this.connectionStringLabel.TabIndex = 1;
+            this.connectionStringLabel.Text = "Connection string";
+            // 
+            // connectionStringTextBox2
+            // 
+            this.connectionStringTextBox2.Location = new System.Drawing.Point(157, 71);
+            this.connectionStringTextBox2.Name = "connectionStringTextBox2";
+            this.connectionStringTextBox2.Size = new System.Drawing.Size(555, 20);
+            this.connectionStringTextBox2.TabIndex = 5;
+            // 
+            // connectionStringTextBox3
+            // 
+            this.connectionStringTextBox3.Location = new System.Drawing.Point(157, 97);
+            this.connectionStringTextBox3.Name = "connectionStringTextBox3";
+            this.connectionStringTextBox3.Size = new System.Drawing.Size(555, 20);
+            this.connectionStringTextBox3.TabIndex = 7;
+            // 
+            // okButton
+            // 
+            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.okButton.Location = new System.Drawing.Point(506, 250);
+            this.okButton.Name = "okButton";
+            this.okButton.Size = new System.Drawing.Size(95, 38);
+            this.okButton.TabIndex = 16;
+            this.okButton.Text = "OK";
+            this.okButton.UseVisualStyleBackColor = true;
+            this.okButton.Click += new System.EventHandler(this.okButton_Click);
+            // 
+            // cancelButton
+            // 
+            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.cancelButton.Location = new System.Drawing.Point(617, 250);
+            this.cancelButton.Name = "cancelButton";
+            this.cancelButton.Size = new System.Drawing.Size(95, 38);
+            this.cancelButton.TabIndex = 17;
+            this.cancelButton.Text = "Cancel";
+            this.cancelButton.UseVisualStyleBackColor = true;
+            this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
+            // 
+            // benchNameTextBox1
+            // 
+            this.benchNameTextBox1.Location = new System.Drawing.Point(29, 45);
+            this.benchNameTextBox1.Name = "benchNameTextBox1";
+            this.benchNameTextBox1.Size = new System.Drawing.Size(100, 20);
+            this.benchNameTextBox1.TabIndex = 2;
+            // 
+            // benchNameTextBox2
+            // 
+            this.benchNameTextBox2.Location = new System.Drawing.Point(29, 71);
+            this.benchNameTextBox2.Name = "benchNameTextBox2";
+            this.benchNameTextBox2.Size = new System.Drawing.Size(100, 20);
+            this.benchNameTextBox2.TabIndex = 4;
+            // 
+            // benchNameTextBox3
+            // 
+            this.benchNameTextBox3.Location = new System.Drawing.Point(29, 97);
+            this.benchNameTextBox3.Name = "benchNameTextBox3";
+            this.benchNameTextBox3.Size = new System.Drawing.Size(100, 20);
+            this.benchNameTextBox3.TabIndex = 6;
+            // 
+            // languageLabel
+            // 
+            this.languageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.languageLabel.AutoSize = true;
+            this.languageLabel.Location = new System.Drawing.Point(26, 239);
+            this.languageLabel.Name = "languageLabel";
+            this.languageLabel.Size = new System.Drawing.Size(55, 13);
+            this.languageLabel.TabIndex = 14;
+            this.languageLabel.Text = "Language";
+            // 
+            // languageTextBox
+            // 
+            this.languageTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.languageTextBox.Location = new System.Drawing.Point(29, 263);
+            this.languageTextBox.Name = "languageTextBox";
+            this.languageTextBox.Size = new System.Drawing.Size(100, 20);
+            this.languageTextBox.TabIndex = 15;
+            // 
+            // formatLabel
+            // 
+            this.formatLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.formatLabel.AutoSize = true;
+            this.formatLabel.Location = new System.Drawing.Point(26, 185);
+            this.formatLabel.Name = "formatLabel";
+            this.formatLabel.Size = new System.Drawing.Size(39, 13);
+            this.formatLabel.TabIndex = 12;
+            this.formatLabel.Text = "Format";
+            // 
+            // timePeriodFormatTextBox
+            // 
+            this.timePeriodFormatTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.timePeriodFormatTextBox.Location = new System.Drawing.Point(29, 207);
+            this.timePeriodFormatTextBox.Name = "timePeriodFormatTextBox";
+            this.timePeriodFormatTextBox.Size = new System.Drawing.Size(683, 20);
+            this.timePeriodFormatTextBox.TabIndex = 13;
+            // 
+            // benchNameTextBox5
+            // 
+            this.benchNameTextBox5.Location = new System.Drawing.Point(29, 149);
+            this.benchNameTextBox5.Name = "benchNameTextBox5";
+            this.benchNameTextBox5.Size = new System.Drawing.Size(100, 20);
+            this.benchNameTextBox5.TabIndex = 10;
+            // 
+            // benchNameTextBox4
+            // 
+            this.benchNameTextBox4.Location = new System.Drawing.Point(29, 123);
+            this.benchNameTextBox4.Name = "benchNameTextBox4";
+            this.benchNameTextBox4.Size = new System.Drawing.Size(100, 20);
+            this.benchNameTextBox4.TabIndex = 8;
+            // 
+            // connectionStringTextBox5
+            // 
+            this.connectionStringTextBox5.Location = new System.Drawing.Point(157, 149);
+            this.connectionStringTextBox5.Name = "connectionStringTextBox5";
+            this.connectionStringTextBox5.Size = new System.Drawing.Size(555, 20);
+            this.connectionStringTextBox5.TabIndex = 11;
+            // 
+            // connectionStringTextBox4
+            // 
+            this.connectionStringTextBox4.Location = new System.Drawing.Point(157, 123);
+            this.connectionStringTextBox4.Name = "connectionStringTextBox4";
+            this.connectionStringTextBox4.Size = new System.Drawing.Size(555, 20);
+            this.connectionStringTextBox4.TabIndex = 9;
+            // 
+            // DatabaseSettingsDlg
+            // 
+            this.AcceptButton = this.okButton;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.cancelButton;
+            this.ClientSize = new System.Drawing.Size(743, 310);
+            this.Controls.Add(this.benchNameTextBox5);
+            this.Controls.Add(this.benchNameTextBox4);
+            this.Controls.Add(this.connectionStringTextBox5);
+            this.Controls.Add(this.connectionStringTextBox4);
+            this.Controls.Add(this.timePeriodFormatTextBox);
+            this.Controls.Add(this.formatLabel);
+            this.Controls.Add(this.languageTextBox);
+            this.Controls.Add(this.languageLabel);
+            this.Controls.Add(this.benchNameTextBox3);
+            this.Controls.Add(this.benchNameTextBox2);
+            this.Controls.Add(this.benchNameTextBox1);
+            this.Controls.Add(this.cancelButton);
+            this.Controls.Add(this.okButton);
+            this.Controls.Add(this.connectionStringTextBox3);
+            this.Controls.Add(this.connectionStringLabel);
+            this.Controls.Add(this.connectionStringTextBox2);
+            this.Controls.Add(this.benchNameLabel);
+            this.Controls.Add(this.connectionStringTextBox1);
+            this.Name = "DatabaseSettingsDlg";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Database Settings";
+            this.Load += new System.EventHandler(this.DatabaseSettings_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
 		}
 
@@ -203,5 +245,9 @@
         private System.Windows.Forms.TextBox languageTextBox;
 		private System.Windows.Forms.Label formatLabel;
 		private System.Windows.Forms.TextBox timePeriodFormatTextBox;
+        private System.Windows.Forms.TextBox benchNameTextBox5;
+        private System.Windows.Forms.TextBox benchNameTextBox4;
+        private System.Windows.Forms.TextBox connectionStringTextBox5;
+        private System.Windows.Forms.TextBox connectionStringTextBox4;
 	}
 }

ResultsBrowser/Forms/DatabaseSettingsDlg.cs

@@ -1,10 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 using ResultsBrowser.Resources;
 
@@ -24,10 +18,14 @@ namespace ResultsBrowser.Forms
             benchNameTextBox1.Text = Program.LocalSettings.Bench1;
             benchNameTextBox2.Text = Program.LocalSettings.Bench2;
             benchNameTextBox3.Text = Program.LocalSettings.Bench3;
+            benchNameTextBox4.Text = Program.LocalSettings.Bench4;
+            benchNameTextBox5.Text = Program.LocalSettings.Bench5;
 
             connectionStringTextBox1.Text = Program.LocalSettings.ConnectionString1;
 			connectionStringTextBox2.Text = Program.LocalSettings.ConnectionString2;
 			connectionStringTextBox3.Text = Program.LocalSettings.ConnectionString3;
+            connectionStringTextBox4.Text = Program.LocalSettings.ConnectionString4;
+            connectionStringTextBox5.Text = Program.LocalSettings.ConnectionString5;
 
 			timePeriodFormatTextBox.Text = Program.LocalSettings.TimePeriodFormat;
 
@@ -50,10 +48,14 @@ namespace ResultsBrowser.Forms
             Program.LocalSettings.Bench1 = benchNameTextBox1.Text;
             Program.LocalSettings.Bench2 = benchNameTextBox2.Text;
             Program.LocalSettings.Bench3 = benchNameTextBox3.Text;
+            Program.LocalSettings.Bench4 = benchNameTextBox4.Text;
+            Program.LocalSettings.Bench5 = benchNameTextBox5.Text;
 
             Program.LocalSettings.ConnectionString1 = connectionStringTextBox1.Text;
 			Program.LocalSettings.ConnectionString2 = connectionStringTextBox2.Text;
 			Program.LocalSettings.ConnectionString3 = connectionStringTextBox3.Text;
+            Program.LocalSettings.ConnectionString4 = connectionStringTextBox4.Text;
+            Program.LocalSettings.ConnectionString5 = connectionStringTextBox5.Text;
 
 			Program.LocalSettings.TimePeriodFormat = timePeriodFormatTextBox.Text;
 

ResultsBrowser/LocalSettings.cs

@@ -27,15 +27,21 @@ namespace ResultsBrowser
         public string Bench1;
         public string Bench2;
         public string Bench3;
+        public string Bench4;
+        public string Bench5;
 
         /// Database settings of servers.
 		public string ConnectionString1;
 		public string ConnectionString2;
 		public string ConnectionString3;
+        public string ConnectionString4;
+        public string ConnectionString5;
 
         public bool Bench1Selected;
         public bool Bench2Selected;
         public bool Bench3Selected;
+        public bool Bench4Selected;
+        public bool Bench5Selected;
 
 		public string TimePeriodFormat;
 

ResultsBrowser/Properties/AssemblyInfo.cs

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

ResultsBrowser/ResultsBrowser.csproj

@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -31,7 +31,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

ResultsBrowser/ResultsBrowserWnd.Designer.cs

@@ -45,6 +45,8 @@
             this.executeQueryBtn = new System.Windows.Forms.Button();
             this.addFilterBtn = new System.Windows.Forms.Button();
             this.testBenchesGroupBox = new System.Windows.Forms.GroupBox();
+            this.checkBox5 = new System.Windows.Forms.RadioButton();
+            this.checkBox4 = new System.Windows.Forms.RadioButton();
             this.checkBox3 = new System.Windows.Forms.RadioButton();
             this.checkBox2 = new System.Windows.Forms.RadioButton();
             this.checkBox1 = new System.Windows.Forms.RadioButton();
@@ -151,7 +153,7 @@
             // 
             // statisticsBtn
             // 
-            this.statisticsBtn.Location = new System.Drawing.Point(8, 562);
+            this.statisticsBtn.Location = new System.Drawing.Point(8, 581);
             this.statisticsBtn.Name = "statisticsBtn";
             this.statisticsBtn.Size = new System.Drawing.Size(125, 33);
             this.statisticsBtn.TabIndex = 10;
@@ -161,7 +163,7 @@
             // 
             // printQueryResultsBtn
             // 
-            this.printQueryResultsBtn.Location = new System.Drawing.Point(8, 487);
+            this.printQueryResultsBtn.Location = new System.Drawing.Point(8, 506);
             this.printQueryResultsBtn.Name = "printQueryResultsBtn";
             this.printQueryResultsBtn.Size = new System.Drawing.Size(125, 33);
             this.printQueryResultsBtn.TabIndex = 9;
@@ -171,7 +173,7 @@
             // 
             // exportQueryResultsBtn
             // 
-            this.exportQueryResultsBtn.Location = new System.Drawing.Point(8, 448);
+            this.exportQueryResultsBtn.Location = new System.Drawing.Point(8, 467);
             this.exportQueryResultsBtn.Name = "exportQueryResultsBtn";
             this.exportQueryResultsBtn.Size = new System.Drawing.Size(125, 33);
             this.exportQueryResultsBtn.TabIndex = 8;
@@ -181,7 +183,7 @@
             // 
             // formatOfResultsBtn
             // 
-            this.formatOfResultsBtn.Location = new System.Drawing.Point(8, 255);
+            this.formatOfResultsBtn.Location = new System.Drawing.Point(8, 274);
             this.formatOfResultsBtn.Name = "formatOfResultsBtn";
             this.formatOfResultsBtn.Size = new System.Drawing.Size(125, 33);
             this.formatOfResultsBtn.TabIndex = 7;
@@ -191,7 +193,7 @@
             // 
             // clearFiltersBtn
             // 
-            this.clearFiltersBtn.Location = new System.Drawing.Point(8, 177);
+            this.clearFiltersBtn.Location = new System.Drawing.Point(8, 196);
             this.clearFiltersBtn.Name = "clearFiltersBtn";
             this.clearFiltersBtn.Size = new System.Drawing.Size(125, 33);
             this.clearFiltersBtn.TabIndex = 2;
@@ -211,7 +213,7 @@
             // 
             // saveConfigBtn
             // 
-            this.saveConfigBtn.Location = new System.Drawing.Point(8, 294);
+            this.saveConfigBtn.Location = new System.Drawing.Point(8, 313);
             this.saveConfigBtn.Name = "saveConfigBtn";
             this.saveConfigBtn.Size = new System.Drawing.Size(125, 33);
             this.saveConfigBtn.TabIndex = 5;
@@ -221,7 +223,7 @@
             // 
             // loadConfigBtn
             // 
-            this.loadConfigBtn.Location = new System.Drawing.Point(8, 333);
+            this.loadConfigBtn.Location = new System.Drawing.Point(8, 352);
             this.loadConfigBtn.Name = "loadConfigBtn";
             this.loadConfigBtn.Size = new System.Drawing.Size(125, 33);
             this.loadConfigBtn.TabIndex = 4;
@@ -231,7 +233,7 @@
             // 
             // executeQueryBtn
             // 
-            this.executeQueryBtn.Location = new System.Drawing.Point(8, 409);
+            this.executeQueryBtn.Location = new System.Drawing.Point(8, 428);
             this.executeQueryBtn.Name = "executeQueryBtn";
             this.executeQueryBtn.Size = new System.Drawing.Size(125, 33);
             this.executeQueryBtn.TabIndex = 6;
@@ -241,7 +243,7 @@
             // 
             // addFilterBtn
             // 
-            this.addFilterBtn.Location = new System.Drawing.Point(8, 216);
+            this.addFilterBtn.Location = new System.Drawing.Point(8, 235);
             this.addFilterBtn.Name = "addFilterBtn";
             this.addFilterBtn.Size = new System.Drawing.Size(125, 33);
             this.addFilterBtn.TabIndex = 3;
@@ -251,20 +253,46 @@
             // 
             // testBenchesGroupBox
             // 
+            this.testBenchesGroupBox.Controls.Add(this.checkBox5);
+            this.testBenchesGroupBox.Controls.Add(this.checkBox4);
             this.testBenchesGroupBox.Controls.Add(this.checkBox3);
             this.testBenchesGroupBox.Controls.Add(this.checkBox2);
             this.testBenchesGroupBox.Controls.Add(this.checkBox1);
             this.testBenchesGroupBox.Location = new System.Drawing.Point(8, 54);
             this.testBenchesGroupBox.Name = "testBenchesGroupBox";
-            this.testBenchesGroupBox.Size = new System.Drawing.Size(125, 99);
+            this.testBenchesGroupBox.Size = new System.Drawing.Size(125, 135);
             this.testBenchesGroupBox.TabIndex = 1;
             this.testBenchesGroupBox.TabStop = false;
             this.testBenchesGroupBox.Text = "Test benches";
             // 
+            // checkBox5
+            // 
+            this.checkBox5.AutoSize = true;
+            this.checkBox5.Location = new System.Drawing.Point(23, 106);
+            this.checkBox5.Name = "checkBox5";
+            this.checkBox5.Size = new System.Drawing.Size(85, 17);
+            this.checkBox5.TabIndex = 4;
+            this.checkBox5.TabStop = true;
+            this.checkBox5.Text = "radioButton5";
+            this.checkBox5.UseVisualStyleBackColor = true;
+            this.checkBox5.CheckedChanged += new System.EventHandler(this.checkBox5_CheckedChanged);
+            // 
+            // checkBox4
+            // 
+            this.checkBox4.AutoSize = true;
+            this.checkBox4.Location = new System.Drawing.Point(23, 86);
+            this.checkBox4.Name = "checkBox4";
+            this.checkBox4.Size = new System.Drawing.Size(85, 17);
+            this.checkBox4.TabIndex = 3;
+            this.checkBox4.TabStop = true;
+            this.checkBox4.Text = "radioButton4";
+            this.checkBox4.UseVisualStyleBackColor = true;
+            this.checkBox4.CheckedChanged += new System.EventHandler(this.checkBox4_CheckedChanged);
+            // 
             // checkBox3
             // 
             this.checkBox3.AutoSize = true;
-            this.checkBox3.Location = new System.Drawing.Point(23, 69);
+            this.checkBox3.Location = new System.Drawing.Point(23, 65);
             this.checkBox3.Name = "checkBox3";
             this.checkBox3.Size = new System.Drawing.Size(85, 17);
             this.checkBox3.TabIndex = 2;
@@ -276,7 +304,7 @@
             // checkBox2
             // 
             this.checkBox2.AutoSize = true;
-            this.checkBox2.Location = new System.Drawing.Point(23, 46);
+            this.checkBox2.Location = new System.Drawing.Point(23, 44);
             this.checkBox2.Name = "checkBox2";
             this.checkBox2.Size = new System.Drawing.Size(85, 17);
             this.checkBox2.TabIndex = 1;
@@ -344,5 +372,7 @@
         private System.Windows.Forms.Button printQueryResultsBtn;
         private System.Windows.Forms.Button statisticsBtn;
         private System.Windows.Forms.ListView resultsListView;
+        private System.Windows.Forms.RadioButton checkBox5;
+        private System.Windows.Forms.RadioButton checkBox4;
     }
 }

ResultsBrowser/ResultsBrowserWnd.cs

@@ -5,6 +5,7 @@ using NHibernate;
 using Results.Entities;
 using ResultsBrowser.Filters;
 using ResultsBrowser.Resources;
+using System.IO;
 
 namespace ResultsBrowser
 {
@@ -49,6 +50,8 @@ namespace ResultsBrowser
             checkBox1.Checked = Program.LocalSettings.Bench1Selected;
             checkBox2.Checked = Program.LocalSettings.Bench2Selected;
             checkBox3.Checked = Program.LocalSettings.Bench3Selected;
+            checkBox4.Checked = Program.LocalSettings.Bench4Selected;
+            checkBox5.Checked = Program.LocalSettings.Bench5Selected;
 
             if (args.Length == 1 && args[0].IndexOf(".qry") == args[0].Length - 4)
             {
@@ -69,10 +72,14 @@ namespace ResultsBrowser
             checkBox1.Text = Program.LocalSettings.Bench1;
             checkBox2.Text = Program.LocalSettings.Bench2;
             checkBox3.Text = Program.LocalSettings.Bench3;
+            checkBox4.Text = Program.LocalSettings.Bench4;
+            checkBox5.Text = Program.LocalSettings.Bench5;
 
             checkBox1.Visible = !string.IsNullOrEmpty(checkBox1.Text);
             checkBox2.Visible = !string.IsNullOrEmpty(checkBox2.Text);
             checkBox3.Visible = !string.IsNullOrEmpty(checkBox3.Text);
+            checkBox4.Visible = !string.IsNullOrEmpty(checkBox4.Text);
+            checkBox5.Visible = !string.IsNullOrEmpty(checkBox5.Text);
         }
 
 		string BenchName()
@@ -110,12 +117,16 @@ namespace ResultsBrowser
         private void checkBox1_CheckedChanged(object sender, EventArgs e) { SaveCheckBoxes(); }
         private void checkBox2_CheckedChanged(object sender, EventArgs e) { SaveCheckBoxes(); }
         private void checkBox3_CheckedChanged(object sender, EventArgs e) { SaveCheckBoxes(); }
+        private void checkBox4_CheckedChanged(object sender, EventArgs e) { SaveCheckBoxes(); }
+        private void checkBox5_CheckedChanged(object sender, EventArgs e) { SaveCheckBoxes(); }
 
         void SaveCheckBoxes()
         {
             Program.LocalSettings.Bench1Selected = checkBox1.Checked;
             Program.LocalSettings.Bench2Selected = checkBox2.Checked;
             Program.LocalSettings.Bench3Selected = checkBox3.Checked;
+            Program.LocalSettings.Bench4Selected = checkBox4.Checked;
+            Program.LocalSettings.Bench5Selected = checkBox5.Checked;
             Program.LocalSettings.Save();
         }
 
@@ -214,7 +225,9 @@ namespace ResultsBrowser
                 Results.DB.ConnectionString = checkBox1.Checked ? Program.LocalSettings.ConnectionString1 :
                                              (checkBox2.Checked ? Program.LocalSettings.ConnectionString2 :
                                              (checkBox3.Checked ? Program.LocalSettings.ConnectionString3 :
-                                                                  Program.LocalSettings.ConnectionString1));
+                                             (checkBox4.Checked ? Program.LocalSettings.ConnectionString4 :
+                                             (checkBox5.Checked ? Program.LocalSettings.ConnectionString5 :
+                                                                  Program.LocalSettings.ConnectionString1))));
 
                 ISession[] sessions = new ISession[] { Results.DB.CreateSession() };
 
@@ -259,8 +272,15 @@ namespace ResultsBrowser
                     ListViewItem lvi = null;
                     foreach (var item in items)
                     {
-                        if (lvi == null) lvi = new ListViewItem(item.Print(wm));
-                        else lvi.SubItems.Add(item.Print(wm));
+                        /// Get text and strip color information
+                        string itemText = item.Print(wm);
+                        string[] texts = itemText.Split(new char[] { '|' });
+                        if (texts.Length == 2) { itemText = texts[0]; }
+
+                        if (lvi == null)
+                            lvi = new ListViewItem(itemText);
+                        else
+                            lvi.SubItems.Add(itemText);
                     }
                     if (lvi != null) resultsListView.Items.Add(lvi);
                 }
@@ -288,8 +308,52 @@ namespace ResultsBrowser
 
         private void exportQueryResultsBtn_Click(object sender, EventArgs e)
         {
-            if (waterMeters == null || waterMeters.Count == 0) return;
+            IList<Results.WMeterRsltItemSpec> items = Results.WMeterRsltItemSpec.FromStrArray(filtersConfig.ResultItems);
 
+            if (waterMeters == null || waterMeters.Count == 0 || items.Count == 0) return;
+
+            SaveFileDialog dlg = new SaveFileDialog();
+
+            if (dlg.ShowDialog() == DialogResult.OK)
+            {
+                using (TextWriter writer = new StreamWriter(dlg.FileName))
+                {
+                    try
+                    {
+                        for (int i = 0; i < items.Count; i++)
+                        {
+                            writer.Write(items[i].Caption);
+
+                            if (i == items.Count - 1)
+                                writer.WriteLine();     /// New line after the last item
+                            else
+                                writer.Write(";");      /// Semicolon between two items
+                        }
+
+                        foreach (var wm in waterMeters)
+                        {
+                            for (int i = 0; i < items.Count; i++)
+                            {
+                                /// Get text and strip color information
+                                string itemText = items[i].Print(wm);
+                                string[] texts = itemText.Split(new char[] { '|' });
+                                if (texts.Length == 2) { itemText = texts[0]; }
+
+                                writer.Write(itemText);
+
+                                if (i == items.Count - 1)
+                                    writer.WriteLine();     /// New line after the last item
+                                else
+                                    writer.Write(";");      /// Semicolon between two items
+                            }
+                        }
+                    }
+                    catch (Exception exc)
+                    {
+                        MessageBox.Show(exc.Message, Strings.Error_displaying_results, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+                    }
+                }
+            }
         }
 
         private void printQueryResultsBtn_Click(object sender, EventArgs e)

TestBenchFramework/BenchControl/Sequences/MainSeq.cs

@@ -1096,9 +1096,7 @@ namespace TBF.BenchControl.Sequences
                     Bridge.OnActivity(this, Strings.Please_select_a_cycle_a_test_or_empty);
                 }
 
-                bool saveResultsActive = (context == MKSelContext.InsideProcedure)
-                                      && (StateMachine.Procedure != null)
-                                      && (!StateMachine.Procedure.MustBeComplete || BatchRslts.AllTestsDone()); 
+                bool saveResultsActive = (context == MKSelContext.InsideProcedure) && (StateMachine.Procedure != null); 
 
                 /// Enable appropriate UI controls and buttons
                 Bridge.Bench2UI(((context == MKSelContext.ProcedureNotSelected) ? ButtonsEtc.ProcedureCmbBoxEn : 0) |

TestBenchFramework/BenchControl/Sequences/ProcessData.cs

@@ -31,6 +31,9 @@ namespace TBF.BenchControl.Sequences
 		public static DateTime  TestStartTime;
 		public static DateTime  TestEndTime;
 
+        public static double StartTime;
+        public static double EndTime;
+
 		/// Heat meters only
 		public static DoubleBox TempRefHi1 = new DoubleBox() { Name = "T hi ac 1", Format = "F3" };						/// [°C]
 		public static DoubleBox TempRefHi2 = new DoubleBox() { Name = "T hi ac 2", Format = "F3" };						/// [°C]

TestBenchFramework/BenchControl/Sequences/SequenceBase.cs

@@ -73,12 +73,22 @@ namespace TBF.BenchControl.Sequences
         ///
         /// Process data logging
         ///
-        public void LogProcessHeader(ILog logger)
+        public void LogProcessDataTestInfo(ILog logger, string procedureName, string testName)
         {
-            LogProcessHeader(logger, null);
+            logger.Info(Environment.NewLine);
+            logger.InfoFormat("{0}={1:dd.MM.yyyy HH:mm:ss}  {2}={3}  {4}={5}  {6}={7}",
+                              Strings.Date_and_time, TestStartTime,
+                              Strings.Batch_nr, BatchRslts.Batch.BatchNr,
+                              Strings.Procedure, procedureName,
+                              Strings.Test, testName);
         }
 
-        public void LogProcessHeader(ILog logger, string sectionName)
+        public void LogProcessDataHeader(ILog logger)
+        {
+            LogProcessDataHeader(logger, null);
+        }
+
+        public void LogProcessDataHeader(ILog logger, string sectionName)
         {
             logger.Info(Environment.NewLine);
             if (sectionName != null) logger.Info(sectionName);
@@ -108,7 +118,7 @@ namespace TBF.BenchControl.Sequences
                                outPath.RegulValve.Position.ToString("F1"));
         }
 
-		public void LogProcessHeaderHeatMeters(ILog logger, string sectionName)
+		public void LogProcessDataHeaderHeatMeters(ILog logger, string sectionName)
 		{
 			logger.Info(Environment.NewLine);
 			if (sectionName != null) logger.Info(sectionName);
@@ -742,6 +752,64 @@ namespace TBF.BenchControl.Sequences
 			return Event.Done;
 		}
 
+
+        /// <summary>
+        /// Update temperature, pressure, water density and ambient values
+        /// including their statistics in the test results structure.
+        /// </summary>
+        /// <param name="tstRslt">Test results</param>
+        protected void UpdateTempPressDensAmb(Results.Entities.TestRslt tstRslt)
+        {
+            tstRslt.AmbTempMean = (float)AmbTempStat.Average;
+            tstRslt.AmbTempStart = (float)AmbTempStat.First;
+            tstRslt.AmbTempEnd = (float)AmbTempStat.Last;
+            tstRslt.AmbTempMin = (float)AmbTempStat.Min;
+            tstRslt.AmbTempMax = (float)AmbTempStat.Max;
+            tstRslt.AmbPressMean = (float)AmbPressStat.Average;
+            tstRslt.AmbPressStart = (float)AmbPressStat.First;
+            tstRslt.AmbPressEnd = (float)AmbPressStat.Last;
+            tstRslt.AmbPressMin = (float)AmbPressStat.Min;
+            tstRslt.AmbPressMax = (float)AmbPressStat.Max;
+            tstRslt.AmbHumiMean = (float)AmbHumiStat.Average;
+            tstRslt.AmbHumiStart = (float)AmbHumiStat.First;
+            tstRslt.AmbHumiEnd = (float)AmbHumiStat.Last;
+            tstRslt.AmbHumiMin = (float)AmbHumiStat.Min;
+            tstRslt.AmbHumiMax = (float)AmbHumiStat.Max;
+            tstRslt.PressUpMean = (float)PressUpStat.Average;
+            tstRslt.PressUpStart = (float)PressUpStat.First;
+            tstRslt.PressUpEnd = (float)PressUpStat.Last;
+            tstRslt.PressUpMin = (float)PressUpStat.Min;
+            tstRslt.PressUpMax = (float)PressUpStat.Max;
+            tstRslt.PressDownMean = (float)PressDownStat.Average;
+            tstRslt.PressDownStart = (float)PressDownStat.First;
+            tstRslt.PressDownEnd = (float)PressDownStat.Last;
+            tstRslt.PressDownMin = (float)PressDownStat.Min;
+            tstRslt.PressDownMax = (float)PressDownStat.Max;
+            tstRslt.PressDeltaMean = (float)PressDeltaStat.Average;
+            tstRslt.PressDeltaStart = (float)PressDeltaStat.First;
+            tstRslt.PressDeltaEnd = (float)PressDeltaStat.Last;
+            tstRslt.PressDeltaMin = (float)PressDeltaStat.Min;
+            tstRslt.PressDeltaMax = (float)PressDeltaStat.Max;
+            tstRslt.TempUpMean = (float)TempUpStat.Average;
+            tstRslt.TempUpStart = (float)TempUpStat.First;
+            tstRslt.TempUpEnd = (float)TempUpStat.Last;
+            tstRslt.TempUpMin = (float)TempUpStat.Min;
+            tstRslt.TempUpMax = (float)TempUpStat.Max;
+            tstRslt.TempDownMean = (float)TempDownStat.Average;
+            tstRslt.TempDownStart = (float)TempDownStat.First;
+            tstRslt.TempDownEnd = (float)TempDownStat.Last;
+            tstRslt.TempDownMin = (float)TempDownStat.Min;
+            tstRslt.TempDownMax = (float)TempDownStat.Max;
+            tstRslt.TempDivMean = (float)TempDivStat.Average;
+            tstRslt.TempDivStart = (float)TempDivStat.First;
+            tstRslt.TempDivEnd = (float)TempDivStat.Last;
+            tstRslt.TempDivMin = (float)TempDivStat.Min;
+            tstRslt.TempDivMax = (float)TempDivStat.Max;
+            tstRslt.DensityIn = Formulas.WaterDensityFromTemp(tstRslt.TempUpMean);		/// [kg/m3]
+            tstRslt.DensityOut = Formulas.WaterDensityFromTemp(tstRslt.TempDownMean);	/// [kg/m3]
+            tstRslt.DensityDiv = Formulas.WaterDensityFromTemp(tstRslt.TempDivMean);	/// [kg/m3]
+        }
+
         
         protected string TestResult2CsvLine(string testName, int part)
 		{

TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs

@@ -289,55 +289,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
 
 				if (tstRslt != null)
 				{
-					/// Auxiliary results
-					tstRslt.AmbTempMean = (float)AmbTempStat.Average;
-					tstRslt.AmbTempStart = (float)AmbTempStat.First;
-					tstRslt.AmbTempEnd = (float)AmbTempStat.Last;
-					tstRslt.AmbTempMin = (float)AmbTempStat.Min;
-					tstRslt.AmbTempMax = (float)AmbTempStat.Max;
-					tstRslt.AmbPressMean = (float)AmbPressStat.Average;
-					tstRslt.AmbPressStart = (float)AmbPressStat.First;
-					tstRslt.AmbPressEnd = (float)AmbPressStat.Last;
-					tstRslt.AmbPressMin = (float)AmbPressStat.Min;
-					tstRslt.AmbPressMax = (float)AmbPressStat.Max;
-					tstRslt.AmbHumiMean = (float)AmbHumiStat.Average;
-					tstRslt.AmbHumiStart = (float)AmbHumiStat.First;
-					tstRslt.AmbHumiEnd = (float)AmbHumiStat.Last;
-					tstRslt.AmbHumiMin = (float)AmbHumiStat.Min;
-					tstRslt.AmbHumiMax = (float)AmbHumiStat.Max;
-					tstRslt.PressUpMean = (float)PressUpStat.Average;
-					tstRslt.PressUpStart = (float)PressUpStat.First;
-					tstRslt.PressUpEnd = (float)PressUpStat.Last;
-					tstRslt.PressUpMin = (float)PressUpStat.Min;
-					tstRslt.PressUpMax = (float)PressUpStat.Max;
-					tstRslt.PressDownMean = (float)PressDownStat.Average;
-					tstRslt.PressDownStart = (float)PressDownStat.First;
-					tstRslt.PressDownEnd = (float)PressDownStat.Last;
-					tstRslt.PressDownMin = (float)PressDownStat.Min;
-					tstRslt.PressDownMax = (float)PressDownStat.Max;
-					tstRslt.PressDeltaMean = (float)PressDeltaStat.Average;
-					tstRslt.PressDeltaStart = (float)PressDeltaStat.First;
-					tstRslt.PressDeltaEnd = (float)PressDeltaStat.Last;
-					tstRslt.PressDeltaMin = (float)PressDeltaStat.Min;
-					tstRslt.PressDeltaMax = (float)PressDeltaStat.Max;
-					tstRslt.TempUpMean = (float)TempUpStat.Average;
-					tstRslt.TempUpStart = (float)TempUpStat.First;
-					tstRslt.TempUpEnd = (float)TempUpStat.Last;
-					tstRslt.TempUpMin = (float)TempUpStat.Min;
-					tstRslt.TempUpMax = (float)TempUpStat.Max;
-					tstRslt.TempDownMean = (float)TempDownStat.Average;
-					tstRslt.TempDownStart = (float)TempDownStat.First;
-					tstRslt.TempDownEnd = (float)TempDownStat.Last;
-					tstRslt.TempDownMin = (float)TempDownStat.Min;
-					tstRslt.TempDownMax = (float)TempDownStat.Max;
-					tstRslt.TempDivMean = (float)TempDivStat.Average;
-					tstRslt.TempDivStart = (float)TempDivStat.First;
-					tstRslt.TempDivEnd = (float)TempDivStat.Last;
-					tstRslt.TempDivMin = (float)TempDivStat.Min;
-					tstRslt.TempDivMax = (float)TempDivStat.Max;
-					tstRslt.DensityIn  = Formulas.WaterDensityFromTemp(tstRslt.TempUpMean);		/// [kg/m3]
-					tstRslt.DensityOut = Formulas.WaterDensityFromTemp(tstRslt.TempDownMean);    /// [kg/m3]
-					tstRslt.DensityDiv = Formulas.WaterDensityFromTemp(tstRslt.TempDivMean);    /// [kg/m3]
+                    UpdateTempPressDensAmb(tstRslt);
 
 					/// Main results
 					tstRslt.StartTime    = TestStartTime;

TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs

@@ -603,55 +603,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
 
 			if (tstRslt != null)
 			{
-				/// Auxiliary results
-				tstRslt.AmbTempMean = (float)AmbTempStat.Average;
-				tstRslt.AmbTempStart = (float)AmbTempStat.First;
-				tstRslt.AmbTempEnd = (float)AmbTempStat.Last;
-				tstRslt.AmbTempMin = (float)AmbTempStat.Min;
-				tstRslt.AmbTempMax = (float)AmbTempStat.Max;
-				tstRslt.AmbPressMean = (float)AmbPressStat.Average;
-				tstRslt.AmbPressStart = (float)AmbPressStat.First;
-				tstRslt.AmbPressEnd = (float)AmbPressStat.Last;
-				tstRslt.AmbPressMin = (float)AmbPressStat.Min;
-				tstRslt.AmbPressMax = (float)AmbPressStat.Max;
-				tstRslt.AmbHumiMean = (float)AmbHumiStat.Average;
-				tstRslt.AmbHumiStart = (float)AmbHumiStat.First;
-				tstRslt.AmbHumiEnd = (float)AmbHumiStat.Last;
-				tstRslt.AmbHumiMin = (float)AmbHumiStat.Min;
-				tstRslt.AmbHumiMax = (float)AmbHumiStat.Max;
-				tstRslt.PressUpMean = (float)PressUpStat.Average;
-				tstRslt.PressUpStart = (float)PressUpStat.First;
-				tstRslt.PressUpEnd = (float)PressUpStat.Last;
-				tstRslt.PressUpMin = (float)PressUpStat.Min;
-				tstRslt.PressUpMax = (float)PressUpStat.Max;
-				tstRslt.PressDownMean = (float)PressDownStat.Average;
-				tstRslt.PressDownStart = (float)PressDownStat.First;
-				tstRslt.PressDownEnd = (float)PressDownStat.Last;
-				tstRslt.PressDownMin = (float)PressDownStat.Min;
-				tstRslt.PressDownMax = (float)PressDownStat.Max;
-				tstRslt.PressDeltaMean = (float)PressDeltaStat.Average;
-				tstRslt.PressDeltaStart = (float)PressDeltaStat.First;
-				tstRslt.PressDeltaEnd = (float)PressDeltaStat.Last;
-				tstRslt.PressDeltaMin = (float)PressDeltaStat.Min;
-				tstRslt.PressDeltaMax = (float)PressDeltaStat.Max;
-				tstRslt.TempUpMean = (float)TempUpStat.Average;
-				tstRslt.TempUpStart = (float)TempUpStat.First;
-				tstRslt.TempUpEnd = (float)TempUpStat.Last;
-				tstRslt.TempUpMin = (float)TempUpStat.Min;
-				tstRslt.TempUpMax = (float)TempUpStat.Max;
-				tstRslt.TempDownMean = (float)TempDownStat.Average;
-				tstRslt.TempDownStart = (float)TempDownStat.First;
-				tstRslt.TempDownEnd = (float)TempDownStat.Last;
-				tstRslt.TempDownMin = (float)TempDownStat.Min;
-				tstRslt.TempDownMax = (float)TempDownStat.Max;
-				tstRslt.TempDivMean = (float)TempDivStat.Average;
-				tstRslt.TempDivStart = (float)TempDivStat.First;
-				tstRslt.TempDivEnd = (float)TempDivStat.Last;
-				tstRslt.TempDivMin = (float)TempDivStat.Min;
-				tstRslt.TempDivMax = (float)TempDivStat.Max;
-				tstRslt.DensityIn  = Formulas.WaterDensityFromTemp(tstRslt.TempUpMean);		/// [kg/m3]
-				tstRslt.DensityOut = Formulas.WaterDensityFromTemp(tstRslt.TempDownMean);	/// [kg/m3]
-				tstRslt.DensityDiv = Formulas.WaterDensityFromTemp(tstRslt.TempDivMean);	/// [kg/m3]
+                UpdateTempPressDensAmb(tstRslt);
 
 				/// Main results
 				tstRslt.StartTime    = TestStartTime;

TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs

@@ -304,55 +304,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
 
                     if (tstRslt != null)
                     {
-                        /// Auxiliary results
-                        tstRslt.AmbTempMean = (float)AmbTempStat.Average;
-                        tstRslt.AmbTempStart = (float)AmbTempStat.First;
-                        tstRslt.AmbTempEnd = (float)AmbTempStat.Last;
-                        tstRslt.AmbTempMin = (float)AmbTempStat.Min;
-                        tstRslt.AmbTempMax = (float)AmbTempStat.Max;
-                        tstRslt.AmbPressMean = (float)AmbPressStat.Average;
-                        tstRslt.AmbPressStart = (float)AmbPressStat.First;
-                        tstRslt.AmbPressEnd = (float)AmbPressStat.Last;
-                        tstRslt.AmbPressMin = (float)AmbPressStat.Min;
-                        tstRslt.AmbPressMax = (float)AmbPressStat.Max;
-                        tstRslt.AmbHumiMean = (float)AmbHumiStat.Average;
-                        tstRslt.AmbHumiStart = (float)AmbHumiStat.First;
-                        tstRslt.AmbHumiEnd = (float)AmbHumiStat.Last;
-                        tstRslt.AmbHumiMin = (float)AmbHumiStat.Min;
-                        tstRslt.AmbHumiMax = (float)AmbHumiStat.Max;
-                        tstRslt.PressUpMean = (float)PressUpStat.Average;
-                        tstRslt.PressUpStart = (float)PressUpStat.First;
-                        tstRslt.PressUpEnd = (float)PressUpStat.Last;
-                        tstRslt.PressUpMin = (float)PressUpStat.Min;
-                        tstRslt.PressUpMax = (float)PressUpStat.Max;
-                        tstRslt.PressDownMean = (float)PressDownStat.Average;
-                        tstRslt.PressDownStart = (float)PressDownStat.First;
-                        tstRslt.PressDownEnd = (float)PressDownStat.Last;
-                        tstRslt.PressDownMin = (float)PressDownStat.Min;
-                        tstRslt.PressDownMax = (float)PressDownStat.Max;
-                        tstRslt.PressDeltaMean = (float)PressDeltaStat.Average;
-                        tstRslt.PressDeltaStart = (float)PressDeltaStat.First;
-                        tstRslt.PressDeltaEnd = (float)PressDeltaStat.Last;
-                        tstRslt.PressDeltaMin = (float)PressDeltaStat.Min;
-                        tstRslt.PressDeltaMax = (float)PressDeltaStat.Max;
-                        tstRslt.TempUpMean = (float)TempUpStat.Average;
-                        tstRslt.TempUpStart = (float)TempUpStat.First;
-                        tstRslt.TempUpEnd = (float)TempUpStat.Last;
-                        tstRslt.TempUpMin = (float)TempUpStat.Min;
-                        tstRslt.TempUpMax = (float)TempUpStat.Max;
-                        tstRslt.TempDownMean = (float)TempDownStat.Average;
-                        tstRslt.TempDownStart = (float)TempDownStat.First;
-                        tstRslt.TempDownEnd = (float)TempDownStat.Last;
-                        tstRslt.TempDownMin = (float)TempDownStat.Min;
-                        tstRslt.TempDownMax = (float)TempDownStat.Max;
-                        tstRslt.TempDivMean = (float)TempDivStat.Average;
-                        tstRslt.TempDivStart = (float)TempDivStat.First;
-                        tstRslt.TempDivEnd = (float)TempDivStat.Last;
-                        tstRslt.TempDivMin = (float)TempDivStat.Min;
-                        tstRslt.TempDivMax = (float)TempDivStat.Max;
-                        tstRslt.DensityIn = Formulas.WaterDensityFromTemp(tstRslt.TempUpMean);		/// [kg/m3]
-                        tstRslt.DensityOut = Formulas.WaterDensityFromTemp(tstRslt.TempDownMean);	/// [kg/m3]
-                        tstRslt.DensityDiv = Formulas.WaterDensityFromTemp(tstRslt.TempDivMean);	/// [kg/m3]
+                        UpdateTempPressDensAmb(tstRslt);
 
                         /// Main results
                         tstRslt.StartTime = TestStartTime;

TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs

@@ -503,55 +503,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
 
 			if (tstRslt != null)
 			{
-				/// Auxiliary results
-				tstRslt.AmbTempMean = (float)AmbTempStat.Average;
-				tstRslt.AmbTempStart = (float)AmbTempStat.First;
-				tstRslt.AmbTempEnd = (float)AmbTempStat.Last;
-				tstRslt.AmbTempMin = (float)AmbTempStat.Min;
-				tstRslt.AmbTempMax = (float)AmbTempStat.Max;
-				tstRslt.AmbPressMean = (float)AmbPressStat.Average;
-				tstRslt.AmbPressStart = (float)AmbPressStat.First;
-				tstRslt.AmbPressEnd = (float)AmbPressStat.Last;
-				tstRslt.AmbPressMin = (float)AmbPressStat.Min;
-				tstRslt.AmbPressMax = (float)AmbPressStat.Max;
-				tstRslt.AmbHumiMean = (float)AmbHumiStat.Average;
-				tstRslt.AmbHumiStart = (float)AmbHumiStat.First;
-				tstRslt.AmbHumiEnd = (float)AmbHumiStat.Last;
-				tstRslt.AmbHumiMin = (float)AmbHumiStat.Min;
-				tstRslt.AmbHumiMax = (float)AmbHumiStat.Max;
-				tstRslt.PressUpMean = (float)PressUpStat.Average;
-				tstRslt.PressUpStart = (float)PressUpStat.First;
-				tstRslt.PressUpEnd = (float)PressUpStat.Last;
-				tstRslt.PressUpMin = (float)PressUpStat.Min;
-				tstRslt.PressUpMax = (float)PressUpStat.Max;
-				tstRslt.PressDownMean = (float)PressDownStat.Average;
-				tstRslt.PressDownStart = (float)PressDownStat.First;
-				tstRslt.PressDownEnd = (float)PressDownStat.Last;
-				tstRslt.PressDownMin = (float)PressDownStat.Min;
-				tstRslt.PressDownMax = (float)PressDownStat.Max;
-				tstRslt.PressDeltaMean = (float)PressDeltaStat.Average;
-				tstRslt.PressDeltaStart = (float)PressDeltaStat.First;
-				tstRslt.PressDeltaEnd = (float)PressDeltaStat.Last;
-				tstRslt.PressDeltaMin = (float)PressDeltaStat.Min;
-				tstRslt.PressDeltaMax = (float)PressDeltaStat.Max;
-				tstRslt.TempUpMean = (float)TempUpStat.Average;
-				tstRslt.TempUpStart = (float)TempUpStat.First;
-				tstRslt.TempUpEnd = (float)TempUpStat.Last;
-				tstRslt.TempUpMin = (float)TempUpStat.Min;
-				tstRslt.TempUpMax = (float)TempUpStat.Max;
-				tstRslt.TempDownMean = (float)TempDownStat.Average;
-				tstRslt.TempDownStart = (float)TempDownStat.First;
-				tstRslt.TempDownEnd = (float)TempDownStat.Last;
-				tstRslt.TempDownMin = (float)TempDownStat.Min;
-				tstRslt.TempDownMax = (float)TempDownStat.Max;
-				tstRslt.TempDivMean = (float)TempDivStat.Average;
-				tstRslt.TempDivStart = (float)TempDivStat.First;
-				tstRslt.TempDivEnd = (float)TempDivStat.Last;
-				tstRslt.TempDivMin = (float)TempDivStat.Min;
-				tstRslt.TempDivMax = (float)TempDivStat.Max;
-				tstRslt.DensityIn = Formulas.WaterDensityFromTemp(tstRslt.TempUpMean);		/// [kg/m3]
-				tstRslt.DensityOut = Formulas.WaterDensityFromTemp(tstRslt.TempDownMean);	/// [kg/m3]
-				tstRslt.DensityDiv = Formulas.WaterDensityFromTemp(tstRslt.TempDivMean);	/// [kg/m3]
+                UpdateTempPressDensAmb(tstRslt);
 
 				/// Main results
 				tstRslt.StartTime = TestStartTime;

TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs

@@ -72,7 +72,6 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
             /// Start the test, initialize test results
             Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
             string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
-            TestStartTime = DateTime.Now;
             TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, 0, Convert.ToInt32(test.TstTime) + 15, 0, 0 });
             Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.JustStarted));
 
@@ -401,6 +400,13 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
             //------------------------------------------------
             Bridge.OnActivity(this, Strings.Measuring_the_weight);
             //------------------------------------------------
+
+            TestStartTime = DateTime.Now;
+            LogProcessDataTestInfo(processDataLogger, test.Procedure.Name, test.Name);
+
+            if (heatMetersPath == null) LogProcessDataHeader(processDataLogger, "Start mass");
+            else LogProcessDataHeaderHeatMeters(processDataLogger, "Start mass");
+
             State.Create(string.Format("{0}({1}) : Measuring the start mass", test.Method, test.Name))
                 .AddOperation(checkUiOp)
 				.AddOperations(measureOperations)
@@ -430,6 +436,10 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
 
             Mass.Val = StartMass.Val;
 
+
+            if (heatMetersPath == null) LogProcessDataHeader(processDataLogger, "Measurement");
+            else LogProcessDataHeaderHeatMeters(processDataLogger, "Measurement");
+
             //------------------------------------------------
             Bridge.OnActivity(this, Strings.Test_in_progress);
             //------------------------------------------------
@@ -457,6 +467,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
             }
             while (!e.Contains(Event.MeasurementStarted));
 
+            StartTime = (double)StateMachine.Time;
 
             State.Create(string.Format("{0}({1}) : Opening the start/stop valve at the beginning of the fixed start test", test.Method, test.Name))
                 .AddOperation(checkUiOp)
@@ -564,6 +575,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
 
         test_completed:
 
+            EndTime = (double)StateMachine.Time;
+
             State.Create(string.Format("{0}({1}) : Closing the start/stop valve at the end of the fixed start test", test.Method, test.Name))
                 .AddOperation(checkUiOp)
 				.AddOperation(benchPath.TempMtrUp     == null ? null : benchPath.TempMtrUp.ReadTempOp(ref TempUp))
@@ -615,6 +628,9 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
             while (!e.Contains(Event.TimerExpired));
 
 
+            if (heatMetersPath == null) LogProcessDataHeader(processDataLogger, "End mass");
+            else LogProcessDataHeaderHeatMeters(processDataLogger, "End mass");
+
             //------------------------------------------------
             Bridge.OnActivity(this, Strings.Measuring_the_weight);
             //------------------------------------------------
@@ -737,71 +753,25 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
 
             if (tstRslt != null)
             {
-                /// Auxiliary results
-				tstRslt.AmbTempMean = (float)AmbTempStat.Average;
-				tstRslt.AmbTempStart = (float)AmbTempStat.First;
-				tstRslt.AmbTempEnd = (float)AmbTempStat.Last;
-				tstRslt.AmbTempMin = (float)AmbTempStat.Min;
-				tstRslt.AmbTempMax = (float)AmbTempStat.Max;
-				tstRslt.AmbPressMean = (float)AmbPressStat.Average;
-				tstRslt.AmbPressStart = (float)AmbPressStat.First;
-				tstRslt.AmbPressEnd = (float)AmbPressStat.Last;
-				tstRslt.AmbPressMin = (float)AmbPressStat.Min;
-				tstRslt.AmbPressMax = (float)AmbPressStat.Max;
-				tstRslt.AmbHumiMean = (float)AmbHumiStat.Average;
-				tstRslt.AmbHumiStart = (float)AmbHumiStat.First;
-				tstRslt.AmbHumiEnd = (float)AmbHumiStat.Last;
-				tstRslt.AmbHumiMin = (float)AmbHumiStat.Min;
-				tstRslt.AmbHumiMax = (float)AmbHumiStat.Max;
-				tstRslt.PressUpMean = (float)PressUpStat.Average;
-				tstRslt.PressUpStart = (float)PressUpStat.First;
-				tstRslt.PressUpEnd = (float)PressUpStat.Last;
-				tstRslt.PressUpMin = (float)PressUpStat.Min;
-				tstRslt.PressUpMax = (float)PressUpStat.Max;
-				tstRslt.PressDownMean = (float)PressDownStat.Average;
-				tstRslt.PressDownStart = (float)PressDownStat.First;
-				tstRslt.PressDownEnd = (float)PressDownStat.Last;
-				tstRslt.PressDownMin = (float)PressDownStat.Min;
-				tstRslt.PressDownMax = (float)PressDownStat.Max;
-				tstRslt.PressDeltaMean = (float)PressDeltaStat.Average;
-				tstRslt.PressDeltaStart = (float)PressDeltaStat.First;
-				tstRslt.PressDeltaEnd = (float)PressDeltaStat.Last;
-				tstRslt.PressDeltaMin = (float)PressDeltaStat.Min;
-				tstRslt.PressDeltaMax = (float)PressDeltaStat.Max;
-				tstRslt.TempUpMean = (float)TempUpStat.Average;
-                tstRslt.TempUpStart = (float)TempUpStat.First;
-                tstRslt.TempUpEnd = (float)TempUpStat.Last;
-                tstRslt.TempUpMin = (float)TempUpStat.Min;
-                tstRslt.TempUpMax = (float)TempUpStat.Max;
-                tstRslt.TempDownMean = (float)TempDownStat.Average;
-                tstRslt.TempDownStart = (float)TempDownStat.First;
-                tstRslt.TempDownEnd = (float)TempDownStat.Last;
-                tstRslt.TempDownMin = (float)TempDownStat.Min;
-                tstRslt.TempDownMax = (float)TempDownStat.Max;
-                tstRslt.TempDivMean = (float)TempDivStat.Average;
-                tstRslt.TempDivStart = (float)TempDivStat.First;
-                tstRslt.TempDivEnd = (float)TempDivStat.Last;
-                tstRslt.TempDivMin = (float)TempDivStat.Min;
-                tstRslt.TempDivMax = (float)TempDivStat.Max;
-                tstRslt.DensityIn = Formulas.WaterDensityFromTemp(tstRslt.TempUpMean);		/// [kg/m3]
-                tstRslt.DensityOut = Formulas.WaterDensityFromTemp(tstRslt.TempDownMean);	/// [kg/m3]
-                tstRslt.DensityDiv = Formulas.WaterDensityFromTemp(tstRslt.TempDivMean);	/// [kg/m3]
+                UpdateTempPressDensAmb(tstRslt);
 
                 /// Main results
                 tstRslt.StartTime = TestStartTime;
                 tstRslt.EndTime = TestEndTime;
                 tstRslt.FlowSetTime = flowSetTime;
-                tstRslt.TestTime = cBrd.TTime;							/// [s] measurement time
+
+                tstRslt.TestTime = Math.Max(1.0, EndTime - StartTime);		/// [s] measurement time, at least 1 to prevent division by zero
+                
                 tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0));	/// Pulses of the master flow meter (test total)
                 tstRslt.MassStartRaw = StartMass.Val;
                 tstRslt.MassStart = massStart;
                 tstRslt.MassEndRaw = EndMass.Val;
                 tstRslt.MassEnd = massEnd;
                 tstRslt.FlowMass = 3600.0 * (tstRslt.MassEnd - tstRslt.MassStart) / tstRslt.TestTime;	/// [kg/h]
-                tstRslt.FlowVolume = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime;		/// [m3/h]
-                tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster;								/// [l] volume from the master flow meter
+                tstRslt.FlowVolume = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime;	/// [m3/h]
+                tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster;							/// [l] volume from the master flow meter
                 tstRslt.VolumeCTV = volumeCTV;															/// [l] 1000.0f is because density is in [kg/m3]
-                tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster;			/// Corrected master pulses per liter
+                tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster;		/// Corrected master pulses per liter
                 tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV);
 
 				tstRslt.FlowMin = (float)((tstRslt.VolumeMaster != 0) ? (RefFlowStat.Min * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Min);

TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs

@@ -414,55 +414,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
 
 			if (tstRslt != null)
 			{
-				/// Auxiliary results
-				tstRslt.AmbTempMean = (float)AmbTempStat.Average;
-				tstRslt.AmbTempStart = (float)AmbTempStat.First;
-				tstRslt.AmbTempEnd = (float)AmbTempStat.Last;
-				tstRslt.AmbTempMin = (float)AmbTempStat.Min;
-				tstRslt.AmbTempMax = (float)AmbTempStat.Max;
-				tstRslt.AmbPressMean = (float)AmbPressStat.Average;
-				tstRslt.AmbPressStart = (float)AmbPressStat.First;
-				tstRslt.AmbPressEnd = (float)AmbPressStat.Last;
-				tstRslt.AmbPressMin = (float)AmbPressStat.Min;
-				tstRslt.AmbPressMax = (float)AmbPressStat.Max;
-				tstRslt.AmbHumiMean = (float)AmbHumiStat.Average;
-				tstRslt.AmbHumiStart = (float)AmbHumiStat.First;
-				tstRslt.AmbHumiEnd = (float)AmbHumiStat.Last;
-				tstRslt.AmbHumiMin = (float)AmbHumiStat.Min;
-				tstRslt.AmbHumiMax = (float)AmbHumiStat.Max;
-				tstRslt.PressUpMean = (float)PressUpStat.Average;
-				tstRslt.PressUpStart = (float)PressUpStat.First;
-				tstRslt.PressUpEnd = (float)PressUpStat.Last;
-				tstRslt.PressUpMin = (float)PressUpStat.Min;
-				tstRslt.PressUpMax = (float)PressUpStat.Max;
-				tstRslt.PressDownMean = (float)PressDownStat.Average;
-				tstRslt.PressDownStart = (float)PressDownStat.First;
-				tstRslt.PressDownEnd = (float)PressDownStat.Last;
-				tstRslt.PressDownMin = (float)PressDownStat.Min;
-				tstRslt.PressDownMax = (float)PressDownStat.Max;
-				tstRslt.PressDeltaMean = (float)PressDeltaStat.Average;
-				tstRslt.PressDeltaStart = (float)PressDeltaStat.First;
-				tstRslt.PressDeltaEnd = (float)PressDeltaStat.Last;
-				tstRslt.PressDeltaMin = (float)PressDeltaStat.Min;
-				tstRslt.PressDeltaMax = (float)PressDeltaStat.Max;
-				tstRslt.TempUpMean = (float)TempUpStat.Average;
-				tstRslt.TempUpStart = (float)TempUpStat.First;
-				tstRslt.TempUpEnd = (float)TempUpStat.Last;
-				tstRslt.TempUpMin = (float)TempUpStat.Min;
-				tstRslt.TempUpMax = (float)TempUpStat.Max;
-				tstRslt.TempDownMean = (float)TempDownStat.Average;
-				tstRslt.TempDownStart = (float)TempDownStat.First;
-				tstRslt.TempDownEnd = (float)TempDownStat.Last;
-				tstRslt.TempDownMin = (float)TempDownStat.Min;
-				tstRslt.TempDownMax = (float)TempDownStat.Max;
-				tstRslt.TempDivMean = (float)TempDivStat.Average;
-				tstRslt.TempDivStart = (float)TempDivStat.First;
-				tstRslt.TempDivEnd = (float)TempDivStat.Last;
-				tstRslt.TempDivMin = (float)TempDivStat.Min;
-				tstRslt.TempDivMax = (float)TempDivStat.Max;
-				tstRslt.DensityIn  = Formulas.WaterDensityFromTemp(tstRslt.TempUpMean);		/// [kg/m3]
-				tstRslt.DensityOut = Formulas.WaterDensityFromTemp(tstRslt.TempDownMean);	/// [kg/m3]
-				tstRslt.DensityDiv = Formulas.WaterDensityFromTemp(tstRslt.TempDivMean);	/// [kg/m3]
+                UpdateTempPressDensAmb(tstRslt);
 
 				/// Main results
 				tstRslt.StartTime    = TestStartTime;

TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs

@@ -458,10 +458,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 			Bridge.OnActivity(this, Strings.Measuring_the_weight);
 			//------------------------------------------------
 
-			if (heatMetersPath == null)
-				LogProcessHeader(processDataLogger, "Start mass");
-			else
-				LogProcessHeaderHeatMeters(processDataLogger, "Start mass");
+            LogProcessDataTestInfo(processDataLogger, test.Procedure.Name, test.Name);
+
+			if (heatMetersPath == null) LogProcessDataHeader(processDataLogger, "Start mass");
+			else LogProcessDataHeaderHeatMeters(processDataLogger, "Start mass");
     
 			State.Create(string.Format("{0}({1}) : Measuring the start mass", test.Method, test.Name))
 				.AddOperation(checkUiOp)
@@ -490,14 +490,13 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 			}
 			while (!e.Contains(Event.BalanceDone));
 
-			if (heatMetersPath == null)
-				LogProcessHeader(processDataLogger, "Measurement");
-			else
-				LogProcessHeaderHeatMeters(processDataLogger, "Measurement");
-
             log.WarnFormat("Start mass = {0}kg", StartMass);
             Mass.Val = StartMass.Val;
 
+
+			if (heatMetersPath == null) LogProcessDataHeader(processDataLogger, "Measurement");
+			else LogProcessDataHeaderHeatMeters(processDataLogger, "Measurement");
+
             //------------------------------------------------
             Bridge.OnActivity(this, Strings.Test_in_progress);
             //------------------------------------------------
@@ -661,10 +660,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
             }
             while (!e.Contains(Event.TimerExpired) || !e.Contains(Event.BalanceDone));
 
-			if (heatMetersPath == null)
-				LogProcessHeader(processDataLogger, "End mass");
-			else
-				LogProcessHeaderHeatMeters(processDataLogger, "End mass");
+
+			if (heatMetersPath == null) LogProcessDataHeader(processDataLogger, "End mass");
+			else LogProcessDataHeaderHeatMeters(processDataLogger, "End mass");
 
             State.Create(string.Format("{0}({1}) : Measuring the end mass", test.Method, test.Name))
 				.AddOperation(checkUiOp)
@@ -712,55 +710,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 
 			if (tstRslt != null)
 			{
-				/// Auxiliary results
-				tstRslt.AmbTempMean = (float)AmbTempStat.Average;
-				tstRslt.AmbTempStart = (float)AmbTempStat.First;
-				tstRslt.AmbTempEnd = (float)AmbTempStat.Last;
-				tstRslt.AmbTempMin = (float)AmbTempStat.Min;
-				tstRslt.AmbTempMax = (float)AmbTempStat.Max;
-				tstRslt.AmbPressMean = (float)AmbPressStat.Average;
-				tstRslt.AmbPressStart = (float)AmbPressStat.First;
-				tstRslt.AmbPressEnd = (float)AmbPressStat.Last;
-				tstRslt.AmbPressMin = (float)AmbPressStat.Min;
-				tstRslt.AmbPressMax = (float)AmbPressStat.Max;
-				tstRslt.AmbHumiMean = (float)AmbHumiStat.Average;
-				tstRslt.AmbHumiStart = (float)AmbHumiStat.First;
-				tstRslt.AmbHumiEnd = (float)AmbHumiStat.Last;
-				tstRslt.AmbHumiMin = (float)AmbHumiStat.Min;
-				tstRslt.AmbHumiMax = (float)AmbHumiStat.Max;
-				tstRslt.PressUpMean = (float)PressUpStat.Average;
-				tstRslt.PressUpStart = (float)PressUpStat.First;
-				tstRslt.PressUpEnd = (float)PressUpStat.Last;
-				tstRslt.PressUpMin = (float)PressUpStat.Min;
-				tstRslt.PressUpMax = (float)PressUpStat.Max;
-				tstRslt.PressDownMean = (float)PressDownStat.Average;
-				tstRslt.PressDownStart = (float)PressDownStat.First;
-				tstRslt.PressDownEnd = (float)PressDownStat.Last;
-				tstRslt.PressDownMin = (float)PressDownStat.Min;
-				tstRslt.PressDownMax = (float)PressDownStat.Max;
-				tstRslt.PressDeltaMean = (float)PressDeltaStat.Average;
-				tstRslt.PressDeltaStart = (float)PressDeltaStat.First;
-				tstRslt.PressDeltaEnd = (float)PressDeltaStat.Last;
-				tstRslt.PressDeltaMin = (float)PressDeltaStat.Min;
-				tstRslt.PressDeltaMax = (float)PressDeltaStat.Max;
-				tstRslt.TempUpMean = (float)TempUpStat.Average;
-				tstRslt.TempUpStart = (float)TempUpStat.First;
-				tstRslt.TempUpEnd = (float)TempUpStat.Last;
-				tstRslt.TempUpMin = (float)TempUpStat.Min;
-				tstRslt.TempUpMax = (float)TempUpStat.Max;
-				tstRslt.TempDownMean = (float)TempDownStat.Average;
-				tstRslt.TempDownStart = (float)TempDownStat.First;
-				tstRslt.TempDownEnd = (float)TempDownStat.Last;
-				tstRslt.TempDownMin = (float)TempDownStat.Min;
-				tstRslt.TempDownMax = (float)TempDownStat.Max;
-				tstRslt.TempDivMean = (float)TempDivStat.Average;
-				tstRslt.TempDivStart = (float)TempDivStat.First;
-				tstRslt.TempDivEnd = (float)TempDivStat.Last;
-				tstRslt.TempDivMin = (float)TempDivStat.Min;
-				tstRslt.TempDivMax = (float)TempDivStat.Max;
-                tstRslt.DensityIn = Formulas.WaterDensityFromTemp(tstRslt.TempUpMean);		/// [kg/m3]
-				tstRslt.DensityOut = Formulas.WaterDensityFromTemp(tstRslt.TempDownMean);	/// [kg/m3]
-				tstRslt.DensityDiv = Formulas.WaterDensityFromTemp(tstRslt.TempDivMean);	/// [kg/m3]
+                UpdateTempPressDensAmb(tstRslt);
 
 				/// Main results
 				tstRslt.StartTime    = TestStartTime;

TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs

@@ -283,55 +283,8 @@ namespace TBF.BenchControl.TestMethods.LeakTest
 
 			if (tstRslt != null)
 			{
-				/// Auxiliary results
-				tstRslt.AmbTempMean = (float)AmbTempStat.Average;
-				tstRslt.AmbTempStart = (float)AmbTempStat.First;
-				tstRslt.AmbTempEnd = (float)AmbTempStat.Last;
-				tstRslt.AmbTempMin = (float)AmbTempStat.Min;
-				tstRslt.AmbTempMax = (float)AmbTempStat.Max;
-				tstRslt.AmbPressMean = (float)AmbPressStat.Average;
-				tstRslt.AmbPressStart = (float)AmbPressStat.First;
-				tstRslt.AmbPressEnd = (float)AmbPressStat.Last;
-				tstRslt.AmbPressMin = (float)AmbPressStat.Min;
-				tstRslt.AmbPressMax = (float)AmbPressStat.Max;
-				tstRslt.AmbHumiMean = (float)AmbHumiStat.Average;
-				tstRslt.AmbHumiStart = (float)AmbHumiStat.First;
-				tstRslt.AmbHumiEnd = (float)AmbHumiStat.Last;
-				tstRslt.AmbHumiMin = (float)AmbHumiStat.Min;
-				tstRslt.AmbHumiMax = (float)AmbHumiStat.Max;
-				tstRslt.PressUpMean = (float)PressUpStat.Average;
-				tstRslt.PressUpStart = (float)PressUpStat.First;
-				tstRslt.PressUpEnd = (float)PressUpStat.Last;
-				tstRslt.PressUpMin = (float)PressUpStat.Min;
-				tstRslt.PressUpMax = (float)PressUpStat.Max;
-				tstRslt.PressDownMean = (float)PressDownStat.Average;
-				tstRslt.PressDownStart = (float)PressDownStat.First;
-				tstRslt.PressDownEnd = (float)PressDownStat.Last;
-				tstRslt.PressDownMin = (float)PressDownStat.Min;
-				tstRslt.PressDownMax = (float)PressDownStat.Max;
-				tstRslt.PressDeltaMean = (float)PressDeltaStat.Average;
-				tstRslt.PressDeltaStart = (float)PressDeltaStat.First;
-				tstRslt.PressDeltaEnd = (float)PressDeltaStat.Last;
-				tstRslt.PressDeltaMin = (float)PressDeltaStat.Min;
-				tstRslt.PressDeltaMax = (float)PressDeltaStat.Max;
-				tstRslt.TempUpMean = (float)TempUpStat.Average;
-				tstRslt.TempUpStart = (float)TempUpStat.First;
-				tstRslt.TempUpEnd = (float)TempUpStat.Last;
-				tstRslt.TempUpMin = (float)TempUpStat.Min;
-				tstRslt.TempUpMax = (float)TempUpStat.Max;
-				tstRslt.TempDownMean = (float)TempDownStat.Average;
-				tstRslt.TempDownStart = (float)TempDownStat.First;
-				tstRslt.TempDownEnd = (float)TempDownStat.Last;
-				tstRslt.TempDownMin = (float)TempDownStat.Min;
-				tstRslt.TempDownMax = (float)TempDownStat.Max;
-				tstRslt.TempDivMean = (float)TempDivStat.Average;
-				tstRslt.TempDivStart = (float)TempDivStat.First;
-				tstRslt.TempDivEnd = (float)TempDivStat.Last;
-				tstRslt.TempDivMin = (float)TempDivStat.Min;
-				tstRslt.TempDivMax = (float)TempDivStat.Max;
-				tstRslt.DensityIn  = Formulas.WaterDensityFromTemp(tstRslt.TempUpMean);		/// [kg/m3]
-				tstRslt.DensityOut = Formulas.WaterDensityFromTemp(tstRslt.TempDownMean);	/// [kg/m3]
-				tstRslt.DensityDiv = 0;
+                UpdateTempPressDensAmb(tstRslt);
+                tstRslt.DensityDiv = 0;
 
 				/// Main results
 				tstRslt.StartTime    = TestStartTime;

TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs

@@ -194,55 +194,8 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
 
 			if (tstRslt != null)
 			{
-				/// Auxiliary results
-				tstRslt.AmbTempMean = (float)AmbTempStat.Average;
-				tstRslt.AmbTempStart = (float)AmbTempStat.First;
-				tstRslt.AmbTempEnd = (float)AmbTempStat.Last;
-				tstRslt.AmbTempMin = (float)AmbTempStat.Min;
-				tstRslt.AmbTempMax = (float)AmbTempStat.Max;
-				tstRslt.AmbPressMean = (float)AmbPressStat.Average;
-				tstRslt.AmbPressStart = (float)AmbPressStat.First;
-				tstRslt.AmbPressEnd = (float)AmbPressStat.Last;
-				tstRslt.AmbPressMin = (float)AmbPressStat.Min;
-				tstRslt.AmbPressMax = (float)AmbPressStat.Max;
-				tstRslt.AmbHumiMean = (float)AmbHumiStat.Average;
-				tstRslt.AmbHumiStart = (float)AmbHumiStat.First;
-				tstRslt.AmbHumiEnd = (float)AmbHumiStat.Last;
-				tstRslt.AmbHumiMin = (float)AmbHumiStat.Min;
-				tstRslt.AmbHumiMax = (float)AmbHumiStat.Max;
-				tstRslt.PressUpMean = (float)PressUpStat.Average;
-				tstRslt.PressUpStart = (float)PressUpStat.First;
-				tstRslt.PressUpEnd = (float)PressUpStat.Last;
-				tstRslt.PressUpMin = (float)PressUpStat.Min;
-				tstRslt.PressUpMax = (float)PressUpStat.Max;
-				tstRslt.PressDownMean = (float)PressDownStat.Average;
-				tstRslt.PressDownStart = (float)PressDownStat.First;
-				tstRslt.PressDownEnd = (float)PressDownStat.Last;
-				tstRslt.PressDownMin = (float)PressDownStat.Min;
-				tstRslt.PressDownMax = (float)PressDownStat.Max;
-				tstRslt.PressDeltaMean = (float)PressDeltaStat.Average;
-				tstRslt.PressDeltaStart = (float)PressDeltaStat.First;
-				tstRslt.PressDeltaEnd = (float)PressDeltaStat.Last;
-				tstRslt.PressDeltaMin = (float)PressDeltaStat.Min;
-				tstRslt.PressDeltaMax = (float)PressDeltaStat.Max;
-				tstRslt.TempUpMean = (float)TempUpStat.Average;
-				tstRslt.TempUpStart = (float)TempUpStat.First;
-				tstRslt.TempUpEnd = (float)TempUpStat.Last;
-				tstRslt.TempUpMin = (float)TempUpStat.Min;
-				tstRslt.TempUpMax = (float)TempUpStat.Max;
-				tstRslt.TempDownMean = (float)TempDownStat.Average;
-				tstRslt.TempDownStart = (float)TempDownStat.First;
-				tstRslt.TempDownEnd = (float)TempDownStat.Last;
-				tstRslt.TempDownMin = (float)TempDownStat.Min;
-				tstRslt.TempDownMax = (float)TempDownStat.Max;
-				tstRslt.TempDivMean = (float)TempDivStat.Average;
-				tstRslt.TempDivStart = (float)TempDivStat.First;
-				tstRslt.TempDivEnd = (float)TempDivStat.Last;
-				tstRslt.TempDivMin = (float)TempDivStat.Min;
-				tstRslt.TempDivMax = (float)TempDivStat.Max;
-				tstRslt.DensityIn  = Formulas.WaterDensityFromTemp(tstRslt.TempUpMean);		/// [kg/m3]
-				tstRslt.DensityOut = Formulas.WaterDensityFromTemp(tstRslt.TempDownMean);	/// [kg/m3]
-				tstRslt.DensityDiv = 0;
+                UpdateTempPressDensAmb(tstRslt);
+                tstRslt.DensityDiv = 0;
 
 				/// Main results
 				tstRslt.StartTime    = TestStartTime;

TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs

@@ -305,55 +305,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
 
 			if (tstRslt != null)
 			{
-				/// Auxiliary results
-				tstRslt.AmbTempMean = (float)AmbTempStat.Average;
-				tstRslt.AmbTempStart = (float)AmbTempStat.First;
-				tstRslt.AmbTempEnd = (float)AmbTempStat.Last;
-				tstRslt.AmbTempMin = (float)AmbTempStat.Min;
-				tstRslt.AmbTempMax = (float)AmbTempStat.Max;
-				tstRslt.AmbPressMean = (float)AmbPressStat.Average;
-				tstRslt.AmbPressStart = (float)AmbPressStat.First;
-				tstRslt.AmbPressEnd = (float)AmbPressStat.Last;
-				tstRslt.AmbPressMin = (float)AmbPressStat.Min;
-				tstRslt.AmbPressMax = (float)AmbPressStat.Max;
-				tstRslt.AmbHumiMean = (float)AmbHumiStat.Average;
-				tstRslt.AmbHumiStart = (float)AmbHumiStat.First;
-				tstRslt.AmbHumiEnd = (float)AmbHumiStat.Last;
-				tstRslt.AmbHumiMin = (float)AmbHumiStat.Min;
-				tstRslt.AmbHumiMax = (float)AmbHumiStat.Max;
-				tstRslt.PressUpMean = (float)PressUpStat.Average;
-				tstRslt.PressUpStart = (float)PressUpStat.First;
-				tstRslt.PressUpEnd = (float)PressUpStat.Last;
-				tstRslt.PressUpMin = (float)PressUpStat.Min;
-				tstRslt.PressUpMax = (float)PressUpStat.Max;
-				tstRslt.PressDownMean = (float)PressDownStat.Average;
-				tstRslt.PressDownStart = (float)PressDownStat.First;
-				tstRslt.PressDownEnd = (float)PressDownStat.Last;
-				tstRslt.PressDownMin = (float)PressDownStat.Min;
-				tstRslt.PressDownMax = (float)PressDownStat.Max;
-				tstRslt.PressDeltaMean = (float)PressDeltaStat.Average;
-				tstRslt.PressDeltaStart = (float)PressDeltaStat.First;
-				tstRslt.PressDeltaEnd = (float)PressDeltaStat.Last;
-				tstRslt.PressDeltaMin = (float)PressDeltaStat.Min;
-				tstRslt.PressDeltaMax = (float)PressDeltaStat.Max;
-				tstRslt.TempUpMean = (float)TempUpStat.Average;
-				tstRslt.TempUpStart = (float)TempUpStat.First;
-				tstRslt.TempUpEnd = (float)TempUpStat.Last;
-				tstRslt.TempUpMin = (float)TempUpStat.Min;
-				tstRslt.TempUpMax = (float)TempUpStat.Max;
-				tstRslt.TempDownMean = (float)TempDownStat.Average;
-				tstRslt.TempDownStart = (float)TempDownStat.First;
-				tstRslt.TempDownEnd = (float)TempDownStat.Last;
-				tstRslt.TempDownMin = (float)TempDownStat.Min;
-				tstRslt.TempDownMax = (float)TempDownStat.Max;
-				tstRslt.TempDivMean = (float)TempDivStat.Average;
-				tstRslt.TempDivStart = (float)TempDivStat.First;
-				tstRslt.TempDivEnd = (float)TempDivStat.Last;
-				tstRslt.TempDivMin = (float)TempDivStat.Min;
-				tstRslt.TempDivMax = (float)TempDivStat.Max;
-				tstRslt.DensityIn  = Formulas.WaterDensityFromTemp(tstRslt.TempUpMean);		/// [kg/m3]
-				tstRslt.DensityOut = Formulas.WaterDensityFromTemp(tstRslt.TempDownMean);	/// [kg/m3]
-				tstRslt.DensityDiv = Formulas.WaterDensityFromTemp(tstRslt.TempDivMean);	/// [kg/m3]
+                UpdateTempPressDensAmb(tstRslt);
 
 				/// Main results
 				tstRslt.StartTime    = TestStartTime;

TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs

@@ -208,6 +208,56 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
 
 			tstRslt.Components = oriTestRslt.Components;
 
+            /// Auxiliary results, as in SequenceBase.UpdateTemoPressDensAmb()
+            tstRslt.AmbTempMean = oriTestRslt.AmbTempMean;
+            tstRslt.AmbTempStart = oriTestRslt.AmbTempStart;
+            tstRslt.AmbTempEnd = oriTestRslt.AmbTempEnd;
+            tstRslt.AmbTempMin = oriTestRslt.AmbTempMin;
+            tstRslt.AmbTempMax = oriTestRslt.AmbTempMax;
+            tstRslt.AmbPressMean = oriTestRslt.AmbPressMean;
+            tstRslt.AmbPressStart = oriTestRslt.AmbPressStart;
+            tstRslt.AmbPressEnd = oriTestRslt.AmbPressEnd;
+            tstRslt.AmbPressMin = oriTestRslt.AmbPressMin;
+            tstRslt.AmbPressMax = oriTestRslt.AmbPressMax;
+            tstRslt.AmbHumiMean = oriTestRslt.AmbHumiMean;
+            tstRslt.AmbHumiStart = oriTestRslt.AmbHumiStart;
+            tstRslt.AmbHumiEnd = oriTestRslt.AmbHumiEnd;
+            tstRslt.AmbHumiMin = oriTestRslt.AmbHumiMin;
+            tstRslt.AmbHumiMax = oriTestRslt.AmbHumiMax;
+            tstRslt.PressUpMean = oriTestRslt.PressUpMean;
+            tstRslt.PressUpStart = oriTestRslt.PressUpStart;
+            tstRslt.PressUpEnd = oriTestRslt.PressUpEnd;
+            tstRslt.PressUpMin = oriTestRslt.PressUpMin;
+            tstRslt.PressUpMax = oriTestRslt.PressUpMax;
+            tstRslt.PressDownMean = oriTestRslt.PressDownMean;
+            tstRslt.PressDownStart = oriTestRslt.PressDownStart;
+            tstRslt.PressDownEnd = oriTestRslt.PressDownEnd;
+            tstRslt.PressDownMin = oriTestRslt.PressDownMin;
+            tstRslt.PressDownMax = oriTestRslt.PressDownMax;
+            tstRslt.PressDeltaMean = oriTestRslt.PressDeltaMean;
+            tstRslt.PressDeltaStart = oriTestRslt.PressDeltaStart;
+            tstRslt.PressDeltaEnd = oriTestRslt.PressDeltaEnd;
+            tstRslt.PressDeltaMin = oriTestRslt.PressDeltaMin;
+            tstRslt.PressDeltaMax = oriTestRslt.PressDeltaMax;
+            tstRslt.TempUpMean = oriTestRslt.TempUpMean;
+            tstRslt.TempUpStart = oriTestRslt.TempUpStart;
+            tstRslt.TempUpEnd = oriTestRslt.TempUpEnd;
+            tstRslt.TempUpMin = oriTestRslt.TempUpMin;
+            tstRslt.TempUpMax = oriTestRslt.TempUpMax;
+            tstRslt.TempDownMean = oriTestRslt.TempDownMean;
+            tstRslt.TempDownStart = oriTestRslt.TempDownStart;
+            tstRslt.TempDownEnd = oriTestRslt.TempDownEnd;
+            tstRslt.TempDownMin = oriTestRslt.TempDownMin;
+            tstRslt.TempDownMax = oriTestRslt.TempDownMax;
+            tstRslt.TempDivMean = oriTestRslt.TempDivMean;
+            tstRslt.TempDivStart = oriTestRslt.TempDivStart;
+            tstRslt.TempDivEnd = oriTestRslt.TempDivEnd;
+            tstRslt.TempDivMin = oriTestRslt.TempDivMin;
+            tstRslt.TempDivMax = oriTestRslt.TempDivMax;
+            tstRslt.DensityIn = oriTestRslt.DensityIn;
+            tstRslt.DensityOut = oriTestRslt.DensityOut;
+            tstRslt.DensityDiv = oriTestRslt.DensityDiv;
+
 			tstRslt.StartTime		= oriTestRslt.StartTime;
 			tstRslt.EndTime			= oriTestRslt.EndTime;
 			tstRslt.FlowSetTime		= oriTestRslt.FlowSetTime;
@@ -218,45 +268,14 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
             tstRslt.MassStart       = oriTestRslt.MassStart;
             tstRslt.MassEndRaw      = oriTestRslt.MassEndRaw;
             tstRslt.MassEnd         = oriTestRslt.MassEnd;
-			tstRslt.DensityIn       = oriTestRslt.DensityIn;
-			tstRslt.DensityOut      = oriTestRslt.DensityOut;
-			tstRslt.DensityDiv      = oriTestRslt.DensityDiv;
             tstRslt.Buoyancy        = oriTestRslt.Buoyancy;
 			tstRslt.FlowMass        = oriTestRslt.FlowMass;
 			tstRslt.FlowVolume      = oriTestRslt.FlowVolume;
 			tstRslt.VolumeCTV       = oriTestRslt.VolumeCTV;
 			tstRslt.VolumeMaster    = oriTestRslt.VolumeMaster;
             tstRslt.ErrorMaster     = oriTestRslt.ErrorMaster;
-
-			tstRslt.AmbTempMean = oriTestRslt.AmbTempMean;
-			tstRslt.AmbPressMean = oriTestRslt.AmbPressMean;
-			tstRslt.AmbHumiMean = oriTestRslt.AmbHumiMean;
-			tstRslt.PressUpMean = oriTestRslt.PressUpMean;
-			tstRslt.PressUpStart = oriTestRslt.PressUpStart;
-			tstRslt.PressUpEnd = oriTestRslt.PressUpEnd;
-			tstRslt.PressUpMin = oriTestRslt.PressUpMin;
-			tstRslt.PressUpMax = oriTestRslt.PressUpMax;
-			tstRslt.PressDownMean = oriTestRslt.PressDownMean;
-			tstRslt.PressDownStart = oriTestRslt.PressDownStart;
-			tstRslt.PressDownEnd = oriTestRslt.PressDownEnd;
-			tstRslt.PressDownMin = oriTestRslt.PressDownMin;
-			tstRslt.PressDownMax = oriTestRslt.PressDownMax;
-			tstRslt.TempUpMean = oriTestRslt.TempUpMean;
-			tstRslt.TempUpStart = oriTestRslt.TempUpStart;
-			tstRslt.TempUpEnd = oriTestRslt.TempUpEnd;
-			tstRslt.TempUpMin = oriTestRslt.TempUpMin;
-			tstRslt.TempUpMax = oriTestRslt.TempUpMax;
-			tstRslt.TempDownMean = oriTestRslt.TempDownMean;
-			tstRslt.TempDownStart = oriTestRslt.TempDownStart;
-			tstRslt.TempDownEnd = oriTestRslt.TempDownEnd;
-			tstRslt.TempDownMin = oriTestRslt.TempDownMin;
-			tstRslt.TempDownMax = oriTestRslt.TempDownMax;
-			tstRslt.TempDivMean = oriTestRslt.TempDivMean;
-			tstRslt.TempDivStart = oriTestRslt.TempDivStart;
-			tstRslt.TempDivEnd = oriTestRslt.TempDivEnd;
-			tstRslt.TempDivMin = oriTestRslt.TempDivMin;
-			tstRslt.TempDivMax = oriTestRslt.TempDivMax;
-			tstRslt.FlowMin = oriTestRslt.FlowMin;
+            
+            tstRslt.FlowMin = oriTestRslt.FlowMin;
 			tstRslt.FlowMax = oriTestRslt.FlowMax;
 
 			tstRslt.Custom1 = oriTestRslt.Custom1;

TestBenchFramework/Forms/PreviousResultsDlg.cs

@@ -8,6 +8,8 @@ using Results.Entities;
 using NHibernate;
 using log4net;
 using TBF.Resources;
+using TBF.BenchControl.DB.SensusOracle;
+using Oracle.DataAccess.Client;
 
 namespace TBF.Forms
 {

TestBenchFramework/MainWnd.Designer.cs

@@ -54,9 +54,9 @@ namespace TBF
 			this.horizontalSplitContainer = new System.Windows.Forms.SplitContainer();
 			this.mainTabControl = new System.Windows.Forms.TabControl();
 			this.homeTabPage = new System.Windows.Forms.TabPage();
-			this.ctrlBrdComponent = new ControlComponent3Munich.UserControl1();
+			this.ctrlBrdComponent = new ControlComponent_Torino2015.UserControl1();
 			this.processTabPage = new System.Windows.Forms.TabPage();
-			this.processTabPageCtrl = new TBF.Screens.ProcessTabPageCtrl6();
+			this.processTabPageCtrl = new TBF.Screens.ProcessTabPageCtrl48();
 			this.insertTabPage = new System.Windows.Forms.TabPage();
 			this.resultsTabPage = new System.Windows.Forms.TabPage();
 			this.resultsTabPageCtrl = new TBF.Screens.ResultsTabPageCtrl();

TestBenchFramework/ProcedureDlg.cs

@@ -940,7 +940,7 @@ namespace TBF
             processListViewEx.Items.Add(lviProcess);
 
 			///
-			/// Process subitems FeedingPath, ...
+			/// Parameters subitems FeedingPath, ...
 			/// 
 			lviParameters.SubItems.Add(test.PumpPower.ToString("F1"));
             lviParameters.SubItems.Add((test.MassRepeats < 4 ? 5 : test.MassRepeats).ToString());

TestBenchFramework/Properties/AssemblyInfo.cs

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

TestBenchFramework/Resources/Strings.Designer.cs

@@ -420,6 +420,24 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Batch.
+        /// </summary>
+        internal static string Batch {
+            get {
+                return ResourceManager.GetString("Batch", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Batch nr..
+        /// </summary>
+        internal static string Batch_nr {
+            get {
+                return ResourceManager.GetString("Batch_nr", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Bench.
         /// </summary>

TestBenchFramework/Resources/Strings.cs.resx

@@ -1281,4 +1281,7 @@
   <data name="Show" xml:space="preserve">
     <value>Zobrazit</value>
   </data>
-</root>
+  <data name="Batch_nr" xml:space="preserve">
+    <value>Číslo dávky</value>
+  </data>
+</root>

TestBenchFramework/Resources/Strings.de.resx

@@ -466,7 +466,7 @@
     <value>Schließe das Entleerventil</value>
   </data>
   <data name="Get_mass_of_water_in_the_tank" xml:space="preserve">
-    <value>Ermittle das Gewicht des Wassers im Tank</value>
+    <value>Ermittle das Gewicht des Wassers im Behälter</value>
   </data>
   <data name="Ignore" xml:space="preserve">
     <value>Ignorieren</value>
@@ -475,13 +475,13 @@
     <value>Laden des Prüfvorgangs</value>
   </data>
   <data name="Make_tank_empty" xml:space="preserve">
-    <value>Tank leeren</value>
+    <value>Behälter leeren</value>
   </data>
   <data name="Measure_the_mass" xml:space="preserve">
     <value>wiegen</value>
   </data>
   <data name="Please_select_a_procedure" xml:space="preserve">
-    <value>Wählen Sie einen Prüfvorlage</value>
+    <value>Wählen Sie eine Prüfvorlage</value>
   </data>
   <data name="Please_select_a_test" xml:space="preserve">
     <value>Bitte wählen Sie eine Prüfung aus.</value>
@@ -1416,4 +1416,7 @@
   <data name="Restore" xml:space="preserve">
     <value>Wiederherstellen</value>
   </data>
+  <data name="Batch_nr" xml:space="preserve">
+    <value>Stapel Nr.</value>
+  </data>
 </root>

TestBenchFramework/Resources/Strings.resx

@@ -1756,4 +1756,10 @@
   <data name="_0_wait_until_the_tank_is_empty" xml:space="preserve">
     <value>{0} - wait until the tank is empty</value>
   </data>
+  <data name="Batch" xml:space="preserve">
+    <value>Batch</value>
+  </data>
+  <data name="Batch_nr" xml:space="preserve">
+    <value>Batch nr.</value>
+  </data>
 </root>

TestBenchFramework/TBF.csproj

@@ -39,7 +39,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -49,7 +49,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -58,7 +58,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
@@ -67,7 +67,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -97,8 +97,8 @@
     <SignManifests>false</SignManifests>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ControlComponent3Munich">
-      <HintPath>..\packages\ControlBoard\Munich\ControlComponent3Munich.dll</HintPath>
+    <Reference Include="ControlComponent3U">
+      <HintPath>..\packages\ControlBoard\iPerlST\ControlComponent3U.dll</HintPath>
     </Reference>
     <Reference Include="FluentNHibernate">
       <HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>