Call filterFeatures on QgsAttributeTableDialog::setFilterExpression i…

…nstead of emitting the features there. In the test, call the filter functions of the attribute table instead of the not existent filter feature widget (like it's done on later releases)
qgis · Apr 1, 2020 · be51084 · be51084
1 parent 6d7fc7e
commit be51084
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 55 deletions.
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -1263,12 +1263,6 @@ void QgsAttributeTableDialog::setFilterExpression( const QString &filterString,
     }
   }
 
-  QgsFeatureIds filteredFeatures;
-  QgsDistanceArea myDa;
-
-  myDa.setSourceCrs( mLayer->crs(), QgsProject::instance()->transformContext() );
-  myDa.setEllipsoid( QgsProject::instance()->ellipsoid() );
-
   // parse search string and build parsed tree
   QgsExpression filterExpression( filter );
   if ( filterExpression.hasParserError() )
@@ -1284,50 +1278,7 @@ void QgsAttributeTableDialog::setFilterExpression( const QString &filterString,
     QgisApp::instance()->messageBar()->pushMessage( tr( "Evaluation error" ), filterExpression.evalErrorString(), Qgis::Warning, QgisApp::instance()->messageTimeout() );
   }
 
-  bool fetchGeom = filterExpression.needsGeometry();
-
-  QApplication::setOverrideCursor( Qt::WaitCursor );
-
-  filterExpression.setGeomCalculator( &myDa );
-  filterExpression.setDistanceUnits( QgsProject::instance()->distanceUnits() );
-  filterExpression.setAreaUnits( QgsProject::instance()->areaUnits() );
-  QgsFeatureRequest request( mMainView->masterModel()->request() );
-  request.setSubsetOfAttributes( filterExpression.referencedColumns(), mLayer->fields() );
-  if ( !fetchGeom )
-  {
-    request.setFlags( QgsFeatureRequest::NoGeometry );
-  }
-  else
-  {
-    // force geometry extraction if the filter requests it
-    request.setFlags( request.flags() & ~QgsFeatureRequest::NoGeometry );
-  }
-  QgsFeatureIterator featIt = mLayer->getFeatures( request );
-
-  QgsFeature f;
-
-  while ( featIt.nextFeature( f ) )
-  {
-    context.setFeature( f );
-    if ( filterExpression.evaluate( &context ).toInt() != 0 )
-      filteredFeatures << f.id();
-
-    // check if there were errors during evaluating
-    if ( filterExpression.hasEvalError() )
-      break;
-  }
-
-  featIt.close();
-
-  mMainView->setFilteredFeatures( filteredFeatures );
-
-  QApplication::restoreOverrideCursor();
-
-  if ( filterExpression.hasEvalError() )
-  {
-    QgisApp::instance()->messageBar()->pushMessage( tr( "Error filtering" ), filterExpression.evalErrorString(), Qgis::Warning, QgisApp::instance()->messageTimeout() );
-    return;
-  }
+  mMainView->filterFeatures( filterExpression, context );
   mMainView->setFilterMode( QgsAttributeTableFilterModel::ShowFilteredList );
 }
 

diff --git a/tests/src/app/testqgsattributetable.cpp b/tests/src/app/testqgsattributetable.cpp
@@ -429,7 +429,7 @@ void TestQgsAttributeTable::testFilteredFeatures()
   std::unique_ptr< QgsAttributeTableDialog > dlg( new QgsAttributeTableDialog( tempLayer.get(), QgsAttributeTableFilterModel::ShowAll ) );
 
   // show all (three features)
-  dlg->mFeatureFilterWidget->filterShowAll();
+  dlg->filterShowAll();
   QCOMPARE( dlg->mMainView->featureCount(), 3 );
   QCOMPARE( dlg->mMainView->filteredFeatureCount(), 3 );
 
@@ -442,15 +442,15 @@ void TestQgsAttributeTable::testFilteredFeatures()
   QCOMPARE( dlg->mMainView->filteredFeatureCount(), 4 );
 
   // bigger 5 (two of four features)
-  dlg->mFeatureFilterWidget->setFilterExpression( QStringLiteral( "col1>5" ), QgsAttributeForm::ReplaceFilter, true );
+  dlg->setFilterExpression( QStringLiteral( "col1>5" ), QgsAttributeForm::ReplaceFilter, true );
   QCOMPARE( dlg->mMainView->featureCount(), 4 );
   QCOMPARE( dlg->mMainView->filteredFeatureCount(), 2 );
   // bigger 7 (one of four features)
-  dlg->mFeatureFilterWidget->setFilterExpression( QStringLiteral( "col1>7" ), QgsAttributeForm::ReplaceFilter, true );
+  dlg->setFilterExpression( QStringLiteral( "col1>7" ), QgsAttributeForm::ReplaceFilter, true );
   QCOMPARE( dlg->mMainView->featureCount(), 4 );
   QCOMPARE( dlg->mMainView->filteredFeatureCount(), 1 );
   // bigger 9 (no of four features)
-  dlg->mFeatureFilterWidget->setFilterExpression( QStringLiteral( "col1>9" ), QgsAttributeForm::ReplaceFilter, true );
+  dlg->setFilterExpression( QStringLiteral( "col1>9" ), QgsAttributeForm::ReplaceFilter, true );
   QCOMPARE( dlg->mMainView->featureCount(), 4 );
   QCOMPARE( dlg->mMainView->filteredFeatureCount(), 0 );
 
@@ -482,7 +482,7 @@ void TestQgsAttributeTable::testFilteredFeatures()
   QCOMPARE( dlg->mMainView->filteredFeatureCount(), 1 );
 
   // smaller 11 (three of four features)
-  dlg->mFeatureFilterWidget->setFilterExpression( QStringLiteral( "col1<11" ), QgsAttributeForm::ReplaceFilter, true );
+  dlg->setFilterExpression( QStringLiteral( "col1<11" ), QgsAttributeForm::ReplaceFilter, true );
   QCOMPARE( dlg->mMainView->filteredFeatureCount(), 3 );
 }