consider data defined svg pattern rotation (fixes #7736)

qgis · Jul 11, 2013 · fd85aee · fd85aee
1 parent 3e83901
commit fd85aee
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.cpp b/src/core/symbology-ng/qgsfillsymbollayerv2.cpp
@@ -302,6 +302,7 @@ void QgsImageFillSymbolLayer::renderPolygon( const QPolygonF& points, QList<QPol
     return;
   }
 
+  mNextAngle = mAngle;
   applyDataDefinedSettings( context );
 
   p->setPen( QPen( Qt::NoPen ) );
@@ -315,14 +316,14 @@ void QgsImageFillSymbolLayer::renderPolygon( const QPolygonF& points, QList<QPol
     _renderPolygon( p, points, rings );
   }
 
-  if ( qgsDoubleNear( mAngle, 0.0 ) )
+  if ( qgsDoubleNear( mNextAngle, 0.0 ) )
   {
     p->setBrush( mBrush );
   }
   else
   {
     QTransform t = mBrush.transform();
-    t.rotate( mAngle );
+    t.rotate( mNextAngle );
     QBrush rotatedBrush = mBrush;
     rotatedBrush.setTransform( t );
     p->setBrush( rotatedBrush );
@@ -766,11 +767,17 @@ void QgsSVGFillSymbolLayer::applyDataDefinedSettings( const QgsSymbolV2RenderCon
   QgsExpression* fillColorExpression = expression( "svgFillColor" );
   QgsExpression* outlineColorExpression = expression( "svgOutlineColor" );
   QgsExpression* outlineWidthExpression = expression( "svgOutlineWidth" );
-  if ( !widthExpression && !svgFileExpression && !fillColorExpression && !outlineColorExpression && !outlineWidthExpression )
+  QgsExpression* angleExpression = expression( "angle" );
+  if ( !widthExpression && !svgFileExpression && !fillColorExpression && !outlineColorExpression && !outlineWidthExpression && !angleExpression )
   {
     return; //no data defined settings
   }
 
+  if ( angleExpression )
+  {
+    mNextAngle = angleExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toDouble();
+  }
+
   double width = mPatternWidth;
   if ( widthExpression )
   {

diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.h b/src/core/symbology-ng/qgsfillsymbollayerv2.h
@@ -118,6 +118,7 @@ class CORE_EXPORT QgsImageFillSymbolLayer: public QgsFillSymbolLayerV2
 
   protected:
     QBrush mBrush;
+    double mNextAngle; // mAngle / data defined angle
 
     /**Outline width*/
     double mOutlineWidth;