Mirrors/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2024-10-06 12:19:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use proper reverse option in radial linear scale

Browse Source
This commit is contained in:
etimberg 2017-07-03 19:50:08 -04:00 committed by Evert Timberg
parent cc9e88aebc
commit 7d60857819
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,7 +244,7 @@ module.exports = function(Chart) {
ctx.lineWidth = angleLineOpts.lineWidth; ctx.lineWidth = angleLineOpts.lineWidth;
ctx.strokeStyle = angleLineOpts.color; ctx.strokeStyle = angleLineOpts.color;
var outerDistance = scale.getDistanceFromCenterForValue(opts.reverse ? scale.min : scale.max); var outerDistance = scale.getDistanceFromCenterForValue(opts.ticks.reverse ? scale.min : scale.max);
// Point Label Font // Point Label Font
var plFont = getPointLabelFontOptions(scale); var plFont = getPointLabelFontOptions(scale);
@ -366,6 +366,7 @@ module.exports = function(Chart) {
}, },
convertTicksToLabels: function() { convertTicksToLabels: function() {
var me = this; var me = this;
Chart.LinearScaleBase.prototype.convertTicksToLabels.call(me); Chart.LinearScaleBase.prototype.convertTicksToLabels.call(me);
// Point labels // Point labels
@ -433,7 +434,7 @@ module.exports = function(Chart) {
// Take into account half font size + the yPadding of the top value // Take into account half font size + the yPadding of the top value
var scalingFactor = me.drawingArea / (me.max - me.min); var scalingFactor = me.drawingArea / (me.max - me.min);
if (me.options.reverse) { if (me.options.ticks.reverse) {
return (me.max - value) * scalingFactor; return (me.max - value) * scalingFactor;
} }
return (value - me.min) * scalingFactor; return (value - me.min) * scalingFactor;
@ -480,7 +481,7 @@ module.exports = function(Chart) {
helpers.each(me.ticks, function(label, index) { helpers.each(me.ticks, function(label, index) {
// Don't draw a centre value (if it is minimum) // Don't draw a centre value (if it is minimum)
if (index > 0 || opts.reverse) { if (index > 0 || tickOpts.reverse) {
var yCenterOffset = me.getDistanceFromCenterForValue(me.ticksAsNumbers[index]); var yCenterOffset = me.getDistanceFromCenterForValue(me.ticksAsNumbers[index]);
var yHeight = me.yCenter - yCenterOffset; var yHeight = me.yCenter - yCenterOffset;

2
test/specs/scale.radialLinear.tests.js
View File

@ -401,7 +401,7 @@ describe('Test the radial linear scale', function() {
y: 275, y: 275,
}); });
chart.scale.options.reverse = true; chart.scale.options.ticks.reverse = true;
chart.update(); chart.update();
expect(chart.scale.getDistanceFromCenterForValue(chart.scale.min)).toBe(233); expect(chart.scale.getDistanceFromCenterForValue(chart.scale.min)).toBe(233);