Merge pull request #36354 from signedav/filterfix_310

signedav · web-flow · commit 6153b2ffb275 · 2020-05-14T20:24:26.000+02:00
Avoid long loading in attributetable on model change
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;

Original file line number	Diff line number	Diff line change
`@@ -321,22 +321,24 @@ void QgsAttributeTableFilterModel::setFilterMode( FilterMode filterMode )`
`321`	`321`	`if ( filterMode == ShowVisible )`
`322`	`322`	`{`
`323`	`323`	`connect( mCanvas, &QgsMapCanvas::extentsChanged, this, &QgsAttributeTableFilterModel::reloadVisible );`
`324`		`- connect( mTableModel, &QgsAttributeTableModel::dataChanged, this, &QgsAttributeTableFilterModel::reloadVisible );`
	`324`	`+ connect( layer(), &QgsVectorLayer::featureAdded, this, &QgsAttributeTableFilterModel::reloadVisible );`
	`325`	`+ //featureDeleted is handled over selectionChanged`
`325`	`326`	`generateListOfVisibleFeatures();`
`326`	`327`	`}`
`327`	`328`	`else`
`328`	`329`	`{`
`329`	`330`	`disconnect( mCanvas, &QgsMapCanvas::extentsChanged, this, &QgsAttributeTableFilterModel::reloadVisible );`
`330`		`- disconnect( mTableModel, &QgsAttributeTableModel::dataChanged, this, &QgsAttributeTableFilterModel::reloadVisible );`
	`331`	`+ disconnect( layer(), &QgsVectorLayer::featureAdded, this, &QgsAttributeTableFilterModel::reloadVisible );`
`331`	`332`	`}`
`332`	`333`
`333`	`334`	`if ( filterMode == ShowFilteredList )`
`334`	`335`	`{`
`335`		`- connect( mTableModel, &QgsAttributeTableModel::dataChanged, this, &QgsAttributeTableFilterModel::filterFeatures );`
	`336`	`+ connect( layer(), &QgsVectorLayer::featureAdded, this, &QgsAttributeTableFilterModel::filterFeatures );`
	`337`	`+ //featureDeleted is handled over selectionChanged`
`336`	`338`	`}`
`337`	`339`	`else`
`338`	`340`	`{`
`339`		`- disconnect( mTableModel, &QgsAttributeTableModel::dataChanged, this, &QgsAttributeTableFilterModel::filterFeatures );`
	`341`	`+ disconnect( layer(), &QgsVectorLayer::featureAdded, this, &QgsAttributeTableFilterModel::filterFeatures );`
`340`	`342`	`}`
`341`	`343`
`342`	`344`	`mFilterMode = filterMode;`