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

Entry form related improvements / bugfixes (Fixed start collection method related).

Browse Source
This commit is contained in:
Milan Hanajik
2015-04-28 15:27:47 +02:00
parent 221669283d
commit 39eb2cfd57
12 changed files with 46 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
+1 -5
View File
@@ -240,11 +240,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
//------------------------------------------------
/// Make sure the CycleBeginForm is closed so that water meter data (s/n) can be copied into results
if (cycleBeginFormOpened)
{
cycleBeginFormOpened = false;
if (WaitBeginFormClosed()) goto stopTest;
}
if (WaitBeginFormClosed()) goto stopTest;
///
/// Populate TestResult data entity with data
TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs
+2 -6
View File
@@ -337,12 +337,8 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters
Bridge.OnActivity(this, Strings.Test_completed);
//------------------------------------------------
/// Make sure the CycleBeginForm is closed so that water meter data (s/n) can be copied into results
if (cycleBeginFormOpened)
{
cycleBeginFormOpened = false;
if (WaitBeginFormClosed()) goto stopTest;
}
/// Make sure the CycleBeginForm is closed so that water meter data (s/n) can be copied into results
if (WaitBeginFormClosed()) goto stopTest;
/// Optionally supress pulses from the large water meter
if (testParams.SupressTrills)
TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
+22 -26
View File
@@ -38,14 +38,14 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
checkUiOp = new Operations.CheckUIOp(true); /// Runs in more then one state
//--------------------------------
State.Create("CombinedWithDetection : stop diverter gate etc")
State.Create("CombinedWithDetection : stopTest diverter gate etc")
.AddOperation(checkUiOp)
.AddOperation(cBrd.StopPreviousOp())
.EnterState();
do
{
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stopTest;
}
while (!e.Contains(Event.PreviousStopped));
@@ -72,7 +72,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
switch (Transition(transitionStart, TransitionContext.TestStart))
{
case Event.Error: goto error;
case Event.UiCmdStop: goto stop;
case Event.UiCmdStop: goto stopTest;
}
//====================================
@@ -93,7 +93,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
{
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.Error)) goto error;
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stopTest;
}
while (!e.Contains(Event.BalanceDone));
@@ -108,7 +108,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
switch (EmptyTheTank(outPath.EmptyTankValve, outPath.Balance))
{
case Event.Error: goto error;
case Event.UiCmdStop: goto stop;
case Event.UiCmdStop: goto stopTest;
}
switching_flow_detection:
@@ -141,7 +141,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
float progress = Formulas.TestProgress(flowSetTime, estFlowSetTime, test.TstTime);
Bridge.OnTestProgress(this, GetTestProgressData(test, tstRslt, false, cBrd, flowSetTime, progress));
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stopTest;
}
while (!e.Contains(Event.ValvesSet));
@@ -159,7 +159,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
float progress = Formulas.TestProgress(flowSetTime, estFlowSetTime, test.TstTime);
Bridge.OnTestProgress(this, GetTestProgressData(test, tstRslt, false, cBrd, flowSetTime, progress));
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stopTest;
if (e.Contains(Event.RegulValveTimeOut))
{
Bridge.OnError(this, Strings.Timeout);
@@ -172,7 +172,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
switch (ReadRegistersTempPressAmbient(measureOperations, false))
{
case Event.Error: goto error;
case Event.UiCmdStop: goto stop;
case Event.UiCmdStop: goto stopTest;
}
//====================================
@@ -215,7 +215,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
float progress = Formulas.TestProgress(flowSetTime, estFlowSetTime, test.TstTime);
Bridge.OnTestProgress(this, GetTestProgressData(test, tstRslt, false, cBrd, flowSetTime, progress));
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stopTest;
}
while (!e.Contains(Event.PositionReached));
@@ -232,7 +232,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
switch (ReadRegistersTempPressAmbient(measureOperations, false))
{
case Event.Error: goto error;
case Event.UiCmdStop: goto stop;
case Event.UiCmdStop: goto stopTest;
}
int time = StateMachine.Time;
@@ -350,7 +350,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
float progress = Formulas.TestProgress(flowSetTime, estFlowSetTime, test.TstTime);
Bridge.OnTestProgress(this, GetTestProgressData(test, tstRslt, false, cBrd, flowSetTime, progress));
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stopTest;
if (e.Contains(Event.RegulValveTimeOut))
{
Bridge.OnError(this, Strings.Timeout);
@@ -376,7 +376,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
float progress = Formulas.TestProgress(flowSetTime, estFlowSetTime, test.TstTime);
Bridge.OnTestProgress(this, GetTestProgressData(test, tstRslt, false, cBrd, flowSetTime, progress));
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stopTest;
//if (e.Contains(Event.FlowTimeOut)) goto do_detection;
}
while (!e.Contains(Event.FlowReached));
@@ -396,7 +396,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
{
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.Error)) goto error;
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stopTest;
}
while (!e.Contains(Event.BalanceDone));
@@ -416,7 +416,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
{
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.Error)) goto error;
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stopTest;
}
while (!e.Contains(Event.MeasurementStarted));
@@ -437,7 +437,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
switch (ReadRegistersTempPressAmbient(measureOperations, true))
{
case Event.Error: goto error;
case Event.UiCmdStop: goto stop;
case Event.UiCmdStop: goto stopTest;
case Event.MeasurementCompleted: goto measurement_completed;
}
@@ -503,7 +503,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
{
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.Error)) goto error;
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stopTest;
}
while (!e.Contains(Event.BalanceDone));
///
@@ -522,7 +522,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
do
{
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stopTest;
}
while (!e.Contains(Event.ValvesSet));
@@ -535,17 +535,13 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
do
{
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stopTest;
}
while (!e.Contains(Event.PreviousStopped));
/// Make sure the CycleBeginForm is closed so that water meter data (s/n) can be copied into results
if (cycleBeginFormOpened)
{
cycleBeginFormOpened = false;
if (WaitBeginFormClosed()) goto stop;
}
/// Make sure the CycleBeginForm is closed so that water meter data (s/n) can be copied into results
if (WaitBeginFormClosed()) goto stopTest;
/// Optionally supress pulses from the large water meter
if (testParams.SupressTrills)
@@ -671,7 +667,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
switch (Transition(transitionStop, TransitionContext.TestEnd))
{
case Event.Error: goto error;
case Event.UiCmdStop: goto stop;
case Event.UiCmdStop: goto stopTest;
}
/// Create the return value - a list with one event Event.Done - and return
@@ -680,7 +676,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
return retval1;
//====================================
stop:
stopTest:
State.Create("CombinedWithDetection : User selected STOP -> Closing the valves")
.AddOperation(checkUiOp)
TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+2 -6
View File
@@ -473,12 +473,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
Bridge.OnActivity(this, Strings.Test_completed);
//------------------------------------------------
/// Make sure the CycleBeginForm is closed so that water meter data (s/n) can be copied into results
if (cycleBeginFormOpened)
{
cycleBeginFormOpened = false;
if (WaitBeginFormClosed()) goto stopTest;
}
/// Make sure the CycleBeginForm is closed so that water meter data (s/n) can be copied into results
if (WaitBeginFormClosed()) goto stopTest;
///
/// Populate TestResult data entity with data
TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
+2 -6
View File
@@ -208,12 +208,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
Bridge.OnActivity(this, Strings.Test_completed);
//------------------------------------------------
/// Make sure the CycleBeginForm is closed so that water meter data (s/n) can be copied into results
if (cycleBeginFormOpened)
{
cycleBeginFormOpened = false;
if (WaitBeginFormClosed()) goto stopTest;
}
/// Make sure the CycleBeginForm is closed so that water meter data (s/n) can be copied into results
if (WaitBeginFormClosed()) goto stopTest;
///
/// Populate TestResult data entity with data
TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
+1 -5
View File
@@ -370,11 +370,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
//------------------------------------------------
/// Make sure the CycleBeginForm is closed so that water meter data (s/n) can be copied into results
if (cycleBeginFormOpened)
{
cycleBeginFormOpened = false;
if (WaitBeginFormClosed()) goto stopTest;
}
if (WaitBeginFormClosed()) goto stopTest;
///
/// Populate TestResult data entity with data
TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs
+2 -6
View File
@@ -252,12 +252,8 @@ namespace TBF.BenchControl.TestMethods.LeakTest
Bridge.OnActivity(this, Strings.Test_completed);
//------------------------------------------------
/// Make sure the CycleBeginForm is closed so that water meter data (s/n) can be copied into results
if (cycleBeginFormOpened)
{
cycleBeginFormOpened = false;
if (WaitBeginFormClosed()) goto stopTest;
}
/// Make sure the CycleBeginForm is closed so that water meter data (s/n) can be copied into results
if (WaitBeginFormClosed()) goto stopTest;
///
/// Populate TestResult data entity with data
TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs
+2 -6
View File
@@ -171,12 +171,8 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
Bridge.OnActivity(this, Strings.Test_completed);
//------------------------------------------------
/// Make sure the CycleBeginForm is closed so that water meter data (s/n) can be copied into results
if (cycleBeginFormOpened)
{
cycleBeginFormOpened = false;
if (WaitBeginFormClosed()) goto stopTest;
}
/// Make sure the CycleBeginForm is closed so that water meter data (s/n) can be copied into results
if (WaitBeginFormClosed()) goto stopTest;
///
/// Populate TestResult data entity with data
TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
+2 -6
View File
@@ -325,12 +325,8 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
Bridge.OnActivity(this, Strings.Test_completed);
//------------------------------------------------
/// Make sure the CycleBeginForm is closed so that water meter data (s/n) can be copied into results
if (cycleBeginFormOpened)
{
cycleBeginFormOpened = false;
if (WaitBeginFormClosed()) goto stopTest;
}
/// Make sure the CycleBeginForm is closed so that water meter data (s/n) can be copied into results
if (WaitBeginFormClosed()) goto stopTest;
///
/// Populate TestResult data entity with data