Simplify the change by not modifing interfaces

Sandro Santilli · Sandro Santilli · commit 90db597e7bce · 2014-12-13T17:35:17.000+01:00
.. I've found a link from gsMapCanvasMap and the QgsMapToPixel class
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -724,7 +724,7 @@ void QgsMapCanvas::rendererJobFinished()
     p.end();
 
     QgsRectangle rect = mSettings.visibleExtent();
-    mMap->setContent( img, rect, mSettings.rotation() );
+    mMap->setContent( img, rect );
   }
 
   // now we are in a slot called from mJob - do not delete it immediately
diff --git a/src/gui/qgsmapcanvasmap.cpp b/src/gui/qgsmapcanvasmap.cpp
@@ -23,7 +23,7 @@
 #include <QPainter>
 
 QgsMapCanvasMap::QgsMapCanvasMap( QgsMapCanvas* canvas )
-    : QgsMapCanvasItem( canvas ), mRotation(0.0)
+    : QgsMapCanvasItem( canvas )
 {
   setZValue( -10 );
 }
@@ -32,9 +32,8 @@ QgsMapCanvasMap::~QgsMapCanvasMap()
 {
 }
 
-void QgsMapCanvasMap::setContent( const QImage& image, const QgsRectangle& rect, double rotation )
+void QgsMapCanvasMap::setContent( const QImage& image, const QgsRectangle& rect )
 {
-  mRotation = rotation;
   mImage = image;
 
   // For true retro fans: this is approximately how the graphics looked like in 1990
@@ -48,27 +47,12 @@ void QgsMapCanvasMap::setContent( const QImage& image, const QgsRectangle& rect,
 void QgsMapCanvasMap::paint( QPainter* painter )
 {
   int w = qRound( boundingRect().width() ) - 2, h = qRound( boundingRect().height() ) - 2; // setRect() makes the size +2 :-(
-  int wi = mImage.width();
-  int hi = mImage.height();
-
-  double ar = h ? double(w)/h : 0.0; // aspect ratio of bounding rect
-  double ari = hi ? double(wi)/hi : 0.0; // aspect ratio of image
-  double ard = fabs(ari-ar); // aspect ratio difference
-
-#if 0
-  QgsDebugMsg( QString( "XXXX img %1,%2 (%3) item %4,%5 (%6) ardiff %7" )
-    .arg( wi ).arg( hi ).arg( ari )
-    .arg( w ).arg( h ).arg( ar )
-    .arg ( ard )
-  );
-#endif
-
   if ( mImage.size() != QSize( w, h ) )
   {
-    QgsDebugMsg( QString( "map paint DIFFERENT SIZE: img %1,%2  item %3,%4" ).arg( wi ).arg( hi ).arg( w ).arg( h ) );
+    QgsDebugMsg( QString( "map paint DIFFERENT SIZE: img %1,%2  item %3,%4" ).arg( mImage.width() ).arg( mImage.height() ).arg( w ).arg( h ) );
   }
 
-  if ( mRotation )
+  if ( mMapCanvas->getCoordinateTransform()->mapRotation() )
   {
     int tX = ( w - mImage.width() ) / 2.0;
     int tY = ( h - mImage.height() ) / 2.0;
diff --git a/src/gui/qgsmapcanvasmap.h b/src/gui/qgsmapcanvasmap.h
@@ -41,8 +41,7 @@ class GUI_EXPORT QgsMapCanvasMap : public QgsMapCanvasItem  // public QObject, p
     ~QgsMapCanvasMap();
 
     //! @note added in 2.4
-    //! @note rotation parameter added in 2.8
-    void setContent( const QImage& image, const QgsRectangle& rect, double rotation=0.0 );
+    void setContent( const QImage& image, const QgsRectangle& rect );
 
     //! @note added in 2.4
     QImage contentImage() const { return mImage; }
@@ -76,8 +75,6 @@ class GUI_EXPORT QgsMapCanvasMap : public QgsMapCanvasItem  // public QObject, p
   private:
 
     QImage mImage;
-
-    double mRotation;
 };
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -724,7 +724,7 @@ void QgsMapCanvas::rendererJobFinished()`
`724`	`724`	`p.end();`
`725`	`725`
`726`	`726`	`QgsRectangle rect = mSettings.visibleExtent();`
`727`		`- mMap->setContent( img, rect, mSettings.rotation() );`
	`727`	`+ mMap->setContent( img, rect );`
`728`	`728`	`}`
`729`	`729`
`730`	`730`	`// now we are in a slot called from mJob - do not delete it immediately`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`#include <QPainter>`
`24`	`24`
`25`	`25`	`QgsMapCanvasMap::QgsMapCanvasMap( QgsMapCanvas* canvas )`
`26`		`- : QgsMapCanvasItem( canvas ), mRotation(0.0)`
	`26`	`+ : QgsMapCanvasItem( canvas )`
`27`	`27`	`{`
`28`	`28`	`setZValue( -10 );`
`29`	`29`	`}`
`@@ -32,9 +32,8 @@ QgsMapCanvasMap::~QgsMapCanvasMap()`
`32`	`32`	`{`
`33`	`33`	`}`
`34`	`34`
`35`		`-void QgsMapCanvasMap::setContent( const QImage& image, const QgsRectangle& rect, double rotation )`
	`35`	`+void QgsMapCanvasMap::setContent( const QImage& image, const QgsRectangle& rect )`
`36`	`36`	`{`
`37`		`- mRotation = rotation;`
`38`	`37`	`mImage = image;`
`39`	`38`
`40`	`39`	`// For true retro fans: this is approximately how the graphics looked like in 1990`
`@@ -48,27 +47,12 @@ void QgsMapCanvasMap::setContent( const QImage& image, const QgsRectangle& rect,`
`48`	`47`	`void QgsMapCanvasMap::paint( QPainter* painter )`
`49`	`48`	`{`
`50`	`49`	`int w = qRound( boundingRect().width() ) - 2, h = qRound( boundingRect().height() ) - 2; // setRect() makes the size +2 :-(`
`51`		`- int wi = mImage.width();`
`52`		`- int hi = mImage.height();`
`53`		`-`
`54`		`- double ar = h ? double(w)/h : 0.0; // aspect ratio of bounding rect`
`55`		`- double ari = hi ? double(wi)/hi : 0.0; // aspect ratio of image`
`56`		`- double ard = fabs(ari-ar); // aspect ratio difference`
`57`		`-`
`58`		`-#if 0`
`59`		`- QgsDebugMsg( QString( "XXXX img %1,%2 (%3) item %4,%5 (%6) ardiff %7" )`
`60`		`- .arg( wi ).arg( hi ).arg( ari )`
`61`		`- .arg( w ).arg( h ).arg( ar )`
`62`		`- .arg ( ard )`
`63`		`- );`
`64`		`-#endif`
`65`		`-`
`66`	`50`	`if ( mImage.size() != QSize( w, h ) )`
`67`	`51`	`{`
`68`		`- QgsDebugMsg( QString( "map paint DIFFERENT SIZE: img %1,%2 item %3,%4" ).arg( wi ).arg( hi ).arg( w ).arg( h ) );`
	`52`	`+ QgsDebugMsg( QString( "map paint DIFFERENT SIZE: img %1,%2 item %3,%4" ).arg( mImage.width() ).arg( mImage.height() ).arg( w ).arg( h ) );`
`69`	`53`	`}`
`70`	`54`
`71`		`- if ( mRotation )`
	`55`	`+ if ( mMapCanvas->getCoordinateTransform()->mapRotation() )`
`72`	`56`	`{`
`73`	`57`	`int tX = ( w - mImage.width() ) / 2.0;`
`74`	`58`	`int tY = ( h - mImage.height() ) / 2.0;`