From 08a08282b550fbad95eb72691f2733734de951e5 Mon Sep 17 00:00:00 2001
From: Milan Hanajik <milan.hanajik@xyleminc.com>
Date: Fri, 28 Jan 2022 15:06:16 +0100
Subject: [PATCH] Bug fixes : 1. DaEntry.Std24.TestStartEndForm, 2.
 StandingStartMassColl mass msrmnt, not finished, process data logging, ver.
 3.1.1864

---
 TBF/Properties/AssemblyInfo.cs                         |  4 ++--
 TBF/Rig/DataEntry/Standard24/TestStartEndForm.cs       | 10 +++++-----
 .../StandingStartMassCollectionSeq.cs                  |  8 +++++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index 7361ef802..549270949 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.1861.0")]
-[assembly: AssemblyFileVersion("3.1.1861.0")]
+[assembly: AssemblyVersion("3.1.1864.0")]
+[assembly: AssemblyFileVersion("3.1.1864.0")]
diff --git a/TBF/Rig/DataEntry/Standard24/TestStartEndForm.cs b/TBF/Rig/DataEntry/Standard24/TestStartEndForm.cs
index 7120cfd9f..0c6a8fe65 100644
--- a/TBF/Rig/DataEntry/Standard24/TestStartEndForm.cs
+++ b/TBF/Rig/DataEntry/Standard24/TestStartEndForm.cs
@@ -237,17 +237,17 @@ namespace TBF.Rig.DataEntry.Standard24
                 /// End of test
 				for (int i = 0; i < TextBoxesCount; i++)
 				{
-					if (WMStartStateStr != null && i < WMStartStateStr.Length)
-					{
-						startTextBoxes[i].Text = WMStartStateStr[i];
-					}
-
 					if (((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null)))
 					{
 						endTextBoxes[i].Enabled = false;
 					}
 					else
 					{
+						if (WMStartStateStr != null && i < WMStartStateStr.Length)
+						{
+							startTextBoxes[i].Text = WMStartStateStr[i];
+						}
+
 						endTextBoxes[i].Enabled = true;
 						activeTextBoxes.Add(endTextBoxes[i]);
                         activeWmNrs.Add(i);
diff --git a/TBF/Rig/TestMethods/StandingStartMassCollection/StandingStartMassCollectionSeq.cs b/TBF/Rig/TestMethods/StandingStartMassCollection/StandingStartMassCollectionSeq.cs
index 64dca4944..0ad80e0ec 100644
--- a/TBF/Rig/TestMethods/StandingStartMassCollection/StandingStartMassCollectionSeq.cs
+++ b/TBF/Rig/TestMethods/StandingStartMassCollection/StandingStartMassCollectionSeq.cs
@@ -518,7 +518,8 @@ namespace TBF.Rig.TestMethods.StandingStartMassCollection
                                         .AddOperation(checkUiOp)
                                         .AddOperations(readTempPressOps)
                                         .AddOperation(readStartMassOp)
-                                        .AddOperation(testInProgress);
+                                        .AddOperation(testInProgress)
+                                        .AddOperation(processDataLoggingOp);
 
                     for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
                     {
@@ -552,12 +553,13 @@ namespace TBF.Rig.TestMethods.StandingStartMassCollection
                      .AddOperation(readStartMassOp)
                      .AddOperation(testInProgress)
                      .AddOperation((dataEntryCmpnt as GenericDevices.IHasWMStatesForm).ShowTestStartFormOp(sensPath.RegisterReaders))
+                     .AddOperation(processDataLoggingOp)
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
-                while (!e.Contains(Event.ModelessFormClosed));
+                while ((!e.Contains(Event.ModelessFormClosed) || !e.Contains(Event.ScaleDone)) && !e.Contains(Event.Next));
 
                 if (heatMetersTestParams != null)
                 {
@@ -618,12 +620,12 @@ namespace TBF.Rig.TestMethods.StandingStartMassCollection
             }
             else
             {
-
                 State.Create(string.Format("{0}({1}) : Measure the start mass", test.Method, test.Name))
                      .AddOperation(checkUiOp)
                      .AddOperations(readTempPressOps)
                      .AddOperation(testInProgress)
                      .AddOperation(readStartMassOp)
+                     .AddOperation(processDataLoggingOp)
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();