[composer] Fix failing rotation tests

qgis · Dec 30, 2013 · f1aead4 · f1aead4
1 parent 0437dbb
commit f1aead4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/core/composer/qgscomposeritem.cpp b/src/core/composer/qgscomposeritem.cpp
@@ -707,7 +707,7 @@ void QgsComposerItem::setRotation( double r )
 {
   //kept for api compatibility with QGIS 2.0
   //remove after 2.0 series
-  setItemRotation( r );
+  setItemRotation( r, true );
 }
 
 void QgsComposerItem::setItemRotation( double r, bool adjustPosition )

diff --git a/tests/src/core/testqgscomposerrotation.cpp b/tests/src/core/testqgscomposerrotation.cpp
@@ -130,12 +130,13 @@ void TestQgsComposerRotation::shapeRotation()
 {
   mComposition->addComposerShape( mComposerRect );
 
-  mComposerRect->setItemRotation( 45 );
+  mComposerRect->setItemRotation( 45, true );
 
   QgsCompositionChecker checker( "composerrotation_shape", mComposition );
   QVERIFY( checker.testComposition( mReport ) );
 
   mComposition->removeItem( mComposerRect );
+  mComposerRect->setItemRotation( 0, true );
 }
 
 void TestQgsComposerRotation::oldShapeRotationApi()
@@ -155,12 +156,13 @@ void TestQgsComposerRotation::labelRotation()
 {
   mComposition->addComposerLabel( mComposerLabel );
 
-  mComposerLabel->setItemRotation( 135 );
+  mComposerLabel->setItemRotation( 135, true );
 
   QgsCompositionChecker checker( "composerrotation_label", mComposition );
   QVERIFY( checker.testComposition( mReport ) );
 
   mComposition->removeItem( mComposerLabel );
+  mComposerLabel->setItemRotation( 0, true );
 }
 
 void TestQgsComposerRotation::oldLabelRotationApi()
@@ -195,13 +197,13 @@ void TestQgsComposerRotation::mapItemRotation()
   //test map item rotation
   mComposition->addComposerMap( mComposerMap );
   mComposerMap->setNewExtent( QgsRectangle( 781662.375, 3339523.125, 793062.375, 3345223.125 ) );
-  mComposerMap->setItemRotation( 90 );
+  mComposerMap->setItemRotation( 90, true );
 
   QgsCompositionChecker checker( "composerrotation_mapitemrotation", mComposition );
   QVERIFY( checker.testComposition( mReport ) );
 
   mComposition->removeItem( mComposerMap );
-  mComposerMap->setItemRotation( 0 );
+  mComposerMap->setItemRotation( 0, true );
 }
 
 void TestQgsComposerRotation::oldMapRotationApi()
@@ -235,13 +237,13 @@ void TestQgsComposerRotation::pictureItemRotation()
 {
   //test picture item rotation
   mComposition->addComposerPicture( mComposerPicture );
-  mComposerPicture->setItemRotation( 45 );
+  mComposerPicture->setItemRotation( 45, true );
 
   QgsCompositionChecker checker( "composerrotation_pictureitemrotation", mComposition );
   QVERIFY( checker.testComposition( mReport ) );
 
   mComposition->removeItem( mComposerPicture );
-  mComposerPicture->setItemRotation( 0 );
+  mComposerPicture->setItemRotation( 0, true );
 }
 
 void TestQgsComposerRotation::oldPictureRotationApi()