fix bug with background color of composer picture

mhugent · mhugent · commit f67ac34fbd5d · 2008-11-15T14:13:19.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9640 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/composer/qgscomposerpicture.cpp b/src/core/composer/qgscomposerpicture.cpp
@@ -101,6 +101,9 @@ void QgsComposerPicture::setPictureFile( const QString& path )
     mMode = Unknown;
   }
 
+  //mImage = QImage(mImage.width(), mImage.height(), QImage::Format_ARGB32 );
+  //setSceneRect
+
   QFileInfo sourceFileInfo( mSourceFile );
   QString sourceFileSuffix = sourceFileInfo.suffix();
   if ( sourceFileSuffix.compare( "svg", Qt::CaseInsensitive ) == 0 )
@@ -133,6 +136,11 @@ void QgsComposerPicture::setPictureFile( const QString& path )
       mMode = Unknown;
     }
   }
+
+  if(mMode != Unknown) //make sure we start with a new QImage
+    {
+      setSceneRect(QRectF(transform().dx(), transform().dy(), rect().width(), rect().height()));
+    }
   emit settingsChanged();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,9 @@ void QgsComposerPicture::setPictureFile( const QString& path )`
`101`	`101`	`mMode = Unknown;`
`102`	`102`	`}`
`103`	`103`
	`104`	`+ //mImage = QImage(mImage.width(), mImage.height(), QImage::Format_ARGB32 );`
	`105`	`+ //setSceneRect`
	`106`	`+`
`104`	`107`	`QFileInfo sourceFileInfo( mSourceFile );`
`105`	`108`	`QString sourceFileSuffix = sourceFileInfo.suffix();`
`106`	`109`	`if ( sourceFileSuffix.compare( "svg", Qt::CaseInsensitive ) == 0 )`
`@@ -133,6 +136,11 @@ void QgsComposerPicture::setPictureFile( const QString& path )`
`133`	`136`	`mMode = Unknown;`
`134`	`137`	`}`
`135`	`138`	`}`
	`139`	`+`
	`140`	`+ if(mMode != Unknown) //make sure we start with a new QImage`
	`141`	`+ {`
	`142`	`+ setSceneRect(QRectF(transform().dx(), transform().dy(), rect().width(), rect().height()));`
	`143`	`+ }`
`136`	`144`	`emit settingsChanged();`
`137`	`145`	`}`
`138`	`146`