michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Milan Hanajik 2016-06-15 17:04:25 +02:00
parent e6d38040e0
commit 1337fff2dc
11 changed files with 48 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Results/Entities/WaterMeterData.cs
View File

@ -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;

4
TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
View File

@ -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;
}

2
TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs
View File

@ -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));

6
TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
View File

@ -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);

13
TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs
View File

@ -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);

13
TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/FixedStartCombinedMetersSeq.cs
View File

@ -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);

13
TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
View File

@ -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);

4
TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
View File

@ -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;
//------------------------------------------------

4
TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
View File

@ -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;
//------------------------------------------------

4
TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
View File

@ -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;
}

2
TestBenchFramework/MainWnd.cs
View File

@ -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)