- Implemented #009304: Possibility to format labels via callback

2 files changed, 20 insertions, 1 deletions

diff --git a/src/charts/pie.php b/src/charts/pie.php
index 8396492..85bf7a2 100644
--- a/src/charts/pie.php
+++ b/src/charts/pie.php
@@ -87,13 +87,17 @@ class ezcGraphPieChart extends ezcGraphChart
             switch ( $dataset->displayType->default )
             {
                 case ezcGraph::PIE:
+                    $displayLabel = ( $this->options->labelCallback !== null
+                        ? call_user_func( $this->options->labelCallback, $label, $value, $value / $sum )
+                        : sprintf( $this->options->label, $label, $value, $value / $sum * 100 ) );
+
                     $renderer->drawPieSegment(
                         $boundings,
                         new ezcGraphContext( $datasetName, $label ),
                         $dataset->color[$label],
                         $angle,
                         $angle += $value / $sum * 360,
-                        sprintf( $this->options->label, $label, $value, $value / $sum * 100 ),
+                        $displayLabel,
                         $dataset->highlight[$label]
                     );
                     break;
diff --git a/src/options/pie_chart.php b/src/options/pie_chart.php
index 104bc5a..5974a2d 100644
--- a/src/options/pie_chart.php
+++ b/src/options/pie_chart.php
@@ -15,6 +15,10 @@
  *              %$1s    Name of pie
  *              %2$d    Value of pie
  *              %3$.1f  Percentage
+ * @property callback $labelCallback
+ *           Callback function to format pie chart labels.
+ *           Function will receive 3 parameters:
+ *              string function( label, value, percent )
  * @property float $sum
  *           Fixed sum of values. This should be used for incomplete pie 
  *           charts.
@@ -40,6 +44,7 @@ class ezcGraphPieChartOptions extends ezcGraphChartOptions
     public function __construct( array $options = array() )
     {
         $this->properties['label'] = '%1$s: %2$d (%3$.1f%%)';
+        $this->properties['labelCallback'] = null;
         $this->properties['sum'] = false;
 
         $this->properties['percentTreshHold'] = .0;
@@ -66,6 +71,16 @@ class ezcGraphPieChartOptions extends ezcGraphChartOptions
             case 'label':
                 $this->properties['label'] = (string) $propertyValue;
                 break;
+            case 'labelCallback':
+                if ( is_string( $propertyValue ) && function_exists( $propertyValue ) )
+                {
+                    $this->properties['labelCallback'] = $propertyValue;
+                }
+                else
+                {
+                    throw new ezcBaseValueException( $propertyName, $propertyValue, 'callback function' );
+                }
+                break;
             case 'sum':
                 $this->properties['sum'] = (float) $propertyValue;
                 break;