Fixed: (1) STOP button does not function in FlyingStart and FlyingStartMassCollection methods, (2) Results.Entities.WaterMeterData.Equals(.)

2016-06-15 17:04:25 +02:00
parent e6d38040e0
commit 1337fff2dc
11 changed files with 48 additions and 22 deletions
@@ -319,9 +319,16 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
                //--------------------------------
                switch (ReadRegistersTempPressAmbient(measureOperations, true))
                {
-                    case Event.Error: { retVal = Event.Error; goto stopTest; }
-                    case Event.UiCmdStop: { retVal = Event.UiCmdStop; goto stopTest; }
-                    case Event.MeasurementCompleted: goto test_completed;
+                    case Event.Error:
+                        retVal = Event.Error;       
+                        goto stopTest;
+
+                    case Event.UiCmdStop:
+                        retVal = Event.UiCmdStop;   
+                        goto stopTest;
+
+                    case Event.MeasurementCompleted:
+                        goto test_completed;
                }

 				int remainingTime = Math.Max(estimtdEndTime - StateMachine.Time, 0);