Skip to content

Commit

Permalink
minor changes and prepare minor release
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.code.sf.net/p/pspm/svn/trunk@529 23ec9670-3a1e-4a12-9187-a0ba8bce340d
  • Loading branch information
Tobias Moser committed Feb 23, 2018
1 parent aa48a2e commit c4ba5ba
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
4 changes: 2 additions & 2 deletions pspm_cfg/pspm_cfg_run_contrast2.m
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
end

% outfile
outfile = [job.outdir{1} '\' job.filename '.mat'];
outfile = [job.outdir{1} filesep job.filename '.mat'];

% connames & con
connames = fieldnames(job.def_con_name);
Expand Down Expand Up @@ -44,4 +44,4 @@

pspm_con2(modelfile, outfile, con, connames, options);

out = {outfile};
out = {outfile};
6 changes: 4 additions & 2 deletions pspm_cfg/pspm_cfg_run_import.m
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,15 @@
% Check if eytracker distance is available
if ~isempty(regexpi(type, 'pupil')) && ...
isfield(job.datatype.(datatype), 'eyelink_trackdist')
transfer = job.datatype.(datatype).eyelink_trackdist;
distance_unit = job.datatype.(datatype).distance_unit;
transfer = job.datatype.(datatype).eyelink_trackdist;
distance_unit = job.datatype.(datatype).distance_unit;

if transfer > 0
import{i}.eyelink_trackdist = transfer;
import{i}.distance_unit = distance_unit;
else
import{i}.eyelink_trackdist = 'none';
import{i}.distance_unit = '';
end
end

Expand Down
14 changes: 10 additions & 4 deletions pspm_rev2.m
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,14 @@ function pspm_rev2(modelfile, con)
hold on;
fig(1).err(c)=errorbar(c, m(c), s(c), 'LineStyle', 'none', 'Color', [0 0 0], 'LineWidth', 3);
end;
set(fig(1).ax(1).h, 'XTick', [1:numel(con)], 'XTickLabel', t.names(con), 'YLim',[YMin, YMax], 'YTick', [], 'FontWeight', 'Bold', 'FontSize', 14);
set(get(fig(1).ax(1).h, 'YLabel'), 'String', 'Parameter mean (arbitrary units)', 'FontSize', 18, 'FontWeight', 'Bold');
set(fig(1).ax(1).h, 'XTick', [1:numel(con)], ...
'XTickLabel', t.names(con), 'YLim',[YMin, YMax], ...
'YTick', [], 'TickLabelInterpreter', 'none', ...
'XTickLabelRotation', 25, ...
'FontWeight', 'Bold', 'FontSize', 14);
set(get(fig(1).ax(1).h, 'YLabel'), ...
'String', 'Parameter mean (arbitrary units)', ...
'FontSize', 18, 'FontWeight', 'Bold');
end;

% display files and tables
Expand Down Expand Up @@ -106,6 +112,6 @@ function pspm_rev2(modelfile, con)
end;
disp(' ');
disp('__________________________________________________________________________________');
disp('SCRalyze (c) Dominik R. Bach, Wellcome Trust Centre for Neuroimaging, UCL London UK');
disp('PsPM (c) Dominik R. Bach, Wellcome Trust Centre for Neuroimaging, UCL London UK');

return;
return;

0 comments on commit c4ba5ba

Please sign in to comment.