Small tidying up, replacing with GEO_NONE

homann · homann · commit 0a1270b9fc85 · 2012-09-04T10:40:06.000+02:00
diff --git a/src/app/qgsmaptoolfeatureaction.cpp b/src/app/qgsmaptoolfeatureaction.cpp
@@ -15,7 +15,6 @@
 
 #include "qgsmaptoolfeatureaction.h"
 
-#include "qgsdistancearea.h"
 #include "qgsfeature.h"
 #include "qgsfield.h"
 #include "qgsgeometry.h"
@@ -111,7 +110,6 @@ bool QgsMapToolFeatureAction::doAction( QgsVectorLayer *layer, int x, int y )
   // load identify radius from settings
   QSettings settings;
   double identifyValue = settings.value( "/Map/identifyRadius", QGis::DEFAULT_IDENTIFY_RADIUS ).toDouble();
-  QString ellipsoid = settings.value( "/qgis/measure/ellipsoid", "WGS84" ).toString();
 
   if ( identifyValue <= 0.0 )
     identifyValue = QGis::DEFAULT_IDENTIFY_RADIUS;
diff --git a/src/app/qgsmaptoolidentify.cpp b/src/app/qgsmaptoolidentify.cpp
@@ -204,7 +204,7 @@ bool QgsMapToolIdentify::identifyVectorLayer( QgsVectorLayer *layer, int x, int
   // load identify radius from settings
   QSettings settings;
   double identifyValue = settings.value( "/Map/identifyRadius", QGis::DEFAULT_IDENTIFY_RADIUS ).toDouble();
-  QString ellipsoid = settings.value( "/qgis/measure/ellipsoid", "WGS84" ).toString();
+  QString ellipsoid = settings.value( "/qgis/measure/ellipsoid", GEO_NONE ).toString();
 
   if ( identifyValue <= 0.0 )
     identifyValue = QGis::DEFAULT_IDENTIFY_RADIUS;
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -283,7 +283,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
 
   getEllipsoidList();
   // Pre-select current ellipsoid
-  QString myEllipsoidId = settings.value( "/qgis/measure/ellipsoid", "WGS84" ).toString();
+  QString myEllipsoidId = settings.value( "/qgis/measure/ellipsoid", GEO_NONE ).toString();
   cmbEllipsoid->setCurrentIndex( cmbEllipsoid->findText( getEllipsoidName( myEllipsoidId ), Qt::MatchExactly ) );
   // Check if CRS transformation is on, or else turn combobox off
   if ( QgisApp::instance()->mapCanvas()->mapRenderer()->hasCrsTransformEnabled() )
diff --git a/src/core/qgsdistancearea.cpp b/src/core/qgsdistancearea.cpp
@@ -44,7 +44,7 @@ QgsDistanceArea::QgsDistanceArea()
   mEllipsoidalMode = false;
   mCoordTransform = new QgsCoordinateTransform;
   setSourceCrs( GEOCRS_ID ); // WGS 84
-  setEllipsoid( "WGS84" );
+  setEllipsoid( GEO_NONE );
 }
 
 
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -773,15 +773,15 @@ static QVariant fcnRound( const QVariantList& values , QgsFeature *f, QgsExpress
   Q_UNUSED( f );
   if ( values.length() == 2 )
   {
-      double number = getDoubleValue( values.at( 0 ), parent );
-      double scaler = pow( 10.0, getIntValue( values.at( 1 ), parent ) );
-      return QVariant( qRound( number * scaler ) / scaler );
+    double number = getDoubleValue( values.at( 0 ), parent );
+    double scaler = pow( 10.0, getIntValue( values.at( 1 ), parent ) );
+    return QVariant( round( number * scaler ) / scaler );
   }
 
   if ( values.length() == 1 )
   {
-      double number = getIntValue( values.at( 0 ), parent );
-      return QVariant( qRound( number) ).toInt();
+    double number = getIntValue( values.at( 0 ), parent );
+    return QVariant( round( number ) ).toInt();
   }
 
   return QVariant();
@@ -950,10 +950,10 @@ bool QgsExpression::needsGeometry()
 void QgsExpression::initGeomCalculator()
 {
   mCalc = new QgsDistanceArea;
-  mCalc->setEllipsoidalMode( false );
   QSettings settings;
-  QString ellipsoid = settings.value( "/qgis/measure/ellipsoid", "WGS84" ).toString();
+  QString ellipsoid = settings.value( "/qgis/measure/ellipsoid", GEO_NONE ).toString();
   mCalc->setEllipsoid( ellipsoid );
+  mCalc->setEllipsoidalMode( false );
 }
 
 bool QgsExpression::prepare( const QgsFieldMap& fields )

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ QgsDistanceArea::QgsDistanceArea()`
`44`	`44`	`mEllipsoidalMode = false;`
`45`	`45`	`mCoordTransform = new QgsCoordinateTransform;`
`46`	`46`	`setSourceCrs( GEOCRS_ID ); // WGS 84`
`47`		`- setEllipsoid( "WGS84" );`
	`47`	`+ setEllipsoid( GEO_NONE );`
`48`	`48`	`}`
`49`	`49`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -773,15 +773,15 @@ static QVariant fcnRound( const QVariantList& values , QgsFeature *f, QgsExpress`
`773`	`773`	`Q_UNUSED( f );`
`774`	`774`	`if ( values.length() == 2 )`
`775`	`775`	`{`
`776`		`- double number = getDoubleValue( values.at( 0 ), parent );`
`777`		`- double scaler = pow( 10.0, getIntValue( values.at( 1 ), parent ) );`
`778`		`- return QVariant( qRound( number * scaler ) / scaler );`
	`776`	`+ double number = getDoubleValue( values.at( 0 ), parent );`
	`777`	`+ double scaler = pow( 10.0, getIntValue( values.at( 1 ), parent ) );`
	`778`	`+ return QVariant( round( number * scaler ) / scaler );`
`779`	`779`	`}`
`780`	`780`
`781`	`781`	`if ( values.length() == 1 )`
`782`	`782`	`{`
`783`		`- double number = getIntValue( values.at( 0 ), parent );`
`784`		`- return QVariant( qRound( number) ).toInt();`
	`783`	`+ double number = getIntValue( values.at( 0 ), parent );`
	`784`	`+ return QVariant( round( number ) ).toInt();`
`785`	`785`	`}`
`786`	`786`
`787`	`787`	`return QVariant();`
`@@ -950,10 +950,10 @@ bool QgsExpression::needsGeometry()`
`950`	`950`	`void QgsExpression::initGeomCalculator()`
`951`	`951`	`{`
`952`	`952`	`mCalc = new QgsDistanceArea;`
`953`		`- mCalc->setEllipsoidalMode( false );`
`954`	`953`	`QSettings settings;`
`955`		`- QString ellipsoid = settings.value( "/qgis/measure/ellipsoid", "WGS84" ).toString();`
	`954`	`+ QString ellipsoid = settings.value( "/qgis/measure/ellipsoid", GEO_NONE ).toString();`
`956`	`955`	`mCalc->setEllipsoid( ellipsoid );`
	`956`	`+ mCalc->setEllipsoidalMode( false );`
`957`	`957`	`}`
`958`	`958`
`959`	`959`	`bool QgsExpression::prepare( const QgsFieldMap& fields )`