From 6d14e7f7bc8351347869491b1f87d2a4c480658e Mon Sep 17 00:00:00 2001 From: Justin Gardner Date: Mon, 19 Dec 2022 10:48:00 -0800 Subject: [PATCH] Fixing label issues for GLMV2 plugin - seems that the names callback and label have been changed by mathworks --- mrLoadRet/GUI/mlrAdjustGUI.m | 1 + mrLoadRet/Plugin/GLM_v2/GLM_v2Plugin.m | 43 +++++++++++++------------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/mrLoadRet/GUI/mlrAdjustGUI.m b/mrLoadRet/GUI/mlrAdjustGUI.m index 7591788a2..9de2592ca 100644 --- a/mrLoadRet/GUI/mlrAdjustGUI.m +++ b/mrLoadRet/GUI/mlrAdjustGUI.m @@ -552,6 +552,7 @@ function setItemProperty(args,uiControls,menuControls,plotAxes,verbose) % if not, warn and continue if isstr(propertyName) disp(sprintf('(mlrAdjustGUI) *** Could not find property %s of %s %s ***',propertyName,controlType,controlName)); + keyboard else disp(sprintf('(mlrAdjustGUI) *** Could not find correct property of %s %s. Did you pass in a string indicating a property to set ***',controlType,controlName)); end diff --git a/mrLoadRet/Plugin/GLM_v2/GLM_v2Plugin.m b/mrLoadRet/Plugin/GLM_v2/GLM_v2Plugin.m index e4ab92c51..9f0f4a67e 100644 --- a/mrLoadRet/Plugin/GLM_v2/GLM_v2Plugin.m +++ b/mrLoadRet/Plugin/GLM_v2/GLM_v2Plugin.m @@ -213,29 +213,30 @@ %---------------------------- Add menus -------------------------------- - + menuCallbackName = 'MenuSelectedFcn'; + menuLabel = 'Text'; % File menu - mlrAdjustGUI(thisView,'set','exportImageMenuItem','callback',@exportImage_Callback); - mlrAdjustGUI(thisView,'set','exportImageMenuItem','label','Export Images'); + mlrAdjustGUI(thisView,'set','exportImageMenuItem',menuCallbackName,@exportImage_Callback); + mlrAdjustGUI(thisView,'set','exportImageMenuItem',menuLabel,'Export Images'); % Edit menu - mlrAdjustGUI(thisView,'add','menu','Unlink Stimfile','/Edit/Scan/Link Stimfile','callback',@unlinkStimfileMenuItem_Callback,'tag','unlinkStimfileMenuItem'); + mlrAdjustGUI(thisView,'add','menu','Unlink Stimfile','/Edit/Scan/Link Stimfile',menuCallbackName,@unlinkStimfileMenuItem_Callback,'tag','unlinkStimfileMenuItem'); mlrAdjustGUI(thisView,'set','/Edit/Scan/Link Stimfile','separator','on'); - mlrAdjustGUI(thisView,'add','menu','Copy sform','/Edit/Base Anatomy/Transforms/','callback',@copyBaseSformCallBack,'tag','copyBaseSformMenuItem'); - mlrAdjustGUI(thisView,'add','menu','Paste sform','/Edit/Base Anatomy/Transforms/','callback',@pasteBaseSformCallBack,'tag','pasteBaseSformMenuItem'); - mlrAdjustGUI(thisView,'set','copyOverlayMenuItem','Callback',@copyOverlayCallback); - mlrAdjustGUI(thisView,'set','copyOverlayMenuItem','label','Copy overlay(s)...'); - mlrAdjustGUI(thisView,'set','pasteOverlayMenuItem','Callback',@pasteOverlayCallback); - mlrAdjustGUI(thisView,'set','copyScanMenuItem','Callback',@copyScanCallback); - mlrAdjustGUI(thisView,'set','copyScanMenuItem','label','Copy scan(s)...'); - mlrAdjustGUI(thisView,'set','pasteScanMenuItem','Callback',@pasteScanCallback); + mlrAdjustGUI(thisView,'add','menu','Copy sform','/Edit/Base Anatomy/Transforms/',menuCallbackName,@copyBaseSformCallBack,'tag','copyBaseSformMenuItem'); + mlrAdjustGUI(thisView,'add','menu','Paste sform','/Edit/Base Anatomy/Transforms/',menuCallbackName,@pasteBaseSformCallBack,'tag','pasteBaseSformMenuItem'); + mlrAdjustGUI(thisView,'set','copyOverlayMenuItem',menuCallbackName,@copyOverlayCallback); + mlrAdjustGUI(thisView,'set','copyOverlayMenuItem',menuLabel,'Copy overlay(s)...'); + mlrAdjustGUI(thisView,'set','pasteOverlayMenuItem',menuCallbackName,@pasteOverlayCallback); + mlrAdjustGUI(thisView,'set','copyScanMenuItem',menuCallbackName,@copyScanCallback); + mlrAdjustGUI(thisView,'set','copyScanMenuItem',menuLabel,'Copy scan(s)...'); + mlrAdjustGUI(thisView,'set','pasteScanMenuItem',menuCallbackName,@pasteScanCallback); % Analysis menu mlrAdjustGUI(thisView,'add','menu','Apply MotionComp Transforms','/Analysis/Motion Compensation/Slice Time Correction (only)','callback',@applyMotionCompTransformsCallBack,'tag','applyMotionCompTransformMenuItem'); %mlrAdjustGUI(thisView,'remove','menu','eventRelatedMenuItem'); - mlrAdjustGUI(thisView,'set','glmMenuItem','Callback',@glmAnalysisCallback); - mlrAdjustGUI(thisView,'set','glmMenuItem','label','GLM analysis (v2)'); - mlrAdjustGUI(thisView,'set','recomputeAnalysisMenuItem','Callback',@recomputeAnalysisCallback); + mlrAdjustGUI(thisView,'set','glmMenuItem',menuCallbackName,@glmAnalysisCallback); + mlrAdjustGUI(thisView,'set','glmMenuItem',menuLabel,'GLM analysis (v2)'); + mlrAdjustGUI(thisView,'set','recomputeAnalysisMenuItem',menuCallbackName,@recomputeAnalysisCallback); % Overlay menu mlrAdjustGUI(thisView,'add','menu','overlaysMenu','/Analysis','label','Overlays','tag','overlaysMenu'); @@ -251,12 +252,12 @@ mlrAdjustGUI(thisView,'set','undoRoiMenuItem','location','/ROI/Restrict'); mlrAdjustGUI(thisView,'set','convertRoiMenuItem','separator','off'); mlrAdjustGUI(thisView,'set','deleteRoiMenu','separator','on'); - mlrAdjustGUI(thisView,'set','restrictRoiMenuItem','label','Selected ROI(s)'); - mlrAdjustGUI(thisView,'set','deleteRoiMenuItem','label','Selected ROI(s)'); - mlrAdjustGUI(thisView,'set','saveROIMenuItem','label','Save selected ROI(s)'); - mlrAdjustGUI(thisView,'set','copyRoiMenuItem','label','Copy selected ROI(s)'); - mlrAdjustGUI(thisView,'set','pasteRoiMenuItem','label','Paste ROI(s)'); - mlrAdjustGUI(thisView,'set','editRoiMenuItem','label','Edit selected ROI(s)'); + mlrAdjustGUI(thisView,'set','restrictRoiMenuItem',menuLabel,'Selected ROI(s)'); + mlrAdjustGUI(thisView,'set','deleteRoiMenuItem',menuLabel,'Selected ROI(s)'); + mlrAdjustGUI(thisView,'set','saveROIMenuItem',menuLabel,'Save selected ROI(s)'); + mlrAdjustGUI(thisView,'set','copyRoiMenuItem',menuLabel,'Copy selected ROI(s)'); + mlrAdjustGUI(thisView,'set','pasteRoiMenuItem',menuLabel,'Paste ROI(s)'); + mlrAdjustGUI(thisView,'set','editRoiMenuItem',menuLabel,'Edit selected ROI(s)'); %add functions mlrAdjustGUI(thisView,'add','menu','Single Voxels','/ROI/Create/Contiguous Voxels','callback',@createSingleVoxelsCallBack,'label','Single Voxels','tag','createSingleVoxelsRoiMenuItem','accelerator','T'); mlrAdjustGUI(thisView,'add','menu','Single Voxels2','/ROI/Add/Contiguous Voxels','callback',@addSingleVoxelsCallBack,'label','Single Voxels','tag','addSingleVoxelsRoiMenuItem','accelerator','N');