update PDAL algorithms to use expression for filter parameter

qgis · May 2, 2023 · 61cfdd3 · 61cfdd3
1 parent 45791b1
commit 61cfdd3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/analysis/processing/pdal/qgsalgorithmpdalfilter.cpp b/src/analysis/processing/pdal/qgsalgorithmpdalfilter.cpp
@@ -19,6 +19,7 @@
 
 #include "qgsrunprocess.h"
 #include "qgspointcloudlayer.h"
+#include "qgspointcloudexpression.h"
 
 ///@cond PRIVATE
 
@@ -60,7 +61,7 @@ QgsPdalFilterAlgorithm *QgsPdalFilterAlgorithm::createInstance() const
 void QgsPdalFilterAlgorithm::initAlgorithm( const QVariantMap & )
 {
   addParameter( new QgsProcessingParameterPointCloudLayer( QStringLiteral( "INPUT" ), QObject::tr( "Input layer" ) ) );
-  addParameter( new QgsProcessingParameterString( QStringLiteral( "FILTER_EXPRESSION" ), QObject::tr( "Filter expression" ), QVariant(), false, true ) );
+  addParameter( new QgsProcessingParameterExpression( QStringLiteral( "FILTER_EXPRESSION" ), QObject::tr( "Filter expression" ), QVariant(), QStringLiteral( "INPUT" ), false, QgsProcessingParameterExpression::PointCloud ) );
   addParameter( new QgsProcessingParameterExtent( QStringLiteral( "FILTER_EXTENT" ), QObject::tr( "Cropping extent" ), QVariant(), true ) );
   addParameter( new QgsProcessingParameterPointCloudDestination( QStringLiteral( "OUTPUT" ), QObject::tr( "Filtered" ) ) );
 }
@@ -86,7 +87,8 @@ QStringList QgsPdalFilterAlgorithm::createArgumentLists( const QVariantMap &para
   const QString filterExpression = parameterAsString( parameters, QStringLiteral( "FILTER_EXPRESSION" ), context ).trimmed();
   if ( !filterExpression.isEmpty() )
   {
-    args << QStringLiteral( "--filter=%1" ).arg( filterExpression );
+    QgsPointCloudExpression exp( filterExpression );
+    args << QStringLiteral( "--filter=%1" ).arg( exp.asPdalExpression() );
   }
 
   if ( parameters.value( QStringLiteral( "FILTER_EXTENT" ) ).isValid() )

diff --git a/src/analysis/processing/pdal/qgspdalalgorithmbase.cpp b/src/analysis/processing/pdal/qgspdalalgorithmbase.cpp
@@ -19,6 +19,7 @@
 
 #include "qgsapplication.h"
 #include "qgsrunprocess.h"
+#include "qgspointcloudexpression.h"
 
 ///@cond PRIVATE
 
@@ -47,7 +48,7 @@ QString QgsPdalAlgorithmBase::wrenchExecutableBinary() const
 
 void QgsPdalAlgorithmBase::createCommonParameters()
 {
-  std::unique_ptr< QgsProcessingParameterString > filterParam = std::make_unique< QgsProcessingParameterString >( QStringLiteral( "FILTER_EXPRESSION" ), QObject::tr( "Filter expression" ), QVariant(), false, true );
+  std::unique_ptr< QgsProcessingParameterExpression > filterParam = std::make_unique< QgsProcessingParameterExpression >( QStringLiteral( "FILTER_EXPRESSION" ), QObject::tr( "Filter expression" ), QVariant(), QStringLiteral( "INPUT" ), true, QgsProcessingParameterExpression::PointCloud );
   filterParam->setFlags( filterParam->flags() | QgsProcessingParameterDefinition::FlagAdvanced );
   addParameter( filterParam.release() );
 
@@ -61,7 +62,8 @@ void QgsPdalAlgorithmBase::applyCommonParameters( QStringList &arguments, QgsCoo
   const QString filterExpression = parameterAsString( parameters, QStringLiteral( "FILTER_EXPRESSION" ), context ).trimmed();
   if ( !filterExpression.isEmpty() )
   {
-    arguments << QStringLiteral( "--filter=%1" ).arg( filterExpression );
+    QgsPointCloudExpression exp( filterExpression );
+    arguments << QStringLiteral( "--filter=%1" ).arg( exp.asPdalExpression() );
   }
 
   if ( parameters.value( QStringLiteral( "FILTER_EXTENT" ) ).isValid() )