corrected some bugs to make demos work.

bbci · Aug 22, 2012 · 0eca71f · 0eca71f
1 parent a485801
commit 0eca71f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/demos/demo_analysis_ERPs.m b/demos/demo_analysis_ERPs.m
@@ -74,7 +74,7 @@
 
 fig_set(3)
 H= grid_plot(epo, mnt, defopt_erps, 'ColorOrder',colOrder);
-grid_addBars(epo_r, 'h_scale',H.scale);
+grid_addBars(epo_r, 'HScale',H.scale);
 %printFigure(['erp'], [19 12]);
 
 fig_set(2);

diff --git a/demos/demo_analysis_Spectra.m b/demos/demo_analysis_Spectra.m
@@ -82,6 +82,6 @@
 fig_set(6);
 H= plot_scalpEvolutionPlusChannel(spec_ref, mnt, clab, band_list, ...
                              defopt_scalp_power, ...
-                             'extrapolate', 0, ...
-                             'colorOrder',colOrder);
+                             'Extrapolate', 0, ...
+                             'ColorOrder',colOrder);
 grid_addBars(spec_r);
diff --git a/misc/misc_history.m b/misc/misc_history.m
@@ -60,7 +60,8 @@
 ht{N}.fcn_params = setdiff(token,'varargin','stable');
 
 % Get argument values for named arguments
-for ii=1:numel(token)
+nActualArguments= evalin('caller', 'nargin');
+for ii=1:min(numel(token), nActualArguments),
     if ~strcmp(token{ii},'varargin') && ~strcmp(token{ii},objname)
         s=evalin('caller',['whos(''' token{ii} ''')']);  % Get size of variable
         if s.bytes > maxSize

diff --git a/processing/proc_selectIval.m b/processing/proc_selectIval.m
@@ -38,7 +38,7 @@
 end
 
 [opt, isdefault]= opt_setDefaults(opt, props);
-opt_checkProplist(opt, props);
+opt_checkProplist(opt, props, props_getIvalIndices);
 misc_checkType('dat', 'STRUCT(x fs)'); 
 misc_checkType('ival','DOUBLE[2]'); 
 

diff --git a/processing/utils/procutil_getIvalIndices.m b/processing/utils/procutil_getIvalIndices.m
@@ -26,16 +26,16 @@
   iv= props; return
 end
 
-misc_checkType(ival, 'DOUBLE[- 2]');
-misc_checkType(dat, '!DOUBLE[1]|STRUCT(fs t)');
+misc_checkType('ival', 'DOUBLE[- 2]');
+misc_checkType('dat', '!DOUBLE[1]|STRUCT(fs t)');
 
 if length(varargin)==1 & ~isstruct(varargin{1}),
   opt= strukt('Dim', varargin{1});
 else
   opt= opt_proplistToStruct(varargin{:});
 end
 opt= opt_setDefaults(opt, props);
-opt_checkProplist(opt, props, props_scalp);
+opt_checkProplist(opt, props);
 
 if size(ival,1)>1,
   iv= [];
@@ -47,7 +47,7 @@
 end
 
 if isstruct(dat),
-  if isfield(dat, 'dim') & &length(dat.dim)>1,
+  if isfield(dat, 'dim') && length(dat.dim)>1,
     %% first dimension of dat.x comprises different 'virtual' dimensions
     %% that have been clashed
     dati= struct('fs', dat.fs);

diff --git a/visualization/plot_scalpPattern.m b/visualization/plot_scalpPattern.m
@@ -44,7 +44,7 @@
 
 eee= erp;
 if nargin>=3 & ~isempty(ival) & ~any(isnan(ival)),
-  eee= proc_selectIval(eee, ival, 'ival_policy','minimal');
+  eee= proc_selectIval(eee, ival, 'IvalPolicy','minimal');
 end
 if ~isempty(opt.Class),
   eee= proc_selectClasses(eee, opt.Class);