Minimize canvas refreshes during save/rollback/cancel current edits actions

Author: dakcarto

src/app/qgisapp.cpp

@@ -5271,10 +5271,10 @@ bool QgisApp::toggleEditing( QgsMapLayer *layer, bool allowCancel )
 
 void QgisApp::saveActiveLayerEdits()
 {
-  saveEdits( activeLayer() );
+  saveEdits( activeLayer(), true, true );
 }
 
-void QgisApp::saveEdits( QgsMapLayer *layer, bool leaveEditable )
+void QgisApp::saveEdits( QgsMapLayer *layer, bool leaveEditable, bool triggerRepaint )
 {
   QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( layer );
   if ( !vlayer || !vlayer->isEditable() || !vlayer->isModified() )
@@ -5297,10 +5297,13 @@ void QgisApp::saveEdits( QgsMapLayer *layer, bool leaveEditable )
   {
     vlayer->startEditing();
   }
-  vlayer->triggerRepaint();
+  if ( triggerRepaint )
+  {
+    vlayer->triggerRepaint();
+  }
 }
 
-void QgisApp::cancelEdits( QgsMapLayer *layer, bool leaveEditable )
+void QgisApp::cancelEdits( QgsMapLayer *layer, bool leaveEditable, bool triggerRepaint )
 {
   QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( layer );
   if ( !vlayer || !vlayer->isEditable() )
@@ -5326,7 +5329,10 @@ void QgisApp::cancelEdits( QgsMapLayer *layer, bool leaveEditable )
   {
     vlayer->startEditing();
   }
-  vlayer->triggerRepaint();
+  if ( triggerRepaint )
+  {
+    vlayer->triggerRepaint();
+  }
 }
 
 void QgisApp::saveEdits()
@@ -5336,8 +5342,9 @@ void QgisApp::saveEdits()
 
   foreach ( QgsMapLayer * layer, mMapLegend->selectedLayers() )
   {
-    saveEdits( layer );
+    saveEdits( layer, true, false );
   }
+  mMapCanvas->refresh();
   activateDeactivateLayerRelatedActions( activeLayer() );
 }
 
@@ -5354,8 +5361,9 @@ void QgisApp::saveAllEdits( bool verifyAction )
 
   foreach ( QgsMapLayer * layer, editableLayers( true ) )
   {
-    saveEdits( layer );
+    saveEdits( layer, true, false );
   }
+  mMapCanvas->refresh();
   activateDeactivateLayerRelatedActions( activeLayer() );
 }
 
@@ -5366,8 +5374,9 @@ void QgisApp::rollbackEdits()
 
   foreach ( QgsMapLayer * layer, mMapLegend->selectedLayers() )
   {
-    cancelEdits( layer );
+    cancelEdits( layer, true, false );
   }
+  mMapCanvas->refresh();
   activateDeactivateLayerRelatedActions( activeLayer() );
 }
 
@@ -5384,8 +5393,9 @@ void QgisApp::rollbackAllEdits( bool verifyAction )
 
   foreach ( QgsMapLayer * layer, editableLayers( true ) )
   {
-    cancelEdits( layer );
+    cancelEdits( layer, true, false );
   }
+  mMapCanvas->refresh();
   activateDeactivateLayerRelatedActions( activeLayer() );
 }
 
@@ -5396,8 +5406,9 @@ void QgisApp::cancelEdits()
 
   foreach ( QgsMapLayer * layer, mMapLegend->selectedLayers() )
   {
-    cancelEdits( layer, false );
+    cancelEdits( layer, false, false );
   }
+  mMapCanvas->refresh();
   activateDeactivateLayerRelatedActions( activeLayer() );
 }
 
@@ -5414,12 +5425,13 @@ void QgisApp::cancelAllEdits( bool verifyAction )
 
   foreach ( QgsMapLayer * layer, editableLayers() )
   {
-    cancelEdits( layer, false );
+    cancelEdits( layer, false, false );
   }
+  mMapCanvas->refresh();
   activateDeactivateLayerRelatedActions( activeLayer() );
 }
 
-bool QgisApp::verifyEditsActionDialog( QString act, QString upon )
+bool QgisApp::verifyEditsActionDialog( const QString& act, const QString& upon )
 {
   bool res = false;
   switch ( QMessageBox::information( 0,

src/app/qgisapp.h

@@ -456,12 +456,18 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
      * @note added in 1.9 */
     void saveActiveLayerEdits();
 
-    //! Save edits of a layer
-    void saveEdits( QgsMapLayer *layer, bool leaveEditable = true );
+    /** Save edits of a layer
+     * @param leaveEditable leave the layer in editing mode when done (added in QGIS 1.9)
+     * @param triggerRepaint send layer signal to repaint canvas when done (added in QGIS 1.9)
+     */
+    void saveEdits( QgsMapLayer *layer, bool leaveEditable = true, bool triggerRepaint = true );
 
     /** Cancel edits for a layer
-      * @note added in 1.9 */
-    void cancelEdits( QgsMapLayer *layer, bool leaveEditable = true );
+      * @param leaveEditable leave the layer in editing mode when done
+      * @param triggerRepaint send layer signal to repaint canvas when done
+      * @note added in 1.9
+      */
+    void cancelEdits( QgsMapLayer *layer, bool leaveEditable = true, bool triggerRepaint = true );
 
     //! Save current edits for selected layer(s) and start new transaction(s)
     void saveEdits();
@@ -839,7 +845,7 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
 
     /** Dialog for verification of action on many edits
      * @note added in 1.9 */
-    bool verifyEditsActionDialog( QString act, QString upon );
+    bool verifyEditsActionDialog( const QString& act, const QString& upon );
 
     /** Update gui actions/menus when layers are modified
      * @note added in 1.9 */