Skip to content

Commit 84481a1

Browse files
committed
DAP_CheckProc_Settings_PUser: Disable and stop manual pressure on user access
This avoids a runtime assertion.
1 parent d368a2d commit 84481a1

File tree

2 files changed

+26
-1
lines changed

2 files changed

+26
-1
lines changed

Packages/MIES/MIES_DAEphys.ipf

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4459,14 +4459,24 @@ Function DAP_CheckProc_Settings_PUser(cba) : CheckBoxControl
44594459
device = cba.win
44604460
DAP_AbortIfUnlocked(device)
44614461
DAG_Update(device, cba.ctrlName, val = cba.checked)
4462+
4463+
WAVE pressureType = GetPressureTypeWv(device)
4464+
44624465
WAVE pressureDataWv = P_GetPressureDataWaveRef(device)
4463-
P_RunP_ControlIfTPOFF(device)
44644466
headstage = PressureDataWv[0][%UserSelectedHeadStage]
4467+
4468+
if(pressureType[headstage] == PRESSURE_TYPE_MANUAL)
4469+
PGC_SetAndActivateControl(device, "button_DataAcq_SSSetPressureMan")
4470+
endif
4471+
4472+
P_RunP_ControlIfTPOFF(device)
44654473
if(P_ValidatePressureSetHeadstage(device, headstage))
44664474
P_SetPressureValves(device, headstage, P_GetUserAccess(device, headstage, PressureDataWv[headstage][%Approach_Seal_BrkIn_Clear]))
44674475
endif
44684476
P_UpdatePressureType(device)
44694477

4478+
P_AdaptManualControlsForUserAccess(device, headstage)
4479+
44704480
break
44714481
endswitch
44724482

Packages/MIES/MIES_PressureControl.ipf

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1826,6 +1826,21 @@ Function P_UpdatePressureModeTabs(device, headStage)
18261826
endif
18271827

18281828
PGC_SetAndActivateControl(device, "setvar_DataAcq_SSPressure", val = pressureWave[headStage][%ManSSPressure])
1829+
1830+
P_AdaptManualControlsForUserAccess(device, headStage)
1831+
End
1832+
1833+
Function P_AdaptManualControlsForUserAccess(string device, variable headstage)
1834+
1835+
string ctrlsDisableUserAccess = "button_DataAcq_SSSetPressureMan;setvar_DataAcq_SSPressure;button_DataAcq_PPSetPressureMan;setvar_DataAcq_PPPressure;setvar_DataAcq_PPDuration;check_DataAcq_ManPressureAll"
1836+
1837+
WAVE pressureType = GetPressureTypeWv(device)
1838+
1839+
if(pressureType[headstage] == PRESSURE_TYPE_USER)
1840+
DisableControls(device, ctrlsDisableUserAccess)
1841+
else
1842+
EnableControls(device, ctrlsDisableUserAccess)
1843+
endif
18291844
End
18301845

18311846
/// @brief Checks if all the pressure settings for a headStage are valid

0 commit comments

Comments
 (0)