fix study calling

Author: arnodelorme

eeg_icalabelstat.m

@@ -0,0 +1,25 @@
+% eeg_icalabelstat - show some stats about IC label
+%
+% Input:
+%  EEG       - EEGLAB dataset
+%  threshold - threshold for belonging to a category (default 0.9 
+%              corresponding to 90%
+%
+% Author: A. Delorme
+
+function eeg_icalabelstat(EEG, threshold)
+
+if nargin < 1
+    help eeg_icalabelstat;
+    return;
+end
+if nargin < 2
+    threshold = 0.9;
+end
+
+ics = EEG.etc.ic_classification.ICLabel;
+if length(threshold) == 1, threshold(1:length(ics.classes)) = threshold; end
+for iIC = 1:length(ics.classes)
+    ICfound = find(ics.classifications(:,iIC) > threshold(iIC));
+    fprintf('%30s: %d/%d components at %d%% threshold\n', sprintf('IClabel class "%s"',ics.classes{iIC}), length(ICfound), size(ics.classifications,1), round(threshold(iIC)*100));
+end

pop_icflag.m

@@ -39,6 +39,10 @@
 end
 
 if nargin < 2
+    if length(EEG) == 1
+        eeg_icalabelstat(EEG);
+    end
+    
     cat     = { 'Brain'  'Muscle'  'Eye'  'Heart'  'Line Noise'  'Channel Noise'  'Other' };
     defaultMin = { ''       '0.9'     '0.9'  ''       ''            ''               '' };
     defaultMax = { ''       '1'       '1'    ''       ''            ''               '' };
@@ -58,30 +62,25 @@
 
     res = inputgui(allGeom, allRows);
     if isempty(res)
+        com = '';
         return
     end
 
     thresh = cellfun(@str2double, res);
     thresh = reshape(thresh, 2, 7)';
 end
 
-com = sprintf('EEG = pop_icflag(EEG, %s);',vararg2str(thresh));
-
 if length(EEG) > 1
-    for iEEG = 1:length(EEG)
-        % run iclabel
-        EEG(iEEG) = pop_icflag(EEG(iEEG), thresh);
+    [ EEG, com ] = eeg_eval( 'pop_icflag', EEG, 'params', { thresh } );
+else
+    % perform rejection
+    flagReject = zeros(1,size(EEG.icaweights,1))';
+    for iCat = 1:7
+        tmpReject  = EEG.etc.ic_classification.ICLabel.classifications(:,iCat) > thresh(iCat,1) & EEG.etc.ic_classification.ICLabel.classifications(:,iCat) < thresh(iCat,2);
+        flagReject = flagReject | tmpReject;
     end
-    return
+    EEG.reject.gcompreject = flagReject;
+    fprintf('%d components rejected\n', sum(flagReject));
+    com = sprintf('EEG = pop_icflag(EEG, %s);',vararg2str(thresh));
 end
 
-% perform rejection
-flagReject = zeros(1,size(EEG.icaweights,1))';
-for iCat = 1:7
-    tmpReject  = EEG.etc.ic_classification.ICLabel.classifications(:,iCat) > thresh(iCat,1) & EEG.etc.ic_classification.ICLabel.classifications(:,iCat) < thresh(iCat,2);
-    flagReject = flagReject | tmpReject;
-end
-EEG.reject.gcompreject = flagReject;
-fprintf('%d components rejected\n', sum(flagReject));
-
-

pop_iclabel.m

@@ -68,9 +68,12 @@
 
 end
 
-for iEEG = 1:length(EEG)
-    % run iclabel
-    EEG(iEEG) = iclabel(EEG(iEEG), version);
+if length(EEG) > 1
+    [ EEG, com ] = eeg_eval( 'iclabel', EEG, 'params', { version } );
+    varargout = {com};
+else
+    EEG = iclabel(EEG(iEEG), version);
+    varargout = {['EEG = pop_iclabel(EEG, ' version ');']};
 end
 
 % % visualize with viewprops
@@ -86,12 +89,6 @@
 % end
 %     
 
-% return for EEG.history
-if nargout == 2
-    varargout = {['EEG = pop_iclabel(EEG, ' version ');']};
-end
-
-
 % inputdlg3() - A comprehensive gui automatic builder. This function takes
 %               text, type of GUI and default value and builds
 %               automatically a simple graphic interface.