Merge pull request #36194 from signedav/filterfix_312

Avoid long loading in attributetable on model change
qgis · May 14, 2020 · 84d7523 · 84d7523
2 parents ffdd052 + 9c92393
commit 84d7523
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.cpp b/src/gui/attributetable/qgsattributetablefiltermodel.cpp
@@ -321,22 +321,24 @@ void QgsAttributeTableFilterModel::setFilterMode( FilterMode filterMode )
     if ( filterMode == ShowVisible )
     {
       connect( mCanvas, &QgsMapCanvas::extentsChanged, this, &QgsAttributeTableFilterModel::reloadVisible );
-      connect( mTableModel, &QgsAttributeTableModel::dataChanged, this, &QgsAttributeTableFilterModel::reloadVisible );
+      connect( layer(), &QgsVectorLayer::featureAdded, this, &QgsAttributeTableFilterModel::reloadVisible );
+      //featureDeleted is handled over selectionChanged
       generateListOfVisibleFeatures();
     }
     else
     {
       disconnect( mCanvas, &QgsMapCanvas::extentsChanged, this, &QgsAttributeTableFilterModel::reloadVisible );
-      disconnect( mTableModel, &QgsAttributeTableModel::dataChanged, this, &QgsAttributeTableFilterModel::reloadVisible );
+      disconnect( layer(), &QgsVectorLayer::featureAdded, this, &QgsAttributeTableFilterModel::reloadVisible );
     }
 
     if ( filterMode == ShowFilteredList )
     {
-      connect( mTableModel, &QgsAttributeTableModel::dataChanged, this, &QgsAttributeTableFilterModel::filterFeatures );
+      connect( layer(), &QgsVectorLayer::featureAdded, this, &QgsAttributeTableFilterModel::filterFeatures );
+      //featureDeleted is handled over selectionChanged
     }
     else
     {
-      disconnect( mTableModel, &QgsAttributeTableModel::dataChanged, this, &QgsAttributeTableFilterModel::filterFeatures );
+      disconnect( layer(), &QgsVectorLayer::featureAdded, this, &QgsAttributeTableFilterModel::filterFeatures );
     }
 
     mFilterMode = filterMode;