Bugfix: Time series display with +/- values < eps

brainstorm-tools · May 5, 2020 · 972f601 · 972f601
1 parent 82c4b8e
commit 972f601
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/doc/license.html b/doc/license.html
@@ -5,7 +5,7 @@
 <body alink="#fff000" link="#fff000" vlink="#fff000">
 <h4><span style="font-family: Arial Black; color: #ffffff;"><strong>THERE IS NO UNDO BUTTON - SET UP A BACKUP OF YOUR DATABASE</strong></span></h4>
 <HR>
-<!-- LICENCE_START -->Version: 3.200504 (04-May-2020)<br>
+<!-- LICENCE_START -->Version: 3.200505 (05-May-2020)<br>
 <span style="font-style: italic;">COPYRIGHT &copy; 2000-2020
 USC &amp; McGill University.<br>
 </span>

diff --git a/doc/version.txt b/doc/version.txt
@@ -1,2 +1,2 @@
 % Brainstorm
-% v. 3.200504 (04-May-2020)
+% v. 3.200505 (05-May-2020)
diff --git a/toolbox/gui/figure_timeseries.m b/toolbox/gui/figure_timeseries.m
@@ -264,13 +264,13 @@ function UniformizeTimeSeriesScales(isUniform)
                     hAxes = sFigure.Handles(iPlot).hAxes;
                     % Get maximal value
                     fmax = max(abs(FigureDataMinMax{iMod})) * sFigure.Handles(iPlot).DisplayFactor;
-                    % If displaying absolute values (only positive values)
-                    if (FigureDataMinMax{iMod}(1) >= 0)
-                        ylim = 1.05 .* [0, fmax];
-                    % Else : displaying positive and negative values
-                    else
+                    % If displaying positive and negative values
+                    if (FigureDataMinMax{iMod}(1) < -eps) || ((FigureDataMinMax{iMod}(1) < 0) && (FigureDataMinMax{iMod}(2) <= eps))
                         ylim = 1.05 .* [-fmax, fmax];
-                    end      
+                    % Else: displaying absolute values (only positive values)
+                    else
+                        ylim = 1.05 .* [0, fmax];
+                    end    
                     % Update figure Y-axis limits
                     set(hAxes, 'YLim', ylim);
                     setappdata(hAxes, 'YLimInit', ylim);
@@ -3338,12 +3338,12 @@ function SetTimeVisible(hFig, isVisible) %#ok<*DEFNU>
     PlotHandles.DisplayUnits  = fUnits;
     % Get automatic YLim
     if (Fmax ~= 0)
-        % If data to plot are absolute values
-        if (PlotHandles.DataMinMax(1) >= -eps)
-            YLim = 1.05 * PlotHandles.DisplayFactor * [0, Fmax];
-        % Else, there are positive and negative values
-        else
+        % If data to plot are relative values
+        if (PlotHandles.DataMinMax(1) < -eps) || ((PlotHandles.DataMinMax(1) < 0) && (PlotHandles.DataMinMax(2) <= eps))
             YLim = 1.05 * PlotHandles.DisplayFactor * [-Fmax, Fmax];
+        % Otherwise: absolute values
+        else
+            YLim = 1.05 * PlotHandles.DisplayFactor * [0, Fmax];
         end
     else
         YLim = [-1, 1];