fix 'increase dtick' lgoic for cases with dtick value starting 'M'

plotly · Mar 12, 2020 · 1b55b42 · 1b55b42
1 parent 40d57fa
commit 1b55b42
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js
@@ -526,7 +526,9 @@ axes.prepTicks = function(ax) {
         // have explicit tickvals without tick text
         if(ax.tickmode === 'array') nt *= 100;
 
-        axes.autoTicks(ax, (Math.abs(rng[1] - rng[0]) - (ax._lBreaks || 0)) / nt);
+
+        ax._roughDTick = (Math.abs(rng[1] - rng[0]) - (ax._lBreaks || 0)) / nt;
+        axes.autoTicks(ax, ax._roughDTick);
 
         // check for a forced minimum dtick
         if(ax._minDtick > 0 && ax.dtick < ax._minDtick * 2) {
@@ -620,7 +622,8 @@ axes.calcTicks = function calcTicks(ax) {
         // increase dtick to generate more ticks,
         // so that some hopefully fall between breaks
         if(ax.tickmode === 'auto' && tickVals.length < nTicksBefore / 6) {
-            ax.dtick /= 2;
+            axes.autoTicks(ax, ax._roughDTick / 3);
+            autoTickRound(ax);
             ax._tmin = axes.tickFirst(ax);
             generateTicks();
             tickVals = tickVals.filter(function(d) {

diff --git a/test/image/baselines/axes_breaks-finance.png b/test/image/baselines/axes_breaks-finance.png
diff --git a/test/jasmine/tests/axes_test.js b/test/jasmine/tests/axes_test.js
@@ -4880,8 +4880,8 @@ describe('Test axes', function() {
                 .then(function() {
                     _assert('with breaks enabled on x-axis', {
                         tickVals: [
-                            1483531200000, 1484136000000, 1484740800000, 1485345600000,
-                            1485950400000, 1486555200000, 1487160000000
+                            1483574400000, 1484092800000, 1484611200000, 1484870400000,
+                            1485388800000, 1485907200000, 1486425600000, 1486684800000
                         ]
                     });
                 })