Merge branch 'master' of https://github.com/sccn/BCILAB

Author: chkothe

RELEASE NOTES.TXT

@@ -77,6 +77,16 @@ The latest versions of the toolbox can be found at github.com/sccn/BCILAB, and r
   code.google.com/p/labstreaminglayer. Besides this, the toolbox continues to natively support BioSemi and BrainProducts hardware, as well as a few common 
   protocols (TCP, OSC, etc.).
 
+
+=== Known Issues in Beta Version ===
+- utl_kernelize has a bug that renders it non-working (affects ml_trainsvm and ml_trainrvm)
+- flt_fir has no minimum-phase implementation for high-pass filters yet, which means that it will incur possibly 
+  intolerable delay (workaround: use flt_iir, or, if working with epochs, flt_spectrum)
+- flt_standardize with the sphere setting turned on is not robust to signals that are (almost) rank-deficient
+- flt_iir flips the signal sign under some settings (though consistently) and causes rather high CPU load during 
+  online processing
+
+
 === Credits ===
 
 If you are using the toolbox for a publication, please consider citing any of the following references:
@@ -299,7 +309,3 @@ Minor Fixes:
 - flt_eog: fixed bug which disabled regression when removing EOG channels
 - utl_check_dataset: fixed a warning message
 
-Known Issues
-- utl_kernelize has a bug that renders it non-working (affects ml_trainsvm and ml_trainrvm)
-
-

code/filters/in_development/flt_sourceLocalize.m

@@ -284,7 +284,7 @@
         newRoiVertices{k} = A(sort(idx));
     end
 
-    if appendROI
+    if ~appendROI
         % remove all merged ROIs ...
         mergedROI = unique(cell2mat(roiIdxInAtlas));
         state.roiVerticesReduced(mergedROI) = [];

code/online_analysis/onl_peek.m

@@ -80,4 +80,4 @@
 % update meta-data
 [chunk.nbchan,chunk.pnts,chunk.trials] = size(chunk.data);
 chunk.chanlocs = chunk.chanlocs(channels_to_get);
-chunk.xmax = chunk.xmin + (chunk.pnts-1)/buf.srate;
+chunk.xmax = chunk.xmin + (chunk.pnts-1)/chunk.srate;

dependencies/eeglab_10_0_1_0x/plugins/xdfimport1.11/eeg_load_xdf.m renamed to dependencies/eeglab_10_0_1_0x/plugins/xdfimport1.11b/eeg_load_xdf.m

@@ -80,18 +80,17 @@
             chanlocs(c).labels = chn.label; end            
         if isfield(chn,'type')
             chanlocs(c).type = chn.type; end
-        if isfield(chn,'location')
-            try
-                chanlocs(c).X = str2num(chn.location.X)/1000;
-                chanlocs(c).Y = str2num(chn.location.Y)/1000;
-                chanlocs(c).Z = str2num(chn.location.Z)/1000;
-                [chanlocs(c).sph_theta,chanlocs(c).sph_phi,chanlocs(c).sph_radius] = cart2sph(chanlocs(c).X,chanlocs(c).Y,chanlocs(c).Z);
-                [chanlocs(c).theta,chanlocs(c).radius] = cart2pol(chanlocs(c).X,chanlocs(c).Y);
-                chanlocs(c).urchan = c;
-                chanlocs(c).ref = '';
-            catch
-            end
+        try
+            chanlocs(c).X = str2num(chn.location.X)/1000;
+            chanlocs(c).Y = str2num(chn.location.Y)/1000;
+            chanlocs(c).Z = str2num(chn.location.Z)/1000;
+            [chanlocs(c).sph_theta,chanlocs(c).sph_phi,chanlocs(c).sph_radius] = cart2sph(chanlocs(c).X,chanlocs(c).Y,chanlocs(c).Z);
+            [chanlocs(c).theta,chanlocs(c).radius] = cart2pol(chanlocs(c).X,chanlocs(c).Y);
+        catch
+            [chanlocs(c).X,chanlocs(c).Y,chanlocs(c).Z,chanlocs(c).sph_theta,chanlocs(c).sph_phi,chanlocs(c).sph_radius,chanlocs(c).theta,chanlocs(c).radius] = deal([]);
         end
+        chanlocs(c).urchan = c;
+        chanlocs(c).ref = '';
     end
     raw.chaninfo.nosedir = '+Y';    
 catch e

dependencies/eeglab_10_0_1_0x/plugins/xdfimport1.11/eegplugin_xdfimport.m renamed to dependencies/eeglab_10_0_1_0x/plugins/xdfimport1.11b/eegplugin_xdfimport.m

@@ -45,7 +45,7 @@
 
 function vers = eegplugin_xdfimport(fig, trystrs, catchstrs)
 
-    vers = 'xdfimport1.11';
+    vers = 'xdfimport1.11b';
 
     if nargin < 3
         error('eegplugin_xdfimport requires 3 arguments');