Add tests for fixedAspectRatio in SVG marker

qgis · Sep 28, 2017 · 48514d2 · 48514d2
1 parent 60cf7bd
commit 48514d2
Show file tree

Hide file tree

Showing 12 changed files with 98 additions and 1 deletion.
diff --git a/tests/code_layout/acceptable_missing_doc.py b/tests/code_layout/acceptable_missing_doc.py
@@ -180,7 +180,7 @@
     "QgsRangeConfigDlg": ["QgsRangeConfigDlg(QgsVectorLayer *vl, int fieldIdx, QWidget *parent)", "rangeWidgetChanged(int index)"],
     "QgsMapMouseEvent": ["SnappingMode"],
     "QgsScaleExpression": ["Type", "operator bool() const "],
-    "QgsSvgMarkerSymbolLayer": ["strokeWidthMapUnitScale() const ", "path() const ", "setStrokeWidthMapUnitScale(const QgsMapUnitScale &scale)", "setStrokeWidth(double w)", "strokeWidthUnit() const ", "QgsSvgMarkerSymbolLayer(const QString &name=DEFAULT_SVGMARKER_NAME, double size=DEFAULT_SVGMARKER_SIZE, double angle=DEFAULT_SVGMARKER_ANGLE, QgsSymbol::ScaleMethod scaleMethod=DEFAULT_SCALE_METHOD)", "create(const QgsStringMap &properties=QgsStringMap())", "setStrokeWidthUnit(QgsSymbol::OutputUnit unit)", "setPath(const QString &path)", "createFromSld(QDomElement &element)", "strokeWidth() const ", "fixedAspectRatio() const ", "setFixedAspectRatio(double far)", "updateDefaultAspectRatio()", "defaultAspectRatio() const "],
+    "QgsSvgMarkerSymbolLayer": ["strokeWidthMapUnitScale() const ", "setStrokeWidthMapUnitScale(const QgsMapUnitScale &scale)", "setStrokeWidth(double w)", "strokeWidthUnit() const ", "QgsSvgMarkerSymbolLayer(const QString &name=DEFAULT_SVGMARKER_NAME, double size=DEFAULT_SVGMARKER_SIZE, double angle=DEFAULT_SVGMARKER_ANGLE, QgsSymbol::ScaleMethod scaleMethod=DEFAULT_SCALE_METHOD)", "create(const QgsStringMap &properties=QgsStringMap())", "setStrokeWidthUnit(QgsSymbol::OutputUnit unit)", "createFromSld(QDomElement &element)", "strokeWidth() const "],
     "QgsDateTimeEditWrapper": ["QgsDateTimeEditWrapper(QgsVectorLayer *vl, int fieldIdx, QWidget *editor, QWidget *parent=nullptr)"],
     "QgsMultiBandColorRendererWidget": ["QgsMultiBandColorRendererWidget(QgsRasterLayer *layer, const QgsRectangle &extent=QgsRectangle())", "create(QgsRasterLayer *layer, const QgsRectangle &extent)", "setFromRenderer(const QgsRasterRenderer *r)", "loadMinMax(int bandNo, double min, double max, int origin)"],
     "QgsAnimatedIcon": ["setIconPath(const QString &iconPath)", "iconPath() const ", "icon() const ", "onFrameChanged()"],

diff --git a/tests/src/core/testqgssvgmarker.cpp b/tests/src/core/testqgssvgmarker.cpp
@@ -55,6 +55,12 @@ class TestQgsSvgMarkerSymbol : public QObject
 
     void svgMarkerSymbol();
     void bounds();
+    void boundsWidth();
+    void bench();
+    void aspectRatio();
+    void dynamicSizeWithAspectRatio();
+    void dynamicWidthWithAspectRatio();
+    void dynamicAspectRatio();
 
   private:
     bool mTestHasError =  false ;
@@ -151,6 +157,97 @@ void TestQgsSvgMarkerSymbol::bounds()
   mMapSettings.setFlag( QgsMapSettings::DrawSymbolBounds, true );
   bool result = imageCheck( QStringLiteral( "svgmarker_bounds" ) );
   mMapSettings.setFlag( QgsMapSettings::DrawSymbolBounds, false );
+  mSvgMarkerLayer->setDataDefinedProperty( QgsSymbolLayer::PropertySize, QgsProperty() );
+  QVERIFY( result );
+}
+
+void TestQgsSvgMarkerSymbol::boundsWidth()
+{
+  //use a tall, narrow symbol (non-square to test calculation of height)
+  mSvgMarkerLayer->setPath( mTestDataDir + "test_symbol_svg.svg" );
+  mSvgMarkerLayer->setStrokeColor( Qt::black );
+  mSvgMarkerLayer->setColor( Qt::blue );
+  mSvgMarkerLayer->setStrokeWidth( 0.5 );
+  mSvgMarkerLayer->setDataDefinedProperty( QgsSymbolLayer::PropertyWidth, QgsProperty::fromExpression( QStringLiteral( "min(\"importance\" * 2, 6)" ) ) );
+
+  mMapSettings.setFlag( QgsMapSettings::DrawSymbolBounds, true );
+  bool result = imageCheck( QStringLiteral( "svgmarker_bounds" ) );
+  mMapSettings.setFlag( QgsMapSettings::DrawSymbolBounds, false );
+  mSvgMarkerLayer->setDataDefinedProperty( QgsSymbolLayer::PropertyWidth, QgsProperty() );
+  QVERIFY( result );
+}
+
+void TestQgsSvgMarkerSymbol::bench()
+{
+  QString svgPath = QgsSymbolLayerUtils::svgSymbolNameToPath( QStringLiteral( "/amenity/amenity_bench.svg" ), QgsPathResolver() );
+
+  mSvgMarkerLayer->setPath( svgPath );
+  mSvgMarkerLayer->setStrokeColor( Qt::black );
+  mSvgMarkerLayer->setColor( Qt::black );
+  mSvgMarkerLayer->setSize( 20 );
+  mSvgMarkerLayer->setStrokeWidth( 0.0 );
+  QVERIFY( imageCheck( "svgmarker_bench" ) );
+}
+
+void TestQgsSvgMarkerSymbol::aspectRatio()
+{
+  QString svgPath = QgsSymbolLayerUtils::svgSymbolNameToPath( QStringLiteral( "/amenity/amenity_bench.svg" ), QgsPathResolver() );
+
+  mSvgMarkerLayer->setPath( svgPath );
+  mSvgMarkerLayer->setStrokeColor( Qt::black );
+  mSvgMarkerLayer->setColor( Qt::black );
+  mSvgMarkerLayer->setSize( 20 );
+  mSvgMarkerLayer->setFixedAspectRatio( 0.5 );
+  mSvgMarkerLayer->setStrokeWidth( 0.0 );
+  QVERIFY( imageCheck( "svgmarker_aspectratio" ) );
+}
+
+void TestQgsSvgMarkerSymbol::dynamicSizeWithAspectRatio()
+{
+  QString svgPath = QgsSymbolLayerUtils::svgSymbolNameToPath( QStringLiteral( "/amenity/amenity_bench.svg" ), QgsPathResolver() );
+
+  mSvgMarkerLayer->setPath( svgPath );
+  mSvgMarkerLayer->setStrokeColor( Qt::black );
+  mSvgMarkerLayer->setColor( Qt::black );
+  mSvgMarkerLayer->setDataDefinedProperty( QgsSymbolLayer::PropertySize, QgsProperty::fromExpression( QStringLiteral( "max(\"importance\" * 5, 10)" ) ) );
+  mSvgMarkerLayer->setFixedAspectRatio( 0.5 );
+  mSvgMarkerLayer->setStrokeWidth( 0.0 );
+
+  bool result = imageCheck( QStringLiteral( "svgmarker_dynamicsize_aspectratio" ) );
+  mSvgMarkerLayer->setDataDefinedProperty( QgsSymbolLayer::PropertySize, QgsProperty() );
+  QVERIFY( result );
+}
+
+void TestQgsSvgMarkerSymbol::dynamicWidthWithAspectRatio()
+{
+  QString svgPath = QgsSymbolLayerUtils::svgSymbolNameToPath( QStringLiteral( "/amenity/amenity_bench.svg" ), QgsPathResolver() );
+
+  mSvgMarkerLayer->setPath( svgPath );
+  mSvgMarkerLayer->setStrokeColor( Qt::black );
+  mSvgMarkerLayer->setColor( Qt::black );
+  mSvgMarkerLayer->setDataDefinedProperty( QgsSymbolLayer::PropertyWidth, QgsProperty::fromExpression( QStringLiteral( "max(\"importance\" * 5, 10)" ) ) );
+  mSvgMarkerLayer->setFixedAspectRatio( 0.5 );
+  mSvgMarkerLayer->setStrokeWidth( 0.0 );
+
+  bool result = imageCheck( QStringLiteral( "svgmarker_dynamicwidth_aspectratio" ) );
+  mSvgMarkerLayer->setDataDefinedProperty( QgsSymbolLayer::PropertyWidth, QgsProperty() );
+  QVERIFY( result );
+}
+
+void TestQgsSvgMarkerSymbol::dynamicAspectRatio()
+{
+  QString svgPath = QgsSymbolLayerUtils::svgSymbolNameToPath( QStringLiteral( "/amenity/amenity_bench.svg" ), QgsPathResolver() );
+
+  mSvgMarkerLayer->setPath( svgPath );
+  mSvgMarkerLayer->setStrokeColor( Qt::black );
+  mSvgMarkerLayer->setColor( Qt::black );
+  mSvgMarkerLayer->setSize( 20 );
+  mSvgMarkerLayer->setDataDefinedProperty( QgsSymbolLayer::PropertyHeight, QgsProperty::fromExpression( QStringLiteral( "max(\"importance\" * 5, 10)" ) ) );
+  mSvgMarkerLayer->setFixedAspectRatio( 0.5 );
+  mSvgMarkerLayer->setStrokeWidth( 0.0 );
+
+  bool result = imageCheck( QStringLiteral( "svgmarker_dynamic_aspectratio" ) );
+  mSvgMarkerLayer->setDataDefinedProperty( QgsSymbolLayer::PropertyHeight, QgsProperty() );
   QVERIFY( result );
 }
 

diff --git a/...bol_svgmarker/expected_svgmarker_aspectratio/expected_svgmarker_aspectratio.png b/...bol_svgmarker/expected_svgmarker_aspectratio/expected_svgmarker_aspectratio.png
diff --git a/...vgmarker/expected_svgmarker_aspectratio/expected_svgmarker_aspectratio_mask.png b/...vgmarker/expected_svgmarker_aspectratio/expected_svgmarker_aspectratio_mask.png
diff --git a/...l_images/symbol_svgmarker/expected_svgmarker_bench/expected_svgmarker_bench.png b/...l_images/symbol_svgmarker/expected_svgmarker_bench/expected_svgmarker_bench.png
diff --git a/...ges/symbol_svgmarker/expected_svgmarker_bench/expected_svgmarker_bench_mask.png b/...ges/symbol_svgmarker/expected_svgmarker_bench/expected_svgmarker_bench_mask.png
diff --git a/...pected_svgmarker_dynamic_aspectratio/expected_svgmarker_dynamic_aspectratio.png b/...pected_svgmarker_dynamic_aspectratio/expected_svgmarker_dynamic_aspectratio.png
diff --git a/...d_svgmarker_dynamic_aspectratio/expected_svgmarker_dynamic_aspectratio_mask.png b/...d_svgmarker_dynamic_aspectratio/expected_svgmarker_dynamic_aspectratio_mask.png
diff --git a/...vgmarker_dynamicsize_aspectratio/expected_svgmarker_dynamicsize_aspectratio.png b/...vgmarker_dynamicsize_aspectratio/expected_svgmarker_dynamicsize_aspectratio.png
diff --git a/...ker_dynamicsize_aspectratio/expected_svgmarker_dynamicsize_aspectratio_mask.png b/...ker_dynamicsize_aspectratio/expected_svgmarker_dynamicsize_aspectratio_mask.png
diff --git a/...marker_dynamicwidth_aspectratio/expected_svgmarker_dynamicwidth_aspectratio.png b/...marker_dynamicwidth_aspectratio/expected_svgmarker_dynamicwidth_aspectratio.png
diff --git a/...r_dynamicwidth_aspectratio/expected_svgmarker_dynamicwidth_aspectratio_mask.png b/...r_dynamicwidth_aspectratio/expected_svgmarker_dynamicwidth_aspectratio_mask.png