]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Removed custom hue(), using hsl()
authorChristopher Weiss <cmweiss@gmail.com>
Mon, 26 Jan 2015 21:28:11 +0000 (16:28 -0500)
committerChristopher Weiss <cmweiss@gmail.com>
Mon, 26 Jan 2015 21:28:11 +0000 (16:28 -0500)
src/Chart.Doughnut.js

index f1dcaf1c175789f0cdd288e370a908349b9e903b..ae2ce937e1cd89c8542f91700a498218008878ed 100644 (file)
 
        };
 
-       function hue(part, total) {
-               // Given the total number of segments (total) and the index of a segment (part) returns a #rrggbb color for the segment
-               var h = (part / total) * 360,
-                       s = 1,
-                       v = 1,
-                       c = v * s,
-                       x =  c * (1 - Math.abs((h / 60) % 2 - 1)),
-                       m = v - c,
-                       r,
-                       g,
-                       b;
-
-               switch (Math.floor(h / 60)) {
-                       case 0: // 0 <= h < 60
-                               r = c + m;
-                               g = x + m;
-                               b = 0 + m;
-                       break;
-                       case 1: // 60 <= h < 120
-                               r = x + m;
-                               g = c + m;
-                               b = 0 + m;
-                       break;
-                       case 2: // 120 <= h < 180
-                               r = 0 + m;
-                               g = c + m;
-                               b = x + m;
-                       break;
-                       case 3: // 180 <= h < 240
-                               r = 0 + m;
-                               g = x + m;
-                               b = c + m;
-                       break;
-                       case 4: // 240 <= h < 300
-                               r = x + m;
-                               g = 0 + m;
-                               b = c + m;
-                       break;
-                       case 5: // 300 <= h < 360
-                               r = c + m;
-                               g = 0 + m;
-                               b = x + m;
-                       break;
-               }
-
-               r = '00' + Math.round(r * 255).toString(16);
-               g = '00' + Math.round(g * 255).toString(16);
-               b = '00' + Math.round(b * 255).toString(16);
-
-               return '#' + r.substr(r.length - 2) + g.substr(g.length - 2) + b.substr(b.length - 2);
-       }
-
        Chart.Type.extend({
                //Passing in a name registers this chart in the Chart namespace
                name: "Doughnut",
 
                        data = data.map(function (v, i, a){
                                if (!v.color) {
-                                       v.color = hue(i, a.length);
+                                       v.color = 'hsl(' + (360 * i / a.length) * 360 + ', 100%, 50%)';
                                        return v;
                                }
                        });