Adapt compositionchecker for multi pages

qgis · Jul 19, 2012 · 3af7ef3 · 3af7ef3
1 parent 937bffa
commit 3af7ef3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/tests/src/core/qgscompositionchecker.cpp b/tests/src/core/qgscompositionchecker.cpp
@@ -34,7 +34,7 @@ QgsCompositionChecker::~QgsCompositionChecker()
 {
 }
 
-bool QgsCompositionChecker::testComposition()
+bool QgsCompositionChecker::testComposition( int page )
 {
   if ( !mComposition )
   {
@@ -70,9 +70,7 @@ bool QgsCompositionChecker::testComposition()
   outputImage.setDotsPerMeterY( expectedImage.dotsPerMeterX() );
   outputImage.fill( 0 );
   QPainter p( &outputImage );
-  QRectF sourceArea( 0, 0, mComposition->paperWidth(), mComposition->paperHeight() );
-  QRectF targetArea( 0, 0, width, height );
-  mComposition->render( &p, targetArea, sourceArea );
+  mComposition->renderPage( &p, page );
   p.end();
 
   QString renderedFilePath = QDir::tempPath() + QDir::separator() + QFileInfo( mExpectedImageFile ).baseName() + "_rendered.png";

diff --git a/tests/src/core/qgscompositionchecker.h b/tests/src/core/qgscompositionchecker.h
@@ -27,7 +27,7 @@ class QgsCompositionChecker
     QgsCompositionChecker( const QString& testName, QgsComposition* composition, const QString& expectedImageFile );
     ~QgsCompositionChecker();
 
-    bool testComposition();
+    bool testComposition( int page = 0 );
 
   private:
     QgsCompositionChecker(); //forbidden