Skip to content

Commit e455264

Browse files
homannhomann
committedAug 23, 2012
Renamed accessor/mutator and deprecated old names
·
ltr-3_40Before-merge-new_vector_api
1 parent dd4de85 commit e455264

File tree

12 files changed

+27
-24
lines changed

12 files changed

+27
-24
lines changed
 

‎python/core/qgsdistancearea.sip

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ class QgsDistanceArea
1515

1616
//! sets whether coordinates must be projected to ellipsoid before measuring
1717
void setProjectionsEnabled(bool flag);
18+
void setEllipsoidalEnabled(bool flag) /Deprecated/;
1819

1920
//! returns projections enabled flag
20-
bool hasCrsTransformEnabled();
21+
bool ellipsoidalEnabled();
22+
bool hasCrsTransformEnabled() /Deprecated/;
2123

2224
//! sets source spatial reference system (by QGIS CRS)
2325
void setSourceCrs(long srsid);

‎src/analysis/network/qgsgraphbuilderintr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class ANALYSIS_EXPORT QgsGraphBuilderInterface
4646
{
4747
mDa.setSourceCrs( mCrs.srsid() );
4848
mDa.setEllipsoid( ellipsoidID );
49-
mDa.setProjectionsEnabled( ctfEnabled );
49+
mDa.setEllipsoidalEnabled( ctfEnabled );
5050
}
5151

5252
//! Destructor

‎src/app/qgsmaptoolidentify.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ bool QgsMapToolIdentify::identifyVectorLayer( QgsVectorLayer *layer, int x, int
245245
QgsDistanceArea calc;
246246
if ( !featureList.count() == 0 )
247247
{
248-
calc.setProjectionsEnabled( mCanvas->hasCrsTransformEnabled() ); // project?
248+
calc.setEllipsoidalEnabled( mCanvas->hasCrsTransformEnabled() ); // project?
249249
calc.setEllipsoid( ellipsoid );
250250
calc.setSourceCrs( layer->crs().srsid() );
251251
}

‎src/app/qgsmaptoolmeasureangle.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ void QgsMapToolMeasureAngle::configureDistanceArea()
183183
QString ellipsoidId = settings.value( "/qgis/measure/ellipsoid", "WGS84" ).toString();
184184
mDa.setSourceCrs( mCanvas->mapRenderer()->destinationCrs().srsid() );
185185
mDa.setEllipsoid( ellipsoidId );
186-
mDa.setProjectionsEnabled( mResultDisplay->projectionEnabled() );
186+
mDa.setEllipsoidalEnabled( mResultDisplay->projectionEnabled() );
187187
}
188188

189189

‎src/app/qgsmeasuredialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,5 +365,5 @@ void QgsMeasureDialog::configureDistanceArea()
365365
QString ellipsoidId = settings.value( "/qgis/measure/ellipsoid", "WGS84" ).toString();
366366
mDa.setSourceCrs( mTool->canvas()->mapRenderer()->destinationCrs().srsid() );
367367
mDa.setEllipsoid( ellipsoidId );
368-
mDa.setProjectionsEnabled( mcbProjectionEnabled->isChecked() );
368+
mDa.setEllipsoidalEnabled( mcbProjectionEnabled->isChecked() );
369369
}

‎src/core/composer/qgscomposerscalebar.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ double QgsComposerScaleBar::mapDiagonal() const
188188
else
189189
{
190190
QgsDistanceArea da;
191-
da.setProjectionsEnabled( true );
191+
da.setEllipsoidalEnabled( true );
192192
da.setSourceCrs( mComposerMap->mapRenderer()->destinationCrs().srsid() );
193193
QSettings s;
194194
da.setEllipsoid( s.value( "/qgis/measure/ellipsoid", "WGS84" ).toString() );

‎src/core/qgsdistancearea.cpp

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
QgsDistanceArea::QgsDistanceArea()
4242
{
4343
// init with default settings
44-
mProjectionsEnabled = false;
44+
mEllipsoidalEnabled = false;
4545
mCoordTransform = new QgsCoordinateTransform;
4646
setSourceCrs( GEOCRS_ID ); // WGS 84
4747
setEllipsoid( "WGS84" );
@@ -53,10 +53,9 @@ QgsDistanceArea::~QgsDistanceArea()
5353
delete mCoordTransform;
5454
}
5555

56-
57-
void QgsDistanceArea::setProjectionsEnabled( bool flag )
56+
void QgsDistanceArea::setEllipsoidalEnabled( bool flag )
5857
{
59-
mProjectionsEnabled = flag;
58+
mEllipsoidalEnabled = flag;
6059
}
6160

6261
void QgsDistanceArea::setSourceCrs( long srsid )
@@ -338,14 +337,14 @@ double QgsDistanceArea::measureLine( const QList<QgsPoint>& points )
338337

339338
try
340339
{
341-
if ( mProjectionsEnabled && ( mEllipsoid != "NONE" ) )
340+
if ( mEllipsoidalEnabled && ( mEllipsoid != "NONE" ) )
342341
p1 = mCoordTransform->transform( points[0] );
343342
else
344343
p1 = points[0];
345344

346345
for ( QList<QgsPoint>::const_iterator i = points.begin(); i != points.end(); ++i )
347346
{
348-
if ( mProjectionsEnabled && ( mEllipsoid != "NONE" ) )
347+
if ( mEllipsoidalEnabled && ( mEllipsoid != "NONE" ) )
349348
{
350349
p2 = mCoordTransform->transform( *i );
351350
total += computeDistanceBearing( p1, p2 );
@@ -379,7 +378,7 @@ double QgsDistanceArea::measureLine( const QgsPoint& p1, const QgsPoint& p2 )
379378
QgsPoint pp1 = p1, pp2 = p2;
380379

381380
QgsDebugMsg( QString( "Measuring from %1 to %2" ).arg( p1.toString( 4 ) ).arg( p2.toString( 4 ) ) );
382-
if ( mProjectionsEnabled && ( mEllipsoid != "NONE" ) )
381+
if ( mEllipsoidalEnabled && ( mEllipsoid != "NONE" ) )
383382
{
384383
QgsDebugMsg( QString( "Ellipsoidal calculations is enabled, using ellipsoid %1" ).arg( mEllipsoid ) );
385384
QgsDebugMsg( QString( "From proj4 : %1" ).arg( mCoordTransform->sourceCrs().toProj4() ) );
@@ -448,7 +447,7 @@ unsigned char* QgsDistanceArea::measurePolygon( unsigned char* feature, double*
448447

449448
pnt = QgsPoint( x, y );
450449

451-
if ( mProjectionsEnabled && ( mEllipsoid != "NONE" ) )
450+
if ( mEllipsoidalEnabled && ( mEllipsoid != "NONE" ) )
452451
{
453452
pnt = mCoordTransform->transform( pnt );
454453
}
@@ -500,7 +499,7 @@ double QgsDistanceArea::measurePolygon( const QList<QgsPoint>& points )
500499

501500
try
502501
{
503-
if ( mProjectionsEnabled && ( mEllipsoid != "NONE" ) )
502+
if ( mEllipsoidalEnabled && ( mEllipsoid != "NONE" ) )
504503
{
505504
QList<QgsPoint> pts;
506505
for ( QList<QgsPoint>::const_iterator i = points.begin(); i != points.end(); ++i )
@@ -528,7 +527,7 @@ double QgsDistanceArea::bearing( const QgsPoint& p1, const QgsPoint& p2 )
528527
QgsPoint pp1 = p1, pp2 = p2;
529528
double bearing;
530529

531-
if ( mProjectionsEnabled && ( mEllipsoid != "NONE" ) )
530+
if ( mEllipsoidalEnabled && ( mEllipsoid != "NONE" ) )
532531
{
533532
pp1 = mCoordTransform->transform( p1 );
534533
pp2 = mCoordTransform->transform( p2 );
@@ -690,7 +689,7 @@ double QgsDistanceArea::computePolygonArea( const QList<QgsPoint>& points )
690689
double area;
691690

692691
QgsDebugMsgLevel( "Ellipsoid: " + mEllipsoid, 3 );
693-
if (( ! mProjectionsEnabled ) || ( mEllipsoid == "NONE" ) )
692+
if (( ! mEllipsoidalEnabled ) || ( mEllipsoid == "NONE" ) )
694693
{
695694
return computePolygonFlatArea( points );
696695
}

‎src/core/qgsdistancearea.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,12 @@ class CORE_EXPORT QgsDistanceArea
4141
~QgsDistanceArea();
4242

4343
//! sets whether coordinates must be projected to ellipsoid before measuring
44-
void setProjectionsEnabled( bool flag );
44+
void setEllipsoidalEnabled( bool flag );
45+
Q_DECL_DEPRECATED void QgsDistanceArea::setProjectionsEnabled( bool flag ) { setEllipsoidalEnabled( flag ); };
4546

4647
//! returns projections enabled flag
47-
bool hasCrsTransformEnabled() { return mProjectionsEnabled; }
48+
bool ellipsoidalEnabled() { return mEllipsoidalEnabled; }
49+
Q_DECL_DEPRECATED bool hasCrsTransformEnabled() { return mEllipsoidalEnabled; }
4850

4951
//! sets source spatial reference system (by QGIS CRS)
5052
void setSourceCrs( long srsid );
@@ -134,7 +136,7 @@ class CORE_EXPORT QgsDistanceArea
134136
QgsCoordinateTransform* mCoordTransform;
135137

136138
//! indicates whether we will transform coordinates
137-
bool mProjectionsEnabled;
139+
bool mEllipsoidalEnabled;
138140

139141
//! id of the source spatial reference system
140142
long mSourceRefSys;

‎src/core/qgsexpression.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -913,7 +913,7 @@ bool QgsExpression::needsGeometry()
913913
void QgsExpression::initGeomCalculator()
914914
{
915915
mCalc = new QgsDistanceArea;
916-
mCalc->setProjectionsEnabled( false );
916+
mCalc->setEllipsoidalEnabled( false );
917917
QSettings settings;
918918
QString ellipsoid = settings.value( "/qgis/measure/ellipsoid", "WGS84" ).toString();
919919
mCalc->setEllipsoid( ellipsoid );

‎src/core/qgsmaprenderer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ void QgsMapRenderer::setProjectionsEnabled( bool enabled )
664664
{
665665
mProjectionsEnabled = enabled;
666666
QgsDebugMsg( "Adjusting DistArea projection on/off" );
667-
mDistArea->setProjectionsEnabled( enabled );
667+
mDistArea->setEllipsoidalEnabled( enabled );
668668
updateFullExtent();
669669
mLastExtent.setMinimal();
670670
emit hasCrsTransformEnabled( enabled );

‎src/plugins/heatmap/heatmap.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ float Heatmap::mapUnitsOf( float meters, QgsCoordinateReferenceSystem layerCrs )
307307
da.setEllipsoid( layerCrs.ellipsoidAcronym() );
308308
if ( da.geographic() )
309309
{
310-
da.setProjectionsEnabled( true );
310+
da.setEllipsoidalEnabled( true );
311311
}
312312
return meters / da.measureLine( QgsPoint( 0.0, 0.0 ), QgsPoint( 0.0, 1.0 ) );
313313
}

‎src/plugins/heatmap/heatmapgui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ float HeatmapGui::mapUnitsOf( float meters, QgsCoordinateReferenceSystem layerCr
336336
da.setEllipsoid( layerCrs.ellipsoidAcronym() );
337337
if ( da.geographic() )
338338
{
339-
da.setProjectionsEnabled( true );
339+
da.setEllipsoidalEnabled( true );
340340
}
341341
double unitDistance = da.measureLine( QgsPoint( 0.0, 0.0 ), QgsPoint( 0.0, 1.0 ) );
342342
QgsDebugMsg( QString( "Converted %1 meters to %2 mapunits" ).arg( meters ).arg( meters / unitDistance ) );

0 commit comments

Comments
 (0)
Please sign in to comment.