squash some bugs

mattansb · Apr 13, 2018 · 9966584 · 9966584
1 parent 19bb42b
commit 9966584
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/import_export/epp_loadeeglab.m b/import_export/epp_loadeeglab.m
@@ -43,6 +43,7 @@
 %{
 Change log:
 -----------
+13-04-2018  A million little bug fixes
 11-04-2018  Added errors when subject ID
 20-03-2018  Fix naming of subject files.
 06-03-2018  New function (written in MATLAB R2017a)

diff --git a/supportfuncs/suppWaveletConv3.m b/supportfuncs/suppWaveletConv3.m
@@ -33,6 +33,7 @@
 %{
 Change log:
 -----------
+13-04-2018  Added suuport for no time cuts
 01-03-2018  Added support for downsampling.
 28-02-2018  absolute ITC values are not computed,to allow for the
             combination of conditions.
@@ -57,7 +58,7 @@
     addRequired(p,'num_frex',@(x) length(x)==1 && isnumeric(x));
     addRequired(p,'cycles_range',@(x) length(x)==2 && isnumeric(x));
     addRequired(p,'baselinetime',@(x) length(x)==2 && isnumeric(x));
-    addOptional(p,'cut_times',[],@(x) length(x)==2 && isnumeric(x));
+    addOptional(p,'cut_times',[],@(x) isempty(x) | (length(x)==2 && isnumeric(x)));
     addParameter(p,'log',true, @islogical);
     addParameter(p,'dB',true, @islogical);
     addParameter(p,'downsample',1, @(x) floor(x) == x);