- Fixed pie chart labeling

5 files changed, 15 insertions, 21 deletions

diff --git a/src/charts/pie.php b/src/charts/pie.php
index d163238..0abf6a8 100644
--- a/src/charts/pie.php
+++ b/src/charts/pie.php
@@ -72,7 +72,7 @@ class ezcGraphPieChart extends ezcGraphChart
                 $dataset->color[$label],
                 $angle,
                 $angle += $value / $sum * 360,
-                $label,
+                sprintf( $this->options->label, $label, $value, $sum / $value * 100 ),
                 $dataset->highlight[$label]
             );
         }
diff --git a/src/renderer/2d.php b/src/renderer/2d.php
index 83ed126..b3a21f2 100644
--- a/src/renderer/2d.php
+++ b/src/renderer/2d.php
@@ -202,20 +202,14 @@ class ezcGraphRenderer2d extends ezcGraphRenderer
                     );
 
                     $this->driver->drawCircle(
-                        new ezcGraphCoordinate(
-                            $label[0]->x - $symbolSize / 2,
-                            $label[0]->y - $symbolSize / 2
-                        ),
+                        $label[0],
                         $symbolSize,
                         $symbolSize,
                         $this->options->font->color,
                         true
                     );
                     $this->driver->drawCircle(
-                        new ezcGraphCoordinate(
-                            $labelPosition->x - $symbolSize / 2,
-                            $labelPosition->y - $symbolSize / 2
-                        ),
+                        $labelPosition,
                         $symbolSize,
                         $symbolSize,
                         $this->options->font->color,
diff --git a/tests/complete_rendering_test.php b/tests/complete_rendering_test.php
index 9af17cf..f8fd18e 100644
--- a/tests/complete_rendering_test.php
+++ b/tests/complete_rendering_test.php
@@ -50,7 +50,7 @@ class ezcGraphCompleteRenderingTest extends ezcImageTestCase
      */
     public function tearDown()
     {
-        $this->removeTempDir();
+    //    $this->removeTempDir();
     }
 
     public function testRenderLineChart()
@@ -117,25 +117,25 @@ class ezcGraphCompleteRenderingTest extends ezcImageTestCase
         $chart->render( 500, 200, $filename );
     }
 
-    public function testRenderWithTransparentBackground()
+    public function testRenderPieChart()
     {
         $filename = $this->tempDir . __FUNCTION__ . '.png';
 
-        $chart = ezcGraph::create( 'line' );
-        $chart['sampleData'] = array( 'sample 1' => 234, 'sample 2' => 21, 'sample 3' => 324, 'sample 4' => 120, 'sample 5' => 1);
-        $chart->palette = 'Black';
-        $chart->options->backgroundImage = $this->basePath . $this->testFiles['png'];
-        $chart->options->background = '#2E343655';
+        $chart = ezcGraph::create( 'Pie' );
+        $chart['sample'] = array(
+            'Mozilla' => 4375,
+            'IE' => 345,
+            'Opera' => 1204,
+            'wget' => 231,
+            'Safari' => 987,
+        );
+
+        $chart['sample']->highlight['Safari'] = true;
 
         $chart->driver = new ezcGraphGdDriver();
         $chart->options->font = $this->basePath . 'font.ttf';
         $chart->render( 500, 200, $filename );
 
-        $this->assertTrue(
-            file_exists( $filename ),
-            'No image was generated.'
-        );
-
         $this->assertImageSimilar(
             $filename,
             $this->basePath . 'compare/' . __CLASS__ . '_' . __FUNCTION__ . '.png',
diff --git a/tests/data/compare/ezcGraphCompleteRenderingTest_testRenderPieChart.png b/tests/data/compare/ezcGraphCompleteRenderingTest_testRenderPieChart.png
new file mode 100644
index 0000000..3270033
--- /dev/null
+++ b/tests/data/compare/ezcGraphCompleteRenderingTest_testRenderPieChart.png
diff --git a/tests/data/compare/ezcGraphCompleteRenderingTest_testRenderWithTransparentBackground.png b/tests/data/compare/ezcGraphCompleteRenderingTest_testRenderWithTransparentBackground.png
deleted file mode 100644
index 639e5e4..0000000
--- a/tests/data/compare/ezcGraphCompleteRenderingTest_testRenderWithTransparentBackground.png
+++ /dev/null