Greatly speed up attribute table loading

nyalldawson · nyalldawson · commit b97a980b99a3 · 2017-05-22T19:07:19.000+10:00
Don't advise for rows added when a model reset is in progress. Otherwise the rows are tested for sort order, etc triggering a bunch of useless calculations, given that the model is in the process of being reset anyway. Tested using a 150k point shapefile, decreased attribute table load times from 50+ seconds to 4 seconds. Refs #16577, #16239
diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -197,7 +197,7 @@ bool QgsAttributeTableModel::removeRows( int row, int count, const QModelIndex &
   return true;
 }
 
-void QgsAttributeTableModel::featureAdded( QgsFeatureId fid )
+void QgsAttributeTableModel::featureAdded( QgsFeatureId fid , bool resettingModel )
 {
   QgsDebugMsgLevel( QString( "(%2) fid: %1" ).arg( fid ).arg( mFeatureRequest.filterType() ), 4 );
   bool featOk = true;
@@ -225,10 +225,12 @@ void QgsAttributeTableModel::featureAdded( QgsFeatureId fid )
     if ( ! mIdRowMap.contains( fid ) )
     {
       int n = mRowIdMap.size();
-      beginInsertRows( QModelIndex(), n, n );
+      if ( !resettingModel )
+        beginInsertRows( QModelIndex(), n, n );
       mIdRowMap.insert( fid, n );
       mRowIdMap.insert( n, fid );
-      endInsertRows();
+      if ( !resettingModel )
+        endInsertRows();
       reload( index( rowCount() - 1, 0 ), index( rowCount() - 1, columnCount() ) );
     }
   }
@@ -412,7 +414,7 @@ void QgsAttributeTableModel::loadLayer()
 
       t.restart();
     }
-    featureAdded( mFeat.id() );
+    featureAdded( mFeat.id(), true );
   }
 
   emit finished();
diff --git a/src/gui/attributetable/qgsattributetablemodel.h b/src/gui/attributetable/qgsattributetablemodel.h
@@ -307,7 +307,7 @@ class GUI_EXPORT QgsAttributeTableModel: public QAbstractTableModel
      * Launched when a feature has been added
      * @param fid feature id
      */
-    virtual void featureAdded( QgsFeatureId fid );
+    virtual void featureAdded( QgsFeatureId fid, bool resettingModel = false );
 
     /**
      * Launched when layer has been deleted

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ bool QgsAttributeTableModel::removeRows( int row, int count, const QModelIndex &`
`197`	`197`	`return true;`
`198`	`198`	`}`
`199`	`199`
`200`		`-void QgsAttributeTableModel::featureAdded( QgsFeatureId fid )`
	`200`	`+void QgsAttributeTableModel::featureAdded( QgsFeatureId fid , bool resettingModel )`
`201`	`201`	`{`
`202`	`202`	`QgsDebugMsgLevel( QString( "(%2) fid: %1" ).arg( fid ).arg( mFeatureRequest.filterType() ), 4 );`
`203`	`203`	`bool featOk = true;`
`@@ -225,10 +225,12 @@ void QgsAttributeTableModel::featureAdded( QgsFeatureId fid )`
`225`	`225`	`if ( ! mIdRowMap.contains( fid ) )`
`226`	`226`	`{`
`227`	`227`	`int n = mRowIdMap.size();`
`228`		`- beginInsertRows( QModelIndex(), n, n );`
	`228`	`+ if ( !resettingModel )`
	`229`	`+ beginInsertRows( QModelIndex(), n, n );`
`229`	`230`	`mIdRowMap.insert( fid, n );`
`230`	`231`	`mRowIdMap.insert( n, fid );`
`231`		`- endInsertRows();`
	`232`	`+ if ( !resettingModel )`
	`233`	`+ endInsertRows();`
`232`	`234`	`reload( index( rowCount() - 1, 0 ), index( rowCount() - 1, columnCount() ) );`
`233`	`235`	`}`
`234`	`236`	`}`
`@@ -412,7 +414,7 @@ void QgsAttributeTableModel::loadLayer()`
`412`	`414`
`413`	`415`	`t.restart();`
`414`	`416`	`}`
`415`		`- featureAdded( mFeat.id() );`
	`417`	`+ featureAdded( mFeat.id(), true );`
`416`	`418`	`}`
`417`	`419`
`418`	`420`	`emit finished();`