Skip to content

Commit f33927c

Browse files
committed
Pressure Control: Disable manual controls when user access is enabled
Otherwise we can get an assertion as the manual pressure pulse interferes. Close #2124
1 parent 1d8c20b commit f33927c

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

Packages/MIES/MIES_DAEphys.ipf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4452,11 +4452,23 @@ Function DAP_CheckProc_Settings_PUser(cba) : CheckBoxControl
44524452
STRUCT WMCheckboxAction &cba
44534453

44544454
variable headstage
4455+
string ctrls
44554456

44564457
switch(cba.eventCode)
44574458
case 2: // mouse up
44584459
DAP_AbortIfUnlocked(cba.win)
44594460
DAG_Update(cba.win, cba.ctrlName, val = cba.checked)
4461+
4462+
if(!cmpstr(cba.ctrlName, "check_DataACq_Pressure_User"))
4463+
ctrls = "button_DataAcq_SSSetPressureMan;setvar_DataAcq_SSPressure;button_DataAcq_PPSetPressureMan;setvar_DataAcq_PPPressure;setvar_DataAcq_PPDuration;check_DataAcq_ManPressureAll"
4464+
4465+
if(cba.checked)
4466+
DisableControls(cba.win, ctrls)
4467+
else
4468+
EnableControls(cba.win, ctrls)
4469+
endif
4470+
endif
4471+
44604472
WAVE pressureDataWv = P_GetPressureDataWaveRef(cba.win)
44614473
P_RunP_ControlIfTPOFF(cba.win)
44624474
headstage = PressureDataWv[0][%UserSelectedHeadStage]

0 commit comments

Comments
 (0)