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

FixedStartMassCollection modified, ControlBoard.Elde repmoved, ver. 3.1.1624

Browse Source
This commit is contained in:
Milan Hanajik
2021-04-16 14:06:47 +02:00
parent 95d5d16c83
commit 847956f708
46 changed files with 113 additions and 3688 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Rig/Sequences/MainSeq.cs
+6 -6
View File
@@ -311,9 +311,9 @@ namespace TBF.Rig.Sequences
/// Procedure selected at this point, a new batch was started
///
int newBatchNr = Program.LocalSettings.BatchNr;
if (StateMachine.ControlBoard is ControlBoard.Legacy.CBoard)
if (StateMachine.ControlBoard is ControlBoard.Uni.UniCB)
{
(StateMachine.ControlBoard as ControlBoard.Legacy.CBoard).ManualUIAllowed = !StateMachine.Procedure.ManualCtrlDisabled;
(StateMachine.ControlBoard as ControlBoard.Uni.UniCB).IsUIBlocked = StateMachine.Procedure.ManualCtrlDisabled;
}
Bridge.Bench2UI(ButtonsEtc.StopBtnEn); /// A new cycle started : Enable STOP button
log.FatalFormat("New measurement session started: batch = {0}, procedure = {1}", newBatchNr, StateMachine.Procedure.Name);
@@ -641,9 +641,9 @@ namespace TBF.Rig.Sequences
}
if (selection == Selection.Break)
{
if (StateMachine.ControlBoard is ControlBoard.Legacy.CBoard)
if (StateMachine.ControlBoard is ControlBoard.Uni.UniCB)
{
(StateMachine.ControlBoard as ControlBoard.Legacy.CBoard).ManualUIAllowed = true;
(StateMachine.ControlBoard as ControlBoard.Uni.UniCB).IsUIBlocked = false;
}
Bridge.Bench2UI(ButtonsEtc.ShowBenchEmpty);
Bridge.OnProcedureCompleted(this, new ProcedureCompletedEventArgs(StateMachine.Procedure));
@@ -1271,9 +1271,9 @@ namespace TBF.Rig.Sequences
ProcessData.BatchRslts.Batch.ProcedureName,
Program.LocalSettings.BatchNr);
if (StateMachine.ControlBoard is ControlBoard.Legacy.CBoard)
if (StateMachine.ControlBoard is ControlBoard.Uni.UniCB)
{
(StateMachine.ControlBoard as ControlBoard.Legacy.CBoard).ManualUIAllowed = true;
(StateMachine.ControlBoard as ControlBoard.Uni.UniCB).IsUIBlocked = false;
}
Event evacRetv = DoEvacuation(purgeEnd);