[QGIS Commit] r12720 - trunk/qgis/src/core/symbology-ng

[svn_qgis at osgeo.org]

Author: wonder
Date: 2010-01-09 14:58:47 -0500 (Sat, 09 Jan 2010)
New Revision: 12720

Modified:
   trunk/qgis/src/core/symbology-ng/qgslinesymbollayerv2.cpp
Log:
Consider also original marker rotation in marker line with rotated symbols.


Modified: trunk/qgis/src/core/symbology-ng/qgslinesymbollayerv2.cpp
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgslinesymbollayerv2.cpp	2010-01-09 19:48:11 UTC (rev 12719)
+++ trunk/qgis/src/core/symbology-ng/qgslinesymbollayerv2.cpp	2010-01-09 19:58:47 UTC (rev 12720)
@@ -231,6 +231,7 @@
   QPointF lastPt = points[0];
   double lengthLeft = 0; // how much is left until next marker
   bool first = true;
+  double origAngle = mMarker->angle();
 
   for ( int i = 1; i < points.count(); ++i )
   {
@@ -252,7 +253,7 @@
     // rotate marker (if desired)
     if ( mRotateMarker )
     {
-      mMarker->setAngle( l.angle() * 180 / M_PI );
+      mMarker->setAngle( origAngle + ( l.angle() * 180 / M_PI ) );
       mMarker->startRender( context );
     }
 
@@ -279,6 +280,9 @@
       mMarker->stopRender( context );
   }
 
+  // restore original rotation
+  mMarker->setAngle( origAngle );
+
 }
 
 QgsStringMap QgsMarkerLineSymbolLayerV2::properties() const