diff --git a/Packages/MIES/MIES_BrowserSettingsPanel.ipf b/Packages/MIES/MIES_BrowserSettingsPanel.ipf index f70418c7ac..d2f4ae4d1d 100644 --- a/Packages/MIES/MIES_BrowserSettingsPanel.ipf +++ b/Packages/MIES/MIES_BrowserSettingsPanel.ipf @@ -1267,25 +1267,22 @@ Function BSP_CheckProc_ChangedSetting(cba) : CheckBoxControl endif break case "check_BrowserSettings_TTL": - if(checked) + if(checked && !GetCheckBoxState(bsPanel, "check_BrowserSettings_VisEpochs")) EnableControl(bsPanel, "check_BrowserSettings_splitTTL") else DisableControl(bsPanel, "check_BrowserSettings_splitTTL") endif break case "check_BrowserSettings_VisEpochs": - AdaptDependentControls(bsPanel, "check_BrowserSettings_splitTTL", CHECKBOX_UNSELECTED, checked, DEP_CTRLS_SAME) + if(GetCheckBoxState(bsPanel, "check_BrowserSettings_TTL")) + AdaptDependentControls(bsPanel, "check_BrowserSettings_splitTTL", CHECKBOX_UNSELECTED, checked, DEP_CTRLS_SAME) + endif if(checked) DisableControls(bsPanel, "check_Display_EqualYrange;check_Display_EqualYignore") else EnableControls(bsPanel, "check_Display_EqualYrange;check_Display_EqualYignore") endif break - case "check_BrowserSettings_splitTTL": - if(!checked) - PGC_SetAndActivateControl(bsPanel, "check_BrowserSettings_VisEpochs", val = 0) - endif - break default: if(StringMatch(ctrl, "check_channelSel_*")) BSP_GUIToChannelSelectionWave(bsPanel, ctrl, checked) diff --git a/Packages/MIES/MIES_DataBrowser.ipf b/Packages/MIES/MIES_DataBrowser.ipf index cb35383981..1d55fd89dd 100644 --- a/Packages/MIES/MIES_DataBrowser.ipf +++ b/Packages/MIES/MIES_DataBrowser.ipf @@ -117,7 +117,7 @@ Function DB_ResetAndStoreCurrentDBPanel() PGC_SetAndActivateControl(bsPanel, "Settings", val = 0) CheckBox check_overlaySweeps_disableHS, WIN = $bsPanel, value= 0 CheckBox check_overlaySweeps_non_commula, WIN = $bsPanel, value= 0 - CheckBox check_BrowserSettings_splitTTL, WIN = $bsPanel, value= 1 + CheckBox check_BrowserSettings_splitTTL, WIN = $bsPanel, value= 1,disable=DISABLE_CONTROL_BIT PopupMenu popup_overlaySweeps_select, WIN = $bsPanel, mode=1 SetVariable setvar_overlaySweeps_offset, WIN = $bsPanel, value= _NUM:0 SetVariable setvar_overlaySweeps_step, WIN = $bsPanel, value= _NUM:1 @@ -200,7 +200,6 @@ Function DB_ResetAndStoreCurrentDBPanel() CheckBox check_BrowserSettings_DAC, WIN = $bsPanel, value= 0 CheckBox check_BrowserSettings_ADC, WIN = $bsPanel, value= 1 CheckBox check_BrowserSettings_TTL, WIN = $bsPanel, value= 0 - CheckBox check_BrowserSettings_splitTTL, WIN = $bsPanel, value= 0,disable=DISABLE_CONTROL_BIT CheckBox check_BrowserSettings_OChan, WIN = $bsPanel, value= 0 CheckBox check_BrowserSettings_dDAQ, WIN = $bsPanel, value= 0 CheckBox check_Calculation_ZeroTraces, WIN = $bsPanel, value= 0 diff --git a/Packages/MIES/MIES_DataBrowser_Macro.ipf b/Packages/MIES/MIES_DataBrowser_Macro.ipf index 8bc105828b..4245176470 100644 --- a/Packages/MIES/MIES_DataBrowser_Macro.ipf +++ b/Packages/MIES/MIES_DataBrowser_Macro.ipf @@ -930,7 +930,7 @@ Window DataBrowser() : Graph CheckBox check_SweepControl_HideSweep,value=0 CheckBox check_BrowserSettings_splitTTL,pos={170.00,56.00},size={58.00,15.00},disable=2,proc=BSP_CheckProc_ChangedSetting CheckBox check_BrowserSettings_splitTTL,title="sep. TTL" - CheckBox check_BrowserSettings_splitTTL,help={"Display the TTL channel data as single traces for each TTL bit"} + CheckBox check_BrowserSettings_splitTTL help={"Display the TTL channel data as single traces for each TTL bit (ITC hardware only, for other hardware types this is always the case regardless of this checkbox)"} CheckBox check_BrowserSettings_splitTTL,userdata(tabnum)="0" CheckBox check_BrowserSettings_splitTTL,userdata(tabcontrol)="Settings" CheckBox check_BrowserSettings_splitTTL,userdata(ResizeControlsInfo)=A"!!,G:!!#>n!!#?!!!#<(z!!#`-A7TLfzzzzzzzzzzzzzz!!#r+D.OhkBk2=!z"