avoiding double call of dataChanged

qgis · Dec 17, 2019 · 0755647 · 0755647
1 parent b89f1e0
commit 0755647
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/python/core/auto_generated/qgsdataprovider.sip.in b/python/core/auto_generated/qgsdataprovider.sip.in
@@ -269,8 +269,6 @@ Reloads the data from the source by calling reloadProviderData() implemented
 by providers with data caches to synchronize, changes in the data source, feature
 counts and other specific actions.
 Emits the `dataChanged` signal
-
-.. seealso:: :py:func:`reloadProviderData`
 %End
 
     virtual QDateTime timestamp() const;

diff --git a/src/core/qgsdataprovider.h b/src/core/qgsdataprovider.h
@@ -360,7 +360,6 @@ class CORE_EXPORT QgsDataProvider : public QObject
      * by providers with data caches to synchronize, changes in the data source, feature
      * counts and other specific actions.
      * Emits the `dataChanged` signal
-     * \see reloadProviderData()
      */
     virtual void reloadData();
 

diff --git a/src/providers/wfs/qgsoapifprovider.cpp b/src/providers/wfs/qgsoapifprovider.cpp
@@ -234,6 +234,7 @@ QgsRectangle QgsOapifProvider::extent() const
 
 void QgsOapifProvider::reloadProviderData()
 {
+  mUpdateFeatureCountAtNextFeatureCountRequest = true;
   mShared->invalidateCache();
 }
 
@@ -301,13 +302,16 @@ bool QgsOapifProvider::setSubsetString( const QString &filter, bool updateFeatur
   if ( !mShared->computeServerFilter( errorMsg ) )
     QgsMessageLog::logMessage( errorMsg, tr( "OAPIF" ) );
 
-  reloadData();
+
   if ( updateFeatureCount )
   {
-    mUpdateFeatureCountAtNextFeatureCountRequest = true;
+    reloadData();
+  }
+  else
+  {
+    mShared->invalidateCache();
+    emit dataChanged();
   }
-
-  emit dataChanged();
 
   return true;
 }

diff --git a/src/providers/wfs/qgswfsprovider.cpp b/src/providers/wfs/qgswfsprovider.cpp
@@ -755,7 +755,9 @@ bool QgsWFSProvider::setSubsetString( const QString &theSQL, bool updateFeatureC
   QString errorMsg;
   if ( !mShared->computeFilter( errorMsg ) )
     QgsMessageLog::logMessage( errorMsg, tr( "WFS" ) );
-  reloadData();
+
+
+  mShared->invalidateCache();
   if ( updateFeatureCount )
     featureCount();