main annotation layer should be used as a valid option even if type hint is set to UnknownType (fix #49010) #60341
Conversation
is set to UnknownType (fix qgis#49010)
alexbruy
added
Processing
🪟 Windows buildsDownload Windows builds of this PR for testing. 🪟 Windows Qt6 buildsDownload Windows Qt6 builds of this PR for testing. |
| @@ -516,7 +516,7 @@ QgsMapLayer *QgsProcessingUtils::mapLayerFromString( const QString &string, QgsP | |||
| return nullptr; | |||
|
|
|||
| // prefer project layers | |||
| if ( context.project() && typeHint == LayerHint::Annotation && string.compare( QLatin1String( "main" ), Qt::CaseInsensitive ) == 0 ) | |||
| if ( context.project() && ( typeHint == LayerHint::Annotation || typeHint == LayerHint::UnknownType ) && string.compare( QLatin1String( "main" ), Qt::CaseInsensitive ) == 0 ) | |||
There was a problem hiding this comment.
Wouldn't this break things if the project eg contains a vector layer called "main"?
There was a problem hiding this comment.
Yes, it will break in that case and not only with vector layer but also with other layer types. We probably need to find another way to check validity of main annotation layer here.
There was a problem hiding this comment.
Ok -- how about splitting this logic then, and leaving the condition where the typeHint is set where it is (ie it gets first preference), and then adding the new logic where typeHint isn't set to just before the "if ( !allowLoadingNewLayers )" check?
That way the named project layer will still get preference when typeHint isn't set.
Description
If Processing algorithm uses multiple layers parameter with
Qgis::ProcessingSourceType::MapLayertype, annotation layers are should be considered as a valid choice. However, this will fail with the main annotation layer which exists in all projects by default.The
mapLayerFromString()method will returntrueonly if type hint is explicitly set toAnnotation. In case of multiple layers input we check parameter value using theUnknownTypetype hint and main annotation layer won't be considered as a valid parameter value.Fixes #49010.