Fix flexible aspect ratio is ignored when rendering marker svg symbols

qgis · Jul 21, 2020 · 9484aff · 9484aff
1 parent a79f0e5
commit 9484aff
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/src/core/symbology/qgssvgcache.cpp b/src/core/symbology/qgssvgcache.cpp
@@ -407,6 +407,8 @@ void QgsSvgCache::cacheImage( QgsSvgCacheEntry *entry )
   std::unique_ptr< QImage > image = qgis::make_unique< QImage >( imageSize, QImage::Format_ARGB32_Premultiplied );
   image->fill( 0 ); // transparent background
 
+  const bool isFixedAR = entry->fixedAspectRatio > 0;
+
   QPainter p( image.get() );
   QSvgRenderer r( entry->svgContent );
   if ( qgsDoubleNear( viewBoxSize.width(), viewBoxSize.height() ) )
@@ -416,7 +418,7 @@ void QgsSvgCache::cacheImage( QgsSvgCacheEntry *entry )
   else
   {
     QSizeF s( viewBoxSize );
-    s.scale( scaledSize.width(), scaledSize.height(), Qt::KeepAspectRatio );
+    s.scale( scaledSize.width(), scaledSize.height(), isFixedAR ? Qt::IgnoreAspectRatio : Qt::KeepAspectRatio );
     QRectF rect( ( imageSize.width() - s.width() ) / 2, ( imageSize.height() - s.height() ) / 2, s.width(), s.height() );
     r.render( &p, rect );
   }

diff --git a/tests/src/core/testqgssvgcache.cpp b/tests/src/core/testqgssvgcache.cpp
@@ -54,6 +54,7 @@ class TestQgsSvgCache : public QObject
     void changeImage(); //check that cache is updated if svg source file changes
     void base64();
     void replaceParams();
+    void aspectRatio();
 
 };
 
@@ -332,6 +333,18 @@ void TestQgsSvgCache::replaceParams()
 
 }
 
+void TestQgsSvgCache::aspectRatio()
+{
+  // test rendering SVGs with manual aspect ratio
+  QgsSvgCache cache;
+  bool inCache = false;
+
+  const QString originalImage = TEST_DATA_DIR + QStringLiteral( "/test_symbol_svg.svg" );
+  QImage img = cache.svgAsImage( originalImage, 200, QColor( 0, 0, 0 ), QColor( 0, 0, 0 ), 1.0,
+                                 1.0, inCache, 0.5 );
+  QVERIFY( imageCheck( QStringLiteral( "svgcache_aspect_ratio" ), img, 30 ) );
+}
+
 bool TestQgsSvgCache::imageCheck( const QString &testName, QImage &image, int mismatchCount )
 {
   //draw background

diff --git a/...ontrol_images/expected_svgcache_aspect_ratio/expected_svgcache_aspect_ratio.png b/...ontrol_images/expected_svgcache_aspect_ratio/expected_svgcache_aspect_ratio.png
diff --git a/...l_images/expected_svgcache_aspect_ratio/expected_svgcache_aspect_ratio_mask.png b/...l_images/expected_svgcache_aspect_ratio/expected_svgcache_aspect_ratio_mask.png