Skip to content

Commit 86c0a16

Browse files
committed
Code cleanup
1 parent c4bc154 commit 86c0a16

File tree

4 files changed

+9
-21
lines changed

4 files changed

+9
-21
lines changed

src/app/qgsmeasuredialog.cpp

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,6 @@ void QgsMeasureDialog::updateSettings()
8181
mDa.setEllipsoid( QgsProject::instance()->ellipsoid() );
8282
mDa.setEllipsoidalMode( true );
8383

84-
QgsDebugMsg( "****************" );
85-
QgsDebugMsg( QString( "Ellipsoid ID : %1" ).arg( mDa.ellipsoid() ) );
86-
QgsDebugMsg( QString( "Ellipsoidal : %1" ).arg( mDa.ellipsoidalEnabled() ? "true" : "false" ) );
87-
QgsDebugMsg( QString( "Decimalplaces: %1" ).arg( mDecimalPlaces ) );
88-
QgsDebugMsg( QString( "Distance units: %1" ).arg( QgsUnitTypes::encodeUnit( mDistanceUnits ) ) );
89-
QgsDebugMsg( QString( "Area units: %1" ).arg( QgsUnitTypes::encodeUnit( mAreaUnits ) ) );
90-
QgsDebugMsg( QString( "Canvas units : %1" ).arg( QgsUnitTypes::encodeUnit( mCanvasUnits ) ) );
91-
9284
mTable->clear();
9385
mTotal = 0;
9486
updateUi();
@@ -107,7 +99,7 @@ void QgsMeasureDialog::unitsChanged( int index )
10799
if ( !mTool->done() )
108100
{
109101
// re-add temporary mouse cursor position
110-
addPoint( mLastMousePoint );
102+
addPoint();
111103
mouseMove( mLastMousePoint );
112104
}
113105
}
@@ -149,15 +141,12 @@ void QgsMeasureDialog::mouseMove( const QgsPoint &point )
149141
if ( item )
150142
{
151143
item->setText( 0, QLocale::system().toString( d, 'f', mDecimalPlaces ) );
152-
QgsDebugMsg( QString( "Final result is %1" ).arg( item->text( 0 ) ) );
153144
}
154145
}
155146
}
156147

157-
void QgsMeasureDialog::addPoint( const QgsPoint &p )
148+
void QgsMeasureDialog::addPoint()
158149
{
159-
Q_UNUSED( p );
160-
161150
int numPoints = mTool->points().size();
162151
if ( mMeasureArea && numPoints > 2 )
163152
{
@@ -179,7 +168,6 @@ void QgsMeasureDialog::addPoint( const QgsPoint &p )
179168
editTotal->setText( formatDistance( mTotal ) );
180169
}
181170
}
182-
QgsDebugMsg( "Exiting" );
183171
}
184172

185173
void QgsMeasureDialog::removeLastPoint()

src/app/qgsmeasuredialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class APP_EXPORT QgsMeasureDialog : public QDialog, private Ui::QgsMeasureBase
4343
void restorePosition();
4444

4545
//! Add new point
46-
void addPoint( const QgsPoint &point );
46+
void addPoint();
4747

4848
//! Mose move
4949
void mouseMove( const QgsPoint &point );

src/app/qgsmeasuretool.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ void QgsMeasureTool::updateSettings()
166166
if ( !mDone && mRubberBand->size() > 0 )
167167
{
168168
mRubberBand->addPoint( mPoints.last() );
169-
mDialog->addPoint( mPoints.last() );
169+
mDialog->addPoint();
170170
}
171171
if ( mRubberBand->size() > 0 )
172172
{
@@ -280,7 +280,7 @@ void QgsMeasureTool::addPoint( const QgsPoint &point )
280280
mRubberBandPoints->addPoint( point );
281281
if ( ! mDone ) // Prevent the insertion of a new item in segments measure table
282282
{
283-
mDialog->addPoint( point );
283+
mDialog->addPoint();
284284
}
285285
}
286286

tests/src/app/testqgsmeasuretool.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ void TestQgsMeasureTool::testLengthCalculation()
106106
tool->addPoint( QgsPoint( 2484588, 2425722 ) );
107107
tool->addPoint( QgsPoint( 2482767, 2398853 ) );
108108
//force dialog recalculation
109-
dlg->addPoint( QgsPoint( 0, 0 ) );
109+
dlg->addPoint();
110110

111111
// check result
112112
QString measureString = dlg->editTotal->text();
@@ -123,7 +123,7 @@ void TestQgsMeasureTool::testLengthCalculation()
123123
tool2->addPoint( QgsPoint( 2484588, 2425722 ) );
124124
tool2->addPoint( QgsPoint( 2482767, 2398853 ) );
125125
//force dialog recalculation
126-
dlg2->addPoint( QgsPoint( 0, 0 ) );
126+
dlg2->addPoint();
127127

128128
// check result
129129
measureString = dlg2->editTotal->text();
@@ -175,7 +175,7 @@ void TestQgsMeasureTool::testAreaCalculation()
175175
tool->addPoint( QgsPoint( 2520109, 2397715 ) );
176176
tool->addPoint( QgsPoint( 2520792, 2425494 ) );
177177
//force dialog recalculation
178-
dlg->addPoint( QgsPoint( 0, 0 ) );
178+
dlg->addPoint();
179179

180180
// check result
181181
QString measureString = dlg->editTotal->text();
@@ -194,7 +194,7 @@ void TestQgsMeasureTool::testAreaCalculation()
194194
tool2->addPoint( QgsPoint( 2520109, 2397715 ) );
195195
tool2->addPoint( QgsPoint( 2520792, 2425494 ) );
196196
//force dialog recalculation
197-
dlg2->addPoint( QgsPoint( 0, 0 ) );
197+
dlg2->addPoint();
198198

199199
// check result
200200
measureString = dlg2->editTotal->text();

0 commit comments

Comments
 (0)