Set the line angle instead of the symbol angle

elpaso · elpaso · commit 2018edbec0ff · 2020-09-16T18:25:48.000+02:00
Fixes #38716
diff --git a/src/core/symbology/qgslinesymbollayer.cpp b/src/core/symbology/qgslinesymbollayer.cpp
@@ -2056,12 +2056,14 @@ void QgsTemplatedLineSymbolLayerBase::renderPolylineCentral( const QPolygonF &po
     }
 
     // draw the marker
-    double origAngle = symbolAngle();
+    // rotate marker (if desired)
     if ( rotateSymbols() )
-      setSymbolAngle( origAngle + thisSymbolAngle * 180 / M_PI );
+    {
+      setSymbolLineAngle( thisSymbolAngle * 180 / M_PI );
+    }
+
     renderSymbol( pt, context.feature(), context.renderContext(), -1, context.selected() );
-    if ( rotateSymbols() )
-      setSymbolAngle( origAngle );
+
   }
 }
 
diff --git a/src/core/symbology/qgsmarkersymbollayer.cpp b/src/core/symbology/qgsmarkersymbollayer.cpp
@@ -246,7 +246,9 @@ void QgsSimpleMarkerSymbolLayerBase::renderPoint( QPointF point, QgsSymbolRender
   }
 
   if ( !qgsDoubleNear( angle, 0.0 ) && ( hasDataDefinedRotation || createdNewPath ) )
+  {
     transform.rotate( angle );
+  }
 
   //need to pass: symbol, polygon, path
 
@@ -666,7 +668,7 @@ void QgsSimpleMarkerSymbolLayerBase::calculateOffsetAndRotation( QgsSymbolRender
   if ( mDataDefinedProperties.isActive( QgsSymbolLayer::PropertyAngle ) )
   {
     context.setOriginalValueVariable( angle );
-    angle = mDataDefinedProperties.valueAsDouble( QgsSymbolLayer::PropertyAngle, context.renderContext().expressionContext(), mAngle, &ok ) + mLineAngle;
+    angle = mDataDefinedProperties.valueAsDouble( QgsSymbolLayer::PropertyAngle, context.renderContext().expressionContext(), 0, &ok ) + mLineAngle;
 
     // If the expression evaluation was not successful, fallback to static value
     if ( !ok )

Original file line number	Diff line number	Diff line change
`@@ -2056,12 +2056,14 @@ void QgsTemplatedLineSymbolLayerBase::renderPolylineCentral( const QPolygonF &po`
`2056`	`2056`	`}`
`2057`	`2057`
`2058`	`2058`	`// draw the marker`
`2059`		`- double origAngle = symbolAngle();`
	`2059`	`+ // rotate marker (if desired)`
`2060`	`2060`	`if ( rotateSymbols() )`
`2061`		`- setSymbolAngle( origAngle + thisSymbolAngle * 180 / M_PI );`
	`2061`	`+ {`
	`2062`	`+ setSymbolLineAngle( thisSymbolAngle * 180 / M_PI );`
	`2063`	`+ }`
	`2064`	`+`
`2062`	`2065`	`renderSymbol( pt, context.feature(), context.renderContext(), -1, context.selected() );`
`2063`		`- if ( rotateSymbols() )`
`2064`		`- setSymbolAngle( origAngle );`
	`2066`	`+`
`2065`	`2067`	`}`
`2066`	`2068`	`}`
`2067`	`2069`
Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,9 @@ void QgsSimpleMarkerSymbolLayerBase::renderPoint( QPointF point, QgsSymbolRender`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`if ( !qgsDoubleNear( angle, 0.0 ) && ( hasDataDefinedRotation \|\| createdNewPath ) )`
	`249`	`+ {`
`249`	`250`	`transform.rotate( angle );`
	`251`	`+ }`
`250`	`252`
`251`	`253`	`//need to pass: symbol, polygon, path`
`252`	`254`
`@@ -666,7 +668,7 @@ void QgsSimpleMarkerSymbolLayerBase::calculateOffsetAndRotation( QgsSymbolRender`
`666`	`668`	`if ( mDataDefinedProperties.isActive( QgsSymbolLayer::PropertyAngle ) )`
`667`	`669`	`{`
`668`	`670`	`context.setOriginalValueVariable( angle );`
`669`		`- angle = mDataDefinedProperties.valueAsDouble( QgsSymbolLayer::PropertyAngle, context.renderContext().expressionContext(), mAngle, &ok ) + mLineAngle;`
	`671`	`+ angle = mDataDefinedProperties.valueAsDouble( QgsSymbolLayer::PropertyAngle, context.renderContext().expressionContext(), 0, &ok ) + mLineAngle;`
`670`	`672`
`671`	`673`	`// If the expression evaluation was not successful, fallback to static value`
`672`	`674`	`if ( !ok )`