Fix all layers are force redrawed whenever a filter is changed in any

nyalldawson · nirvn · commit cdfe7bc35dc4 · 2019-05-21T09:51:13.000+07:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2165,7 +2165,7 @@ void QgisApp::createActions()
   connect( mActionZoomActualSize, &QAction::triggered, this, &QgisApp::zoomActualSize );
   connect( mActionMapTips, &QAction::toggled, this, &QgisApp::toggleMapTips );
   connect( mActionNewBookmark, &QAction::triggered, this, &QgisApp::newBookmark );
-  connect( mActionDraw, &QAction::triggered, this, &QgisApp::refreshMapCanvas );
+  connect( mActionDraw, &QAction::triggered, this, [this] { refreshMapCanvas( true ); } );
   connect( mActionTextAnnotation, &QAction::triggered, this, &QgisApp::addTextAnnotation );
   connect( mActionFormAnnotation, &QAction::triggered, this, &QgisApp::addFormAnnotation );
   connect( mActionHtmlAnnotation, &QAction::triggered, this, &QgisApp::addHtmlAnnotation );
@@ -9159,13 +9159,16 @@ void QgisApp::copyFeatures( QgsFeatureStore &featureStore )
   clipboard()->replaceWithCopyOf( featureStore );
 }
 
-void QgisApp::refreshMapCanvas()
+void QgisApp::refreshMapCanvas( bool redrawAllLayers )
 {
   Q_FOREACH ( QgsMapCanvas *canvas, mapCanvases() )
   {
     //stop any current rendering
     canvas->stopRendering();
-    canvas->refreshAllLayers();
+    if ( redrawAllLayers )
+      canvas->refreshAllLayers();
+    else
+      canvas->refresh();
   }
 }
 
@@ -12102,7 +12105,7 @@ void QgisApp::layersWereAdded( const QList<QgsMapLayer *> &layers )
     if ( provider )
     {
       connect( provider, &QgsDataProvider::dataChanged, layer, [layer] { layer->triggerRepaint(); } );
-      connect( provider, &QgsDataProvider::dataChanged, this, &QgisApp::refreshMapCanvas );
+      connect( provider, &QgsDataProvider::dataChanged, this, [this] { refreshMapCanvas(); } );
     }
   }
 }
diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -1441,7 +1441,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
     void selectByForm();
 
     //! refresh map canvas
-    void refreshMapCanvas();
+    void refreshMapCanvas( bool redrawAllLayers = false );
 
     //! start "busy" progress bar
     void canvasRefreshStarted();

Original file line number	Diff line number	Diff line change
`@@ -2165,7 +2165,7 @@ void QgisApp::createActions()`
`2165`	`2165`	`connect( mActionZoomActualSize, &QAction::triggered, this, &QgisApp::zoomActualSize );`
`2166`	`2166`	`connect( mActionMapTips, &QAction::toggled, this, &QgisApp::toggleMapTips );`
`2167`	`2167`	`connect( mActionNewBookmark, &QAction::triggered, this, &QgisApp::newBookmark );`
`2168`		`- connect( mActionDraw, &QAction::triggered, this, &QgisApp::refreshMapCanvas );`
	`2168`	`+ connect( mActionDraw, &QAction::triggered, this, [this] { refreshMapCanvas( true ); } );`
`2169`	`2169`	`connect( mActionTextAnnotation, &QAction::triggered, this, &QgisApp::addTextAnnotation );`
`2170`	`2170`	`connect( mActionFormAnnotation, &QAction::triggered, this, &QgisApp::addFormAnnotation );`
`2171`	`2171`	`connect( mActionHtmlAnnotation, &QAction::triggered, this, &QgisApp::addHtmlAnnotation );`
`@@ -9159,13 +9159,16 @@ void QgisApp::copyFeatures( QgsFeatureStore &featureStore )`
`9159`	`9159`	`clipboard()->replaceWithCopyOf( featureStore );`
`9160`	`9160`	`}`
`9161`	`9161`
`9162`		`-void QgisApp::refreshMapCanvas()`
	`9162`	`+void QgisApp::refreshMapCanvas( bool redrawAllLayers )`
`9163`	`9163`	`{`
`9164`	`9164`	`Q_FOREACH ( QgsMapCanvas *canvas, mapCanvases() )`
`9165`	`9165`	`{`
`9166`	`9166`	`//stop any current rendering`
`9167`	`9167`	`canvas->stopRendering();`
`9168`		`- canvas->refreshAllLayers();`
	`9168`	`+ if ( redrawAllLayers )`
	`9169`	`+ canvas->refreshAllLayers();`
	`9170`	`+ else`
	`9171`	`+ canvas->refresh();`
`9169`	`9172`	`}`
`9170`	`9173`	`}`
`9171`	`9174`
`@@ -12102,7 +12105,7 @@ void QgisApp::layersWereAdded( const QList<QgsMapLayer *> &layers )`
`12102`	`12105`	`if ( provider )`
`12103`	`12106`	`{`
`12104`	`12107`	`connect( provider, &QgsDataProvider::dataChanged, layer, [layer] { layer->triggerRepaint(); } );`
`12105`		`- connect( provider, &QgsDataProvider::dataChanged, this, &QgisApp::refreshMapCanvas );`
	`12108`	`+ connect( provider, &QgsDataProvider::dataChanged, this, [this] { refreshMapCanvas(); } );`
`12106`	`12109`	`}`
`12107`	`12110`	`}`
`12108`	`12111`	`}`