Fix for placement of map items in composer

git-svn-id: http://svn.osgeo.org/qgis/trunk@15843 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 28, 2011 · 02e434c · 02e434c
1 parent badda87
commit 02e434c
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -1568,10 +1568,11 @@ QPointF QgsComposerMap::composerMapPosForItem( const QGraphicsItem* item ) const
     return QPointF( 0, 0 );
   }
 
-  double mapX = item->scenePos().x() / mMapCanvas->width() * mMapRenderer->extent().width() + mMapRenderer->extent().xMinimum();
-  double mapY = mMapRenderer->extent().yMaximum() - item->scenePos().y() / mMapCanvas->height() * mMapRenderer->extent().height();
+  QRectF graphicsSceneRect = mMapCanvas->sceneRect();
+  QPointF itemScenePos = item->scenePos();
+  QgsRectangle mapRendererExtent = mMapRenderer->extent();
 
-  double itemX = rect().width() * ( mapX - mExtent.xMinimum() ) / mExtent.width() + mXOffset;
-  double itemY = rect().height() * ( mExtent.yMaximum() - mapY ) / mExtent.height() + mYOffset;
-  return QPointF( itemX, itemY );
+  double mapX = itemScenePos.x() / graphicsSceneRect.width() * mapRendererExtent.width() + mapRendererExtent.xMinimum();
+  double mapY = mapRendererExtent.yMaximum() - itemScenePos.y() / graphicsSceneRect.height() * mapRendererExtent.height();
+  return mapToItemCoords( QPointF( mapX, mapY ) );
 }