Trigger repaints instead of explicitly refreshing canvas

nyalldawson · nyalldawson · commit 4e10c5be0f47 · 2016-06-07T07:26:34.000+10:00
Inspired by work by @manisandro
diff --git a/src/app/nodetool/qgsmaptoolnodetool.cpp b/src/app/nodetool/qgsmaptoolnodetool.cpp
@@ -502,7 +502,7 @@ void QgsMapToolNodeTool::canvasReleaseEvent( QgsMapMouseEvent* e )
       }
 
       mSelectedFeature->moveSelectedVertexes( releaseLayerCoords - pressLayerCoords );
-      mCanvas->refresh();
+      vlayer->triggerRepaint();
     }
     else // selecting vertexes by rubberband
     {
@@ -646,7 +646,7 @@ void QgsMapToolNodeTool::canvasDoubleClickEvent( QgsMapMouseEvent* e )
   vlayer->endEditCommand();
 
   // make sure that new node gets its vertex marker
-  mCanvas->refresh();
+  vlayer->triggerRepaint();
 }
 
 void QgsMapToolNodeTool::deleteNodeSelection()
@@ -674,7 +674,7 @@ void QgsMapToolNodeTool::deleteNodeSelection()
 
       safeSelectVertex( nextVertexToSelect );
     }
-    mCanvas->refresh();
+    mSelectedFeature->vlayer()->triggerRepaint();
   }
 }
 
diff --git a/src/app/nodetool/qgsnodeeditor.cpp b/src/app/nodetool/qgsnodeeditor.cpp
@@ -230,7 +230,7 @@ bool QgsNodeEditorModel::setData( const QModelIndex& index, const QVariant& valu
   mLayer->beginEditCommand( QObject::tr( "Moved vertices" ) );
   mLayer->moveVertex( p, mSelectedFeature->featureId(), index.row() );
   mLayer->endEditCommand();
-  mCanvas->refresh();
+  mLayer->triggerRepaint();
 
   return false;
 }
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -5859,7 +5859,7 @@ void QgisApp::fieldCalculator()
   QgsFieldCalculator calc( myLayer, this );
   if ( calc.exec() )
   {
-    mMapCanvas->refresh();
+    myLayer->triggerRepaint();
   }
 }
 
@@ -6865,7 +6865,7 @@ void QgisApp::mergeAttributesOfSelectedFeatures()
 
   if ( mapCanvas() )
   {
-    mapCanvas()->refresh();
+    vl->triggerRepaint();
   }
 }
 
@@ -7045,7 +7045,7 @@ void QgisApp::mergeSelectedFeatures()
 
   if ( mapCanvas() )
   {
-    mapCanvas()->refresh();
+    vl->triggerRepaint();
   }
 }
 
@@ -7367,7 +7367,7 @@ void QgisApp::editPaste( QgsMapLayer *destinationLayer )
                                QgsMessageBar::WARNING, messageTimeout() );
   }
 
-  mMapCanvas->refresh();
+  pasteVectorLayer->triggerRepaint();
 }
 
 void QgisApp::pasteAsNewVector()
@@ -7600,8 +7600,7 @@ void QgisApp::pasteStyle( QgsMapLayer * destinationLayer )
       }
 
       mLayerTreeView->refreshLayerSymbology( selectionLayer->id() );
-      mMapCanvas->clearCache();
-      mMapCanvas->refresh();
+      selectionLayer->triggerRepaint();
     }
   }
 }
@@ -8056,7 +8055,7 @@ void QgisApp::layerSubsetString()
   {
     if ( subsetBefore != qb->sql() )
     {
-      mMapCanvas->refresh();
+      vlayer->triggerRepaint();
       if ( mLayerTreeView )
       {
         mLayerTreeView->refreshLayerSymbology( vlayer->id() );
@@ -8878,7 +8877,7 @@ void QgisApp::histogramStretch( bool visibleAreaOnly, QgsRaster::ContrastEnhance
 
   myRasterLayer->setContrastEnhancement( QgsContrastEnhancement::StretchToMinimumMaximum, theLimits, myRectangle );
 
-  mMapCanvas->refresh();
+  myRasterLayer->triggerRepaint();
 }
 
 void QgisApp::increaseBrightness()
diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp
@@ -828,12 +828,8 @@ void QgsDiagramProperties::apply()
   mLayer->setDiagramLayerSettings( dls );
 
   // refresh
-  if ( mMapCanvas )
-  {
-    QgisApp::instance()->markDirty();
-    if ( mMapCanvas )
-      mMapCanvas->refresh();
-  }
+  QgisApp::instance()->markDirty();
+  mLayer->triggerRepaint();
 }
 
 void QgsDiagramProperties::showAddAttributeExpressionDialog()
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -891,10 +891,7 @@ void QgsLabelingGui::apply()
   mFontMissingLabel->setVisible( false );
   QgisApp::instance()->markDirty();
   // trigger refresh
-  if ( mMapCanvas )
-  {
-    mMapCanvas->refresh();
-  }
+  mLayer->triggerRepaint();
 }
 
 void QgsLabelingGui::writeSettingsToLayer()
diff --git a/src/app/qgslabelingwidget.cpp b/src/app/qgslabelingwidget.cpp
@@ -139,10 +139,7 @@ void QgsLabelingWidget::apply()
   writeSettingsToLayer();
   QgisApp::instance()->markDirty();
   // trigger refresh
-  if ( mCanvas )
-  {
-    mCanvas->refresh();
-  }
+  mLayer->triggerRepaint();
 }
 
 void QgsLabelingWidget::labelModeChanged( int index )
diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp
@@ -170,7 +170,7 @@ void QgsMapToolAddFeature::cadCanvasReleaseEvent( QgsMapMouseEvent* e )
 
       addFeature( vlayer, &f, false );
 
-      mCanvas->refresh();
+      vlayer->triggerRepaint();
     }
   }
 
diff --git a/src/app/qgsmaptooladdpart.cpp b/src/app/qgsmaptooladdpart.cpp
@@ -192,7 +192,7 @@ void QgsMapToolAddPart::cadCanvasReleaseEvent( QgsMapMouseEvent * e )
 
       vlayer->endEditCommand();
 
-      mCanvas->refresh();
+      vlayer->triggerRepaint();
       return;
     }
 
diff --git a/src/app/qgsmaptoolchangelabelproperties.cpp b/src/app/qgsmaptoolchangelabelproperties.cpp
@@ -93,7 +93,7 @@ void QgsMapToolChangeLabelProperties::applyChanges( const QgsAttributeMap& chang
     }
 
     vlayer->endEditCommand();
-    mCanvas->refresh();
+    vlayer->triggerRepaint();
   }
 }
 
diff --git a/src/app/qgsmaptooldeletepart.cpp b/src/app/qgsmaptooldeletepart.cpp
@@ -107,7 +107,7 @@ void QgsMapToolDeletePart::canvasReleaseEvent( QgsMapMouseEvent* e )
     vlayer->beginEditCommand( tr( "Part of multipart feature deleted" ) );
     vlayer->changeGeometry( f.id(), g );
     vlayer->endEditCommand();
-    mCanvas->refresh();
+    vlayer->triggerRepaint();
   }
   else
   {
diff --git a/src/app/qgsmaptooldeletering.cpp b/src/app/qgsmaptooldeletering.cpp
@@ -115,7 +115,7 @@ void QgsMapToolDeleteRing::canvasReleaseEvent( QgsMapMouseEvent* e )
     vlayer->beginEditCommand( tr( "Ring deleted" ) );
     vlayer->changeGeometry( mPressedFid, g );
     vlayer->endEditCommand();
-    mCanvas->refresh();
+    vlayer->triggerRepaint();
   }
 }
 
@@ -197,7 +197,7 @@ void QgsMapToolDeleteRing::deleteRing( QgsFeatureId fId, int beforeVertexNr, Qgs
     vlayer->beginEditCommand( tr( "Ring deleted" ) );
     vlayer->changeGeometry( fId, editableGeom );
     vlayer->endEditCommand();
-    mCanvas->refresh();
+    vlayer->triggerRepaint();
   }
 
 }
diff --git a/src/app/qgsmaptoolmovefeature.cpp b/src/app/qgsmaptoolmovefeature.cpp
@@ -166,8 +166,8 @@ void QgsMapToolMoveFeature::canvasReleaseEvent( QgsMapMouseEvent* e )
   }
   delete mRubberBand;
   mRubberBand = nullptr;
-  mCanvas->refresh();
   vlayer->endEditCommand();
+  vlayer->triggerRepaint();
 }
 
 //! called when map tool is being deactivated
diff --git a/src/app/qgsmaptoolmovelabel.cpp b/src/app/qgsmaptoolmovelabel.cpp
@@ -169,8 +169,7 @@ void QgsMapToolMoveLabel::canvasReleaseEvent( QgsMapMouseEvent* e )
   }
   vlayer->endEditCommand();
 
-  if ( mCanvas )
-    mCanvas->refresh();
+  vlayer->triggerRepaint();
 }
 
 
diff --git a/src/app/qgsmaptooloffsetcurve.cpp b/src/app/qgsmaptooloffsetcurve.cpp
@@ -186,7 +186,7 @@ void QgsMapToolOffsetCurve::applyOffset()
   delete mSnapVertexMarker;
   mSnapVertexMarker = nullptr;
   mForceCopy = false;
-  mCanvas->refresh();
+  layer->triggerRepaint();
 }
 
 void QgsMapToolOffsetCurve::placeOffsetCurveToValue()
diff --git a/src/app/qgsmaptooloffsetpointsymbol.cpp b/src/app/qgsmaptooloffsetpointsymbol.cpp
@@ -164,7 +164,8 @@ void QgsMapToolOffsetPointSymbol::canvasReleaseEvent( QgsMapMouseEvent* e )
   mOffsetting = false;
   delete mOffsetItem;
   mOffsetItem = nullptr;
-  mCanvas->refresh();
+  if ( mActiveLayer )
+    mActiveLayer->triggerRepaint();
 }
 
 void QgsMapToolOffsetPointSymbol::createPreviewItem( QgsMarkerSymbolV2* markerSymbol )
diff --git a/src/app/qgsmaptoolrotatefeature.cpp b/src/app/qgsmaptoolrotatefeature.cpp
@@ -400,8 +400,8 @@ void QgsMapToolRotateFeature::applyRotation( double rotation )
   deleteRotationWidget();
   deleteRubberband();
 
-  mCanvas->refresh();
   vlayer->endEditCommand();
+  vlayer->triggerRepaint();
 }
 
 void QgsMapToolRotateFeature::activate()
diff --git a/src/app/qgsmaptoolrotatelabel.cpp b/src/app/qgsmaptoolrotatelabel.cpp
@@ -173,7 +173,7 @@ void QgsMapToolRotateLabel::canvasReleaseEvent( QgsMapMouseEvent* e )
   vlayer->beginEditCommand( tr( "Rotated label" ) + QString( " '%1'" ).arg( currentLabelText( 24 ) ) );
   vlayer->changeAttributeValue( mCurrentLabel.pos.featureId, rotationCol, rotation );
   vlayer->endEditCommand();
-  mCanvas->refresh();
+  vlayer->triggerRepaint();
 }
 
 int QgsMapToolRotateLabel::roundTo15Degrees( double n )
diff --git a/src/app/qgsmaptoolrotatepointsymbols.cpp b/src/app/qgsmaptoolrotatepointsymbols.cpp
@@ -199,7 +199,8 @@ void QgsMapToolRotatePointSymbols::canvasReleaseEvent( QgsMapMouseEvent* e )
   mRotating = false;
   delete mRotationItem;
   mRotationItem = nullptr;
-  mCanvas->refresh();
+  if ( mActiveLayer )
+    mActiveLayer->triggerRepaint();
 }
 
 double QgsMapToolRotatePointSymbols::calculateAzimut( QPoint mousePos )
diff --git a/src/app/qgsmaptoolshowhidelabels.cpp b/src/app/qgsmaptoolshowhidelabels.cpp
@@ -179,7 +179,7 @@ void QgsMapToolShowHideLabels::showHideLabels( QMouseEvent * e )
   if ( labelChanged )
   {
     vlayer->endEditCommand();
-    mCanvas->refresh();
+    vlayer->triggerRepaint();
   }
   else
   {
diff --git a/src/app/qgsmaptoolsimplify.cpp b/src/app/qgsmaptoolsimplify.cpp
@@ -182,7 +182,7 @@ void QgsMapToolSimplify::storeSimplified()
 
   clearSelection();
 
-  mCanvas->refresh();
+  vlayer->triggerRepaint();
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ void QgsMapToolNodeTool::canvasReleaseEvent( QgsMapMouseEvent* e )`
`502`	`502`	`}`
`503`	`503`
`504`	`504`	`mSelectedFeature->moveSelectedVertexes( releaseLayerCoords - pressLayerCoords );`
`505`		`- mCanvas->refresh();`
	`505`	`+ vlayer->triggerRepaint();`
`506`	`506`	`}`
`507`	`507`	`else // selecting vertexes by rubberband`
`508`	`508`	`{`
`@@ -646,7 +646,7 @@ void QgsMapToolNodeTool::canvasDoubleClickEvent( QgsMapMouseEvent* e )`
`646`	`646`	`vlayer->endEditCommand();`
`647`	`647`
`648`	`648`	`// make sure that new node gets its vertex marker`
`649`		`- mCanvas->refresh();`
	`649`	`+ vlayer->triggerRepaint();`
`650`	`650`	`}`
`651`	`651`
`652`	`652`	`void QgsMapToolNodeTool::deleteNodeSelection()`
`@@ -674,7 +674,7 @@ void QgsMapToolNodeTool::deleteNodeSelection()`
`674`	`674`
`675`	`675`	`safeSelectVertex( nextVertexToSelect );`
`676`	`676`	`}`
`677`		`- mCanvas->refresh();`
	`677`	`+ mSelectedFeature->vlayer()->triggerRepaint();`
`678`	`678`	`}`
`679`	`679`	`}`
`680`	`680`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ bool QgsNodeEditorModel::setData( const QModelIndex& index, const QVariant& valu`
`230`	`230`	`mLayer->beginEditCommand( QObject::tr( "Moved vertices" ) );`
`231`	`231`	`mLayer->moveVertex( p, mSelectedFeature->featureId(), index.row() );`
`232`	`232`	`mLayer->endEditCommand();`
`233`		`- mCanvas->refresh();`
	`233`	`+ mLayer->triggerRepaint();`
`234`	`234`
`235`	`235`	`return false;`
`236`	`236`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5859,7 +5859,7 @@ void QgisApp::fieldCalculator()`
`5859`	`5859`	`QgsFieldCalculator calc( myLayer, this );`
`5860`	`5860`	`if ( calc.exec() )`
`5861`	`5861`	`{`
`5862`		`- mMapCanvas->refresh();`
	`5862`	`+ myLayer->triggerRepaint();`
`5863`	`5863`	`}`
`5864`	`5864`	`}`
`5865`	`5865`
`@@ -6865,7 +6865,7 @@ void QgisApp::mergeAttributesOfSelectedFeatures()`
`6865`	`6865`
`6866`	`6866`	`if ( mapCanvas() )`
`6867`	`6867`	`{`
`6868`		`- mapCanvas()->refresh();`
	`6868`	`+ vl->triggerRepaint();`
`6869`	`6869`	`}`
`6870`	`6870`	`}`
`6871`	`6871`
`@@ -7045,7 +7045,7 @@ void QgisApp::mergeSelectedFeatures()`
`7045`	`7045`
`7046`	`7046`	`if ( mapCanvas() )`
`7047`	`7047`	`{`
`7048`		`- mapCanvas()->refresh();`
	`7048`	`+ vl->triggerRepaint();`
`7049`	`7049`	`}`
`7050`	`7050`	`}`
`7051`	`7051`
`@@ -7367,7 +7367,7 @@ void QgisApp::editPaste( QgsMapLayer *destinationLayer )`
`7367`	`7367`	`QgsMessageBar::WARNING, messageTimeout() );`
`7368`	`7368`	`}`
`7369`	`7369`
`7370`		`- mMapCanvas->refresh();`
	`7370`	`+ pasteVectorLayer->triggerRepaint();`
`7371`	`7371`	`}`
`7372`	`7372`
`7373`	`7373`	`void QgisApp::pasteAsNewVector()`
`@@ -7600,8 +7600,7 @@ void QgisApp::pasteStyle( QgsMapLayer * destinationLayer )`
`7600`	`7600`	`}`
`7601`	`7601`
`7602`	`7602`	`mLayerTreeView->refreshLayerSymbology( selectionLayer->id() );`
`7603`		`- mMapCanvas->clearCache();`
`7604`		`- mMapCanvas->refresh();`
	`7603`	`+ selectionLayer->triggerRepaint();`
`7605`	`7604`	`}`
`7606`	`7605`	`}`
`7607`	`7606`	`}`
`@@ -8056,7 +8055,7 @@ void QgisApp::layerSubsetString()`
`8056`	`8055`	`{`
`8057`	`8056`	`if ( subsetBefore != qb->sql() )`
`8058`	`8057`	`{`
`8059`		`- mMapCanvas->refresh();`
	`8058`	`+ vlayer->triggerRepaint();`
`8060`	`8059`	`if ( mLayerTreeView )`
`8061`	`8060`	`{`
`8062`	`8061`	`mLayerTreeView->refreshLayerSymbology( vlayer->id() );`
`@@ -8878,7 +8877,7 @@ void QgisApp::histogramStretch( bool visibleAreaOnly, QgsRaster::ContrastEnhance`
`8878`	`8877`
`8879`	`8878`	`myRasterLayer->setContrastEnhancement( QgsContrastEnhancement::StretchToMinimumMaximum, theLimits, myRectangle );`
`8880`	`8879`
`8881`		`- mMapCanvas->refresh();`
	`8880`	`+ myRasterLayer->triggerRepaint();`
`8882`	`8881`	`}`
`8883`	`8882`
`8884`	`8883`	`void QgisApp::increaseBrightness()`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ void QgsMapToolAddFeature::cadCanvasReleaseEvent( QgsMapMouseEvent* e )`
`170`	`170`
`171`	`171`	`addFeature( vlayer, &f, false );`
`172`	`172`
`173`		`- mCanvas->refresh();`
	`173`	`+ vlayer->triggerRepaint();`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ void QgsMapToolAddPart::cadCanvasReleaseEvent( QgsMapMouseEvent * e )`
`192`	`192`
`193`	`193`	`vlayer->endEditCommand();`
`194`	`194`
`195`		`- mCanvas->refresh();`
	`195`	`+ vlayer->triggerRepaint();`
`196`	`196`	`return;`
`197`	`197`	`}`
`198`	`198`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ void QgsMapToolChangeLabelProperties::applyChanges( const QgsAttributeMap& chang`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`vlayer->endEditCommand();`
`96`		`- mCanvas->refresh();`
	`96`	`+ vlayer->triggerRepaint();`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ void QgsMapToolDeletePart::canvasReleaseEvent( QgsMapMouseEvent* e )`
`107`	`107`	`vlayer->beginEditCommand( tr( "Part of multipart feature deleted" ) );`
`108`	`108`	`vlayer->changeGeometry( f.id(), g );`
`109`	`109`	`vlayer->endEditCommand();`
`110`		`- mCanvas->refresh();`
	`110`	`+ vlayer->triggerRepaint();`
`111`	`111`	`}`
`112`	`112`	`else`
`113`	`113`	`{`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ void QgsMapToolDeleteRing::canvasReleaseEvent( QgsMapMouseEvent* e )`
`115`	`115`	`vlayer->beginEditCommand( tr( "Ring deleted" ) );`
`116`	`116`	`vlayer->changeGeometry( mPressedFid, g );`
`117`	`117`	`vlayer->endEditCommand();`
`118`		`- mCanvas->refresh();`
	`118`	`+ vlayer->triggerRepaint();`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`
`@@ -197,7 +197,7 @@ void QgsMapToolDeleteRing::deleteRing( QgsFeatureId fId, int beforeVertexNr, Qgs`
`197`	`197`	`vlayer->beginEditCommand( tr( "Ring deleted" ) );`
`198`	`198`	`vlayer->changeGeometry( fId, editableGeom );`
`199`	`199`	`vlayer->endEditCommand();`
`200`		`- mCanvas->refresh();`
	`200`	`+ vlayer->triggerRepaint();`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,8 +166,8 @@ void QgsMapToolMoveFeature::canvasReleaseEvent( QgsMapMouseEvent* e )`
`166`	`166`	`}`
`167`	`167`	`delete mRubberBand;`
`168`	`168`	`mRubberBand = nullptr;`
`169`		`- mCanvas->refresh();`
`170`	`169`	`vlayer->endEditCommand();`
	`170`	`+ vlayer->triggerRepaint();`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`//! called when map tool is being deactivated`
Original file line number	Diff line number	Diff line change
`@@ -169,8 +169,7 @@ void QgsMapToolMoveLabel::canvasReleaseEvent( QgsMapMouseEvent* e )`
`169`	`169`	`}`
`170`	`170`	`vlayer->endEditCommand();`
`171`	`171`
`172`		`- if ( mCanvas )`
`173`		`- mCanvas->refresh();`
	`172`	`+ vlayer->triggerRepaint();`
`174`	`173`	`}`
`175`	`174`
`176`	`175`