Fix bug with rotated labels

wonder-sk · wonder-sk · commit d20ff2329dd6 · 2015-09-24T16:57:54.000+08:00
This code has been funded by Tuscany Region (Italy) - SITA (CIG: 63526840AE) and commissioned to Gis3W s.a.s.
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -2574,7 +2574,8 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext
   *labelFeature = lf;
   ( *labelFeature )->setHasFixedPosition( dataDefinedPosition );
   ( *labelFeature )->setFixedPosition( QgsPoint( xPos, yPos ) );
-  ( *labelFeature )->setHasFixedAngle( dataDefinedRotation );
+  // use layer-level defined rotation, but not if position fixed
+  ( *labelFeature )->setHasFixedAngle( dataDefinedRotation || ( !dataDefinedPosition && angle != 0 ) );
   ( *labelFeature )->setFixedAngle( angle );
   ( *labelFeature )->setQuadOffset( QPointF( quadOffsetX, quadOffsetY ) );
   ( *labelFeature )->setPositionOffset( QgsPoint( offsetX, offsetY ) );
