reload visible filter on dataChange of table model and use the same (…

…renamed) slot (extendsChanged to reloadVisibleChanged
qgis · Mar 16, 2020 · 18dddff · 18dddff
1 parent afbb37f
commit 18dddff
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/python/gui/auto_generated/attributetable/qgsattributetablefiltermodel.sip.in b/python/gui/auto_generated/attributetable/qgsattributetablefiltermodel.sip.in
@@ -234,9 +234,10 @@ selection state of the feature in case selected features are to be shown on top.
 
   public slots:
 
-    void extentsChanged();
+    void reloadVisible();
 %Docstring
-Is called upon every change of the visible extents on the map canvas.
+Is called upon every change of the visible extents on the map canvas or when data of
+the master table model changes.
 When a change is signalled, the filter is updated and invalidated if needed.
 %End
 

diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.cpp b/src/gui/attributetable/qgsattributetablefiltermodel.cpp
@@ -313,12 +313,14 @@ void QgsAttributeTableFilterModel::setFilterMode( FilterMode filterMode )
   {
     if ( filterMode == ShowVisible )
     {
-      connect( mCanvas, &QgsMapCanvas::extentsChanged, this, &QgsAttributeTableFilterModel::extentsChanged );
+      connect( mCanvas, &QgsMapCanvas::extentsChanged, this, &QgsAttributeTableFilterModel::reloadVisible );
+      connect( mTableModel, &QgsAttributeTableModel::dataChanged, this, &QgsAttributeTableFilterModel::reloadVisible );
       generateListOfVisibleFeatures();
     }
     else
     {
-      disconnect( mCanvas, &QgsMapCanvas::extentsChanged, this, &QgsAttributeTableFilterModel::extentsChanged );
+      disconnect( mCanvas, &QgsMapCanvas::extentsChanged, this, &QgsAttributeTableFilterModel::reloadVisible );
+      disconnect( mTableModel, &QgsAttributeTableModel::dataChanged, this, &QgsAttributeTableFilterModel::reloadVisible );
     }
 
     mFilterMode = filterMode;
@@ -371,7 +373,7 @@ bool QgsAttributeTableFilterModel::filterAcceptsRow( int sourceRow, const QModel
   // returns are handled in their respective case statement above
 }
 
-void QgsAttributeTableFilterModel::extentsChanged()
+void QgsAttributeTableFilterModel::reloadVisible()
 {
   generateListOfVisibleFeatures();
   invalidateFilter();

diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.h b/src/gui/attributetable/qgsattributetablefiltermodel.h
@@ -255,10 +255,11 @@ class GUI_EXPORT QgsAttributeTableFilterModel: public QSortFilterProxyModel, pub
   public slots:
 
     /**
-     * Is called upon every change of the visible extents on the map canvas.
+     * Is called upon every change of the visible extents on the map canvas or when data of
+     * the master table model changes.
      * When a change is signalled, the filter is updated and invalidated if needed.
      */
-    void extentsChanged();
+    void reloadVisible();
 
   private slots:
     void selectionChanged();