archive-gh-me/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2025-12-08 20:36:08 +00:00
Code Issues Projects Releases Wiki Activity

changed option name for radar chart from offsetAngle to startAngle. Added test to make sure correct angles are computed for all points in the radar chart (with and without startAngle option set).

Browse Source
This commit is contained in:
unknown 2016-07-17 23:11:30 -06:00
parent d7733b2221
commit 1a63113bc0
3 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/05-Radar-Chart.md
View File

@ -98,7 +98,7 @@ scale | Object | [See Scales](#scales) and [Defaults for Radial Linear Scale](#s
*scale*.type | String |"radialLinear" | As defined in ["Radial Linear"](#scales-radial-linear-scale).
*elements*.line | Object | | Options for all line elements used on the chart, as defined in the global elements, duplicated here to show Radar chart specific defaults.
*elements.line*.lineTension | Number | 0 | Tension exhibited by lines when calculating splineCurve. Setting to 0 creates straight lines.
offsetAngle | Number | 0 | The number of degrees to rotate the chart clockwise.
startAngle | Number | 0 | The number of degrees to rotate the chart clockwise.
You can override these for your `Chart` instance by passing a second argument into the `Radar` method as an object with the keys you want to override.

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

@ -232,14 +232,14 @@ module.exports = function(Chart) {
getIndexAngle: function(index) {
var angleMultiplier = (Math.PI * 2) / this.getValueCount();
var offsetAngle = this.chart.options && this.chart.options.offsetAngle ?
this.chart.options.offsetAngle :
var startAngle = this.chart.options && this.chart.options.startAngle ?
this.chart.options.startAngle :
0;
var offsetAngleRadians = offsetAngle * Math.PI * 2 / 360;
var startAngleRadians = startAngle * Math.PI * 2 / 360;
// Start from the top instead of right, so remove a quarter of the circle
return index * angleMultiplier - (Math.PI / 2) + offsetAngleRadians;
return index * angleMultiplier - (Math.PI / 2) + startAngleRadians;
},
getDistanceFromCenterForValue: function(value) {
var me = this;

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

@ -420,4 +420,43 @@ describe('Test the radial linear scale', function() {
expect(chartInstance.scale.getDistanceFromCenterForValue(chartInstance.scale.min)).toBe(225);
expect(chartInstance.scale.getDistanceFromCenterForValue(chartInstance.scale.max)).toBe(0);
});
it('should correctly get angles for all points', function() {
chartInstance = window.acquireChart({
type: 'radar',
data: {
datasets: [{
data: [10, 5, 0, 25, 78]
}],
labels: ['label1', 'label2', 'label3', 'label4', 'label5']
},
options: {
scale: {
pointLabels: {
callback: function(value, index) {
return index.toString();
}
}
},
startAngle: 15
}
});
var radToNearestDegree = function(rad) {
return Math.round((360 * rad) / (2 * Math.PI));
}
var slice = 72; // (360 / 5)
for(var i = 0; i < 5; i++) {
expect(radToNearestDegree(chartInstance.scale.getIndexAngle(i))).toBe(15 + (slice * i) - 90);
}
chartInstance.options.startAngle = 0;
chartInstance.update();
for(var i = 0; i < 5; i++) {
expect(radToNearestDegree(chartInstance.scale.getIndexAngle(i))).toBe((slice * i) - 90);
}
});
});