From 1337fff2dce5449041e95a278495c8bc99083c12 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 15 Jun 2016 17:04:25 +0200 Subject: [PATCH] Fixed: (1) STOP button does not function in FlyingStart and FlyingStartMassCollection methods, (2) Results.Entities.WaterMeterData.Equals(.) --- Results/Entities/WaterMeterData.cs | 5 +++++ .../TestMethods/Adjustment/AdjustmentSeq.cs | 4 ++-- .../TestMethods/CombinedMeters/CombinedMetersSeq.cs | 2 +- .../CombinedWithDetectionSeq.cs | 6 +++--- .../FixedStartAdvanced/FixedStartAdvancedSeq.cs | 13 ++++++++++--- .../FixedStartCombinedMetersSeq.cs | 13 ++++++++++--- .../FixedStartMassCollectionSeq.cs | 13 ++++++++++--- .../TestMethods/FlyingStart/FlyingStartSeq.cs | 4 ++-- .../FlyingStartMassCollectionSeq.cs | 4 ++-- .../ReferenceFlowmeterCalibrationSeq.cs | 4 ++-- TestBenchFramework/MainWnd.cs | 2 +- 11 files changed, 48 insertions(+), 22 deletions(-) diff --git a/Results/Entities/WaterMeterData.cs b/Results/Entities/WaterMeterData.cs index 9a4d55798..bf54a8b5f 100644 --- a/Results/Entities/WaterMeterData.cs +++ b/Results/Entities/WaterMeterData.cs @@ -88,6 +88,11 @@ namespace Results.Entities if (PulsesPerLtr != wmd.PulsesPerLtr) return false; + if (ProducerAux != wmd.ProducerAux) return false; + if (Q3_Qn_Aux != wmd.Q3_Qn_Aux) return false; + if (MetrologicalClassAux != wmd.MetrologicalClassAux) return false; + if (ApprovalInfoAux != wmd.ApprovalInfoAux) return false; + if (Text1 != wmd.Text1) return false; if (Text2 != wmd.Text2) return false; if (Text3 != wmd.Text3) return false; diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs index c3938a5aa..77d351057 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs @@ -218,8 +218,8 @@ namespace TBF.BenchControl.TestMethods.Adjustment //-------------------------------- switch (ReadRegistersTempPressAmbient(measureOperations, true)) { - case Event.Error: { retVal = Event.Error; goto stopTest; } - case Event.UiCmdStop: { retVal = Event.UiCmdStop; goto stopTest; } + case Event.Error: { retVal = Event.Error; goto stopTest; } + case Event.UiCmdStop: { retVal = Event.UiCmdStop; goto stopTest; } case Event.MeasurementCompleted: goto one_test_completed; } diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs index 40a29260d..65c129975 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs @@ -307,7 +307,7 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters do { e = StateMachine.WaitRunDevsRunOps(); - if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; } + if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; } if (TestAndLogUiCmdStop(test,e)) { retVal = Event.UiCmdStop; goto stopTest; } } while (!e.Contains(Event.TimerExpired)); diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs index 243a6cc30..091259efd 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs @@ -428,9 +428,9 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection //-------------------------------- switch (ReadRegistersTempPressAmbient(measureOperations, true)) { - case Event.Error: goto error; - case Event.UiCmdStop: goto stopTest; - case Event.MeasurementCompleted: goto measurement_completed; + case Event.Error: goto error; + case Event.UiCmdStop: goto stopTest; + case Event.MeasurementCompleted: goto measurement_completed; } int remainingTime = Math.Max(estimtdEndTime - StateMachine.Time, 0); diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs index 3eb7f3b60..8f076bba7 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs @@ -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); diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/FixedStartCombinedMetersSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/FixedStartCombinedMetersSeq.cs index 4f580b3e5..3036986cb 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/FixedStartCombinedMetersSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/FixedStartCombinedMetersSeq.cs @@ -318,9 +318,16 @@ namespace TBF.BenchControl.TestMethods.FixedStartCombinedMeters //-------------------------------- 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); diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index 954817460..388932520 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -318,9 +318,16 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection //-------------------------------- 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); diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index ca75ea5f3..557d93ed8 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -179,8 +179,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStart do { e = StateMachine.WaitRunDevsRunOps(); - if (e.Contains(Event.Error)) goto stopTest; - if (TestAndLogUiCmdStop(test,e)) goto stopTest; + if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; } + if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } if (e.Contains(Event.MeasurementCompleted)) goto test_completed; //------------------------------------------------ diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index e530878cc..df725bff4 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -359,8 +359,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection do { e = StateMachine.WaitRunDevsRunOps(); - if (e.Contains(Event.Error)) goto stopTest; - if (TestAndLogUiCmdStop(test,e)) goto stopTest; + if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; } + if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } if (e.Contains(Event.MeasurementCompleted)) goto test_completed; //------------------------------------------------ diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs index 200537966..f2fa5ee52 100644 --- a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs @@ -224,8 +224,8 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration //-------------------------------- switch (ReadRegistersTempPressAmbient(null, true)) { - case Event.Error: { retVal = Event.Error; goto stopTest; } - case Event.UiCmdStop: { retVal = Event.UiCmdStop; goto stopTest; } + case Event.Error: { retVal = Event.Error; goto stopTest; } + case Event.UiCmdStop: { retVal = Event.UiCmdStop; goto stopTest; } case Event.MeasurementCompleted: goto test_completed; } diff --git a/TestBenchFramework/MainWnd.cs b/TestBenchFramework/MainWnd.cs index 2da6b473e..1d5f3da92 100644 --- a/TestBenchFramework/MainWnd.cs +++ b/TestBenchFramework/MainWnd.cs @@ -338,7 +338,7 @@ namespace TBF public void UpdateStatusP(string statusPStr) { - statusPStatusLabel.Text = string.Format("S={0} , ", statusPStr); + //statusPStatusLabel.Text = string.Format("S={0} , ", statusPStr); /// TODO: Resolve exception } public void UpdateRoute(string routeStr)