- Fixed issue #12064: Gradients are not rendered correctly in Flash driver

7 files changed, 23 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 840b8a5..a247ca0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 
 - Implemented support for odometer charts. Thanks to lars Jankowski from Oxid
   esales for the initial patch.
+- Fixed issue #12064: Gradients are not rendered correctly in Flash driver
 
 1.2alpha1 - Monday 29 October 2007
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/driver/flash.php b/src/driver/flash.php
index 9aba002..7c12de5 100644
--- a/src/driver/flash.php
+++ b/src/driver/flash.php
@@ -129,17 +129,26 @@ class ezcGraphFlashDriver extends ezcGraphDriver
 
                     $fill = $shape->addFill( $gradient, SWFFILL_LINEAR_GRADIENT );
 
+                    // Calculate desired length of gradient
+                    $length = sqrt( 
+                        pow( $color->endPoint->x - $color->startPoint->x, 2 ) + 
+                        pow( $color->endPoint->y - $color->startPoint->y, 2 ) 
+                    ); 
+
+                    $fill->scaleTo( $this->modifyCoordinate( $length ) / 32768 , $this->modifyCoordinate( $length ) / 32768 );
                     $fill->rotateTo( 
                         rad2deg( asin( 
-                            ( $color->endPoint->x - $color->startPoint->x ) / 
-                            $length = sqrt( 
-                                pow( $color->endPoint->x - $color->startPoint->x, 2 ) + 
-                                pow( $color->endPoint->y - $color->startPoint->y, 2 ) 
-                            ) 
+                            ( $color->endPoint->x - $color->startPoint->x ) / $length
                         ) + 180 )
                     );
-                    $fill->scaleTo( $this->modifyCoordinate( $length ) / 32768 , $this->modifyCoordinate( $length ) / 32768 );
-                    $fill->moveTo( $this->modifyCoordinate( $color->startPoint->x ), $this->modifyCoordinate( $color->startPoint->y ) );
+                    $fill->moveTo( 
+                        $this->modifyCoordinate( 
+                            ( $color->startPoint->x + $color->endPoint->x ) / 2 
+                        ), 
+                        $this->modifyCoordinate( 
+                            ( $color->startPoint->y + $color->endPoint->y ) / 2 
+                        )
+                    );
 
                     $shape->setLeftFill( $fill );
                     break;
@@ -857,7 +866,7 @@ class ezcGraphFlashDriver extends ezcGraphDriver
         );
 
         // @TODO: User SWFShape::curveTo
-        for ( $angle = $this->options->circleResolution; $angle <= 360; $angle += $this->options->circleResolution )
+        for ( $angle = $this->options->circleResolution; $angle < 360; $angle += $this->options->circleResolution )
         {
             $shape->drawLineTo( 
                 $this->modifyCoordinate( $center->x + cos( deg2rad( $angle ) ) * $width / 2 ), 
@@ -865,6 +874,11 @@ class ezcGraphFlashDriver extends ezcGraphDriver
             );
         }
 
+        $shape->drawLineTo( 
+            $this->modifyCoordinate( $center->x + $width / 2 ), 
+            $this->modifyCoordinate( $center->y )
+        );
+
         $object = $movie->add( $shape );
         $object->setName( $id = 'ezcGraphCircle_' . $this->id++ );
 
diff --git a/tests/data/compare/ezcGraphFlashDriverTest_testDrawCircleLinearFill.swf b/tests/data/compare/ezcGraphFlashDriverTest_testDrawCircleLinearFill.swf
index 5f62700..5d297a1 100644
--- a/tests/data/compare/ezcGraphFlashDriverTest_testDrawCircleLinearFill.swf
+++ b/tests/data/compare/ezcGraphFlashDriverTest_testDrawCircleLinearFill.swf
diff --git a/tests/data/compare/ezcGraphFlashDriverTest_testDrawCircularArcAcute.swf b/tests/data/compare/ezcGraphFlashDriverTest_testDrawCircularArcAcute.swf
index b3ba3c7..cf384ce 100644
--- a/tests/data/compare/ezcGraphFlashDriverTest_testDrawCircularArcAcute.swf
+++ b/tests/data/compare/ezcGraphFlashDriverTest_testDrawCircularArcAcute.swf
diff --git a/tests/data/compare/ezcGraphFlashDriverTest_testDrawCircularArcAcuteReverse.swf b/tests/data/compare/ezcGraphFlashDriverTest_testDrawCircularArcAcuteReverse.swf
index 867031c..f2ae3ea 100644
--- a/tests/data/compare/ezcGraphFlashDriverTest_testDrawCircularArcAcuteReverse.swf
+++ b/tests/data/compare/ezcGraphFlashDriverTest_testDrawCircularArcAcuteReverse.swf
diff --git a/tests/data/compare/ezcGraphFlashDriverTest_testDrawCircularArcObtuse.swf b/tests/data/compare/ezcGraphFlashDriverTest_testDrawCircularArcObtuse.swf
index 1688f39..22df567 100644
--- a/tests/data/compare/ezcGraphFlashDriverTest_testDrawCircularArcObtuse.swf
+++ b/tests/data/compare/ezcGraphFlashDriverTest_testDrawCircularArcObtuse.swf
diff --git a/tests/data/compare/ezcGraphFlashDriverTest_testRenderLabeledFlashPieChart.swf b/tests/data/compare/ezcGraphFlashDriverTest_testRenderLabeledFlashPieChart.swf
index 6b2fd3e..30ee68b 100644
--- a/tests/data/compare/ezcGraphFlashDriverTest_testRenderLabeledFlashPieChart.swf
+++ b/tests/data/compare/ezcGraphFlashDriverTest_testRenderLabeledFlashPieChart.swf