Fix scaling of rotated svg markers if printing a QGIS server WMS with QGIS desktop

mhugent · mhugent · commit 1e29b76a83c5 · 2013-07-18T18:05:49.000+02:00
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -956,7 +956,7 @@ void QgsSvgMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2Re
   {
     p->setOpacity( context.alpha() );
     const QPicture& pct = QgsSvgCache::instance()->svgAsPicture( path, size, fillColor, outlineColor, outlineWidth,
-                          context.renderContext().scaleFactor(), context.renderContext().rasterScaleFactor() );
+                          context.renderContext().scaleFactor(), context.renderContext().rasterScaleFactor(), context.renderContext().forceVectorOutput() );
 
     if ( pct.width() > 1 )
     {
diff --git a/src/core/symbology-ng/qgssvgcache.cpp b/src/core/symbology-ng/qgssvgcache.cpp
@@ -138,7 +138,7 @@ const QImage& QgsSvgCache::svgAsImage( const QString& file, double size, const Q
       // instead cache picture
       if ( !currentEntry->picture )
       {
-        cachePicture( currentEntry );
+        cachePicture( currentEntry, false );
       }
     }
     else
@@ -152,15 +152,15 @@ const QImage& QgsSvgCache::svgAsImage( const QString& file, double size, const Q
 }
 
 const QPicture& QgsSvgCache::svgAsPicture( const QString& file, double size, const QColor& fill, const QColor& outline, double outlineWidth,
-    double widthScaleFactor, double rasterScaleFactor )
+    double widthScaleFactor, double rasterScaleFactor, bool forceVectorOutput )
 {
   QgsSvgCacheEntry* currentEntry = cacheEntry( file, size, fill, outline, outlineWidth, widthScaleFactor, rasterScaleFactor );
 
   //if current entry picture is 0: cache picture for entry
   //update stats for memory usage
   if ( !currentEntry->picture )
   {
-    cachePicture( currentEntry );
+    cachePicture( currentEntry, forceVectorOutput );
     trimToMaximumSize();
   }
 
@@ -398,7 +398,7 @@ void QgsSvgCache::cacheImage( QgsSvgCacheEntry* entry )
   mTotalSize += ( image->width() * image->height() * 32 );
 }
 
-void QgsSvgCache::cachePicture( QgsSvgCacheEntry *entry )
+void QgsSvgCache::cachePicture( QgsSvgCacheEntry *entry, bool forceVectorOutput )
 {
   if ( !entry )
   {
@@ -418,7 +418,7 @@ void QgsSvgCache::cachePicture( QgsSvgCacheEntry *entry )
     hwRatio = r.viewBoxF().height() / r.viewBoxF().width();
   }
   bool drawOnScreen = qgsDoubleNear( entry->rasterScaleFactor, 1.0, 0.1 );
-  if ( drawOnScreen )
+  if ( drawOnScreen && forceVectorOutput ) //forceVectorOutput always true in case of composer draw / composer preview
   {
     // fix to ensure rotated symbols scale with composer page (i.e. not map item) zoom
     double wSize = entry->size;
diff --git a/src/core/symbology-ng/qgssvgcache.h b/src/core/symbology-ng/qgssvgcache.h
@@ -72,7 +72,7 @@ class CORE_EXPORT QgsSvgCache : public QObject
     const QImage& svgAsImage( const QString& file, double size, const QColor& fill, const QColor& outline, double outlineWidth,
                               double widthScaleFactor, double rasterScaleFactor, bool& fitsInCache );
     const QPicture& svgAsPicture( const QString& file, double size, const QColor& fill, const QColor& outline, double outlineWidth,
-                                  double widthScaleFactor, double rasterScaleFactor );
+                                  double widthScaleFactor, double rasterScaleFactor, bool forceVectorOutput = false );
 
     /**Tests if an svg file contains parameters for fill, outline color, outline width. If yes, possible default values are returned. If there are several
       default values in the svg file, only the first one is considered*/
@@ -96,7 +96,7 @@ class CORE_EXPORT QgsSvgCache : public QObject
 
     void replaceParamsAndCacheSvg( QgsSvgCacheEntry* entry );
     void cacheImage( QgsSvgCacheEntry* entry );
-    void cachePicture( QgsSvgCacheEntry* entry );
+    void cachePicture( QgsSvgCacheEntry* entry, bool forceVectorOutput = false );
     /**Returns entry from cache or creates a new entry if it does not exist already*/
     QgsSvgCacheEntry* cacheEntry( const QString& file, double size, const QColor& fill, const QColor& outline, double outlineWidth,
                                   double widthScaleFactor, double rasterScaleFactor );

Original file line number	Diff line number	Diff line change
`@@ -956,7 +956,7 @@ void QgsSvgMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2Re`
`956`	`956`	`{`
`957`	`957`	`p->setOpacity( context.alpha() );`
`958`	`958`	`const QPicture& pct = QgsSvgCache::instance()->svgAsPicture( path, size, fillColor, outlineColor, outlineWidth,`
`959`		`- context.renderContext().scaleFactor(), context.renderContext().rasterScaleFactor() );`
	`959`	`+ context.renderContext().scaleFactor(), context.renderContext().rasterScaleFactor(), context.renderContext().forceVectorOutput() );`
`960`	`960`
`961`	`961`	`if ( pct.width() > 1 )`
`962`	`962`	`{`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ const QImage& QgsSvgCache::svgAsImage( const QString& file, double size, const Q`
`138`	`138`	`// instead cache picture`
`139`	`139`	`if ( !currentEntry->picture )`
`140`	`140`	`{`
`141`		`- cachePicture( currentEntry );`
	`141`	`+ cachePicture( currentEntry, false );`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`	`else`
`@@ -152,15 +152,15 @@ const QImage& QgsSvgCache::svgAsImage( const QString& file, double size, const Q`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`const QPicture& QgsSvgCache::svgAsPicture( const QString& file, double size, const QColor& fill, const QColor& outline, double outlineWidth,`
`155`		`- double widthScaleFactor, double rasterScaleFactor )`
	`155`	`+ double widthScaleFactor, double rasterScaleFactor, bool forceVectorOutput )`
`156`	`156`	`{`
`157`	`157`	`QgsSvgCacheEntry* currentEntry = cacheEntry( file, size, fill, outline, outlineWidth, widthScaleFactor, rasterScaleFactor );`
`158`	`158`
`159`	`159`	`//if current entry picture is 0: cache picture for entry`
`160`	`160`	`//update stats for memory usage`
`161`	`161`	`if ( !currentEntry->picture )`
`162`	`162`	`{`
`163`		`- cachePicture( currentEntry );`
	`163`	`+ cachePicture( currentEntry, forceVectorOutput );`
`164`	`164`	`trimToMaximumSize();`
`165`	`165`	`}`
`166`	`166`
`@@ -398,7 +398,7 @@ void QgsSvgCache::cacheImage( QgsSvgCacheEntry* entry )`
`398`	`398`	`mTotalSize += ( image->width() * image->height() * 32 );`
`399`	`399`	`}`
`400`	`400`
`401`		`-void QgsSvgCache::cachePicture( QgsSvgCacheEntry *entry )`
	`401`	`+void QgsSvgCache::cachePicture( QgsSvgCacheEntry *entry, bool forceVectorOutput )`
`402`	`402`	`{`
`403`	`403`	`if ( !entry )`
`404`	`404`	`{`
`@@ -418,7 +418,7 @@ void QgsSvgCache::cachePicture( QgsSvgCacheEntry *entry )`
`418`	`418`	`hwRatio = r.viewBoxF().height() / r.viewBoxF().width();`
`419`	`419`	`}`
`420`	`420`	`bool drawOnScreen = qgsDoubleNear( entry->rasterScaleFactor, 1.0, 0.1 );`
`421`		`- if ( drawOnScreen )`
	`421`	`+ if ( drawOnScreen && forceVectorOutput ) //forceVectorOutput always true in case of composer draw / composer preview`
`422`	`422`	`{`
`423`	`423`	`// fix to ensure rotated symbols scale with composer page (i.e. not map item) zoom`
`424`	`424`	`double wSize = entry->size;`