bugfixes

bbci · Sep 6, 2012 · a651674 · a651674
1 parent 6461552
commit a651674
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/misc/opt_structToProplist.m b/misc/opt_structToProplist.m
@@ -3,7 +3,7 @@
 %
 % See also opt_proplistToStruct
 
-if nargin==0
+if nargin==0 || isempty(opt)
   pl=[];
   return
 end

diff --git a/processing/proc_resample.m b/processing/proc_resample.m
@@ -70,7 +70,6 @@
 
 % Adjust marker if necessary
 if N>0 && ~isempty(mrk)
-    %% *** HIER WEITER
     mrk.time = mrk.time-Nt;
     % Remove markers that refer to data that was cut-off the beginning or
     % end

diff --git a/processing/utils/procutil_getClassIndices.m b/processing/utils/procutil_getClassIndices.m
@@ -20,14 +20,12 @@
 % returns 2.
 % this function is used, e.g., in mrk_selectClasses, mrk_mergeClasses
 
-% bb 08/03, ida.first.fhg
-
 if nargin==0,
   clInd=[];
   return
 end
 
-misc_checkType(className, 'STRUCT|CHAR');
+misc_checkType(className, '!STRUCT|!CELL{CHAR}');
 
 
 if isempty(varargin),
@@ -64,7 +62,7 @@
   clInd= [];
   for desiredClass= classes,
     dc= desiredClass{1};
-    clInd= [clInd, str_patternmatch(dc, className)];
+    clInd= [clInd, find(strcmp(dc,className))];
   end
 end
 

diff --git a/processing/utils/select_time_intervals.m b/processing/utils/select_time_intervals.m
@@ -323,7 +323,7 @@
 if isfield(epo_r, 'yUnit'),
   ylabel(H.cb, sprintf('[%s]', epo_r.yUnit));
 end
-cidx= strpatternmatch(optVisu.markClab, epo_r.clab);
+cidx= find(ismember(epo_r.clab,optVisu.markClab));
 set(H.ax, 'YTick',cidx, 'YTickLabel',optVisu.markClab, ...
           'TickLength',[0.005 0]);
 if isdefault.xunit && isfield(epo_r, 'xUnit'),
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
     %
     % See also opt_proplistToStruct
-    if nargin==0
+    if nargin==0 || isempty(opt)
       pl=[];
       return
     end
@@ Expand Down @@