Fix incorrect label/diagram distance when map is rotated

nyalldawson · nyalldawson · commit 02cc0cc3488b · 2016-07-08T18:27:17.000+10:00
(Cherry-picked from 873eb7f)
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -2898,7 +2898,7 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, QgsRenderContext &cont
     {
       distance *= vectorScaleFactor;
     }
-    double d = qAbs( ptOne.x() - ptZero.x() ) * distance;
+    double d = ptOne.distance( ptZero ) * distance;
     ( *labelFeature )->setDistLabel( d );
   }
 
diff --git a/src/core/qgsvectorlayerdiagramprovider.cpp b/src/core/qgsvectorlayerdiagramprovider.cpp
@@ -368,6 +368,6 @@ QgsLabelFeature* QgsVectorLayerDiagramProvider::registerDiagram( QgsFeature& fea
 
   QgsPoint ptZero = mSettings.xform->toMapCoordinates( 0, 0 );
   QgsPoint ptOne = mSettings.xform->toMapCoordinates( 1, 0 );
-  lf->setDistLabel( qAbs( ptOne.x() - ptZero.x() ) * mSettings.dist );
+  lf->setDistLabel( ptOne.distance( ptZero ) * mSettings.dist );
   return lf;
 }

Original file line number	Diff line number	Diff line change
`@@ -2898,7 +2898,7 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, QgsRenderContext &cont`
`2898`	`2898`	`{`
`2899`	`2899`	`distance *= vectorScaleFactor;`
`2900`	`2900`	`}`
`2901`		`- double d = qAbs( ptOne.x() - ptZero.x() ) * distance;`
	`2901`	`+ double d = ptOne.distance( ptZero ) * distance;`
`2902`	`2902`	`( *labelFeature )->setDistLabel( d );`
`2903`	`2903`	`}`
`2904`	`2904`
Original file line number	Diff line number	Diff line change
`@@ -368,6 +368,6 @@ QgsLabelFeature* QgsVectorLayerDiagramProvider::registerDiagram( QgsFeature& fea`
`368`	`368`
`369`	`369`	`QgsPoint ptZero = mSettings.xform->toMapCoordinates( 0, 0 );`
`370`	`370`	`QgsPoint ptOne = mSettings.xform->toMapCoordinates( 1, 0 );`
`371`		`- lf->setDistLabel( qAbs( ptOne.x() - ptZero.x() ) * mSettings.dist );`
	`371`	`+ lf->setDistLabel( ptOne.distance( ptZero ) * mSettings.dist );`
`372`	`372`	`return lf;`
`373`	`373`	`}`