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

Correction in algorithm.

Browse Source
This commit is contained in:
Christopher Weiss 2014-10-21 13:28:45 -04:00
parent 7e21cb4e04
commit fdc9be3e23
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Chart.Doughnut.js
View File

@ -41,7 +41,7 @@
var h = (part / total) * 360, var h = (part / total) * 360,
s = 1, s = 1,
v = 1, v = 1,
c = h * s, c = v * s,
x = c * (1 - Math.abs((h / 60) % 2 - 1)), x = c * (1 - Math.abs((h / 60) % 2 - 1)),
m = v - c, m = v - c,
r, r,
@ -55,29 +55,29 @@
b = 0 + m; b = 0 + m;
break; break;
case 1: // 60 <= h < 120 case 1: // 60 <= h < 120
r = c + m; r = x + m;
g = x + m; g = c + m;
b = 0 + m; b = 0 + m;
break; break;
case 2: // 120 <= h < 180 case 2: // 120 <= h < 180
r = c + m; r = 0 + m;
g = x + m; g = c + m;
b = 0 + m; b = x + m;
break; break;
case 3: // 180 <= h < 240 case 3: // 180 <= h < 240
r = c + m; r = 0 + m;
g = x + m; g = x + m;
b = 0 + m; b = c + m;
break; break;
case 4: // 240 <= h < 300 case 4: // 240 <= h < 300
r = c + m; r = x + m;
g = x + m; g = 0 + m;
b = 0 + m; b = c + m;
break; break;
case 5: // 300 <= h < 360 case 5: // 300 <= h < 360
r = c + m; r = c + m;
g = x + m; g = 0 + m;
b = 0 + m; b = x + m;
break; break;
} }
@ -123,6 +123,13 @@
} }
this.calculateTotal(data); this.calculateTotal(data);
data = data.map(function (v, i, a){
if (!v.color) {
v.color = hue(i, a.length);
return v;
}
});
helpers.each(data,function(datapoint, index){ helpers.each(data,function(datapoint, index){
this.addData(datapoint, index, true); this.addData(datapoint, index, true);
},this); },this);