Update feature count on layer modification (Fix #8445)

jdvaz · m-kuhn · commit 5e4a42ebb942 · 2013-08-19T17:37:48.000+02:00
diff --git a/src/app/legend/qgslegendlayer.cpp b/src/app/legend/qgslegendlayer.cpp
@@ -496,9 +496,9 @@ QString QgsLegendLayer::label()
 {
   QString name = mLyr.layer()->name();
   QgsVectorLayer *vlayer = dynamic_cast<QgsVectorLayer *>( mLyr.layer() );
-  if ( mShowFeatureCount && vlayer && vlayer->featureCount() >= 0 )
+  if ( mShowFeatureCount && vlayer && vlayer->pendingFeatureCount() >= 0 )
   {
-    name += QString( " [%1]" ).arg( vlayer->featureCount() );
+    name += QString( " [%1]" ).arg( vlayer->pendingFeatureCount() );
   }
   return name;
 }
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -1498,6 +1498,7 @@ bool QgsVectorLayer::startEditing()
 
   mEditBuffer = new QgsVectorLayerEditBuffer( this );
   // forward signals
+  connect( mEditBuffer, SIGNAL( layerModified() ), this, SLOT( invalidateSymbolCountedFlag() ) );
   connect( mEditBuffer, SIGNAL( layerModified() ), this, SIGNAL( layerModified() ) ); // TODO[MD]: necessary?
   //connect( mEditBuffer, SIGNAL( layerModified() ), this, SLOT( triggerRepaint() ) ); // TODO[MD]: works well?
   connect( mEditBuffer, SIGNAL( featureAdded( QgsFeatureId ) ), this, SIGNAL( featureAdded( QgsFeatureId ) ) );
@@ -3771,6 +3772,11 @@ void QgsVectorLayer::onCacheImageDelete()
     mCurrentRendererContext->setRenderingStopped( true );
 }
 
+void QgsVectorLayer::invalidateSymbolCountedFlag()
+{
+  mSymbolFeatureCounted = false;
+}
+
 QgsVectorLayer::ValueRelationData &QgsVectorLayer::valueRelation( int idx )
 {
   const QgsFields &fields = pendingFields();
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -1305,6 +1305,9 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
      */
     virtual void onCacheImageDelete();
 
+  protected slots:
+    void invalidateSymbolCountedFlag();
+
   signals:
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -496,9 +496,9 @@ QString QgsLegendLayer::label()`
`496`	`496`	`{`
`497`	`497`	`QString name = mLyr.layer()->name();`
`498`	`498`	`QgsVectorLayer vlayer = dynamic_cast<QgsVectorLayer >( mLyr.layer() );`
`499`		`- if ( mShowFeatureCount && vlayer && vlayer->featureCount() >= 0 )`
	`499`	`+ if ( mShowFeatureCount && vlayer && vlayer->pendingFeatureCount() >= 0 )`
`500`	`500`	`{`
`501`		`- name += QString( " [%1]" ).arg( vlayer->featureCount() );`
	`501`	`+ name += QString( " [%1]" ).arg( vlayer->pendingFeatureCount() );`
`502`	`502`	`}`
`503`	`503`	`return name;`
`504`	`504`	`}`