Fix for jumps if moving diagrams and labels with rotation point other than lower left

mhugent · mhugent · commit 8d364cb1ca4a · 2011-04-08T21:25:19.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@15683 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsmaptoolmovelabel.cpp b/src/app/qgsmaptoolmovelabel.cpp
@@ -49,8 +49,14 @@ void QgsMapToolMoveLabel::canvasPressEvent( QMouseEvent * e )
   if ( labelMoveable( layer, xCol, yCol ) || diagramMoveable( layer, xCol, yCol ) )
   {
     mStartPointMapCoords = toMapCoordinates( e->pos() );
-    mClickOffsetX = mStartPointMapCoords.x() - mCurrentLabelPos.labelRect.xMinimum();
-    mClickOffsetY = mStartPointMapCoords.y() - mCurrentLabelPos.labelRect.yMinimum();
+    QgsPoint referencePoint;
+    if ( !rotationPoint( referencePoint ) )
+    {
+      referencePoint.setX( mCurrentLabelPos.labelRect.xMinimum() );
+      referencePoint.setY( mCurrentLabelPos.labelRect.yMinimum() );
+    }
+    mClickOffsetX = mStartPointMapCoords.x() - referencePoint.x();
+    mClickOffsetY = mStartPointMapCoords.y() - referencePoint.y();
     createRubberBands();
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,14 @@ void QgsMapToolMoveLabel::canvasPressEvent( QMouseEvent * e )`
`49`	`49`	`if ( labelMoveable( layer, xCol, yCol ) \|\| diagramMoveable( layer, xCol, yCol ) )`
`50`	`50`	`{`
`51`	`51`	`mStartPointMapCoords = toMapCoordinates( e->pos() );`
`52`		`- mClickOffsetX = mStartPointMapCoords.x() - mCurrentLabelPos.labelRect.xMinimum();`
`53`		`- mClickOffsetY = mStartPointMapCoords.y() - mCurrentLabelPos.labelRect.yMinimum();`
	`52`	`+ QgsPoint referencePoint;`
	`53`	`+ if ( !rotationPoint( referencePoint ) )`
	`54`	`+ {`
	`55`	`+ referencePoint.setX( mCurrentLabelPos.labelRect.xMinimum() );`
	`56`	`+ referencePoint.setY( mCurrentLabelPos.labelRect.yMinimum() );`
	`57`	`+ }`
	`58`	`+ mClickOffsetX = mStartPointMapCoords.x() - referencePoint.x();`
	`59`	`+ mClickOffsetY = mStartPointMapCoords.y() - referencePoint.y();`
`54`	`60`	`createRubberBands();`
`55`	`61`	`}`
`56`	`62`	`}`