Replace multiple calls to featureCount() with just one when loading attribute table.

wonder · wonder · commit 3a8592b73403 · 2009-07-21T13:19:10.000Z
Can speed up loading of attribute table with providers not caching the feature count. By Vita Cizek. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11136 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/attributetable/qgsattributetablemodel.cpp b/src/app/attributetable/qgsattributetablemodel.cpp
@@ -157,18 +157,19 @@ void QgsAttributeTableModel::loadLayer()
   mRowIdMap.clear();
   mIdRowMap.clear();
 
-  if ( mFeatureCount < mLayer->pendingFeatureCount() )
+  int pendingFeatureCount = mLayer->pendingFeatureCount();
+  if ( mFeatureCount < pendingFeatureCount)
   {
     QgsDebugMsg( "ins" );
     ins = true;
-    beginInsertRows( QModelIndex(), mFeatureCount, mLayer->pendingFeatureCount() - 1 );
+    beginInsertRows( QModelIndex(), mFeatureCount, pendingFeatureCount - 1 );
 // QgsDebugMsg(QString("%1, %2").arg(mFeatureCount).arg(mLayer->pendingFeatureCount() - 1));
   }
-  else if ( mFeatureCount > mLayer->pendingFeatureCount() )
+  else if ( mFeatureCount > pendingFeatureCount )
   {
     QgsDebugMsg( "rm" );
     rm = true;
-    beginRemoveRows( QModelIndex(), mLayer->pendingFeatureCount(), mFeatureCount - 1 );
+    beginRemoveRows( QModelIndex(), pendingFeatureCount, mFeatureCount - 1 );
 // QgsDebugMsg(QString("%1, %2").arg(mFeatureCount).arg(mLayer->pendingFeatureCount() -1));
   }
 
@@ -181,7 +182,7 @@ void QgsAttributeTableModel::loadLayer()
   }
 
   // not needed when we have featureAdded signal
-  mFeatureCount = mLayer->pendingFeatureCount();
+  mFeatureCount = pendingFeatureCount;
   mFieldCount = mLayer->pendingFields().size();
 
   if ( ins )
@@ -235,7 +236,7 @@ int QgsAttributeTableModel::idToRow( const int id ) const
 {
   if ( !mIdRowMap.contains( id ) )
   {
-    QgsDebugMsg( QString( "idToRow: id %1 not in map" ).arg( id ) );
+    QgsDebugMsg( QString( "idToRow: id %1 not in the map" ).arg( id ) );
     return -1;
   }
 
@@ -246,7 +247,7 @@ int QgsAttributeTableModel::rowToId( const int id ) const
 {
   if ( !mRowIdMap.contains( id ) )
   {
-    QgsDebugMsg( QString( "rowToId: row %1 not in map" ).arg( id ) );
+    QgsDebugMsg( QString( "rowToId: row %1 not in the map" ).arg( id ) );
     return -1;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -157,18 +157,19 @@ void QgsAttributeTableModel::loadLayer()`
`157`	`157`	`mRowIdMap.clear();`
`158`	`158`	`mIdRowMap.clear();`
`159`	`159`
`160`		`- if ( mFeatureCount < mLayer->pendingFeatureCount() )`
	`160`	`+ int pendingFeatureCount = mLayer->pendingFeatureCount();`
	`161`	`+ if ( mFeatureCount < pendingFeatureCount)`
`161`	`162`	`{`
`162`	`163`	`QgsDebugMsg( "ins" );`
`163`	`164`	`ins = true;`
`164`		`- beginInsertRows( QModelIndex(), mFeatureCount, mLayer->pendingFeatureCount() - 1 );`
	`165`	`+ beginInsertRows( QModelIndex(), mFeatureCount, pendingFeatureCount - 1 );`
`165`	`166`	`// QgsDebugMsg(QString("%1, %2").arg(mFeatureCount).arg(mLayer->pendingFeatureCount() - 1));`
`166`	`167`	`}`
`167`		`- else if ( mFeatureCount > mLayer->pendingFeatureCount() )`
	`168`	`+ else if ( mFeatureCount > pendingFeatureCount )`
`168`	`169`	`{`
`169`	`170`	`QgsDebugMsg( "rm" );`
`170`	`171`	`rm = true;`
`171`		`- beginRemoveRows( QModelIndex(), mLayer->pendingFeatureCount(), mFeatureCount - 1 );`
	`172`	`+ beginRemoveRows( QModelIndex(), pendingFeatureCount, mFeatureCount - 1 );`
`172`	`173`	`// QgsDebugMsg(QString("%1, %2").arg(mFeatureCount).arg(mLayer->pendingFeatureCount() -1));`
`173`	`174`	`}`
`174`	`175`
`@@ -181,7 +182,7 @@ void QgsAttributeTableModel::loadLayer()`
`181`	`182`	`}`
`182`	`183`
`183`	`184`	`// not needed when we have featureAdded signal`
`184`		`- mFeatureCount = mLayer->pendingFeatureCount();`
	`185`	`+ mFeatureCount = pendingFeatureCount;`
`185`	`186`	`mFieldCount = mLayer->pendingFields().size();`
`186`	`187`
`187`	`188`	`if ( ins )`
`@@ -235,7 +236,7 @@ int QgsAttributeTableModel::idToRow( const int id ) const`
`235`	`236`	`{`
`236`	`237`	`if ( !mIdRowMap.contains( id ) )`
`237`	`238`	`{`
`238`		`- QgsDebugMsg( QString( "idToRow: id %1 not in map" ).arg( id ) );`
	`239`	`+ QgsDebugMsg( QString( "idToRow: id %1 not in the map" ).arg( id ) );`
`239`	`240`	`return -1;`
`240`	`241`	`}`
`241`	`242`
`@@ -246,7 +247,7 @@ int QgsAttributeTableModel::rowToId( const int id ) const`
`246`	`247`	`{`
`247`	`248`	`if ( !mRowIdMap.contains( id ) )`
`248`	`249`	`{`
`249`		`- QgsDebugMsg( QString( "rowToId: row %1 not in map" ).arg( id ) );`
	`250`	`+ QgsDebugMsg( QString( "rowToId: row %1 not in the map" ).arg( id ) );`
`250`	`251`	`return -1;`
`251`	`252`	`}`
`252`	`253`