sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-06 00:07:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

[processing] Fix Output Variant availability

Browse Source 
With #54358 [processing] Add a new 'Calculate expression' algorithm for use in models, a processing output type for variant values has been introduced.
This output Should be used when the output is a flexible type and may represent any QVariant value, like QgsPoint, and  must be available for use as inputs for most parameter types.

In ba7bdec, `QgsProcessingOutputVariant::typeName()` is sometimes added in widget wrapper `compatibleParameterTypes` instead of `compatibleOutputTypes`.
For example, the `QgsProcessingOutputVariant::typeName()` is in `QgsProcessingPointWidgetWrapper::compatibleParameterTypes()` instead of `QgsProcessingPointWidgetWrapper::compatibleOutputTypes()`, so `QgsPoint` output in a variant could not be used as an input parameter.
This commit is contained in:
rldhont 2024-04-14 20:30:01 +02:00 committed by Nyall Dawson
parent 9a6cb9ff47
commit 359cd426b6
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp
View File

@ -2544,7 +2544,6 @@ QStringList QgsProcessingExpressionWidgetWrapper::compatibleParameterTypes() con
<< QgsProcessingParameterNumber::typeName()
<< QgsProcessingParameterDistance::typeName()
<< QgsProcessingParameterScale::typeName()
<< QgsProcessingOutputVariant::typeName()
<< QgsProcessingParameterProviderConnection::typeName();
}
@ -2552,7 +2551,8 @@ QStringList QgsProcessingExpressionWidgetWrapper::compatibleOutputTypes() const
{
return QStringList()
<< QgsProcessingOutputString::typeName()
<< QgsProcessingOutputNumber::typeName();
<< QgsProcessingOutputNumber::typeName()
<< QgsProcessingOutputVariant::typeName();
}
QString QgsProcessingExpressionWidgetWrapper::modelerExpressionFormatString() const
@ -3164,14 +3164,14 @@ QStringList QgsProcessingLayoutWidgetWrapper::compatibleParameterTypes() const
{
return QStringList()
<< QgsProcessingParameterLayout::typeName()
<< QgsProcessingOutputVariant::typeName()
<< QgsProcessingParameterString::typeName();
}
QStringList QgsProcessingLayoutWidgetWrapper::compatibleOutputTypes() const
{
return QStringList()
<< QgsProcessingOutputString::typeName();
<< QgsProcessingOutputString::typeName()
<< QgsProcessingOutputVariant::typeName();
}
QString QgsProcessingLayoutWidgetWrapper::modelerExpressionFormatString() const
@ -3688,14 +3688,14 @@ QStringList QgsProcessingPointWidgetWrapper::compatibleParameterTypes() const
{
return QStringList()
<< QgsProcessingParameterPoint::typeName()
<< QgsProcessingOutputVariant::typeName()
<< QgsProcessingParameterString::typeName();
}
QStringList QgsProcessingPointWidgetWrapper::compatibleOutputTypes() const
{
return QStringList()
<< QgsProcessingOutputString::typeName();
<< QgsProcessingOutputString::typeName()
<< QgsProcessingOutputVariant::typeName();
}
QString QgsProcessingPointWidgetWrapper::modelerExpressionFormatString() const
@ -3805,14 +3805,14 @@ QStringList QgsProcessingGeometryWidgetWrapper::compatibleParameterTypes() const
<< QgsProcessingParameterGeometry::typeName()
<< QgsProcessingParameterString::typeName()
<< QgsProcessingParameterPoint::typeName()
<< QgsProcessingOutputVariant::typeName()
<< QgsProcessingParameterExtent::typeName();
}
QStringList QgsProcessingGeometryWidgetWrapper::compatibleOutputTypes() const
{
return QStringList()
<< QgsProcessingOutputString::typeName();
<< QgsProcessingOutputString::typeName()
<< QgsProcessingOutputVariant::typeName();
}
QString QgsProcessingGeometryWidgetWrapper::modelerExpressionFormatString() const
@ -3951,14 +3951,14 @@ QStringList QgsProcessingColorWidgetWrapper::compatibleParameterTypes() const
{
return QStringList()
<< QgsProcessingParameterColor::typeName()
<< QgsProcessingOutputVariant::typeName()
<< QgsProcessingParameterString::typeName();
}
QStringList QgsProcessingColorWidgetWrapper::compatibleOutputTypes() const
{
return QStringList()
<< QgsProcessingOutputString::typeName();
<< QgsProcessingOutputString::typeName()
<< QgsProcessingOutputVariant::typeName();
}
QString QgsProcessingColorWidgetWrapper::modelerExpressionFormatString() const
@ -4829,14 +4829,14 @@ QStringList QgsProcessingFieldWidgetWrapper::compatibleParameterTypes() const
{
return QStringList()
<< QgsProcessingParameterField::typeName()
<< QgsProcessingParameterString::typeName()
<< QgsProcessingOutputVariant::typeName();
<< QgsProcessingParameterString::typeName();
}
QStringList QgsProcessingFieldWidgetWrapper::compatibleOutputTypes() const
{
return QStringList()
<< QgsProcessingOutputString::typeName();
<< QgsProcessingOutputString::typeName()
<< QgsProcessingOutputVariant::typeName();
}
QString QgsProcessingFieldWidgetWrapper::modelerExpressionFormatString() const
@ -5035,14 +5035,14 @@ QStringList QgsProcessingMapThemeWidgetWrapper::compatibleParameterTypes() const
{
return QStringList()
<< QgsProcessingParameterString::typeName()
<< QgsProcessingOutputVariant::typeName()
<< QgsProcessingParameterExpression::typeName();
}
QStringList QgsProcessingMapThemeWidgetWrapper::compatibleOutputTypes() const
{
return QStringList()
<< QgsProcessingOutputString::typeName();
<< QgsProcessingOutputString::typeName()
<< QgsProcessingOutputVariant::typeName();
}
QString QgsProcessingMapThemeWidgetWrapper::modelerExpressionFormatString() const
@ -5373,14 +5373,14 @@ QStringList QgsProcessingProviderConnectionWidgetWrapper::compatibleParameterTyp
return QStringList()
<< QgsProcessingParameterProviderConnection::typeName()
<< QgsProcessingParameterString::typeName()
<< QgsProcessingOutputVariant::typeName()
<< QgsProcessingParameterExpression::typeName();
}
QStringList QgsProcessingProviderConnectionWidgetWrapper::compatibleOutputTypes() const
{
return QStringList()
<< QgsProcessingOutputString::typeName();
<< QgsProcessingOutputString::typeName()
<< QgsProcessingOutputVariant::typeName();
}
QString QgsProcessingProviderConnectionWidgetWrapper::modelerExpressionFormatString() const
@ -5581,14 +5581,14 @@ QStringList QgsProcessingDatabaseSchemaWidgetWrapper::compatibleParameterTypes()
return QStringList()
<< QgsProcessingParameterProviderConnection::typeName()
<< QgsProcessingParameterString::typeName()
<< QgsProcessingOutputVariant::typeName()
<< QgsProcessingParameterExpression::typeName();
}
QStringList QgsProcessingDatabaseSchemaWidgetWrapper::compatibleOutputTypes() const
{
return QStringList()
<< QgsProcessingOutputString::typeName();
<< QgsProcessingOutputString::typeName()
<< QgsProcessingOutputVariant::typeName();
}
QString QgsProcessingDatabaseSchemaWidgetWrapper::modelerExpressionFormatString() const
@ -6079,7 +6079,6 @@ QStringList QgsProcessingExtentWidgetWrapper::compatibleParameterTypes() const
return QStringList()
<< QgsProcessingParameterExtent::typeName()
<< QgsProcessingParameterString::typeName()
<< QgsProcessingOutputVariant::typeName()
<< QgsProcessingParameterMapLayer::typeName()
<< QgsProcessingParameterFeatureSource::typeName()
<< QgsProcessingParameterRasterLayer::typeName()
@ -6095,7 +6094,8 @@ QStringList QgsProcessingExtentWidgetWrapper::compatibleOutputTypes() const
<< QgsProcessingOutputString::typeName()
<< QgsProcessingOutputRasterLayer::typeName()
<< QgsProcessingOutputVectorLayer::typeName()
<< QgsProcessingOutputMapLayer::typeName();
<< QgsProcessingOutputMapLayer::typeName()
<< QgsProcessingOutputVariant::typeName();
}
QString QgsProcessingExtentWidgetWrapper::modelerExpressionFormatString() const
@ -6239,7 +6239,6 @@ QStringList QgsProcessingMapLayerWidgetWrapper::compatibleParameterTypes() const
<< QgsProcessingParameterPointCloudLayer::typeName()
<< QgsProcessingParameterAnnotationLayer::typeName()
<< QgsProcessingParameterString::typeName()
<< QgsProcessingOutputVariant::typeName()
<< QgsProcessingParameterExpression::typeName();
}
@ -6250,7 +6249,8 @@ QStringList QgsProcessingMapLayerWidgetWrapper::compatibleOutputTypes() const
<< QgsProcessingOutputRasterLayer::typeName()
<< QgsProcessingOutputVectorLayer::typeName()
<< QgsProcessingOutputMapLayer::typeName()
<< QgsProcessingOutputFile::typeName();
<< QgsProcessingOutputFile::typeName()
<< QgsProcessingOutputVariant::typeName();
}
QString QgsProcessingMapLayerWidgetWrapper::modelerExpressionFormatString() const
@ -7010,14 +7010,14 @@ QStringList QgsProcessingBandWidgetWrapper::compatibleParameterTypes() const
{
return QStringList()
<< QgsProcessingParameterBand::typeName()
<< QgsProcessingOutputVariant::typeName()
<< QgsProcessingParameterNumber::typeName();
}
QStringList QgsProcessingBandWidgetWrapper::compatibleOutputTypes() const
{
return QStringList()
<< QgsProcessingOutputNumber::typeName();
<< QgsProcessingOutputNumber::typeName()
<< QgsProcessingOutputVariant::typeName();
}
QString QgsProcessingBandWidgetWrapper::modelerExpressionFormatString() const
@ -7410,7 +7410,6 @@ QStringList QgsProcessingMultipleLayerWidgetWrapper::compatibleParameterTypes()
<< QgsProcessingParameterFeatureSource::typeName()
<< QgsProcessingParameterRasterLayer::typeName()
<< QgsProcessingParameterFile::typeName()
<< QgsProcessingOutputVariant::typeName()
<< QgsProcessingParameterString::typeName();
}
@ -7422,7 +7421,8 @@ QStringList QgsProcessingMultipleLayerWidgetWrapper::compatibleOutputTypes() con
<< QgsProcessingOutputVectorLayer::typeName()
<< QgsProcessingOutputMultipleLayers::typeName()
<< QgsProcessingOutputFile::typeName()
<< QgsProcessingOutputString::typeName();
<< QgsProcessingOutputString::typeName()
<< QgsProcessingOutputVariant::typeName();
}
QString QgsProcessingMultipleLayerWidgetWrapper::modelerExpressionFormatString() const
@ -7517,7 +7517,6 @@ QStringList QgsProcessingAnnotationLayerWidgetWrapper::compatibleParameterTypes(
<< QgsProcessingParameterAnnotationLayer::typeName()
<< QgsProcessingParameterMapLayer::typeName()
<< QgsProcessingParameterString::typeName()
<< QgsProcessingOutputVariant::typeName()
<< QgsProcessingParameterExpression::typeName();
}
@ -7525,7 +7524,8 @@ QStringList QgsProcessingAnnotationLayerWidgetWrapper::compatibleOutputTypes() c
{
return QStringList()
<< QgsProcessingOutputString::typeName()
<< QgsProcessingOutputMapLayer::typeName();
<< QgsProcessingOutputMapLayer::typeName()
<< QgsProcessingOutputVariant::typeName();
}
QString QgsProcessingAnnotationLayerWidgetWrapper::modelerExpressionFormatString() const
@ -8168,7 +8168,6 @@ QStringList QgsProcessingOutputWidgetWrapper::compatibleParameterTypes() const
<< QgsProcessingParameterVectorLayer::typeName()
<< QgsProcessingParameterMapLayer::typeName()
<< QgsProcessingParameterString::typeName()
<< QgsProcessingOutputVariant::typeName()
<< QgsProcessingParameterExpression::typeName();
}
@ -8177,7 +8176,8 @@ QStringList QgsProcessingOutputWidgetWrapper::compatibleOutputTypes() const
return QStringList()
<< QgsProcessingOutputString::typeName()
<< QgsProcessingOutputFolder::typeName()
<< QgsProcessingOutputFile::typeName();
<< QgsProcessingOutputFile::typeName()
<< QgsProcessingOutputVariant::typeName();
}
//