Merge pull request #1 from OklahomaChristian/pie-labels

Pie labels
OklahomaChristian · May 20, 2014 · 8cde7de · 8cde7de
2 parents b4caee3 + 85c5fcd
commit 8cde7de
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/flotr2.js b/flotr2.js
@@ -2609,6 +2609,7 @@ Graph.prototype = {
         textEnabled : this.textEnabled,
         htmlText    : this.options.HtmlText,
         text        : this._text, // TODO Is this necessary?
+		labelText	: series.label,
         element     : this.el,
         data        : series.data,
         color       : series.color,
@@ -4765,8 +4766,8 @@ function isImage (i) {
 var
   _ = Flotr._;
 
-Flotr.defaultPieLabelFormatter = function (total, value) {
-  return (100 * value / total).toFixed(2)+'%';
+Flotr.defaultPieLabelFormatter = function (total, value, labelText) {
+  return labelText+(100 * value / total).toFixed(2)+'%';
 };
 
 Flotr.addType('pie', {
@@ -4809,7 +4810,8 @@ Flotr.addType('pie', {
       startAngle    = this.startAngle || (2 * Math.PI * options.startAngle), // TODO: this initial startAngle is already in radians (fixing will be test-unstable)
       endAngle      = startAngle + measure,
       bisection     = startAngle + measure / 2,
-      label         = options.labelFormatter(this.total, value),
+      //label         = options.labelFormatter(this.total, value),
+	  label         = options.labelFormatter(this.total, value, options.labelText),
       //plotTickness  = Math.sin(series.pie.viewAngle)*series.pie.spliceThickness / vScale;
       explodeCoeff  = explode + radius + 4,
       distX         = Math.cos(bisection) * explodeCoeff,

diff --git a/flotr2.min.js b/flotr2.min.js
diff --git a/flotr2.nolibs.js b/flotr2.nolibs.js
@@ -1267,6 +1267,7 @@ Graph.prototype = {
         textEnabled : this.textEnabled,
         htmlText    : this.options.HtmlText,
         text        : this._text, // TODO Is this necessary?
+		labelText	: series.label,
         element     : this.el,
         data        : series.data,
         color       : series.color,
@@ -3423,8 +3424,8 @@ function isImage (i) {
 var
   _ = Flotr._;
 
-Flotr.defaultPieLabelFormatter = function (total, value) {
-  return (100 * value / total).toFixed(2)+'%';
+Flotr.defaultPieLabelFormatter = function (total, value, labelText) {
+  return labelText+(100 * value / total).toFixed(2)+'%';
 };
 
 Flotr.addType('pie', {
@@ -3467,7 +3468,8 @@ Flotr.addType('pie', {
       startAngle    = this.startAngle || (2 * Math.PI * options.startAngle), // TODO: this initial startAngle is already in radians (fixing will be test-unstable)
       endAngle      = startAngle + measure,
       bisection     = startAngle + measure / 2,
-      label         = options.labelFormatter(this.total, value),
+      //label         = options.labelFormatter(this.total, value),
+	  label         = options.labelFormatter(this.total, value, options.labelText),
       //plotTickness  = Math.sin(series.pie.viewAngle)*series.pie.spliceThickness / vScale;
       explodeCoeff  = explode + radius + 4,
       distX         = Math.cos(bisection) * explodeCoeff,

diff --git a/js/Graph.js b/js/Graph.js
@@ -293,6 +293,7 @@ Graph.prototype = {
         textEnabled : this.textEnabled,
         htmlText    : this.options.HtmlText,
         text        : this._text, // TODO Is this necessary?
+		labelText	: series.label,
         element     : this.el,
         data        : series.data,
         color       : series.color,

diff --git a/js/types/pie.js b/js/types/pie.js
@@ -10,8 +10,8 @@
 var
   _ = Flotr._;
 
-Flotr.defaultPieLabelFormatter = function (total, value) {
-  return (100 * value / total).toFixed(2)+'%';
+Flotr.defaultPieLabelFormatter = function (total, value, labelText) {
+  return labelText+(100 * value / total).toFixed(2)+'%';
 };
 
 Flotr.addType('pie', {
@@ -54,7 +54,8 @@ Flotr.addType('pie', {
       startAngle    = this.startAngle || (2 * Math.PI * options.startAngle), // TODO: this initial startAngle is already in radians (fixing will be test-unstable)
       endAngle      = startAngle + measure,
       bisection     = startAngle + measure / 2,
-      label         = options.labelFormatter(this.total, value),
+      //label         = options.labelFormatter(this.total, value),
+	  label         = options.labelFormatter(this.total, value, options.labelText),
       //plotTickness  = Math.sin(series.pie.viewAngle)*series.pie.spliceThickness / vScale;
       explodeCoeff  = explode + radius + 4,
       distX         = Math.cos(bisection) * explodeCoeff,