When undo/redoing changes in QgsVectorLayer, ensure triggerRepaint

signal is emitted so that layer is redrawn in **all** map canvases
qgis · Dec 8, 2022 · 8c68d64 · 8c68d64
1 parent 3458bea
commit 8c68d64
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 4 deletions.
diff --git a/src/core/vector/qgsvectorlayereditbuffer.cpp b/src/core/vector/qgsvectorlayereditbuffer.cpp
@@ -58,6 +58,7 @@ void QgsVectorLayerEditBuffer::undoIndexChanged( int index )
 
   QgsDebugMsgLevel( QStringLiteral( "undo index changed %1" ).arg( index ), 4 );
   Q_UNUSED( index )
+  L->triggerRepaint();
   emit layerModified();
 }
 
@@ -167,9 +168,12 @@ bool QgsVectorLayerEditBuffer::addFeatures( QgsFeatureList &features )
   mBlockModifiedSignals--;
 
   if ( anyAdded )
+  {
     emit layerModified();
+    L->triggerRepaint();
+    L->updateExtents();
+  }
 
-  L->updateExtents();
   return result;
 }
 
@@ -220,6 +224,7 @@ bool QgsVectorLayerEditBuffer::deleteFeatures( const QgsFeatureIds &fids )
     ok = deleteFeature( fid ) && ok;
 
   mBlockModifiedSignals--;
+  L->triggerRepaint();
   emit layerModified();
 
   return ok;
@@ -267,6 +272,7 @@ bool QgsVectorLayerEditBuffer::changeAttributeValues( QgsFeatureId fid, const Qg
   }
 
   mBlockModifiedSignals--;
+  L->triggerRepaint();
   emit layerModified();
 
   return success;

diff --git a/tests/src/python/test_layer_dependencies.py b/tests/src/python/test_layer_dependencies.py
@@ -217,8 +217,9 @@ def test_circular_dependencies_with_2_layers(self):
 
         # repaintRequested is called on commit changes on point
         # so it is on depending line
-        self.assertEqual(len(spy_lines_repaint_requested), 1)
-        self.assertEqual(len(spy_points_repaint_requested), 1)
+        # (ideally only one repaintRequested signal is fired, but it's harmless to fire multiple ones)
+        self.assertGreaterEqual(len(spy_lines_repaint_requested), 2)
+        self.assertGreaterEqual(len(spy_points_repaint_requested), 2)
 
     def test_circular_dependencies_with_1_layer(self):
 
@@ -249,7 +250,8 @@ def test_circular_dependencies_with_1_layer(self):
         self.assertEqual(len(spy_lines_data_changed), 4)
 
         # repaintRequested is called only once on commit changes on line
-        self.assertEqual(len(spy_lines_repaint_requested), 1)
+        # (ideally only one repaintRequested signal is fired, but it's harmless to fire multiple ones)
+        self.assertGreaterEqual(len(spy_lines_repaint_requested), 2)
 
     def test_layerDefinitionRewriteId(self):
         tmpfile = os.path.join(tempfile.tempdir, "test.qlr")