qgis · Dec 30, 2013
diff --git a/‎src/core/composer/qgscomposerpicture.cpp
Lines changed: 1 addition & 1 deletion b/‎src/core/composer/qgscomposerpicture.cpp
Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/src/core/testqgscomposerrotation.cpp
Lines changed: 31 additions & 4 deletions b/‎tests/src/core/testqgscomposerrotation.cpp
Lines changed: 31 additions & 4 deletions
diff --git a/‎tests/testdata/control_images/expected_composerrotation_pictureitemrotation/expected_composerrotation_pictureitemrotation.png
247 KB b/‎tests/testdata/control_images/expected_composerrotation_pictureitemrotation/expected_composerrotation_pictureitemrotation.png
247 KB
diff --git a/‎tests/testdata/control_images/expected_composerrotation_picturerotation/expected_composerrotation_picturerotation.png
225 KB b/‎tests/testdata/control_images/expected_composerrotation_picturerotation/expected_composerrotation_picturerotation.png
225 KB
diff --git a/‎tests/testdata/control_images/expected_composerrotation_picturerotation_oldapi/expected_composerrotation_picturerotation_oldapi.png
225 KB b/‎tests/testdata/control_images/expected_composerrotation_picturerotation_oldapi/expected_composerrotation_picturerotation_oldapi.png
225 KB
diff --git a/‎tests/testdata/sample_image.png
93.8 KB b/‎tests/testdata/sample_image.png
93.8 KB
@@ -54,7 +54,7 @@ void QgsComposerPicture::paint( QPainter* painter, const QStyleOptionGraphicsIte
 
   drawBackground( painter );
 
-  int newDpi = ( painter->device()->logicalDpiX() + painter->device()->logicalDpiY() ) / 2;
+  //int newDpi = ( painter->device()->logicalDpiX() + painter->device()->logicalDpiY() ) / 2;
 
   if ( mMode != Unknown )
   {
 
@@ -46,7 +46,9 @@ class TestQgsComposerRotation: public QObject
     void mapRotation(); //test if composer map mapRotation is functioning
     void mapItemRotation(); //test if composer map item rotation is functioning
     void oldMapRotationApi(); //test if old deprectated composer map rotation api is functioning
-    void pictureRotation();
+    void pictureRotation(); //test if picture pictureRotation is functioning
+    void pictureItemRotation(); //test if composer picture item rotation is functioning
+    void oldPictureRotationApi(); //test if old deprectated composer picture rotation api is functioning
 
   private:
     QgsComposition* mComposition;
@@ -218,17 +220,42 @@ void TestQgsComposerRotation::oldMapRotationApi()
 
 void TestQgsComposerRotation::pictureRotation()
 {
-  //test map rotation
+  //test picture rotation
   mComposition->addComposerPicture( mComposerPicture );
   mComposerPicture->setPictureRotation( 45 );
-  //mComposerPicture->setSceneRect( QRectF( 70, 70, 100, 100 ) );
 
-  QgsCompositionChecker checker( "composerrotation_maprotation", mComposition );
+  QgsCompositionChecker checker( "composerrotation_picturerotation", mComposition );
   QVERIFY( checker.testComposition( mReport ) );
 
   mComposition->removeItem( mComposerPicture );
   mComposerPicture->setPictureRotation( 0 );
 }
 
+void TestQgsComposerRotation::pictureItemRotation()
+{
+  //test picture item rotation
+  mComposition->addComposerPicture( mComposerPicture );
+  mComposerPicture->setItemRotation( 45 );
+
+  QgsCompositionChecker checker( "composerrotation_pictureitemrotation", mComposition );
+  QVERIFY( checker.testComposition( mReport ) );
+
+  mComposition->removeItem( mComposerPicture );
+  mComposerPicture->setItemRotation( 0 );
+}
+
+void TestQgsComposerRotation::oldPictureRotationApi()
+{
+  //test old style deprecated rotation api - remove test after 2.0 series
+  mComposition->addComposerPicture( mComposerPicture );
+  mComposerPicture->setRotation( 45 );
+
+  QgsCompositionChecker checker( "composerrotation_picturerotation_oldapi", mComposition );
+  QVERIFY( checker.testComposition( mReport ) );
+
+  mComposition->removeItem( mComposerPicture );
+  mComposerPicture->setRotation( 0 );
+}
+
 QTEST_MAIN( TestQgsComposerRotation )
 #include "moc_testqgscomposerrotation.cxx"
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ void QgsComposerPicture::paint( QPainter* painter, const QStyleOptionGraphicsIte`
`54`	`54`
`55`	`55`	`drawBackground( painter );`
`56`	`56`
`57`		`- int newDpi = ( painter->device()->logicalDpiX() + painter->device()->logicalDpiY() ) / 2;`
	`57`	`+ //int newDpi = ( painter->device()->logicalDpiX() + painter->device()->logicalDpiY() ) / 2;`
`58`	`58`
`59`	`59`	`if ( mMode != Unknown )`
`60`	`60`	`{`