Skip to content

Commit d8ad1d8

Browse files
committed
Reintroduce $map and optional canvas refresh debug logs
1 parent 9e42c5b commit d8ad1d8

File tree

1 file changed

+10
-54
lines changed

1 file changed

+10
-54
lines changed

src/gui/qgsmapcanvas.cpp

Lines changed: 10 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -588,60 +588,6 @@ void QgsMapCanvas::refresh()
588588

589589
// schedule a refresh
590590
QTimer::singleShot( 1, this, SLOT( refreshMap() ) );
591-
592-
/*
593-
// we can't draw again if already drawing...
594-
if ( mDrawing )
595-
return;
596-
597-
QSettings settings;
598-
bool logRefresh = settings.value( "/Map/logCanvasRefreshEvent", false ).toBool();
599-
QTime t;
600-
if ( logRefresh )
601-
{
602-
t.start();
603-
}
604-
605-
mDrawing = true;
606-
607-
//update $map variable to canvas
608-
QgsExpression::setSpecialColumn( "$map", tr( "canvas" ) );
609-
610-
if ( mRenderFlag && !mFrozen )
611-
{
612-
clear();
613-
614-
// Tell the user we're going to be a while
615-
QApplication::setOverrideCursor( Qt::WaitCursor );
616-
617-
mMap->render();
618-
619-
mDirty = false;
620-
621-
// notify any listeners that rendering is complete
622-
QPainter p;
623-
p.begin( &mMap->paintDevice() );
624-
emit renderComplete( &p );
625-
p.end();
626-
627-
// Tell the user we've finished going to be a while
628-
QApplication::restoreOverrideCursor();
629-
}
630-
631-
mDrawing = false;
632-
633-
if ( logRefresh )
634-
{
635-
QString logMsg = tr( "Canvas refresh: %1 ms" ).arg( t.elapsed() );
636-
QObject* senderObj = QObject::sender();
637-
if ( senderObj )
638-
{
639-
logMsg += tr( ", sender '%1'" ).arg( senderObj->metaObject()->className() );
640-
}
641-
QgsMessageLog::logMessage( logMsg, tr( "Rendering" ) );
642-
}
643-
*/
644-
645591
} // refresh
646592

647593
void QgsMapCanvas::refreshMap()
@@ -655,6 +601,9 @@ void QgsMapCanvas::refreshMap()
655601
// from now on we can accept refresh requests again
656602
mRefreshScheduled = false;
657603

604+
//update $map variable to canvas
605+
QgsExpression::setSpecialColumn( "$map", tr( "canvas" ) );
606+
658607
// create the renderer job
659608
Q_ASSERT( mJob == 0 );
660609
mJobCancelled = false;
@@ -707,6 +656,13 @@ void QgsMapCanvas::rendererJobFinished()
707656
QPainter p( &img );
708657
emit renderComplete( &p );
709658

659+
QSettings settings;
660+
if ( settings.value( "/Map/logCanvasRefreshEvent", false ).toBool() )
661+
{
662+
QString logMsg = tr( "Canvas refresh: %1 ms" ).arg( mJob->renderingTime() );
663+
QgsMessageLog::logMessage( logMsg, tr( "Rendering" ) );
664+
}
665+
710666
if ( mDrawRenderingStats )
711667
{
712668
int w = img.width(), h = img.height();

0 commit comments

Comments
 (0)