Add a test covering data defined angle for polygon outline marker lin…

…e, update one control image (cherry picked from commit 925b827)
qgis · May 15, 2021 · 852d064 · 852d064
1 parent 8d5c17d
commit 852d064
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 1 deletion.
diff --git a/tests/src/python/test_qgsmarkerlinesymbollayer.py b/tests/src/python/test_qgsmarkerlinesymbollayer.py
@@ -476,7 +476,7 @@ def testCenterSegment(self):
         rendered_image = self.renderGeometry(s, g)
         assert self.imageCheck('markerline_segmentcenter', 'markerline_segmentcenter', rendered_image)
 
-    def testMarkerAngleDD(self):
+    def testMarkerDataDefinedAngleLine(self):
         """Test issue https://github.com/qgis/QGIS/issues/38716"""
 
         s = QgsLineSymbol()
@@ -528,6 +528,48 @@ def testMarkerAngleDD(self):
         rendered_image = self.renderGeometry(s, g)
         assert self.imageCheck('markerline_center_angle_dd', 'markerline_center_angle_dd', rendered_image)
 
+    def testDataDefinedAnglePolygon(self):
+        # test rendering curve polygon with markers at vertices and curve points
+        s = QgsFillSymbol()
+
+        marker_line = QgsMarkerLineSymbolLayer(True)
+        marker_line.setPlacement(QgsMarkerLineSymbolLayer.SegmentCenter)
+        marker = QgsSimpleMarkerSymbolLayer(QgsSimpleMarkerSymbolLayer.Triangle, 4)
+        marker.setColor(QColor(255, 0, 0))
+        marker.setStrokeStyle(Qt.NoPen)
+        marker.setAngle(90)
+        marker_symbol = QgsMarkerSymbol()
+        marker_symbol.changeSymbolLayer(0, marker)
+        marker_line.setSubSymbol(marker_symbol)
+
+        s.appendSymbolLayer(marker_line.clone())
+
+        g = QgsGeometry.fromWkt('Polygon (LineString (0 5, 5 0, 10 5, 5 10, 0 5))')
+        self.assertFalse(g.isNull())
+
+        # rendering test with non data-defined angle
+        rendered_image = self.renderGeometry(s, g)
+        self.assertTrue(self.imageCheck('markerline_datadefinedanglepolygon', 'markerline_datadefinedanglepolygon', rendered_image))
+
+        s = QgsFillSymbol()
+
+        marker_line = QgsMarkerLineSymbolLayer(True)
+        marker_line.setPlacement(QgsMarkerLineSymbolLayer.SegmentCenter)
+        marker = QgsSimpleMarkerSymbolLayer(QgsSimpleMarkerSymbolLayer.Triangle, 4)
+        marker.setColor(QColor(255, 0, 0))
+        marker.setStrokeStyle(Qt.NoPen)
+        marker.setAngle(38)
+        marker_symbol = QgsMarkerSymbol()
+        marker_symbol.changeSymbolLayer(0, marker)
+        marker_symbol.setDataDefinedAngle(QgsProperty.fromExpression('90'))
+        marker_line.setSubSymbol(marker_symbol)
+
+        s.appendSymbolLayer(marker_line.clone())
+
+        # rendering test with data-defined angle
+        rendered_image = self.renderGeometry(s, g)
+        self.assertTrue(self.imageCheck('markerline_datadefinedanglepolygon', 'markerline_datadefinedanglepolygon', rendered_image))
+
     def testOpacityWithDataDefinedColor(self):
         line_shp = os.path.join(TEST_DATA_DIR, 'lines.shp')
         line_layer = QgsVectorLayer(line_shp, 'Lines', 'ogr')

diff --git a/...kerline_datadefinedanglepolygon/expected_markerline_datadefinedanglepolygon.png b/...kerline_datadefinedanglepolygon/expected_markerline_datadefinedanglepolygon.png
diff --git a/...ol_markerline/expected_markerline_multicurve/expected_markerline_multicurve.png b/...ol_markerline/expected_markerline_multicurve/expected_markerline_multicurve.png