Merge pull request #8 from sccn/master

Still numerical event boundary but simplier code
widmann · Jul 13, 2022 · 782562f · 782562f
2 parents 785254e + 77d3ef2
commit 782562f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,7 @@
+Version 2.5
+- ENH: handles events of type -99 if EEGLAB option set
+- ENH: further checks when processing datasets with boundaries
+
 Version 2.4
 - BUG: new fix command line call for backward compatibility in pop_eegfiltnew.m
 

diff --git a/eegplugin_firfilt.m b/eegplugin_firfilt.m
@@ -31,7 +31,7 @@
 
 function vers = eegplugin_firfilt(fig, trystrs, catchstrs)
 
-    vers = 'firfilt2.4';
+    vers = 'firfilt2.5';
     if nargin < 3
         error('eegplugin_firfilt requires 3 arguments');
     end

diff --git a/findboundaries.m b/findboundaries.m
@@ -32,10 +32,14 @@
 
 function boundaries = findboundaries(event)
 
-if isfield(event, 'type') & isfield(event, 'latency') & cellfun('isclass', {event.type}, 'char')
+if isfield(event, 'type') && isfield(event, 'latency')
 
     % Boundary event indices
-    boundaries = strmatch('boundary', {event.type});
+    if all(cellfun('isclass', {event.type}, 'char'))
+        boundaries = strmatch('boundary', {event.type});
+    else
+        boundaries = find([ event.type ] == -99);
+    end
 
     % Boundary event latencies
     boundaries = [event(boundaries).latency];