diff --git a/src/pspm_display.m b/src/pspm_display.m index 0f57f14ee..94b2473ed 100644 --- a/src/pspm_display.m +++ b/src/pspm_display.m @@ -488,8 +488,6 @@ function load_Callback(hObject, ~, handles) set(handles.button_autoscale,'Value',0); set(handles.button_all,'Value',1); -elseif numel(varargin)>1 - warning('Too many input arguments. Inputs 2:end ignored. '); end % Update handles structure diff --git a/src/pspm_glm_recon.m b/src/pspm_glm_recon.m index 218a0c176..a0c675abc 100644 --- a/src/pspm_glm_recon.m +++ b/src/pspm_glm_recon.m @@ -35,7 +35,7 @@ % for ra_fc with bf.arg == 1 take regressor difference % ------------------------------------------------------------------------- -if strcmpi('ra_fc', glm.modelspec) && glm.bf.args == 1 +if strcmpi('ra_fc', glm.modelspec) && ~isempty(glm.bf.args) && glm.bf.args == 1 regdiff = 1; else regdiff = 0; diff --git a/src/pspm_rev_glm.m b/src/pspm_rev_glm.m index 59cdbf3b2..3fba8ec35 100644 --- a/src/pspm_rev_glm.m +++ b/src/pspm_rev_glm.m @@ -6,7 +6,6 @@ % fig = pspm_rev_glm(modelfile, plotNr) % ● Arguments % * modelfile : filename and path of modelfile -% * glm : loaded model % * plotNr : defines which figure shall be plotted % (several plots can be defined by a vector) % 1 - design matrix, SPM style diff --git a/src/pspm_review.m b/src/pspm_review.m index a3456c5b3..ad5d3a8ca 100644 --- a/src/pspm_review.m +++ b/src/pspm_review.m @@ -194,8 +194,7 @@ function buttonPlot1_Callback(hObject, ~, handles) switch handles.modelData{handles.currentModel}.modeltype case 'glm' handles.modelData{handles.currentModel}.fig = ... - pspm_rev_glm(handles.modelData{handles.currentModel}.modelfile, ... - handles.modelData{handles.currentModel}.model, 1); + pspm_rev_glm(handles.modelData{handles.currentModel}.modelfile, 1); case 'dcm' sessionNr = checkSessionNr(handles); @@ -228,8 +227,7 @@ function buttonPlot2_Callback(hObject, ~, handles) switch handles.modelData{handles.currentModel}.modeltype case 'glm' handles.modelData{handles.currentModel}.fig = ... - pspm_rev_glm(handles.modelData{handles.currentModel}.modelfile, ... - handles.modelData{handles.currentModel}.model, 2); + pspm_rev_glm(handles.modelData{handles.currentModel}.modelfile, 2); case 'dcm' sessionNr = checkSessionNr(handles); @@ -257,8 +255,7 @@ function buttonPlot3_Callback(hObject, ~, handles) switch handles.modelData{handles.currentModel}.modeltype case 'glm' handles.modelData{handles.currentModel}.fig = ... - pspm_rev_glm(handles.modelData{handles.currentModel}.modelfile, ... - handles.modelData{handles.currentModel}.model, 3); + pspm_rev_glm(handles.modelData{handles.currentModel}.modelfile, 3); case 'dcm' sessionNr = checkSessionNr(handles); @@ -280,8 +277,7 @@ function buttonPlot4_Callback(hObject, ~, handles) switch handles.modelData{handles.currentModel}.modeltype case 'glm' handles.modelData{handles.currentModel}.fig = ... - pspm_rev_glm(handles.modelData{handles.currentModel}.modelfile, ... - handles.modelData{handles.currentModel}.model, 4); + pspm_rev_glm(handles.modelData{handles.currentModel}.modelfile, 4); case 'dcm' pspm_rev_dcm(handles.modelData{handles.currentModel}.model, 'names'); end @@ -298,8 +294,7 @@ function buttonPlot5_Callback(hObject, ~, handles) switch handles.modelData{handles.currentModel}.modeltype case 'glm' handles.modelData{handles.currentModel}.fig = ... - pspm_rev_glm(handles.modelData{handles.currentModel}.modelfile, ... - handles.modelData{handles.currentModel}.model, 5); + pspm_rev_glm(handles.modelData{handles.currentModel}.modelfile, 5); case 'dcm' handles.modelData{handles.currentModel}.fig = ... pspm_rev_con(handles.modelData{handles.currentModel}.model);