Skip to content

Commit 20c729a

Browse files
author
Sandro Santilli
committed
Add a QgsDebugCall macro to trace entering/leaving functions
Replace manual debugging lines used for the same purpose in a couple of implementation files for node tool.
1 parent c510c44 commit 20c729a

File tree

3 files changed

+26
-9
lines changed

3 files changed

+26
-9
lines changed

src/app/nodetool/qgsmaptoolnodetool.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ void QgsMapToolNodeTool::canvasMoveEvent( QMouseEvent * e )
345345

346346
void QgsMapToolNodeTool::canvasPressEvent( QMouseEvent * e )
347347
{
348-
QgsDebugMsg( "Entering." );
348+
QgsDebugCall;
349349

350350
QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( mCanvas->currentLayer() );
351351

@@ -473,12 +473,11 @@ void QgsMapToolNodeTool::canvasPressEvent( QMouseEvent * e )
473473
}
474474
}
475475
}
476-
QgsDebugMsg( "Leaving." );
477476
}
478477

479478
void QgsMapToolNodeTool::selectedFeatureDestroyed()
480479
{
481-
QgsDebugMsg( "Entered." );
480+
QgsDebugCall;
482481
mSelectedFeature = 0;
483482
}
484483

src/app/nodetool/qgsselectedfeature.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ QgsSelectedFeature::QgsSelectedFeature( QgsFeatureId featureId,
3535
, mRubberBand( 0 )
3636
, mValidator( 0 )
3737
{
38-
QgsDebugMsg( "Entering." );
38+
QgsDebugCall;
3939
setSelectedFeature( featureId, vlayer, canvas );
4040
}
4141

4242
QgsSelectedFeature::~QgsSelectedFeature()
4343
{
44-
QgsDebugMsg( "Entering." );
44+
QgsDebugCall;
4545

4646
deleteVertexMap();
4747

@@ -61,14 +61,14 @@ QgsSelectedFeature::~QgsSelectedFeature()
6161

6262
void QgsSelectedFeature::currentLayerChanged( QgsMapLayer *layer )
6363
{
64-
QgsDebugMsg( "Entering." );
64+
QgsDebugCall;
6565
if ( layer == mVlayer )
6666
deleteLater();
6767
}
6868

6969
void QgsSelectedFeature::updateGeometry( QgsGeometry *geom )
7070
{
71-
QgsDebugMsg( "Entering." );
71+
QgsDebugCall;
7272

7373
delete mGeometry;
7474

@@ -149,7 +149,7 @@ void QgsSelectedFeature::featureDeleted( QgsFeatureId fid )
149149

150150
void QgsSelectedFeature::geometryChanged( QgsFeatureId fid, QgsGeometry &geom )
151151
{
152-
QgsDebugMsg( "Entering." );
152+
QgsDebugCall;
153153

154154
if ( !mVlayer || fid != mFeatureId )
155155
return;
@@ -483,7 +483,7 @@ void QgsSelectedFeature::createVertexMapPoint()
483483

484484
void QgsSelectedFeature::createVertexMap()
485485
{
486-
QgsDebugMsg( "Entering." );
486+
QgsDebugCall;
487487

488488
if ( !mGeometry )
489489
{

src/core/qgslogger.h

+18
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ class QFile;
3030
if ( QgsLogger::debugLevel() >= (level) && (level) > 0 ) \
3131
QgsLogger::debug(QString(str), (level), __FILE__, __FUNCTION__, __LINE__); \
3232
}
33+
#define QgsDebugCall QgsScopeLogger _qgsScopeLogger(__FILE__, __FUNCTION__, __LINE__)
3334
#else
35+
#define QgsDebugCall
3436
#define QgsDebugMsg(str)
3537
#define QgsDebugMsgLevel(str, level)
3638
#endif
@@ -130,4 +132,20 @@ class CORE_EXPORT QgsLogger
130132
static int sPrefixLength;
131133
};
132134

135+
class QgsScopeLogger {
136+
public:
137+
QgsScopeLogger(const char* file, const char* func, int line)
138+
: _file(file), _func(func), _line(line)
139+
{
140+
QgsLogger::debug("Entering.", 1, _file, _func, _line);
141+
}
142+
~QgsScopeLogger() {
143+
QgsLogger::debug("Leaving.", 1, _file, _func, _line);
144+
}
145+
private:
146+
const char *_file;
147+
const char *_func;
148+
int _line;
149+
};
150+
133151
#endif

0 commit comments

Comments
 (0)