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

Fixed but in main sequence when there are no scales

Browse Source
This commit is contained in:
Milan Hanajik 2014-08-08 09:37:45 +02:00
parent a597da1e18
commit ea31fc31fe
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
TestBenchFramework/BenchControl/Sequences/MainSeq.cs
View File

@ -117,14 +117,14 @@ namespace TBF.BenchControl.Sequences
Bridge.Bench2UI(ButtonsEtc.ProcedureCmbBoxEn | ButtonsEtc.TestCmbBoxEn | ButtonsEtc.StopBtnEn |
((emptying1 || emptying2) ? 0 : (ButtonsEtc.StartCycleBtnEn | ButtonsEtc.StartTestBtnsEn |
ButtonsEtc.PurgeBeginBtnEn | ButtonsEtc.CalibrationBtnEn)) |
(emptying1 ? 0 : ButtonsEtc.EmptyTankBtn1En) |
(emptying2 ? 0 : ButtonsEtc.EmptyTankBtn2En));
(((StateMachine.Balance1 != null) && !emptying1) ? ButtonsEtc.EmptyTankBtn1En : 0) |
(((StateMachine.Balance2 != null) && !emptying2) ? ButtonsEtc.EmptyTankBtn2En : 0));
selection = Selection.None;
State.Create("MainSeq : Select a procedure")
.AddOperation(checkUiOp)
.AddOperation(StateMachine.Balance1.ReadMassOp(ref mass1))
.AddOperation(StateMachine.Balance2.ReadMassOp(ref mass2))
.AddOperation((StateMachine.Balance1 != null) ? StateMachine.Balance1.ReadMassOp(ref mass1) : null)
.AddOperation((StateMachine.Balance2 != null) ? StateMachine.Balance2.ReadMassOp(ref mass2) : null)
.AddOperation(cBrd.UpdateTankWeightOp())
.EnterState();
do
@ -303,15 +303,15 @@ namespace TBF.BenchControl.Sequences
ButtonsEtc.PurgeBeginBtnEn | ButtonsEtc.PurgeEndBtnEn |
((Cameras.Count > 0) ? ButtonsEtc.CalibrationBtnEn : 0)) |
ButtonsEtc.SensitivityTestBtnEn | ButtonsEtc.TryOpticalHeadsBtnEn) |
(emptying1 ? 0 : ButtonsEtc.EmptyTankBtn1En) |
(emptying2 ? 0 : ButtonsEtc.EmptyTankBtn2En));
(((StateMachine.Balance1 != null) && !emptying1) ? ButtonsEtc.EmptyTankBtn1En : 0) |
(((StateMachine.Balance2 != null) && !emptying2) ? ButtonsEtc.EmptyTankBtn2En : 0));
selection = Selection.None;
State.Create("MainSeq : Select an activity for the selected procedure")
.AddOperation(checkUiOp)
.AddOperation(StateMachine.Balance1.ReadMassOp(ref mass1))
.AddOperation(StateMachine.Balance2.ReadMassOp(ref mass2))
.AddOperation(cBrd.UpdateTankWeightOp())
.AddOperation((StateMachine.Balance1 != null) ? StateMachine.Balance1.ReadMassOp(ref mass1) : null)
.AddOperation((StateMachine.Balance2 != null) ? StateMachine.Balance2.ReadMassOp(ref mass2) : null)
.AddOperation(cBrd.UpdateTankWeightOp())
.EnterState();
do
{

BIN
TestBenchFramework/SampleConfig/SQLite.db
View File

Binary file not shown.