Fix for projection/ellipsoid

homann · homann · commit edb2a7f58f06 · 2012-08-23T08:48:42.000+02:00
diff --git a/src/core/composer/qgscomposerscalebar.cpp b/src/core/composer/qgscomposerscalebar.cpp
@@ -188,7 +188,7 @@ double QgsComposerScaleBar::mapDiagonal() const
   else
   {
     QgsDistanceArea da;
-    da.setEllipsoidalEnabled( true );
+    da.setEllipsoidalEnabled( mComposerMap->mapRenderer()->hasCrsTransformEnabled() );
     da.setSourceCrs( mComposerMap->mapRenderer()->destinationCrs().srsid() );
     QSettings s;
     da.setEllipsoid( s.value( "/qgis/measure/ellipsoid", "WGS84" ).toString() );

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ double QgsComposerScaleBar::mapDiagonal() const`
`188`	`188`	`else`
`189`	`189`	`{`
`190`	`190`	`QgsDistanceArea da;`
`191`		`- da.setEllipsoidalEnabled( true );`
	`191`	`+ da.setEllipsoidalEnabled( mComposerMap->mapRenderer()->hasCrsTransformEnabled() );`
`192`	`192`	`da.setSourceCrs( mComposerMap->mapRenderer()->destinationCrs().srsid() );`
`193`	`193`	`QSettings s;`
`194`	`194`	`da.setEllipsoid( s.value( "/qgis/measure/ellipsoid", "WGS84" ).toString() );`