Skip to content

Commit 9241578

Browse files
committed
reduce roughDTick by total length of breaks
- adjust tick spacing on x axes - fixup tests
1 parent c5cf45a commit 9241578

17 files changed

+3
-8
lines changed

src/plots/cartesian/axes.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ axes.prepTicks = function(ax) {
536536
if(ax.tickmode === 'array') nt *= 100;
537537

538538

539-
ax._roughDTick = Math.abs(rng[1] - rng[0]) / nt;
539+
ax._roughDTick = (Math.abs(rng[1] - rng[0]) - (ax._lBreaks || 0)) / nt;
540540
axes.autoTicks(ax, ax._roughDTick);
541541

542542
// check for a forced minimum dtick
@@ -628,7 +628,7 @@ axes.calcTicks = function calcTicks(ax) {
628628
var tf = 0;
629629
if(ax.tickmode === 'auto') {
630630
tf =
631-
(ax._id.charAt(0) === 'y' ? 2 : 5) *
631+
(ax._id.charAt(0) === 'y' ? 2 : 6) *
632632
(ax.tickfont ? ax.tickfont.size : 12);
633633
}
634634

-1.21 KB
Loading
537 Bytes
Loading
Loading
15.3 KB
Loading
1.07 KB
Loading
Loading
3.93 KB
Loading
Loading
Loading

test/image/baselines/axes_breaks.png

-80 Bytes
Loading

test/image/mocks/axes_breaks-contour1d.json

-1
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,6 @@
856856
"text": "1D-z-array contour with rangebreaks"
857857
},
858858
"xaxis": {
859-
"dtick": 1800000,
860859
"rangebreaks": [
861860
{
862861
"pattern": "hour",

test/image/mocks/axes_breaks-contour2d.json

-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@
128128
"text": "2D-z-array contour with rangebreaks"
129129
},
130130
"xaxis": {
131-
"dtick": 1800000,
132131
"rangebreaks": [
133132
{
134133
"pattern": "hour",

test/image/mocks/axes_breaks-heatmap1d.json

-1
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,6 @@
856856
"text": "1D-z-array heatmap with rangebreaks"
857857
},
858858
"xaxis": {
859-
"dtick": 1800000,
860859
"rangebreaks": [
861860
{
862861
"pattern": "hour",

test/image/mocks/axes_breaks-heatmap2d.json

-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@
128128
"text": "2D-z-array heatmap with rangebreaks"
129129
},
130130
"xaxis": {
131-
"dtick": 1800000,
132131
"rangebreaks": [
133132
{
134133
"pattern": "hour",

test/image/mocks/axes_breaks-histogram2d.json

-1
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,6 @@
482482
"2020-01-02 16:55",
483483
"2020-01-03 09:55"
484484
],
485-
"dtick": 1800000,
486485
"rangebreaks": [{
487486
"pattern": "hour",
488487
"bounds": [18, 9]

test/jasmine/tests/axes_test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5016,7 +5016,7 @@ describe('Test axes', function() {
50165016
})
50175017
.then(function() {
50185018
_assert('with two rangebreaks', {
5019-
tickVals: [0, 89, 189, 200]
5019+
tickVals: [0, 5, 90, 95, 190, 195, 200]
50205020
});
50215021
})
50225022
.catch(failTest)

0 commit comments

Comments
 (0)