- Fixed issue #12246: Graph: dataBorder doesn't works in 2d renderer for

  piecharts

4 files changed, 35 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index bbdcc92..b7bff54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1.2 - [RELEASEDATE]
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+- Fixed issue #12246: Graph: dataBorder doesn't works in 2d renderer for
+  piecharts
+
 1.2beta1 - Wednesday 28 November 2007
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/src/renderer/2d.php b/src/renderer/2d.php
index 599b8a7..e450f8b 100644
--- a/src/renderer/2d.php
+++ b/src/renderer/2d.php
@@ -278,7 +278,7 @@ class ezcGraphRenderer2d
                 )
             );
 
-            $darkenedColor = $circleSector['color']->darken( .5 );
+            $darkenedColor = $circleSector['color']->darken( $this->options->dataBorder );
             $this->driver->drawCircleSector(
                 $circleSector['center'],
                 $circleSector['width'],
diff --git a/tests/data/compare/ezcGraphRenderer2dTest_testRenderPieChartDifferentDataBorder.svg b/tests/data/compare/ezcGraphRenderer2dTest_testRenderPieChartDifferentDataBorder.svg
new file mode 100644
index 0000000..c8b8700
--- /dev/null
+++ b/tests/data/compare/ezcGraphRenderer2dTest_testRenderPieChartDifferentDataBorder.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="500" height="200" version="1.0" id="ezcGraph"><defs/><g id="ezcGraphChart" color-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="optimizeLegibility"><path d=" M 0.0000,200.0000 L 0.0000,0.0000 L 500.0000,0.0000 L 500.0000,200.0000 L 0.0000,200.0000 z " style="fill: #eeeeec; fill-opacity: 1.00; stroke: none;" id="ezcGraphPolygon_1"/><path d=" M 0.0000,200.0000 L 0.0000,0.0000 L 100.0000,0.0000 L 100.0000,200.0000 L 0.0000,200.0000 z " style="fill: #000000; fill-opacity: 0.00; stroke: none;" id="ezcGraphPolygon_2"/><path d=" M 2.0000,16.0000 L 2.0000,2.0000 L 16.0000,2.0000 L 16.0000,16.0000 L 2.0000,16.0000 z " style="fill: #3465a4; fill-opacity: 1.00; stroke: none;" id="ezcGraphPolygon_3"/><path d=" M 2.0000,34.0000 L 2.0000,20.0000 L 16.0000,20.0000 L 16.0000,34.0000 L 2.0000,34.0000 z " style="fill: #4e9a06; fill-opacity: 1.00; stroke: none;" id="ezcGraphPolygon_5"/><path d=" M 2.0000,52.0000 L 2.0000,38.0000 L 16.0000,38.0000 L 16.0000,52.0000 L 2.0000,52.0000 z " style="fill: #cc0000; fill-opacity: 1.00; stroke: none;" id="ezcGraphPolygon_7"/><path d=" M 2.0000,70.0000 L 2.0000,56.0000 L 16.0000,56.0000 L 16.0000,70.0000 L 2.0000,70.0000 z " style="fill: #edd400; fill-opacity: 1.00; stroke: none;" id="ezcGraphPolygon_9"/><path d=" M 2.0000,88.0000 L 2.0000,74.0000 L 16.0000,74.0000 L 16.0000,88.0000 L 2.0000,88.0000 z " style="fill: #75505b; fill-opacity: 1.00; stroke: none;" id="ezcGraphPolygon_11"/><path d="M 300.00,100.00 L 390.00,100.00 A 90.00,90.00 0 1,1 231.59,41.52 z" style="fill: #3465a4; fill-opacity: 1.00; stroke: none;" id="ezcGraphCircleSector_13"/><path d="M 299.82,100.50 L 389.50,100.50 A 89.50,89.50 0 1,1 231.65,42.22 z" style="fill: none; stroke: #2f5b94; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphCircleSector_14"/><path d="M 300.00,100.00 L 231.59,41.52 A 90.00,90.00 0 0,1 252.20,23.75 z" style="fill: #4e9a06; fill-opacity: 1.00; stroke: none;" id="ezcGraphCircleSector_15"/><path d="M 297.84,97.50 L 232.30,41.46 A 89.50,89.50 0 0,1 252.04,24.43 z" style="fill: none; stroke: #468b05; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphCircleSector_16"/><path d="M 300.00,100.00 L 252.20,23.75 A 90.00,90.00 0 0,1 343.09,20.99 z" style="fill: #cc0000; fill-opacity: 1.00; stroke: none;" id="ezcGraphCircleSector_17"/><path d="M 299.97,99.01 L 252.89,23.90 A 89.50,89.50 0 0,1 342.41,21.19 z" style="fill: none; stroke: #b80000; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphCircleSector_18"/><path d="M 300.00,100.00 L 343.09,20.99 A 90.00,90.00 0 0,1 358.15,31.31 z" style="fill: #edd400; fill-opacity: 1.00; stroke: none;" id="ezcGraphCircleSector_19"/><path d="M 302.79,95.93 L 343.29,21.66 A 89.50,89.50 0 0,1 357.45,31.37 z" style="fill: none; stroke: #d5bf00; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphCircleSector_20"/><path d="M 309.07,95.79 L 367.22,27.10 A 90.00,90.00 0 0,1 399.07,95.79 z" style="fill: #75505b; fill-opacity: 1.00; stroke: none;" id="ezcGraphCircleSector_21"/><path d="M 310.15,95.29 L 367.28,27.81 A 89.50,89.50 0 0,1 398.57,95.29 z" style="fill: none; stroke: #694852; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphCircleSector_22"/><path d=" M 297.9769,33.3640 L 250.4110,10.0000" style="fill: none; stroke: #000000; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphLine_23"/><ellipse cx="297.9769" cy="33.3640" rx="3.0000" ry="3.0000" style="fill: #000000; fill-opacity: 1.00; stroke: none;" id="ezcGraphCircle_24"/><ellipse cx="250.4110" cy="10.0000" rx="3.0000" ry="3.0000" style="fill: #000000; fill-opacity: 1.00; stroke: none;" id="ezcGraphCircle_25"/><path d=" M 256.4576,49.5173 L 222.5857,30.0000" style="fill: none; stroke: #000000; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphLine_27"/><ellipse cx="256.4576" cy="49.5173" rx="3.0000" ry="3.0000" style="fill: #000000; fill-opacity: 1.00; stroke: none;" id="ezcGraphCircle_28"/><ellipse cx="222.5857" cy="30.0000" rx="3.0000" ry="3.0000" style="fill: #000000; fill-opacity: 1.00; stroke: none;" id="ezcGraphCircle_29"/><path d=" M 276.9111,162.5408 L 250.4110,190.0000" style="fill: none; stroke: #000000; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphLine_31"/><ellipse cx="276.9111" cy="162.5408" rx="3.0000" ry="3.0000" style="fill: #000000; fill-opacity: 1.00; stroke: none;" id="ezcGraphCircle_32"/><ellipse cx="250.4110" cy="190.0000" rx="3.0000" ry="3.0000" style="fill: #000000; fill-opacity: 1.00; stroke: none;" id="ezcGraphCircle_33"/><path d=" M 337.6907,45.0104 L 361.7763,17.0000" style="fill: none; stroke: #000000; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphLine_35"/><ellipse cx="337.6907" cy="45.0104" rx="3.0000" ry="3.0000" style="fill: #000000; fill-opacity: 1.00; stroke: none;" id="ezcGraphCircle_36"/><ellipse cx="361.7763" cy="17.0000" rx="3.0000" ry="3.0000" style="fill: #000000; fill-opacity: 1.00; stroke: none;" id="ezcGraphCircle_37"/><path d=" M 369.5539,67.7505 L 394.2666,53.0000" style="fill: none; stroke: #000000; stroke-width: 1; stroke-opacity: 1.00; stroke-linecap: round; stroke-linejoin: round;" id="ezcGraphLine_39"/><ellipse cx="369.5539" cy="67.7505" rx="3.0000" ry="3.0000" style="fill: #000000; fill-opacity: 1.00; stroke: none;" id="ezcGraphCircle_40"/><ellipse cx="394.2666" cy="53.0000" rx="3.0000" ry="3.0000" style="fill: #000000; fill-opacity: 1.00; stroke: none;" id="ezcGraphCircle_41"/><g id="ezcGraphTextBox_4"><path d=" M 16.5000,17.0000 L 16.5000,1.5000 L 69.9400,1.5000 L 69.9400,17.0000 L 16.5000,17.0000 z " style="fill: #ffffff; fill-opacity: 0.00; stroke: none;" id="ezcGraphPolygon_43"/><text id="ezcGraphTextBox_4_text" x="17.0000" text-length="51.9400px" y="13.9000" style="font-size: 14px; font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">Mozilla</text></g><g id="ezcGraphTextBox_6"><path d=" M 16.5000,35.0000 L 16.5000,19.5000 L 32.8400,19.5000 L 32.8400,35.0000 L 16.5000,35.0000 z " style="fill: #ffffff; fill-opacity: 0.00; stroke: none;" id="ezcGraphPolygon_44"/><text id="ezcGraphTextBox_6_text" x="17.0000" text-length="14.8400px" y="31.9000" style="font-size: 14px; font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">IE</text></g><g id="ezcGraphTextBox_8"><path d=" M 16.5000,53.0000 L 16.5000,37.5000 L 55.1000,37.5000 L 55.1000,53.0000 L 16.5000,53.0000 z " style="fill: #ffffff; fill-opacity: 0.00; stroke: none;" id="ezcGraphPolygon_45"/><text id="ezcGraphTextBox_8_text" x="17.0000" text-length="37.1000px" y="49.9000" style="font-size: 14px; font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">Opera</text></g><g id="ezcGraphTextBox_10"><path d=" M 16.5000,71.0000 L 16.5000,55.5000 L 47.6800,55.5000 L 47.6800,71.0000 L 16.5000,71.0000 z " style="fill: #ffffff; fill-opacity: 0.00; stroke: none;" id="ezcGraphPolygon_46"/><text id="ezcGraphTextBox_10_text" x="17.0000" text-length="29.6800px" y="67.9000" style="font-size: 14px; font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">wget</text></g><g id="ezcGraphTextBox_12"><path d=" M 16.5000,89.0000 L 16.5000,73.5000 L 62.5200,73.5000 L 62.5200,89.0000 L 16.5000,89.0000 z " style="fill: #ffffff; fill-opacity: 0.00; stroke: none;" id="ezcGraphPolygon_47"/><text id="ezcGraphTextBox_12_text" x="17.0000" text-length="44.5200px" y="85.9000" style="font-size: 14px; font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">Safari</text></g><g id="ezcGraphTextBox_26"><path d=" M 153.2810,15.5000 L 153.2810,5.0000 L 245.4110,5.0000 L 245.4110,15.5000 L 153.2810,15.5000 z " style="fill: #ffffff; fill-opacity: 0.00; stroke: none;" id="ezcGraphPolygon_48"/><text id="ezcGraphTextBox_26_text" x="153.7810" text-length="90.6300px" y="13.1500" style="font-size: 9px; font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">Opera: 1204 (16.9%)</text></g><g id="ezcGraphTextBox_30"><path d=" M 149.3057,35.5000 L 149.3057,25.0000 L 217.5857,25.0000 L 217.5857,35.5000 L 149.3057,35.5000 z " style="fill: #ffffff; fill-opacity: 0.00; stroke: none;" id="ezcGraphPolygon_49"/><text id="ezcGraphTextBox_30_text" x="149.8057" text-length="66.7800px" y="33.1500" style="font-size: 9px; font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">IE: 345 (4.8%)</text></g><g id="ezcGraphTextBox_34"><path d=" M 143.7410,195.5000 L 143.7410,185.0000 L 245.4110,185.0000 L 245.4110,195.5000 L 143.7410,195.5000 z " style="fill: #ffffff; fill-opacity: 0.00; stroke: none;" id="ezcGraphPolygon_50"/><text id="ezcGraphTextBox_34_text" x="144.2410" text-length="100.1700px" y="193.1500" style="font-size: 9px; font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">Mozilla: 4375 (61.3%)</text></g><g id="ezcGraphTextBox_38"><path d=" M 367.2763,22.5000 L 367.2763,12.0000 L 445.0963,12.0000 L 445.0963,22.5000 L 367.2763,22.5000 z " style="fill: #ffffff; fill-opacity: 0.00; stroke: none;" id="ezcGraphPolygon_51"/><text id="ezcGraphTextBox_38_text" x="367.7763" text-length="76.3200px" y="20.1500" style="font-size: 9px; font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">wget: 231 (3.2%)</text></g><g id="ezcGraphTextBox_42"><path d=" M 399.7666,58.5000 L 399.7666,48.0000 L 491.8966,48.0000 L 491.8966,58.5000 L 399.7666,58.5000 z " style="fill: #ffffff; fill-opacity: 0.00; stroke: none;" id="ezcGraphPolygon_52"/><text id="ezcGraphTextBox_42_text" x="400.2666" text-length="90.6300px" y="56.1500" style="font-size: 9px; font-family: sans-serif; fill: #2e3436; fill-opacity: 1.00; stroke: none;">Safari: 987 (13.8%)</text></g></g></svg>
diff --git a/tests/renderer_2d_test.php b/tests/renderer_2d_test.php
index 550d0d4..2c57f46 100644
--- a/tests/renderer_2d_test.php
+++ b/tests/renderer_2d_test.php
@@ -1856,6 +1856,32 @@ class ezcGraphRenderer2dTest extends ezcGraphTestCase
         );
     }
 
+    public function testRenderPieChartDifferentDataBorder()
+    {
+        $filename = $this->tempDir . __FUNCTION__ . '.svg';
+
+        $chart = new ezcGraphPieChart();
+        $chart->data['sample'] = new ezcGraphArrayDataSet( array(
+            'Mozilla' => 4375,
+            'IE' => 345,
+            'Opera' => 1204,
+            'wget' => 231,
+            'Safari' => 987,
+        ) );
+
+        $chart->data['sample']->highlight['Safari'] = true;
+
+        $chart->renderer->options->dataBorder = .1;
+
+        $chart->driver = new ezcGraphSvgDriver();
+        $chart->render( 500, 200, $filename );
+
+        $this->compare(
+            $filename,
+            $this->basePath . 'compare/' . __CLASS__ . '_' . __FUNCTION__ . '.svg'
+        );
+    }
+
     public function testRenderPieChartWithHighlightAndOffset()
     {
         $filename = $this->tempDir . __FUNCTION__ . '.svg';