4147 - in trunk/Graph: . src/driver tests/data/compare [eZComponents: Trunk]

Author: Kore Nordmann
Date: 2006-11-30 14:20:11 +0100 (Thu, 30 Nov 2006)
New Revision: 4147

Log:
- Fixed: Bug #9549 (Pie chart slices not contiguous with Ming driver)

Modified:
   trunk/Graph/ChangeLog
   trunk/Graph/src/driver/flash.php
   
trunk/Graph/tests/data/compare/ezcGraphFlashDriverTest_testDrawCircleSectorAcute.swf
   
trunk/Graph/tests/data/compare/ezcGraphFlashDriverTest_testDrawCircleSectorAcuteNonFilled.swf
   
trunk/Graph/tests/data/compare/ezcGraphFlashDriverTest_testDrawCircleSectorAcuteReverse.swf
   
trunk/Graph/tests/data/compare/ezcGraphFlashDriverTest_testDrawMultipleBigCircleSectors.swf
   
trunk/Graph/tests/data/compare/ezcGraphFlashDriverTest_testDrawMultipleCircleSectors.swf
   
trunk/Graph/tests/data/compare/ezcGraphFlashDriverTest_testRenderLabeledFlashPieChart.swf

Modified: trunk/Graph/ChangeLog
===================================================================
--- trunk/Graph/ChangeLog       2006-11-30 11:11:42 UTC (rev 4146)
+++ trunk/Graph/ChangeLog       2006-11-30 13:20:11 UTC (rev 4147)
@@ -13,6 +13,7 @@
 - Fixed issue #9568: Devision by zero warning
 - Fixed issue #9655: pieChartOffset and highlight do not work together in 2d
   renderer
+- Fixed issue #9549: Pie chart slices not contiguous with Ming driver
 - Fixed issue #9545: pie chart tresh hold does not work if agregated data
   stays below tresh hold
 

Modified: trunk/Graph/src/driver/flash.php
===================================================================
--- trunk/Graph/src/driver/flash.php    2006-11-30 11:11:42 UTC (rev 4146)
+++ trunk/Graph/src/driver/flash.php    2006-11-30 13:20:11 UTC (rev 4147)
@@ -588,17 +588,20 @@
         $shape->movePenTo( $this->modifyCoordinate( $center->x ), 
$this->modifyCoordinate( $center->y ) );
 
         // @TODO: User SWFShape::curveTo
-        for ( $angle = $startAngle; $angle <= $endAngle; $angle += 
$this->options->circleResolution )
+        for(
+            $angle = $startAngle;
+            $angle <= $endAngle;
+            $angle = min( $angle + $this->options->circleResolution, $endAngle 
) )
         {
-            $angle = min(
-                $angle,
-                $endAngle
-            );
-
             $shape->drawLineTo( 
                 $this->modifyCoordinate( $center->x + cos( deg2rad( $angle ) ) 
* $width / 2 ), 
                 $this->modifyCoordinate( $center->y + sin( deg2rad( $angle ) ) 
* $height / 2 )
             );
+
+            if ( $angle === $endAngle )
+            {
+                break;
+            }
         }
 
         $shape->drawLineTo( 

Modified: 
trunk/Graph/tests/data/compare/ezcGraphFlashDriverTest_testDrawCircleSectorAcute.swf
===================================================================
(Binary files differ)

Modified: 
trunk/Graph/tests/data/compare/ezcGraphFlashDriverTest_testDrawCircleSectorAcuteNonFilled.swf
===================================================================
(Binary files differ)

Modified: 
trunk/Graph/tests/data/compare/ezcGraphFlashDriverTest_testDrawCircleSectorAcuteReverse.swf
===================================================================
(Binary files differ)

Modified: 
trunk/Graph/tests/data/compare/ezcGraphFlashDriverTest_testDrawMultipleBigCircleSectors.swf
===================================================================
(Binary files differ)

Modified: 
trunk/Graph/tests/data/compare/ezcGraphFlashDriverTest_testDrawMultipleCircleSectors.swf
===================================================================
(Binary files differ)

Modified: 
trunk/Graph/tests/data/compare/ezcGraphFlashDriverTest_testRenderLabeledFlashPieChart.swf
===================================================================
(Binary files differ)