[QGIS Commit] r15683 - trunk/qgis/src/app
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Fri Apr 8 17:25:19 EDT 2011
Author: mhugent
Date: 2011-04-08 14:25:19 -0700 (Fri, 08 Apr 2011)
New Revision: 15683
Modified:
trunk/qgis/src/app/qgsmaptoolmovelabel.cpp
Log:
Fix for jumps if moving diagrams and labels with rotation point other than lower left
Modified: trunk/qgis/src/app/qgsmaptoolmovelabel.cpp
===================================================================
--- trunk/qgis/src/app/qgsmaptoolmovelabel.cpp 2011-04-08 21:21:59 UTC (rev 15682)
+++ trunk/qgis/src/app/qgsmaptoolmovelabel.cpp 2011-04-08 21:25:19 UTC (rev 15683)
@@ -49,8 +49,14 @@
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();
}
}
More information about the QGIS-commit
mailing list