diff --git a/src/core/processing/qgsprocessingparameters.cpp b/src/core/processing/qgsprocessingparameters.cpp index 5b4a74c8a7f4..1d565611cd60 100644 --- a/src/core/processing/qgsprocessingparameters.cpp +++ b/src/core/processing/qgsprocessingparameters.cpp @@ -3294,6 +3294,10 @@ QString QgsProcessingParameterMapLayer::asScriptCode() const { switch ( static_cast< Qgis::ProcessingSourceType >( type ) ) { + case Qgis::ProcessingSourceType::Vector: + code += QLatin1String( "table " ); + break; + case Qgis::ProcessingSourceType::VectorAnyGeometry: code += QLatin1String( "hasgeometry " ); break; @@ -3345,6 +3349,12 @@ QgsProcessingParameterMapLayer *QgsProcessingParameterMapLayer::fromScriptCode( QString def = definition; while ( true ) { + if ( def.startsWith( QLatin1String( "table" ), Qt::CaseInsensitive ) ) + { + types << static_cast< int >( Qgis::ProcessingSourceType::Vector ); + def = def.mid( 6 ); + continue; + } if ( def.startsWith( QLatin1String( "hasgeometry" ), Qt::CaseInsensitive ) ) { types << static_cast< int >( Qgis::ProcessingSourceType::VectorAnyGeometry ); diff --git a/src/gui/processing/qgsprocessingmaplayercombobox.cpp b/src/gui/processing/qgsprocessingmaplayercombobox.cpp index d571cdad8903..57e332bca3ed 100644 --- a/src/gui/processing/qgsprocessingmaplayercombobox.cpp +++ b/src/gui/processing/qgsprocessingmaplayercombobox.cpp @@ -161,6 +161,8 @@ QgsProcessingMapLayerComboBox::QgsProcessingMapLayerComboBox( const QgsProcessin QList dataTypes; dataTypes = static_cast( mParameter.get() )->dataTypes(); + if ( dataTypes.contains( static_cast( Qgis::ProcessingSourceType::Vector ) ) ) + filters |= Qgis::LayerFilter::VectorLayer; if ( dataTypes.contains( static_cast( Qgis::ProcessingSourceType::VectorAnyGeometry ) ) ) filters |= Qgis::LayerFilter::HasGeometry; if ( dataTypes.contains( static_cast( Qgis::ProcessingSourceType::VectorPoint ) ) ) diff --git a/src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp b/src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp index 9648d502f000..de7cf3a34db0 100644 --- a/src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp +++ b/src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp @@ -6698,6 +6698,7 @@ QgsProcessingMapLayerParameterDefinitionWidget::QgsProcessingMapLayerParameterDe mLayerTypeComboBox->addItem( tr( "Vector (Line)" ), static_cast( Qgis::ProcessingSourceType::VectorLine ) ); mLayerTypeComboBox->addItem( tr( "Vector (Polygon)" ), static_cast( Qgis::ProcessingSourceType::VectorPolygon ) ); mLayerTypeComboBox->addItem( tr( "Vector (Any Geometry Type)" ), static_cast( Qgis::ProcessingSourceType::VectorAnyGeometry ) ); + mLayerTypeComboBox->addItem( tr( "Vector (No Geometry Required)" ), static_cast( Qgis::ProcessingSourceType::Vector ) ); mLayerTypeComboBox->addItem( tr( "Raster" ), static_cast( Qgis::ProcessingSourceType::Raster ) ); mLayerTypeComboBox->addItem( tr( "Mesh" ), static_cast( Qgis::ProcessingSourceType::Mesh ) ); mLayerTypeComboBox->addItem( tr( "Plugin" ), static_cast( Qgis::ProcessingSourceType::Plugin ) );