Index: src/app/qgsmeasuredialog.cpp
===================================================================
--- src/app/qgsmeasuredialog.cpp (revision 14990)
+++ src/app/qgsmeasuredialog.cpp (working copy)
@@ -97,11 +97,12 @@
{
QSettings settings;
int decimalPlaces = settings.value( "/qgis/measure/decimalplaces", "3" ).toInt();
+ QString ellipsoidId = settings.value( "/qgis/measure/ellipsoid", "WGS84").toString();
// Create QgsDistance Area for customization ProjectionEnabled setting
QgsDistanceArea myDa;
myDa.setSourceCrs( mTool->canvas()->mapRenderer()->destinationSrs().srsid() );
- myDa.setEllipsoid( mTool->canvas()->mapRenderer()->distanceArea()->ellipsoid() );
+ myDa.setEllipsoid( ellipsoidId );
myDa.setProjectionsEnabled( mcbProjectionEnabled->isChecked() );
// show current distance/area while moving the point
@@ -132,11 +133,13 @@
{
QSettings settings;
int decimalPlaces = settings.value( "/qgis/measure/decimalplaces", "3" ).toInt();
+ QString ellipsoidId = settings.value( "/qgis/measure/ellipsoid", "WGS84").toString();
// Create QgsDistance Area for customization ProjectionEnabled setting
QgsDistanceArea myDa;
myDa.setSourceCrs( mTool->canvas()->mapRenderer()->destinationSrs().srsid() );
- myDa.setEllipsoid( mTool->canvas()->mapRenderer()->distanceArea()->ellipsoid() );
+ myDa.setEllipsoid( ellipsoidId );
+
myDa.setProjectionsEnabled( mcbProjectionEnabled->isChecked() );
int numPoints = mTool->points().size();
Index: src/app/qgsmaptoolmeasureangle.cpp
===================================================================
--- src/app/qgsmaptoolmeasureangle.cpp (revision 14990)
+++ src/app/qgsmaptoolmeasureangle.cpp (working copy)
@@ -59,10 +59,13 @@
mResultDisplay->move( e->pos() - QPoint( 100, 100 ) );
}
mResultDisplay->show();
+
+ QSettings settings;
+ QString ellipsoidId = settings.value( "/qgis/measure/ellipsoid", "WGS84").toString();
QgsDistanceArea myDa;
myDa.setSourceCrs( mCanvas->mapRenderer()->destinationSrs().srsid() );
- myDa.setEllipsoid( distArea->ellipsoid() );
+ myDa.setEllipsoid( ellipsoidId );
myDa.setProjectionsEnabled( mResultDisplay->projectionEnabled() );
//angle calculation
@@ -161,9 +164,12 @@
if ( !mResultDisplay )
return;
+ QSettings settings;
+ QString ellipsoidId = settings.value( "/qgis/measure/ellipsoid", "WGS84").toString();
+
QgsDistanceArea myDa;
myDa.setSourceCrs( mCanvas->mapRenderer()->destinationSrs().srsid() );
- myDa.setEllipsoid( mCanvas->mapRenderer()->distanceArea()->ellipsoid() );
+ myDa.setEllipsoid( ellipsoidId );
myDa.setProjectionsEnabled( mResultDisplay->projectionEnabled() );
//angle calculation
Index: src/ui/qgsmeasurebase.ui
===================================================================
--- src/ui/qgsmeasurebase.ui (revision 14990)
+++ src/ui/qgsmeasurebase.ui (working copy)
@@ -101,7 +101,7 @@
-
- Ellipsoidal (WGS84)
+ Ellipsoidal
Index: src/ui/qgsdisplayanglebase.ui
===================================================================
--- src/ui/qgsdisplayanglebase.ui (revision 14990)
+++ src/ui/qgsdisplayanglebase.ui (working copy)
@@ -47,7 +47,7 @@
-
- Ellipsoidal (WGS84)
+ Ellipsoidal