Disable composer svg cash if dpi is different. Fix for bug #2085

mhugent · mhugent · commit 2e93a04d9330 · 2009-11-13T08:14:22.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@12097 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/composer/qgscomposerpicture.cpp b/src/core/composer/qgscomposerpicture.cpp
@@ -57,6 +57,11 @@ void QgsComposerPicture::paint( QPainter* painter, const QStyleOptionGraphicsIte
   drawBackground( painter );
 
   int newDpi = ( painter->device()->logicalDpiX() + painter->device()->logicalDpiY() ) / 2;
+  if ( newDpi != mCachedDpi )
+  {
+    mSvgCacheUpToDate = false;
+  }
+
   if ( mMode != Unknown )
   {
     double rectPixelWidth = rect().width() * newDpi / 25.4;
@@ -225,7 +230,7 @@ bool QgsComposerPicture::imageSizeConsideringRotation( double& width, double& he
     return false;
   }
 #if 0
-  if(!cornerPointOnRotatedAndScaledRect(x4, y4, width, height))
+  if ( !cornerPointOnRotatedAndScaledRect( x4, y4, width, height ) )
   {
     return false;
   }

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,11 @@ void QgsComposerPicture::paint( QPainter* painter, const QStyleOptionGraphicsIte`
`57`	`57`	`drawBackground( painter );`
`58`	`58`
`59`	`59`	`int newDpi = ( painter->device()->logicalDpiX() + painter->device()->logicalDpiY() ) / 2;`
	`60`	`+ if ( newDpi != mCachedDpi )`
	`61`	`+ {`
	`62`	`+ mSvgCacheUpToDate = false;`
	`63`	`+ }`
	`64`	`+`
`60`	`65`	`if ( mMode != Unknown )`
`61`	`66`	`{`
`62`	`67`	`double rectPixelWidth = rect().width() * newDpi / 25.4;`
`@@ -225,7 +230,7 @@ bool QgsComposerPicture::imageSizeConsideringRotation( double& width, double& he`
`225`	`230`	`return false;`
`226`	`231`	`}`
`227`	`232`	`#if 0`
`228`		`- if(!cornerPointOnRotatedAndScaledRect(x4, y4, width, height))`
	`233`	`+ if ( !cornerPointOnRotatedAndScaledRect( x4, y4, width, height ) )`
`229`	`234`	`{`
`230`	`235`	`return false;`
`231`	`236`	`}`