Skip to content

Commit 1dcd3a5

Browse files
author
wonder
committed
Small cleanups in debug messages, now displaying correct total rendering time.
git-svn-id: http://svn.osgeo.org/qgis/trunk@5766 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 9830a34 commit 1dcd3a5

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

src/gui/qgsmaprender.cpp

+8-10
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,9 @@ void QgsMapRender::render(QPainter* painter)
195195

196196
mDrawing = true;
197197

198-
int myRenderCounter = 0;
199198

200199
#ifdef QGISDEBUG
201-
QgsDebugMsg("QgsMapRender::render: Starting to render layer stack.");
200+
QgsDebugMsg("Starting to render layer stack.");
202201
QTime renderTime;
203202
renderTime.start();
204203
#endif
@@ -208,7 +207,7 @@ void QgsMapRender::render(QPainter* painter)
208207

209208
while (li != layers.end())
210209
{
211-
QgsDebugMsg("QgsMapRender::render: at layer item '" + (*li));
210+
QgsDebugMsg("At layer item '" + (*li) + "'");
212211

213212
// This call is supposed to cause the progress bar to
214213
// advance. However, it seems that updating the progress bar is
@@ -223,13 +222,13 @@ void QgsMapRender::render(QPainter* painter)
223222

224223
if (!ml)
225224
{
226-
QgsLogger::warning("QgsMapRender::render: layer not found in registry!");
225+
QgsLogger::warning("Layer not found in registry!");
227226
li++;
228227
continue;
229228
}
230229

231230
#ifdef QGISDEBUG
232-
QgsDebugMsg("QgsMapRender::render: Rendering layer " + ml->name());
231+
QgsDebugMsg("Rendering layer " + ml->name());
233232
QgsLogger::debug(" Layer minscale ", ml->minScale(), 1, __FILE__, __FUNCTION__, __LINE__);
234233
QgsLogger::debug(" Layer maxscale ", ml->maxScale(), 1, __FILE__, __FUNCTION__, __LINE__);
235234
QgsLogger::debug(" Scale dep. visibility enabled? ", ml->scaleBasedVisibility(), 1,\
@@ -272,8 +271,8 @@ void QgsMapRender::render(QPainter* painter)
272271
}
273272
else
274273
{
275-
QgsDebugMsg("QgsMapRender::render: Layer not rendered because it is not within the defined \
276-
visibility scale range")
274+
QgsDebugMsg("Layer not rendered because it is not within the defined \
275+
visibility scale range");
277276
}
278277

279278
} // if (ml->visible())
@@ -282,7 +281,7 @@ visibility scale range")
282281

283282
} // while (li != end)
284283

285-
QgsDebugMsg("QgsMapRender::render: Done rendering map layers");
284+
QgsDebugMsg("Done rendering map layers");
286285

287286
if (!mOverview)
288287
{
@@ -316,8 +315,7 @@ visibility scale range")
316315
emit setProgress(1,1);
317316

318317
#ifdef QGISDEBUG
319-
QgsLogger::debug("QgsMapRender::render: Rendering done in (seconds)", renderTime.elapsed() / 1000.0, 1,\
320-
__FILE__, __FUNCTION__, __LINE__);
318+
QgsDebugMsg("Rendering done in " + QString("%1").arg(renderTime.elapsed() / 1000.0) + " seconds");
321319
#endif
322320

323321
mDrawing = false;

0 commit comments

Comments
 (0)