Skip to content

Update pspm_display.m #751

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
dominikbach merged 4 commits into from
Aug 5, 2024
Merged

Update pspm_display.m #751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e50b8f2
Update pspm_display.m
Aug 5, 2024
086fb58
remove unused parameters
Aug 5, 2024
fdac226
Update pspm_data_editor.m
Aug 5, 2024
916f0ae
Revert "Update pspm_data_editor.m"
Aug 5, 2024
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
2 changes: 0 additions & 2 deletions src/pspm_display.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/pspm_glm_recon.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion src/pspm_rev_glm.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 5 additions & 10 deletions src/pspm_review.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand All @@ -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
Expand All @@ -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);
Expand Down