bugfix: timelimits were ignored for pvalues

behinger · Dec 6, 2017 · dbd7be3 · dbd7be3
1 parent de1ddd3
commit dbd7be3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/topo_butter/plot_butterfly.m b/topo_butter/plot_butterfly.m
@@ -86,7 +86,7 @@
 
     % Mark Single Channels
     for ch = 1:size(plt.data,1)
-        sigConnected = bwlabel(sigTime(ch,:));
+        sigConnected = bwlabel(sigTime(ch,plt.timeidx));
         for sigC = 1:max(sigConnected)
             sigTimeIdx = find(sigConnected == sigC);
             plot(plt.time(sigTimeIdx),plt.data(ch,sigTimeIdx),'k','LineWidth',1.5)
@@ -98,7 +98,7 @@
 
     % Mark rectangular things in the background
     sigAny = any(sigTime,1);
-    sigConnected = bwlabel(sigAny);
+    sigConnected = bwlabel(sigAny(plt.timeidx));
 
     % We need to do this to get anything in the background in matlab
     pvalAreaAxes = axes('Position',plot_pos,'XLim',get(plotAxes,'XLim'),'YLim',get(plotAxes,'YLim'));

diff --git a/topo_butter/plot_topo.m b/topo_butter/plot_topo.m
@@ -8,7 +8,7 @@
     'topoalpha','real',[],0.05; % change the statistical alpha-value indicating significant electrodes
     'contour','string',{'yes','no'},'yes'; % activate/deactive contour
     'individualcontour','string',{'yes','no'},'no'; % do not put the contour lines on the same value
-    'individualcolormap','string',{'yes','no'},'no'; % do not put the same caxis limit for all colormaps
+    'individualcolorscale','string',{'yes','row','no'},'no'; % do not put the same caxis limit for all colormaps
     'colormap','cell',{},{'div'}; % customized colorbars are possible: {{'div','RdYlBu'},{'div','BrBG'},'seq'}. The whole set of colorbrewer is available
     'n_rows','integer',[1 1:size(inp_data,3)],size(inp_data,3); % number of rows to be used, by default plots one row per third-dimension entry of EEG.data. But it is possible to skip some*
     'numcontour','integer',[],6; % How many contour lines
@@ -133,8 +133,10 @@
 
     if ~isempty(g.caxis)
         scale = g.caxis;
-    else
-    scale = prctile(data(:),[1 99]);
+    elseif strcmp(g.individualcolorscale,'row')
+        scale = prctile(data(:),[1 99]);
+    elseif strcmp(g.individualcolorscale,'no')
+        scale = prctile(inp_data(:),[0.05 99.95]);
     end
 
     % make scale symmetric for divergent colormaps
@@ -195,8 +197,8 @@
         set(topo_image,'YDir','normal');
         axis(topo_image,'square','off')
         set(h,'alphadata',~isnan(cdata))
-        switch g.individualcolormap
-            case 'no'
+        switch g.individualcolorscale
+            case {'row','no'}
                 caxis(topo_image,scale)
         end
         % Change the respective colormap