g.circular.js
authoredward <edward@roojs.com>
Thu, 21 Jun 2018 10:25:11 +0000 (18:25 +0800)
committeredward <edward@roojs.com>
Thu, 21 Jun 2018 10:25:11 +0000 (18:25 +0800)
g.circular.js

index 5d1ba30..11cbc00 100644 (file)
@@ -163,24 +163,12 @@ Roo = typeof(Roo) != 'undefined' ? Roo:  (imports ? imports.seed.Roo.Roo: {});
                     continue;
                 }
                 
-                chart.labels.push(paper.set());
-                chart.labels[len - 1].push(paper[mark](x + 5, y, 5).attr({ fill: colors[i] || chartinst.colors[i], stroke: "none" }));
-                chart.labels[len - 1].push(
-                    txt = paper.text(x + 20, y, otherslabel || 'Others').attr(opts.txtattr || chartinst.txtattr).attr({ fill: opts.legendcolor || "#000", "text-anchor": "start"}));
+                paper[mark](x + 5, y, 5).attr({ fill: colors[i] || chartinst.colors[i], stroke: "none" })
+                txt = paper.text(x + 20, y, otherslabel || 'Others').attr(opts.txtattr || chartinst.txtattr).attr({ fill: opts.legendcolor || "#000", "text-anchor": "start"})
                 
                 y += txt.getBBox().height * 1.2;
             }
 
-//            var bb = chart.labels.getBBox(),
-//                tr = {
-//                    east: [0, -bb.height / 2],
-//                    west: [-bb.width - 2 * r - 20, -bb.height / 2],
-//                    north: [-r - bb.width / 2, -r - bb.height - 10],
-//                    south: [-r - bb.width / 2, r + 10]
-//                }[dir];
-
-//            chart.labels.translate.apply(chart.labels, tr);
-//            chart.push(chart.labels);
         };
 
         if (opts.legend) {