20 changes: 10 additions & 10 deletions src/core/qgsdistancearea.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ bool QgsDistanceArea::setEllipsoid( const QString& ellipsoid )
int myResult;

// Shortcut if ellipsoid is none.
if ( ellipsoid == "NONE" )
if ( ellipsoid == GEO_NONE )
{
mEllipsoid = "NONE";
mEllipsoid = GEO_NONE;
return true;
}

Expand Down Expand Up @@ -386,14 +386,14 @@ double QgsDistanceArea::measureLine( const QList<QgsPoint>& points )

try
{
if ( mEllipsoidalMode && ( mEllipsoid != "NONE" ) )
if ( mEllipsoidalMode && ( mEllipsoid != GEO_NONE ) )
p1 = mCoordTransform->transform( points[0] );
else
p1 = points[0];

for ( QList<QgsPoint>::const_iterator i = points.begin(); i != points.end(); ++i )
{
if ( mEllipsoidalMode && ( mEllipsoid != "NONE" ) )
if ( mEllipsoidalMode && ( mEllipsoid != GEO_NONE ) )
{
p2 = mCoordTransform->transform( *i );
total += computeDistanceBearing( p1, p2 );
Expand Down Expand Up @@ -427,7 +427,7 @@ double QgsDistanceArea::measureLine( const QgsPoint& p1, const QgsPoint& p2 )
QgsPoint pp1 = p1, pp2 = p2;

QgsDebugMsg( QString( "Measuring from %1 to %2" ).arg( p1.toString( 4 ) ).arg( p2.toString( 4 ) ) );
if ( mEllipsoidalMode && ( mEllipsoid != "NONE" ) )
if ( mEllipsoidalMode && ( mEllipsoid != GEO_NONE ) )
{
QgsDebugMsg( QString( "Ellipsoidal calculations is enabled, using ellipsoid %1" ).arg( mEllipsoid ) );
QgsDebugMsg( QString( "From proj4 : %1" ).arg( mCoordTransform->sourceCrs().toProj4() ) );
Expand Down Expand Up @@ -496,7 +496,7 @@ unsigned char* QgsDistanceArea::measurePolygon( unsigned char* feature, double*

pnt = QgsPoint( x, y );

if ( mEllipsoidalMode && ( mEllipsoid != "NONE" ) )
if ( mEllipsoidalMode && ( mEllipsoid != GEO_NONE ) )
{
pnt = mCoordTransform->transform( pnt );
}
Expand Down Expand Up @@ -548,7 +548,7 @@ double QgsDistanceArea::measurePolygon( const QList<QgsPoint>& points )

try
{
if ( mEllipsoidalMode && ( mEllipsoid != "NONE" ) )
if ( mEllipsoidalMode && ( mEllipsoid != GEO_NONE ) )
{
QList<QgsPoint> pts;
for ( QList<QgsPoint>::const_iterator i = points.begin(); i != points.end(); ++i )
Expand Down Expand Up @@ -576,7 +576,7 @@ double QgsDistanceArea::bearing( const QgsPoint& p1, const QgsPoint& p2 )
QgsPoint pp1 = p1, pp2 = p2;
double bearing;

if ( mEllipsoidalMode && ( mEllipsoid != "NONE" ) )
if ( mEllipsoidalMode && ( mEllipsoid != GEO_NONE ) )
{
pp1 = mCoordTransform->transform( p1 );
pp2 = mCoordTransform->transform( p2 );
Expand Down Expand Up @@ -738,7 +738,7 @@ double QgsDistanceArea::computePolygonArea( const QList<QgsPoint>& points )
double area;

QgsDebugMsgLevel( "Ellipsoid: " + mEllipsoid, 3 );
if (( ! mEllipsoidalMode ) || ( mEllipsoid == "NONE" ) )
if (( ! mEllipsoidalMode ) || ( mEllipsoid == GEO_NONE ) )
{
return computePolygonFlatArea( points );
}
Expand Down Expand Up @@ -934,7 +934,7 @@ void QgsDistanceArea::convertMeasurement( double &measure, QGis::UnitType &measu
// The parameters measure and measureUnits are in/out

if (( measureUnits == QGis::Degrees || measureUnits == QGis::Feet ) &&
mEllipsoid != "NONE" &&
mEllipsoid != GEO_NONE &&
mEllipsoidalMode )
{
// Measuring on an ellipsoid returned meters. Force!
Expand Down
7 changes: 0 additions & 7 deletions src/ui/qgsdisplayanglebase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,6 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="mcbProjectionEnabled">
<property name="text">
<string>Ellipsoidal</string>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
Expand Down
7 changes: 0 additions & 7 deletions src/ui/qgsmeasurebase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,6 @@
</property>
</widget>
</item>
<item row="0" column="0" colspan="3">
<widget class="QCheckBox" name="mcbProjectionEnabled">
<property name="text">
<string>Ellipsoidal</string>
</property>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
Expand Down