Skip to content

Commit

Permalink
Merge branch 'master' of github.com:sccn/bids-matlab-tools
Browse files Browse the repository at this point in the history
  • Loading branch information
arnodelorme committed Nov 11, 2021
2 parents bee8f87 + 58dbeb2 commit f49482b
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 4 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,5 @@ v5.3 - adding capability to export stimuli
v5.3.1 - update documentation for tInfo.HardwareFilters; fix bug defaults fields not filled for eInfo

v5.4 - fix issue with reading BIDS information when importing BIDS data to STUDY

v6.0 - new examples and fixes for HED
1 change: 0 additions & 1 deletion bids_export_example3.m
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@
'CHANGES', CHANGES, ...
'codefiles', codefiles, ...
'trialtype', trialTypes, ...
'chanlookup', '/data/matlab/eeglab/plugins/dipfit/standard_BEM/elec/standard_1005.elc', ...
'renametype', {}, ...
'checkresponse', 'condition 1', ...
'tInfo', tInfo, ...
Expand Down
2 changes: 1 addition & 1 deletion eegplugin_bids.m
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

function vers = eegplugin_bids(fig, trystrs, catchstrs)

vers = '5.4';
vers = '6.0';
if nargin < 3
error('eegplugin_bids requires 3 arguments');
end
Expand Down
18 changes: 16 additions & 2 deletions pop_taskinfo.m
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,11 @@ function okCB(src,event)
if strcmp(objs(i).Tag, 'ReferencesAndLinks') || strcmp(objs(i).Tag, 'Authors')
gInfo.(objs(i).Tag) = {objs(i).String};
else
gInfo.(objs(i).Tag) = objs(i).String;
tmp = objs(i).String;
if ndims(tmp) > 1 && size(tmp,1) > 1
tmp = reformatchartostring(tmp);
end
gInfo.(objs(i).Tag) = tmp;
end
else
if strcmp(objs(i).Style, 'popupmenu')
Expand All @@ -210,7 +214,11 @@ function okCB(src,event)
tmp.FilterDescription.Description = objs(i).String;
tInfo.(objs(i).Tag) = tmp;
else
tInfo.(objs(i).Tag) = objs(i).String;
tmp = objs(i).String;
if ndims(tmp) > 1 && size(tmp,1) > 1
tmp = reformatchartostring(tmp);
end
tInfo.(objs(i).Tag) = tmp;
end
end
end
Expand Down Expand Up @@ -340,4 +348,10 @@ function preFill()

function editedCB(src,event)
end

function string_out = reformatchartostring(char_in)
char_in(1:end-1,end+1) = newline;
char_in = char_in';
string_out = char_in(:)';
end
end

0 comments on commit f49482b

Please sign in to comment.