[attrtable] Only update table at the end of an edit command

Fix #9315
qgis · Jan 30, 2014 · 3ba33d7 · 3ba33d7
1 parent 70c5949
commit 3ba33d7
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 1 deletion.
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -3263,17 +3263,20 @@ void QgsVectorLayer::setRendererV2( QgsFeatureRendererV2 *r )
 void QgsVectorLayer::beginEditCommand( QString text )
 {
   undoStack()->beginMacro( text );
+  emit editCommandStarted( text );
 }
 
 void QgsVectorLayer::endEditCommand()
 {
   undoStack()->endMacro();
+  emit editCommandEnded();
 }
 
 void QgsVectorLayer::destroyEditCommand()
 {
   undoStack()->endMacro();
   undoStack()->undo();
+  emit editCommandDestroyed();
 }
 
 

diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -1539,6 +1539,27 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
     /** Signal emitted when setLayerTransparency() is called */
     void layerTransparencyChanged( int layerTransparency );
 
+    /**
+     * Signal emitted when a new edit command has been started
+     *
+     * @param text Description for this edit command
+     */
+    void editCommandStarted( const QString& text );
+
+    /**
+     * Signal emitted, when an edit command successfully ended
+     * @note This does not mean it is also committed, only that it is written
+     * to the edit buffer. See {@link beforeCommitChanges()}
+     */
+    void editCommandEnded();
+
+    /**
+     * Signal emitted, whan an edit command is destroyed
+     * @note This is not a rollback, it is only related to the current edit command.
+     * See {@link beforeRollBack()}
+     */
+    void editCommandDestroyed();
+
   private slots:
     void onRelationsLoaded();
 

diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -55,6 +55,7 @@ QgsAttributeTableModel::QgsAttributeTableModel( QgsVectorLayerCache *layerCache,
   connect( layer(), SIGNAL( featureDeleted( QgsFeatureId ) ), this, SLOT( featureDeleted( QgsFeatureId ) ) );
   connect( layer(), SIGNAL( attributeDeleted( int ) ), this, SLOT( attributeDeleted( int ) ) );
   connect( layer(), SIGNAL( updatedFields() ), this, SLOT( updatedFields() ) );
+  connect( layer(), SIGNAL( editCommandEnded() ), this, SLOT( editCommandEnded() ) );
   connect( mLayerCache, SIGNAL( featureAdded( QgsFeatureId ) ), this, SLOT( featureAdded( QgsFeatureId ) ) );
   connect( mLayerCache, SIGNAL( cachedLayerDeleted() ), this, SLOT( layerDeleted() ) );
 }
@@ -162,6 +163,14 @@ void QgsAttributeTableModel::updatedFields()
   emit modelChanged();
 }
 
+void QgsAttributeTableModel::editCommandEnded()
+{
+  reload( createIndex( mChangedCellBounds.top(), mChangedCellBounds.left() ),
+          createIndex( mChangedCellBounds.bottom(), mChangedCellBounds.right() ) );
+
+  mChangedCellBounds = QRect();
+}
+
 void QgsAttributeTableModel::attributeDeleted( int idx )
 {
   if ( idx == mCachedField )
@@ -592,7 +601,29 @@ bool QgsAttributeTableModel::setData( const QModelIndex &index, const QVariant &
   if ( !layer()->isModified() )
     return false;
 
-  emit dataChanged( index, index );
+  if ( mChangedCellBounds.isNull() )
+  {
+    mChangedCellBounds = QRect( index.column(), index.row(), 0, 0 );
+  }
+  else
+  {
+    if ( index.column() < mChangedCellBounds.left() )
+    {
+      mChangedCellBounds.setLeft( index.column() );
+    }
+    if ( index.row() < mChangedCellBounds.top() )
+    {
+      mChangedCellBounds.setTop( index.row() );
+    }
+    if ( index.column() > mChangedCellBounds.right() )
+    {
+      mChangedCellBounds.setRight( index.column() );
+    }
+    if ( index.row() > mChangedCellBounds.bottom() )
+    {
+      mChangedCellBounds.setBottom( index.row() );
+    }
+  }
 
   return true;
 }

diff --git a/src/gui/attributetable/qgsattributetablemodel.h b/src/gui/attributetable/qgsattributetablemodel.h
@@ -212,6 +212,13 @@ class GUI_EXPORT QgsAttributeTableModel: public QAbstractTableModel
      */
     virtual void updatedFields();
 
+    /**
+     * Gets called when an edit command ends
+     * This will synchronize all fields which have been changed since the last
+     * edit command in one single go
+     */
+    virtual void editCommandEnded();
+
     /**
      * Called whenever a column is removed;
      */
@@ -274,6 +281,15 @@ class GUI_EXPORT QgsAttributeTableModel: public QAbstractTableModel
     int mCachedField;
     /** Allows to cache one specific column (used for sorting) */
     QHash<QgsFeatureId, QVariant> mFieldCache;
+
+    /**
+     * Holds the bounds of changed cells while an update operation is running
+     * top    = min row
+     * left   = min column
+     * bottom = max row
+     * right  = max column
+     */
+    QRect mChangedCellBounds;
 };