Mirrors/Chart.js
2
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2026-03-15 04:36:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1816 from hallatore/Bug_AutoSkip

Browse Source 
Refactored skipRatio to use the longest label text for calculation.
This commit is contained in:
Evert Timberg
2015-12-22 08:19:25 -05:00
parent 923378e2af 0437968a4e
commit fd668086b2
7 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/core.scale.js
View File

@@ -47,6 +47,7 @@
reverse: false,
display: true,
autoSkip: true,
autoSkipPadding: 20,
callback: function(value) {
return '' + value;
},
@@ -454,8 +455,8 @@
var yTickEnd = this.options.position === "bottom" ? this.top + 10 : this.bottom;
skipRatio = false;
if ((this.options.ticks.fontSize + 4) * this.ticks.length > (this.width - (this.paddingLeft + this.paddingRight))) {
skipRatio = 1 + Math.floor(((this.options.ticks.fontSize + 4) * this.ticks.length) / (this.width - (this.paddingLeft + this.paddingRight)));
if ((this.options.ticks.fontSize * maxLength) * this.ticks.length > (this.width - (this.paddingLeft + this.paddingRight))) {
skipRatio = 1 + Math.floor((((this.options.ticks.fontSize * maxLength / 2) + this.options.ticks.autoSkipPadding) * this.ticks.length) / (this.width - (this.paddingLeft + this.paddingRight)));
}
if (!useAutoskipper) {

6
test/core.helpers.tests.js
View File

@@ -244,7 +244,8 @@ describe('Core helper tests', function() {
reverse: false,
display: true,
callback: merged.scales.yAxes[1].ticks.callback, // make it nicer, then check explicitly below
autoSkip: true
autoSkip: true,
autoSkipPadding: 20
},
type: 'linear'
}, {
@@ -281,7 +282,8 @@ describe('Core helper tests', function() {
reverse: false,
display: true,
callback: merged.scales.yAxes[2].ticks.callback, // make it nicer, then check explicitly below
autoSkip: true
autoSkip: true,
autoSkipPadding: 20
},
type: 'linear'
}]

3
test/scale.category.tests.js
View File

@@ -43,7 +43,8 @@ describe('Category scale tests', function() {
reverse: false,
display: true,
callback: defaultConfig.ticks.callback, // make this nicer, then check explicitly below
autoSkip: true
autoSkip: true,
autoSkipPadding: 20
}
});

3
test/scale.linear.tests.js
View File

@@ -42,7 +42,8 @@ describe('Linear Scale', function() {
reverse: false,
display: true,
callback: defaultConfig.ticks.callback, // make this work nicer, then check below
autoSkip: true
autoSkip: true,
autoSkipPadding: 20
}
});

3
test/scale.logarithmic.tests.js
View File

@@ -41,7 +41,8 @@ describe('Logarithmic Scale tests', function() {
reverse: false,
display: true,
callback: defaultConfig.ticks.callback, // make this nicer, then check explicitly below
autoSkip: true
autoSkip: true,
autoSkipPadding: 20
},
});

3
test/scale.radialLinear.tests.js
View File

@@ -58,7 +58,8 @@ describe('Test the radial linear scale', function() {
showLabelBackdrop: true,
display: true,
callback: defaultConfig.ticks.callback, // make this nicer, then check explicitly below
autoSkip: true
autoSkip: true,
autoSkipPadding: 20
},
});

3
test/scale.time.tests.js
View File

@@ -46,7 +46,8 @@ describe('Time scale tests', function() {
reverse: false,
display: true,
callback: defaultConfig.ticks.callback, // make this nicer, then check explicitly below,
autoSkip: true
autoSkip: true,
autoSkipPadding: 20
},
time: {
format: false,