Merge pull request #35587 from qgis-bot/backport-35575-to-release-3_10

[Backport release-3_10] Fix simple and ellipse marker bound calculation ignores stroke width
qgis · Apr 5, 2020 · 96c5b0e · 96c5b0e
2 parents 9b3830d + 7f6e38e
commit 96c5b0e
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 4 deletions.
diff --git a/src/core/symbology/qgsellipsesymbollayer.cpp b/src/core/symbology/qgsellipsesymbollayer.cpp
@@ -674,7 +674,7 @@ QRectF QgsEllipseSymbolLayer::bounds( QPointF point, QgsSymbolRenderContext &con
   if ( !qgsDoubleNear( angle, 0.0 ) )
     transform.rotate( angle );
 
-  double penWidth = 0.0;
+  double penWidth = mStrokeWidth;
   if ( mDataDefinedProperties.isActive( QgsSymbolLayer::PropertyStrokeWidth ) )
   {
     context.setOriginalValueVariable( mStrokeWidth );
@@ -686,10 +686,12 @@ QRectF QgsEllipseSymbolLayer::bounds( QPointF point, QgsSymbolRenderContext &con
       double strokeWidth = exprVal.toDouble( &ok );
       if ( ok )
       {
-        penWidth = context.renderContext().convertToPainterUnits( strokeWidth, mStrokeWidthUnit, mStrokeWidthMapUnitScale );
+        penWidth = strokeWidth;
       }
     }
   }
+  penWidth = context.renderContext().convertToPainterUnits( penWidth, mStrokeWidthUnit, mStrokeWidthMapUnitScale );
+
   if ( mDataDefinedProperties.isActive( QgsSymbolLayer::PropertyStrokeStyle ) )
   {
     context.setOriginalValueVariable( QgsSymbolLayerUtils::encodePenStyle( mStrokeStyle ) );
@@ -699,6 +701,8 @@ QRectF QgsEllipseSymbolLayer::bounds( QPointF point, QgsSymbolRenderContext &con
       penWidth = 0.0;
     }
   }
+  else if ( mStrokeStyle == Qt::NoPen )
+    penWidth = 0;
 
   //antialiasing, add 1 pixel
   penWidth += 1;

diff --git a/src/core/symbology/qgsmarkersymbollayer.cpp b/src/core/symbology/qgsmarkersymbollayer.cpp
@@ -1458,17 +1458,18 @@ QRectF QgsSimpleMarkerSymbolLayer::bounds( QPointF point, QgsSymbolRenderContext
   QRectF symbolBounds = QgsSimpleMarkerSymbolLayerBase::bounds( point, context );
 
   // need to account for stroke width
-  double penWidth = 0.0;
+  double penWidth = mStrokeWidth;
   bool ok = true;
   if ( mDataDefinedProperties.isActive( QgsSymbolLayer::PropertyStrokeWidth ) )
   {
     context.setOriginalValueVariable( mStrokeWidth );
     double strokeWidth = mDataDefinedProperties.valueAsDouble( QgsSymbolLayer::PropertyStrokeWidth, context.renderContext().expressionContext(), mStrokeWidth, &ok );
     if ( ok )
     {
-      penWidth = context.renderContext().convertToPainterUnits( strokeWidth, mStrokeWidthUnit, mStrokeWidthMapUnitScale );
+      penWidth = strokeWidth;
     }
   }
+  penWidth = context.renderContext().convertToPainterUnits( penWidth, mStrokeWidthUnit, mStrokeWidthMapUnitScale );
   if ( mDataDefinedProperties.isActive( QgsSymbolLayer::PropertyStrokeStyle ) )
   {
     context.setOriginalValueVariable( QgsSymbolLayerUtils::encodePenStyle( mStrokeStyle ) );
@@ -1478,6 +1479,9 @@ QRectF QgsSimpleMarkerSymbolLayer::bounds( QPointF point, QgsSymbolRenderContext
       penWidth = 0.0;
     }
   }
+  else if ( mStrokeStyle == Qt::NoPen )
+    penWidth = 0;
+
   //antialiasing, add 1 pixel
   penWidth += 1;
 

diff --git a/...l_ellipsemarker/expected_ellipsemarker_bounds/expected_ellipsemarker_bounds.png b/...l_ellipsemarker/expected_ellipsemarker_bounds/expected_ellipsemarker_bounds.png
diff --git a/...ipsemarker/expected_ellipsemarker_bounds/expected_ellipsemarker_bounds_mask.png b/...ipsemarker/expected_ellipsemarker_bounds/expected_ellipsemarker_bounds_mask.png
diff --git a/...mbol_simplemarker/expected_simplemarker_bounds/expected_simplemarker_bounds.png b/...mbol_simplemarker/expected_simplemarker_bounds/expected_simplemarker_bounds.png
diff --git a/...simplemarker/expected_simplemarker_bounds/expected_simplemarker_bounds_mask.png b/...simplemarker/expected_simplemarker_bounds/expected_simplemarker_bounds_mask.png
diff --git a/...arker/expected_simplemarker_boundsoffset/expected_simplemarker_boundsoffset.png b/...arker/expected_simplemarker_boundsoffset/expected_simplemarker_boundsoffset.png
diff --git a/.../expected_simplemarker_boundsoffset/expected_simplemarker_boundsoffset_mask.png b/.../expected_simplemarker_boundsoffset/expected_simplemarker_boundsoffset_mask.png
diff --git a/...r/expected_simplemarker_boundsrotation/expected_simplemarker_boundsrotation.png b/...r/expected_simplemarker_boundsrotation/expected_simplemarker_boundsrotation.png
diff --git a/...ected_simplemarker_boundsrotation/expected_simplemarker_boundsrotation_mask.png b/...ected_simplemarker_boundsrotation/expected_simplemarker_boundsrotation_mask.png
diff --git a/...implemarker_boundsrotationoffset/expected_simplemarker_boundsrotationoffset.png b/...implemarker_boundsrotationoffset/expected_simplemarker_boundsrotationoffset.png
diff --git a/...marker_boundsrotationoffset/expected_simplemarker_boundsrotationoffset_mask.png b/...marker_boundsrotationoffset/expected_simplemarker_boundsrotationoffset_mask.png