Mirrors/Chart.js
2
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2026-03-06 16:26:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use ticks consistently (#6873)

Browse Source
This commit is contained in:
Jukka Kurkela
2019-12-31 00:14:55 +02:00
committed by Evert Timberg
parent 1cda96946b
commit dbd835f4f3
6 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/controller.bar.js
View File

@@ -53,7 +53,7 @@ function computeMinSampleSize(scale, pixels) {
min = Math.min(min, Math.abs(pixels[i] - pixels[i - 1]));
}
for (i = 0, ilen = scale.getTicks().length; i < ilen; ++i) {
for (i = 0, ilen = scale.ticks.length; i < ilen; ++i) {
curr = scale.getPixelForTick(i);
min = i > 0 ? Math.min(min, Math.abs(curr - prev)) : min;
prev = curr;

2
src/scales/scale.category.js
View File

@@ -78,7 +78,7 @@ class CategoryScale extends Scale {
if (index < 0 || index > ticks.length - 1) {
return null;
}
return this.getPixelForValue(index * me._numLabels / ticks.length + this.min);
return me.getPixelForValue(index * me._numLabels / ticks.length + me.min);
}
getValueForPixel(pixel) {

4
src/scales/scale.linear.js
View File

@@ -63,11 +63,11 @@ class LinearScale extends LinearScaleBase {
}
getPixelForTick(index) {
var ticks = this._tickValues;
const ticks = this.ticks;
if (index < 0 || index > ticks.length - 1) {
return null;
}
return this.getPixelForValue(ticks[index]);
return this.getPixelForValue(ticks[index].value);
}
}

8
src/scales/scale.linearbase.js
View File

@@ -231,15 +231,9 @@ class LinearScaleBase extends Scale {
return ticks;
}
generateTickLabels(ticks) {
var me = this;
me._tickValues = ticks.map(t => t.value);
Scale.prototype.generateTickLabels.call(me, ticks);
}
_configure() {
var me = this;
var ticks = me.getTicks();
var ticks = me.ticks;
var start = me.min;
var end = me.max;
var offset;

4
src/scales/scale.radialLinear.js
View File

@@ -450,7 +450,7 @@ class RadialLinearScale extends LinearScaleBase {
if (gridLineOpts.display) {
me.ticks.forEach(function(tick, index) {
if (index !== 0) {
offset = me.getDistanceFromCenterForValue(me._tickValues[index]);
offset = me.getDistanceFromCenterForValue(me.ticks[index].value);
drawRadiusLine(me, gridLineOpts, offset, index);
}
});
@@ -508,7 +508,7 @@ class RadialLinearScale extends LinearScaleBase {
return;
}
offset = me.getDistanceFromCenterForValue(me._tickValues[index]);
offset = me.getDistanceFromCenterForValue(me.ticks[index].value);
if (tickOpts.showLabelBackdrop) {
width = ctx.measureText(tick.label).width;

9
src/scales/scale.time.js
View File

@@ -703,10 +703,11 @@ class TimeScale extends Scale {
}
getPixelForTick(index) {
const ticks = this.getTicks();
return index >= 0 && index < ticks.length ?
this.getPixelForValue(ticks[index].value) :
null;
const ticks = this.ticks;
if (index < 0 || index > ticks.length - 1) {
return null;
}
return this.getPixelForValue(ticks[index].value);
}
getValueForPixel(pixel) {