Disable view updates while reloading attribute table

m-kuhn · m-kuhn · commit fccd8e58cda9 · 2015-06-12T09:41:27.000+02:00
Fix #12930
diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -336,6 +336,7 @@ void QgsAttributeTableModel::loadAttributes()
 void QgsAttributeTableModel::loadLayer()
 {
   QgsDebugMsg( "entered." );
+  beginResetModel();
 
   if ( rowCount() != 0 )
   {
@@ -372,6 +373,7 @@ void QgsAttributeTableModel::loadLayer()
   connect( mLayerCache, SIGNAL( invalidated() ), this, SLOT( loadLayer() ) );
 
   mFieldCount = mAttributes.size();
+  endResetModel();
 }
 
 void QgsAttributeTableModel::swapRows( QgsFeatureId a, QgsFeatureId b )
@@ -620,12 +622,7 @@ void QgsAttributeTableModel::reload( const QModelIndex &index1, const QModelInde
   emit dataChanged( index1, index2 );
 }
 
-void QgsAttributeTableModel::resetModel()
-{
-  beginResetModel();
-  loadLayer();
-  endResetModel();
-}
+
 
 void QgsAttributeTableModel::executeAction( int action, const QModelIndex &idx ) const
 {
diff --git a/src/gui/attributetable/qgsattributetablemodel.h b/src/gui/attributetable/qgsattributetablemodel.h
@@ -117,8 +117,10 @@ class GUI_EXPORT QgsAttributeTableModel: public QAbstractTableModel
 
     /**
      * Resets the model
+     *
+     * Alias to loadLayer()
      */
-    void resetModel();
+    inline void resetModel() { loadLayer(); }
 
     /**
      * Maps feature id to table row

Original file line number	Diff line number	Diff line change
`@@ -336,6 +336,7 @@ void QgsAttributeTableModel::loadAttributes()`
`336`	`336`	`void QgsAttributeTableModel::loadLayer()`
`337`	`337`	`{`
`338`	`338`	`QgsDebugMsg( "entered." );`
	`339`	`+ beginResetModel();`
`339`	`340`
`340`	`341`	`if ( rowCount() != 0 )`
`341`	`342`	`{`
`@@ -372,6 +373,7 @@ void QgsAttributeTableModel::loadLayer()`
`372`	`373`	`connect( mLayerCache, SIGNAL( invalidated() ), this, SLOT( loadLayer() ) );`
`373`	`374`
`374`	`375`	`mFieldCount = mAttributes.size();`
	`376`	`+ endResetModel();`
`375`	`377`	`}`
`376`	`378`
`377`	`379`	`void QgsAttributeTableModel::swapRows( QgsFeatureId a, QgsFeatureId b )`
`@@ -620,12 +622,7 @@ void QgsAttributeTableModel::reload( const QModelIndex &index1, const QModelInde`
`620`	`622`	`emit dataChanged( index1, index2 );`
`621`	`623`	`}`
`622`	`624`
`623`		`-void QgsAttributeTableModel::resetModel()`
`624`		`-{`
`625`		`- beginResetModel();`
`626`		`- loadLayer();`
`627`		`- endResetModel();`
`628`		`-}`
	`625`	`+`
`629`	`626`
`630`	`627`	`void QgsAttributeTableModel::executeAction( int action, const QModelIndex &idx ) const`
`631`	`628`	`{`