Skip to content

Fix splitTLL assertion #1837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
t-b merged 3 commits into from
Aug 5, 2023
Merged

Fix splitTLL assertion #1837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae13331
DataBrowser: Improve help message for check_BrowserSettings_splitTTL
t-b Aug 4, 2023
a844956
DB_ResetAndStoreCurrentDBPanel: Remove duplicated setting of check_Br…
t-b Aug 4, 2023
70bdbc3
BSP_CheckProc_ChangedSetting: Fix interaction with splitTTL checkbox
t-b Aug 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions Packages/MIES/MIES_BrowserSettingsPanel.ipf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions Packages/MIES/MIES_DataBrowser.ipf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Packages/MIES/MIES_DataBrowser_Macro.ipf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down