From ae13331f97e485c13a5006cd462800e1e547cefb Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Fri, 4 Aug 2023 20:26:46 +0200 Subject: [PATCH 1/3] DataBrowser: Improve help message for check_BrowserSettings_splitTTL --- Packages/MIES/MIES_DataBrowser_Macro.ipf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From a844956a65664731271ad7492e426b81037b2219 Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Fri, 4 Aug 2023 20:27:35 +0200 Subject: [PATCH 2/3] DB_ResetAndStoreCurrentDBPanel: Remove duplicated setting of check_BrowserSettings_splitTTL And do it correctly once. --- Packages/MIES/MIES_DataBrowser.ipf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 From 70bdbc326d5d5edc7028ed3ed42586e866cff25f Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Fri, 4 Aug 2023 20:37:09 +0200 Subject: [PATCH 3/3] BSP_CheckProc_ChangedSetting: Fix interaction with splitTTL checkbox We currently get an assertion when enabling "Visualize Epochs". The reason is that the interplay between the checkboxes "Vis Epochs", "splitTTL" and "TTL" was broken. The fix is to: - Enable "Split TTL" for "Vis Epochs" only when required - Turn off "Split TTL" when disabling "TTL" only if "Vis Epochs" is not checked --- Packages/MIES/MIES_BrowserSettingsPanel.ipf | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) 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)