Test updates

qgis · Jul 11, 2020 · c7ef8c8 · c7ef8c8
1 parent 28c8eef
commit c7ef8c8
Show file tree

Hide file tree

Showing 20 changed files with 27 additions and 2 deletions.
diff --git a/python/core/auto_generated/symbology/qgsfillsymbollayer.sip.in b/python/core/auto_generated/symbology/qgsfillsymbollayer.sip.in
@@ -759,6 +759,13 @@ Returns the stroke width map unit scale.
     virtual void applyDataDefinedSettings( QgsSymbolRenderContext &context );
 %Docstring
 Custom stroke
+%End
+
+    virtual bool applyBrushTransformFromContext() const;
+%Docstring
+Returns ``True`` if the image brush should be transformed using the render context's texture origin.
+
+.. versionadded:: 3.16
 %End
 
   private:
@@ -1041,6 +1048,7 @@ Returns the map unit scale for the image's width.
 
     virtual void applyDataDefinedSettings( QgsSymbolRenderContext &context );
 
+    virtual bool applyBrushTransformFromContext() const;
 
 };
 

diff --git a/src/core/symbology/qgsfillsymbollayer.cpp b/src/core/symbology/qgsfillsymbollayer.cpp
@@ -1597,7 +1597,7 @@ void QgsImageFillSymbolLayer::renderPolygon( const QPolygonF &points, const QVec
   p->setPen( QPen( Qt::NoPen ) );
 
   QTransform bkTransform = mBrush.transform();
-  if ( !context.renderContext().textureOrigin().isNull() )
+  if ( applyBrushTransformFromContext() && !context.renderContext().textureOrigin().isNull() )
   {
     QPointF leftCorner = context.renderContext().textureOrigin();
     QTransform t = mBrush.transform();
@@ -1751,6 +1751,11 @@ bool QgsImageFillSymbolLayer::hasDataDefinedProperties() const
   return false;
 }
 
+bool QgsImageFillSymbolLayer::applyBrushTransformFromContext() const
+{
+  return true;
+}
+
 
 //QgsSVGFillSymbolLayer
 
@@ -4171,6 +4176,11 @@ void QgsRasterFillSymbolLayer::applyDataDefinedSettings( QgsSymbolRenderContext
   applyPattern( mBrush, file, width, opacity, context );
 }
 
+bool QgsRasterFillSymbolLayer::applyBrushTransformFromContext() const
+{
+  return false;
+}
+
 void QgsRasterFillSymbolLayer::applyPattern( QBrush &brush, const QString &imageFilePath, const double width, const double alpha, const QgsSymbolRenderContext &context )
 {
   QSize size;

diff --git a/src/core/symbology/qgsfillsymbollayer.h b/src/core/symbology/qgsfillsymbollayer.h
@@ -710,6 +710,13 @@ class CORE_EXPORT QgsImageFillSymbolLayer: public QgsFillSymbolLayer
 
     virtual void applyDataDefinedSettings( QgsSymbolRenderContext &context ) { Q_UNUSED( context ) }
 
+    /**
+     * Returns TRUE if the image brush should be transformed using the render context's texture origin.
+     *
+     * \since QGIS 3.16
+     */
+    virtual bool applyBrushTransformFromContext() const;
+
   private:
 #ifdef SIP_RUN
     QgsImageFillSymbolLayer( const QgsImageFillSymbolLayer &other );
@@ -922,7 +929,7 @@ class CORE_EXPORT QgsRasterFillSymbolLayer: public QgsImageFillSymbolLayer
   protected:
 
     void applyDataDefinedSettings( QgsSymbolRenderContext &context ) override;
-
+    bool applyBrushTransformFromContext() const override;
   private:
 
     //! Path to the image file

diff --git a/...ages/adjacent_tiles/expected_adjacent_line_fill/expected_adjacent_line_fill.png b/...ages/adjacent_tiles/expected_adjacent_line_fill/expected_adjacent_line_fill.png
diff --git a/...adjacent_tiles/expected_adjacent_line_fill/expected_adjacent_line_fill_mask.png b/...adjacent_tiles/expected_adjacent_line_fill/expected_adjacent_line_fill_mask.png
diff --git a/.../adjacent_tiles/expected_adjacent_marker_fill/expected_adjacent_marker_fill.png b/.../adjacent_tiles/expected_adjacent_marker_fill/expected_adjacent_marker_fill.png
diff --git a/...cent_tiles/expected_adjacent_marker_fill/expected_adjacent_marker_fill_mask.png b/...cent_tiles/expected_adjacent_marker_fill/expected_adjacent_marker_fill_mask.png
diff --git a/...mbol_linefill/expected_datadefined_subsymbol/expected_datadefined_subsymbol.png b/...mbol_linefill/expected_datadefined_subsymbol/expected_datadefined_subsymbol.png
diff --git a/...linefill/expected_datadefined_subsymbol/expected_datadefined_subsymbol_mask.png b/...linefill/expected_datadefined_subsymbol/expected_datadefined_subsymbol_mask.png
diff --git a/...ol_images/symbol_linefill/expected_symbol_linefill/expected_symbol_linefill.png b/...ol_images/symbol_linefill/expected_symbol_linefill/expected_symbol_linefill.png
diff --git a/...ages/symbol_linefill/expected_symbol_linefill/expected_symbol_linefill_mask.png b/...ages/symbol_linefill/expected_symbol_linefill/expected_symbol_linefill_mask.png
diff --git a/...ed_symbol_linefill_large_negoffset/expected_symbol_linefill_large_negoffset.png b/...ed_symbol_linefill_large_negoffset/expected_symbol_linefill_large_negoffset.png
diff --git a/...ed_symbol_linefill_large_posoffset/expected_symbol_linefill_large_posoffset.png b/...ed_symbol_linefill_large_posoffset/expected_symbol_linefill_large_posoffset.png
diff --git a/...inefill/expected_symbol_linefill_negangle/expected_symbol_linefill_negangle.png b/...inefill/expected_symbol_linefill_negangle/expected_symbol_linefill_negangle.png
diff --git a/...efill/expected_symbol_linefill_negoffset/expected_symbol_linefill_negoffset.png b/...efill/expected_symbol_linefill_negoffset/expected_symbol_linefill_negoffset.png
diff --git a/...efill/expected_symbol_linefill_posoffset/expected_symbol_linefill_posoffset.png b/...efill/expected_symbol_linefill_posoffset/expected_symbol_linefill_posoffset.png
diff --git a/...symbol_pointpatternfill/expected_symbol_pointfill/expected_symbol_pointfill.png b/...symbol_pointpatternfill/expected_symbol_pointfill/expected_symbol_pointfill.png
diff --git a/...l_pointpatternfill/expected_symbol_pointfill/expected_symbol_pointfill_mask.png b/...l_pointpatternfill/expected_symbol_pointfill/expected_symbol_pointfill_mask.png
diff --git a/...tternfill/expected_symbol_pointfill_offset/expected_symbol_pointfill_offset.png b/...tternfill/expected_symbol_pointfill_offset/expected_symbol_pointfill_offset.png
diff --git a/...fill/expected_symbol_pointfill_offset/expected_symbol_pointfill_offset_mask.png b/...fill/expected_symbol_pointfill_offset/expected_symbol_pointfill_offset_mask.png