<Merge-Fix>: Solve merge conflicts

Cause:
1. When the Cycle was stopped during the second or a later test and then resumed using the Start Test button, the resume confirmation was handled incorrectly. After selecting to continue, the sequence restarted from the first test instead of continuing from the interrupted test.
2. Increase revision to 3.9.3134.114

Solution:
1. Corrected the Cycle resume logic so that, after confirming continuation, the sequence resumes from the interrupted test instead of restarting from the first test.
2. Increased revision to 3.9.3134.114

TBF/Rig/Sequences/MainSeq.cs

@@ -895,6 +895,10 @@ namespace TBF.Rig.Sequences
 				///
                 if (selection == Selection.RestOfCycle)			/// ... otherwise
                 {
+                    log.InfoFormat(
+                                    "RestOfCycle requested from selectedTestName={0}",
+                                    selectedTestName);
+
                     for (int i = 0; i < StateMachine.TestInstances.Length; i++)
                     {
                         if (selectedTestName == StateMachine.TestInstances[i].Name)
@@ -1006,21 +1010,38 @@ namespace TBF.Rig.Sequences
                         nextTransitionBefore = null;
                     }
 
-					/// Fetch paths and transitions of this test
+                    /// Fetch paths and transitions of this test
                     TestInstance testInst = StateMachine.TestInstances[currentTestIx];
-                    TBF.Rig.Generic.IComponent testMethodComp = TbfComponents.FindComponent(testInst.Test.Method);
+
+                    /// Remember the current test so that "Continue in the cycle"
+                    /// can restart from the interrupted test.
+                    selectedTestName = testInst.Name;
+                    log.InfoFormat(
+                                    "Cycle current test: index={0}, name={1}, selectedTestName updated",
+                                    currentTestIx,
+                                    selectedTestName);
+
+                    TBF.Rig.Generic.IComponent testMethodComp =
+                        TbfComponents.FindComponent(testInst.Test.Method);
+
                     string errorMsg;
-                    if (!StateMachine.GetPaths(testInst.Test, (StateMachine.Procedure.MetersKind == MetersKind.HeatMeter),
-                                               out inPath, out benchPath, out outPath, out sensPath,
+                    if (!StateMachine.GetPaths(testInst.Test,
+                                               (StateMachine.Procedure.MetersKind == MetersKind.HeatMeter),
+                                               out inPath,
+                                               out benchPath,
+                                               out outPath,
+                                               out sensPath,
                                                out heatMetersPath,
-                                               out transitionBefore, out transitionBetween, out transitionAfter,
+                                               out transitionBefore,
+                                               out transitionBetween,
+                                               out transitionAfter,
                                                out errorMsg))
                     {
-						Bridge.OnError(this, errorMsg);
-						goto select_cycle_or_test;
-					}
+                        Bridge.OnError(this, errorMsg);
+                        goto select_cycle_or_test;
+                    }
 
-					/// Update format for the water mass
+                    /// Update format for the water mass
                     if (outPath != null && outPath.Scale != null && !string.IsNullOrEmpty(outPath.Scale.Format))
                     {
                         StartMass.Format = outPath.Scale.Format;

TBF/Rig/TestMethods/StandingStart/StandingStartSeq.cs

@@ -693,7 +693,7 @@ namespace TBF.Rig.TestMethods.StandingStart
             State.Create(string.Format("{0}({1}) : Closing the start/stop valve at the end of the standing start/stop test", test.Method, test.Name))
                  .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
-                 .AddOperation(testInProgress)
+                 //.AddOperation(testInProgress)
                  .AddOperation(cBrd.CloseStartValveOp(timeStampEnd, stopSwitchTime))
                  .AddOperation(processDataLoggingOp)
                  .EnterState();

TBF/UI/MainWnd.resx

@@ -739,7 +739,7 @@
     <value>processTabPageCtrl</value>
   </data>
   <data name="&gt;&gt;processTabPageCtrl.Type" xml:space="preserve">
-    <value>TBF.UI.Process.ProcessTabPageCtrl, TBF, Version=3.9.3001.1, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.UI.Process.ProcessTabPageCtrl, TBF, Version=3.9.3134.114, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;processTabPageCtrl.Parent" xml:space="preserve">
     <value>processTabPage</value>
@@ -817,7 +817,7 @@
     <value>resultsTabPageCtrl</value>
   </data>
   <data name="&gt;&gt;resultsTabPageCtrl.Type" xml:space="preserve">
-    <value>TBF.UI.ResultsMI.ResultsTabPageCtrl, TBF, Version=3.9.3001.1, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.UI.ResultsMI.ResultsTabPageCtrl, TBF, Version=3.9.3134.112, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;resultsTabPageCtrl.Parent" xml:space="preserve">
     <value>resultsTabPage</value>
@@ -871,7 +871,7 @@
     <value>graphsTabPageCtrl</value>
   </data>
   <data name="&gt;&gt;graphsTabPageCtrl.Type" xml:space="preserve">
-    <value>TBF.UI.Graphs.GraphsTabPageCtrl, TBF, Version=3.9.3001.1, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.UI.Graphs.GraphsTabPageCtrl, TBF, Version=3.9.3134.112, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;graphsTabPageCtrl.Parent" xml:space="preserve">
     <value>graphsTabPage</value>
@@ -925,7 +925,7 @@
     <value>eventLogsTabPageCtrl</value>
   </data>
   <data name="&gt;&gt;eventLogsTabPageCtrl.Type" xml:space="preserve">
-    <value>TBF.UI.EventLogs.EventLogsTabPageCtrl, TBF, Version=3.9.3001.1, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.UI.EventLogs.EventLogsTabPageCtrl, TBF, Version=3.9.3134.112, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;eventLogsTabPageCtrl.Parent" xml:space="preserve">
     <value>eventLogsTabPage</value>
@@ -979,7 +979,7 @@
     <value>calendarTabPageCtrl</value>
   </data>
   <data name="&gt;&gt;calendarTabPageCtrl.Type" xml:space="preserve">
-    <value>TBF.UI.Calendar.CalendarTabPageCtrl, TBF, Version=3.9.3001.1, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.UI.Calendar.CalendarTabPageCtrl, TBF, Version=3.9.3134.112, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;calendarTabPageCtrl.Parent" xml:space="preserve">
     <value>calendarTabPage</value>
@@ -1033,7 +1033,7 @@
     <value>picturesTabPageCtrl</value>
   </data>
   <data name="&gt;&gt;picturesTabPageCtrl.Type" xml:space="preserve">
-    <value>TBF.UI.Camera.PicturesTabPageCtrl, TBF, Version=3.9.3001.1, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.UI.Camera.PicturesTabPageCtrl, TBF, Version=3.9.3134.112, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;picturesTabPageCtrl.Parent" xml:space="preserve">
     <value>picturesTabPage</value>