[attrtable] Minimize feature requests on load (Fix #8851)

m-kuhn · m-kuhn · commit c0b8e9abdf17 · 2013-11-15T15:43:41.000+01:00
diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -133,7 +133,12 @@ bool QgsAttributeTableModel::removeRows( int row, int count, const QModelIndex &
 void QgsAttributeTableModel::featureAdded( QgsFeatureId fid )
 {
   QgsDebugMsgLevel( QString( "(%2) fid: %1" ).arg( fid ).arg( mFeatureRequest.filterType() ), 4 );
-  if ( loadFeatureAtId( fid ) && mFeatureRequest.acceptFeature( mFeat ) )
+  bool featOk = true;
+
+  if ( mFeat.id() != fid )
+    featOk = loadFeatureAtId( fid );
+
+  if ( featOk && mFeatureRequest.acceptFeature( mFeat ) )
   {
     mFieldCache[ fid ] = mFeat.attribute( mCachedField );
 
@@ -351,6 +356,7 @@ void QgsAttributeTableModel::loadLayer()
 
       t.restart();
     }
+    mFeat = feat;
     featureAdded( feat.id() );
   }
 

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,12 @@ bool QgsAttributeTableModel::removeRows( int row, int count, const QModelIndex &`
`133`	`133`	`void QgsAttributeTableModel::featureAdded( QgsFeatureId fid )`
`134`	`134`	`{`
`135`	`135`	`QgsDebugMsgLevel( QString( "(%2) fid: %1" ).arg( fid ).arg( mFeatureRequest.filterType() ), 4 );`
`136`		`- if ( loadFeatureAtId( fid ) && mFeatureRequest.acceptFeature( mFeat ) )`
	`136`	`+ bool featOk = true;`
	`137`	`+`
	`138`	`+ if ( mFeat.id() != fid )`
	`139`	`+ featOk = loadFeatureAtId( fid );`
	`140`	`+`
	`141`	`+ if ( featOk && mFeatureRequest.acceptFeature( mFeat ) )`
`137`	`142`	`{`
`138`	`143`	`mFieldCache[ fid ] = mFeat.attribute( mCachedField );`
`139`	`144`
`@@ -351,6 +356,7 @@ void QgsAttributeTableModel::loadLayer()`
`351`	`356`
`352`	`357`	`t.restart();`
`353`	`358`	`}`
	`359`	`+ mFeat = feat;`
`354`	`360`	`featureAdded( feat.id() );`
`355`	`361`	`}`
`356`	`362`