Skip to content

Commit 9c1be3c

Browse files
committed
fixes #4940; fixes #4935; x-axis ticks improvements
1 parent 65267f4 commit 9c1be3c

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

src/modules/Range.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ class Range {
426426
ticks = gl.series[gl.maxValsInArrayIndex].length - 1
427427
}
428428
if (gl.isXNumeric) {
429-
const diff = gl.maxX - gl.minX
429+
const diff = Math.round(gl.maxX - gl.minX)
430430
if (diff < 30) {
431431
ticks = diff - 1
432432
}

src/modules/Scales.js

+2-5
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ export default class Scales {
436436
step = range / ticks
437437
}
438438

439-
step = Math.round((step + Number.EPSILON) * 10) / 10
439+
step = Math.round((step + Number.EPSILON) * 100) / 100
440440

441441
if (ticks === Number.MAX_VALUE) {
442442
ticks = 5
@@ -582,16 +582,13 @@ export default class Scales {
582582
setXScale(minX, maxX) {
583583
const w = this.w
584584
const gl = w.globals
585-
let diff = Math.abs(maxX - minX)
585+
let diff = Math.round(Math.abs(maxX - minX))
586586
if (maxX === -Number.MAX_VALUE || !Utils.isNumber(maxX)) {
587587
// no data in the chart. Either all series collapsed or user passed a blank array
588588
gl.xAxisScale = this.linearScale(0, 10, 10)
589589
} else {
590590
let ticks = gl.xTickAmount
591591

592-
if (diff < 10 && diff > 1) {
593-
ticks = diff
594-
}
595592
gl.xAxisScale = this.linearScale(
596593
minX,
597594
maxX,

0 commit comments

Comments
 (0)